uberwald/l5rx-chiaroscuro
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev_skillslist

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	system/lang/en-en.json
#	system/lang/fr-fr.json
#	system/scripts/actor.js
#	system/scripts/actors/base-character-sheet.js
#	system/scripts/combat.js
#	system/scripts/config.js
#	system/scripts/dice/dice-picker-dialog.js
#	system/scripts/dice/roll-n-keep-dialog.js
#	system/scripts/gm/gm-monitor.js
#	system/scripts/gm/gm-toolbox.js
#	system/scripts/hooks.js
#	system/scripts/items/technique-sheet.js
#	system/scripts/main-l5r5e.js
#	system/scripts/migration.js
#	system/scripts/preloadTemplates.js
#	system/scripts/settings.js
#	system/scripts/socket-handler.js
#	system/styles/l5r5e.css
#	system/system.json
#	system/templates/actors/character-sheet.html
This commit is contained in:
Vlyan
2023-12-14 10:08:41 +01:00
parent 67b7601fa1 9a46cfb842
commit 6f7b00328e
54 changed files with 9442 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
system/scripts/combat.js
View File

@@ -24,15 +24,15 @@ export class CombatL5r5e extends Combat {
// Get global modifiers
const cfg = {
difficulty: game.settings.get(CONFIG.l5r5e.systemName, "initiative-difficulty-value"),
difficultyHidden: game.settings.get(CONFIG.l5r5e.systemName, "initiative-difficulty-hidden"),
difficulty: game.settings.get(CONFIG.l5r5e.namespace, "initiative-difficulty-value"),
difficultyHidden: game.settings.get(CONFIG.l5r5e.namespace, "initiative-difficulty-hidden"),
};
// SkillId from DicePicker or global
const skillId = messageOptions.skillId
? messageOptions.skillId
: CONFIG.l5r5e.initiativeSkills[game.settings.get(CONFIG.l5r5e.systemName, "initiative-encounter")];
const skillCat = CONFIG.l5r5e.skills.get(skillId);// TODO refacto avec les skill items
: CONFIG.l5r5e.initiativeSkills[game.settings.get(CONFIG.l5r5e.namespace, "initiative-encounter")];
const skillCat = CONFIG.l5r5e.skills.get(skillId); // TODO refacto with skill items
// Get score for each combatant
const networkActors = [];