Merge branch 'dev' into dev_skillslist

# Conflicts:
#	CHANGELOG.md
#	system/styles/l5r5e.css
#	system/system.json
This commit is contained in:
Vlyan
2023-03-26 11:22:28 +02:00
6 changed files with 62 additions and 2 deletions

View File

@@ -188,6 +188,13 @@ export class ActorL5r5e extends Actor {
system.composure = (Number(system.rings.earth) + Number(system.rings.water)) * 2;
system.focus = Number(system.rings.air) + Number(system.rings.fire);
system.vigilance = Math.ceil((Number(system.rings.air) + Number(system.rings.water)) / 2);
// Modifiers from conditions
const modifiers = system.modifiers?.character;
system.endurance = system.endurance + (Number(modifiers?.endurance) || 0);
system.composure = system.composure + (Number(modifiers?.composure) || 0);
system.focus = system.focus + (Number(modifiers?.focus) || 0);
system.vigilance = system.vigilance + (Number(modifiers?.vigilance) || 0);
}
/**