Skip to content

Commit

Permalink
Refactor FormulaHelper to read racial resistances
Browse files Browse the repository at this point in the history
FormulaHelper previously applied racial resistances by reading the player's race directly. With this change, the saving throw calculation will be modified by the contents of the player's RaceTemplate.

Addresses the following issue:
Interkarma#2660
  • Loading branch information
numidium committed Jul 7, 2024
1 parent 04c7f4e commit a3081e1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
2 changes: 2 additions & 0 deletions Assets/Scripts/Game/Entities/RaceTemplate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,8 @@ public Breton()

PaperDollHeadsMale = "FACE00I0.CIF";
PaperDollHeadsFemale = "FACE10I0.CIF";

ResistanceFlags = DFCareer.EffectFlags.Magic;
}
}

Expand Down
11 changes: 8 additions & 3 deletions Assets/Scripts/Game/Formulas/FormulaHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1509,9 +1509,14 @@ public static int SavingThrow(DFCareer.Elements elementType, DFCareer.EffectFlag
savingThrow += 25;

savingThrow += biographyMod + modifier;
if (elementType == DFCareer.Elements.Frost && target == playerEntity && playerEntity.Race == Races.Nord)
savingThrow += 30;
else if (elementType == DFCareer.Elements.Magic && target == playerEntity && playerEntity.Race == Races.Breton)

// Apply racial resistances
var raceTemplate = playerEntity.GetLiveRaceTemplate();
if ((elementType == DFCareer.Elements.Fire && (raceTemplate.ResistanceFlags & DFCareer.EffectFlags.Fire) != 0) ||
(elementType == DFCareer.Elements.Frost && (raceTemplate.ResistanceFlags & DFCareer.EffectFlags.Frost) != 0) ||
(elementType == DFCareer.Elements.DiseaseOrPoison && (raceTemplate.ResistanceFlags & (DFCareer.EffectFlags.Disease | DFCareer.EffectFlags.Poison)) != 0) ||
(elementType == DFCareer.Elements.Shock && (raceTemplate.ResistanceFlags & DFCareer.EffectFlags.Shock) != 0) ||
(elementType == DFCareer.Elements.Magic && (raceTemplate.ResistanceFlags & DFCareer.EffectFlags.Magic) != 0))
savingThrow += 30;

// Handle perfect immunity of 100% or greater
Expand Down

0 comments on commit a3081e1

Please sign in to comment.