diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-18 17:13:46 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-18 17:13:46 +0100 |
| commit | 4e46f7ced6420927e4520bca34f4bee7d1f1c707 (patch) | |
| tree | 02256e0b3e64229a45106a0763e7d68e643d0c4e /sql | |
| parent | 0d7b5d07c843829da027ae9ed7b2bf2165882418 (diff) | |
| parent | 19cec23f396c0ab8cb6a574eea5665c73e5ce5a2 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
src/server/game/Events/GameEventMgr.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Loot/LootMgr.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/worldserver/worldserver.conf.dist
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/updates/world/2012_08_16_00_world_spell_dbc.sql | 3 | ||||
| -rw-r--r-- | sql/updates/world/2012_08_17_00_world_spell_dbc.sql | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sql/updates/world/2012_08_16_00_world_spell_dbc.sql b/sql/updates/world/2012_08_16_00_world_spell_dbc.sql new file mode 100644 index 00000000000..248674d17a5 --- /dev/null +++ b/sql/updates/world/2012_08_16_00_world_spell_dbc.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_dbc` WHERE `Id`=35009; +INSERT INTO `spell_dbc` (`Id`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`Targets`,`CastingTimeIndex`,`ProcCharges`,`SpellLevel`,`RangeIndex`,`Effect1`,`EffectDieSides1`,`EffectBasePoints1`,`EffectImplicitTargetA1`,`EffectImplicitTargetB1`,`EffectRadiusIndex1`,`SpellFamilyName`,`SpellFamilyFlags2`,`DmgMultiplier1`,`SchoolMask`,`Comment`) VALUES +(35009,134545792,1024,268435460,65536,64,1,101,1,13,125,1,-11,22,16,27,10,4,1,6,'Invisibility - Reducing threat'); diff --git a/sql/updates/world/2012_08_17_00_world_spell_dbc.sql b/sql/updates/world/2012_08_17_00_world_spell_dbc.sql new file mode 100644 index 00000000000..ee6d2d2f3b6 --- /dev/null +++ b/sql/updates/world/2012_08_17_00_world_spell_dbc.sql @@ -0,0 +1 @@ +UPDATE `spell_dbc` SET `ProcChance`=101,`ProcCharges`=0,`SpellFamilyName`=3,`SpellFamilyFlags2`=0 WHERE `Id`=35009; |