diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-23 06:32:44 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-23 06:32:44 +0200 |
| commit | 8bc519a308ab78b1d6b243f49b332ddd9dd4ae17 (patch) | |
| tree | 95c92ba85108b8df3b9f58027034accba018a9d1 /sql | |
| parent | 059f3030b4b842a241e2f526b60f5a48956ee5e6 (diff) | |
| parent | 1bebe15698bea8ff314bfdf93b205e9dc17aeced (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/updates/world/2014_07_22_00_world_conditions.sql | 4 | ||||
| -rw-r--r-- | sql/updates/world/2014_07_22_01_world_playercreateinfo_skills.sql | 1 | ||||
| -rw-r--r-- | sql/updates/world/2014_07_23_00_world_misc.sql | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/sql/updates/world/2014_07_22_00_world_conditions.sql b/sql/updates/world/2014_07_22_00_world_conditions.sql new file mode 100644 index 00000000000..a13a495f737 --- /dev/null +++ b/sql/updates/world/2014_07_22_00_world_conditions.sql @@ -0,0 +1,4 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry`=1790; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(19,0,1790,0,0,8,0,1786,0,0,1,0,0,'','Show quest ''The Symbol of Life'' only if quest ''The Tome of Divinity'' is not rewarded'), +(19,0,1790,0,0,28,0,1786,0,0,1,0,0,'','Show quest ''The Symbol of Life'' only if quest ''The Tome of Divinity'' is not completed'); diff --git a/sql/updates/world/2014_07_22_01_world_playercreateinfo_skills.sql b/sql/updates/world/2014_07_22_01_world_playercreateinfo_skills.sql new file mode 100644 index 00000000000..325d326107b --- /dev/null +++ b/sql/updates/world/2014_07_22_01_world_playercreateinfo_skills.sql @@ -0,0 +1 @@ +ALTER TABLE `playercreateinfo_skills` ENGINE MyISAM; diff --git a/sql/updates/world/2014_07_23_00_world_misc.sql b/sql/updates/world/2014_07_23_00_world_misc.sql new file mode 100644 index 00000000000..3cd67bd0106 --- /dev/null +++ b/sql/updates/world/2014_07_23_00_world_misc.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `smart_scripts` WHERE `entryorguid`=17716 AND `source_type`=0 AND `id`=1; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(17716, 0, 1, 0, 6, 0, 100, 1, 0, 30, 0, 0, 15, 9678, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Sangrias Stillblade - On Death - Complete quest'); |