diff --git a/README.md b/README.md index 3087971..02c6273 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,12 @@ This is an in-development implementation of the Rolemaster Standard System for F If you need access to the Rolemaster Standard System you may be out of luck as the system has been out of print for some time. However it's successor Rolemaster Fantasy Roleplaying is broadly compatible and can be purchased as a PDF via Drive Thru RPG here: https://www.drivethrurpg.com/product/91995/Rolemaster-Fantasy-Role-Playing?cPath=1361_6495 ## How to Use -Download the latest release from this repository and then extract the rmss folder. Drag it into the systems folder of your FoundryVTT Data Directory. More detailed instructions can be found here in the docs directory. +Download the latest release from this repository and then extract the rmss folder. Drag it into the systems folder of your FoundryVTT Data Directory. More detailed instructions can be found [here](docs/INSTALL.md) in the docs directory. If you are using this system I highly recommend the "Simple Dice Roller" module which will allow you to roll dice easily while this feature is in development. You can install it in the Foundry Modules section or you can visit the following link for more instructions: https://foundryvtt.com/packages/simple-dice-roller/ +Further information on how the system works can be found [here](docs/USAGE.md) + ## Goals/ToDo Project goals include: - A functionaing character sheet that automates some of the basic maths. diff --git a/rmss/.gitignore b/rmss/.gitignore index 40b878d..6d368f2 100644 --- a/rmss/.gitignore +++ b/rmss/.gitignore @@ -1 +1,3 @@ -node_modules/ \ No newline at end of file +node_modules/ +.jshintrc +.eslintrc \ No newline at end of file diff --git a/rmss/assets/default/language.svg b/rmss/assets/default/language.svg new file mode 100644 index 0000000..6f23946 --- /dev/null +++ b/rmss/assets/default/language.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/rmss/lang/en.json b/rmss/lang/en.json index b0133d5..721dad9 100644 --- a/rmss/lang/en.json +++ b/rmss/lang/en.json @@ -33,6 +33,9 @@ "stat_total": "Total" } }, + "pc_sheet": { + "import_skillcat": "Import" + }, "pc_sheet_tabs": { "record": "Record", "skill_categories": "Skill Categories", @@ -128,10 +131,11 @@ "prof_bonus": "Prof Bonus", "special_bonus": "Special Bonus", "total_bonus": "Total Bonus", - "add_skillcat": "Add Skill Category" + "import_skillcat": "Import Skill Categories" }, "pc_sheet_items": { "equipped": "Equipped", + "worn": "Worn", "favorite": "Favorite", "quantity": "Quantity", "item_name": "Item Name", @@ -149,6 +153,11 @@ "range": "Range", "type": "Type" }, + "pc_sheet_language": { + "name": "Name", + "spoken": "Spoken", + "written": "Written" + }, "entity_sheet": { "spell": "RMSS Spell", "weapon": "RMSS Weapon", @@ -171,6 +180,7 @@ "cp": "Copper Pieces" }, "item": { + "worn": "Worn", "description": "Other Notes", "quantity": "Quantity", "weight": "Weight", @@ -245,6 +255,11 @@ "special_bonus_2": "Special Bonus 2:", "total_bonus": "Total Bonus:", "description": "Description:" + }, + "language": { + "spoken": "Spoken", + "written": "Written", + "description": "Description" } } } \ No newline at end of file diff --git a/rmss/less/actor-sheet/actor-sheet-items.less b/rmss/less/actor-sheet/actor-sheet-items.less index cb4e4fc..e89c01b 100644 --- a/rmss/less/actor-sheet/actor-sheet-items.less +++ b/rmss/less/actor-sheet/actor-sheet-items.less @@ -1,6 +1,6 @@ .items-grid-container { display: grid; - grid-template-columns: [name] 30% [quantity] 17% [weight] 17% [cost] 18% [controls] 18%; + grid-template-columns: [worn] 10% [name] 30% [quantity] 15% [weight] 15% [cost] 15% [controls] 15%; } .items-grid-container > div { @@ -16,11 +16,12 @@ justify-content: center; } -.items-grid-container > div:nth-child(10n+1), -.items-grid-container > div:nth-child(10n+2), -.items-grid-container > div:nth-child(10n+3), -.items-grid-container > div:nth-child(10n+4), -.items-grid-container > div:nth-child(10n+5) +.items-grid-container > div:nth-child(12n+1), +.items-grid-container > div:nth-child(12n+2), +.items-grid-container > div:nth-child(12n+3), +.items-grid-container > div:nth-child(12n+4), +.items-grid-container > div:nth-child(12n+5), +.items-grid-container > div:nth-child(12n+6) { font-family: Signika, sans-serif; font-size: 12px; diff --git a/rmss/less/actor-sheet/actor-sheet-resistances.less b/rmss/less/actor-sheet/actor-sheet-resistances.less new file mode 100644 index 0000000..67f83cf --- /dev/null +++ b/rmss/less/actor-sheet/actor-sheet-resistances.less @@ -0,0 +1,18 @@ +.resistances-grid-container { + outline: 1px solid; /* use instead of border */ + margin-top: 1px; + margin-left: 1px; + padding: 5px; + display: grid; + grid-template-columns: [Name] 40% [Value] 20% [Race_Mod] 20% [Total] 20%; +} + +.resistances-grid-heading { + font-weight: bold; + border-bottom: 1px solid; + background-image: linear-gradient(rgba(0, 0, 0, 0.1) 0 0); +} + +.resistance-input { + width: 50% +} \ No newline at end of file diff --git a/rmss/less/actor-sheet/actor-sheet.less b/rmss/less/actor-sheet/actor-sheet.less index 918f3c3..9d410ba 100644 --- a/rmss/less/actor-sheet/actor-sheet.less +++ b/rmss/less/actor-sheet/actor-sheet.less @@ -27,6 +27,12 @@ padding: 1px; } +.settings-button, .playersheet-settings { + font-family: Signika, sans-serif; + font-size: 12px; + margin-right: 6px +} + // Resource Elements in Headers .resource-container { @@ -133,6 +139,7 @@ padding: 5px; } +// Remove Me .resistance-block { outline: 1px solid; /* use instead of border */ margin-top: 1px; diff --git a/rmss/less/rmss.less b/rmss/less/rmss.less index a3929f6..93ac91f 100644 --- a/rmss/less/rmss.less +++ b/rmss/less/rmss.less @@ -9,6 +9,7 @@ @import "./actor-sheet/actor-sheet-armor.less"; @import "./actor-sheet/actor-sheet-herbs.less"; @import "./actor-sheet/actor-sheet-spells.less"; +@import "./actor-sheet/actor-sheet-resistances.less"; //Skill Category Sheet diff --git a/rmss/less/skillcat-sheet/skillcat-sheet.less b/rmss/less/skillcat-sheet/skillcat-sheet.less index 54755ab..48139e6 100644 --- a/rmss/less/skillcat-sheet/skillcat-sheet.less +++ b/rmss/less/skillcat-sheet/skillcat-sheet.less @@ -1,11 +1,11 @@ -.skillcat-name, .skill-name, .item-name, .spell-name, .equipable-name{ +.skillcat-name, .skill-name, .item-name, .spell-name, .equipable-name { font-family: Signika, sans-serif; font-size: 12px; font-weight: bold; text-align: center; } -.skillcat-entry, .skill-entry, .item-entry, .spell-entry, .equipable-entry{ +.skillcat-entry, .skill-entry, .item-entry, .spell-entry, .equipable-entry { font-family: Signika, sans-serif; font-size: 12px; text-align: center; diff --git a/rmss/module/config.js b/rmss/module/config.js index 3561be5..7def4bb 100644 --- a/rmss/module/config.js +++ b/rmss/module/config.js @@ -1,60 +1,60 @@ export const rmss = {}; rmss.curreny_type = { - mp: "rmss.curreny_type.mp", - pp: "rmss.curreny_type.pp", - gp: "rmss.curreny_type.gp", - sp: "rmss.curreny_type.sp", - bp: "rmss.curreny_type.bp", - cp: "rmss.curreny_type.cp" + mp: "rmss.curreny_type.mp", + pp: "rmss.curreny_type.pp", + gp: "rmss.curreny_type.gp", + sp: "rmss.curreny_type.sp", + bp: "rmss.curreny_type.bp", + cp: "rmss.curreny_type.cp" }; rmss.stats = { - agility: { - fullname: "Agility", - shortname: "Ag" - }, - constitution: { - fullname: "Constitution", - shortname: "Co" - }, - memory: { - fullname: "Memory", - shortname: "Me" - }, - reasoning: { - fullname: "Reasoning", - shortname: "Re" - }, - self_discipline: { - fullname: "Self Discipline", - shortname: "SD" - }, - empathy: { - fullname: "Empathy", - shortname: "Em" - }, - intuition: { - fullname: "Intuition", - shortname: "In" - }, - presence: { - fullname: "Presence", - shortname: "Pr" - }, - quickness: { - fullname: "Quickness", - shortname: "Qu" - }, - strength: { - fullname: "Strength", - shortname: "St" - } + agility: { + fullname: "Agility", + shortname: "Ag" + }, + constitution: { + fullname: "Constitution", + shortname: "Co" + }, + memory: { + fullname: "Memory", + shortname: "Me" + }, + reasoning: { + fullname: "Reasoning", + shortname: "Re" + }, + self_discipline: { + fullname: "Self Discipline", + shortname: "SD" + }, + empathy: { + fullname: "Empathy", + shortname: "Em" + }, + intuition: { + fullname: "Intuition", + shortname: "In" + }, + presence: { + fullname: "Presence", + shortname: "Pr" + }, + quickness: { + fullname: "Quickness", + shortname: "Qu" + }, + strength: { + fullname: "Strength", + shortname: "St" + } }; rmss.skill_designations = { - None: "None", - Occupational: "Occupational", - Everyman: "Everyman", - Restricted: "Restricted" + None: "None", + Occupational: "Occupational", + Everyman: "Everyman", + Restricted: "Restricted" }; diff --git a/rmss/module/documents/actor.js b/rmss/module/documents/actor.js index 814d0a0..23e47d6 100644 --- a/rmss/module/documents/actor.js +++ b/rmss/module/documents/actor.js @@ -1,5 +1,5 @@ export class RMSSActor extends Actor { - + /** @override */ prepareData() { // Prepare data for the actor. Calling the super version of this executes @@ -8,83 +8,157 @@ export class RMSSActor extends Actor { // prepareDerivedData(). super.prepareData(); } - + prepareDerivedData() { const actorData = this; const systemData = actorData.system; const flags = actorData.flags.rmss || {}; - + // Make separate methods for each Actor type (character, npc, etc.) to keep // things organized. this._prepareCharacterData(actorData); this._prepareNpcData(actorData); } - + /** - * Prepare Character type specific data - */ + * Prepare Character specific data. + * @param {Actor} actorData The NPC Object to prepare data for + */ _prepareCharacterData(actorData) { - if (actorData.type !== 'character') return; - + if (actorData.type !== "character") return; + // Calculate Stat Bonuses for the Actor this.calculateStatBonuses(actorData); - + // Calculate Resistance Rolls for the Actor this.calculateResistanceRolls(actorData); - + // Iterate through and apply Stat bonuses for Skill Category Items this.calculateSkillCategoryStatBonuses(); // Iterate through and apply Skill Category Bonuses for Skill items this.calculateSkillBonuses(); } - + /** - * Prepare NPC type specific data. - */ + * Prepare NPC specific data. + * @param {Actor} actorData The NPC Object to prepare data for + */ _prepareNpcData(actorData) { - if (actorData.type !== 'npc') return; - + if (actorData.type !== "npc") return; + // Make modifications to data here. For example: const data = actorData.data; } - - // Tally each stat bonus and populate the total field. + + // Tally each stat bonus and populate the total field. calculateStatBonuses(actorData) { const systemData = actorData.system; - actorData.system.stats.agility.stat_bonus = Number(systemData.stats.agility.racial_bonus)+Number(systemData.stats.agility.special_bonus)+Number(systemData.stats.agility.basic_bonus); - actorData.system.stats.constitution.stat_bonus = Number(systemData.stats.constitution.racial_bonus)+Number(systemData.stats.constitution.special_bonus)+Number(systemData.stats.constitution.basic_bonus); - actorData.system.stats.memory.stat_bonus = Number(systemData.stats.memory.racial_bonus)+Number(systemData.stats.memory.special_bonus)+Number(systemData.stats.memory.basic_bonus); - actorData.system.stats.reasoning.stat_bonus = Number(systemData.stats.reasoning.racial_bonus)+Number(systemData.stats.reasoning.special_bonus)+Number(systemData.stats.reasoning.basic_bonus); - actorData.system.stats.self_discipline.stat_bonus = Number(systemData.stats.self_discipline.racial_bonus)+Number(systemData.stats.self_discipline.special_bonus)+Number(systemData.stats.self_discipline.basic_bonus); - actorData.system.stats.empathy.stat_bonus = Number(systemData.stats.empathy.racial_bonus)+Number(systemData.stats.empathy.special_bonus)+Number(systemData.stats.empathy.basic_bonus); - actorData.system.stats.intuition.stat_bonus = Number(systemData.stats.intuition.racial_bonus)+Number(systemData.stats.intuition.special_bonus)+Number(systemData.stats.intuition.basic_bonus); - actorData.system.stats.presence.stat_bonus = Number(systemData.stats.presence.racial_bonus)+Number(systemData.stats.presence.special_bonus)+Number(systemData.stats.presence.basic_bonus); - actorData.system.stats.quickness.stat_bonus = Number(systemData.stats.quickness.racial_bonus)+Number(systemData.stats.quickness.special_bonus)+Number(systemData.stats.quickness.basic_bonus); - actorData.system.stats.strength.stat_bonus = Number(systemData.stats.strength.racial_bonus)+Number(systemData.stats.strength.special_bonus)+Number(systemData.stats.strength.basic_bonus); + + actorData.system.stats.agility.stat_bonus = Number(systemData.stats.agility.racial_bonus) + + Number(systemData.stats.agility.special_bonus) + + Number(systemData.stats.agility.basic_bonus); + + actorData.system.stats.constitution.stat_bonus = Number(systemData.stats.constitution.racial_bonus) + + Number(systemData.stats.constitution.special_bonus) + + Number(systemData.stats.constitution.basic_bonus); + + actorData.system.stats.memory.stat_bonus = Number(systemData.stats.memory.racial_bonus) + + Number(systemData.stats.memory.special_bonus) + + Number(systemData.stats.memory.basic_bonus); + + actorData.system.stats.reasoning.stat_bonus = Number(systemData.stats.reasoning.racial_bonus) + + Number(systemData.stats.reasoning.special_bonus) + + Number(systemData.stats.reasoning.basic_bonus); + + + actorData.system.stats.self_discipline.stat_bonus = Number(systemData.stats.self_discipline.racial_bonus) + + Number(systemData.stats.self_discipline.special_bonus) + + Number(systemData.stats.self_discipline.basic_bonus); + + actorData.system.stats.empathy.stat_bonus = Number(systemData.stats.empathy.racial_bonus) + + Number(systemData.stats.empathy.special_bonus) + + Number(systemData.stats.empathy.basic_bonus); + + actorData.system.stats.intuition.stat_bonus = Number(systemData.stats.intuition.racial_bonus) + + Number(systemData.stats.intuition.special_bonus) + + Number(systemData.stats.intuition.basic_bonus); + + actorData.system.stats.presence.stat_bonus = Number(systemData.stats.presence.racial_bonus) + + Number(systemData.stats.presence.special_bonus) + + Number(systemData.stats.presence.basic_bonus); + + actorData.system.stats.quickness.stat_bonus = Number(systemData.stats.quickness.racial_bonus) + + Number(systemData.stats.quickness.special_bonus) + + Number(systemData.stats.quickness.basic_bonus); + + actorData.system.stats.strength.stat_bonus = Number(systemData.stats.strength.racial_bonus) + + Number(systemData.stats.strength.special_bonus) + + Number(systemData.stats.strength.basic_bonus); } - // Calculate each Resistance Roll with the formula on the character sheet. - calculateResistanceRolls(actorData) { // TODO: Add Racial modifiers to resistance + // Calculate each Resistance Roll with the formula on the character sheet. + calculateResistanceRolls(actorData) { const systemData = actorData.system; - actorData.system.resistance_rolls.essence = Number(systemData.stats.empathy.stat_bonus * 3); - actorData.system.resistance_rolls.channeling = Number(systemData.stats.intuition.stat_bonus * 3); - actorData.system.resistance_rolls.mentalism = Number(systemData.stats.presence.stat_bonus * 3); - actorData.system.resistance_rolls.fear = Number(systemData.stats.self_discipline.stat_bonus * 3); - actorData.system.resistance_rolls.poison_disease = Number(systemData.stats.constitution.stat_bonus * 3); - actorData.system.resistance_rolls.chann_ess = Number(systemData.stats.intuition.stat_bonus) + Number(systemData.stats.empathy.stat_bonus); - actorData.system.resistance_rolls.chann_ment = Number(systemData.stats.intuition.stat_bonus) + Number(systemData.stats.presence.stat_bonus); - actorData.system.resistance_rolls.ess_ment = Number(systemData.stats.empathy.stat_bonus) + Number(systemData.stats.presence.stat_bonus); - actorData.system.resistance_rolls.arcane = Number(systemData.stats.empathy.stat_bonus) + Number(systemData.stats.intuition.stat_bonus) + Number(systemData.stats.presence.stat_bonus); + + actorData.system.resistance_rolls.essence.value = Number(systemData.stats.empathy.stat_bonus * 3); + + actorData.system.resistance_rolls.channeling.value = Number(systemData.stats.intuition.stat_bonus * 3); + + actorData.system.resistance_rolls.mentalism.value = Number(systemData.stats.presence.stat_bonus * 3); + + actorData.system.resistance_rolls.fear.value = Number(systemData.stats.self_discipline.stat_bonus * 3); + + actorData.system.resistance_rolls.poison_disease.value = Number(systemData.stats.constitution.stat_bonus * 3); + + actorData.system.resistance_rolls.chann_ess.value = Number(systemData.stats.intuition.stat_bonus) + + Number(systemData.stats.empathy.stat_bonus); + + actorData.system.resistance_rolls.chann_ment.value = Number(systemData.stats.intuition.stat_bonus) + + Number(systemData.stats.presence.stat_bonus); + + actorData.system.resistance_rolls.ess_ment.value = Number(systemData.stats.empathy.stat_bonus) + + Number(systemData.stats.presence.stat_bonus); + + actorData.system.resistance_rolls.arcane.value = Number(systemData.stats.empathy.stat_bonus) + + Number(systemData.stats.intuition.stat_bonus) + + Number(systemData.stats.presence.stat_bonus); + + actorData.system.resistance_rolls.essence.total = actorData.system.resistance_rolls.essence.value + + actorData.system.resistance_rolls.essence.race_mod; + + actorData.system.resistance_rolls.channeling.total = actorData.system.resistance_rolls.channeling.value + + actorData.system.resistance_rolls.channeling.race_mod; + + actorData.system.resistance_rolls.mentalism.total = actorData.system.resistance_rolls.mentalism.value + + actorData.system.resistance_rolls.mentalism.race_mod; + + actorData.system.resistance_rolls.fear.total = actorData.system.resistance_rolls.fear.value + + actorData.system.resistance_rolls.fear.race_mod; + + actorData.system.resistance_rolls.poison_disease.total = actorData.system.resistance_rolls.poison_disease.value + + actorData.system.resistance_rolls.poison_disease.race_mod; + + actorData.system.resistance_rolls.chann_ess.total = actorData.system.resistance_rolls.chann_ess.value + + actorData.system.resistance_rolls.chann_ess.race_mod; + + actorData.system.resistance_rolls.chann_ment.total = actorData.system.resistance_rolls.chann_ment.value + + actorData.system.resistance_rolls.chann_ment.race_mod; + + actorData.system.resistance_rolls.ess_ment.total = actorData.system.resistance_rolls.ess_ment.value + + actorData.system.resistance_rolls.ess_ment.race_mod; + + actorData.system.resistance_rolls.arcane.total = actorData.system.resistance_rolls.arcane.value + + actorData.system.resistance_rolls.arcane.race_mod; } calculateSkillBonuses() { for (const item of this.items) { if (item.type === "skill") { - console.log("rmss | actor.js | Calculating skill bonus for Skill: " + item.name); - console.log("rmss | actor.js | Updating Skill Category Bonus for Skill: " + item.name); + console.log(`rmss | actor.js | Calculating skill bonus for Skill: ${item.name}`); + console.log(`rmss | actor.js | Updating Skill Category Bonus for Skill: ${item.name}`); item.calculateSelectedSkillCategoryBonus(item); - console.log("rmss | actor.js | Updating Skill Total Bonus for Skill: " + item.name); + console.log(`rmss | actor.js | Updating Skill Total Bonus for Skill: ${item.name}`); item.calculateSkillTotalBonus(item); } } @@ -94,25 +168,25 @@ export class RMSSActor extends Actor { calculateSkillCategoryStatBonuses() { for (const item of this.items) { if (item.type === "skill_category") { - - console.log("rmss | actor.js | Calculating Skill Category Stat Bonuses for: " + item.name); - // Get all the applicable stats for this skill category - var app_stat_1 = item.system.app_stat_1; - var app_stat_2 = item.system.app_stat_2; - var app_stat_3 = item.system.app_stat_3; - + + console.log(`rmss | actor.js | Calculating Skill Category Stat Bonuses for: ${item.name}`); + // Get all the applicable stats for this skill category + let app_stat_1 = item.system.app_stat_1; + let app_stat_2 = item.system.app_stat_2; + let app_stat_3 = item.system.app_stat_3; + // If the first one is None we don't need to do anything further if (app_stat_1 === "None") { continue; - } - else - { - var applicable_stat_bonus = 0; - - var app_stat_1_found = false; - var app_stat_2_found = false; - var app_stat_3_found = false; - + } + else + { + let applicable_stat_bonus = 0; + + let app_stat_1_found = false; + let app_stat_2_found = false; + let app_stat_3_found = false; + // Iterate through the applicable stats and find their full names for (const stat in CONFIG.rmss.stats) { // If the configured App Stat matches the one of the stats in config @@ -130,11 +204,25 @@ export class RMSSActor extends Actor { applicable_stat_bonus = applicable_stat_bonus + this.system.stats[stat].stat_bonus; } } - //console.log("Applicable Stat Bonus: " + applicable_stat_bonus) + if (app_stat_1_found === true && app_stat_2_found === true && app_stat_3_found === true) { // Apply the update if we found stat bonuses for every applicable stat item.system.stat_bonus = applicable_stat_bonus; - + + // Update the total in the Item + item.calculateSkillCategoryTotalBonus(item); + } + else if (app_stat_1_found === true && app_stat_2_found === true && app_stat_3_found === false) { + // Apply the update if we found stat bonuses for the first two applicable stats + item.system.stat_bonus = applicable_stat_bonus; + + // Update the total in the Item + item.calculateSkillCategoryTotalBonus(item); + } + else if (app_stat_1_found === true && app_stat_2_found === false && app_stat_3_found === false) { + // Apply the update if we found stat bonuses for the first applicable stat + item.system.stat_bonus = applicable_stat_bonus; + // Update the total in the Item item.calculateSkillCategoryTotalBonus(item); } @@ -148,15 +236,13 @@ export class RMSSActor extends Actor { // This is the format that the select helper on the skill sheet needs getOwnedItemsByType(item_type) { - var ownedItems = {None: "None"}; - console.log("rmss | actor.js | Getting owned " + item_type + " for: " + this.name); - for (const item of this.items) { + let ownedItems = {None: "None"}; + console.log(`rmss | actor.js | Getting owned ${item_type} for: ${this.name}`); + for (const item of this.items) { if (item.type === item_type) { ownedItems[item._id] = item.name; } } - return(ownedItems); + return (ownedItems); } - - -} \ No newline at end of file +} diff --git a/rmss/module/documents/item.js b/rmss/module/documents/item.js index edaa872..f447c97 100644 --- a/rmss/module/documents/item.js +++ b/rmss/module/documents/item.js @@ -1,117 +1,118 @@ -export class RMSSItem extends Item { +export class RMSSItem extends Item { - /** @override */ - prepareData() { - // Prepare data for the item. Calling the super version of this executes - // the following, in order: data reset (to clear active effects), - // prepareBaseData(), prepareEmbeddedDocuments() (including active effects), - // prepareDerivedData(). - console.log("rmss | item.js | prepareData for:" + this.name); - super.prepareData(); - } + /** @override */ + prepareData() { + // Prepare data for the item. Calling the super version of this executes + // the following, in order: data reset (to clear active effects), + // prepareBaseData(), prepareEmbeddedDocuments() (including active effects), + // prepareDerivedData(). + console.log(`rmss | item.js | prepareData for: ${this.name}`); + super.prepareData(); + } - // Set the icon images for newly created images. - async _preCreate(data, options, userId) { - await super._preCreate(data, options, userId); - - // Do not set on copied items if they have a custom Icon. - if (!data.name.includes("(Copy)")) - { - if (this.type == "armor") { - await this.updateSource({img: "systems/rmss/assets/default/armor.svg"}); - } - else if (this.type == "weapon") { - await this.updateSource({img: "systems/rmss/assets/default/weapon.svg"}); - } - else if (this.type == "skill") { - await this.updateSource({img: "systems/rmss/assets/default/skill.svg"}); - } - else if (this.type == "skill_category") { - await this.updateSource({img: "systems/rmss/assets/default/skill_category.svg"}); - } - else if (this.type == "spell") { - await this.updateSource({img: "systems/rmss/assets/default/spell.svg"}); - } - else if (this.type == "herb_or_poison") { - await this.updateSource({img: "systems/rmss/assets/default/herb_or_poison.svg"}); - } - else if (this.type == "transport") { - await this.updateSource({img: "systems/rmss/assets/default/transport.svg"}); - } - } - } - - prepareDerivedData() { - const itemData = this; - const systemData = itemData.system; - const flags = itemData.flags.rmss || {}; - - // Make separate methods for each item type to keep things organized. - - if (itemData.type === 'skill') { - this._prepareSkillCategoryData(itemData); - } - - if (itemData.type === 'skill') { - this._prepareSkillData(itemData); - } + // Set the icon images for newly created images. + async _preCreate(data, options, userId) { + await super._preCreate(data, options, userId); + // Do not set on copied items if they have a custom Icon. + if (!data.name.includes("(Copy)")) + { + if (this.type === "armor") { + await this.updateSource({img: "systems/rmss/assets/default/armor.svg"}); } + else if (this.type === "weapon") { + await this.updateSource({img: "systems/rmss/assets/default/weapon.svg"}); + } + else if (this.type === "skill") { + await this.updateSource({img: "systems/rmss/assets/default/skill.svg"}); + } + else if (this.type === "skill_category") { + await this.updateSource({img: "systems/rmss/assets/default/skill_category.svg"}); + } + else if (this.type === "spell") { + await this.updateSource({img: "systems/rmss/assets/default/spell.svg"}); + } + else if (this.type === "herb_or_poison") { + await this.updateSource({img: "systems/rmss/assets/default/herb_or_poison.svg"}); + } + else if (this.type === "transport") { + await this.updateSource({img: "systems/rmss/assets/default/transport.svg"}); + } + } + } - _prepareSkillCategoryData(itemData) { - if (itemData.type !== 'skill_category') return; - console.log("rmss | item.js | Preparing Skill Category Data for: " + itemData.name); - // Calculate Skill Category Total Bonus - this.calculateSkillCategoryTotalBonus(itemData); + prepareDerivedData() { + const itemData = this; + const systemData = itemData.system; + const flags = itemData.flags.rmss || {}; + + // Make separate methods for each item type to keep things organized. + + if (itemData.type === "skill") { + this._prepareSkillCategoryData(itemData); } - _prepareSkillData(itemData) { - if (itemData.type !== 'skill') return; - - console.log("rmss | item.js | Preparing Skill Data for: " + itemData.name); - - // Make modifications to data here. For example: - const systemData = itemData.system; - - // Calculate Skill Category Bonus - this.calculateSelectedSkillCategoryBonus(itemData); - - // Calculate Skill Total Bonus - this.calculateSkillTotalBonus(itemData); + if (itemData.type === "skill") { + this._prepareSkillData(itemData); } + } - calculateSkillCategoryTotalBonus(itemData) { - if (this.type === "skill_category") { - console.log("rmss | item.js | Calculating Skill Category Total Bonus for: " + itemData.name); - const systemData = itemData.system; - itemData.system.total_bonus = Number(systemData.rank_bonus)+Number(systemData.stat_bonus)+Number(systemData.prof_bonus)+Number(systemData.special_bonus_1)+Number(systemData.special_bonus_2); + _prepareSkillCategoryData(itemData) { + if (itemData.type !== "skill_category") return; + console.log(`rmss | item.js | Preparing Skill Category Data for: ${itemData.name}`); + // Calculate Skill Category Total Bonus + this.calculateSkillCategoryTotalBonus(itemData); + } - } + _prepareSkillData(itemData) { + if (itemData.type !== "skill") return; + console.log(`rmss | item.js | Preparing Skill Data for: ${itemData.name}`); + // Make modifications to data here. For example: + // const systemData = itemData.system; + // Calculate Skill Category Bonus + this.calculateSelectedSkillCategoryBonus(itemData); + // Calculate Skill Total Bonus + this.calculateSkillTotalBonus(itemData); + } + + calculateSkillCategoryTotalBonus(itemData) { + if (this.type === "skill_category") { + console.log(`rmss | item.js | Calculating Skill Category Total Bonus for: ${itemData.name}`); + const systemData = itemData.system; + itemData.system.total_bonus = Number(systemData.rank_bonus) + + Number(systemData.stat_bonus) + + Number(systemData.prof_bonus) + + Number(systemData.special_bonus_1) + + Number(systemData.special_bonus_2); } + } - calculateSkillTotalBonus(itemData) { - if (this.type === "skill") { - const systemData = itemData.system; - - console.log("rmss | item.js | Calculating Skill Total Bonus for: " + itemData.name) - itemData.system.total_bonus = Number(systemData.rank_bonus)+Number(systemData.category_bonus)+Number(systemData.item_bonus)+Number(systemData.special_bonus_1)+Number(systemData.special_bonus_2); - } + calculateSkillTotalBonus(itemData) { + if (this.type === "skill") { + const systemData = itemData.system; + console.log(`rmss | item.js | Calculating Skill Total Bonus for: ${itemData.name}`); + itemData.system.total_bonus = Number(systemData.rank_bonus) + + Number(systemData.category_bonus) + + Number(systemData.item_bonus) + + Number(systemData.special_bonus_1) + + Number(systemData.special_bonus_2); } + } - calculateSelectedSkillCategoryBonus(itemData) { - if (this.isEmbedded === null) { - console.log("rmss | item.js | Skill " + this.name + " has no owner. Not calculating Skill Category bonus"); - } - else - { - const items = this.parent.items; - console.log("rmss | item.js | Skill " + this.name + " has owner, calculating skill category bonus."); - for (const item of items) { - if (item.type === "skill_category" && item._id === itemData.system.category) { - console.log("rmss | item.js | Calculating Skill Category bonus for skill: " + this.name); - this.system.category_bonus = item.system.total_bonus; - } - } + calculateSelectedSkillCategoryBonus(itemData) { + if (this.isEmbedded === null) { + console.log(`rmss | item.js | Skill ${this.name} has no owner. Not calculating Skill Category bonus`); + } + else + { + const items = this.parent.items; + console.log(`rmss | item.js | Skill ${this.name} has owner, calculating skill category bonus.`); + for (const item of items) { + if (item.type === "skill_category" && item._id === itemData.system.category) { + console.log(`rmss | item.js | Calculating Skill Category bonus for skill: ${this.name}`); + this.system.category_bonus = item.system.total_bonus; } + } } -} \ No newline at end of file + } +} diff --git a/rmss/module/sheets/actors/rmss_player_sheet.js b/rmss/module/sheets/actors/rmss_player_sheet.js index fb06c18..283ac2f 100644 --- a/rmss/module/sheets/actors/rmss_player_sheet.js +++ b/rmss/module/sheets/actors/rmss_player_sheet.js @@ -1,306 +1,390 @@ export default class RMSSPlayerSheet extends ActorSheet { - - // Override Default Options, Set CSS Classes, Set Default Sheet, Set up Sheet Tabs - static get defaultOptions() { - return mergeObject(super.defaultOptions, { - template: "systems/rmss/templates/sheets/actors/rmss-character-sheet.html", - classes: ["rmss", "sheet", "actor"], - tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "features" }] - }); - } - - // Make the data available to the sheet template - getData() { - const context = super.getData(); - - // Use a safe clone of the actor data for further operations. - const actorData = this.actor.toObject(false); - // Add the actor's data to context.data for easier access, as well as flags. - context.system = actorData.system; - context.flags = actorData.flags; - - // Prepare character data and items. - if (actorData.type == 'character') { - this._prepareItems(context); - this._prepareCharacterData(context); - } - - // Prepare NPC data and items. - if (actorData.type == 'npc') { - this._prepareItems(context); - } - return context; - } - - //Override this method to check for duplicates when things are dragged to the sheet - // We don't want duplicate skills and skill categories. - async _onDropItem(event, data) { - - // Reconstruct the item from the event - const newitem = await Item.implementation.fromDropData(data); - const itemData = newitem.toObject(); - - // To Do: Seperate Skills and Skill Categories. Increment Counts for items - if (itemData.type === "skill_category"){ + // Override Default Options, Set CSS Classes, Set Default Sheet, Set up Sheet Tabs + static get defaultOptions() { + return mergeObject(super.defaultOptions, { + width: 860, + height: 780, + template: "systems/rmss/templates/sheets/actors/rmss-character-sheet.html", + classes: ["rmss", "sheet", "actor"], + tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "features" }] + }); + } - // Get the already owned Items from the actor and push into an array - const owneditems = this.object.getOwnedItemsByType("skill_category"); + // Make the data available to the sheet template + async getData() { + const context = super.getData(); - var ownedskillcatlist = Object.values(owneditems); - - // Check if the dragged item is not in the array and not owned - if (!ownedskillcatlist.includes(itemData.name)) { - console.log("Not Owned!"); - super._onDropItem(event, data); - } - } else if ( itemData.type === "skill") { - // Get the already owned Items from the actor and push into an array - const owneditems = this.object.getOwnedItemsByType("skill"); + // Use a safe clone of the actor data for further operations. + const actorData = this.actor.toObject(false); - var ownedskilllist = Object.values(owneditems); + let enrichedDescription = await TextEditor.enrichHTML(this.actor.system.description, {async: true}); - // Check if the dragged item is not in the array and not owned - if (!ownedskilllist.includes(itemData.name)) { - console.log("Not Owned!"); - super._onDropItem(event, data); - } - } - else { - super._onDropItem(event, data); - } + // Add the actor's data to context.data for easier access, as well as flags. + context.system = actorData.system; + context.flags = actorData.flags; + context.enrichedDescription = enrichedDescription; + + // Prepare character data and items. + if (actorData.type === "character") { + this._prepareItems(context); + this._prepareCharacterData(context); } - _prepareCharacterData(context) { + // Prepare NPC data and items. + if (actorData.type === "npc") { + this._prepareItems(context); } - - _prepareItems(context) { - console.log("rmss | rmss_player_sheet.js | Preparing items for: "+ this.name); - // Initialize containers. - const gear = []; - const playerskill= []; - const skillcat = []; - const weapons = []; - const armor = []; - const herbs = []; - const spells = []; - const equipables = []; - - // Iterate through items, allocating to containers - for (let i of context.items) { - i.img = i.img || DEFAULT_TOKEN; - // Append to gear. - if (i.type === 'item') { - gear.push(i); - } - else if (i.type === 'weapon') { - weapons.push(i); - } - else if (i.type === 'herb_or_poison') { - herbs.push(i); - } - // Append to skill categories. - else if (i.type === 'skill_category') { - skillcat.push(i); - } - // Append to playerskill - else if (i.type === 'skill') { - playerskill.push(i); - } - else if (i.type === 'armor') { - armor.push(i); - } - else if (i.type === 'spell') { - spells.push(i); - } - } - - - // Sort Skill/Skillcat Arrays - skillcat.sort(function (a, b){ - if (a.name < b.name) { - return -1; - } - if (a.name > b.name) { - return 1; - } - return 0; - }); + return context; + } - playerskill.sort(function (a, b){ - if (a.name < b.name) { - return -1; - } - if (a.name > b.name) { - return 1; - } - return 0; - }); + // Override this method to check for duplicates when things are dragged to the sheet + // We don't want duplicate skills and skill categories. + async _onDropItem(event, data) { - // Assign and return - context.gear = gear; - context.skillcat = skillcat; - context.playerskill = playerskill; - context.weapons = weapons; - context.armor = armor; - context.herbs = herbs; - context.spells = spells; + // Reconstruct the item from the event + const newitem = await Item.implementation.fromDropData(data); + const itemData = newitem.toObject(); + + // To Do: Seperate Skills and Skill Categories. Increment Counts for items + if (itemData.type === "skill_category") { + + // Get the already owned Items from the actor and push into an array + const owneditems = this.object.getOwnedItemsByType("skill_category"); + + let ownedskillcatlist = Object.values(owneditems); + + // Check if the dragged item is not in the array and not owned + if (!ownedskillcatlist.includes(itemData.name)) { + console.log("Not Owned!"); + super._onDropItem(event, data); + } + } else if ( itemData.type === "skill") { + // Get the already owned Items from the actor and push into an array + const owneditems = this.object.getOwnedItemsByType("skill"); + + let ownedskilllist = Object.values(owneditems); + + // Check if the dragged item is not in the array and not owned + if (!ownedskilllist.includes(itemData.name)) { + console.log("Not Owned!"); + super._onDropItem(event, data); + } } - - activateListeners(html) { - super.activateListeners(html); - - // Render the item sheet for viewing/editing prior to the editable check. - html.find('.item-edit').click(ev => { - const item = this.actor.items.get(ev.currentTarget.getAttribute("data-item-id")); - //console.log(this); - item.sheet.render(true); - }); - - // ------------------------------------------------------------- - // Everything below here is only needed if the sheet is editable - if (!this.isEditable) return; - - // Add Item - html.find('.item-create').click(this._onItemCreate.bind(this)); - - // Delete Item - html.find('.item-delete').click(ev => { - console.log(ev.currentTarget.getAttribute("data-item-id")); - const item = this.actor.items.get(ev.currentTarget.getAttribute("data-item-id")); - item.delete(); - }); - - // Check/Uncheck Favorite Skill - html.find('.skill-favorite').click(ev => { - const item = this.actor.items.get(ev.currentTarget.getAttribute("data-item-id")); - console.log(item); - console.log("Before change: " + item.system.favorite); - if (item.system.favorite === true) { - console.log("Setting False"); - item.update({system: {"favorite": false}}); - } else { - console.log("Setting True"); - item.update({system: {"favorite": true}}); - } - console.log("After change: " + item.system.favorite); - }); - - // Check/Uncheck Favorite Spell - html.find('.spell-favorite').click(ev => { - const item = this.actor.items.get(ev.currentTarget.getAttribute("data-item-id")); - console.log(item); - console.log("Before change: " + item.system.favorite); - if (item.system.favorite === true) { - console.log("Setting False"); - item.update({system: {"favorite": false}}); - } else { - console.log("Setting True"); - item.update({system: {"favorite": true}}); - } - console.log("After change: " + item.system.favorite); - }); - - // Equip/Unequip Item - html.find('.equippable').click(ev => { - const item = this.actor.items.get(ev.currentTarget.getAttribute("data-item-id")); - console.log(item); - console.log("Before change: " + item.system.equipped); - if (item.system.equipped === true) { - console.log("Setting False"); - item.update({system: {"equipped": false}}); - } else { - console.log("Setting True"); - item.update({system: {"equipped": true}}); - } - console.log("After change: " + item.system.equipped); - }); - - // Change New Ranks value when clicked in player sheet. From 0-3. - html.find('.skill-newrank').click(ev => { - const item = this.actor.items.get(ev.currentTarget.getAttribute("data-item-id")); - - console.log("Firing in the Player Sheet"); - console.log(ev.currentTarget.getAttribute("value")); - console.log(ev.currentTarget.getAttribute("data-item-id")); - - switch(ev.currentTarget.getAttribute("value")) { - case "0": - console.log("Skill NewRanks is 0 setting to 1"); - item.update({system: {new_ranks:{ "value": 1 }}}); - break; - - case "1": - console.log("Skill NewRanks is 1 setting to 2"); - item.update({system: {new_ranks:{ "value": 2 }}}); - break; - - case "2": - console.log("Skill NewRanks is 2 setting to 3"); - item.update({system: {new_ranks:{ "value": 3 }}}); - break; - - case "3": - console.log("Skill NewRanks is 3 setting to 0"); - item.update({system: {new_ranks:{ "value": 0 }}}); - break; - } - }); - - // Change New Ranks value when clicked in player sheet. From 0-3. - html.find('.skillcategory-newrank').click(ev => { - const item = this.actor.items.get(ev.currentTarget.getAttribute("data-item-id")); - - console.log("Firing in the Player Sheet"); - console.log(ev.currentTarget.getAttribute("value")); - console.log(ev.currentTarget.getAttribute("data-item-id")); - - switch(ev.currentTarget.getAttribute("value")) { - case "0": - console.log("Skill Category NewRanks is 0 setting to 1"); - item.update({system: {new_ranks:{ "value": 1 }}}); - break; - - case "1": - console.log("Skill Category NewRanks is 1 setting to 2"); - item.update({system: {new_ranks:{ "value": 2 }}}); - break; - - case "2": - console.log("Skill Category NewRanks is 2 setting to 3"); - item.update({system: {new_ranks:{ "value": 3 }}}); - break; - - case "3": - console.log("Skill Category NewRanks is 3 setting to 0"); - item.update({system: {new_ranks:{ "value": 0 }}}); - break; - } - }); + else { + super._onDropItem(event, data); } - - async _onItemCreate(event) { - event.preventDefault(); - const header = event.currentTarget; - - // Get the type of item to create. - const type = header.dataset.type; - - // Grab any data associated with this control. - const data = duplicate(header.dataset); - - // Initialize a default name. - const name = `New ${type.capitalize()}`; - - // Prepare the item object. - const itemData = { - name: name, - type: type, - data: data - }; - // Remove the type from the dataset since it's in the itemData.type prop. - delete itemData.data.type; - // Finally, create the item! - return await Item.create(itemData, {parent: this.actor}); + } + + _prepareCharacterData(context) { + // Calculate Power Point Exhaustion + let powerpointPercentage = (Number(context.system.attributes.power_points.current) / Number(context.system.attributes.power_points.max)) * 100; + + console.log(true); + + switch (true) { + case (powerpointPercentage < 25): + context.system.attributes.power_points.modifier = "PP Exhaustion Penalty: -30 "; + break; + case (powerpointPercentage < 50): + context.system.attributes.power_points.modifier = "PP Exhaustion Penalty: -20 "; + break; + case (powerpointPercentage < 75): + console.log("Less than 75"); + context.system.attributes.power_points.modifier = "PP Exhaustion Penalty: -10 "; + break; + default: + console.log("Setting Default"); + context.system.attributes.power_points.modifier = "PP Exhaustion Penalty: 0 "; } -} \ No newline at end of file + + // Calculate Exhaustion Point Penalty + let exhaustionPercentage = (Number(context.system.attributes.exhaustion_points.current) / Number(context.system.attributes.exhaustion_points.max)) * 100; + + console.log(true); + + switch (true) { + case (exhaustionPercentage < 1): + context.system.attributes.exhaustion_points.modifier = "Exhaustion Penalty: -100 "; + break; + case (exhaustionPercentage < 10): + context.system.attributes.exhaustion_points.modifier = "Exhaustion Penalty: -60 "; + break; + case (exhaustionPercentage < 25): + context.system.attributes.exhaustion_points.modifier = "Exhaustion Penalty: -30 "; + break; + case (exhaustionPercentage < 50): + context.system.attributes.exhaustion_points.modifier = "Exhaustion Penalty: -15 "; + break; + case (exhaustionPercentage < 75): + console.log("Less than 75"); + context.system.attributes.exhaustion_points.modifier = "Exhaustion Penalty: -5 "; + break; + default: + console.log("Setting Default"); + context.system.attributes.exhaustion_points.modifier = "Exhaustion Penalty: 0 "; + } + + } + + _prepareItems(context) { + console.log(`rmss | rmss_player_sheet.js | Preparing items for: ${this.name}`); + // Initialize containers. + const gear = []; + const playerskill= []; + const skillcat = []; + const weapons = []; + const armor = []; + const herbs = []; + const spells = []; + const equipables = []; + + // Iterate through items, allocating to containers + for (let i of context.items) { + i.img = i.img || DEFAULT_TOKEN; + // Append to gear. + if (i.type === "item") { + gear.push(i); + } + else if (i.type === "weapon") { + weapons.push(i); + } + else if (i.type === "herb_or_poison") { + herbs.push(i); + } + // Append to skill categories. + else if (i.type === "skill_category") { + skillcat.push(i); + } + // Append to playerskill + else if (i.type === "skill") { + playerskill.push(i); + } + else if (i.type === "armor") { + armor.push(i); + } + else if (i.type === "spell") { + spells.push(i); + } + } + + + // Sort Skill/Skillcat Arrays + skillcat.sort(function(a, b) { + if (a.name < b.name) { + return -1; + } + if (a.name > b.name) { + return 1; + } + return 0; + }); + + playerskill.sort(function(a, b) { + if (a.name < b.name) { + return -1; + } + if (a.name > b.name) { + return 1; + } + return 0; + }); + + // Assign and return + context.gear = gear; + context.skillcat = skillcat; + context.playerskill = playerskill; + context.weapons = weapons; + context.armor = armor; + context.herbs = herbs; + context.spells = spells; + } + + async renderCharacterSettings(data) { + console.log(data); + const configSheet = await renderTemplate("systems/rmss/templates/sheets/actors/dialogs/actor-settings.html", data); + return (configSheet); + } + + activateListeners(html) { + super.activateListeners(html); + + // Render the item sheet for viewing/editing prior to the editable check. + html.find(".item-edit").click(ev => { + const item = this.actor.items.get(ev.currentTarget.getAttribute("data-item-id")); + item.sheet.render(true); + }); + + // ------------------------------------------------------------- + // Everything below here is only needed if the sheet is editable + if (!this.isEditable) return; + + // Add Item + html.find(".item-create").click(this._onItemCreate.bind(this)); + + // Delete Item + html.find(".item-delete").click(ev => { + console.log(ev.currentTarget.getAttribute("data-item-id")); + const item = this.actor.items.get(ev.currentTarget.getAttribute("data-item-id")); + item.delete(); + }); + + // Show Sheet Settings + html.find(".import-skillcats").click(async ev => { + + let selectOptions = {}; + for (const pack of game.packs) { + selectOptions[pack.metadata.id] = pack.metadata.label; + } + + new game.rmss.applications.RMSSActorSheetConfig(selectOptions, this.actor).render(true); + }); + + // Check/Uncheck Favorite Skill + html.find(".skill-favorite").click(ev => { + const item = this.actor.items.get(ev.currentTarget.getAttribute("data-item-id")); + console.log(item); + console.log(`Before change: ${item.system.favorite}`); + if (item.system.favorite === true) { + console.log("Setting False"); + item.update({system: {favorite: false}}); + } else { + console.log("Setting True"); + item.update({system: {favorite: true}}); + } + console.log(`After change: ${item.system.favorite}`); + }); + + // Check/Uncheck Favorite Spell + html.find(".spell-favorite").click(ev => { + const item = this.actor.items.get(ev.currentTarget.getAttribute("data-item-id")); + console.log(item); + console.log(`Before change: ${item.system.favorite}`); + if (item.system.favorite === true) { + console.log("Setting False"); + item.update({system: {favorite: false}}); + } else { + console.log("Setting True"); + item.update({system: {favorite: true}}); + } + console.log(`After change: ${item.system.favorite}`); + }); + + // Equip/Unequip Weapon/Armor + html.find(".equippable").click(ev => { + const item = this.actor.items.get(ev.currentTarget.getAttribute("data-item-id")); + console.log(item); + console.log(`Before change: ${item.system.equipped}`); + if (item.system.equipped === true) { + console.log("Setting False"); + item.update({system: {equipped: false}}); + } else { + console.log("Setting True"); + item.update({system: {equipped: true}}); + } + console.log(`After change: ${item.system.equipped}`); + }); + + // Wear/Remove Item + html.find(".wearable").click(ev => { + const item = this.actor.items.get(ev.currentTarget.getAttribute("data-item-id")); + console.log(item); + console.log(`Before change: ${item.system.equipped}`); + if (item.system.worn === true) { + console.log("Setting False"); + item.update({system: {worn: false}}); + } else { + console.log("Setting True"); + item.update({system: {worn: true}}); + } + console.log(`After change: ${item.system.equipped}`); + }); + + // Change New Ranks value when clicked in player sheet. From 0-3. + html.find(".skill-newrank").click(ev => { + const item = this.actor.items.get(ev.currentTarget.getAttribute("data-item-id")); + + console.log("Firing in the Player Sheet"); + console.log(ev.currentTarget.getAttribute("value")); + console.log(ev.currentTarget.getAttribute("data-item-id")); + + switch (ev.currentTarget.getAttribute("value")) { + case "0": + console.log("Skill NewRanks is 0 setting to 1"); + item.update({system: {new_ranks: { value: 1 }}}); + break; + + case "1": + console.log("Skill NewRanks is 1 setting to 2"); + item.update({system: {new_ranks: { value: 2 }}}); + break; + + case "2": + console.log("Skill NewRanks is 2 setting to 3"); + item.update({system: {new_ranks: { value: 3 }}}); + break; + + case "3": + console.log("Skill NewRanks is 3 setting to 0"); + item.update({system: {new_ranks: { value: 0 }}}); + break; + } + }); + + // Change New Ranks value when clicked in player sheet. From 0-3. + html.find(".skillcategory-newrank").click(ev => { + const item = this.actor.items.get(ev.currentTarget.getAttribute("data-item-id")); + + console.log("Firing in the Player Sheet"); + console.log(ev.currentTarget.getAttribute("value")); + console.log(ev.currentTarget.getAttribute("data-item-id")); + + switch (ev.currentTarget.getAttribute("value")) { + case "0": + console.log("Skill Category NewRanks is 0 setting to 1"); + item.update({system: {new_ranks: { value: 1 }}}); + break; + + case "1": + console.log("Skill Category NewRanks is 1 setting to 2"); + item.update({system: {new_ranks: { value: 2 }}}); + break; + + case "2": + console.log("Skill Category NewRanks is 2 setting to 3"); + item.update({system: {new_ranks: { value: 3 }}}); + break; + + case "3": + console.log("Skill Category NewRanks is 3 setting to 0"); + item.update({system: {new_ranks: { value: 0 }}}); + break; + } + }); + } + + async _onItemCreate(event) { + event.preventDefault(); + const header = event.currentTarget; + + // Get the type of item to create. + const type = header.dataset.type; + + // Grab any data associated with this control. + const data = duplicate(header.dataset); + + // Initialize a default name. + const name = `New ${type.capitalize()}`; + + // Prepare the item object. + const itemData = { + name: name, + type: type, + data: data + }; + // Remove the type from the dataset since it's in the itemData.type prop. + delete itemData.data.type; + // Finally, create the item! + return await Item.create(itemData, {parent: this.actor}); + } +} diff --git a/rmss/module/sheets/actors/rmss_player_sheet_config.js b/rmss/module/sheets/actors/rmss_player_sheet_config.js new file mode 100644 index 0000000..8906fc2 --- /dev/null +++ b/rmss/module/sheets/actors/rmss_player_sheet_config.js @@ -0,0 +1,55 @@ +export default class RMSSActorSheetConfig extends FormApplication { + + constructor(selectOptions, character) { + super(); + this.selectOptions = selectOptions; + this.character = character; + } + + static get defaultOptions() { + return mergeObject(super.defaultOptions, { + classes: ["form"], + popOut: true, + template: "systems/rmss/templates/sheets/actors/apps/actor-settings.html" + }); + } + + getData() { + // Send data to the template + return { + selectOptions: this.selectOptions + }; + } + + activateListeners(html) { + super.activateListeners(html); + } + + async _updateObject(event, formData) { + console.log("Deleting Old Skill Categories."); + for (const item of this.character.items) { + if (item.type === "skill_category") { + item.delete(); + } + } + + const pack = game.packs.get(formData.selectOptions); + const skillCategoryData = await pack.getIndex(); + + console.log("Importing New Skill Categories."); + + for (const sc of skillCategoryData) { + const newitem = await pack.getDocument(sc._id); + + let newDocuments = []; + if (newitem.type === "skill_category") { + console.log(newitem); + newDocuments.push(newitem); + } + if (newDocuments.length > 0) { + await Item.createDocuments(newDocuments, {parent: this.character}); + } + } + } +} + diff --git a/rmss/module/sheets/items/rmss_armor_sheet.js b/rmss/module/sheets/items/rmss_armor_sheet.js index 1968871..0d4cbe6 100644 --- a/rmss/module/sheets/items/rmss_armor_sheet.js +++ b/rmss/module/sheets/items/rmss_armor_sheet.js @@ -1,36 +1,36 @@ // Our Item Sheet extends the default export default class RMSSArmorSheet extends ItemSheet { - // Set the height and width - static get defaultOptions() { - return mergeObject(super.defaultOptions, { - width: 530, - height: 440, - template: "systems/rmss/templates/sheets/items/rmss-armor-sheet.html", - classes: ["rmss", "sheet", "item"] - }); - } - - // If our sheet is called here it is. - get template() { - return `systems/rmss/templates/sheets/items/rmss-armor-sheet.html`; - } + // Set the height and width + static get defaultOptions() { + return mergeObject(super.defaultOptions, { + width: 530, + height: 440, + template: "systems/rmss/templates/sheets/items/rmss-armor-sheet.html", + classes: ["rmss", "sheet", "item"] + }); + } - // Make the data available to the sheet template - async getData() { - const baseData = await super.getData(); + // If our sheet is called here it is. + get template() { + return "systems/rmss/templates/sheets/items/rmss-armor-sheet.html"; + } - var enrichedDescription = await TextEditor.enrichHTML(this.item.system.description, {async: true}); + // Make the data available to the sheet template + async getData() { + const baseData = await super.getData(); - let sheetData = { - owner: this.item.isOwner, - editable :this.isEditable, - item: baseData.item, - system: baseData.item.system, - config: CONFIG.rmss, - enrichedDescription: enrichedDescription - }; + let enrichedDescription = await TextEditor.enrichHTML(this.item.system.description, {async: true}); - return sheetData; - } -} \ No newline at end of file + let sheetData = { + owner: this.item.isOwner, + editable: this.isEditable, + item: baseData.item, + system: baseData.item.system, + config: CONFIG.rmss, + enrichedDescription: enrichedDescription + }; + + return sheetData; + } +} diff --git a/rmss/module/sheets/items/rmss_herb_or_poison_sheet.js b/rmss/module/sheets/items/rmss_herb_or_poison_sheet.js index 2f2b4fb..1c32ac8 100644 --- a/rmss/module/sheets/items/rmss_herb_or_poison_sheet.js +++ b/rmss/module/sheets/items/rmss_herb_or_poison_sheet.js @@ -1,36 +1,36 @@ // Our Item Sheet extends the default export default class RMSSHerbAndPoisonSheet extends ItemSheet { - // Set the height and width - static get defaultOptions() { - return mergeObject(super.defaultOptions, { - width: 530, - height: 440, - template: "systems/rmss/templates/sheets/items/rmss-herb-or-poison-sheet.html", - classes: ["rmss", "sheet", "item"] - }); - } - - // If our sheet is called here it is. - get template() { - return `systems/rmss/templates/sheets/items/rmss-herb-or-poison-sheet.html`; - } + // Set the height and width + static get defaultOptions() { + return mergeObject(super.defaultOptions, { + width: 530, + height: 440, + template: "systems/rmss/templates/sheets/items/rmss-herb-or-poison-sheet.html", + classes: ["rmss", "sheet", "item"] + }); + } - // Make the data available to the sheet template - async getData() { - const baseData = await super.getData(); + // If our sheet is called here it is. + get template() { + return "systems/rmss/templates/sheets/items/rmss-herb-or-poison-sheet.html"; + } - var enrichedDescription = await TextEditor.enrichHTML(this.item.system.description, {async: true}); + // Make the data available to the sheet template + async getData() { + const baseData = await super.getData(); - let sheetData = { - owner: this.item.isOwner, - editable :this.isEditable, - item: baseData.item, - system: baseData.item.system, - config: CONFIG.rmss, - enrichedDescription: enrichedDescription - }; + let enrichedDescription = await TextEditor.enrichHTML(this.item.system.description, {async: true}); - return sheetData; - } -} \ No newline at end of file + let sheetData = { + owner: this.item.isOwner, + editable: this.isEditable, + item: baseData.item, + system: baseData.item.system, + config: CONFIG.rmss, + enrichedDescription: enrichedDescription + }; + + return sheetData; + } +} diff --git a/rmss/module/sheets/items/rmss_item_sheet.js b/rmss/module/sheets/items/rmss_item_sheet.js index 7bcc34a..2eda346 100644 --- a/rmss/module/sheets/items/rmss_item_sheet.js +++ b/rmss/module/sheets/items/rmss_item_sheet.js @@ -1,36 +1,36 @@ // Our Item Sheet extends the default export default class RMSSItemSheet extends ItemSheet { - // Set the height and width - static get defaultOptions() { - return mergeObject(super.defaultOptions, { - width: 530, - height: 440, - template: "systems/rmss/templates/sheets/items/rmss-item-sheet.html", - classes: ["rmss", "sheet", "item"] - }); - } - - // If our sheet is called here it is. - get template() { - return `systems/rmss/templates/sheets/items/rmss-item-sheet.html`; - } + // Set the height and width + static get defaultOptions() { + return mergeObject(super.defaultOptions, { + width: 530, + height: 440, + template: "systems/rmss/templates/sheets/items/rmss-item-sheet.html", + classes: ["rmss", "sheet", "item"] + }); + } - // Make the data available to the sheet template - async getData() { - const baseData = await super.getData(); + // If our sheet is called here it is. + get template() { + return "systems/rmss/templates/sheets/items/rmss-item-sheet.html"; + } - var enrichedDescription = await TextEditor.enrichHTML(this.item.system.description, {async: true}); + // Make the data available to the sheet template + async getData() { + const baseData = await super.getData(); - let sheetData = { - owner: this.item.isOwner, - editable :this.isEditable, - item: baseData.item, - system: baseData.item.system, - config: CONFIG.rmss, - enrichedDescription: enrichedDescription - }; + let enrichedDescription = await TextEditor.enrichHTML(this.item.system.description, {async: true}); - return sheetData; - } -} \ No newline at end of file + let sheetData = { + owner: this.item.isOwner, + editable: this.isEditable, + item: baseData.item, + system: baseData.item.system, + config: CONFIG.rmss, + enrichedDescription: enrichedDescription + }; + + return sheetData; + } +} diff --git a/rmss/module/sheets/items/rmss_transport_sheet.js b/rmss/module/sheets/items/rmss_transport_sheet.js index afa0493..08164df 100644 --- a/rmss/module/sheets/items/rmss_transport_sheet.js +++ b/rmss/module/sheets/items/rmss_transport_sheet.js @@ -1,36 +1,36 @@ // Our Item Sheet extends the default export default class RMSSTransportSheet extends ItemSheet { - // Set the height and width - static get defaultOptions() { - return mergeObject(super.defaultOptions, { - width: 530, - height: 440, - template: "systems/rmss/templates/sheets/items/rmss-transport-sheet.html", - classes: ["rmss", "sheet", "item"] - }); - } - - // If our sheet is called here it is. - get template() { - return `systems/rmss/templates/sheets/items/rmss-transport-sheet.html`; - } + // Set the height and width + static get defaultOptions() { + return mergeObject(super.defaultOptions, { + width: 530, + height: 440, + template: "systems/rmss/templates/sheets/items/rmss-transport-sheet.html", + classes: ["rmss", "sheet", "item"] + }); + } - // Make the data available to the sheet template - async getData() { - const baseData = await super.getData(); + // If our sheet is called here it is. + get template() { + return "systems/rmss/templates/sheets/items/rmss-transport-sheet.html"; + } - var enrichedDescription = await TextEditor.enrichHTML(this.item.system.description, {async: true}); + // Make the data available to the sheet template + async getData() { + const baseData = await super.getData(); - let sheetData = { - owner: this.item.isOwner, - editable :this.isEditable, - item: baseData.item, - system: baseData.item.system, - config: CONFIG.rmss, - enrichedDescription: enrichedDescription - }; + let enrichedDescription = await TextEditor.enrichHTML(this.item.system.description, {async: true}); - return sheetData; - } -} \ No newline at end of file + let sheetData = { + owner: this.item.isOwner, + editable: this.isEditable, + item: baseData.item, + system: baseData.item.system, + config: CONFIG.rmss, + enrichedDescription: enrichedDescription + }; + + return sheetData; + } +} diff --git a/rmss/module/sheets/items/rmss_weapon_sheet.js b/rmss/module/sheets/items/rmss_weapon_sheet.js index 4aa2e2d..8382025 100644 --- a/rmss/module/sheets/items/rmss_weapon_sheet.js +++ b/rmss/module/sheets/items/rmss_weapon_sheet.js @@ -1,36 +1,36 @@ // Our Item Sheet extends the default export default class RMSSWeaponSheet extends ItemSheet { - // Set the height and width - static get defaultOptions() { - return mergeObject(super.defaultOptions, { - width: 530, - height: 440, - template: "systems/rmss/templates/sheets/items/rmss-weapon-sheet.html", - classes: ["rmss", "sheet", "item"] - }); - } - - // If our sheet is called here it is. - get template() { - return `systems/rmss/templates/sheets/items/rmss-weapon-sheet.html`; - } + // Set the height and width + static get defaultOptions() { + return mergeObject(super.defaultOptions, { + width: 530, + height: 440, + template: "systems/rmss/templates/sheets/items/rmss-weapon-sheet.html", + classes: ["rmss", "sheet", "item"] + }); + } - // Make the data available to the sheet template - async getData() { - const baseData = await super.getData(); + // If our sheet is called here it is. + get template() { + return "systems/rmss/templates/sheets/items/rmss-weapon-sheet.html"; + } - var enrichedDescription = await TextEditor.enrichHTML(this.item.system.description, {async: true}); + // Make the data available to the sheet template + async getData() { + const baseData = await super.getData(); - let sheetData = { - owner: this.item.isOwner, - editable :this.isEditable, - item: baseData.item, - system: baseData.item.system, - config: CONFIG.rmss, - enrichedDescription: enrichedDescription - }; + let enrichedDescription = await TextEditor.enrichHTML(this.item.system.description, {async: true}); - return sheetData; - } -} \ No newline at end of file + let sheetData = { + owner: this.item.isOwner, + editable: this.isEditable, + item: baseData.item, + system: baseData.item.system, + config: CONFIG.rmss, + enrichedDescription: enrichedDescription + }; + + return sheetData; + } +} diff --git a/rmss/module/sheets/skills/rmss_skill_category_sheet.js b/rmss/module/sheets/skills/rmss_skill_category_sheet.js index dceb3a1..adfdaf9 100644 --- a/rmss/module/sheets/skills/rmss_skill_category_sheet.js +++ b/rmss/module/sheets/skills/rmss_skill_category_sheet.js @@ -1,132 +1,133 @@ // Our Item Sheet extends the default export default class RMSSSkillCategorySheet extends ItemSheet { - // Set the height and width - static get defaultOptions() { - return mergeObject(super.defaultOptions, { - width: 580, - height: 440, - template: "systems/rmss/templates/sheets/skills/rmss-skill-category-sheet.html", - classes: ["rmss", "sheet", "item"] - }); + // Set the height and width + static get defaultOptions() { + return mergeObject(super.defaultOptions, { + width: 580, + height: 440, + template: "systems/rmss/templates/sheets/skills/rmss-skill-category-sheet.html", + classes: ["rmss", "sheet", "item"] + }); + } + + // If our sheet is called here it is. + get template() { + return "systems/rmss/templates/sheets/skills/rmss-skill-category-sheet.html"; + } + + // Make the data available to the sheet template + async getData() { + const context = await super.getData(); + + // Get a list of stats that can be used as applicable stats + let applicableStatList = this.prepareApplicableStatNames(CONFIG); + + // Get the currently selected value for all three applicable stats + let firstApplicableStat = this.prepareApplicableSelectedStat("app_stat_1"); + let secondApplicableStat = this.prepareApplicableSelectedStat("app_stat_2"); + let thirdApplicableStat = this.prepareApplicableSelectedStat("app_stat_3"); + + // Build and apply the display string for Applicable Stats + let applicableStatText = + this.buildApplicableStatsText(firstApplicableStat, secondApplicableStat, thirdApplicableStat); + context.item.system.applicable_stats = applicableStatText; + + let enrichedDescription = await TextEditor.enrichHTML(this.item.system.description, {async: true}); + + let sheetData = { + owner: this.item.isOwner, + editable: this.isEditable, + item: context.item, + system: context.item.system, + config: CONFIG.rmss, + applicable_stat_list: applicableStatList, + applicable_stat_1_selected: firstApplicableStat, + applicable_stat_2_selected: secondApplicableStat, + applicable_stat_3_selected: thirdApplicableStat, + enrichedDescription: enrichedDescription + }; + return sheetData; + } + + async _setApplicableStat(item, ev) { + // Build a JSON Object from the selected tag value and selected name (item data attribute key) + let updateKey = ev.currentTarget.getAttribute("name"); + let updateData = ev.target.value; + + // Update Item Data + await item.update({[updateKey]: updateData}); + } + + // Each Skill Category can have up to three Applicable Stats that apply to it. We need to get a list of + // the Stat Shortnames from Config so the user can select which stats are applicable to this Skill Category + prepareApplicableStatNames(config) { + let applicableStatList = {None: "None"}; + for (const item in config.rmss.stats) { + applicableStatList[config.rmss.stats[item].shortname] = config.rmss.stats[item].shortname; } - - // If our sheet is called here it is. - get template() { - return `systems/rmss/templates/sheets/skills/rmss-skill-category-sheet.html`; + return applicableStatList; + } + + // Get the values for the currently selected Applicable Stat so we can display it on the Skill Category Sheet + // If nothing is selected return an empty string. + prepareApplicableSelectedStat(appStat) { + let applicableStatSelected = ""; + applicableStatSelected = this.item.system[appStat]; + return applicableStatSelected; + } + + // The character sheet has an information field that displays the applicable stats in the following format + // St/Ag/St. This method checks the current applicable stats and builds that field so + // it can be displayed to the user. + buildApplicableStatsText(firstAppStat, secondAppStat, thirdAppStat) { + if (firstAppStat === "None") { + return ("None"); } + else if (firstAppStat !== "None" && secondAppStat === "None") { + return (firstAppStat); + } + else if (firstAppStat !== "None" && secondAppStat !== "None" && thirdAppStat === "None" ) { + return (`${firstAppStat}/${secondAppStat}`); + } + else if (firstAppStat !== "None" && secondAppStat !== "None" && thirdAppStat !== "None" ) { + return (`${firstAppStat}/${secondAppStat}/${thirdAppStat}`); + } + else { + return ("None"); + } + } - // Make the data available to the sheet template - async getData() { - const context = await super.getData(); + activateListeners(html) { + super.activateListeners(html); - // Get a list of stats that can be used as applicable stats - var applicableStatList = this.prepareApplicableStatNames(CONFIG); + // ------------------------------------------------------------- + // Everything below here is only needed if the sheet is editable + if (!this.isEditable) return; - //Get the currently selected value for all three applicable stats - var firstApplicableStat = this.prepareApplicableSelectedStat("app_stat_1"); - var secondApplicableStat = this.prepareApplicableSelectedStat("app_stat_2"); - var thirdApplicableStat = this.prepareApplicableSelectedStat("app_stat_3"); + // Every time the user selects one of the Applicable Stat dropdowns + // fire an event to change the value in the Skill Category + html.find(".stat-selector").change(ev => { + this._setApplicableStat(this.item, ev); + }); - // Build and apply the display string for Applicable Stats - var applicableStatText = this.buildApplicableStatsText(firstApplicableStat, secondApplicableStat, thirdApplicableStat); - context.item.system.applicable_stats = applicableStatText; - - var enrichedDescription = await TextEditor.enrichHTML(this.item.system.description, {async: true}); - - let sheetData = { - owner: this.item.isOwner, - editable :this.isEditable, - item: context.item, - system: context.item.system, - config: CONFIG.rmss, - applicable_stat_list: applicableStatList, - applicable_stat_1_selected: firstApplicableStat, - applicable_stat_2_selected: secondApplicableStat, - applicable_stat_3_selected: thirdApplicableStat, - enrichedDescription: enrichedDescription - }; - return sheetData; - } - - async _setApplicableStat(item, ev) { - // Build a JSON Object from the selected tag value and selected name (item data attribute key) - var updateKey = ev.currentTarget.getAttribute("name"); - var updateData = ev.target.value; - - // Update Item Data - await item.update({[updateKey]: updateData}); - } - - // Each Skill Category can have up to three Applicable Stats that apply to it. We need to get a list of - // the Stat Shortnames from Config so the user can select which stats are applicable to this Skill Category - prepareApplicableStatNames(config) { - var applicableStatList = {None: "None"}; - for (const item in config.rmss.stats) { - applicableStatList[config.rmss.stats[item].shortname] = config.rmss.stats[item].shortname; - } - return applicableStatList; - } - - // Get the values for the currently selected Applicable Stat so we can display it on the Skill Category Sheet - // If nothing is selected return an empty string. - prepareApplicableSelectedStat(appStat) { - var applicableStatSelected = ""; - applicableStatSelected = this.item.system[appStat]; - return applicableStatSelected; - } - - // The character sheet has an information field that displays the applicable stats in the following format - // St/Ag/St. This method checks the current applicable stats and builds that field so - // it can be displayed to the user. - buildApplicableStatsText(firstAppStat, secondAppStat, thirdAppStat) { - if (firstAppStat === "None") { - return("None"); - } - else if (firstAppStat !== "None" && secondAppStat === "None") { - return(firstAppStat); - } - else if (firstAppStat !== "None" && secondAppStat !== "None" && thirdAppStat === "None" ) { - return(firstAppStat + "/" + secondAppStat ); - } - else if (firstAppStat !== "None" && secondAppStat !== "None" && thirdAppStat !== "None" ) { - return(firstAppStat + "/" + secondAppStat + "/" + thirdAppStat ); - } - else { - return("None"); - } - } - - activateListeners(html) { - super.activateListeners(html); - - // ------------------------------------------------------------- - // Everything below here is only needed if the sheet is editable - if (!this.isEditable) return; - - // Every time the user selects one of the Applicable Stat dropdowns - // fire an event to change the value in the Skill Category - html.find('.stat-selector').change(ev => { - this._setApplicableStat(this.item, ev); - }); - - // Catch the event when the user clicks one of the New Ranks Checkboxes in a Skill Category. - // It will increment by one or wrap back to zero on a value of three - html.find('.skillcategorysheet-newrank').click(ev => { - switch(ev.currentTarget.getAttribute("value")) { - case "0": - this.object.update({system: {new_ranks:{ "value": 1 }}}); - break; - case "1": - this.object.update({system: {new_ranks:{ "value": 2 }}}); - break; - case "2": - this.object.update({system: {new_ranks:{ "value": 3 }}}); - break; - case "3": - this.object.update({system: {new_ranks:{ "value": 0 }}}); - break; - } - }); - } -} \ No newline at end of file + // Catch the event when the user clicks one of the New Ranks Checkboxes in a Skill Category. + // It will increment by one or wrap back to zero on a value of three + html.find(".skillcategorysheet-newrank").click(ev => { + switch (ev.currentTarget.getAttribute("value")) { + case "0": + this.object.update({system: {new_ranks: { value: 1 }}}); + break; + case "1": + this.object.update({system: {new_ranks: { value: 2 }}}); + break; + case "2": + this.object.update({system: {new_ranks: { value: 3 }}}); + break; + case "3": + this.object.update({system: {new_ranks: { value: 0 }}}); + break; + } + }); + } +} diff --git a/rmss/module/sheets/skills/rmss_skill_sheet.js b/rmss/module/sheets/skills/rmss_skill_sheet.js index 36dfff8..7f31af9 100644 --- a/rmss/module/sheets/skills/rmss_skill_sheet.js +++ b/rmss/module/sheets/skills/rmss_skill_sheet.js @@ -1,115 +1,115 @@ // Our Item Sheet extends the default export default class RMSSSkillSheet extends ItemSheet { - // Set the height and width - static get defaultOptions() { - return mergeObject(super.defaultOptions, { - width: 530, - height: 440, - template: "systems/rmss/templates/sheets/skills/rmss-skill-sheet.html", - classes: ["rmss", "sheet", "item"] - }); + // Set the height and width + static get defaultOptions() { + return mergeObject(super.defaultOptions, { + width: 530, + height: 440, + template: "systems/rmss/templates/sheets/skills/rmss-skill-sheet.html", + classes: ["rmss", "sheet", "item"] + }); + } + + // If our sheet is called here it is. + get template() { + return "systems/rmss/templates/sheets/skills/rmss-skill-sheet.html"; + } + + // Make the data available to the sheet template + async getData() { + const baseData = await super.getData(); + + let enrichedDescription = await TextEditor.enrichHTML(this.item.system.description, {async: true}); + + // Get a list of the parent item's skill categories for the dropdown + let ownedSkillCategories = this.prepareSkillCategoryValues(); + + // Figure out if a valid Skill Category is already selected + let selectedSkillCategory = this.prepareSelectedSkillCategory(ownedSkillCategories, this.object.system.category); + + let sheetData = { + owner: this.item.isOwner, + editable: this.isEditable, + item: baseData.item, + system: baseData.item.system, + config: CONFIG.rmss, + owned_skillcats: ownedSkillCategories, + enrichedDescription: enrichedDescription, + selected_skillcat: selectedSkillCategory, + designations: CONFIG.rmss.skill_designations + }; + + return sheetData; + } + + activateListeners(html) { + super.activateListeners(html); + + // Catch the event when the user clicks one of the New Ranks Checkboxes in a Skill. + // It will increment by one or wrap back to zero on a value of three + html.find(".skillsheet-newrank").click(ev => { + switch (ev.currentTarget.getAttribute("value")) { + case "0": + this.object.update({system: {new_ranks: { value: 1 }}}); + break; + case "1": + this.object.update({system: {new_ranks: { value: 2 }}}); + break; + case "2": + this.object.update({system: {new_ranks: { value: 3 }}}); + break; + case "3": + this.object.update({system: {new_ranks: { value: 0 }}}); + break; + } + }); + } + + // Skills are related to Skill Categories so we need something to allow the user to choose that relationship + // If this Skill is owned then we will return a list of Skill Categories and allow them to choose + // Otherwise we'll just return 'Skill has no owner' + prepareSkillCategoryValues() { + let skillNoOwner = {None: "Skill Has No Owner"}; + + if (this.item.isEmbedded === null) { + return (skillNoOwner); } - - // If our sheet is called here it is. - get template() { - return `systems/rmss/templates/sheets/skills/rmss-skill-sheet.html`; + else + { + const skillCategories = this.item.parent.getOwnedItemsByType("skill_category"); + return (skillCategories); } + } - // Make the data available to the sheet template - async getData() { - const baseData = await super.getData(); + // Determine which Skill Category is selected and test that it is in the current list of categories. + // If it isn't set it to None. + prepareSelectedSkillCategory(ownedSkillCategories, selectedSkillCategory) { + let defaultSelectedCategory = "None"; + if (Object.keys(ownedSkillCategories).includes(selectedSkillCategory)) { + return (selectedSkillCategory); + } else { + return (defaultSelectedCategory); + } + } - var enrichedDescription = await TextEditor.enrichHTML(this.item.system.description, {async: true}); + // Populate the Skill Category Bonus field on the Skill Sheet. + // Iterate through the owned skill categories and if one of them matches the item id of currently + // selected skill category then set the Skill Category Bonus field to the Total Bonus field of the Skill Category + prepareSelectedSkillCategoryBonus(selected_skillcat) { + if (this.item.isEmbedded === null) { + console.log("Skill has no owner"); + } + else + { + const items = this.object.parent.items; - // Get a list of the parent item's skill categories for the dropdown - var ownedSkillCategories = this.prepareSkillCategoryValues(); - - // Figure out if a valid Skill Category is already selected - var selectedSkillCategory = this.prepareSelectedSkillCategory(ownedSkillCategories, this.object.system.category); - - let sheetData = { - owner: this.item.isOwner, - editable :this.isEditable, - item: baseData.item, - system: baseData.item.system, - config: CONFIG.rmss, - owned_skillcats: ownedSkillCategories, - enrichedDescription: enrichedDescription, - selected_skillcat: selectedSkillCategory, - designations: CONFIG.rmss.skill_designations - }; - - return sheetData; + for (const item of items) { + if (item.type === "skill_category" && item._id === selected_skillcat) { + console.log(`rmss | rmss_skill_sheet | Calculating Skill Category bonus for skill: ${this.object.name}`); + this.object.system.category_bonus = item.system.total_bonus; } - - activateListeners(html) { - super.activateListeners(html); - - // Catch the event when the user clicks one of the New Ranks Checkboxes in a Skill. - // It will increment by one or wrap back to zero on a value of three - html.find('.skillsheet-newrank').click(ev => { - switch(ev.currentTarget.getAttribute("value")) { - case "0": - this.object.update({system: {new_ranks:{ "value": 1 }}}); - break; - case "1": - this.object.update({system: {new_ranks:{ "value": 2 }}}); - break; - case "2": - this.object.update({system: {new_ranks:{ "value": 3 }}}); - break; - case "3": - this.object.update({system: {new_ranks:{ "value": 0 }}}); - break; - } - }); + } } - - // Skills are related to Skill Categories so we need something to allow the user to choose that relationship - // If this Skill is owned then we will return a list of Skill Categories and allow them to choose - // Otherwise we'll just return 'Skill has no owner' - prepareSkillCategoryValues() { - var skillNoOwner = {None: "Skill Has No Owner", }; - - if (this.item.isEmbedded === null) { - return(skillNoOwner); - } - else - { - const skillCategories = this.item.parent.getOwnedItemsByType("skill_category"); - return(skillCategories); - } - } - - // Determine which Skill Category is selected and test that it is in the current list of categories. - // If it isn't set it to None. - prepareSelectedSkillCategory(ownedSkillCategories, selectedSkillCategory) { - var defaultSelectedCategory = "None"; - if (Object.keys(ownedSkillCategories).includes(selectedSkillCategory)) { - return(selectedSkillCategory); - } else { - return(defaultSelectedCategory); - } - } - - // Populate the Skill Category Bonus field on the Skill Sheet. - // Iterate through the owned skill categories and if one of them matches the item id of currently select skill category - // then set the Skill Category Bonus field to the Total Bonus field of the Skill Category - prepareSelectedSkillCategoryBonus(selected_skillcat) { - if (this.item.isEmbedded === null) { - console.log("Skill has no owner"); - } - else - { - const items = this.object.parent.items; - - for (const item of items) { - if (item.type === "skill_category" && item._id === selected_skillcat) { - console.log("rmss | rmss_skill_sheet | Calculating Skill Category bonus for skill: " + this.object.name); - this.object.system.category_bonus = item.system.total_bonus; - } - } - } - } -} \ No newline at end of file + } +} diff --git a/rmss/module/sheets/spells/rmss_spell_sheet.js b/rmss/module/sheets/spells/rmss_spell_sheet.js index bbb36d1..c294f70 100644 --- a/rmss/module/sheets/spells/rmss_spell_sheet.js +++ b/rmss/module/sheets/spells/rmss_spell_sheet.js @@ -1,35 +1,35 @@ // Our Item Sheet extends the default export default class RMSSSpellSheet extends ItemSheet { - // Set the height and width - static get defaultOptions() { - return mergeObject(super.defaultOptions, { - width: 530, - height: 440, - classes: ["rmss", "sheet", "item"] - }); - } - - // If our sheet is called here it is. - get template() { - return `systems/rmss/templates/sheets/spells/rmss-spell-sheet.html`; - } + // Set the height and width + static get defaultOptions() { + return mergeObject(super.defaultOptions, { + width: 530, + height: 440, + classes: ["rmss", "sheet", "item"] + }); + } - // Make the data available to the sheet template - async getData() { - const baseData = await super.getData(); + // If our sheet is called here it is. + get template() { + return "systems/rmss/templates/sheets/spells/rmss-spell-sheet.html"; + } - var enrichedDescription = await TextEditor.enrichHTML(this.item.system.description, {async: true}); + // Make the data available to the sheet template + async getData() { + const baseData = await super.getData(); - let sheetData = { - owner: this.item.isOwner, - editable :this.isEditable, - item: baseData.item, - system: baseData.item.system, - config: CONFIG.rmss, - enrichedDescription: enrichedDescription - }; + let enrichedDescription = await TextEditor.enrichHTML(this.item.system.description, {async: true}); - return sheetData; - } -} \ No newline at end of file + let sheetData = { + owner: this.item.isOwner, + editable: this.isEditable, + item: baseData.item, + system: baseData.item.system, + config: CONFIG.rmss, + enrichedDescription: enrichedDescription + }; + + return sheetData; + } +} diff --git a/rmss/rmss.css b/rmss/rmss.css index 1bab685..04c8b12 100644 --- a/rmss/rmss.css +++ b/rmss/rmss.css @@ -65,6 +65,12 @@ align-items: center; padding: 1px; } +.settings-button, +.playersheet-settings { + font-family: Signika, sans-serif; + font-size: 12px; + margin-right: 6px; +} .resource-container { display: flex; flex-direction: row; @@ -231,7 +237,7 @@ } .items-grid-container { display: grid; - grid-template-columns: [name] 30% [quantity] 17% [weight] 17% [cost] 18% [controls] 18%; + grid-template-columns: [worn] 10% [name] 30% [quantity] 15% [weight] 15% [cost] 15% [controls] 15%; } .items-grid-container > div { font-family: Signika, sans-serif; @@ -245,11 +251,12 @@ flex-direction: row; justify-content: center; } -.items-grid-container > div:nth-child(10n+1), -.items-grid-container > div:nth-child(10n+2), -.items-grid-container > div:nth-child(10n+3), -.items-grid-container > div:nth-child(10n+4), -.items-grid-container > div:nth-child(10n+5) { +.items-grid-container > div:nth-child(12n+1), +.items-grid-container > div:nth-child(12n+2), +.items-grid-container > div:nth-child(12n+3), +.items-grid-container > div:nth-child(12n+4), +.items-grid-container > div:nth-child(12n+5), +.items-grid-container > div:nth-child(12n+6) { font-family: Signika, sans-serif; font-size: 12px; text-align: center; @@ -431,6 +438,23 @@ border-bottom: 1px solid; background-image: linear-gradient(rgba(0, 0, 0, 0.1) 0 0); } +.resistances-grid-container { + outline: 1px solid; + /* use instead of border */ + margin-top: 1px; + margin-left: 1px; + padding: 5px; + display: grid; + grid-template-columns: [Name] 40% [Value] 20% [Race_Mod] 20% [Total] 20%; +} +.resistances-grid-heading { + font-weight: bold; + border-bottom: 1px solid; + background-image: linear-gradient(rgba(0, 0, 0, 0.1) 0 0); +} +.resistance-input { + width: 50%; +} .skillcat-name, .skill-name, .item-name, diff --git a/rmss/rmss.js b/rmss/rmss.js index f24082a..46cc9f7 100644 --- a/rmss/rmss.js +++ b/rmss/rmss.js @@ -1,14 +1,11 @@ // Import Configuration Object -console.log("rmss | Importing configuration javascript"); -import {rmss} from "./module/config.js"; +import { rmss } from "./module/config.js"; // Import document classes. -console.log("rmss | Importing document classes"); import { RMSSActor } from "./module/documents/actor.js"; import { RMSSItem } from "./module/documents/item.js"; // Import Sheets -console.log("rmss | Importing actor and item sheet"); import RMSSItemSheet from "./module/sheets/items/rmss_item_sheet.js"; import RMSSArmorSheet from "./module/sheets/items/rmss_armor_sheet.js"; import RMSSTransportSheet from "./module/sheets/items/rmss_transport_sheet.js"; @@ -19,8 +16,9 @@ import RMSSSkillCategorySheet from "./module/sheets/skills/rmss_skill_category_s import RMSSSkillSheet from "./module/sheets/skills/rmss_skill_sheet.js"; import RMSSPlayerSheet from "./module/sheets/actors/rmss_player_sheet.js"; +import RMSSActorSheetConfig from "./module/sheets/actors/rmss_player_sheet_config.js"; -// Preload handlebars templates for character sheets +/** Preload handlebars templates for character sheets */ async function preloadHandlebarsTemplates() { const templatePaths = [ "systems/rmss/templates/sheets/actors/parts/actor-stats.html", @@ -42,68 +40,72 @@ async function preloadHandlebarsTemplates() { "systems/rmss/templates/sheets/actors/parts/actor-herbs.html", "systems/rmss/templates/sheets/actors/parts/actor-spells.html", "systems/rmss/templates/sheets/actors/parts/actor-fav-spells.html", - "systems/rmss/templates/sheets/actors/parts/actor-fav-items.html" + "systems/rmss/templates/sheets/actors/parts/actor-fav-items.html", + "systems/rmss/templates/sheets/actors/apps/actor-settings.html" ]; return loadTemplates(templatePaths); } // Hook the init function and set up our system -Hooks.once("init", function () { +Hooks.once("init", function() { console.log("rmss | Initialising Rolemaster Standard System"); - + // Load our custom actor and item classes console.log("rmss | Loading Rolemaster Actor and Item classes"); game.rmss = { RMSSActor, - RMSSItem + RMSSItem, + applications: { + RMSSActorSheetConfig + } }; - + // Define custom Document classes CONFIG.Actor.documentClass = RMSSActor; CONFIG.Item.documentClass = RMSSItem; - + // Make Config Data Available CONFIG.rmss = rmss; - + // Unregister Default Sheets console.log("rmss | Unregistering core sheets"); - + Items.unregisterSheet("core", ItemSheet); Actors.unregisterSheet("core", ActorSheet); - + // Register RMSS Sheets console.log("rmss | Registering RMSS sheets"); - + // Items - Items.registerSheet("rmss", RMSSItemSheet, {makeDefault: true, label: "rmss.entity_sheet.item", types: ['item']}); - Items.registerSheet("rmss", RMSSArmorSheet, {makeDefault: true, label: "rmss.entity_sheet.armor", types: ['armor']}); - Items.registerSheet("rmss", RMSSTransportSheet, {makeDefault: true, label: "rmss.entity_sheet.transport", types: ['transport']}); - Items.registerSheet("rmss", RMSSWeaponSheet, {makeDefault: true, label: "rmss.entity_sheet.weapon", types: ['weapon']}); - Items.registerSheet("rmss", RMSSHerbOrPoisonSheet, {makeDefault: true, label: "rmss.entity_sheet.herb_or_poison", types: ['herb_or_poison']}); - + Items.registerSheet("rmss", RMSSItemSheet, {makeDefault: true, label: "rmss.entity_sheet.item", types: ["item"]}); + Items.registerSheet("rmss", RMSSArmorSheet, {makeDefault: true, label: "rmss.entity_sheet.armor", types: ["armor"]}); + Items.registerSheet("rmss", RMSSTransportSheet, {makeDefault: true, label: "rmss.entity_sheet.transport", types: ["transport"]}); + Items.registerSheet("rmss", RMSSWeaponSheet, {makeDefault: true, label: "rmss.entity_sheet.weapon", types: ["weapon"]}); + Items.registerSheet("rmss", RMSSHerbOrPoisonSheet, {makeDefault: true, label: "rmss.entity_sheet.herb_or_poison", types: ["herb_or_poison"]}); + // Spells - Items.registerSheet("rmss", RMSSSpellSheet, {makeDefault: true, label: "rmss.entity_sheet.spell", types: ['spell']}); - + Items.registerSheet("rmss", RMSSSpellSheet, {makeDefault: true, label: "rmss.entity_sheet.spell", types: ["spell"]}); + // Skills - Items.registerSheet("rmss", RMSSSkillCategorySheet, {makeDefault: true, label: "rmss.entity_sheet.skill_category", types: ['skill_category']}); - Items.registerSheet("rmss", RMSSSkillSheet, {makeDefault: true, label: "rmss.entity_sheet.skill", types: ['skill']}); - + Items.registerSheet("rmss", RMSSSkillCategorySheet, {makeDefault: true, label: "rmss.entity_sheet.skill_category", types: ["skill_category"]}); + Items.registerSheet("rmss", RMSSSkillSheet, {makeDefault: true, label: "rmss.entity_sheet.skill", types: ["skill"]}); + // Actors - Actors.registerSheet("rmss", RMSSPlayerSheet, {makeDefault: true, label: "rmss.entity_sheet.player_characrer", types: ['character']}); - + Actors.registerSheet("rmss", RMSSPlayerSheet, {makeDefault: true, label: "rmss.entity_sheet.player_characrer", types: ["character"]}); + // Preload Handlebars Templates console.log("rmss | Preloading Handlebars Templates"); preloadHandlebarsTemplates(); - + // Handlebars Helpers - Handlebars.registerHelper('switch', function(value, options) { + Handlebars.registerHelper("switch", function(value, options) { this.switch_value = value; return options.fn(this); }); - - Handlebars.registerHelper('case', function(value, options) { - if (value == this.switch_value) { + + Handlebars.registerHelper("case", function(value, options) { + if (value === this.switch_value) { return options.fn(this); } }); -}); \ No newline at end of file +}); diff --git a/rmss/system.json b/rmss/system.json index 09b5951..5955493 100644 --- a/rmss/system.json +++ b/rmss/system.json @@ -3,7 +3,7 @@ "title": "Rolemaster Standard System", "description": "The Rolemaster Standard System system for FoundryVTT.", "author": "Cynicide", - "version": "0.0.2", + "version": "0.0.3", "minimumCoreVersion": "0.8.6", "compatibleCoreVersion": "10", "esmodules":[ diff --git a/rmss/template.json b/rmss/template.json index ab23281..a7375f5 100644 --- a/rmss/template.json +++ b/rmss/template.json @@ -54,15 +54,51 @@ }, "resistance_rolls": { "resistance_rolls": { - "channeling": 0, - "essence": 0, - "mentalism": 0, - "chann_ess": 0, - "chann_ment": 0, - "ess_ment": 0, - "arcane": 0, - "poison_disease": 0, - "fear": 0 + "channeling": { + "value": 0, + "race_mod": 0, + "total": 0 + }, + "essence": { + "value": 0, + "race_mod": 0, + "total": 0 + }, + "mentalism": { + "value": 0, + "race_mod": 0, + "total": 0 + }, + "chann_ess": { + "value": 0, + "race_mod": 0, + "total": 0 + }, + "chann_ment": { + "value": 0, + "race_mod": 0, + "total": 0 + }, + "ess_ment": { + "value": 0, + "race_mod": 0, + "total": 0 + }, + "arcane": { + "value": 0, + "race_mod": 0, + "total": 0 + }, + "poison_disease": { + "value": 0, + "race_mod": 0, + "total": 0 + }, + "fear": { + "value": 0, + "race_mod": 0, + "total": 0 + } } }, "background": { @@ -184,9 +220,8 @@ } } }, - "character": { - "templates": ["background", "stats", "resistance_rolls", "armor_info", "fixed_info", "race_stat_fixed_info", "role_traits", "money"], + "templates": ["background", "stats", "resistance_rolls", "armor_info", "fixed_info", "race_stat_fixed_info", "role_traits", "money", "description"], "attributes": { "level": { "value": 1 @@ -206,11 +241,12 @@ "experience_points": { "value": 0 } - } + }, + "description": "" } }, "Item": { - "types": ["item", "skill_category", "skill", "armor", "weapon", "transport", "herb_or_poison", "spell"], + "types": ["item", "skill_category", "skill", "armor", "weapon", "transport", "herb_or_poison", "spell", "language"], "templates": { "base": { "description": "Description here." @@ -218,6 +254,7 @@ }, "item": { "templates": ["base"], + "worn": false, "quantity": 1, "weight": 0, "cost": 0, @@ -270,7 +307,7 @@ "category" : "", "ranks": 0, "new_ranks": { - "value": [0], + "value": 0, "max": 3, "max_default": 3 }, diff --git a/rmss/templates/sheets/actors/apps/actor-settings.html b/rmss/templates/sheets/actors/apps/actor-settings.html new file mode 100644 index 0000000..d6187d1 --- /dev/null +++ b/rmss/templates/sheets/actors/apps/actor-settings.html @@ -0,0 +1,17 @@ +
+
+

Import Skill Categories

+
+ WARNING: This will erase your existing Skill Categories and import all Skill Categories from the selected Compendium. +
+
+ Select Compendium: +
+
+ +
+ +
+
\ No newline at end of file diff --git a/rmss/templates/sheets/actors/parts/actor-items.html b/rmss/templates/sheets/actors/parts/actor-items.html index 4e77b39..5e955b2 100644 --- a/rmss/templates/sheets/actors/parts/actor-items.html +++ b/rmss/templates/sheets/actors/parts/actor-items.html @@ -2,6 +2,7 @@
{{ localize "rmss.pc_sheet_items.item_name" }}
+
{{ localize "rmss.pc_sheet_items.worn" }}
{{ localize "rmss.pc_sheet_items.quantity" }}
{{ localize "rmss.pc_sheet_items.weight" }}
{{ localize "rmss.pc_sheet_items.cost" }}
@@ -10,6 +11,11 @@ {{#each gear as |item id|}}
{{item.name}}
+ {{#if item.system.worn}} +
+ {{else}} +
+ {{/if}}
{{item.system.quantity}}
{{item.system.weight}}
{{item.system.cost}}
diff --git a/rmss/templates/sheets/actors/parts/actor-languages.html b/rmss/templates/sheets/actors/parts/actor-languages.html new file mode 100644 index 0000000..6d693c0 --- /dev/null +++ b/rmss/templates/sheets/actors/parts/actor-languages.html @@ -0,0 +1,19 @@ + + + + + + {{#each languages as |language id|}} + + + + + + + {{/each}} +
{{ localize "rmss.pc_sheet_language.name" }}
{{ localize "rmss.pc_sheet_language.spoken" }}
{{ localize "rmss.pc_sheet_language.written" }}
+

{{language.name}}

+
{{language.system.spoken}}
{{language.system.written}}
+ + +
\ No newline at end of file diff --git a/rmss/templates/sheets/actors/parts/actor-resistance.html b/rmss/templates/sheets/actors/parts/actor-resistance.html index fc58141..2ef0443 100644 --- a/rmss/templates/sheets/actors/parts/actor-resistance.html +++ b/rmss/templates/sheets/actors/parts/actor-resistance.html @@ -1,84 +1,53 @@ -
-
    -
  1. -
    -

    {{ localize "rmss.pc_sheet_resistances.channeling" }}

    -
    -
    -

    {{system.resistance_rolls.channeling}}

    -
    -
    2. +
    + +
    Name
    +
    Value
    +
    Racial Mod
    +
    Total
    -
  2. -
    -

    {{ localize "rmss.pc_sheet_resistances.essence" }}

    -
    -
    -

    {{system.resistance_rolls.essence}}

    -
    -
    3. +
    {{ localize "rmss.pc_sheet_resistances.channeling" }}
    +
    {{system.resistance_rolls.channeling.value}}
    +
    +
    {{system.resistance_rolls.channeling.total}}
    -
  3. -
    -

    {{ localize "rmss.pc_sheet_resistances.mentalism" }}

    -
    -
    -

    {{system.resistance_rolls.mentalism}}

    -
    -
    4. +
    {{ localize "rmss.pc_sheet_resistances.essence" }}
    +
    {{system.resistance_rolls.essence.value}}
    +
    +
    {{system.resistance_rolls.essence.total}}
    -
  4. -
    -

    {{ localize "rmss.pc_sheet_resistances.chann_ess" }}

    -
    -
    -

    {{system.resistance_rolls.chann_ess}}

    -
    -
    5. +
    {{ localize "rmss.pc_sheet_resistances.mentalism" }}
    +
    {{system.resistance_rolls.mentalism.value}}
    +
    +
    {{system.resistance_rolls.mentalism.total}}
    -
  5. -
    -

    {{ localize "rmss.pc_sheet_resistances.chann_ment" }}

    -
    -
    -

    {{system.resistance_rolls.chann_ment}}

    -
    -
    6. +
    {{ localize "rmss.pc_sheet_resistances.chann_ess" }}
    +
    {{system.resistance_rolls.chann_ess.value}}
    +
    +
    {{system.resistance_rolls.chann_ess.total}}
    + +
    {{ localize "rmss.pc_sheet_resistances.chann_ment" }}
    +
    {{system.resistance_rolls.chann_ment.value}}
    +
    +
    {{system.resistance_rolls.chann_ment.total}}
    + +
    {{ localize "rmss.pc_sheet_resistances.ess_ment" }}
    +
    {{system.resistance_rolls.ess_ment.value}}
    +
    +
    {{system.resistance_rolls.ess_ment.total}}
    + +
    {{ localize "rmss.pc_sheet_resistances.arcane" }}
    +
    {{system.resistance_rolls.arcane.value}}
    +
    +
    {{system.resistance_rolls.arcane.total}}
    + +
    {{ localize "rmss.pc_sheet_resistances.poison_disease" }}
    +
    {{system.resistance_rolls.poison_disease.value}}
    +
    +
    {{system.resistance_rolls.poison_disease.total}}
    + +
    {{ localize "rmss.pc_sheet_resistances.fear" }}
    +
    {{system.resistance_rolls.fear.value}}
    +
    +
    {{system.resistance_rolls.fear.total}}
    -
  6. -
    -

    {{ localize "rmss.pc_sheet_resistances.ess_ment" }}

    -
    -
    -

    {{system.resistance_rolls.ess_ment}}

    -
    -
    7. - -
  7. -
    -

    {{ localize "rmss.pc_sheet_resistances.arcane" }}

    -
    -
    -

    {{system.resistance_rolls.arcane}}

    -
    -
    8. - -
  8. -
    -

    {{ localize "rmss.pc_sheet_resistances.poison_disease" }}

    -
    -
    -

    {{system.resistance_rolls.poison_disease}}

    -
    -
    9. - -
  9. -
    -

    Fear

    -
    -
    -

    {{system.resistance_rolls.fear}}

    -
    -
    10. -
\ No newline at end of file diff --git a/rmss/templates/sheets/actors/parts/actor-skill-categories.html b/rmss/templates/sheets/actors/parts/actor-skill-categories.html index b2ab396..50f7b77 100644 --- a/rmss/templates/sheets/actors/parts/actor-skill-categories.html +++ b/rmss/templates/sheets/actors/parts/actor-skill-categories.html @@ -11,7 +11,9 @@
{{ localize "rmss.pc_sheet_skill_categories.special_bonus" }}
{{ localize "rmss.pc_sheet_skill_categories.total_bonus" }}
- +
+ +
{{#each skillcat as |skill_category id|}}
{{skill_category.name}}
diff --git a/rmss/templates/sheets/actors/rmss-character-sheet.html b/rmss/templates/sheets/actors/rmss-character-sheet.html index 4506a3b..1985fd7 100644 --- a/rmss/templates/sheets/actors/rmss-character-sheet.html +++ b/rmss/templates/sheets/actors/rmss-character-sheet.html @@ -6,9 +6,10 @@
- -
- +
+
+ +
@@ -17,17 +18,27 @@
{{ localize "rmss.player_character.resources.hits" }} -

/

+

/

- {{ localize "rmss.player_character.resources.exhaustion_points" }} -

/

+
+ {{ localize "rmss.player_character.resources.exhaustion_points" }} +

/

+
+
+ +
- {{ localize "rmss.player_character.resources.power_points" }} -

/

+
+ {{ localize "rmss.player_character.resources.power_points" }} +

/

+
+
+ +
@@ -41,12 +52,12 @@
- +
- +
@@ -88,6 +99,8 @@ {{> "systems/rmss/templates/sheets/actors/parts/actor-fav-spells.html" }}

Equipped Items

{{> "systems/rmss/templates/sheets/actors/parts/actor-fav-items.html" }} +

Description

+ {{editor enrichedDescription target="system.description" button=true owner=owner editable=editable}} diff --git a/rmss/templates/sheets/items/rmss-item-sheet.html b/rmss/templates/sheets/items/rmss-item-sheet.html index 17f5d12..ca91398 100644 --- a/rmss/templates/sheets/items/rmss-item-sheet.html +++ b/rmss/templates/sheets/items/rmss-item-sheet.html @@ -7,11 +7,15 @@
+ +
{{localize "rmss.item.worn"}} {{localize "rmss.item.quantity"}} {{localize "rmss.item.weight"}} {{localize "rmss.item.cost"}} {{localize "rmss.item.prod_time"}}
+ +