aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/3.3.5/2019_07_25_01_world.sql10
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp4
2 files changed, 12 insertions, 2 deletions
diff --git a/sql/updates/world/3.3.5/2019_07_25_01_world.sql b/sql/updates/world/3.3.5/2019_07_25_01_world.sql
new file mode 100644
index 00000000000..3b248a6e0ca
--- /dev/null
+++ b/sql/updates/world/3.3.5/2019_07_25_01_world.sql
@@ -0,0 +1,10 @@
+--
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=30547;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=30547 AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(30547, 0, 0, 0, 1, 0, 100, 0, 30000, 60000, 180000, 300000, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Postmaster Malown - OOC - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `creatureid`=30547;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(30547, 0, 0, "...zzz... ..snrk... c'mere... gonna... gonna be Malowned... zzz..", 12, 0, 100, 0, 0, 0, 31230, 0, "Postmaster Malown"),
+(30547, 0, 1, "...mrf... kids messin'.. with th' boxes... zzzz... teach 'em... lesson...", 12, 0, 100, 0, 0, 0, 31231, 0, "Postmaster Malown");
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp
index 3f81fb5da0f..6f0f962d712 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp
@@ -1071,7 +1071,7 @@ public:
break;
case RP2_EVENT_KILL1:
if (Creature* citizen = me->FindNearestCreature(NPC_CITIZEN, 100.0f, true))
- DoCast(citizen, SPELL_CRUSADER_STRIKE);
+ DoCast(citizen, SPELL_CRUSADER_STRIKE, TRIGGERED_IGNORE_SET_FACING);
if (Creature* resident = me->FindNearestCreature(NPC_RESIDENT, 100.0f, true))
{
resident->SetFlag(UNIT_NPC_EMOTESTATE, EMOTE_STATE_COWER);
@@ -1083,7 +1083,7 @@ public:
break;
case RP2_EVENT_KILL2:
if (Creature* resident = me->FindNearestCreature(NPC_RESIDENT, 100.0f, true))
- DoCast(resident, SPELL_CRUSADER_STRIKE);
+ DoCast(resident, SPELL_CRUSADER_STRIKE, TRIGGERED_IGNORE_SET_FACING);
break;
case RP2_EVENT_REACT1:
case RP2_EVENT_REACT2: