Merge [SD2]

r1151 Remove old workaround and instead use spell to summon dragonhawk from eggs in ZA. Correct eggs hatched count. - skip
r1152 Remove obsolete script function DoZoneInCombat() and replace in code with SetInCombatWithZone(). Requires Mangos 8057+ - skip
r1153 Respawn eggs for boss in ZA in case evade. Remove old workaround and summon dragonhawks by spell from all remaining eggs at 35% hp. - skip
r1154 Added main spells for first boss in ZA - skip
r1155 Added ZA boss' spirit lynx script - skip
r1156 Correct typos and errors in misc .txt files - skip
r1157 Added abilities and phases for halazzi - skip
r1158 Add two lost variables in previous commit, used for reset phase - skip
r1159 Use expected movement flag for escortAI (source need more detailed cleanup) - skip
r1160 More corrections of movementflags + minor cleanup code. - skip
r1161 Correcting boss astromancer and adds' spells. Some minor code cleanup.
r1162 Fix typo related to ReceiveEmote() and update code for once script, using spell instead of emote.
r1163 Added spells for Unworthy Initiate. - skip
r1164 Added ScriptedAI function EnterEvadeIfOutOfCombatArea() used for location check of creatures that are expected to evade when out of certain area. Location coordinates are hard coded for each creature entry.
r1165 Replace/use EnterEvadeIfOutOfCombatArea for three bosses, with locations added in previous commit.
r1166 Add one more boss to EnterEvadeIfOutOfCombatArea() list and also use boolean for function (to be used if special case evade events are expected).
r1167 Remove some old (and wrong/not needed) movementflags, correct remaining to use MONSTER_* - skip
r1168 Fixed spellId typo - skip
r1169 Added basic support for quest 12733 (change our script to this)
r1170 Remove meele attack for mini-boss and add some distance for MoveChase()

--HG--
branch : trunk

2 files changed, 13 insertions, 0 deletions

diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql
index bb3da821bab..fc3c6d9ee61 100644
--- a/sql/FULL/world_script_texts.sql
+++ b/sql/FULL/world_script_texts.sql
@@ -1824,6 +1824,12 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content
 (-1609014, 'Sate your hunger on cold steel\, $R', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_7'),
 (-1609015, 'It ends here!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_8'),
 (-1609016, 'Death is the only cure!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_9'),
+(-1609017,'No potions!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_A'),
+(-1609018,'Remember this day, $n, for it is the day that you will be thoroughly owned.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_B'),
+(-1609019,'I\'m going to tear your heart out, cupcake!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_C'),
+(-1609020,'Don\'t make me laugh.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_D'),
+(-1609021,'Here come the tears...', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_E'),
+(-1609022,'You have challenged death itself!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_F'),
 (-1609025,'Come to finish the job, have you?', NULL,NULL, NULL,NULL, NULL,NULL, NULL,NULL,0,0,0,1,'special_surprise SAY_EXEC_START_1'),
 (-1609026,'Come to finish the job, have ye?', NULL,NULL, NULL,NULL, NULL,NULL, NULL,NULL,0,0,0,1,'special_surprise SAY_EXEC_START_2'),
 (-1609027,'Come ta finish da job, mon?', NULL,NULL, NULL,NULL, NULL,NULL, NULL,NULL,0,0,0,1,'special_surprise SAY_EXEC_START_3'),
diff --git a/sql/updates/4831_script_texts.sql b/sql/updates/4831_script_texts.sql
new file mode 100644
index 00000000000..0feadac12d7
--- /dev/null
+++ b/sql/updates/4831_script_texts.sql
@@ -0,0 +1,7 @@
+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
+(-1609017,'No potions!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_A'),
+(-1609018,'Remember this day, $n, for it is the day that you will be thoroughly owned.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_B'),
+(-1609019,'I\'m going to tear your heart out, cupcake!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_C'),
+(-1609020,'Don\'t make me laugh.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_D'),
+(-1609021,'Here come the tears...', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_E'),
+(-1609022,'You have challenged death itself!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_F');