From 0aef1a9a486f4262540d10c331a5cb0115d3e11e Mon Sep 17 00:00:00 2001
From: Kudlaty <none@none>
Date: Fri, 7 Aug 2009 02:03:27 +0200
Subject: Merge [SD2] r1142 Fix: Kael'thas advisors gain double health in phase
 3 and dropp them on reset       Fix: Void Reaver will now ignore pets and
 totems when casting arcane orb r1143 Remove old workaround for summon
 kael(TK) weapons and use spells instead. Apply code style to parts of code.
 r1144 Added lost sql from revision 1119 and 1121 - skip r1145 Correcting
 details for npc related to quest 590

--HG--
branch : trunk
---
 sql/FULL/world_script_texts.sql   | 3 ++-
 sql/updates/4803_script_texts.sql | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 sql/updates/4803_script_texts.sql

(limited to 'sql')

diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql
index 258f68a779e..601150062b5 100644
--- a/sql/FULL/world_script_texts.sql
+++ b/sql/FULL/world_script_texts.sql
@@ -345,7 +345,8 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content
 (-1000427, 'Something tells me this $r wants the mysterious fossil too. Help!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 7, 0, 'remtravel SAY_REM_AGGRO'),
 (-1000428, 'Ah...the wondrous sound of kodos. I love the way they make the ground shake... inspect the beast for me.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,'kodo round SAY_SMEED_HOME_1'),
 (-1000429, 'Hey, look out with that kodo! You had better inspect that beast before i give you credit!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,'kodo round SAY_SMEED_HOME_2'),
-(-1000430, 'That kodo sure is a beauty. Wait a minute, where are my bifocals? Perhaps you should inspect the beast for me.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'kodo round SAY_SMEED_HOME_3');
+(-1000430, 'That kodo sure is a beauty. Wait a minute, where are my bifocals? Perhaps you should inspect the beast for me.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'kodo round SAY_SMEED_HOME_3'),
+(-1000431, 'Okay, okay... gimme a minute to rest now. You gone and beat me up good.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 14, 1, 'calvin SAY_COMPLETE');
 
 -- -1 033 000 SHADOWFANG KEEP
 INSERT INTO `script_texts` (`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
diff --git a/sql/updates/4803_script_texts.sql b/sql/updates/4803_script_texts.sql
new file mode 100644
index 00000000000..a91fa99c22b
--- /dev/null
+++ b/sql/updates/4803_script_texts.sql
@@ -0,0 +1,3 @@
+DELETE FROM script_texts WHERE entry=-1000431;
+INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
+(-1000431,'Okay, okay... gimme a minute to rest now. You gone and beat me up good.',0,0,14,1,'calvin SAY_COMPLETE');
-- 
cgit v1.2.3