v12 fixes : Fix select to selectOptions

This commit is contained in:
Vlyan
2024-05-24 18:44:24 +02:00
parent fcc2691f4b
commit 3b37859cb5
12 changed files with 87 additions and 201 deletions

View File

@@ -150,7 +150,10 @@ export class TwentyQuestionsDialog extends FormApplication {
skillsList,
skillsListStep7,
skillsListStep17,
noHonorSkillsList: ["commerce", "skulduggery", "medicine", "seafaring", "survival", "labor"],
noHonorSkillsList: CONFIG.l5r5e.noHonorSkillsList.map(id => ({
id,
label: game.i18n.localize("l5r5e.skills." + CONFIG.l5r5e.skills.get(id.toLowerCase()) + "." + id.toLowerCase())
})),
techniquesList: game.l5r5e.HelpersL5r5e.getTechniquesList({ displayInTypes: true }),
data: this.object.data,
cache: this.cache,

View File

@@ -23,6 +23,7 @@ export const L5R5E = {
skirmish: "tactics",
mass_battle: "command",
},
noHonorSkillsList: ["commerce", "skulduggery", "medicine", "seafaring", "survival", "labor"],
};
// *** Techniques ***

View File

@@ -7,7 +7,11 @@ export class AdvancementSheetL5r5e extends ItemSheetL5r5e {
/**
* Sub Types of advancements
*/
static types = { ring: "l5r5e.rings.label", skill: "l5r5e.skills.label" }; // others have theirs own xp count
static types = [
{ id: "ring", label: "l5r5e.rings.label" },
{ id: "skill", label: "l5r5e.skills.label" },
// others have theirs own xp count
];
/** @override */
static get defaultOptions() {
@@ -43,29 +47,33 @@ export class AdvancementSheetL5r5e extends ItemSheetL5r5e {
const currentSkill = this.object.system.skill;
html.find("#advancement_type").on("change", (event) => {
$(event.target).prop("disabled", true);
if ($(event.target).val() === "skill") {
const targetEvt = $(event.target);
targetEvt.prop("disabled", true);
if (targetEvt.val() === "skill") {
this._updateChoice({ ring: currentRing }, { skill: currentSkill }).then(
$(event.target).prop("disabled", false)
targetEvt.prop("disabled", false)
);
} else {
} else if (targetEvt.val() === "ring") {
this._updateChoice({ skill: currentSkill }, { ring: currentRing }).then(
$(event.target).prop("disabled", false)
targetEvt.prop("disabled", false)
);
}
});
html.find("#advancement_ring").on("change", (event) => {
$(event.target).prop("disabled", true);
this._updateChoice({ ring: currentRing }, { ring: $(event.target).val() }).then(
$(event.target).prop("disabled", false)
const targetEvt = $(event.target);
targetEvt.prop("disabled", true);
this._updateChoice({ ring: currentRing }, { ring: targetEvt.val() }).then(
targetEvt.prop("disabled", false)
);
});
html.find("#advancement_skill").on("change", (event) => {
$(event.target).prop("disabled", true);
this._updateChoice({ skill: currentSkill }, { skill: $(event.target).val() }).then(
$(event.target).prop("disabled", false)
const targetEvt = $(event.target);
targetEvt.prop("disabled", true);
this._updateChoice({ skill: currentSkill }, { skill: targetEvt.val() }).then(
targetEvt.prop("disabled", false)
);
});
}
@@ -141,8 +149,5 @@ export class AdvancementSheetL5r5e extends ItemSheetL5r5e {
xp_used: xp_used,
},
});
// Re render
this.render(false);
}
}

View File

@@ -18,7 +18,10 @@ export class WeaponSheetL5r5e extends ItemSheetL5r5e {
// Martial skills only
sheetData.data.skills = Array.from(CONFIG.l5r5e.skills)
.filter(([id, cat]) => cat === "martial")
.map(([id, cat]) => id);
.map(([id, cat]) => ({
id,
label: "l5r5e.skills." + cat.toLowerCase() + "." + id.toLowerCase(),
}));
return sheetData;
}