diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-04 06:41:51 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-04 06:41:51 +0200 |
| commit | ecb317c3006181611dac01554560f15f265aa0e9 (patch) | |
| tree | 9f68584ccac553a219eaee65d4dd9f064a7f0ecc /sql/updates | |
| parent | d7dfef900fff2f52f34fb32a7854475786d34158 (diff) | |
| parent | d4049e62a3b915867e9668a82402b7e7f2389b9f (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
Diffstat (limited to 'sql/updates')
| -rw-r--r-- | sql/updates/world/2014_09_03_01_world_loot.sql | 1 | ||||
| -rw-r--r-- | sql/updates/world/2014_09_04_00_world_creature_template.sql | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sql/updates/world/2014_09_03_01_world_loot.sql b/sql/updates/world/2014_09_03_01_world_loot.sql new file mode 100644 index 00000000000..b56eba26355 --- /dev/null +++ b/sql/updates/world/2014_09_03_01_world_loot.sql @@ -0,0 +1 @@ +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=6 WHERE `entry` IN (34566, 35216, 35268, 35269, 35347, 35348, 35349, 35350, 35351, 35352, 35447, 35448, 35449, 35615, 35616) AND `item`=3;
diff --git a/sql/updates/world/2014_09_04_00_world_creature_template.sql b/sql/updates/world/2014_09_04_00_world_creature_template.sql new file mode 100644 index 00000000000..1484f317983 --- /dev/null +++ b/sql/updates/world/2014_09_04_00_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Remove no longer used script
+UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` = 17662; -- Broggok Poison Cloud
|