Scripts/Quests:

* add support for quest 12634 Some Make Lemonade, Some Make Liquor (implement 51840 spell and Adventurous Dwarf AI, thanks akadabeer)
* implement dummy effect for 49587 Seeds of Nature's Wrath spell (used in quest 12459 That Which Creates Can Also Destroy)
* implement dummy effect for 19512 Apply Salve spell (used in quest 6124/6129 Curing the Sick)
Scripts/Misc: some cleanup in chat log
Core/Locales: fix issue when default locale for trinity_string strings was not used (thanks Aokromes for testing).

--HG--
branch : trunk

6 files changed, 19 insertions, 0 deletions

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 825caf16d46..e73a3b1aab4 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -26793,10 +26793,13 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
 -- quest
 (  8913, 'spell_q55_sacred_cleansing'),
 ( 17271, 'spell_q5206_test_fetid_skull'),
+( 19512, 'spell_q6124_6129_apply_salve'),
 ( 34665, 'spell_q10255_administer_antidote'),
 ( 44936, 'spell_q11515_fel_siphon_dummy'),
 ( 45449, 'spell_q11587_arcane_prisoner_rescue'),
 ( 46023, 'spell_q11730_ultrasonic_screwdriver'),
+( 49587, 'spell_q12459_seeds_of_natures_wrath'),
+( 51840, 'spell_q12634_despawn_fruit_tosser'),
 ( 52308, 'spell_q12683_take_sputum_sample'),
 ( 55804, 'spell_q12937_relief_for_the_fallen'),
 -- item
diff --git a/sql/scripts/world_script_texts.sql b/sql/scripts/world_script_texts.sql
index 9329e6a18fe..cd3147edf9a 100644
--- a/sql/scripts/world_script_texts.sql
+++ b/sql/scripts/world_script_texts.sql
@@ -1841,6 +1841,8 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (30014,-1571039,'Yggdras emerges!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,3,0,0,''),
    (30017,-1571040,'Stinkbeard comin'' for you, little ones!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,''),
    (30007,-1571041,'Do you fell that folks? The air is cracking with energy! Than can only mean one thing...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,''),
+   (28604,-1571042,'Ouch! Watch where you''re tugging!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'adventurous dwarf SAY_DWARF_OUCH'),
+   (28604,-1571043,'Glad I could help!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'adventurous dwarf SAY_DWARF_HELP'),
 
 -- -1 574 000 UTGARDE KEEP
    (23953,-1574000,'Your blood is mine!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13221,1,0,0,'keleseth SAY_AGGRO'),
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index e32259e8bdf..cc6ba278698 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -1179,6 +1179,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_vekjik' WHERE `entry`=28315;
 UPDATE `creature_template` SET `ScriptName`='npc_avatar_of_freya' WHERE `entry`=27801;
 UPDATE `creature_template` SET `ScriptName`='npc_bushwhacker' WHERE `entry`=28317;
 UPDATE `creature_template` SET `ScriptName`='npc_engineer_helice' WHERE `entry`=28787;
+UPDATE `creature_template` SET `ScriptName`='npc_adventurous_dwarf' WHERE `entry`=28604;
 
 /* SILITHUS */
 UPDATE `creature_template` SET `ScriptName`='npcs_rutgar_and_frankal' WHERE `entry` IN (15170,15171);
diff --git a/sql/updates/9948_world_script_name.sql b/sql/updates/9948_world_script_name.sql
new file mode 100644
index 00000000000..acd7f5ed785
--- /dev/null
+++ b/sql/updates/9948_world_script_name.sql
@@ -0,0 +1,2 @@
+-- Add script name to the Adventurous Dwarf
+UPDATE `creature_template` SET `npcflag`=1, `ScriptName`='npc_adventurous_dwarf' WHERE `entry`=28604;
diff --git a/sql/updates/9948_world_script_texts.sql b/sql/updates/9948_world_script_texts.sql
new file mode 100644
index 00000000000..8d52e0be8ec
--- /dev/null
+++ b/sql/updates/9948_world_script_texts.sql
@@ -0,0 +1,4 @@
+DELETE FROM `script_texts` WHERE `entry` IN (-1571043,-1571042);
+INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
+(28604,-1571042,'Ouch! Watch where you''re tugging!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'adventurous dwarf SAY_DWARF_OUCH'),
+(28604,-1571043,'Glad I could help!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'adventurous dwarf SAY_DWARF_HELP');
diff --git a/sql/updates/9948_world_spell_script_names.sql b/sql/updates/9948_world_spell_script_names.sql
new file mode 100644
index 00000000000..38ccd4aa8b1
--- /dev/null
+++ b/sql/updates/9948_world_spell_script_names.sql
@@ -0,0 +1,7 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=51840 AND `ScriptName`='spell_q12634_despawn_fruit_tosser';
+DELETE FROM `spell_script_names` WHERE `spell_id`=49587 AND `ScriptName`='spell_q12459_seeds_of_natures_wrath';
+DELETE FROM `spell_script_names` WHERE `spell_id`=19512 AND `ScriptName`='spell_q6124_6129_apply_salve';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES 
+(51840,'spell_q12634_despawn_fruit_tosser'),
+(49587,'spell_q12459_seeds_of_natures_wrath'),
+(19512,'spell_q6124_6129_apply_salve');
\ No newline at end of file