Skip to content

Commit

Permalink
SD2: Script for q.12570 removed
Browse files Browse the repository at this point in the history 
Redone in DB.
  • Loading branch information
@Grz3s @killerwife
Grz3s authored and killerwife committed Sep 22, 2023
1 parent aba1622 commit f7c9de4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 163 deletions.
26 changes: 0 additions & 26 deletions sql/scriptdev2/scriptdev2.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1466,7 +1466,6 @@ UPDATE creature_template SET ScriptName='npc_adal' WHERE entry IN(18481);

/* SHOLAZAR BASIN */
UPDATE creature_template SET ScriptName='npc_helice' WHERE entry=28787;
UPDATE creature_template SET ScriptName='npc_injured_rainspeaker' WHERE entry=28217;
UPDATE creature_template SET ScriptName='npc_tipsy_mcmanus' WHERE entry=28566;
UPDATE creature_template SET ScriptName='npc_wants_fruit_credit' WHERE entry IN (28535,28536,28537);
UPDATE gameobject_template SET ScriptName='go_quest_still_at_it_credit' WHERE entry IN (190635,190636);
Expand Down Expand Up @@ -12365,31 +12364,6 @@ INSERT INTO script_waypoint (Entry, PathId, Point, PositionX, PositionY, Positio
(26814,0,53,4667.46,-4954.76,47.993,0,0,0,''),
(26814,0,54,4673.41,-4967.3,47.791,0,3000,0,'SAY_ESCORT_COMPLETE'),
(26814,0,55,4694.43,-4979.96,44.715,0,0,0,''),
(28217,0,1,5384.22,4533.26,-129.519,0,0,0,''),
(28217,0,2,5394.1,4531.19,-131.758,0,0,0,''),
(28217,0,3,5401.98,4527.3,-137.599,0,0,0,''),
(28217,0,4,5407.98,4526.48,-143.597,0,0,0,''),
(28217,0,5,5420.84,4519.58,-144.922,0,0,0,''),
(28217,0,6,5428.55,4522.23,-148.79,0,0,0,''),
(28217,0,7,5438.54,4536.08,-149.652,0,0,0,''),
(28217,0,8,5452.43,4553.94,-149.093,0,0,0,''),
(28217,0,9,5460.83,4564.37,-148.66,0,0,0,''),
(28217,0,10,5463.25,4584,-148.962,0,0,0,''),
(28217,0,11,5463.71,4603.71,-147.33,0,0,0,''),
(28217,0,12,5470.24,4609.12,-145.224,0,0,0,''),
(28217,0,13,5479.43,4609.2,-141.364,0,0,0,''),
(28217,0,14,5487.47,4615.62,-138.14,0,0,0,''),
(28217,0,15,5497.97,4634.8,-134.697,0,0,0,''),
(28217,0,16,5527.62,4648.05,-136.171,0,0,0,''),
(28217,0,17,5547.71,4651.72,-134.741,0,0,0,''),
(28217,0,18,5559.47,4652.01,-134.155,0,0,0,''),
(28217,0,19,5579.07,4652.29,-136.746,0,0,0,''),
(28217,0,20,5593.44,4643.72,-136.406,0,0,0,''),
(28217,0,21,5608.83,4630.81,-136.834,0,0,0,''),
(28217,0,22,5629.03,4607.48,-137.094,0,0,0,''),
(28217,0,23,5634.95,4600.2,-137.246,0,5000,0,'thanks and quest credit'),
(28217,0,24,5638.54,4594.92,-137.495,0,0,0,'summon'),
(28217,0,25,5638.06,4579.95,-138.029,0,0,0,''),
(28787,0,1,5913.52,5379.03,-98.8961,0,0,0,''),
(28787,0,2,5917.75,5374.52,-98.8698,0,0,0,'SAY_HELICE_EXPLOSIVES_1'),
(28787,0,3,5926.43,5372.15,-98.8845,0,0,0,''),
Expand Down
138 changes: 1 addition & 137 deletions src/game/AI/ScriptDevAI/scripts/northrend/sholazar_basin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
/* ScriptData
SDName: Sholazar_Basin
SD%Complete: 100
SDComment: Quest support: 12570, 12644, 12688
SDComment: Quest support: 12644, 12688
SDCategory: Sholazar Basin
EndScriptData */

/* ContentData
npc_helice
npc_injured_rainspeaker
npc_tipsy_mcmanus
npc_wants_fruit_credit
go_quest_still_at_it_credit
Expand Down Expand Up @@ -197,133 +196,6 @@ bool QuestAccept_npc_helice(Player* pPlayer, Creature* pCreature, const Quest* p
return false;
}

/*######
## npc_injured_rainspeaker
######*/

enum
{
QUEST_FORTUNATE_MISUNDERSTAND = 12570,

GOSSIP_ITEM_READY = -3000103,

SAY_ACCEPT = -1000605,
SAY_START = -1000606,
SAY_END_1 = -1000607,
SAY_END_2 = -1000608,
SAY_TRACKER = -1000609, // not used in escort (aggro text for trackers? something for vekjik?)

NPC_FRENZYHEART_TRACKER = 28077,

SPELL_ORACLE_ESCORT_START = 51341, // unknown purpose
SPELL_FEIGN_DEATH = 51329,
SPELL_ORACLE_INTRO = 51448,
};

struct npc_injured_rainspeakerAI : public npc_escortAI
{
npc_injured_rainspeakerAI(Creature* pCreature) : npc_escortAI(pCreature) { Reset(); }

void Reset() override { }

void JustStartedEscort() override
{
if (Player* pPlayer = GetPlayerForEscort())
{
DoScriptText(SAY_START, m_creature, pPlayer);
DoCastSpellIfCan(m_creature, SPELL_ORACLE_ESCORT_START);
}
}

void WaypointReached(uint32 uiPointId) override
{
switch (uiPointId)
{
case 23:
{
if (Player* pPlayer = GetPlayerForEscort())
{
DoScriptText(SAY_END_1, m_creature, pPlayer);
DoCastSpellIfCan(m_creature, SPELL_ORACLE_INTRO);
}
break;
}
case 24:
{
DoScriptText(SAY_END_2, m_creature);

// location behind
float fAngle = m_creature->GetOrientation();
fAngle += M_PI_F;

float fX, fY, fZ;
m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0.0f, 15.0f, fAngle);

m_creature->SummonCreature(NPC_FRENZYHEART_TRACKER, fX, fY, fZ, m_creature->GetOrientation(), TEMPSPAWN_TIMED_DESPAWN, 30000);
break;
}
}
}

void UpdateEscortAI(const uint32 /*uiDiff*/) override
{
if (!m_creature->SelectHostileTarget() || !m_creature->GetVictim())
return;

DoMeleeAttackIfReady();
}
};

