Add new items

lang/en.json

@@ -1,4 +1,29 @@
 {
+  "ACTOR": {
+    "TypeCharacter": "Character",
+    "TypeNpc": "NPC",
+    "TypeMonster": "Monster"
+  },
+  "ITEM": {
+    "TypeWeapon": "Weapon",
+    "TypeEquipment": "Equipment",
+    "TypeRace": "Race",
+    "TypeArmor": "Armor",
+    "TypeShield": "Shield",
+    "TypeSkill": "Skill",
+    "TypePower": "Power",
+    "TypeLanguage": "Language",
+    "TypeCondition": "Condition",
+    "TypeClass": "Class",
+    "TypeGenericitem": "Class",
+    "TypeMoney": "Money",
+    "TypePotion": "Potion",
+    "TypePoison": "Poison",
+    "TypeTrap": "Trap",
+    "TypeClassitem": "Class item",
+    "TypeCompetency": "Competency"
+  },
+
   "WH.conf.short": "Short",
   "WH.conf.long": "Long",
   "WH.conf.twohanded": "Two-Handed",
@@ -79,6 +104,7 @@
   "WH.ui.classSkills": "Class Skills",
   "WH.ui.skills": "Skills based on level",
   "WH.ui.isclassskill": "Class skill ?",
+  "WH.ui.israceskill": "Race skill ?",
   "WH.ui.unlimited": "Unlimited use ?",
   "WH.ui.currentuse": "Current use",
   "WH.ui.maxuse": "Max use",
@@ -120,7 +146,46 @@
   "WH.ui.providedslot": "Provided slot",
   "WH.ui.skilllevelacquired": "Acquired at level",
   "WH.ui.totalmoney": "Total money owned",
-  
+  "WH.ui.preparetime": "Time to prepare",
+  "WH.ui.durationrounds": "Duration in rounds",
+  "WH.ui.application": "Application",
+  "WH.ui.savesdc": "Saves DC",
+  "WH.ui.savetype": "Save type",
+  "WH.ui.Touch": "Touch", 
+  "WH.ui.Ingestion": "Ingestion", 
+  "WH.ui.Weapon": "Weapon", 
+  "WH.ui.halfdamage": "Half-damage",
+  "WH.ui.ignore": "Ignore effect",
+  "WH.ui.dcfind": "DC to find",
+  "WH.ui.dcdisable": "DC to disable",
+  "WH.ui.throwtohit": "Throw to hit",
+  "WH.ui.mandatoryfor": "Mandatory for",
+  "WH.ui.generic": "Generic",
+  "WH.ui.bless": "Bless",
+  "WH.ui.spell": "Spell",
+  "WH.ui.poison": "Poison",
+  "WH.ui.disease": "Disease",
+  "WH.ui.curse": "Curse",
+  "WH.ui.permanent": "Permanent", 
+  "WH.ui.temporary": "Temporary", 
+  "WH.ui.begin": "Begin",
+  "WH.ui.specialduration": "Special duration",
+  "WH.ui.infinite": "Infinite", 
+  "WH.uiwithineor": "Within end of round",
+  "WH.ui.beginr": "Beginning of round", 
+  "WH.ui.nextr": "Next round", 
+  "WH.ui.nextcombat": "Next combat",
+  "WH.ui.untilendcombat": "Until end of combat",
+  "WH.ui.beginturn": "Beginning of turn",
+  "WH.ui.endturn": "End of turn",
+  "WH.ui.durationvalue": "Duration value",
+  "WH.ui.durationunit": "Duration unit",
+  "WH.ui.dcsave": "DC save",
+  "WH.ui.incubationtime": "Incubation time",
+  "WH.ui.diseaseduration": "Disease duration",
+  "WH.ui.ignoreeffect": "Ignore effect",
+  "WH.ui.raceSkills": "Race skills",
+
   "WH.chat.save": "Save",
   "WH.chat.mweaponmalus": "Multiple weapons malus ",
   "WH.chat.diceresult": "Dice result",
@@ -132,5 +197,6 @@
   "WH.chat.power": "Power",
   "WH.chat.powerlevel": "Power Level",
 
-  "WH.notif.skillmaxuse": "Maximum skill usage reach - Use is not allowed"
+  "WH.notif.skillmaxuse": "Maximum skill usage reach - Use is not allowed",
+  "WH.notif.toomanyuses": "Maximum use reach - Roll is not allowed"
 }

