teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

AI combat actions: rename 'target' to 'enemy'

Browse source
This commit is contained in:
scrawl 2016-02-07 01:24:49 +01:00
parent 94c05c6baa
commit 162287b82d
2 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
apps/openmw/mwmechanics/aicombataction.cpp
View file

@ -97,7 +97,7 @@ namespace MWMechanics
return rateEffects(potion->mEffects, actor, MWWorld::Ptr()); return rateEffects(potion->mEffects, actor, MWWorld::Ptr());
} }
float rateWeapon (const MWWorld::Ptr &item, const MWWorld::Ptr& actor, const MWWorld::Ptr& target, int type, float rateWeapon (const MWWorld::Ptr &item, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy, int type,
float arrowRating, float boltRating) float arrowRating, float boltRating)
{ {
if (item.getTypeName() != typeid(ESM::Weapon).name()) if (item.getTypeName() != typeid(ESM::Weapon).name())
@ -153,7 +153,7 @@ namespace MWMechanics
if (enchantment->mData.mType == ESM::Enchantment::WhenStrikes if (enchantment->mData.mType == ESM::Enchantment::WhenStrikes
&& (item.getCellRef().getEnchantmentCharge() == -1 && (item.getCellRef().getEnchantmentCharge() == -1
|| item.getCellRef().getEnchantmentCharge() >= enchantment->mData.mCost)) || item.getCellRef().getEnchantmentCharge() >= enchantment->mData.mCost))
rating += rateEffects(enchantment->mEffects, actor, target); rating += rateEffects(enchantment->mEffects, actor, enemy);
} }
int skill = item.getClass().getEquipmentSkill(item); int skill = item.getClass().getEquipmentSkill(item);
@ -163,7 +163,7 @@ namespace MWMechanics
return rating; return rating;
} }
float rateSpell(const ESM::Spell *spell, const MWWorld::Ptr &actor, const MWWorld::Ptr& target) float rateSpell(const ESM::Spell *spell, const MWWorld::Ptr &actor, const MWWorld::Ptr& enemy)
{ {
const CreatureStats& stats = actor.getClass().getCreatureStats(actor); const CreatureStats& stats = actor.getClass().getCreatureStats(actor);
@ -190,13 +190,13 @@ namespace MWMechanics
int types = getRangeTypes(spell->mEffects); int types = getRangeTypes(spell->mEffects);
if ((types & Self) && stats.getActiveSpells().isSpellActive(spell->mId)) if ((types & Self) && stats.getActiveSpells().isSpellActive(spell->mId))
return 0.f; return 0.f;
if ( ((types & Touch) || (types & Target)) && target.getClass().getCreatureStats(target).getActiveSpells().isSpellActive(spell->mId)) if ( ((types & Touch) || (types & Target)) && enemy.getClass().getCreatureStats(enemy).getActiveSpells().isSpellActive(spell->mId))
return 0.f; return 0.f;
return rateEffects(spell->mEffects, actor, target) * (successChance / 100.f); return rateEffects(spell->mEffects, actor, enemy) * (successChance / 100.f);
} }
float rateMagicItem(const MWWorld::Ptr &ptr, const MWWorld::Ptr &actor, const MWWorld::Ptr& target) float rateMagicItem(const MWWorld::Ptr &ptr, const MWWorld::Ptr &actor, const MWWorld::Ptr& enemy)
{ {
if (ptr.getClass().getEnchantment(ptr).empty()) if (ptr.getClass().getEnchantment(ptr).empty())
return 0.f; return 0.f;
@ -205,7 +205,7 @@ namespace MWMechanics
if (enchantment->mData.mType == ESM::Enchantment::CastOnce) if (enchantment->mData.mType == ESM::Enchantment::CastOnce)
{ {
return rateEffects(enchantment->mEffects, actor, target); return rateEffects(enchantment->mEffects, actor, enemy);
} }
else else
{ {
@ -214,9 +214,9 @@ namespace MWMechanics
} }
} }
float rateEffect(const ESM::ENAMstruct &effect, const MWWorld::Ptr &actor, const MWWorld::Ptr &target) float rateEffect(const ESM::ENAMstruct &effect, const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy)
{ {
// NOTE: target may be empty // NOTE: enemy may be empty
float rating = 1; float rating = 1;
switch (effect.mEffectID) switch (effect.mEffectID)
@ -337,7 +337,7 @@ namespace MWMechanics
case ESM::MagicEffect::DamageAttribute: case ESM::MagicEffect::DamageAttribute:
case ESM::MagicEffect::DrainAttribute: case ESM::MagicEffect::DrainAttribute:
if (!target.isEmpty() && target.getClass().getCreatureStats(target).getAttribute(effect.mAttribute).getModified() <= 0) if (!enemy.isEmpty() && enemy.getClass().getCreatureStats(enemy).getAttribute(effect.mAttribute).getModified() <= 0)
return 0.f; return 0.f;
{ {
if (effect.mAttribute >= 0 && effect.mAttribute < ESM::Attribute::Length) if (effect.mAttribute >= 0 && effect.mAttribute < ESM::Attribute::Length)
@ -359,9 +359,9 @@ namespace MWMechanics
case ESM::MagicEffect::DamageSkill: case ESM::MagicEffect::DamageSkill:
case ESM::MagicEffect::DrainSkill: case ESM::MagicEffect::DrainSkill:
if (target.isEmpty() || !target.getClass().isNpc()) if (enemy.isEmpty() || !enemy.getClass().isNpc())
return 0.f; return 0.f;
if (target.getClass().getNpcStats(target).getSkill(effect.mSkill).getModified() <= 0) if (enemy.getClass().getNpcStats(enemy).getSkill(effect.mSkill).getModified() <= 0)
return 0.f; return 0.f;
break; break;
@ -369,9 +369,9 @@ namespace MWMechanics
break; break;
} }
// TODO: for non-cumulative effects (e.g. paralyze), check if the target is already suffering from them // TODO: for non-cumulative effects (e.g. paralyze), check if the enemy is already suffering from them
// TODO: could take into account target's resistance/weakness against the effect // TODO: could take into account enemy's resistance/weakness against the effect
const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectID); const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectID);
@ -392,13 +392,13 @@ namespace MWMechanics
return rating; return rating;
} }
float rateEffects(const ESM::EffectList &list, const MWWorld::Ptr& actor, const MWWorld::Ptr& target) float rateEffects(const ESM::EffectList &list, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
{ {
// NOTE: target may be empty // NOTE: enemy may be empty
float rating = 0.f; float rating = 0.f;
for (std::vector<ESM::ENAMstruct>::const_iterator it = list.mList.begin(); it != list.mList.end(); ++it) for (std::vector<ESM::ENAMstruct>::const_iterator it = list.mList.begin(); it != list.mList.end(); ++it)
{ {
rating += rateEffect(*it, actor, target); rating += rateEffect(*it, actor, enemy);
} }
return rating; return rating;
} }
@ -474,7 +474,7 @@ namespace MWMechanics
// Already done in AiCombat itself // Already done in AiCombat itself
} }
boost::shared_ptr<Action> prepareNextAction(const MWWorld::Ptr &actor, const MWWorld::Ptr &target) boost::shared_ptr<Action> prepareNextAction(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy)
{ {
Spells& spells = actor.getClass().getCreatureStats(actor).getSpells(); Spells& spells = actor.getClass().getCreatureStats(actor).getSpells();
@ -503,7 +503,7 @@ namespace MWMechanics
for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it) for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
{ {
float rating = rateMagicItem(*it, actor, target); float rating = rateMagicItem(*it, actor, enemy);
if (rating > bestActionRating) if (rating > bestActionRating)
{ {
bestActionRating = rating; bestActionRating = rating;
@ -515,7 +515,7 @@ namespace MWMechanics
MWWorld::Ptr bestArrow; MWWorld::Ptr bestArrow;
for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it) for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
{ {
float rating = rateWeapon(*it, actor, target, ESM::Weapon::Arrow); float rating = rateWeapon(*it, actor, enemy, ESM::Weapon::Arrow);
if (rating > bestArrowRating) if (rating > bestArrowRating)
{ {
bestArrowRating = rating; bestArrowRating = rating;
@ -527,7 +527,7 @@ namespace MWMechanics
MWWorld::Ptr bestBolt; MWWorld::Ptr bestBolt;
for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it) for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
{ {
float rating = rateWeapon(*it, actor, target, ESM::Weapon::Bolt); float rating = rateWeapon(*it, actor, enemy, ESM::Weapon::Bolt);
if (rating > bestBoltRating) if (rating > bestBoltRating)
{ {
bestBoltRating = rating; bestBoltRating = rating;
@ -542,7 +542,7 @@ namespace MWMechanics
== equipmentSlots.end()) == equipmentSlots.end())
continue; continue;
float rating = rateWeapon(*it, actor, target, -1, bestArrowRating, bestBoltRating); float rating = rateWeapon(*it, actor, enemy, -1, bestArrowRating, bestBoltRating);
if (rating > bestActionRating) if (rating > bestActionRating)
{ {
const ESM::Weapon* weapon = it->get<ESM::Weapon>()->mBase; const ESM::Weapon* weapon = it->get<ESM::Weapon>()->mBase;
@ -563,7 +563,7 @@ namespace MWMechanics
{ {
const ESM::Spell* spell = it->first; const ESM::Spell* spell = it->first;
float rating = rateSpell(spell, actor, target); float rating = rateSpell(spell, actor, enemy);
if (rating > bestActionRating) if (rating > bestActionRating)
{ {
bestActionRating = rating; bestActionRating = rating;

12
apps/openmw/mwmechanics/aicombataction.hpp
View file

@ -72,19 +72,19 @@ namespace MWMechanics
virtual void getCombatRange (float& rangeAttack, float& rangeFollow); virtual void getCombatRange (float& rangeAttack, float& rangeFollow);
}; };
float rateSpell (const ESM::Spell* spell, const MWWorld::Ptr& actor, const MWWorld::Ptr& target); float rateSpell (const ESM::Spell* spell, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
float rateMagicItem (const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor, const MWWorld::Ptr &target); float rateMagicItem (const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
float ratePotion (const MWWorld::Ptr& item, const MWWorld::Ptr &actor); float ratePotion (const MWWorld::Ptr& item, const MWWorld::Ptr &actor);
/// @param type Skip all weapons that are not of this type (i.e. return rating 0) /// @param type Skip all weapons that are not of this type (i.e. return rating 0)
float rateWeapon (const MWWorld::Ptr& item, const MWWorld::Ptr& actor, const MWWorld::Ptr& target, float rateWeapon (const MWWorld::Ptr& item, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy,
int type=-1, float arrowRating=0.f, float boltRating=0.f); int type=-1, float arrowRating=0.f, float boltRating=0.f);
/// @note target may be empty /// @note target may be empty
float rateEffect (const ESM::ENAMstruct& effect, const MWWorld::Ptr& actor, const MWWorld::Ptr& target); float rateEffect (const ESM::ENAMstruct& effect, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
/// @note target may be empty /// @note target may be empty
float rateEffects (const ESM::EffectList& list, const MWWorld::Ptr& actor, const MWWorld::Ptr& target); float rateEffects (const ESM::EffectList& list, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
boost::shared_ptr<Action> prepareNextAction (const MWWorld::Ptr& actor, const MWWorld::Ptr& target); boost::shared_ptr<Action> prepareNextAction (const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
} }
#endif #endif