mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-03 18:15:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'moralizing' into 'master'

Browse source 
Fix demoralize and rally being swapped

Closes #6532

See merge request OpenMW/openmw!1524
This commit is contained in:
psi29a 2022-01-04 08:49:10 +00:00
commit 0dc4a668c3
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwmechanics/spelleffects.cpp
View file

@ -46,7 +46,7 @@ namespace
{ {
auto& creatureStats = target.getClass().getCreatureStats(target); auto& creatureStats = target.getClass().getCreatureStats(target);
auto stat = creatureStats.getAiSetting(setting); auto stat = creatureStats.getAiSetting(setting);
stat.setModifier(static_cast<int>(stat.getModifier() - magnitude)); stat.setModifier(static_cast<int>(stat.getModifier() + magnitude));
creatureStats.setAiSetting(setting, stat); creatureStats.setAiSetting(setting, stat);
} }
} }
@ -491,11 +491,11 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co
break; break;
case ESM::MagicEffect::FrenzyCreature: case ESM::MagicEffect::FrenzyCreature:
case ESM::MagicEffect::FrenzyHumanoid: case ESM::MagicEffect::FrenzyHumanoid:
modifyAiSetting(target, effect, ESM::MagicEffect::FrenzyCreature, CreatureStats::AI_Fight, -effect.mMagnitude, invalid); modifyAiSetting(target, effect, ESM::MagicEffect::FrenzyCreature, CreatureStats::AI_Fight, effect.mMagnitude, invalid);
break; break;
case ESM::MagicEffect::CalmCreature: case ESM::MagicEffect::CalmCreature:
case ESM::MagicEffect::CalmHumanoid: case ESM::MagicEffect::CalmHumanoid:
modifyAiSetting(target, effect, ESM::MagicEffect::CalmCreature, CreatureStats::AI_Fight, effect.mMagnitude, invalid); modifyAiSetting(target, effect, ESM::MagicEffect::CalmCreature, CreatureStats::AI_Fight, -effect.mMagnitude, invalid);
if(!invalid && effect.mMagnitude > 0) if(!invalid && effect.mMagnitude > 0)
{ {
auto& creatureStats = target.getClass().getCreatureStats(target); auto& creatureStats = target.getClass().getCreatureStats(target);
@ -998,11 +998,11 @@ void removeMagicEffect(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellPara
break; break;
case ESM::MagicEffect::FrenzyCreature: case ESM::MagicEffect::FrenzyCreature:
case ESM::MagicEffect::FrenzyHumanoid: case ESM::MagicEffect::FrenzyHumanoid:
modifyAiSetting(target, effect, ESM::MagicEffect::FrenzyCreature, CreatureStats::AI_Fight, effect.mMagnitude, invalid); modifyAiSetting(target, effect, ESM::MagicEffect::FrenzyCreature, CreatureStats::AI_Fight, -effect.mMagnitude, invalid);
break; break;
case ESM::MagicEffect::CalmCreature: case ESM::MagicEffect::CalmCreature:
case ESM::MagicEffect::CalmHumanoid: case ESM::MagicEffect::CalmHumanoid:
modifyAiSetting(target, effect, ESM::MagicEffect::CalmCreature, CreatureStats::AI_Fight, -effect.mMagnitude, invalid); modifyAiSetting(target, effect, ESM::MagicEffect::CalmCreature, CreatureStats::AI_Fight, effect.mMagnitude, invalid);
break; break;
case ESM::MagicEffect::DemoralizeCreature: case ESM::MagicEffect::DemoralizeCreature:
case ESM::MagicEffect::DemoralizeHumanoid: case ESM::MagicEffect::DemoralizeHumanoid: