Core/Achievements: ported start event and fail event mechanics from master branch
This commit is contained in:
1 parent
a599f7461d
commit
ff0eb86c54
41 files changed
+325
-362
No files matched your search
@@ -303,7 +303,7 @@ class instance_halls_of_origination : public InstanceMapScript
|
||||
if (GameObject* door = GetGameObject(DATA_VAULT_OF_LIGHTS_ENTRANCE_DOOR))
|
||||
door->SetGoState(GO_STATE_ACTIVE);
|
||||
|
||||
DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_VAULT_OF_LIGHTS_START_EVENT);
|
||||
TriggerGameEvent(ACHIEV_VAULT_OF_LIGHTS_START_EVENT);
|
||||
_events.ScheduleEvent(EVENT_FAIL_VAULTS_OF_LIGHT_ACHIEVEMENT, 5min);
|
||||
}
|
||||
else if (value == DONE)
|
||||
|
||||
@@ -157,7 +157,6 @@ public:
|
||||
_Reset();
|
||||
me->SetReactState(REACT_AGGRESSIVE);
|
||||
instance->SetData(DATA_ONYXIA_PHASE, Phase);
|
||||
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
|
||||
}
|
||||
|
||||
void JustEngagedWith(Unit* who) override
|
||||
@@ -168,7 +167,7 @@ public:
|
||||
events.ScheduleEvent(EVENT_TAIL_SWEEP, urand(15000, 20000));
|
||||
events.ScheduleEvent(EVENT_CLEAVE, urand(2000, 5000));
|
||||
events.ScheduleEvent(EVENT_WING_BUFFET, urand(10000, 20000));
|
||||
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
|
||||
instance->TriggerGameEvent(ACHIEV_TIMED_START_EVENT);
|
||||
}
|
||||
|
||||
void JustSummoned(Creature* summoned) override
|
||||
|
||||
@@ -171,7 +171,6 @@ public:
|
||||
Initialize();
|
||||
|
||||
instance->SetBossState(DATA_HERALD_VOLAZJ, NOT_STARTED);
|
||||
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_QUICK_DEMISE_START_EVENT);
|
||||
|
||||
// Visible for all players in insanity
|
||||
for (uint32 i = 173; i <= 177; ++i)
|
||||
@@ -191,7 +190,7 @@ public:
|
||||
Talk(SAY_AGGRO);
|
||||
|
||||
instance->SetBossState(DATA_HERALD_VOLAZJ, IN_PROGRESS);
|
||||
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_QUICK_DEMISE_START_EVENT);
|
||||
instance->TriggerGameEvent(ACHIEV_QUICK_DEMISE_START_EVENT);
|
||||
}
|
||||
|
||||
void JustSummoned(Creature* summon) override
|
||||
|
||||
@@ -122,7 +122,6 @@ public:
|
||||
{
|
||||
BossAI::Reset();
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
|
||||
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOTTA_GO_START_EVENT);
|
||||
_nextSubmerge = 75;
|
||||
_petCount = 0;
|
||||
}
|
||||
@@ -139,7 +138,7 @@ public:
|
||||
door2->SetGoState(GO_STATE_ACTIVE);
|
||||
|
||||
Talk(SAY_AGGRO);
|
||||
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOTTA_GO_START_EVENT);
|
||||
instance->TriggerGameEvent(ACHIEV_GOTTA_GO_START_EVENT);
|
||||
|
||||
events.SetPhase(PHASE_EMERGE);
|
||||
events.ScheduleEvent(EVENT_CLOSE_DOOR, Seconds(5));
|
||||
|
||||
+1
-3
@@ -370,8 +370,6 @@ class boss_fjola : public CreatureScript
|
||||
TwinPactSpellId = SPELL_LIGHT_TWIN_PACT;
|
||||
TouchSpellId = SPELL_LIGHT_TOUCH;
|
||||
SpikeSpellId = SPELL_LIGHT_TWIN_SPIKE;
|
||||
|
||||
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_START_TWINS_FIGHT);
|
||||
boss_twin_baseAI::Reset();
|
||||
}
|
||||
|
||||
@@ -410,7 +408,7 @@ class boss_fjola : public CreatureScript
|
||||
|
||||
void JustEngagedWith(Unit* who) override
|
||||
{
|
||||
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_START_TWINS_FIGHT);
|
||||
instance->TriggerGameEvent(EVENT_START_TWINS_FIGHT);
|
||||
events.ScheduleEvent(EVENT_SPECIAL_ABILITY, 45 * IN_MILLISECONDS);
|
||||
me->SummonCreature(NPC_BULLET_CONTROLLER, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 0.0f, TEMPSUMMON_MANUAL_DESPAWN);
|
||||
boss_twin_baseAI::JustEngagedWith(who);
|
||||
|
||||
@@ -812,7 +812,6 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript
|
||||
_events.Reset();
|
||||
_icewall = 0;
|
||||
_events.ScheduleEvent(EVENT_ESCAPE, 1000);
|
||||
_instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_NOT_RETREATING_EVENT);
|
||||
}
|
||||
|
||||
void JustDied(Unit* /*killer*/) override
|
||||
@@ -1062,7 +1061,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript
|
||||
}
|
||||
}
|
||||
_invincibility = false;
|
||||
_instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_NOT_RETREATING_EVENT);
|
||||
_instance->TriggerGameEvent(ACHIEV_NOT_RETREATING_EVENT);
|
||||
_events.ScheduleEvent(EVENT_ESCAPE_7, 1000);
|
||||
break;
|
||||
case EVENT_ESCAPE_7:
|
||||
|
||||
-2
@@ -348,8 +348,6 @@ class instance_halls_of_reflection : public InstanceMapScript
|
||||
}
|
||||
break;
|
||||
case FAIL:
|
||||
DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_NOT_RETREATING_EVENT);
|
||||
|
||||
if (Creature* jainaOrSylvanas = instance->GetCreature(JainaOrSylvanasEscapeGUID))
|
||||
jainaOrSylvanas->DespawnOrUnsummon(10000);
|
||||
|
||||
|
||||
@@ -148,7 +148,7 @@ public:
|
||||
_JustDied();
|
||||
|
||||
// start achievement timer (kill Maexna within 20 min)
|
||||
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
|
||||
instance->TriggerGameEvent(ACHIEV_TIMED_START_EVENT);
|
||||
}
|
||||
|
||||
void JustEngagedWith(Unit* who) override
|
||||
|
||||
@@ -72,8 +72,6 @@ public:
|
||||
void Reset() override
|
||||
{
|
||||
_Reset();
|
||||
|
||||
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_MAKE_QUICK_WERK_OF_HIM_STARTING_EVENT);
|
||||
}
|
||||
|
||||
void KilledUnit(Unit* /*Victim*/) override
|
||||
@@ -96,7 +94,7 @@ public:
|
||||
events.ScheduleEvent(EVENT_HATEFUL, Seconds(1));
|
||||
events.ScheduleEvent(EVENT_BERSERK, Minutes(6));
|
||||
|
||||
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_MAKE_QUICK_WERK_OF_HIM_STARTING_EVENT);
|
||||
instance->TriggerGameEvent(ACHIEV_MAKE_QUICK_WERK_OF_HIM_STARTING_EVENT);
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff) override
|
||||
|
||||
@@ -381,7 +381,6 @@ public:
|
||||
|
||||
SetPhase(PHASE_NOT_STARTED, true);
|
||||
me->SetReactState(REACT_PASSIVE);
|
||||
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
|
||||
instance->SetBossState(DATA_MALYGOS_EVENT, NOT_STARTED);
|
||||
}
|
||||
|
||||
@@ -573,7 +572,7 @@ public:
|
||||
|
||||
Talk(SAY_START_P_ONE);
|
||||
DoCast(SPELL_BERSERK); // periodic aura, first tick in 10 minutes
|
||||
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
|
||||
instance->TriggerGameEvent(ACHIEV_TIMED_START_EVENT);
|
||||
}
|
||||
|
||||
void EnterEvadeMode(EvadeReason /*why*/) override
|
||||
|
||||
@@ -138,7 +138,7 @@ class boss_drakos : public CreatureScript
|
||||
Talk(SAY_DEATH);
|
||||
|
||||
// start achievement timer (kill Eregos within 20 min)
|
||||
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
|
||||
instance->TriggerGameEvent(ACHIEV_TIMED_START_EVENT);
|
||||
}
|
||||
|
||||
void KilledUnit(Unit* /*victim*/) override
|
||||
|
||||
@@ -82,7 +82,7 @@ struct boss_loken : public BossAI
|
||||
events.ScheduleEvent(EVENT_ARC_LIGHTNING, 15s);
|
||||
events.ScheduleEvent(EVENT_LIGHTNING_NOVA, 20s);
|
||||
events.ScheduleEvent(EVENT_RESUME_PULSING_SHOCKWAVE, 1s);
|
||||
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT);
|
||||
instance->TriggerGameEvent(ACHIEV_TIMELY_DEATH_START_EVENT);
|
||||
me->SetStandState(UNIT_STAND_STATE_STAND);
|
||||
}
|
||||
|
||||
@@ -95,7 +95,6 @@ struct boss_loken : public BossAI
|
||||
|
||||
void EnterEvadeMode(EvadeReason /*why*/) override
|
||||
{
|
||||
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT);
|
||||
_DespawnAtEvade();
|
||||
}
|
||||
|
||||
|
||||
@@ -67,8 +67,6 @@ class boss_maiden_of_grief : public CreatureScript
|
||||
events.ScheduleEvent(EVENT_STORM_OF_GRIEF, 10000);
|
||||
events.ScheduleEvent(EVENT_SHOCK_OF_SORROW, urand(20000, 25000));
|
||||
events.ScheduleEvent(EVENT_PILLAR_OF_WOE, urand(5000, 15000));
|
||||
|
||||
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT);
|
||||
}
|
||||
|
||||
void JustEngagedWith(Unit* who) override
|
||||
@@ -76,7 +74,7 @@ class boss_maiden_of_grief : public CreatureScript
|
||||
BossAI::JustEngagedWith(who);
|
||||
Talk(SAY_AGGRO);
|
||||
|
||||
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT);
|
||||
instance->TriggerGameEvent(ACHIEV_GOOD_GRIEF_START_EVENT);
|
||||
}
|
||||
|
||||
void KilledUnit(Unit* who) override
|
||||
|
||||
@@ -787,7 +787,7 @@ class npc_living_constellation : public CreatureScript
|
||||
|
||||
me->DespawnOrUnsummon(1);
|
||||
if (InstanceScript* instance = me->GetInstanceScript())
|
||||
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_ID_SUPERMASSIVE_START);
|
||||
instance->TriggerGameEvent(EVENT_ID_SUPERMASSIVE_START);
|
||||
caster->CastSpell((Unit*)nullptr, SPELL_BLACK_HOLE_CREDIT, TRIGGERED_FULL_MASK);
|
||||
caster->ToCreature()->DespawnOrUnsummon(1);
|
||||
}
|
||||
@@ -1329,33 +1329,6 @@ class spell_algalon_cosmic_smash_damage : public SpellScriptLoader
|
||||
}
|
||||
};
|
||||
|
||||
class spell_algalon_supermassive_fail : public SpellScriptLoader
|
||||
{
|
||||
public:
|
||||
spell_algalon_supermassive_fail() : SpellScriptLoader("spell_algalon_supermassive_fail") { }
|
||||
|
||||
class spell_algalon_supermassive_fail_SpellScript : public SpellScript
|
||||
{
|
||||
void RecalculateDamage()
|
||||
{
|
||||
if (!GetHitPlayer())
|
||||
return;
|
||||
|
||||
GetHitPlayer()->ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_CONDITION_NO_SPELL_HIT, GetSpellInfo()->Id, true);
|
||||
}
|
||||
|
||||
void Register() override
|
||||
{
|
||||
OnHit.Register(&spell_algalon_supermassive_fail_SpellScript::RecalculateDamage);
|
||||
}
|
||||
};
|
||||
|
||||
SpellScript* GetSpellScript() const override
|
||||
{
|
||||
return new spell_algalon_supermassive_fail_SpellScript();
|
||||
}
|
||||
};
|
||||
|
||||
void AddSC_boss_algalon_the_observer()
|
||||
{
|
||||
new boss_algalon_the_observer();
|
||||
@@ -1371,5 +1344,4 @@ void AddSC_boss_algalon_the_observer()
|
||||
new spell_algalon_remove_phase();
|
||||
new spell_algalon_cosmic_smash();
|
||||
new spell_algalon_cosmic_smash_damage();
|
||||
new spell_algalon_supermassive_fail();
|
||||
}
|
||||
@@ -137,8 +137,6 @@ class boss_ignis : public CreatureScript
|
||||
_Reset();
|
||||
if (Vehicle* _vehicle = me->GetVehicleKit())
|
||||
_vehicle->RemoveAllPassengers();
|
||||
|
||||
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEVEMENT_IGNIS_START_EVENT);
|
||||
}
|
||||
|
||||
void JustEngagedWith(Unit* who) override
|
||||
@@ -152,7 +150,7 @@ class boss_ignis : public CreatureScript
|
||||
events.ScheduleEvent(EVENT_END_POT, 40000);
|
||||
events.ScheduleEvent(EVENT_BERSERK, 480000);
|
||||
Initialize();
|
||||
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEVEMENT_IGNIS_START_EVENT);
|
||||
instance->TriggerGameEvent(ACHIEVEMENT_IGNIS_START_EVENT);
|
||||
}
|
||||
|
||||
void JustDied(Unit* /*killer*/) override
|
||||
|
||||
@@ -200,7 +200,7 @@ class boss_kologarn : public CreatureScript
|
||||
if (!right && !left)
|
||||
events.ScheduleEvent(EVENT_STONE_SHOUT, 5000);
|
||||
|
||||
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, CRITERIA_DISARMED);
|
||||
instance->TriggerGameEvent(CRITERIA_DISARMED);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -203,8 +203,6 @@ class boss_xt002 : public CreatureScript
|
||||
DoCastSelf(SPELL_STAND);
|
||||
|
||||
Initialize();
|
||||
|
||||
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_MUST_DECONSTRUCT_FASTER);
|
||||
}
|
||||
|
||||
void EnterEvadeMode(EvadeReason /*why*/) override
|
||||
@@ -224,7 +222,7 @@ class boss_xt002 : public CreatureScript
|
||||
//Tantrum is cast a bit slower the first time.
|
||||
events.ScheduleEvent(EVENT_TYMPANIC_TANTRUM, urand(TIMER_TYMPANIC_TANTRUM_MIN, TIMER_TYMPANIC_TANTRUM_MAX) * 2);
|
||||
|
||||
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_MUST_DECONSTRUCT_FASTER);
|
||||
instance->TriggerGameEvent(ACHIEV_MUST_DECONSTRUCT_FASTER);
|
||||
}
|
||||
|
||||
void DoAction(int32 action) override
|
||||
|
||||
@@ -493,7 +493,6 @@ class boss_voice_of_yogg_saron : public CreatureScript
|
||||
events.SetPhase(PHASE_ONE);
|
||||
|
||||
instance->SetData(DATA_DRIVE_ME_CRAZY, uint32(true));
|
||||
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
|
||||
|
||||
Initialize();
|
||||
|
||||
@@ -517,7 +516,7 @@ class boss_voice_of_yogg_saron : public CreatureScript
|
||||
if (Creature* keeper = ObjectAccessor::GetCreature(*me, instance->GetGuidData(i)))
|
||||
keeper->SetInCombatWith(me);
|
||||
|
||||
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
|
||||
instance->TriggerGameEvent(ACHIEV_TIMED_START_EVENT);
|
||||
|
||||
DoCastAOE(SPELL_SUMMON_GUARDIAN_2, { SPELLVALUE_MAX_TARGETS, 1 });
|
||||
DoCast(me, SPELL_SANITY_PERIODIC);
|
||||
|
||||
@@ -558,7 +558,7 @@ class instance_ulduar : public InstanceMapScript
|
||||
case NPC_GUARDIAN_OF_LIFE:
|
||||
if (!conSpeedAtory)
|
||||
{
|
||||
DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, CRITERIA_CON_SPEED_ATORY);
|
||||
TriggerGameEvent(CRITERIA_CON_SPEED_ATORY);
|
||||
conSpeedAtory = true;
|
||||
}
|
||||
break;
|
||||
@@ -567,7 +567,7 @@ class instance_ulduar : public InstanceMapScript
|
||||
case NPC_BRIGHTLEAF:
|
||||
if (!lumberjacked)
|
||||
{
|
||||
DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, CRITERIA_LUMBERJACKED);
|
||||
TriggerGameEvent(CRITERIA_LUMBERJACKED);
|
||||
lumberjacked = true;
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -169,8 +169,6 @@ public:
|
||||
me->SetReactState(REACT_PASSIVE);
|
||||
if (!instance->GetCreature(DATA_GRAUF))
|
||||
me->SummonCreature(NPC_GRAUF, GraufLoc);
|
||||
|
||||
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_LODI_DODI_WE_LOVES_THE_SKADI);
|
||||
}
|
||||
|
||||
void EnterEvadeMode(EvadeReason /*why*/) override
|
||||
@@ -234,7 +232,7 @@ public:
|
||||
SpawnFirstWave();
|
||||
Talk(SAY_AGGRO);
|
||||
_phase = PHASE_FLYING;
|
||||
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_LODI_DODI_WE_LOVES_THE_SKADI);
|
||||
instance->TriggerGameEvent(ACHIEV_LODI_DODI_WE_LOVES_THE_SKADI);
|
||||
|
||||
scheduler
|
||||
.Schedule(Seconds(6), [this](TaskContext resetCheck)
|
||||
|
||||
Reference in new issue
Block a user