*Merge.

--HG--
branch : trunk

INSTALL.linux

@@ -2,60 +2,61 @@
 
 Copyright (C) Trinity Core (http://www.trinitycore.org)
 
+CHECK http://www.trinitycore.info/w/Linux_Build_HOWTO FOR FURTHER HELP
+
 Installing Trinity Core is fairly simple on a Linux machine, assuming
 you have all required applications
 
 The most important ones are:
 
-	* make
+	g++
-	* automake
+    gcc
-	* autoconf
+    make
-	* gcc
+    cmake version 2.6.x or greater
+    libmysql++-dev
+    subversion (for checking out Trinity Database)
+    mercurial (for checking out the core)
+    openssl
+    libssl-dev
+    zlib1g-dev
+    libtool
+    libmysqlclient15-dev
+    patch
+    build-essential
+    mysql-client
     
-After that, you can simply run these commands:
+Most of these are included on common Linux distros, others you may have to install by your self. 
+Please check your distro's repos.
 
-	* autoreconf --install --force
+Make a directory to build in, you can call it anything you want like build or bin etc, then go into 
-	* ./configure
+the directory and cmake and make. E.G. you created a dir named build ad want to have your final
+ compiled product installed in /home/trinity/server, an example sequence of commands can be : 
 
-The configure script will tell you if you miss any libraries, and
+    cmake ../ -DPREFIX=/home/trinity/server
-if so, which ones. You can then download them from your preferred
+    make
-package provider (apt-get, emerge, yum, and the alikes).
+    make install
     
-When you have all required packages, be sure to properly configure
+Thats just about all thats needed. You can however tweak more settings than where to install using flags built into our cmake files. Just open up CMakeLists.txt in the main folder and take a look at some of the flags like 
-your build of Trinity Core:
 
-	* ./configure --help
+    DO_MYSQL --mysql database support (enabled or disabled by a 1 or 0, enabled by default)
+    DO_POSTGRESQL --postgresql database support (enabled or disabled by a 1 or 0)
+    DO_SCRIPTS --enable or disable trinity script (enabled or disabled by a 1 or 0, enabled by default)
+    DO_RA --remote administration (enabled or disabled by a 1 or 0)
+    DO_DEBUG --enable debugging (enabled or disabled by a 1 or 0)
+    DO_CLI --enable command line support (enabled or disabled by a 1 or 0, enabled by default)
+    LARGE_CELL --enable large cells (enabled or disabled by a 1 or 0, disabled by default, enabling can cause CPU spikes)
+    SHORT_SLEEP --changes sleep time from 100ms to 50ms
+    PREFIX --prefix directory for install (see example for use)
+    CONF_DIR --location for your trinity config files
+    CMAKE_C_FLAGS --advanced users only
+    CMAKE_CXX_FLAGS --advanced users only
 
-That command will tell you which config options are available. For
-the most part, the following should be used:
 
-	* --enable-cli
+Of course, replace the paths in prefix, conf_dir with the directories you wish to install 
-	* --enable-ra
+Trinity Core to. The datadir is where maps, DBCs, and SQLs are stored. The sysconfdir
-	* --with-mysql
-	* --prefix=/home/trinitycore
-	* --datadir=/home/trinitycore/dat
-	* --sysconfdir=/home/trinitycore/etc
-
-Of course, replace the paths in prefix, datadir, and sysconfdir
-with the directories you wish to install Trinity Core to. The
-datadir is where maps, DBCs, and SQLs are stored. The sysconfdir
 is where configuration files are stored.
 
-When you're ready to execute your configuration, do:
+Once Trinity Core is installed you will need to
-
-	* mkdir build
-	* cd build
-	* ../configure --options --go --here
-
-When you've configured your build, simply run:
-
-	* make
-
-And finally, to install Trinity Core:
-
-	* make install
-
-Done! Trinity Core should now be installed. Now you will need to
 apply database updates where necessary. Furthermore, you must
 configure your installation by editing the config files in the
 sysconfdir.

README

@@ -40,11 +40,4 @@ SQL files to create the database can be found in the sql directory. Files
 to update your database from an older revision/version can be found in the
 sql/updates directory.
 
-See the INSTALL file for installation instructions under Linux.
+See the INSTALL.Linux file for installation instructions under Linux.
-
-If you are using the SVN (unstable) version of Trinity Core, run this
-command prior to building:
-
-autoreconf --install --force
-
-You can then continue to build the source.

sql/updates/54_world.sql

@@ -0,0 +1,5 @@
+CREATE TABLE `game_event_battleground_holiday` (
+ `event` int(10) unsigned NOT NULL,
+ `bgflag` int(10) unsigned NOT NULL default '0',
+ PRIMARY KEY  (`event`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;

src/game/SpellAuras.cpp

@@ -5752,6 +5752,7 @@ void Aura::PeriodicTick()
                 int32 gain = pCaster->ModifyPower(power,gain_amount);
                 m_target->AddThreat(pCaster, float(gain) * 0.5f, GetSpellSchoolMask(GetSpellProto()), GetSpellProto());
             }
+            
             // Mark of Kaz'rogal
             if(GetId() == 31447 && m_target->GetPower(power) == 0)
             {
@@ -5759,6 +5760,20 @@ void Aura::PeriodicTick()
                 // Remove aura
                 SetAuraDuration(0);
             }
+
+            // Mark of Kazzak
+            if(GetId() == 32960)
+            {
+                int32 modifier = (m_target->GetPower(power) * 0.05f);
+                m_target->ModifyPower(power, -modifier);
+
+                if(m_target->GetPower(power) == 0)
+                {
+                    m_target->CastSpell(m_target, 32961, true, 0, this);
+                    // Remove aura
+                    SetAuraDuration(0);
+                }
+            }
             break;
         }
         case SPELL_AURA_PERIODIC_ENERGIZE: