sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Scripts/SSC): make sure adds properly respawn and DoAction only fires on Tidalvess alive (#17680)

Browse Source 
initial commit
This commit is contained in:
Dan
2023-11-11 23:20:26 +01:00
committed by GitHub
parent ea066a3e13
commit e1aa26f92d
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/sql/updates/pending_db_world/only-trigger-on-alive.sql
+4
View File
@@ -0,0 +1,4 @@
--
UPDATE `smart_scripts` SET `target_param4` = 0 WHERE `id` = 1 AND `entryorguid` = 22091 AND `source_type` = 0;
UPDATE `smart_scripts` SET `target_param4` = 0 WHERE `id` = 0 AND `entryorguid` = 22486 AND `source_type` = 0;
UPDATE `smart_scripts` SET `target_param4` = 0 WHERE `id` = 0 AND `entryorguid` = 22487 AND `source_type` = 0;
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+6 -14
View File
@@ -120,20 +120,6 @@ struct boss_fathomlord_karathress : public BossAI
} }
} }
void SummonedCreatureDies(Creature* summon, Unit*) override
{
if (summon->GetEntry() == NPC_FATHOM_GUARD_TIDALVESS)
Talk(SAY_GAIN_ABILITY1);
if (summon->GetEntry() == NPC_FATHOM_GUARD_SHARKKIS)
Talk(SAY_GAIN_ABILITY2);
if (summon->GetEntry() == NPC_FATHOM_GUARD_CARIBDIS)
Talk(SAY_GAIN_ABILITY3);
scheduler.Schedule(1s, [this, summon](TaskContext)
{
summons.Despawn(summon);
});
}
void KilledUnit(Unit* /*victim*/) override void KilledUnit(Unit* /*victim*/) override
{ {
if (!_recentlySpoken) if (!_recentlySpoken)
@@ -269,6 +255,8 @@ struct boss_fathomguard_sharkkis : public ScriptedAI
if (Creature* karathress = _instance->GetCreature(DATA_FATHOM_LORD_KARATHRESS)) if (Creature* karathress = _instance->GetCreature(DATA_FATHOM_LORD_KARATHRESS))
{ {
me->CastSpell(karathress, SPELL_POWER_OF_SHARKKIS, true); me->CastSpell(karathress, SPELL_POWER_OF_SHARKKIS, true);
karathress->AI()->Talk(SAY_GAIN_ABILITY2);
me->DespawnOrUnsummon(1000);
} }
} }
@@ -444,6 +432,8 @@ struct boss_fathomguard_tidalvess : public ScriptedAI
if (Creature* karathress = _instance->GetCreature(DATA_FATHOM_LORD_KARATHRESS)) if (Creature* karathress = _instance->GetCreature(DATA_FATHOM_LORD_KARATHRESS))
{ {
me->CastSpell(karathress, SPELL_POWER_OF_TIDALVESS, true); me->CastSpell(karathress, SPELL_POWER_OF_TIDALVESS, true);
karathress->AI()->Talk(SAY_GAIN_ABILITY1);
me->DespawnOrUnsummon(1000);
} }
} }
@@ -526,6 +516,8 @@ struct boss_fathomguard_caribdis : public ScriptedAI
if (Creature* karathress = _instance->GetCreature(DATA_FATHOM_LORD_KARATHRESS)) if (Creature* karathress = _instance->GetCreature(DATA_FATHOM_LORD_KARATHRESS))
{ {
me->CastSpell(karathress, SPELL_POWER_OF_CARIBDIS, true); me->CastSpell(karathress, SPELL_POWER_OF_CARIBDIS, true);
karathress->AI()->Talk(SAY_GAIN_ABILITY3);
me->DespawnOrUnsummon(1000);
} }
} }