From 9a2dc3be6fd91cf0294effebfec6dfb35888c182 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Sat, 21 Jan 2023 17:56:14 +0100 Subject: [PATCH] Many fixes --- lang/en.json | 9 +++++- modules/warhero-config.js | 6 ++++ modules/warhero-item-sheet.js | 8 ++++- modules/warhero-main.js | 4 +-- styles/simple.css | 33 ++++---------------- template.json | 13 ++++++-- templates/item-class-sheet.html | 54 +++++++++++++++++++++++++++++++++ templates/item-race-sheet.html | 34 +++++++++++++++++++++ 8 files changed, 128 insertions(+), 33 deletions(-) create mode 100644 templates/item-class-sheet.html diff --git a/lang/en.json b/lang/en.json index 991d625..57fb7d6 100644 --- a/lang/en.json +++ b/lang/en.json @@ -29,5 +29,12 @@ "WH.conf.beltpouch3": "Beltpouch 3", "WH.ui.level": "Level", - "WH.ui.notes": "Notes" + "WH.ui.notes": "Notes", + + "WH.ui.hpprog": "HP Progression", + "WH.ui.lan": "Languages", + "WH.ui.attrbonus": "Attribute (+4/Lvl4, +2/Lvl8)", + "WH.ui.weapons": "Weapons", + "WH.ui.armors": "Armors", + "WH.ui.shields": "Shields" } \ No newline at end of file diff --git a/modules/warhero-config.js b/modules/warhero-config.js index d9b138f..9b5ffb0 100644 --- a/modules/warhero-config.js +++ b/modules/warhero-config.js @@ -37,6 +37,12 @@ export const WARHERO_CONFIG = { beltpouch1: {nbslots: 4, label: "WH.conf.beltpouch1"}, beltpouch2: {nbslots: 4, label: "WH.conf.beltpouch2"}, beltpouch3: {nbslots: 4, label: "WH.conf.beltpouch3"}, + }, + + progressionList: { + "high": "High (+6HP/Lvl)", + "medium": "Medium (+4HP/Lvl)", + "low": "Low (+2 HP/Lvl)" } } \ No newline at end of file diff --git a/modules/warhero-item-sheet.js b/modules/warhero-item-sheet.js index 70615c9..85515da 100644 --- a/modules/warhero-item-sheet.js +++ b/modules/warhero-item-sheet.js @@ -69,9 +69,15 @@ export class WarheroItemSheet extends ItemSheet { limited: this.object.limited, options: this.options, owner: this.document.isOwner, + abilities: duplicate(game.model.Actor.character.abilities), isGM: game.user.isGM } - + if ( this.object.type == "power") { + formData.level1 = await TextEditor.enrichHTML(this.object.system.level1, {async: true}) + formData.level2 = await TextEditor.enrichHTML(this.object.system.level2, {async: true}) + formData.level3 = await TextEditor.enrichHTML(this.object.system.level3, {async: true}) + formData.level4 = await TextEditor.enrichHTML(this.object.system.level4, {async: true}) + } this.options.editable = !(this.object.origin == "embeddedItem"); console.log("ITEM DATA", formData, this); return formData; diff --git a/modules/warhero-main.js b/modules/warhero-main.js index d7a5bae..f7534ef 100644 --- a/modules/warhero-main.js +++ b/modules/warhero-main.js @@ -87,10 +87,10 @@ Hooks.once("ready", function () { // User warning if (!game.user.isGM && game.user.character == undefined) { ui.notifications.info("Warning ! No character linked to your user !"); - ChatMessage.create({ + /*ChatMessage.create({ content: "WARNING The player " + game.user.name + " is not linked to a character !", user: game.user._id - }); + });*/ } // CSS patch for v9 diff --git a/styles/simple.css b/styles/simple.css index 3e87b64..1624382 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -1265,32 +1265,6 @@ { color: #CCC } - #pause > img { - content: url(../images/ui/crucible_pause_logo.jpg); - height: 160px; - width: 160px; - top: -80px; - left: calc(50% - 132px); - } - - #logo { - content : url(../images/ui/crucible_game_logo.png); - width: 100px; - height: 60px; - } - - .dice-cell { - padding-left: 12px; - padding-right: 12px; - width: 60px; - text-align: center; - } - - .dice-formula, - .dice-total { - height: 54px; - position:relative; - } /* =================== 1. ACTOR SHEET FONT STYLES =========== *//* Agility AGI: #02a41d Also Used for Ranged Damage @@ -1445,6 +1419,11 @@ max-width: 24rem; min-width: 24rem; } + .item-name-label-header-long3 { + flex-grow:2; + max-width: 30rem; + min-width: 30rem; + } .item-name-label { flex-grow:2; max-width: 10rem; @@ -1500,7 +1479,7 @@ } .alternate-list { margin-top: 4px; - flex-wrap: nowrap; + fong2ex-wrap: nowrap; } .item-filler { flex-grow: 6; diff --git a/template.json b/template.json index f396a8a..77a0e9c 100644 --- a/template.json +++ b/template.json @@ -127,7 +127,13 @@ "description": "" }, "race": { - "description": "" + "description": "", + "hpprogresion": "hp2", + "languages": "", + "attributebonus": "", + "weapons": "", + "shields": "", + "armors": "" }, "skill": { "description": "" @@ -137,6 +143,7 @@ "damage": "1d6", "cost": 0, "equipped": false, + "quantity": 1, "slotused": 1, "slotlocation": "weapon1", "description": "" @@ -146,6 +153,7 @@ "equipped": false, "damagereduction": 1, "cost": 0, + "quantity": 1, "slotused": 1, "slotlocation": "armor", "description":"" @@ -155,6 +163,7 @@ "parrybonus": 1, "equipped": false, "cost": 0, + "quantity": 1, "slotused": 1, "slotlocation": "shield", "description":"" @@ -162,7 +171,7 @@ "equipment": { "equiptype": "", "cost": 0, - "quantity": 0, + "quantity": 1, "equipped": false, "slotused": 1, "slotlocation": "backpack", diff --git a/templates/item-class-sheet.html b/templates/item-class-sheet.html new file mode 100644 index 0000000..e7798ce --- /dev/null +++ b/templates/item-class-sheet.html @@ -0,0 +1,54 @@ +
+
+ +
+

+
+
+ {{> systems/fvtt-warhero/templates/partial-item-nav.html}} + + {{!-- Sheet Body --}} +
+ +
+ + +
+ {{editor description target="system.description" button=true owner=owner editable=editable}} +
+
+ +
+
    + + {{#each system.weapons as |weaponflag key|}} +
  • + + +
    • + {{/each}} + + {{#each system.armors as |armorflag key|}} +
  • + + +
    • + {{/each}} + + {{#each system.shields as |shieldflag key|}} +
  • + + +
    • + {{/each}} + + +
+ +
+ +
+
\ No newline at end of file diff --git a/templates/item-race-sheet.html b/templates/item-race-sheet.html index 18b2eb5..441b80b 100644 --- a/templates/item-race-sheet.html +++ b/templates/item-race-sheet.html @@ -20,6 +20,40 @@