diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-20 22:54:39 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-20 22:54:39 +0200 |
| commit | 81c99b333826d6055932aef8a93c128cadb806ba (patch) | |
| tree | f684897696c25d64e10901f54f21b45cd16870a3 /sql | |
| parent | 40a29a3c99412b18b96341cefefb76bd9407531a (diff) | |
| parent | e25416ee2346fd361d47ef6873814b67d7086ea0 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/tools/map_extractor/dbcfile.h
src/tools/vmap4_extractor/adtfile.cpp
src/tools/vmap4_extractor/adtfile.h
src/tools/vmap4_extractor/loadlib/loadlib.h
Diffstat (limited to 'sql')
4 files changed, 17 insertions, 0 deletions
diff --git a/sql/updates/world/2014_04_20_00_world_misc.sql b/sql/updates/world/2014_04_20_00_world_misc.sql new file mode 100644 index 00000000000..2e98abdbd8a --- /dev/null +++ b/sql/updates/world/2014_04_20_00_world_misc.sql @@ -0,0 +1,6 @@ +-- +UPDATE `gossip_menu_option` SET `option_id`=5, `npc_option_npcflag`=16 WHERE `menu_id`=4825; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=4825; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(14,4825,5881,0,0,15,0,128,0,0,0,0,0,'','Show gossip text if player is a Mage'), +(15,4825,0,0,0,15,0,128,0,0,0,0,0,'','Show gossip option if player is a Mage'); diff --git a/sql/updates/world/2014_04_20_01_world_creature_text.sql b/sql/updates/world/2014_04_20_01_world_creature_text.sql new file mode 100644 index 00000000000..8e8ac1813bc --- /dev/null +++ b/sql/updates/world/2014_04_20_01_world_creature_text.sql @@ -0,0 +1,5 @@ +DELETE FROM `creature_text` WHERE `entry` IN (12923,12924,12925); +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(12923,0,0,'I''m saved! Thank you, doctor!',12,0,100,0,0,0,''), +(12924,0,0,'I''m saved! Thank you, doctor!',12,0,100,0,0,0,''), +(12925,0,0,'I''m saved! Thank you, doctor!',12,0,100,0,0,0,''); diff --git a/sql/updates/world/2014_04_20_02_creature_text.sql b/sql/updates/world/2014_04_20_02_creature_text.sql new file mode 100644 index 00000000000..0a5a064a72d --- /dev/null +++ b/sql/updates/world/2014_04_20_02_creature_text.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `creature_text` WHERE `entry`=17123; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `broadcasttextid`) VALUES +(17123,0,0,'Welcome, kind spirit. What has brought you to us?',12,0,100,0,0,0,'',13512); diff --git a/sql/updates/world/2014_04_20_03_gossip_menu_option.sql b/sql/updates/world/2014_04_20_03_gossip_menu_option.sql new file mode 100644 index 00000000000..7e6b7224173 --- /dev/null +++ b/sql/updates/world/2014_04_20_03_gossip_menu_option.sql @@ -0,0 +1,2 @@ +-- +UPDATE `gossip_menu_option` SET `option_text`='Chief Ashtotem, I have misplaced the token that you gave me.', `OptionBroadcastTextID`=22811 WHERE `menu_id`=8898 AND `id`=0; |