diff --git a/lang/en.json b/lang/en.json index 479f9dc..d9c6516 100644 --- a/lang/en.json +++ b/lang/en.json @@ -15,7 +15,6 @@ "TypeLanguage": "Language", "TypeCondition": "Condition", "TypeClass": "Class", - "TypeGenericitem": "Class", "TypeMoney": "Money", "TypePotion": "Potion", "TypePoison": "Poison", @@ -55,6 +54,11 @@ "WH.conf.beltpouch2": "Beltpouch 2", "WH.conf.beltpouch3": "Beltpouch 3", + "WH.conf.unknown": "Unknown", + "WH.conf.yes": "Yes", + "WH.conf.no": "No", + "WH.conf.notapplicable": "Not applicable", + "WH.ui.level": "Level", "WH.ui.notes": "Notes", @@ -185,7 +189,8 @@ "WH.ui.diseaseduration": "Disease duration", "WH.ui.ignoreeffect": "Ignore effect", "WH.ui.raceSkills": "Race skills", - + "WH.ui.identified": "Identified", + "WH.chat.save": "Save", "WH.chat.mweaponmalus": "Multiple weapons malus ", "WH.chat.diceresult": "Dice result", diff --git a/modules/warhero-config.js b/modules/warhero-config.js index dde1e60..4a52e77 100644 --- a/modules/warhero-config.js +++ b/modules/warhero-config.js @@ -81,6 +81,13 @@ export const WARHERO_CONFIG = { untilendcombat: "WH.ui.untilendcombat", beginturn: "WH.ui.beginturn", endturn: "WH.ui.endturn" + }, + + identifiedState: { + unknown: "WH.conf.unknown", + yes:"WH.conf.yes", + no:"WH.conf.no", + notapplicable:"WH.conf.notapplicable" } } \ No newline at end of file diff --git a/modules/warhero-main.js b/modules/warhero-main.js index 8559991..dcd3a91 100644 --- a/modules/warhero-main.js +++ b/modules/warhero-main.js @@ -56,7 +56,6 @@ Hooks.once("init", async function () { CONFIG.Combat.documentClass = WarheroCombat CONFIG.Actor.documentClass = WarheroActor CONFIG.Item.documentClass = WarheroItem - //CONFIG.Token.objectClass = WarheroToken /* -------------------------------------------- */ // Register sheet application classes @@ -79,28 +78,15 @@ 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({ - content: "WARNING The player " + game.user.name + " is not linked to a character !", - user: game.user._id - });*/ } - // CSS patch for v9 - /*if (game.version) { - let sidebar = document.getElementById("sidebar"); - sidebar.style.width = "min-content"; - }*/ - - //welcomeMessage(); WarheroUtility.ready() - //WarheroHotbar.initDropbar() - }) /* -------------------------------------------- */ /* Foundry VTT Initialization */ /* -------------------------------------------- */ -Hooks.on("chatMessage", (html, content, msg) => { +/*Hooks.on("chatMessage", (html, content, msg) => { if (content[0] == '/') { let regExp = /(\S+)/g; let commands = content.match(regExp); @@ -109,5 +95,5 @@ Hooks.on("chatMessage", (html, content, msg) => { } } return true; -}); +});*/ diff --git a/styles/simple.css b/styles/simple.css index 36afbf1..441f3b4 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -1496,6 +1496,12 @@ li { max-width: 9rem; min-width: 9rem; } +.item-field-label-2rem { + flex-grow: 1; + margin-top: 4px; + max-width: 1.2rem; + min-width: 1.2rem; +} .item-field-label-short { flex-grow: 1; margin-top: 4px; diff --git a/system.json b/system.json index 4000fff..6a55056 100644 --- a/system.json +++ b/system.json @@ -107,7 +107,7 @@ "styles": [ "styles/simple.css" ], - "version": "10.0.35", + "version": "10.0.36", "compatibility": { "minimum": "10", "verified": "10", @@ -115,7 +115,7 @@ }, "title": "Warhero RPG", "manifest": "https://www.uberwald.me/gitea/public/fvtt-warhero/raw/branch/master/system.json", - "download": "https://www.uberwald.me/gitea/uberwald/fvtt-warhero/archive/fvtt-warhero-10.0.35.zip", + "download": "https://www.uberwald.me/gitea/uberwald/fvtt-warhero/archive/fvtt-warhero-10.0.36.zip", "url": "https://www.uberwald.me/gitea/public/fvtt-warhero", "background": "images/ui/warhero_welcome_page.webp", "id": "fvtt-warhero" diff --git a/template.json b/template.json index b25d5fd..00bb6ce 100644 --- a/template.json +++ b/template.json @@ -243,7 +243,6 @@ "language", "condition", "class", - "genericitem", "money", "potion", "poison", @@ -280,7 +279,8 @@ "cost": 0, "quantity": 1, "slotused": 1, - "slotlocation": "armor", + "slotlocation": "backpack", + "isidentified": "unknown", "alchemycost": "", "preparetime": "", "durationround": 0, @@ -290,7 +290,8 @@ "cost": 0, "quantity": 1, "slotused": 1, - "slotlocation": "armor", + "slotlocation": "backpack", + "isidentified": "unknown", "application": "", "preparecost": "", "preparetime": "", @@ -304,7 +305,8 @@ "cost": 0, "quantity": 1, "slotused": 1, - "slotlocation": "armor", + "slotlocation": "backpack", + "isidentified": "unknown", "dcfind": 0, "dcdisable": 0, "throwtohit": 0, @@ -315,7 +317,8 @@ "cost": 0, "quantity": 1, "slotused": 1, - "slotlocation": "armor", + "slotlocation": "backpack", + "isidentified": "unknown", "class": "", "mandatoryfor": "", "description": "" @@ -325,9 +328,6 @@ "slotlocation": "backpack", "description": "" }, - "genericitem": { - "description": "" - }, "condition": { "conditiontype": "", "duration": "", @@ -382,6 +382,7 @@ "quantity": 1, "slotused": 1, "slotlocation": "weapon1", + "isidentified": "unknown", "description": "" }, "armor": { @@ -392,6 +393,7 @@ "quantity": 1, "slotused": 1, "slotlocation": "armor", + "isidentified": "unknown", "description": "" }, "shield": { @@ -402,6 +404,7 @@ "quantity": 1, "slotused": 1, "slotlocation": "shield", + "isidentified": "unknown", "description": "" }, "equipment": { @@ -412,6 +415,7 @@ "slotused": 1, "slotlocation": "backpack", "providedslot": 0, + "isidentified": "unknown", "description": "" }, "power": { diff --git a/templates/partial-actor-stat-block.html b/templates/partial-actor-stat-block.html index b70fefc..cc8ea77 100644 --- a/templates/partial-actor-stat-block.html +++ b/templates/partial-actor-stat-block.html @@ -31,8 +31,9 @@ {{#if hasmax}} {{/if}} - {{#if hasuse}} + {{#if hasuse}} + {{/if}} diff --git a/templates/partial-item-common-equipment.html b/templates/partial-item-common-equipment.html index 95cf073..738f748 100644 --- a/templates/partial-item-common-equipment.html +++ b/templates/partial-item-common-equipment.html @@ -10,7 +10,18 @@ {{/select}} -
  • + +
  • + +
  • + +