1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-01 03:21:41 +00:00

Merge pull request #1111 from Assumeru/weakness_resistance

Fix Calm/Frenzy/Demoralize/Rally Creature weakness and resistance
This commit is contained in:
scrawl 2016-10-25 16:44:12 +02:00 committed by GitHub
commit 8485f6aefb

View File

@ -298,10 +298,10 @@ short MagicEffect::getResistanceEffect(short effect)
for (int i=0; i<2; ++i)
{
effects[CalmHumanoid] = ResistMagicka;
effects[FrenzyHumanoid] = ResistMagicka;
effects[DemoralizeHumanoid] = ResistMagicka;
effects[RallyHumanoid] = ResistMagicka;
effects[CalmHumanoid+i] = ResistMagicka;
effects[FrenzyHumanoid+i] = ResistMagicka;
effects[DemoralizeHumanoid+i] = ResistMagicka;
effects[RallyHumanoid+i] = ResistMagicka;
}
effects[TurnUndead] = ResistMagicka;
@ -341,10 +341,10 @@ short MagicEffect::getWeaknessEffect(short effect)
for (int i=0; i<2; ++i)
{
effects[CalmHumanoid] = WeaknessToMagicka;
effects[FrenzyHumanoid] = WeaknessToMagicka;
effects[DemoralizeHumanoid] = WeaknessToMagicka;
effects[RallyHumanoid] = WeaknessToMagicka;
effects[CalmHumanoid+i] = WeaknessToMagicka;
effects[FrenzyHumanoid+i] = WeaknessToMagicka;
effects[DemoralizeHumanoid+i] = WeaknessToMagicka;
effects[RallyHumanoid+i] = WeaknessToMagicka;
}
effects[TurnUndead] = WeaknessToMagicka;