josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/AI: Removed Scripted_NoMovementAI which has become obsolete. Use ScriptedAI::SetCombatMovement(false); to get the same functionality.

Browse Source
This commit is contained in:
m7nu3l
2013-02-04 19:18:48 -03:00
parent 1e8bf1aad1
commit f9654d52e0
36 changed files with 203 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
+1 -10
View File
@@ -104,7 +104,7 @@ void ScriptedAI::AttackStartNoMove(Unit* who)
if (!who)
return;
if (me->Attack(who, false))
if (me->Attack(who, true))
DoStartNoMovement(who);
}
@@ -447,15 +447,6 @@ bool ScriptedAI::EnterEvadeIfOutOfCombatArea(uint32 const diff)
return true;
}
void Scripted_NoMovementAI::AttackStart(Unit* target)
{
if (!target)
return;
if (me->Attack(target, true))
DoStartNoMovement(target);
}
// BossAI - for instanced bosses
BossAI::BossAI(Creature* creature, uint32 bossId) : ScriptedAI(creature),
instance(creature->GetInstanceScript()),
src/server/game/AI/ScriptedAI/ScriptedCreature.h
-9
View File
@@ -276,15 +276,6 @@ struct ScriptedAI : public CreatureAI
bool _isHeroic;
};
struct Scripted_NoMovementAI : public ScriptedAI
{
Scripted_NoMovementAI(Creature* creature) : ScriptedAI(creature) {}
virtual ~Scripted_NoMovementAI() {}
//Called at each attack of me by any victim
void AttackStart(Unit* target);
};
class BossAI : public ScriptedAI
{
public:
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+5 -5
View File
@@ -345,10 +345,12 @@ public:
return new boss_alythessAI (creature);
};
struct boss_alythessAI : public Scripted_NoMovementAI
struct boss_alythessAI : public ScriptedAI
{
boss_alythessAI(Creature* creature) : Scripted_NoMovementAI(creature)
boss_alythessAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
instance = creature->GetInstanceScript();
IntroStepCounter = 10;
}
@@ -418,9 +420,7 @@ public:
void AttackStart(Unit* who)
{
if (!me->isInCombat())
{
Scripted_NoMovementAI::AttackStart(who);
}
ScriptedAI::AttackStart(who);
}
void MoveInLineOfSight(Unit* who)
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+21 -10
View File
@@ -392,11 +392,13 @@ public:
return new mob_kiljaeden_controllerAI (creature);
}
struct mob_kiljaeden_controllerAI : public Scripted_NoMovementAI
struct mob_kiljaeden_controllerAI : public ScriptedAI
{
mob_kiljaeden_controllerAI(Creature* creature) : Scripted_NoMovementAI(creature), summons(me)
mob_kiljaeden_controllerAI(Creature* creature) : ScriptedAI(creature), summons(me)
{
instance = creature->GetInstanceScript();
SetCombatMovement(false);
}
InstanceScript* instance;
@@ -492,11 +494,13 @@ public:
return new boss_kiljaedenAI (creature);
}
struct boss_kiljaedenAI : public Scripted_NoMovementAI
struct boss_kiljaedenAI : public ScriptedAI
{
boss_kiljaedenAI(Creature* creature) : Scripted_NoMovementAI(creature), summons(me)
boss_kiljaedenAI(Creature* creature) : ScriptedAI(creature), summons(me)
{
instance = creature->GetInstanceScript();
SetCombatMovement(false);
}
InstanceScript* instance;
@@ -520,7 +524,7 @@ public:
void InitializeAI()
{
Scripted_NoMovementAI::InitializeAI();
// Scripted_NoMovementAI::InitializeAI();
}
void Reset()
@@ -615,7 +619,8 @@ public:
void EnterEvadeMode()
{
Scripted_NoMovementAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode();
summons.DespawnAll();
// Reset the controller
@@ -999,9 +1004,12 @@ public:
return new mob_felfire_portalAI (creature);
}
struct mob_felfire_portalAI : public Scripted_NoMovementAI
struct mob_felfire_portalAI : public ScriptedAI
{
mob_felfire_portalAI(Creature* creature) : Scripted_NoMovementAI(creature) {}
mob_felfire_portalAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
}
uint32 uiSpawnFiendTimer;
@@ -1100,9 +1108,12 @@ public:
return new mob_armageddonAI (creature);
}
struct mob_armageddonAI : public Scripted_NoMovementAI
struct mob_armageddonAI : public ScriptedAI
{
mob_armageddonAI(Creature* creature) : Scripted_NoMovementAI(creature) {}
mob_armageddonAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
}
uint8 spell;
uint32 uiTimer;
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+6 -4
View File
@@ -213,10 +213,11 @@ public:
return new boss_muruAI (creature);
}
struct boss_muruAI : public Scripted_NoMovementAI
struct boss_muruAI : public ScriptedAI
{
boss_muruAI(Creature* creature) : Scripted_NoMovementAI(creature), Summons(me)
boss_muruAI(Creature* creature) : ScriptedAI(creature), Summons(creature)
{
SetCombatMovement(false);
instance = creature->GetInstanceScript();
}
@@ -377,10 +378,11 @@ public:
return new npc_muru_portalAI (creature);
}
struct npc_muru_portalAI : public Scripted_NoMovementAI
struct npc_muru_portalAI : public ScriptedAI
{
npc_muru_portalAI(Creature* creature) : Scripted_NoMovementAI(creature), Summons(me)
npc_muru_portalAI(Creature* creature) : ScriptedAI(creature), Summons(creature)
{
SetCombatMovement(false);
instance = creature->GetInstanceScript();
}
src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp
+5 -2
View File
@@ -551,9 +551,12 @@ public:
return new npc_infused_crystalAI (creature);
}
struct npc_infused_crystalAI : public Scripted_NoMovementAI
struct npc_infused_crystalAI : public ScriptedAI
{
npc_infused_crystalAI(Creature* creature) : Scripted_NoMovementAI(creature) {}
npc_infused_crystalAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
}
uint32 EndTimer;
uint32 WaveTimer;
src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
+5 -2
View File
@@ -254,9 +254,12 @@ public:
return new npc_andorhal_towerAI (creature);
}
struct npc_andorhal_towerAI : public Scripted_NoMovementAI
struct npc_andorhal_towerAI : public ScriptedAI
{
npc_andorhal_towerAI(Creature* creature) : Scripted_NoMovementAI(creature) {}
npc_andorhal_towerAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
}
void MoveInLineOfSight(Unit* who)
{
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+3 -3
View File
@@ -1408,11 +1408,11 @@ public:
return new alliance_riflemanAI(creature);
}
struct alliance_riflemanAI : public Scripted_NoMovementAI
struct alliance_riflemanAI : public ScriptedAI
{
alliance_riflemanAI(Creature* creature) : Scripted_NoMovementAI(creature)
alliance_riflemanAI(Creature* creature) : ScriptedAI(creature)
{
Reset();
SetCombatMovement(false);
}
uint32 ExplodeTimer;
src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+3 -2
View File
@@ -197,11 +197,12 @@ class npc_buru_egg : public CreatureScript
public:
npc_buru_egg() : CreatureScript("npc_buru_egg") { }
struct npc_buru_eggAI : public Scripted_NoMovementAI
struct npc_buru_eggAI : public ScriptedAI
{
npc_buru_eggAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_buru_eggAI(Creature* creature) : ScriptedAI(creature)
{
_instance = me->GetInstanceScript();
SetCombatMovement(false);
}
void EnterCombat(Unit* attacker)
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+18 -14
View File
@@ -156,13 +156,15 @@ public:
return new eye_of_cthunAI (creature);
}
struct eye_of_cthunAI : public Scripted_NoMovementAI
struct eye_of_cthunAI : public ScriptedAI
{
eye_of_cthunAI(Creature* creature) : Scripted_NoMovementAI(creature)
eye_of_cthunAI(Creature* creature) : ScriptedAI(creature)
{
instance = creature->GetInstanceScript();
if (!instance)
sLog->outError(LOG_FILTER_TSCR, "No Instance eye_of_cthunAI");
SetCombatMovement(false);
}
InstanceScript* instance;
@@ -460,9 +462,9 @@ public:
return new cthunAI (creature);
}
struct cthunAI : public Scripted_NoMovementAI
struct cthunAI : public ScriptedAI
{
cthunAI(Creature* creature) : Scripted_NoMovementAI(creature)
cthunAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
@@ -916,15 +918,17 @@ public:
return new eye_tentacleAI (creature);
}
struct eye_tentacleAI : public Scripted_NoMovementAI
struct eye_tentacleAI : public ScriptedAI
{
eye_tentacleAI(Creature* creature) : Scripted_NoMovementAI(creature)
eye_tentacleAI(Creature* creature) : ScriptedAI(creature)
{
if (Creature* pPortal = me->SummonCreature(MOB_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN))
{
pPortal->SetReactState(REACT_PASSIVE);
Portal = pPortal->GetGUID();
}
SetCombatMovement(false);
}
uint32 MindflayTimer;
@@ -989,9 +993,9 @@ public:
return new claw_tentacleAI (creature);
}
struct claw_tentacleAI : public Scripted_NoMovementAI
struct claw_tentacleAI : public ScriptedAI
{
claw_tentacleAI(Creature* creature) : Scripted_NoMovementAI(creature)
claw_tentacleAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
@@ -1099,9 +1103,9 @@ public:
return new giant_claw_tentacleAI (creature);
}
struct giant_claw_tentacleAI : public Scripted_NoMovementAI
struct giant_claw_tentacleAI : public ScriptedAI
{
giant_claw_tentacleAI(Creature* creature) : Scripted_NoMovementAI(creature)
giant_claw_tentacleAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
@@ -1218,9 +1222,9 @@ public:
return new giant_eye_tentacleAI (creature);
}
struct giant_eye_tentacleAI : public Scripted_NoMovementAI
struct giant_eye_tentacleAI : public ScriptedAI
{
giant_eye_tentacleAI(Creature* creature) : Scripted_NoMovementAI(creature)
giant_eye_tentacleAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
@@ -1282,9 +1286,9 @@ public:
return new flesh_tentacleAI (creature);
}
struct flesh_tentacleAI : public Scripted_NoMovementAI
struct flesh_tentacleAI : public ScriptedAI
{
flesh_tentacleAI(Creature* creature) : Scripted_NoMovementAI(creature)
flesh_tentacleAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
}
src/server/scripts/Kalimdor/zone_durotar.cpp
+3 -2
View File
@@ -175,10 +175,11 @@ class npc_tiger_matriarch_credit : public CreatureScript
public:
npc_tiger_matriarch_credit() : CreatureScript("npc_tiger_matriarch_credit") { }
struct npc_tiger_matriarch_creditAI : public Scripted_NoMovementAI
struct npc_tiger_matriarch_creditAI : public ScriptedAI
{
npc_tiger_matriarch_creditAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_tiger_matriarch_creditAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
events.ScheduleEvent(EVENT_CHECK_SUMMON_AURA, 2000);
}
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
+2 -2
View File
@@ -182,9 +182,9 @@ class mob_amanitar_mushrooms : public CreatureScript
public:
mob_amanitar_mushrooms() : CreatureScript("mob_amanitar_mushrooms") { }
struct mob_amanitar_mushroomsAI : public Scripted_NoMovementAI
struct mob_amanitar_mushroomsAI : public ScriptedAI
{
mob_amanitar_mushroomsAI(Creature* creature) : Scripted_NoMovementAI(creature) {}
mob_amanitar_mushroomsAI(Creature* creature) : ScriptedAI(creature) {}
EventMap events;
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
+2 -2
View File
@@ -254,9 +254,9 @@ class mob_nadox_eggs : public CreatureScript
public:
mob_nadox_eggs() : CreatureScript("mob_nadox_eggs") { }
struct mob_nadox_eggsAI : public Scripted_NoMovementAI
struct mob_nadox_eggsAI : public ScriptedAI
{
mob_nadox_eggsAI(Creature* creature) : Scripted_NoMovementAI(creature)
mob_nadox_eggsAI(Creature* creature) : ScriptedAI(creature)
{
creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
creature->UpdateAllStats();
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp
+4 -2
View File
@@ -523,15 +523,17 @@ class npc_jedogas_aufseher_trigger : public CreatureScript
public:
npc_jedogas_aufseher_trigger() : CreatureScript("npc_jedogas_aufseher_trigger") { }
struct npc_jedogas_aufseher_triggerAI : public Scripted_NoMovementAI
struct npc_jedogas_aufseher_triggerAI : public ScriptedAI
{
npc_jedogas_aufseher_triggerAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_jedogas_aufseher_triggerAI(Creature* creature) : ScriptedAI(creature)
{
instance = creature->GetInstanceScript();
bRemoved = false;
bRemoved2 = false;
bCasted = false;
bCasted2 = false;
SetCombatMovement(false);
}
InstanceScript* instance;
src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
+6 -5
View File
@@ -1480,10 +1480,11 @@ public:
return new mob_twilight_eggsAI(creature);
}
struct mob_twilight_eggsAI : public Scripted_NoMovementAI
struct mob_twilight_eggsAI : public ScriptedAI
{
mob_twilight_eggsAI(Creature* creature) : Scripted_NoMovementAI(creature)
mob_twilight_eggsAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
instance = creature->GetInstanceScript();
}
@@ -1602,11 +1603,11 @@ public:
return new npc_twilight_fissureAI(creature);
}
struct npc_twilight_fissureAI : public Scripted_NoMovementAI
struct npc_twilight_fissureAI : public ScriptedAI
{
npc_twilight_fissureAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_twilight_fissureAI(Creature* creature) : ScriptedAI(creature)
{
Reset();
SetCombatMovement(false);
}
uint32 VoidBlast_Timer;
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+13 -7
View File
@@ -973,11 +973,13 @@ class npc_meteor_strike_initial : public CreatureScript
public:
npc_meteor_strike_initial() : CreatureScript("npc_meteor_strike_initial") { }
struct npc_meteor_strike_initialAI : public Scripted_NoMovementAI
struct npc_meteor_strike_initialAI : public ScriptedAI
{
npc_meteor_strike_initialAI(Creature* creature) : Scripted_NoMovementAI(creature),
npc_meteor_strike_initialAI(Creature* creature) : ScriptedAI(creature),
_instance(creature->GetInstanceScript())
{ }
{
SetCombatMovement(false);
}
void DoAction(int32 const action)
{
@@ -1045,13 +1047,15 @@ class npc_meteor_strike : public CreatureScript
public:
npc_meteor_strike() : CreatureScript("npc_meteor_strike") { }
struct npc_meteor_strikeAI : public Scripted_NoMovementAI
struct npc_meteor_strikeAI : public ScriptedAI
{
npc_meteor_strikeAI(Creature* creature) : Scripted_NoMovementAI(creature),
npc_meteor_strikeAI(Creature* creature) : ScriptedAI(creature),
_instance(creature->GetInstanceScript())
{
_range = 5.0f;
_spawnCount = 0;
SetCombatMovement(false);
}
void DoAction(int32 const action)
@@ -1114,11 +1118,13 @@ class npc_combustion_consumption : public CreatureScript
public:
npc_combustion_consumption() : CreatureScript("npc_combustion_consumption") { }
struct npc_combustion_consumptionAI : public Scripted_NoMovementAI
struct npc_combustion_consumptionAI : public ScriptedAI
{
npc_combustion_consumptionAI(Creature* creature) : Scripted_NoMovementAI(creature),
npc_combustion_consumptionAI(Creature* creature) : ScriptedAI(creature),
_instance(creature->GetInstanceScript()), _summonerGuid(0)
{
SetCombatMovement(false);
switch (me->GetEntry())
{
case NPC_COMBUSTION:
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+6 -4
View File
@@ -223,10 +223,11 @@ class mob_legion_flame : public CreatureScript
public:
mob_legion_flame() : CreatureScript("mob_legion_flame") { }
struct mob_legion_flameAI : public Scripted_NoMovementAI
struct mob_legion_flameAI : public ScriptedAI
{
mob_legion_flameAI(Creature* creature) : Scripted_NoMovementAI(creature)
mob_legion_flameAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
_instance = creature->GetInstanceScript();
}
@@ -258,10 +259,11 @@ class mob_infernal_volcano : public CreatureScript
public:
mob_infernal_volcano() : CreatureScript("mob_infernal_volcano") { }
struct mob_infernal_volcanoAI : public Scripted_NoMovementAI
struct mob_infernal_volcanoAI : public ScriptedAI
{
mob_infernal_volcanoAI(Creature* creature) : Scripted_NoMovementAI(creature), _summons(me)
mob_infernal_volcanoAI(Creature* creature) : ScriptedAI(creature), _summons(me)
{
SetCombatMovement(false);
}
void Reset()
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+3 -3
View File
@@ -654,11 +654,11 @@ class mob_bullet_controller : public CreatureScript
public:
mob_bullet_controller() : CreatureScript("mob_bullet_controller") { }
struct mob_bullet_controllerAI : public Scripted_NoMovementAI
struct mob_bullet_controllerAI : public ScriptedAI
{
mob_bullet_controllerAI(Creature* creature) : Scripted_NoMovementAI(creature)
mob_bullet_controllerAI(Creature* creature) : ScriptedAI(creature)
{
Reset();
SetCombatMovement(false);
}
void Reset()
src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+4 -2
View File
@@ -424,11 +424,13 @@ class npc_bone_spike : public CreatureScript
public:
npc_bone_spike() : CreatureScript("npc_bone_spike") { }
struct npc_bone_spikeAI : public Scripted_NoMovementAI
struct npc_bone_spikeAI : public ScriptedAI
{
npc_bone_spikeAI(Creature* creature) : Scripted_NoMovementAI(creature), _hasTrappedUnit(false)
npc_bone_spikeAI(Creature* creature) : ScriptedAI(creature), _hasTrappedUnit(false)
{
ASSERT(creature->GetVehicleKit());
SetCombatMovement(false);
}
void JustDied(Unit* /*killer*/)
src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+3 -2
View File
@@ -576,11 +576,12 @@ class npc_ice_tomb : public CreatureScript
public:
npc_ice_tomb() : CreatureScript("npc_ice_tomb") { }
struct npc_ice_tombAI : public Scripted_NoMovementAI
struct npc_ice_tombAI : public ScriptedAI
{
npc_ice_tombAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_ice_tombAI(Creature* creature) : ScriptedAI(creature)
{
_trappedPlayerGUID = 0;
SetCombatMovement(false);
}
void Reset()
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+3 -2
View File
@@ -664,10 +664,11 @@ class npc_frost_freeze_trap : public CreatureScript
public:
npc_frost_freeze_trap() : CreatureScript("npc_frost_freeze_trap") { }
struct npc_frost_freeze_trapAI: public Scripted_NoMovementAI
struct npc_frost_freeze_trapAI: public ScriptedAI
{
npc_frost_freeze_trapAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_frost_freeze_trapAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
}
void DoAction(int32 const action)
src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
+3 -3
View File
@@ -125,11 +125,11 @@ public:
return new npc_grobbulus_poison_cloudAI(creature);
}
struct npc_grobbulus_poison_cloudAI : public Scripted_NoMovementAI
struct npc_grobbulus_poison_cloudAI : public ScriptedAI
{
npc_grobbulus_poison_cloudAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_grobbulus_poison_cloudAI(Creature* creature) : ScriptedAI(creature)
{
Reset();
SetCombatMovement(false);
}
uint32 Cloud_Timer;
src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
+3 -2
View File
@@ -191,11 +191,12 @@ class mob_chaotic_rift : public CreatureScript
public:
mob_chaotic_rift() : CreatureScript("mob_chaotic_rift") { }
struct mob_chaotic_riftAI : public Scripted_NoMovementAI
struct mob_chaotic_riftAI : public ScriptedAI
{
mob_chaotic_riftAI(Creature* creature) : Scripted_NoMovementAI(creature)
mob_chaotic_riftAI(Creature* creature) : ScriptedAI(creature)
{
instance = me->GetInstanceScript();
SetCombatMovement(false);
}
InstanceScript* instance;
src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
+22 -12
View File
@@ -216,10 +216,12 @@ class npc_iron_roots : public CreatureScript
public:
npc_iron_roots() : CreatureScript("npc_iron_roots") { }
struct npc_iron_rootsAI : public Scripted_NoMovementAI
struct npc_iron_rootsAI : public ScriptedAI
{
npc_iron_rootsAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_iron_rootsAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true);
me->ApplySpellImmune(0, IMMUNITY_ID, 49560, true); // Death Grip
me->setFaction(14);
@@ -1337,10 +1339,11 @@ class npc_sun_beam : public CreatureScript
public:
npc_sun_beam() : CreatureScript("npc_sun_beam") { }
struct npc_sun_beamAI : public Scripted_NoMovementAI
struct npc_sun_beamAI : public ScriptedAI
{
npc_sun_beamAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_sun_beamAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
me->SetReactState(REACT_PASSIVE);
DoCastAOE(SPELL_FREYA_UNSTABLE_ENERGY_VISUAL, true);
DoCast(SPELL_FREYA_UNSTABLE_ENERGY);
@@ -1358,10 +1361,11 @@ class npc_healthy_spore : public CreatureScript
public:
npc_healthy_spore() : CreatureScript("npc_healthy_spore") { }
struct npc_healthy_sporeAI : public Scripted_NoMovementAI
struct npc_healthy_sporeAI : public ScriptedAI
{
npc_healthy_sporeAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_healthy_sporeAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_IMMUNE_TO_PC);
me->SetReactState(REACT_PASSIVE);
DoCast(me, SPELL_HEALTHY_SPORE_VISUAL);
@@ -1397,10 +1401,12 @@ class npc_eonars_gift : public CreatureScript
public:
npc_eonars_gift() : CreatureScript("npc_eonars_gift") { }
struct npc_eonars_giftAI : public Scripted_NoMovementAI
struct npc_eonars_giftAI : public ScriptedAI
{
npc_eonars_giftAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_eonars_giftAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
lifeBindersGiftTimer = 12000;
DoCast(me, SPELL_GROW);
DoCast(me, SPELL_PHEROMONES, true);
@@ -1435,10 +1441,12 @@ class npc_nature_bomb : public CreatureScript
public:
npc_nature_bomb() : CreatureScript("npc_nature_bomb") { }
struct npc_nature_bombAI : public Scripted_NoMovementAI
struct npc_nature_bombAI : public ScriptedAI
{
npc_nature_bombAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_nature_bombAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
bombTimer = urand(8000, 10000);
DoCast(SPELL_OBJECT_BOMB);
}
@@ -1475,10 +1483,12 @@ class npc_unstable_sun_beam : public CreatureScript
public:
npc_unstable_sun_beam() : CreatureScript("npc_unstable_sun_beam") { }
struct npc_unstable_sun_beamAI : public Scripted_NoMovementAI
struct npc_unstable_sun_beamAI : public ScriptedAI
{
npc_unstable_sun_beamAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_unstable_sun_beamAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
despawnTimer = urand(7000, 12000);
instance = me->GetInstanceScript();
DoCast(me, SPELL_PHOTOSYNTHESIS);
src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+6 -4
View File
@@ -739,10 +739,11 @@ class npc_mole_machine_trigger : public CreatureScript
public:
npc_mole_machine_trigger() : CreatureScript("npc_mole_machine_trigger") { }
struct npc_mole_machine_triggerAI : public Scripted_NoMovementAI
struct npc_mole_machine_triggerAI : public ScriptedAI
{
npc_mole_machine_triggerAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_mole_machine_triggerAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_PACIFIED);
}
@@ -818,10 +819,11 @@ class npc_devouring_flame : public CreatureScript
public:
npc_devouring_flame() : CreatureScript("npc_devouring_flame") { }
struct npc_devouring_flameAI : public Scripted_NoMovementAI
struct npc_devouring_flameAI : public ScriptedAI
{
npc_devouring_flameAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_devouring_flameAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_PACIFIED);
}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
+3 -2
View File
@@ -451,11 +451,12 @@ class mob_xt002_heart : public CreatureScript
public:
mob_xt002_heart() : CreatureScript("mob_xt002_heart") { }
struct mob_xt002_heartAI : public Scripted_NoMovementAI
struct mob_xt002_heartAI : public ScriptedAI
{
mob_xt002_heartAI(Creature* creature) : Scripted_NoMovementAI(creature),
mob_xt002_heartAI(Creature* creature) : ScriptedAI(creature),
_instance(creature->GetInstanceScript())
{
SetCombatMovement(false);
}
void UpdateAI(uint32 const /*diff*/) { }
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+4 -2
View File
@@ -459,11 +459,13 @@ public:
return new npc_ritual_channelerAI(creature);
}
struct npc_ritual_channelerAI : public Scripted_NoMovementAI
struct npc_ritual_channelerAI : public ScriptedAI
{
npc_ritual_channelerAI(Creature* creature) :Scripted_NoMovementAI(creature)
npc_ritual_channelerAI(Creature* creature) :ScriptedAI(creature)
{
instance = creature->GetInstanceScript();
SetCombatMovement(false);
}
InstanceScript* instance;
src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
+4 -2
View File
@@ -234,9 +234,9 @@ class mob_frozen_orb_stalker : public CreatureScript
public:
mob_frozen_orb_stalker() : CreatureScript("mob_frozen_orb_stalker") { }
struct mob_frozen_orb_stalkerAI : public Scripted_NoMovementAI
struct mob_frozen_orb_stalkerAI : public ScriptedAI
{
mob_frozen_orb_stalkerAI(Creature* creature) : Scripted_NoMovementAI(creature)
mob_frozen_orb_stalkerAI(Creature* creature) : ScriptedAI(creature)
{
creature->SetVisible(false);
creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_DISABLE_MOVE);
@@ -244,6 +244,8 @@ class mob_frozen_orb_stalker : public CreatureScript
instance = creature->GetInstanceScript();
spawned = false;
SetCombatMovement(false);
}
void UpdateAI(const uint32 /*diff*/)
src/server/scripts/Northrend/zone_borean_tundra.cpp
+2 -2
View File
@@ -2207,9 +2207,9 @@ class npc_warmage_coldarra : public CreatureScript
public:
npc_warmage_coldarra() : CreatureScript("npc_warmage_coldarra") { }
struct npc_warmage_coldarraAI : public Scripted_NoMovementAI
struct npc_warmage_coldarraAI : public ScriptedAI
{
npc_warmage_coldarraAI(Creature* creature) : Scripted_NoMovementAI(creature){}
npc_warmage_coldarraAI(Creature* creature) : ScriptedAI(creature) {}
uint32 m_uiTimer; //Timer until recast
src/server/scripts/Northrend/zone_crystalsong_forest.cpp
+5 -2
View File
@@ -49,9 +49,12 @@ class npc_warmage_violetstand : public CreatureScript
public:
npc_warmage_violetstand() : CreatureScript("npc_warmage_violetstand") { }
struct npc_warmage_violetstandAI : public Scripted_NoMovementAI
struct npc_warmage_violetstandAI : public ScriptedAI
{
npc_warmage_violetstandAI(Creature* creature) : Scripted_NoMovementAI(creature){}
npc_warmage_violetstandAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
}
uint64 uiTargetGUID;
src/server/scripts/Northrend/zone_dalaran.cpp
+2 -2
View File
@@ -55,9 +55,9 @@ class npc_mageguard_dalaran : public CreatureScript
public:
npc_mageguard_dalaran() : CreatureScript("npc_mageguard_dalaran") { }
struct npc_mageguard_dalaranAI : public Scripted_NoMovementAI
struct npc_mageguard_dalaranAI : public ScriptedAI
{
npc_mageguard_dalaranAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_mageguard_dalaranAI(Creature* creature) : ScriptedAI(creature)
{
creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_NORMAL, true);
src/server/scripts/Northrend/zone_icecrown.cpp
+14 -6
View File
@@ -264,9 +264,12 @@ class npc_guardian_pavilion : public CreatureScript
public:
npc_guardian_pavilion() : CreatureScript("npc_guardian_pavilion") { }
struct npc_guardian_pavilionAI : public Scripted_NoMovementAI
struct npc_guardian_pavilionAI : public ScriptedAI
{
npc_guardian_pavilionAI(Creature* creature) : Scripted_NoMovementAI(creature) {}
npc_guardian_pavilionAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
}
void MoveInLineOfSight(Unit* who)
{
@@ -370,9 +373,12 @@ class npc_tournament_training_dummy : public CreatureScript
public:
npc_tournament_training_dummy(): CreatureScript("npc_tournament_training_dummy"){}
struct npc_tournament_training_dummyAI : Scripted_NoMovementAI
struct npc_tournament_training_dummyAI : ScriptedAI
{
npc_tournament_training_dummyAI(Creature* creature) : Scripted_NoMovementAI(creature) {}
npc_tournament_training_dummyAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
}
EventMap events;
bool isVulnerable;
@@ -584,13 +590,15 @@ class npc_blessed_banner : public CreatureScript
public:
npc_blessed_banner() : CreatureScript("npc_blessed_banner") { }
struct npc_blessed_bannerAI : public Scripted_NoMovementAI
struct npc_blessed_bannerAI : public ScriptedAI
{
npc_blessed_bannerAI(Creature* creature) : Scripted_NoMovementAI(creature), Summons(me)
npc_blessed_bannerAI(Creature* creature) : ScriptedAI(creature), Summons(me)
{
HalofSpawned = false;
PhaseCount = 0;
Summons.DespawnAll();
SetCombatMovement(false);
}
EventMap events;
src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+5 -2
View File
@@ -272,9 +272,12 @@ public:
return new npc_volcanoAI (creature);
}
struct npc_volcanoAI : public Scripted_NoMovementAI
struct npc_volcanoAI : public ScriptedAI
{
npc_volcanoAI(Creature* creature) : Scripted_NoMovementAI(creature) {}
npc_volcanoAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
}
void Reset()
{
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+6 -5
View File
@@ -78,10 +78,11 @@ public:
return new boss_the_lurker_belowAI (creature);
}
struct boss_the_lurker_belowAI : public Scripted_NoMovementAI
struct boss_the_lurker_belowAI : public ScriptedAI
{
boss_the_lurker_belowAI(Creature* creature) : Scripted_NoMovementAI(creature), Summons(me)
boss_the_lurker_belowAI(Creature* creature) : ScriptedAI(creature), Summons(me)
{
SetCombatMovement(false);
instance = creature->GetInstanceScript();
}
@@ -156,7 +157,6 @@ public:
{
if (instance)
instance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS);
Scripted_NoMovementAI::EnterCombat(who);
}
void MoveInLineOfSight(Unit* who)
@@ -368,10 +368,11 @@ public:
return new mob_coilfang_ambusherAI (creature);
}
struct mob_coilfang_ambusherAI : public Scripted_NoMovementAI
struct mob_coilfang_ambusherAI : public ScriptedAI
{
mob_coilfang_ambusherAI(Creature* creature) : Scripted_NoMovementAI(creature)
mob_coilfang_ambusherAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
}
uint32 MultiShotTimer;
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+5 -2
View File
@@ -1404,9 +1404,12 @@ class mob_kael_flamestrike : public CreatureScript
: CreatureScript("mob_kael_flamestrike")
{
}
struct mob_kael_flamestrikeAI : public Scripted_NoMovementAI
struct mob_kael_flamestrikeAI : public ScriptedAI
{
mob_kael_flamestrikeAI(Creature* creature) : Scripted_NoMovementAI(creature) {}
mob_kael_flamestrikeAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
}
uint32 Timer;
bool Casting;
src/server/scripts/World/npcs_special.cpp
+3 -8
View File
@@ -1981,10 +1981,11 @@ class npc_training_dummy : public CreatureScript
public:
npc_training_dummy() : CreatureScript("npc_training_dummy") { }
struct npc_training_dummyAI : Scripted_NoMovementAI
struct npc_training_dummyAI : ScriptedAI
{
npc_training_dummyAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_training_dummyAI(Creature* creature) : ScriptedAI(creature)
{
SetCombatMovement(false);
entry = creature->GetEntry();
}
@@ -2015,12 +2016,6 @@ public:
damage = 0;
}
void EnterCombat(Unit* /*who*/)
{
if (entry != NPC_ADVANCED_TARGET_DUMMY && entry != NPC_TARGET_DUMMY)
return;
}
void UpdateAI(uint32 const diff)
{
if (!UpdateVictim())