diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-29 21:18:23 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-29 21:18:23 +0200 |
| commit | 06daf22e1ea31d240456fdd05f899b92231458d3 (patch) | |
| tree | 6c250d96c47058940b7b94e95bfc1f088de9351f /sql/updates | |
| parent | e8d0de67782eb7773d6c10172ba0ab0b458d777f (diff) | |
| parent | f5115328c5ced39a5b223c7a5ad555d191eee3ff (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/scripts/Commands/cs_guild.cpp
Diffstat (limited to 'sql/updates')
4 files changed, 11 insertions, 0 deletions
diff --git a/sql/updates/world/2014_08_29_01_world_creature_template.sql b/sql/updates/world/2014_08_29_01_world_creature_template.sql new file mode 100644 index 00000000000..4c4101d0c83 --- /dev/null +++ b/sql/updates/world/2014_08_29_01_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Adds trigger and civilian flags_extra to Halion's Soul Consumption triggers +UPDATE `creature_template` SET `flags_extra` = `flags_extra` |2|128 WHERE `entry` IN (40673, 40674, 40675); diff --git a/sql/updates/world/2014_08_29_02_world_creature_template.sql b/sql/updates/world/2014_08_29_02_world_creature_template.sql new file mode 100644 index 00000000000..2b151714e97 --- /dev/null +++ b/sql/updates/world/2014_08_29_02_world_creature_template.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `faction`=534 WHERE `entry` IN (37580,37614,37576,37615,37575,37617,37572,37616); +UPDATE `creature_template` SET `faction`=35 WHERE `entry` IN (37813,38402,38582,38583); diff --git a/sql/updates/world/2014_08_29_03_world_creature_template.sql b/sql/updates/world/2014_08_29_03_world_creature_template.sql new file mode 100644 index 00000000000..7c057c8dc85 --- /dev/null +++ b/sql/updates/world/2014_08_29_03_world_creature_template.sql @@ -0,0 +1,5 @@ +-- +UPDATE `creature_template` SET `faction`=1692 WHERE `entry` IN (33139,34111); +UPDATE `creature_template` SET `faction`=16 WHERE `entry` IN(32908,33151,32907,33150,32885,33153,32883,33152,32882,33154); +UPDATE `creature_template` SET `faction`=1814 WHERE `entry` IN (29098,31602,29096,31590,29062,31589); +UPDATE `creature_template` SET `faction`=14 WHERE `entry` IN (29153,31585); diff --git a/sql/updates/world/2014_08_29_04_world_creature_template.sql b/sql/updates/world/2014_08_29_04_world_creature_template.sql new file mode 100644 index 00000000000..d63bf2b77e2 --- /dev/null +++ b/sql/updates/world/2014_08_29_04_world_creature_template.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `mechanic_immune_mask`=`mechanic_immune_mask`|0x10000000 WHERE `entry` IN (36619, 38711, 38712); |