Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Foxed Inherent Enhancements AGAIN #372

Merged
merged 1 commit into from
Jun 8, 2024
Merged

Foxed Inherent Enhancements AGAIN #372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions module/actor/actor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,13 +716,6 @@ export class Actor4e extends Actor {
}
def.bonusValue = defBonusValue;

//Using inherent enhancements?
let enhFloor = 0;
if(game.settings.get("dnd4e", "inhEnh")) {
//console.log(`${id}: Checked inherent defence enhancement of +${Helper.findKeyScale(data.details.level, CONFIG.DND4E.SCALE.basic, 1)} for this level against item value of +${def.enhance}`);
//If our enhancement is lower than the inherent level, adjust it upward
enhFloor = Helper.findKeyScale(data.details.level, CONFIG.DND4E.SCALE.basic, 3);
}

//Get Def stats from items
for ( let i of this.items) {
Expand All @@ -740,10 +733,19 @@ export class Actor4e extends Actor {
}
}
else if((i.system.armour.type === "armour" && id === "ac")||(i.system.armour.type === "neck" && ["fort","ref","wil"].includes(id))){
def.enhance = Math.max(def.enhance||0,enhFloor,i.system.armour.enhance);
//console.log(`${id}: Checked item defence enhancement of +${i.system.armour.enhance} against existing value of +${def.enhance}`);
def.enhance = Math.max(def.enhance,i.system.armour.enhance);
}
def.armour += i.system.armour[id];
}

//Using inherent enhancements?
if(game.settings.get("dnd4e", "inhEnh")) {
//If our enhancement is lower than the inherent level, adjust it upward
const enhFloor = Helper.findKeyScale(data.details.level, CONFIG.DND4E.SCALE.basic, 3);
//console.log(`${id}: Checked inherent defence enhancement of +${Helper.findKeyScale(data.details.level, CONFIG.DND4E.SCALE.basic, 1)} for this level against existing value of +${def.enhance}`);
def.enhance = Math.max(def.enhance,enhFloor);
}

let modBonus = def.ability != "" ? data.abilities[def.ability].mod : 0;

Expand Down