UnitAI* GetAI_npc_injured_rainspeaker(Creature* pCreature)
{
return new npc_injured_rainspeakerAI(pCreature);
}

bool QuestAccept_npc_injured_rainspeaker(Player* pPlayer, Creature* pCreature, const Quest* pQuest)
{
if (pQuest->GetQuestId() == QUEST_FORTUNATE_MISUNDERSTAND)
{
pCreature->RemoveAurasDueToSpell(SPELL_FEIGN_DEATH);
DoScriptText(SAY_ACCEPT, pCreature, pPlayer);

// Workaround, GossipHello/GossipSelect doesn't work well when object already has gossip from database
if (npc_injured_rainspeakerAI* pEscortAI = dynamic_cast<npc_injured_rainspeakerAI*>(pCreature->AI()))
{
pEscortAI->Start(true, pPlayer, pQuest);
pCreature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
}
}

return false;
}

/*
bool GossipHello_npc_injured_rainspeaker(Player* pPlayer, Creature* pCreature)
{
if (pPlayer->GetQuestStatus(QUEST_FORTUNATE_MISUNDERSTAND) == QUEST_STATUS_INCOMPLETE)
{
pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_READY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
return true;
}
return false;
}
bool GossipSelect_npc_injured_rainspeaker(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
{
if (uiAction == GOSSIP_ACTION_INFO_DEF)
{
pPlayer->CLOSE_GOSSIP_MENU();
if (npc_injured_rainspeakerAI* pEscortAI = dynamic_cast<npc_injured_rainspeakerAI*>(pCreature->AI()))
pEscortAI->Start(true, pPlayer);
}
return false;
}
*/

/*######
## npc_tipsy_mcmanus
######*/
Expand Down Expand Up @@ -795,14 +667,6 @@ void AddSC_sholazar_basin()
pNewScript->pQuestAcceptNPC = &QuestAccept_npc_helice;
pNewScript->RegisterSelf();

pNewScript = new Script;
pNewScript->Name = "npc_injured_rainspeaker";
pNewScript->GetAI = &GetAI_npc_injured_rainspeaker;
pNewScript->pQuestAcceptNPC = &QuestAccept_npc_injured_rainspeaker;
// pNewScript->pGossipHello = &GossipHello_npc_injured_rainspeaker;
// pNewScript->pGossipSelect = &GossipSelect_npc_injured_rainspeaker;
pNewScript->RegisterSelf();

pNewScript = new Script;
pNewScript->Name = "npc_tipsy_mcmanus";
pNewScript->GetAI = &GetAI_npc_tipsy_mcmanus;
Expand Down

0 comments on commit f7c9de4

Please sign in to comment.