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

ScriptedAI: Fix types in SelectSpell

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Spp
2010-04-19 17:04:28 +02:00
parent be01821050
commit 452cada8b6
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/ScriptedCreature.cpp
+3 -3
View File
@@ -197,7 +197,7 @@ Unit* ScriptedAI::SelectUnit(SelectAggroTarget pTarget, uint32 uiPosition)
} }
} }
SpellEntry const* ScriptedAI::SelectSpell(Unit* pTarget, int32 uiSchool, int32 uiMechanic, SelectTargetType selectTargets, uint32 uiPowerCostMin, uint32 uiPowerCostMax, float fRangeMin, float fRangeMax, SelectEffect selectEffects) SpellEntry const* ScriptedAI::SelectSpell(Unit* pTarget, uint32 uiSchool, uint32 uiMechanic, SelectTargetType selectTargets, uint32 uiPowerCostMin, uint32 uiPowerCostMax, float fRangeMin, float fRangeMax, SelectEffect selectEffects)
{ {
//No target so we can't cast //No target so we can't cast
if (!pTarget) if (!pTarget)
@@ -235,11 +235,11 @@ SpellEntry const* ScriptedAI::SelectSpell(Unit* pTarget, int32 uiSchool, int32 u
continue; continue;
//Check for school if specified //Check for school if specified
if (uiSchool >= 0 && pTempSpell->SchoolMask & uiSchool) if (uiSchool && (pTempSpell->SchoolMask & uiSchool) == 0)
continue; continue;
//Check for spell mechanic if specified //Check for spell mechanic if specified
if (uiMechanic >= 0 && pTempSpell->Mechanic != uiMechanic) if (uiMechanic && pTempSpell->Mechanic != uiMechanic)
continue; continue;
//Make sure that the spell uses the requested amount of power //Make sure that the spell uses the requested amount of power
src/game/ScriptedCreature.h
+1 -1
View File
@@ -156,7 +156,7 @@ struct ScriptedAI : public CreatureAI
bool HealthBelowPct(uint32 pct) const { return me->GetHealth() * 100 < me->GetMaxHealth() * pct; } bool HealthBelowPct(uint32 pct) const { return me->GetHealth() * 100 < me->GetMaxHealth() * pct; }
//Returns spells that meet the specified criteria from the creatures spell list //Returns spells that meet the specified criteria from the creatures spell list
SpellEntry const* SelectSpell(Unit* Target, int32 School, int32 Mechanic, SelectTargetType Targets, uint32 PowerCostMin, uint32 PowerCostMax, float RangeMin, float RangeMax, SelectEffect Effect); SpellEntry const* SelectSpell(Unit* Target, uint32 School, uint32 Mechanic, SelectTargetType Targets, uint32 PowerCostMin, uint32 PowerCostMax, float RangeMin, float RangeMax, SelectEffect Effect);
//Checks if you can cast the specified spell //Checks if you can cast the specified spell
bool CanCast(Unit* pTarget, SpellEntry const* pSpell, bool bTriggered = false); bool CanCast(Unit* pTarget, SpellEntry const* pSpell, bool bTriggered = false);
src/game/ScriptedGuardAI.cpp
+5 -5
View File
@@ -71,7 +71,7 @@ void guardAI::UpdateAI(const uint32 diff)
if (BuffTimer <= diff) if (BuffTimer <= diff)
{ {
//Find a spell that targets friendly and applies an aura (these are generally buffs) //Find a spell that targets friendly and applies an aura (these are generally buffs)
SpellEntry const *info = SelectSpell(me, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_AURA); SpellEntry const *info = SelectSpell(me, 0, 0, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_AURA);
if (info && !GlobalCooldown) if (info && !GlobalCooldown)
{ {
@@ -102,11 +102,11 @@ void guardAI::UpdateAI(const uint32 diff)
//Select a healing spell if less than 30% hp //Select a healing spell if less than 30% hp
if (me->GetHealth()*100 / me->GetMaxHealth() < 30) if (me->GetHealth()*100 / me->GetMaxHealth() < 30)
info = SelectSpell(me, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING); info = SelectSpell(me, 0, 0, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING);
//No healing spell available, select a hostile spell //No healing spell available, select a hostile spell
if (info) Healing = true; if (info) Healing = true;
else info = SelectSpell(me->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE); else info = SelectSpell(me->getVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE);
//20% chance to replace our white hit with a spell //20% chance to replace our white hit with a spell
if (info && rand() % 5 == 0 && !GlobalCooldown) if (info && rand() % 5 == 0 && !GlobalCooldown)
@@ -133,11 +133,11 @@ void guardAI::UpdateAI(const uint32 diff)
//Select a healing spell if less than 30% hp ONLY 33% of the time //Select a healing spell if less than 30% hp ONLY 33% of the time
if (me->GetHealth()*100 / me->GetMaxHealth() < 30 && rand() % 3 == 0) if (me->GetHealth()*100 / me->GetMaxHealth() < 30 && rand() % 3 == 0)
info = SelectSpell(me, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING); info = SelectSpell(me, 0, 0, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING);
//No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DISTANCE) //No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DISTANCE)
if (info) Healing = true; if (info) Healing = true;
else info = SelectSpell(me->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, NOMINAL_MELEE_RANGE, 0, SELECT_EFFECT_DONTCARE); else info = SelectSpell(me->getVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, NOMINAL_MELEE_RANGE, 0, SELECT_EFFECT_DONTCARE);
//Found a spell, check if we arn't on cooldown //Found a spell, check if we arn't on cooldown
if (info && !GlobalCooldown) if (info && !GlobalCooldown)
src/scripts/world/mob_generic_creature.cpp
+5 -5
View File
@@ -61,7 +61,7 @@ struct generic_creatureAI : public ScriptedAI
if (BuffTimer <= diff) if (BuffTimer <= diff)
{ {
//Find a spell that targets friendly and applies an aura (these are generally buffs) //Find a spell that targets friendly and applies an aura (these are generally buffs)
SpellEntry const *info = SelectSpell(me, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_AURA); SpellEntry const *info = SelectSpell(me, 0, 0, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_AURA);
if (info && !GlobalCooldown) if (info && !GlobalCooldown)
{ {
@@ -92,11 +92,11 @@ struct generic_creatureAI : public ScriptedAI
//Select a healing spell if less than 30% hp //Select a healing spell if less than 30% hp
if (me->GetHealth()*100 / me->GetMaxHealth() < 30) if (me->GetHealth()*100 / me->GetMaxHealth() < 30)
info = SelectSpell(me, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING); info = SelectSpell(me, 0, 0, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING);
//No healing spell available, select a hostile spell //No healing spell available, select a hostile spell
if (info) Healing = true; if (info) Healing = true;
else info = SelectSpell(me->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE); else info = SelectSpell(me->getVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE);
//50% chance if elite or higher, 20% chance if not, to replace our white hit with a spell //50% chance if elite or higher, 20% chance if not, to replace our white hit with a spell
if (info && (rand() % (me->GetCreatureInfo()->rank > 1 ? 2 : 5) == 0) && !GlobalCooldown) if (info && (rand() % (me->GetCreatureInfo()->rank > 1 ? 2 : 5) == 0) && !GlobalCooldown)
@@ -123,11 +123,11 @@ struct generic_creatureAI : public ScriptedAI
//Select a healing spell if less than 30% hp ONLY 33% of the time //Select a healing spell if less than 30% hp ONLY 33% of the time
if (me->GetHealth()*100 / me->GetMaxHealth() < 30 && rand() % 3 == 0) if (me->GetHealth()*100 / me->GetMaxHealth() < 30 && rand() % 3 == 0)
info = SelectSpell(me, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING); info = SelectSpell(me, 0, 0, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING);
//No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DISTANCE) //No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DISTANCE)
if (info) Healing = true; if (info) Healing = true;
else info = SelectSpell(me->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, NOMINAL_MELEE_RANGE, 0, SELECT_EFFECT_DONTCARE); else info = SelectSpell(me->getVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, NOMINAL_MELEE_RANGE, 0, SELECT_EFFECT_DONTCARE);
//Found a spell, check if we arn't on cooldown //Found a spell, check if we arn't on cooldown
if (info && !GlobalCooldown) if (info && !GlobalCooldown)