aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sql/FULL/world_script_texts.sql20
-rw-r--r--sql/updates/4246_world_script.sql18
-rw-r--r--src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp22
3 files changed, 55 insertions, 5 deletions
diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql
index 59a7c208cee..894f1c56d1d 100644
--- a/sql/FULL/world_script_texts.sql
+++ b/sql/FULL/world_script_texts.sql
@@ -1729,6 +1729,26 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content
(-1999924, 'You''re right, you are allowed to see my inner secrets.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'example_gossip_codebox SAY_CORRECT'),
(-1999925, 'Hi!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'example_areatrigger SAY_HI');
+-- -1 609 000 - THE SCARLET ENCLAVE
+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
+(-1609000, 'You have made a grave error, fiend!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_START_1' ),
+(-1609001, 'I was a soldier of the Light once... Look at what I have become... ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_START_2'),
+(-1609002, 'You are hopelessly outmatched\, $R.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_START_3'),
+(-1609003, 'They brand me unworthy? I will show them unmorthy!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_START_4'),
+(-1609004, 'You will allow me a weapon and armor, yes?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_START_5'),
+(-1609005, 'I will win my freedom and leave this cursed place!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_START_6'),
+(-1609006, 'I will dismantle this festering hellhole!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_START_7'),
+(-1609007, 'There can be only one survivor!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_START_8'),
+(-1609008, 'To battle!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_1'),
+(-1609009, 'Let your fears consume you!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_2'),
+(-1609010, 'HAH! You can barely hold a blade! Yours will be a quick death.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_3'),
+(-1609011, 'And now you die', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_4'),
+(-1609012, 'To battle!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_5'),
+(-1609013, 'There is no hope for our future...', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_6'),
+(-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');
+
--
-- Below just for beautiful view in table, run at own desire
--
diff --git a/sql/updates/4246_world_script.sql b/sql/updates/4246_world_script.sql
new file mode 100644
index 00000000000..a9700b9baf4
--- /dev/null
+++ b/sql/updates/4246_world_script.sql
@@ -0,0 +1,18 @@
+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
+(-1609000, 'You have made a grave error, fiend!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_START_1' ),
+(-1609001, 'I was a soldier of the Light once... Look at what I have become... ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_START_2'),
+(-1609002, 'You are hopelessly outmatched\, $R.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_START_3'),
+(-1609003, 'They brand me unworthy? I will show them unmorthy!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_START_4'),
+(-1609004, 'You will allow me a weapon and armor, yes?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_START_5'),
+(-1609005, 'I will win my freedom and leave this cursed place!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_START_6'),
+(-1609006, 'I will dismantle this festering hellhole!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_START_7'),
+(-1609007, 'There can be only one survivor!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_START_8'),
+(-1609008, 'To battle!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_1'),
+(-1609009, 'Let your fears consume you!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_2'),
+(-1609010, 'HAH! You can barely hold a blade! Yours will be a quick death.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_3'),
+(-1609011, 'And now you die', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_4'),
+(-1609012, 'To battle!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_5'),
+(-1609013, 'There is no hope for our future...', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_6'),
+(-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');
diff --git a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp
index 7780ef26ff0..777fde29940 100644
--- a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp
+++ b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp
@@ -25,9 +25,6 @@
##Quest 12848
######*/
-#define SAY_EVENT_START "I will dismantle this festering hellhole!"
-#define SAY_EVENT_ATTACK "It ends here!"
-
#define SPELL_SOUL_PRISON_CHAIN_SELF 54612
#define SPELL_SOUL_PRISON_CHAIN 54613
@@ -41,6 +38,18 @@
#define EVENT_BLOOD_STRIKE 3
#define EVENT_DEATH_COIL 4
+int say_event_start[8] =
+{
+ -1609000,-1609001,-1609002,-1609003,
+ -1609004,-1609005,-1609006,-1609007
+};
+
+int say_event_attack[9] =
+{
+ -1609008,-1609009,-1609010,-1609011,-1609012,
+ -1609013,-1609014,-1609015,-1609016
+};
+
uint32 acherus_soul_prison[12] =
{
191577,
@@ -146,6 +155,7 @@ struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI
phase = Chained;
events.Reset();
m_creature->setFaction(7);
+ m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 8);
m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID , 0);
m_creature->SetDisplayId(m_creature->GetNativeDisplayId());
@@ -197,7 +207,8 @@ struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI
wait_timer = 5000;
AddEquipp();
- DoSay(SAY_EVENT_ATTACK,LANG_UNIVERSAL,NULL,true);
+ if(Unit* starter = Unit::GetUnit((*m_creature),event_starter))
+ DoScriptText(say_event_attack[rand()%9],m_creature,starter);
phase = ToAttacking;
}
@@ -215,8 +226,9 @@ struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI
m_creature->RemoveAurasDueToSpell(SPELL_SOUL_PRISON_CHAIN_SELF);
m_creature->RemoveAurasDueToSpell(SPELL_SOUL_PRISON_CHAIN);
- DoSay(SAY_EVENT_START,LANG_UNIVERSAL,NULL,true);
event_starter = target->GetGUID();
+ if(Unit* starter = Unit::GetUnit((*m_creature),event_starter))
+ DoScriptText(say_event_start[rand()%8],m_creature,starter);
}
void UpdateAI(const uint32 diff);