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

30
system/scripts/hooks.js
View File

@@ -6,7 +6,7 @@ export default class HooksL5r5e {
// Enable embed Babele compendiums only if custom compendium is not found or disabled
if (
typeof Babele !== "undefined" &&
Babele.get().modules.every((module) => module.module !== "l5r5e-custom-compendiums")
Babele.get().modules.every((module) => module.module !== game.settings.get(CONFIG.l5r5e.namespace, "custom-compendium-name"))
) {
Babele.get().setSystemTranslationsDir("babele"); // Since Babele v2.0.7
}
@@ -30,9 +30,9 @@ export default class HooksL5r5e {
// Prepare values are sometimes null
["character", "adversary", "minion"].forEach(preparedId => {
const prepVal = game.settings.get(CONFIG.l5r5e.systemName, `initiative-prepared-${preparedId}`);
const prepVal = game.settings.get(CONFIG.l5r5e.namespace, `initiative-prepared-${preparedId}`);
if (prepVal === null || prepVal === "null") {
game.settings.set(CONFIG.l5r5e.systemName, `initiative-prepared-${preparedId}`, "actor");
game.settings.set(CONFIG.l5r5e.namespace, `initiative-prepared-${preparedId}`, "actor");
}
});
@@ -103,14 +103,10 @@ export default class HooksL5r5e {
case "settings":
// Add Changelog link
html.find("#game-details .system").append(
`<p><a href="${game.system.changelog}" target="_blank">Changelog</a>` +
` <a href="${game.i18n.localize(
"l5r5e.settings.wiki.link"
)}" target="_blank">${game.i18n.localize("l5r5e.settings.wiki.title")}</a>` +
` <a href="${game.i18n.localize(
"l5r5e.settings.custom-compendiums.link"
)}" target="_blank">${game.i18n.localize("l5r5e.settings.custom-compendiums.title")}</a>` +
`</p>`
`<span><a href="${game.system.changelog}" target="_blank">Changelog</a>`
+ ` <a href="${game.i18n.localize("l5r5e.settings.wiki.link")}" target="_blank">${game.i18n.localize("l5r5e.settings.wiki.title")}</a>`
+ ` <a href="${game.i18n.localize("l5r5e.settings.custom-compendiums.link")}" target="_blank">${game.i18n.localize("l5r5e.settings.custom-compendiums.title")}</a>`
+ `</span>`
);
break;
}
@@ -166,14 +162,14 @@ export default class HooksL5r5e {
// *** Conf ***
const encounterTypeList = Object.keys(CONFIG.l5r5e.initiativeSkills);
const prepared = {
character: game.settings.get(CONFIG.l5r5e.systemName, "initiative-prepared-character"),
adversary: game.settings.get(CONFIG.l5r5e.systemName, "initiative-prepared-adversary"),
minion: game.settings.get(CONFIG.l5r5e.systemName, "initiative-prepared-minion"),
character: game.settings.get(CONFIG.l5r5e.namespace, "initiative-prepared-character"),
adversary: game.settings.get(CONFIG.l5r5e.namespace, "initiative-prepared-adversary"),
minion: game.settings.get(CONFIG.l5r5e.namespace, "initiative-prepared-minion"),
};
// *** Template ***
const tpl = await renderTemplate(`${CONFIG.l5r5e.paths.templates}gm/combat-tracker-bar.html`, {
encounterType: game.settings.get(CONFIG.l5r5e.systemName, "initiative-encounter"),
encounterType: game.settings.get(CONFIG.l5r5e.namespace, "initiative-encounter"),
encounterTypeList,
prepared,
});
@@ -194,7 +190,7 @@ export default class HooksL5r5e {
if (!encounterTypeList.includes(encounter)) {
return;
}
game.settings.set(CONFIG.l5r5e.systemName, "initiative-encounter", encounter);
game.settings.set(CONFIG.l5r5e.namespace, "initiative-encounter", encounter);
});
html.find(".prepared-control").on("mousedown", (event) => {
@@ -210,7 +206,7 @@ export default class HooksL5r5e {
true: rev ? "actor" : "false",
actor: rev ? "false" : "true",
};
game.settings.set(CONFIG.l5r5e.systemName, `initiative-prepared-${preparedId}`, nextValue[prepared[preparedId]]);
game.settings.set(CONFIG.l5r5e.namespace, `initiative-prepared-${preparedId}`, nextValue[prepared[preparedId]]);
});
}