diff --git a/lang/en.json b/lang/en.json index c1ac4cd..645fab7 100644 --- a/lang/en.json +++ b/lang/en.json @@ -27,8 +27,15 @@ "Mosh.CharacterGenerator.StatOption": "Stats & Saves", "Mosh.CharacterGenerator.StatOptionPopupTitle": "Class Attribute and Saves option", "Mosh.CharacterGenerator.StatOptionPopupText": "Choose where to apply the bonus of:", - "Mosh.CharacterGenerator.SkillOptionPopupTitle": "Choose your skills", - "Mosh.CharacterGenerator.SkillOptionChoice": "Option", + "Mosh.CharacterGenerator.SkillOption.Classerror": "You need to select a class first.", + "Mosh.CharacterGenerator.SkillOption.PopupTitle": "Choose your skills", + "Mosh.CharacterGenerator.SkillOption.PopupTrainedDescription": "Choose 1 Trained skill", + "Mosh.CharacterGenerator.SkillOption.PopupExpertDescription": "Choose 1 Expert skill", + "Mosh.CharacterGenerator.SkillOption.PopupMasterDescription": "Choose 1 Master skill", + "Mosh.CharacterGenerator.SkillOption.PopupFullMasterDescription": "Choose 1 Master skill, and an Expert and Trained Skill prerequisite.", + "Mosh.CharacterGenerator.SkillOption.PopupFullExperDescription": "Choose 1 Expert skill, and Trained Skill prerequisite.", + "Mosh.CharacterGenerator.SkillOption.ChoiceWord": "Option", + "Mosh.CharacterGenerator.SkillOption.ChoiceText":"Choose 1 from these skill bonus options", "Mosh.CharacterGenerator.Tables": "Tables", "Mosh.CharacterGenerator.Table.Loadout": "Loadout Table", "Mosh.CharacterGenerator.Table.Patch": "Patch Table", diff --git a/module/item/class-sheet.js b/module/item/class-sheet.js index 7afca12..bbf4cbf 100644 --- a/module/item/class-sheet.js +++ b/module/item/class-sheet.js @@ -136,7 +136,7 @@ export class MothershipClassSheet extends MothershipItemSheet { DialogContent+=`` } if ( ! stats.includes("intellect")){ - DialogContent+=`` + DialogContent+=`` } if ( ! stats.includes("combat")){ DialogContent+=`` diff --git a/module/windows/actor-generator.js b/module/windows/actor-generator.js index 58ad7a0..2097f64 100644 --- a/module/windows/actor-generator.js +++ b/module/windows/actor-generator.js @@ -172,7 +172,7 @@ export class DLActorGenerator extends FormApplication { let li_html = `
  • ${await TextEditor.enrichHTML(skill.name, { async: true })}
    • `; html.find(`ul[id="system.class.skils.text"]`).append(li_html); } - let old_skills = html.find(`input[id="system.class.skills.uuid"]`).prop("value").split(",").filter(Boolean); + let old_skills = await html.find(`input[id="system.class.skills.uuid"]`).prop("value").split(",").filter(Boolean); html.find(`input[id="system.class.skills.uuid"]`).prop("value", old_skills.concat(skillsUuid).join(",")); } @@ -187,15 +187,15 @@ export class DLActorGenerator extends FormApplication { } for (let i = 0; i < skillPopupOptions.trained; i++) { - await this.showSkillDialog('systems/mosh/templates/dialogs/actor-generator/actor-generator-skill-option-single-dialog.html', "trained"); + await this.showSkillDialog('systems/mosh/templates/dialogs/actor-generator/actor-generator-skill-option-single-dialog.html', "Trained"); } for (let i = 0; i < skillPopupOptions.expert; i++) { - await this.showSkillDialog('systems/mosh/templates/dialogs/actor-generator/actor-generator-skill-option-single-dialog.html', "expert"); + await this.showSkillDialog('systems/mosh/templates/dialogs/actor-generator/actor-generator-skill-option-single-dialog.html', "Expert"); } for (let i = 0; i < skillPopupOptions.master; i++) { - await this.showSkillDialog('systems/mosh/templates/dialogs/actor-generator/actor-generator-skill-option-single-dialog.html', "master"); + await this.showSkillDialog('systems/mosh/templates/dialogs/actor-generator/actor-generator-skill-option-single-dialog.html', "Master"); } //console.log(existingSkills); @@ -213,7 +213,7 @@ export class DLActorGenerator extends FormApplication { let skillPopupData = { - title: game.i18n.localize("Mosh.CharacterGenerator.SkillOptionPopupTitle"), + title: game.i18n.localize("Mosh.CharacterGenerator.SkillOption.PopupTitle"), existingSkills: skillsUuid, skills: { trained: all_skills.filter(i => i.system.rank == "Trained"), @@ -222,15 +222,15 @@ export class DLActorGenerator extends FormApplication { } }; if (exclusive) { - skillPopupData.description = game.i18n.localize("Mosh.CharacterGenerator.SkillOptionPopup" + exclusive + "Description"); + skillPopupData.description = game.i18n.localize("Mosh.CharacterGenerator.SkillOption.Popup" + exclusive + "Description"); switch (exclusive) { - case "master": + case "Master": skillPopupData.skills = all_skills.filter(i => i.system.rank == "Master" && i.system.prerequisite_ids.filter(item => skillsUuid.includes(item)).length > 0); break; - case "expert": + case "Expert": skillPopupData.skills = all_skills.filter(i => i.system.rank == "Expert" && i.system.prerequisite_ids.filter(item => skillsUuid.includes(item)).length > 0); break; - case "trained": + case "Trained": skillPopupData.skills = all_skills.filter(i => i.system.rank == "Trained"); break; } @@ -240,7 +240,7 @@ export class DLActorGenerator extends FormApplication { return new Promise((resolve) => { let d = new Dialog({ - title: game.i18n.localize("Mosh.CharacterGenerator.SkillOptionPopupTitle"), + title: game.i18n.localize("Mosh.CharacterGenerator.SkillOption.PopupTitle"), content: popUpContent, buttons: { "1": { @@ -277,20 +277,20 @@ export class DLActorGenerator extends FormApplication { return new Promise((resolve) => { let d = new Dialog({ - title: game.i18n.localize("Mosh.CharacterGenerator.SkillOptionPopupTitle"), + title: game.i18n.localize("Mosh.CharacterGenerator.SkillOption.PopupTitle"), content: popUpContent, - width: 450, + window:{width: 500,}, buttons: { "1": { icon: '', - label: game.i18n.localize("Mosh.CharacterGenerator.SkillOptionChoice") + " 1", + label: game.i18n.localize("Mosh.CharacterGenerator.SkillOption.ChoiceWord") + " 1", callback: () => { resolve(option_1); } }, "2": { icon: '', - label: game.i18n.localize("Mosh.CharacterGenerator.SkillOptionChoice") + " 2", + label: game.i18n.localize("Mosh.CharacterGenerator.SkillOption.ChoiceWord") + " 2", callback: () => { resolve(option_2); } @@ -301,6 +301,38 @@ export class DLActorGenerator extends FormApplication { }); } + async applyClassSkills(html) { + let class_uuid = html.find(`input[id="system.class.uuid"]`).prop("value"); + if (class_uuid == "") { + ui.notifications.error(game.i18n.localize("Mosh.CharacterGenerator.SkillOption.Classerror")); + } + let classObject = await fromUuid(class_uuid); + await html.find(`ul[id="system.class.skils.text"]`).empty(); + await html.find(`input[id="system.class.skills.uuid"]`).prop("value", ""); + + this.skillsUuid = classObject.system.base_adjustment.skills_granted.slice(); + await this.updateSkillHtmlUl(html, this.skillsUuid); + + + let option_skills_1 = classObject.system.selected_adjustment.choose_skill_and; + await this.popUpSkillOptions(option_skills_1); + let option_skills_2 = classObject.system.selected_adjustment.choose_skill_or; + const isEmptyOption1 = Object.values(option_skills_2.option_1).every(x => x === null || x === '' || x === 0); + const isEmptyOption2 = Object.values(option_skills_2.option_2).every(x => x === null || x === '' || x === 0); + let option_skills_2_choosed = {} + if (isEmptyOption1 == false && isEmptyOption2 == false) { + //we need to choose-> render popup with both options + option_skills_2_choosed = await this.showOptionsDialog(option_skills_2.option_1,option_skills_2.option_2); + } else if (isEmptyOption1 == false) { + //there is only option 1 (edge case) but we go with it. + option_skills_2_choosed = option_skills_2.option_1; + } else if (isEmptyOption2 == false) { + //there is only option 2 (edge case) but we go with it. + option_skills_2_choosed = option_skills_2.option_2; + } + await this.popUpSkillOptions(option_skills_2_choosed); + } + async updateClass(classUuid, randomCharacter = false) { const droppedObject = await fromUuid(classUuid); @@ -329,31 +361,7 @@ export class DLActorGenerator extends FormApplication { * Skills * */ - this._element.find(`ul[id="system.class.skils.text"]`).empty(); - - this.skillsUuid = droppedObject.system.base_adjustment.skills_granted.slice(); - await this.updateSkillHtmlUl(this._element, this.skillsUuid); - - - let option_skills_1 = droppedObject.system.selected_adjustment.choose_skill_and; - await this.popUpSkillOptions(option_skills_1); - let option_skills_2 = droppedObject.system.selected_adjustment.choose_skill_or; - const isEmptyOption1 = Object.values(option_skills_2.option_1).every(x => x === null || x === '' || x === 0); - const isEmptyOption2 = Object.values(option_skills_2.option_2).every(x => x === null || x === '' || x === 0); - let option_skills_2_choosed = {} - if (isEmptyOption1 == false && isEmptyOption2 == false) { - //we need to choose-> render popup with both options - option_skills_2_choosed = await this.showOptionsDialog(option_skills_2.option_1,option_skills_2.option_2); - } else if (isEmptyOption1 == false) { - //there is only option 1 (edge case) but we go with it. - option_skills_2_choosed = option_skills_2.option_1; - } else if (isEmptyOption2 == false) { - //there is only option 2 (edge case) but we go with it. - option_skills_2_choosed = option_skills_2.option_2; - } - await this.popUpSkillOptions(option_skills_2_choosed); - - + await this.applyClassSkills(this._element); /** * Stats @@ -391,38 +399,6 @@ export class DLActorGenerator extends FormApplication { }); d.render(true); } - /* - for(let i = 0; i < statsandsaves.length; i++) { - let obj = statsandsaves[i]; - - if (obj.options.length == 1){ - //only 1 option, then its forced - this._element.find(`input[name="${obj.options[0]}"]`).prop("value",obj.value); - }else{ - - let buttons_options = {}; - for(let j = 0; j < obj.options.length; j++) { - buttons_options[j] = { - icon: '', - label: obj.options[j].replace(/\.bonus/i,"").replace(/(.*)\.+/i,""), - callback: () => this._element.find(`input[name="${obj.options[j]}"]`).prop("value",obj.value) - }; - } - let d = new Dialog({ - title: "Class Attribute and Saves option", - content: `

    You must choose where to apply the bonus of (${obj.value})

    `, - buttons: buttons_options, - default: "1", - //render: html => console.log("Register interactivity in the rendered dialog"), - //close: html => console.log("This always is logged no matter which option is chosen") - }); - d.render(true); - } - }*/ - //}catch{ - // ui.notifications.error("Class has invalid stats and saves configuration."); - //} - //todo: add robotic flag. return; } @@ -513,6 +489,12 @@ export class DLActorGenerator extends FormApplication { html.find(`img[id="system.credits.value"]`).click(ev => { this.rollCredits(html) }); + + /** Redo Skills */ + html.find(`i[id="system.class.skills.redo"]`).click(ev => { + this.applyClassSkills(html) + }); + /** Roll everything button */ html.find(`div[id="roll.everything"]`).click(ev => { this.rollEverything(html) diff --git a/templates/dialogs/actor-generator-dialog.html b/templates/dialogs/actor-generator-dialog.html index 87e40cd..39ad2ac 100644 --- a/templates/dialogs/actor-generator-dialog.html +++ b/templates/dialogs/actor-generator-dialog.html @@ -97,7 +97,7 @@
    {{ localize 'Mosh.Intelect' }} + data-label="{{ localize 'Mosh.Intellect' }}">{{ localize 'Mosh.Intellect' }}
    roll @@ -243,6 +243,10 @@
    {{ localize 'Mosh.Skills' }}
    +
    diff --git a/templates/dialogs/actor-generator/actor-generator-skill-option-choice-dialog.html b/templates/dialogs/actor-generator/actor-generator-skill-option-choice-dialog.html index 3125d16..5e12de3 100644 --- a/templates/dialogs/actor-generator/actor-generator-skill-option-choice-dialog.html +++ b/templates/dialogs/actor-generator/actor-generator-skill-option-choice-dialog.html @@ -1,70 +1,79 @@ -
    +
    -
    +
    +
    +

    {{localize 'Mosh.CharacterGenerator.SkillOption.ChoiceText'}}

    +
    +
    +
    -

    {{localize 'Mosh.CharacterGenerator.SkillOptionChoice'}} 1

    +

    {{localize 'Mosh.CharacterGenerator.SkillOption.ChoiceWord'}}: 1 +

    -
      - {{#if option_1.master}} -
    • - {{localize 'Mosh.SkillRankMaster'}} : {{option_1.master}} -
      • - {{/if}} - {{#if option_1.expert}} -
    • - {{localize 'Mosh.SkillRankExpert'}} : {{option_1.expert}} -
      • - {{/if}} - {{#if option_1.trained}} -
    • - {{localize 'Mosh.SkillRankTrained'}} : {{option_1.trained}} -
      • - {{/if}} - {{#if option_1.master_full_set}} -
    • - {{localize 'Mosh.SkillRankMaster'}} & {{localize 'Mosh.SkillsPrerequisite'}} : - {{option_1.master_full_set}} -
      • - {{/if}} - {{#if option_1.expert_full_set}} -
    • - {{localize 'Mosh.SkillRankExpert'}} & {{localize 'Mosh.SkillsPrerequisite'}} : - {{option_1.expert_full_set}} -
      • - {{/if}} -
    +
      + {{#if option_1.master}} +
    • + {{localize 'Mosh.SkillRankMaster'}} : {{option_1.master}} +
      • + {{/if}} + {{#if option_1.expert}} +
    • + {{localize 'Mosh.SkillRankExpert'}} : {{option_1.expert}} +
      • + {{/if}} + {{#if option_1.trained}} +
    • + {{localize 'Mosh.SkillRankTrained'}} : {{option_1.trained}} +
      • + {{/if}} + {{#if option_1.master_full_set}} +
    • + {{localize 'Mosh.SkillRankMaster'}} & {{localize 'Mosh.SkillsPrerequisite'}} : + {{option_1.master_full_set}} +
      • + {{/if}} + {{#if option_1.expert_full_set}} +
    • + {{localize 'Mosh.SkillRankExpert'}} & {{localize 'Mosh.SkillsPrerequisite'}} : + {{option_1.expert_full_set}} +
      • + {{/if}} +
    +
    +
    +

    {{localize 'Mosh.CharacterGenerator.SkillOption.ChoiceWord'}}: 2 +

    +
      + {{#if option_2.master}} +
    • + {{localize 'Mosh.SkillRankMaster'}} : {{option_2.master}} +
      • + {{/if}} + {{#if option_2.expert}} +
    • + {{localize 'Mosh.SkillRankExpert'}} : {{option_2.expert}} +
      • + {{/if}} + {{#if option_2.trained}} +
    • + {{localize 'Mosh.SkillRankTrained'}} : {{option_2.trained}} +
      • + {{/if}} + {{#if option_2.master_full_set}} +
    • + {{localize 'Mosh.SkillRankMaster'}} & {{localize 'Mosh.SkillsPrerequisite'}} : + {{option_2.master_full_set}} +
      • + {{/if}} + {{#if option_2.expert_full_set}} +
    • + {{localize 'Mosh.SkillRankExpert'}} & {{localize 'Mosh.SkillsPrerequisite'}} : + {{option_2.expert_full_set}} +
      • + {{/if}} +
    +
    + +
    -
    -

    {{localize 'Mosh.CharacterGenerator.SkillOptionChoice'}} 2

    -
      - {{#if option_2.master}} -
    • - {{localize 'Mosh.SkillRankMaster'}} : {{option_2.master}} -
      • - {{/if}} - {{#if option_2.expert}} -
    • - {{localize 'Mosh.SkillRankExpert'}} : {{option_2.expert}} -
      • - {{/if}} - {{#if option_2.trained}} -
    • - {{localize 'Mosh.SkillRankTrained'}} : {{option_2.trained}} -
      • - {{/if}} - {{#if option_2.master_full_set}} -
    • - {{localize 'Mosh.SkillRankMaster'}} & {{localize 'Mosh.SkillsPrerequisite'}} : - {{option_2.master_full_set}} -
      • - {{/if}} - {{#if option_2.expert_full_set}} -
    • - {{localize 'Mosh.SkillRankExpert'}} & {{localize 'Mosh.SkillsPrerequisite'}} : - {{option_2.expert_full_set}} -
      • - {{/if}} -
    -
    -
    \ No newline at end of file diff --git a/templates/dialogs/actor-generator/actor-generator-skill-option-full-expert-dialog.html b/templates/dialogs/actor-generator/actor-generator-skill-option-full-expert-dialog.html index c4af7a2..e356ca7 100644 --- a/templates/dialogs/actor-generator/actor-generator-skill-option-full-expert-dialog.html +++ b/templates/dialogs/actor-generator/actor-generator-skill-option-full-expert-dialog.html @@ -1,17 +1,13 @@ - - +
    - - - - {{title}} - +
    +
    +

    {{localize + 'Mosh.CharacterGenerator.SkillOption.PopupFullExpertDescription'}}

    +
    +
    - - -
    - -
    +
    -
    +
    -
    +
    -
    +
    @@ -28,6 +21,4 @@
    - - - \ No newline at end of file +
    \ No newline at end of file diff --git a/templates/item/item-class-sheet.html b/templates/item/item-class-sheet.html index 626fca6..cf8a993 100644 --- a/templates/item/item-class-sheet.html +++ b/templates/item/item-class-sheet.html @@ -49,8 +49,8 @@
    - {{ localize - 'Mosh.Intelect' }} + {{ localize + 'Mosh.Intellect' }}