diff options
| author | Kudlaty <none@none> | 2009-08-07 18:07:40 +0200 |
|---|---|---|
| committer | Kudlaty <none@none> | 2009-08-07 18:07:40 +0200 |
| commit | be74be36f6d170fd11b2df2ebfc20a9c2e40584a (patch) | |
| tree | e7c34872b781b92733b312a6140c5f9e2cd21e8e /sql | |
| parent | 4e07fd3a0fa0c222b5ea64375b43389d2642a2c6 (diff) | |
Merge [SD2]
r1146 Use ForcedDespawn() where possible and remove some not needed function calls. Code style applied. Requires Mangos 8040+
r1147 Make Millhouse have better movement, using distance for MoveChase
r1148 Added missing call sendGossipMenu
r1149 Correct mixed up emote and language in one script_texts
r1150 Update custom SD2 patch for Mangos 0.12 branch - skip
--HG--
branch : trunk
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/FULL/world_script_texts.sql | 2 | ||||
| -rw-r--r-- | sql/updates/4806_script_texts.sql | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql index 601150062b5..16f8c87f1eb 100644 --- a/sql/FULL/world_script_texts.sql +++ b/sql/FULL/world_script_texts.sql @@ -346,7 +346,7 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content (-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'), -(-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'); +(-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, 1, 14, '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/4806_script_texts.sql b/sql/updates/4806_script_texts.sql new file mode 100644 index 00000000000..1a3875c40cd --- /dev/null +++ b/sql/updates/4806_script_texts.sql @@ -0,0 +1 @@ +UPDATE script_texts SET language=1, emote=14 WHERE entry=-1000431; |