Skip to content

Commit 4609f4b

Browse files
calaxfurry
authored andcommitted
Improve escort quest 5203 in Felwood
NPC Arko'narin will now use its equipment after retrieving it. Also fix a typo in NPC 9563 gossip (quest 4224) (based on commit SD2-TBC[Improve escort quest 5203 in Felwood] - d2ffa69) Signed-off-by: xfurry <xfurry@scriptdev2.com>
1 parent c9f4e30 commit 4609f4b

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

scripts/eastern_kingdoms/burning_steppes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ bool GossipHello_npc_ragged_john(Player* pPlayer, Creature* pCreature)
7676
pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
7777

7878
if (pPlayer->GetQuestStatus(4224) == QUEST_STATUS_INCOMPLETE)
79-
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Official business, John. I need some information about Marshal Windsor. Tell me about he last time you saw him.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
79+
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Official business, John. I need some information about Marshal Windsor. Tell me about the last time you saw him.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
8080

8181
pPlayer->SEND_GOSSIP_MENU(2713, pCreature->GetObjectGuid());
8282
return true;

scripts/kalimdor/felwood.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -422,13 +422,14 @@ enum
422422
SAY_TREY_ATTACK = -1001157,
423423
SAY_ESCORT_COMPLETE = -1001158,
424424

425-
SPELL_STRENGHT_ARKONARIN = 18163,
425+
SPELL_STRENGTH_ARKONARIN = 18163,
426426
SPELL_MORTAL_STRIKE = 16856,
427427
SPELL_CLEAVE = 15496,
428428

429429
QUEST_ID_RESCUE_JAEDENAR = 5203,
430430
NPC_JAEDENAR_LEGIONNAIRE = 9862,
431431
NPC_SPIRT_TREY = 11141,
432+
NPC_ARKONARIN = 11018,
432433
GO_ARKONARIN_CHEST = 176225,
433434
GO_ARKONARIN_CAGE = 176306,
434435
};
@@ -506,14 +507,14 @@ struct npc_captured_arkonarinAI : public npc_escortAI
506507
m_creature->HandleEmote(EMOTE_ONESHOT_KNEEL);
507508
break;
508509
case 39:
509-
DoCastSpellIfCan(m_creature, SPELL_STRENGHT_ARKONARIN);
510+
DoCastSpellIfCan(m_creature, SPELL_STRENGTH_ARKONARIN);
510511
break;
511512
case 40:
513+
m_creature->UpdateEntry(NPC_ARKONARIN);
512514
if (Player* pPlayer = GetPlayerForEscort())
513515
m_creature->SetFacingToObject(pPlayer);
514516
m_bCanAttack = true;
515517
DoScriptText(SAY_FOUND_EQUIPMENT, m_creature);
516-
// ToDo: change equipment!
517518
break;
518519
case 41:
519520
DoScriptText(SAY_ESCAPE_DEMONS, m_creature);

0 commit comments

Comments
 (0)