uberwald/l5rx-chiaroscuro
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 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

15
system/scripts/dice/dice-picker-dialog.js
View File

@@ -176,7 +176,7 @@ export class DicePickerDialog extends FormApplication {
// Difficulty
if (!options.difficulty || !this.parseDifficulty(options.difficulty)) {
this.difficulty = game.settings.get(CONFIG.l5r5e.systemName, "initiative-difficulty-value");
this.difficulty = game.settings.get(CONFIG.l5r5e.namespace, "initiative-difficulty-value");
}
// DifficultyHidden
@@ -201,7 +201,7 @@ export class DicePickerDialog extends FormApplication {
*/
async refresh() {
if (this._difficultyHiddenIsLock.option) {
this.difficulty = game.settings.get(CONFIG.l5r5e.systemName, "initiative-difficulty-value");
this.difficulty = game.settings.get(CONFIG.l5r5e.namespace, "initiative-difficulty-value");
this.difficultyHidden = false;
}
this.render(false);
@@ -246,11 +246,8 @@ export class DicePickerDialog extends FormApplication {
if (!targetToken) {
return;
}
if (!(targetToken instanceof TokenDocument) || !targetToken.isOwner) {
console.warn(
"L5R5E | DP | target rejected : Not a valid TokenDocument instance or permission was denied",
targetToken
);
if (!(targetToken instanceof TokenDocument)) {
console.warn("L5R5E | DP | target rejected : Not a valid TokenDocument instance", targetToken);
return;
}
this._target = targetToken;
@@ -308,7 +305,7 @@ export class DicePickerDialog extends FormApplication {
name: "",
};
this.skillCatId = CONFIG.l5r5e.skills.get(skillId);// TODO refacto avec les skill items
this.skillCatId = CONFIG.l5r5e.skills.get(skillId); // TODO refacto with skill items
}
/**
@@ -365,7 +362,7 @@ export class DicePickerDialog extends FormApplication {
*/
set difficultyHidden(isHidden) {
// If GM hide, then player choice don't matter
this._difficultyHiddenIsLock.gm = game.settings.get(CONFIG.l5r5e.systemName, "initiative-difficulty-hidden");
this._difficultyHiddenIsLock.gm = game.settings.get(CONFIG.l5r5e.namespace, "initiative-difficulty-hidden");
if (this._difficultyHiddenIsLock.gm || this._difficultyHiddenIsLock.option) {
isHidden = true;
}