nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-16 10:30:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/BlackMorass): Fixed amount of Medivh's Integrity shield t… (#14948)

Browse Source
This commit is contained in:
UltraNix
2023-02-11 21:44:59 +01:00
committed by GitHub
parent 76c9eb9159
commit 3bd988d195
2 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
View File

@@ -48,8 +48,8 @@ public:
GuidSet encounterNPCs;
uint32 encounters[MAX_ENCOUNTER];
ObjectGuid _medivhGUID;
uint8 _currentRift;
uint8 _shieldPercent;
uint8 _currentRift;
int8 _shieldPercent;
void Initialize() override
{
@@ -144,7 +144,7 @@ public:
}
}
void SetData(uint32 type, uint32 /*data*/) override
void SetData(uint32 type, uint32 data) override
{
switch (type)
{
@@ -187,10 +187,19 @@ public:
Events.RescheduleEvent(EVENT_NEXT_PORTAL, 3000);
break;
case DATA_DAMAGE_SHIELD:
--_shieldPercent;
{
_shieldPercent -= data;
if (_shieldPercent < 0)
{
_shieldPercent = 0;
}
DoUpdateWorldState(WORLD_STATE_BM_SHIELD, _shieldPercent);
if (!_shieldPercent)
{
if (Creature* medivh = instance->GetCreature(_medivhGUID))
{
if (medivh->IsAlive())
{
Unit::Kill(medivh, medivh);
@@ -198,10 +207,17 @@ public:
// Xinef: delete all spawns
GuidSet eCopy = encounterNPCs;
for (ObjectGuid const& guid : eCopy)
{
if (Creature* creature = instance->GetCreature(guid))
{
creature->DespawnOrUnsummon();
}
}
}
}
}
break;
}
}
}

20
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
View File

@@ -387,16 +387,32 @@ public:
{
PrepareAuraScript(spell_black_morass_corrupt_medivh_AuraScript);
bool Load() override
{
_ticks = 0;
return true;
}
void PeriodicTick(AuraEffect const* /*aurEff*/)
{
if (InstanceScript* instance = GetUnitOwner()->GetInstanceScript())
instance->SetData(DATA_DAMAGE_SHIELD, 1);
if (++_ticks >= 3)
{
_ticks = 0;
if (InstanceScript* instance = GetUnitOwner()->GetInstanceScript())
{
instance->SetData(DATA_DAMAGE_SHIELD, m_scriptSpellId == SPELL_CORRUPT_AEONUS ? 2 : 1);
}
}
}
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_black_morass_corrupt_medivh_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
private:
uint8 _ticks = 0;
};
AuraScript* GetAuraScript() const override