Merge branch '3.3.5' into 4.3.4
Conflicts: sql/base/auth_database.sql sql/updates/world/2015_08_29_00_world.sql sql/updates/world/2015_08_29_01_world.sql sql/updates/world/2015_08_30_00_world.sql sql/updates/world/2015_08_31_01_world.sql sql/updates/world/2015_09_02_00_world.sql sql/updates/world/2015_09_02_01_world.sql sql/updates/world/2015_09_02_04_world.sql sql/updates/world/2015_09_03_00_world.sql sql/updates/world/2015_09_03_01_world.sql sql/updates/world/2015_09_03_02_world.sql sql/updates/world/2015_09_03_03_world.sql sql/updates/world/2015_09_03_04_world.sql sql/updates/world/2015_09_03_06_world.sql sql/updates/world/2015_09_03_07_world.sql sql/updates/world/2015_09_03_08_world.sql sql/updates/world/2015_09_03_09_world.sql sql/updates/world/2015_09_03_10_world.sql sql/updates/world/2015_09_03_11_world.sql sql/updates/world/2015_09_04_00_world.sql sql/updates/world/2015_09_04_01_world.sql sql/updates/world/2015_09_04_02_world.sql sql/updates/world/2015_09_04_03_world.sql sql/updates/world/2015_09_07_00_world.sql sql/updates/world/2015_09_07_01_world.sql sql/updates/world/2015_09_07_02_world.sql sql/updates/world/2015_09_07_03_world.sql sql/updates/world/2015_09_07_04_world.sql sql/updates/world/2015_09_07_05_world.sql sql/updates/world/2015_09_08_00_world.sql src/common/Collision/Management/MMapManager.cpp src/common/Cryptography/Authentication/AuthCrypt.cpp src/common/Cryptography/Authentication/AuthCrypt.h src/common/Cryptography/HMACSHA1.cpp src/common/Cryptography/HMACSHA1.h src/server/CMakeLists.txt src/server/collision/CMakeLists.txt src/server/game/CMakeLists.txt src/server/game/Entities/Object/ObjectGuid.h src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Entities/Unit/Unit.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Quests/QuestDef.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/Auras/SpellAuras.cpp src/server/game/World/World.cpp src/server/scripts/CMakeLists.txt src/server/scripts/Commands/cs_cheat.cpp src/server/scripts/Commands/cs_debug.cpp src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp src/server/scripts/EasternKingdoms/zone_hinterlands.cpp src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp src/server/scripts/Spells/spell_mage.cpp src/server/worldserver/CMakeLists.txt src/server/worldserver/Main.cpp
This commit is contained in:
commit
221f1405b6
252 files changed
+5466
-5950
No files matched your search
@@ -58,6 +58,7 @@ enum MageSpells
|
||||
SPELL_MAGE_WORGEN_FORM = 32819,
|
||||
SPELL_MAGE_SHEEP_FORM = 32820,
|
||||
SPELL_MAGE_GLYPH_OF_ETERNAL_WATER = 70937,
|
||||
SPELL_MAGE_SHATTERED_BARRIER = 55080,
|
||||
SPELL_MAGE_SUMMON_WATER_ELEMENTAL_PERMANENT = 70908,
|
||||
SPELL_MAGE_SUMMON_WATER_ELEMENTAL_TEMPORARY = 70907,
|
||||
SPELL_MAGE_GLYPH_OF_BLAST_WAVE = 62126,
|
||||
@@ -152,6 +153,11 @@ class spell_mage_arcane_potency : public SpellScriptLoader
|
||||
}
|
||||
};
|
||||
|
||||
enum MageSpellIcons
|
||||
{
|
||||
SPELL_ICON_MAGE_SHATTERED_BARRIER = 2945
|
||||
};
|
||||
|
||||
// Incanter's Absorbtion
|
||||
class spell_mage_incanters_absorbtion_base_AuraScript : public AuraScript
|
||||
{
|
||||
@@ -789,6 +795,7 @@ class spell_mage_ice_barrier : public SpellScriptLoader
|
||||
{
|
||||
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_ice_barrier_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
|
||||
AfterEffectRemove += AuraEffectRemoveFn(spell_mage_ice_barrier_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL);
|
||||
AfterEffectRemove += AuraEffectRemoveFn(spell_mage_ice_barrier_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user