feat(Core/Instance): Add instance validation for creature scripts (#4596)

This commit is contained in:
Kitzunu
2021-04-05 15:34:26 +02:00
committed by GitHub
parent 60f865fce6
commit f9d708b450
371 changed files with 1315 additions and 767 deletions

View File

@@ -142,7 +142,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_brutallusAI>(creature);
return GetSunwellPlateauAI<boss_brutallusAI>(creature);
}
};
@@ -386,7 +386,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_madrigosaAI>(creature);
return GetSunwellPlateauAI<npc_madrigosaAI>(creature);
}
};

View File

@@ -209,7 +209,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_sacrolashAI>(creature);
return GetSunwellPlateauAI<boss_sacrolashAI>(creature);
};
};
@@ -347,7 +347,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_alythessAI>(creature);
return GetSunwellPlateauAI<boss_alythessAI>(creature);
};
};

View File

@@ -373,7 +373,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_felmystAI>(creature);
return GetSunwellPlateauAI<boss_felmystAI>(creature);
}
};
@@ -384,7 +384,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_demonic_vaporAI(creature);
return GetSunwellPlateauAI<npc_demonic_vaporAI>(creature);
}
struct npc_demonic_vaporAI : public NullCreatureAI
@@ -420,7 +420,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_demonic_vapor_trailAI(creature);
return GetSunwellPlateauAI<npc_demonic_vapor_trailAI>(creature);
}
struct npc_demonic_vapor_trailAI : public NullCreatureAI

View File

@@ -341,7 +341,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_kalecgosAI>(creature);
return GetSunwellPlateauAI<boss_kalecgosAI>(creature);
}
};
@@ -362,7 +362,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_kalecAI>(creature);
return GetSunwellPlateauAI<boss_kalecAI>(creature);
}
struct boss_kalecAI : public ScriptedAI
@@ -479,7 +479,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_sathrovarrAI>(creature);
return GetSunwellPlateauAI<boss_sathrovarrAI>(creature);
}
struct boss_sathrovarrAI : public ScriptedAI

View File

@@ -153,7 +153,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_kiljaeden_controllerAI>(creature);
return GetSunwellPlateauAI<npc_kiljaeden_controllerAI>(creature);
}
struct npc_kiljaeden_controllerAI : public NullCreatureAI
@@ -650,7 +650,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_kiljaedenAI>(creature);
return GetSunwellPlateauAI<boss_kiljaedenAI>(creature);
}
};
@@ -762,7 +762,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_kalecgos_kjAI>(creature);
return GetSunwellPlateauAI<npc_kalecgos_kjAI>(creature);
}
struct npc_kalecgos_kjAI : public NullCreatureAI

View File

@@ -138,7 +138,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_muruAI>(creature);
return GetSunwellPlateauAI<boss_muruAI>(creature);
}
};
@@ -248,7 +248,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_entropiusAI>(creature);
return GetSunwellPlateauAI<boss_entropiusAI>(creature);
}
};
@@ -259,7 +259,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_singularityAI>(creature);
return GetSunwellPlateauAI<npc_singularityAI>(creature);
}
struct npc_singularityAI : public NullCreatureAI

View File

@@ -11,6 +11,8 @@
#include "SpellAuraEffects.h"
#include "SpellScript.h"
#define SWPScriptName "instance_sunwell_plateau"
enum DataTypes
{
DATA_KALECGOS = 0,
@@ -86,4 +88,10 @@ enum SpellIds
SPELL_SUNWELL_RADIANCE = 45769,
};
template <class AI, class T>
inline AI* GetSunwellPlateauAI(T* obj)
{
return GetInstanceAI<AI>(obj, SWPScriptName);
}
#endif // SUNWELL_PLATEAU_H