ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Scripts/Silithus): Wind Stone summons roleplay & despawn (#9899)

Browse source
This commit is contained in:
Noxies 2021-12-28 14:46:39 +01:00 • committed by GitHub
parent a54c84f349
commit 3412c3e219
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/sql/updates/pending_db_world/rev_1640694155370414400.sql Normal file
View file

@ -0,0 +1,4 @@
INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1640694155370414400');
-- High Marshal Whirlaxis unit flags: UNK_6 & IMMUNE_TO_PC
UPDATE `acore_world`.`creature_template` SET `unit_flags`='320' WHERE `entry` = 15204;

27
src/server/scripts/Kalimdor/zone_silithus.cpp
View file

@ -1000,6 +1000,26 @@ enum WindStone
SAY_ON_SPAWN_IN = 0
};
class DelayedWindstoneSummonEvent : public BasicEvent
{
public:
DelayedWindstoneSummonEvent(TempSummon* summon, ObjectGuid playerGUID) : _summon(summon), _playerGUID(playerGUID) { }
bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/) override
{
if (Player* player = ObjectAccessor::FindPlayer(_playerGUID))
{
_summon->AI()->AttackStart(player);
}
return true;
}
private:
TempSummon* _summon;
ObjectGuid _playerGUID;
};
class go_wind_stone : public GameObjectScript
{
public:
@ -1165,12 +1185,13 @@ public:
return;
}
player->CastSpell(player, spellInfoTrigger->Id, false);
if (TempSummon* summons = go->SummonCreature(npc, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), player->GetOrientation() - M_PI, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 10 * 60 * 1000))
if (TempSummon* summons = go->SummonCreature(npc, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), player->GetOrientation() - M_PI, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 6000))
{
summons->CastSpell(summons, SPELL_SPAWN_IN, false);
summons->SetTarget(player->GetGUID());
summons->SetLootRecipient(player);
summons->CastSpell(summons, SPELL_SPAWN_IN, false);
summons->AI()->Talk(SAY_ON_SPAWN_IN, player);
summons->AI()->AttackStart(player);
summons->m_Events.AddEvent(new DelayedWindstoneSummonEvent(summons, player->GetGUID()), summons->m_Events.CalculateTime(5200));
_creatureGuid = summons->GetGUID();
}
}