diff options
| author | psi29a <psi29a@gmail.com> | 2022-01-04 08:49:10 +0000 |
|---|---|---|
| committer | psi29a <psi29a@gmail.com> | 2022-01-04 08:49:10 +0000 |
| commit | 0dc4a668c353cb7001009ad5777522cc7eb7fcda (patch) | |
| tree | ea3b2e8e3977d18ce8c603990f8d861392c02186 | |
| parent | 74e1e1eefd5f92c23bb672492f801b3e0786b883 (diff) | |
| parent | 97ab7cf457bf7cf5054d468eed54ce883f01ef0b (diff) | |
Merge branch 'moralizing' into 'master'
Fix demoralize and rally being swapped
Closes #6532
See merge request OpenMW/openmw!1524
| -rw-r--r-- | apps/openmw/mwmechanics/spelleffects.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp index aef6b26f19..558a7ebea8 100644 --- a/apps/openmw/mwmechanics/spelleffects.cpp +++ b/apps/openmw/mwmechanics/spelleffects.cpp @@ -46,7 +46,7 @@ namespace { auto& creatureStats = target.getClass().getCreatureStats(target); 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); } } @@ -491,11 +491,11 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co break; case ESM::MagicEffect::FrenzyCreature: 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; case ESM::MagicEffect::CalmCreature: 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) { auto& creatureStats = target.getClass().getCreatureStats(target); @@ -998,11 +998,11 @@ void removeMagicEffect(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellPara break; case ESM::MagicEffect::FrenzyCreature: 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; case ESM::MagicEffect::CalmCreature: 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; case ESM::MagicEffect::DemoralizeCreature: case ESM::MagicEffect::DemoralizeHumanoid: |