modules/warhero-actor-sheet.js

@@ -42,7 +42,9 @@ export class WarheroActorSheet extends ActorSheet {
       cssClass: this.isEditable ? "editable" : "locked",
       system: objectData,
       limited: this.object.limited,
+      compentencyItems:this.actor.getCompetencyItems( ), 
       skills: this.actor.getNormalSkills( ),
+      raceSkills: this.actor.getRaceSkills( ),
       classSkills: this.actor.getClassSkills( ),
       languages: this.actor.getLanguages( ),
       weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ),
@@ -65,6 +67,9 @@ export class WarheroActorSheet extends ActorSheet {
       editScore: this.options.editScore,
       isGM: game.user.isGM
     }
+    // Dynamic patch
+    formData.system.secondary.counterspell.hasmax = false
+    // Race mngt
     if ( race && race.name) {
       formData.hpprogression = game.system.warhero.config.progressionList[race.system.hpprogresion]
     }

modules/warhero-actor.js

@@ -258,6 +258,11 @@ export class WarheroActor extends Actor {
     WarheroUtility.sortArrayObjectsByName(comp)
     return comp
   }
+  getRaceSkills() {
+    let comp = this.items.filter(it => it.type == "skill" && it.system.raceskill)
+    WarheroUtility.sortArrayObjectsByName(comp)
+    return comp
+  }
   getClassSkills() {
     let comp = this.items.filter(it => it.type == "skill" && it.system.classskill)
     WarheroUtility.sortArrayObjectsByName(comp)
@@ -312,7 +317,10 @@ export class WarheroActor extends Actor {
 
   /* ------------------------------------------- */
   getEquipments() {
-    return this.items.filter(item => item.type == 'shield' || item.type == 'armor' || item.type == "weapon" || item.type == "equipment");
+    return this.items.filter(item => item.type == 'shield' || item.type == 'armor' || item.type == "weapon" || item.type == "equipment" || item.type == "potion" || item.type == "poison"|| item.type == "trap" || item.type == "classitem");
+  }
+  getCompetencyItems() {
+    return duplicate(this.items.filter(item => item.type == "competency") || [])
   }
   /* ------------------------------------------- */
   getEquipmentsOnly() {
@@ -655,6 +663,14 @@ export class WarheroActor extends Actor {
     this.update({ 'system.attributes.mana': mana })
     return true
   }
+  
+  /* -------------------------------------------- */
+  incrementUse(rollData) {
+    let stat = duplicate(this.system[rollData.mode][rollData.statKey])
+    stat.nbuse++
+    this.update( { [`system.${rollData.mode}.${rollData.statKey}`]: stat })
+  }
+
   /* -------------------------------------------- */
   getCommonRollData() {
     let rollData = WarheroUtility.getBasicRollData()
@@ -672,11 +688,16 @@ export class WarheroActor extends Actor {
     let stat = duplicate(this.system[rollType][rollKey])
     let rollData = this.getCommonRollData()
     rollData.mode = rollType
+    rollData.statKey = rollKey
     rollData.stat = stat
     if (stat && stat.stat)
     {
       rollData.statBonus = duplicate(this.system.statistics[stat.stat])
     }
+    if ( stat.hasuse && stat.nbuse >= stat.maxuse) {
+      ui.notifications.warn(game.i18n.localize("WH.notif.toomanyuses"))
+      return
+    }
     if (rollKey == "parrybonustotal") {
       WarheroUtility.rollParry(rollData)
       return

modules/warhero-config.js

@@ -45,6 +45,42 @@ export const WARHERO_CONFIG = {
     "high": "High (+6HP/Lvl)",
     "medium": "Medium (+4HP/Lvl)",
     "low": "Low (+2 HP/Lvl)"
+  },
+
+  poisonApplication: {
+    touch: "WH.ui.Touch", 
+    ingestion: "WH.ui.Ingestion", 
+    weapon: "WH.ui.Weapon"
+  },
+
+  saveType: {
+    halfdmg: "WH.ui.halfdamage", 
+    ignore: "WH.ui.ignoreeffect" 
+  },
+
+  conditionType : {
+    generic: "WH.ui.generic",
+    bless: "WH.ui.bless",
+    spell: "WH.ui.spell",
+    disease: "WH.ui.disease",
+    poison: "WH.ui.poison",
+    curse: "WH.u,i.curse"
+  },
+
+  conditionDuration: {
+    permanent: "WH.ui.permanent",
+    temporary: "WH.ui.temporary"
+  },
+
+  conditionSpecialDuration : {
+    infinite: "WH.ui.infinite", 
+    withineor: "WH.uiwithineor",
+    beginr: "WH.ui.beginr", 
+    nextr: "WH.ui.nextr", 
+    nextcombat: "WH.ui.nextcombat",
+    untilendcombat: "WH.ui.untilendcombat",
+    beginturn: "WH.ui.beginturn",
+    endturn: "WH.ui.endturn"
   }
 
 }

modules/warhero-utility.js

@@ -618,6 +618,10 @@ export class WarheroUtility {
       rollData.isCriticalFailure = true
     }
 
+    if ( rollData.stat.hasuse ) {
+      actor.incrementUse(rollData)
+    }
+
     let msg = await this.createChatWithRollMode(rollData.alias, {
       content: await renderTemplate(`systems/fvtt-warhero/templates/chat-generic-result.html`, rollData)
     })

system.json

@@ -107,7 +107,7 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "10.0.33",
+  "version": "10.0.35",
   "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.33.zip",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-warhero/archive/fvtt-warhero-10.0.35.zip",
   "url": "https://www.uberwald.me/gitea/public/fvtt-warhero",
   "background": "images/ui/warhero_welcome_page.webp",
   "id": "fvtt-warhero"

template.json

@@ -184,10 +184,13 @@
             "stat": "min",
             "abbrev": "counterspell",
             "style": "edit",
-            "hasmax": true,
+            "hasmax": false,
             "roll": true,
             "max": 1,
-            "value": 0
+            "value": 0,
+            "hasuse": true,
+            "nbuse": 0,
+            "maxuse": 0
           },
           "createitem": {
             "label": "WH.ui.createitem",
@@ -241,7 +244,12 @@
       "condition",
       "class",
       "genericitem",
-      "money"
+      "money",
+      "potion",
+      "poison",
+      "trap",
+      "classitem",
+      "competency"
     ],
     "templates": {
       "commonclassrace": {
@@ -265,6 +273,53 @@
         }
       }
     },
+    "competency": {
+      "description": ""
+    },
+    "potion": {
+      "cost": 0,
+      "quantity": 1,
+      "slotused": 1,
+      "slotlocation": "armor",
+      "alchemycost": "",
+      "preparetime": "",
+      "durationround": 0,
+      "description": ""
+    },
+    "poison": {
+      "cost": 0,
+      "quantity": 1,
+      "slotused": 1,
+      "slotlocation": "armor",
+      "application": "",
+      "preparecost": "",
+      "preparetime": "",
+      "damageroll": "",
+      "durationround": 0,
+      "savesdc": 0,
+      "savetype": "",
+      "description": ""
+    },
+    "trap": {
+      "cost": 0,
+      "quantity": 1,
+      "slotused": 1,
+      "slotlocation": "armor",
+      "dcfind": 0,
+      "dcdisable": 0,
+      "throwtohit": 0,
+      "damageroll": "",
+      "description": ""
+    },
+    "classitem": {
+      "cost": 0,
+      "quantity": 1,
+      "slotused": 1,
+      "slotlocation": "armor",
+      "class": "",
+      "mandatoryfor": "",
+      "description": ""
+    },
     "money": {
       "quantity": 0,
       "slotlocation": "backpack",
@@ -274,7 +329,16 @@
       "description": ""
     },
     "condition": {
+      "conditiontype": "",
+      "duration": "",
+      "begin": "",
+      "specialduration": "",
+      "durationvalue": 0,
+      "durationunit": "",
       "shortdescription": "",
+      "dcsave": 0,
+      "incubationtime": "",
+      "diseaseduration": "",
       "description": ""
     },
     "class": {
@@ -299,6 +363,7 @@
       "description": ""
     },
     "skill": {
+      "raceskill": false,
       "classskill": false,
       "unlimited": false,
       "acquiredatlevel": 0,

templates/actor-sheet.html

@@ -75,7 +75,7 @@
   {{!-- Sheet Body --}}
   <section class="sheet-body">
 
-    {{!-- Skills Tab --}}
+    {{!-- Main Tab --}}
     <div class="tab main" data-group="primary" data-tab="main">
       
       <div class="flexrow">
@@ -117,6 +117,20 @@
                     </li>
                 {{/if}}
               {{/each}}
+
+              {{#each compentencyItems as |comp key|}}
+              <li class="item flexrow list-item list-item-shadow" data-item-id="{{comp._id}}">
+                <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                    src="{{comp.img}}" /></a>
+                <span class="item-name-label-long">{{comp.name}}</span>
+  
+                <div class="item-filler">&nbsp;</div>
+                <div class="item-controls item-controls-fixed">
+                  <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                </div>
+              </li>
+              {{/each}}
+
             </ul>
           </div>
   
@@ -283,6 +297,44 @@
     <div class="tab skill" data-group="primary" data-tab="skill">
       <div class="flexcol">
 
+        <div>
+          <ul class="stat-list alternate-list">
+            <li class="item flexrow list-item items-title-bg">
+              <span class="item-name-label-header-long">
+                <h3><label class="items-title-text">{{localize "WH.ui.raceSkills"}}</label></h3>
+              </span>
+              <span class="item-field-label-medium">
+                <label class="short-label">{{localize "WH.ui.currentuse"}}</label>
+              </span>
+              <span class="item-field-label-medium">
+                <label class="short-label">{{localize "WH.ui.maxuse"}}</label>
+              </span>
+            </li>
+            {{#each raceSkills as |skill key|}}
+            <li class="item flexrow list-item list-item-shadow" data-item-id="{{skill._id}}">
+              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                  src="{{skill.img}}" /></a>
+              <span class="item-name-label-long">{{skill.name}}</a></span>
+              
+              {{#if skill.system.unlimited}}
+              <span class="item-field-label-medium">N/A</span>
+              <span class="item-field-label-medium">N/A</span>
+              {{else}}
+              <span class="item-field-label-medium">{{skill.system.currentuse}}
+                (<a class="skill-use-minus plus-minus-button">&nbsp;-</a>/<a class="skill-use-plus plus-minus-button">+</a>)
+              </span>
+              <span class="item-field-label-medium">{{skill.system.maxuse}}</span>
+              {{/if}}
+
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+        </div>
+
         <div>
           <ul class="stat-list alternate-list">
             <li class="item flexrow list-item items-title-bg">

templates/item-classitem-sheet.html

@@ -0,0 +1,32 @@
+<form class="{{cssClass}}" autocomplete="off">
+    <header class="sheet-header">
+        <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+        <div class="header-fields">
+            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
+        </div>
+    </header>
+
+    {{> systems/fvtt-warhero/templates/partial-item-nav.html}}
+
+    {{!-- Sheet Body --}}
+    <section class="sheet-body">
+
+      {{> systems/fvtt-warhero/templates/partial-item-description.html}}
+
+      <div class="tab details" data-group="primary" data-tab="details">
+        <ul>
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.class"}}</label>
+            <input type="text" class="item-field-label-medium " name="system.class" value="{{system.class}}" data-dtype="String"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.mandatoryfor"}}</label>
+            <input type="text" class="item-field-label-long2 " name="system.mandatoryfor" value="{{system.mandatoryfor}}" data-dtype="String"/>
+          </li>
+
+          {{> systems/fvtt-warhero/templates/partial-item-common-equipment.html}}
+
+        </ul>
+
+      </div>
+    </section>
+</form>

templates/item-competency-sheet.html

@@ -0,0 +1,24 @@
+<form class="{{cssClass}}" autocomplete="off">
+  <header class="sheet-header">
+    <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}" />
+    <div class="header-fields">
+      <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
+    </div>
+  </header>
+  {{> systems/fvtt-warhero/templates/partial-item-nav.html}}
+
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+
+    {{> systems/fvtt-warhero/templates/partial-item-description.html}}
+
+
+    <div class="tab details" data-group="primary" data-tab="details">
+      <ul>  
+
+      </ul>
+
+    </div>
+
+  </section>
+</form>

templates/item-condition-sheet.html

@@ -16,6 +16,63 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>  
 
+        <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.conditiontype"}}</label>
+          <select class="item-field-label-medium " type="text" name="system.conditiontype" value="{{system.conditiontype}}" data-dtype="String">
+            {{#select system.conditiontype}}
+              {{#each config.conditionType as |type key|}}
+                <option value="{{key}}">{{localize type}}</option>
+              {{/each}}
+            {{/select}}
+          </select>             
+        </li>
+
+        <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.duration"}}</label>
+          <select class="item-field-label-medium " type="text" name="system.duration" value="{{system.duration}}" data-dtype="String">
+            {{#select system.duration}}
+              {{#each config.conditionDuration as |type key|}}
+                <option value="{{key}}">{{localize type}}</option>
+              {{/each}}
+            {{/select}}
+          </select>             
+        </li>
+
+        <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.begin"}}</label>
+          <input type="text" class="item-field-label-long" name="system.begin" value="{{system.begin}}" data-dtype="String"/>
+        </li>
+
+        <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.specialduration"}}</label>
+          <select class="item-field-label-medium " type="text" name="system.specialduration" value="{{system.specialduration}}" data-dtype="String">
+            {{#select system.specialduration}}
+              {{#each config.conditionSpecialDuration as |type key|}}
+                <option value="{{key}}">{{localize type}}</option>
+              {{/each}}
+            {{/select}}
+          </select>             
+        </li>
+
+        <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.durationvalue"}}</label>
+          <input type="text" class="item-field-label-short" name="system.durationvalue" value="{{system.durationvalue}}" data-dtype="Number"/>
+        </li>
+
+        <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.durationunit"}}</label>
+          <input type="text" class="item-field-label-long" name="system.durationunit" value="{{system.durationunit}}" data-dtype="String"/>
+        </li>
+        
+        {{#if (eq conditiontype "disease")}}
+        <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.dcsave"}}</label>
+          <input type="text" class="item-field-label-short" name="system.dcsave" value="{{system.dcsave}}" data-dtype="Number"/>
+        </li>
+
+        <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.incubationtime"}}</label>
+          <input type="text" class="item-field-label-long" name="system.incubationtime" value="{{system.incubationtime}}" data-dtype="String"/>
+        </li>
+
+        <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.diseaseduration"}}</label>
+          <input type="text" class="item-field-label-long" name="system.diseaseduration" value="{{system.diseaseduration}}" data-dtype="String"/>
+        </li>
+
+        {{/if}}
+
         <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.effect"}}</label>
           <input type="text" class="item-field-label-long" name="system.shortdescription" value="{{system.shortdescription}}" data-dtype="String"/>
         </li>

templates/item-poison-sheet.html

@@ -0,0 +1,64 @@
+<form class="{{cssClass}}" autocomplete="off">
+    <header class="sheet-header">
+        <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+        <div class="header-fields">
+            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
+        </div>
+    </header>
+
+    {{> systems/fvtt-warhero/templates/partial-item-nav.html}}
+
+    {{!-- Sheet Body --}}
+    <section class="sheet-body">
+
+      {{> systems/fvtt-warhero/templates/partial-item-description.html}}
+
+      <div class="tab details" data-group="primary" data-tab="details">
+        <ul>
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.application"}}</label>
+            <select class="item-field-label-medium " type="text" name="system.application" value="{{system.application}}" data-dtype="String">
+              {{#select system.application}}
+                {{#each config.poisonApplication as |type key|}}
+                  <option value="{{key}}">{{localize type}}</option>
+                {{/each}}
+              {{/select}}
+            </select>             
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.cost"}}</label>
+            <input type="text" class="item-field-label-medium " name="system.preparecost" value="{{system.preparecost}}" data-dtype="String"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.preparetime"}}</label>
+            <input type="text" class="item-field-label-medium " name="system.preparetime" value="{{system.preparetime}}" data-dtype="String"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.damage"}}</label>
+            <input type="text" class="item-field-label-medium " name="system.damageroll" value="{{system.damageroll}}" data-dtype="String"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.durationrounds"}}</label>
+            <input type="text" class="item-field-label-short " name="system.durationround" value="{{system.durationround}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.savesdc"}}</label>
+            <input type="text" class="item-field-label-short " name="system.savesdc" value="{{system.savesdc}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.savetype"}}</label>
+            <select class="item-field-label-long " type="text" name="system.savetype" value="{{system.savetype}}" data-dtype="String">
+              {{#select system.savetype}}
+                {{#each config.saveType as |type key|}}
+                  <option value="{{key}}">{{localize type}}</option>
+                {{/each}}
+              {{/select}}
+            </select>             
+          </li>
+
+          {{> systems/fvtt-warhero/templates/partial-item-common-equipment.html}}
+
+        </ul>
+
+      </div>
+    </section>
+</form>

templates/item-potion-sheet.html

@@ -0,0 +1,36 @@
+<form class="{{cssClass}}" autocomplete="off">
+    <header class="sheet-header">
+        <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+        <div class="header-fields">
+            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
+        </div>
+    </header>
+
+    {{> systems/fvtt-warhero/templates/partial-item-nav.html}}
+
+    {{!-- Sheet Body --}}
+    <section class="sheet-body">
+
+      {{> systems/fvtt-warhero/templates/partial-item-description.html}}
+
+      <div class="tab details" data-group="primary" data-tab="details">
+        <ul>
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.cost"}}</label>
+            <input type="text" class="item-field-label-medium " name="system.alchemycost" value="{{system.alchemycost}}" data-dtype="String"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.preparetime"}}</label>
+            <input type="text" class="item-field-label-medium " name="system.preparetime" value="{{system.preparetime}}" data-dtype="String"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.durationrounds"}}</label>
+            <input type="text" class="item-field-label-medium " name="system.durationround" value="{{system.durationround}}" data-dtype="Number"/>
+          </li>
+
+          {{> systems/fvtt-warhero/templates/partial-item-common-equipment.html}}
+
+        </ul>
+
+      </div>
+    </section>
+</form>

templates/item-skill-sheet.html

@@ -15,6 +15,10 @@
 
       <div class="tab details" data-group="primary" data-tab="details">
         <ul>
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.israceskill"}}</label>
+            <input type="checkbox" name="system.raceskill" {{checked system.raceskill}}/>
+          </li>
+
           <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.isclassskill"}}</label>
             <input type="checkbox" name="system.classskill" {{checked system.classskill}}/>
           </li>

templates/item-trap-sheet.html

@@ -0,0 +1,40 @@
+<form class="{{cssClass}}" autocomplete="off">
+    <header class="sheet-header">
+        <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+        <div class="header-fields">
+            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
+        </div>
+    </header>
+
+    {{> systems/fvtt-warhero/templates/partial-item-nav.html}}
+
+    {{!-- Sheet Body --}}
+    <section class="sheet-body">
+
+      {{> systems/fvtt-warhero/templates/partial-item-description.html}}
+
+      <div class="tab details" data-group="primary" data-tab="details">
+        <ul>
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.dcfind"}}</label>
+            <input type="text" class="item-field-label-short " name="system.dcfind" value="{{system.dcfind}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.dcdisable"}}</label>
+            <input type="text" class="item-field-label-short " name="system.dcdisable" value="{{system.dcdisable}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.throwtohit"}}</label>
+            <input type="text" class="item-field-label-medium " name="system.throwtohit" value="{{system.throwtohit}}" data-dtype="String"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.damage"}}</label>
+            <input type="text" class="item-field-label-medium " name="system.damageroll" value="{{system.damageroll}}" data-dtype="String"/>
+          </li>
+          
+          {{> systems/fvtt-warhero/templates/partial-item-common-equipment.html}}
+
+        </ul>
+
+      </div>
+    </section>
+</form>

templates/partial-actor-stat-block.html

@@ -31,6 +31,11 @@
     {{#if hasmax}}
       <input type="text" class="item-field-label-short " name="system.{{path}}.{{key}}.max" value="{{stat.max}}" data-dtype="Number"/>
     {{/if}}
+    {{#if hasuse}}
+      <input type="text" class="item-field-label-short " name="system.{{path}}.{{key}}.nbuse" value="{{stat.nbuse}}" data-dtype="Number"/>
+      <input type="text" class="item-field-label-short " name="system.{{path}}.{{key}}.maxuse" value="{{stat.maxuse}}" data-dtype="Number"/>
+    {{/if}}
+  
   {{/if}}
   
   {{#if hassave}}