New combat features

2023-03-24 13:40:20 +01:00 · 2023-03-24 13:29:53 +01:00 · 2023-03-24 13:29:19 +01:00 · 2023-03-22 13:38:49 +01:00 · 2023-03-20 21:01:00 +01:00 · 2023-03-19 23:13:46 +01:00
34 changed files with 1396 additions and 281 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+.history/
--- a/README.md
+++ b/README.md
@@ -1,2 +1,4 @@
-# fvtt-pegasus-rpg
+# fvtt-warhero
+
+

--- a/lang/en.json
+++ b/lang/en.json
@@ -1,4 +1,29 @@
 {
+  "ACTOR": {
+    "TypeCharacter": "Character",
+    "TypeNpc": "NPC",
+    "TypeMonster": "Monster",
+    "TypeParty": "Party"
+  },
+  "ITEM": {
+    "TypeWeapon": "Weapon",
+    "TypeEquipment": "Equipment",
+    "TypeRace": "Race",
+    "TypeArmor": "Armor",
+    "TypeShield": "Shield",
+    "TypeSkill": "Skill",
+    "TypePower": "Power",
+    "TypeLanguage": "Language",
+    "TypeCondition": "Condition",
+    "TypeClass": "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",
@@ -29,6 +54,23 @@
  "WH.conf.beltpouch1": "Beltpouch 1",
  "WH.conf.beltpouch2": "Beltpouch 2",
  "WH.conf.beltpouch3": "Beltpouch 3",
+  "WH.conf.scrollcase": "Scroll case",
+  "WH.conf.wandcase": "Wand case",
+  "WH.conf.potioncase": "Potion case",
+  "WH.conf.bagholding": "Bag of holding",
+  "WH.conf.quiverholding": "Quiver of holding",
+  "WH.conf.backpackholding": "Backpack of holding",
+  "WH.conf.smallchest": "Small chest",
+  "WH.conf.mediumchest": "Medium chest",
+  "WH.conf.largechest": "Large chest",
+  "WH.conf.hugechest": "Huge chest",
+  "WH.conf.partystorage": "Party chest/storage",
+  
+  "WH.conf.unknown": "Unknown",
+  "WH.conf.yes": "Yes",
+  "WH.conf.no": "No",
+  "WH.conf.notapplicable": "Not applicable",
+  "WH.conf.undefined": "Not applicable",

  "WH.ui.level": "Level",
  "WH.ui.notes": "Notes",
@@ -44,6 +86,9 @@
  "WH.ui.Strength": "Strength",
  "WH.ui.Instinct": "Instinct",
  "WH.ui.Dexterity": "Dexterity",
+  "WH.ui.savestr": "Str Save",
+  "WH.ui.savedex": "Dex Save",
+  "WH.ui.savemin": "Mind Save",
  "WH.ui.Mind": "Mind",
  "WH.ui.Type": "Type",
  "WH.ui.HitPoints": "Hit Points",
@@ -76,6 +121,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",
@@ -113,6 +159,62 @@
  "WH.ui.quantity": "Quantity",
  "WH.ui.cost": "Cost",
  "WH.ui.details": "Details",
+  "WH.ui.magicschool": "Magic School",
+  "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.ui.identified": "Identified",
+  "WH.ui.isclasssecondary": "Secondary class ?",
+  "WH.ui.secondaryclass": "Super warhero",
+  "WH.ui.meleedamagebonus": "Melee damage bonus",
+  "WH.ui.rangeddamagebonus": "Ranged damage bonus",
+  "WH.ui.notapplicable": "Not applicable",
+  "WH.ui.chargedaily": "Daily",
+  "WH.ui.chargelimited": "Limited",
+  "WH.ui.magiccharge": "Magic charges",
+  "WH.ui.chargevalue": "Charge value",
+
+  "WH.ui.bodyslots": "Body",
+  "WH.ui.containerslot": "Containers",

  "WH.chat.save": "Save",
  "WH.chat.mweaponmalus": "Multiple weapons malus ",
@@ -123,5 +225,8 @@
  "WH.chat.rollformula": "Roll Formula",
  "WH.chat.useshield":"Use shield ?",
  "WH.chat.power": "Power",
-  "WH.chat.powerlevel": "Power Level"
+  "WH.chat.powerlevel": "Power Level",
+
+  "WH.notif.skillmaxuse": "Maximum skill usage reach - Use is not allowed",
+  "WH.notif.toomanyuses": "Maximum use reach - Roll is not allowed"
 }
--- a/modules/warhero-actor-sheet.js
+++ b/modules/warhero-actor-sheet.js
@@ -42,20 +42,26 @@ 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()) ),
      conditions: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getConditions()) ),
      armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())),
      shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())),
+      equippedWeapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getEquippedWeapons())),
+      equippedArmors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getEquippedArmors())),
+      equippedShields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getEquippedShields())),
      powers: this.actor.sortPowers(),
-      equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsOnly()) ),
-      slotEquipments: this.actor.buildEquipmentsSlot(),
      subActors: duplicate(this.actor.getSubActors()),
      competency: this.actor.getCompetency(),
      race: duplicate(race),
-      class: duplicate(this.actor.getClass()),
+      mainClass: this.actor.getMainClass(),
+      secondaryClass: this.actor.getSecondaryClass(),
+      totalMoney: this.actor.computeTotalMoney(),
+      equipments: duplicate(this.actor.getEquipmentsOnly()),
      //moneys: duplicate(this.actor.getMoneys()),
      description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}),
      notes: await TextEditor.enrichHTML(this.object.system.biodata.notes, {async: true}),
@@ -63,7 +69,16 @@ export class WarheroActorSheet extends ActorSheet {
      owner: this.document.isOwner,
      editScore: this.options.editScore,
      isGM: game.user.isGM
+    }    
+    if (this.actor.type == "party") {
+      formData.partySlots = this.actor.buildPartySlots()
+    } else {
+      formData.equipmentContainers = this.actor.buildEquipmentsSlot()
+      formData.bodyContainers = this.actor.buildBodySlot()
    }
+    // Dynamic patch
+    formData.system.secondary.counterspell.hasmax = false
+    // Race mngt
    if ( race && race.name) {
      formData.hpprogression = game.system.warhero.config.progressionList[race.system.hpprogresion]
    }
@@ -99,7 +114,8 @@ export class WarheroActorSheet extends ActorSheet {
    })
    html.find('.item-add').click(ev => {
      let dataType = $(ev.currentTarget).data("type")
-      this.actor.createEmbeddedDocuments('Item', [{ name: "NewItem", type: dataType }], { renderSheet: true })
+      let slotKey = $(ev.currentTarget).data("slot")
+      this.actor.createEmbeddedDocuments('Item', [{ name: "NewItem", type: dataType, system: { slotlocation: slotKey} }], { renderSheet: true })
    })
        
    html.find('.equip-activate').click(ev => {
@@ -133,6 +149,15 @@ export class WarheroActorSheet extends ActorSheet {
      const li = $(event.currentTarget).parents(".item");
      this.actor.incDecQuantity( li.data("item-id"), +1 );
    } );
+    html.find('.skill-use-minus').click(event => {
+      const li = $(event.currentTarget).parents(".item");
+      this.actor.incDecSkillUse( li.data("item-id"), -1 );
+    } );
+    html.find('.skill-use-plus').click(event => {
+      const li = $(event.currentTarget).parents(".item");
+      this.actor.incDecSkillUse( li.data("item-id"), +1 );
+    } );
+    

    html.find('.ammo-minus').click(event => {
      const li = $(event.currentTarget).parents(".item")
--- a/modules/warhero-actor.js
+++ b/modules/warhero-actor.js
@@ -123,6 +123,11 @@ export class WarheroActor extends Actor {
    return comp;
  }
  /* -------------------------------------------- */
+  getEquippedArmors() {
+    let comp = duplicate(this.items.filter(item => item.type == 'armor' && item.system.slotlocation == 'armor') || []);
+    WarheroUtility.sortArrayObjectsByName(comp)
+    return comp;
+  }
  getArmors() {
    let comp = duplicate(this.items.filter(item => item.type == 'armor') || []);
    WarheroUtility.sortArrayObjectsByName(comp)
@@ -135,7 +140,7 @@ export class WarheroActor extends Actor {
  }
  sortPowers() {
    let schools = {}
-    for(let power of this.items) {
+    for (let power of this.items) {
      if (power.type == "power") {
        power = duplicate(power)
        let school = schools[power.system.magicschool] || []
@@ -147,6 +152,11 @@ export class WarheroActor extends Actor {
    return schools
  }
  /* -------------------------------------------- */
+  getEquippedShields() {
+    let comp = duplicate(this.items.filter(item => item.type == 'shield' && item.system.slotlocation == "shield") || []);
+    WarheroUtility.sortArrayObjectsByName(comp)
+    return comp;
+  }
  getShields() {
    let comp = duplicate(this.items.filter(item => item.type == 'shield') || []);
    WarheroUtility.sortArrayObjectsByName(comp)
@@ -158,9 +168,18 @@ export class WarheroActor extends Actor {
    return race[0] ?? [];
  }
  /* -------------------------------------------- */
-  getClass() {
-    let classWH = this.items.filter(item => item.type == 'class')
-    return classWH[0] ?? [];
+  getMainClass() {
+    let classWH = this.items.find(item => item.type == 'class' && !item.system.issecondary)
+    return classWH
+  }
+  getSecondaryClass() {
+    let classWH = this.items.find(item => item.type == 'class' && item.system.issecondary)
+    return classWH
+  }
+  getClasses() {
+    let comp = duplicate(this.items.filter(item => item.type == "class") || []);
+    WarheroUtility.sortArrayObjectsByName(comp)
+    return comp;
  }
  /* -------------------------------------------- */
  checkAndPrepareEquipment(item) {
@@ -174,22 +193,87 @@ export class WarheroActor extends Actor {
    return listItem
  }
  /* -------------------------------------------- */
-  buildEquipmentsSlot() {
+  computeTotalMoney() {
+    let nbMoney = 0
+    this.items.forEach(it => { if (it.type == 'money') { nbMoney += it.system.quantity } })
+    return nbMoney
+  }
+
+  /* -------------------------------------------- */
+  buildPartySlots() {
    let containers = {}
-    for(let slotName in game.system.warhero.config.slotNames) {
-      let slotDef = game.system.warhero.config.slotNames[slotName]
+    for (let slotName in game.system.warhero.config.partySlotNames) {
+      let slotDef = game.system.warhero.config.partySlotNames[slotName]
      containers[slotName] = duplicate(slotDef)
-      containers[slotName].content = this.items.filter(it => (it.type == 'weapon' || it.type == 'armor' || it.type == 'shield'||it.type == 'equipment')  
-                                      && it.system.slotlocation == slotName )
+      containers[slotName].content = this.items.filter(it => (it.type == 'money' || it.type == 'weapon' || it.type == 'armor' || it.type == 'shield' || it.type == 'equipment') )
      let slotUsed = 0
-      for(let item of containers[slotName].content) {
-        slotUsed += item.system.slotused * ((item.system.quantity) ? item.system.quantity : 1)
+      for (let item of containers[slotName].content) {
+        let q = (item.system.quantity) ? item.system.quantity : 1
+        containers[slotName].nbslots += (item.system.providedslot ?? 0) * q
+        if (item.type == "money") {
+          slotUsed += Math.ceil(item.system.quantity / 1000)
+        } else {
+          slotUsed += item.system.slotused * q
+        }
      }
      slotUsed = Math.ceil(slotUsed)
      containers[slotName].slotUsed = slotUsed
    }
    return containers
  }
+
+  /* -------------------------------------------- */
+  buildBodySlot() {
+    let containers = {}
+    for (let slotName in game.system.warhero.config.slotNames) {
+      let slotDef = game.system.warhero.config.slotNames[slotName]
+      if (!slotDef.container) {
+        containers[slotName] = duplicate(slotDef)
+        containers[slotName].content = this.items.filter(it => (it.type == 'money' || it.type == 'weapon' || it.type == 'armor' || it.type == 'shield' || it.type == 'equipment')
+          && it.system.slotlocation == slotName)
+        let slotUsed = 0
+        for (let item of containers[slotName].content) {
+          let q = (item.system.quantity) ? item.system.quantity : 1
+          containers[slotName].nbslots += (item.system.providedslot ?? 0) * q
+          if (item.type == "money") {
+            slotUsed += Math.ceil(item.system.quantity / 1000)
+          } else {
+            slotUsed += item.system.slotused * q
+          }
+        }
+        slotUsed = Math.ceil(slotUsed)
+        containers[slotName].slotUsed = slotUsed
+      }
+    }
+    return containers
+  }
+
+
+  /* -------------------------------------------- */
+  buildEquipmentsSlot() {
+    let containers = {}
+    for (let slotName in game.system.warhero.config.slotNames) {
+      let slotDef = game.system.warhero.config.slotNames[slotName]
+      if (slotDef.container) {
+        containers[slotName] = duplicate(slotDef)
+        containers[slotName].content = this.items.filter(it => (it.type == 'money' || it.type == 'weapon' || it.type == 'armor' || it.type == 'shield' || it.type == 'equipment')
+          && it.system.slotlocation == slotName)
+        let slotUsed = 0
+        for (let item of containers[slotName].content) {
+          let q = (item.system.quantity) ? item.system.quantity : 1
+          containers[slotName].nbslots += (item.system.providedslot ?? 0) * q
+          if (item.type == "money") {
+            slotUsed += Math.ceil(item.system.quantity / 1000)
+          } else {
+            slotUsed += item.system.slotused * q
+          }
+        }
+        slotUsed = Math.ceil(slotUsed)
+        containers[slotName].slotUsed = slotUsed
+      }
+    }
+    return containers
+  }
  /* -------------------------------------------- */
  getConditions() {
    let comp = duplicate(this.items.filter(item => item.type == 'condition') || []);
@@ -203,15 +287,31 @@ export class WarheroActor extends Actor {
      formula += "+" + this.system.statistics.str.value
    }
    if (weapon.system.weapontype == "twohanded") {
-      formula += "+" + Math.floor(this.system.statistics.str.value*1.5)
+      formula += "+" + Math.floor(this.system.statistics.str.value * 1.5)
    }
    if (weapon.system.weapontype == "polearm") {
-      formula += "+" + Math.floor(this.system.statistics.str.value*1)
-      weapon.damageFormula2Hands =  weapon.system.damage2hands + "+" + Math.floor(this.system.statistics.str.value*1.5)
+      formula += "+" + Math.floor(this.system.statistics.str.value * 1)
+      weapon.damageFormula2Hands = weapon.system.damage2hands + "+" + Math.floor(this.system.statistics.str.value * 1.5)
+    }
+    if (weapon.system.weapontype == "throwing" || weapon.system.weapontype == "shooting") {
+      formula += "+"+this.system.secondary.rangeddamagebonus.value
+    } else if ( weapon.system.weapontype != "special" ) { 
+      formula += "+"+this.system.secondary.meleedamagebonus.value
+      if (weapon.damageFormula2Hands) {
+        weapon.damageFormula2Hands += "+"+this.system.secondary.meleedamagebonus.value
+      }
    }
    weapon.damageFormula = formula
  }
  /* -------------------------------------------- */
+  getEquippedWeapons() {
+    let comp = duplicate(this.items.filter(item => item.type == 'weapon' && (item.system.slotlocation == "weapon1" || item.system.slotlocation == "weapon2") ) || []);
+    for (let weapon of comp) {
+      this.prepareWeapon(weapon)
+    }
+    WarheroUtility.sortArrayObjectsByName(comp)
+    return comp;
+  }
  getWeapons() {
    let comp = duplicate(this.items.filter(item => item.type == 'weapon') || []);
    for (let weapon of comp) {
@@ -242,7 +342,12 @@ export class WarheroActor extends Actor {
  }
  /* -------------------------------------------- */
  getNormalSkills() {
-    let comp = this.items.filter(it => it.type == "skill" && !it.system.classskill)
+    let comp = this.items.filter(it => it.type == "skill" && !it.system.classskill && !it.system.raceskill)
+    WarheroUtility.sortArrayObjectsByName(comp)
+    return comp
+  }
+  getRaceSkills() {
+    let comp = this.items.filter(it => it.type == "skill" && it.system.raceskill)
    WarheroUtility.sortArrayObjectsByName(comp)
    return comp
  }
@@ -300,7 +405,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() {
@@ -382,7 +490,7 @@ export class WarheroActor extends Actor {

  /* -------------------------------------------- */
  async incDecHP(formula) {
-    let dmgRoll = new Roll(formula+"[warhero-orange]").roll({ async: false })
+    let dmgRoll = new Roll(formula + "[warhero-orange]").roll({ async: false })
    await WarheroUtility.showDiceSoNice(dmgRoll, game.settings.get("core", "rollMode"))
    let hp = duplicate(this.system.secondary.hp)
    hp.value = Number(hp.value) + Number(dmgRoll.total)
@@ -391,7 +499,7 @@ export class WarheroActor extends Actor {
  }
  /* -------------------------------------------- */
  updateCompetency(competency, obj, labelTab) {
-    for(let key in obj) {
+    for (let key in obj) {
      if (obj[key]) {
        //console.log("Parsing", key) //game.system.warhero.config.weaponTypes[key].label)
        competency[key] = { enabled: true, label: labelTab[key].label }
@@ -400,15 +508,23 @@ export class WarheroActor extends Actor {
  }
  getCompetency() {
    let myRace = this.getRace()
-    let myClass = this.getClass()
-    let competency = { weapons: {}, armors: {}, shields: {}}
-    if ( myRace.system && myClass.system) {
+    let myClass1 = this.getMainClass()
+    let myClass2 = this.getSecondaryClass()
+    let competency = { weapons: {}, armors: {}, shields: {} }
+    if (myRace.system) {
      this.updateCompetency(competency.weapons, myRace.system.weapons, game.system.warhero.config.weaponTypes)
      this.updateCompetency(competency.armors, myRace.system.armors, game.system.warhero.config.armorTypes)
      this.updateCompetency(competency.shields, myRace.system.shields, game.system.warhero.config.shieldTypes)
-      this.updateCompetency(competency.weapons, myClass.system.weapons, game.system.warhero.config.weaponTypes)
-      this.updateCompetency(competency.armors, myClass.system.armors, game.system.warhero.config.armorTypes)
-      this.updateCompetency(competency.shields, myClass.system.shields, game.system.warhero.config.shieldTypes)
+    }
+    if (myClass1 && myClass1.system) {
+      this.updateCompetency(competency.weapons, myClass1.system.weapons, game.system.warhero.config.weaponTypes)
+      this.updateCompetency(competency.armors, myClass1.system.armors, game.system.warhero.config.armorTypes)
+      this.updateCompetency(competency.shields, myClass1.system.shields, game.system.warhero.config.shieldTypes)
+    }
+    if (myClass2 && myClass2.system) {
+      this.updateCompetency(competency.weapons, myClass2.system.weapons, game.system.warhero.config.weaponTypes)
+      this.updateCompetency(competency.armors, myClass2.system.armors, game.system.warhero.config.armorTypes)
+      this.updateCompetency(competency.shields, myClass2.system.shields, game.system.warhero.config.shieldTypes)
    }
    return competency
  }
@@ -457,12 +573,10 @@ export class WarheroActor extends Actor {
    }
  }
  /* -------------------------------------------- */
-  getInitiativeScore(combatId, combatantId) {
-    if (this.type == 'character') {
-      this.rollMR(true, combatId, combatantId)
-    }
-    console.log("Init required !!!!")
-    return -1;
+  async getInitiativeScore(combatId, combatantId) {
+    let roll = new Roll("1d20+" + this.system.attributes.ini.value).roll({ async: false })
+    await WarheroUtility.showDiceSoNice(roll, game.settings.get("core", "rollMode"))
+    return roll.total
  }

  /* -------------------------------------------- */
@@ -543,7 +657,19 @@ export class WarheroActor extends Actor {
      }
    }
  }
-
+  /* -------------------------------------------- */
+  async incDecSkillUse(skillId, value) {
+    let skill = this.items.get(skillId)
+    if (skill) {
+      let newUse = skill.system.currentuse + value
+      if (newUse > skill.system.maxuse) {
+        ui.notifications.warn(game.i18n.localize("WH.notif.skillmaxuse"))
+        return
+      }
+      newUse = Math.max(newUse, 0)
+      this.updateEmbeddedDocuments('Item', [{ _id: skill.id, 'system.currentuse': newUse }])
+    }
+  }
  /* -------------------------------------------- */
  async incDecQuantity(objetId, incDec = 0) {
    let objetQ = this.items.get(objetId)
@@ -596,39 +722,49 @@ export class WarheroActor extends Actor {
  /* -------------------------------------------- */
  setLevel() {
    let xp = this.system.secondary.xp.value
-    this.system.secondary.xp.level = 1 + Math.floor(xp/10)
+    this.system.secondary.xp.level = 1 + Math.floor(xp / 10)
  }
  /* -------------------------------------------- */
  computeDRTotal() {
-    let armors = this.items.filter(it => it.type == "armor")
+    let armors = this.items.filter(it => it.type == "armor" && it.system.slotlocation == 'armor')
    let dr = 0
    for (let armor of armors) {
      dr += armor.system.damagereduction
    }
-    this.system.secondary.drbonustotal.value = this.system.secondary.drbonus.value + dr 
+    this.system.secondary.drbonustotal.value = this.system.secondary.drbonus.value + dr
  }
  /* -------------------------------------------- */
  computeParryBonusTotal() {
-    let shields = this.items.filter(it => it.type == "shield")
+    let shields = this.items.filter(it => it.type == "shield" && it.system.slotlocation == 'shield')
    let parry = 0
    for (let shield of shields) {
      parry += shield.system.parrybonus
    }
-    this.system.secondary.parrybonustotal.value = this.system.secondary.parrybonus.value + parry 
+    this.system.secondary.parrybonustotal.value = this.system.secondary.parrybonus.value + parry
  }
  /* -------------------------------------------- */
  computeBonusLanguages() {
    this.system.secondary.nblanguage.value = Math.floor(this.system.statistics.min.value / 2)
  }
  /* -------------------------------------------- */
-  spentMana( mana) {
-    if ( Number(mana) > this.system.attributes.mana.value) {
+  spentMana(spentValue) {
+    let mana = duplicate(this.system.attributes.mana)
+    if (Number(spentValue) > mana.value) {
      ui.notifications.warn("Not enough Mana points !")
      return false
    }
-    this.update({'system.attributes.mana.value': this.system.attributes.mana.value-mana})
+    mana.value -= Number(spentValue)
+    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()
@@ -646,8 +782,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 ( rollKey == "parrybonustotal") {
+    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
    }
@@ -661,7 +805,7 @@ export class WarheroActor extends Actor {
    rollData.stat = stat
    this.startRoll(rollData)
  }
-  
+
  /* -------------------------------------------- */
  rollWeapon(weaponId) {
    let weapon = this.items.get(weaponId)
@@ -669,12 +813,12 @@ export class WarheroActor extends Actor {
      weapon = duplicate(weapon)
      let rollData = this.getCommonRollData()
      rollData.mode = "weapon"
-      if (weapon.system.weapontype ==="shooting" || weapon.system.weapontype ==="throwing") {
+      if (weapon.system.weapontype === "shooting" || weapon.system.weapontype === "throwing") {
        rollData.stat = duplicate(this.system.attributes.txcr)
      } else {
        rollData.stat = duplicate(this.system.attributes.txcm)
      }
-      rollData.usemWeaponMalus =
+      rollData.usemWeaponMalus = false
      rollData.mWeaponMalus = this.system.secondary.malusmultiweapon.value
      rollData.weapon = weapon
      rollData.img = weapon.img
@@ -703,13 +847,13 @@ export class WarheroActor extends Actor {
      let rollData = this.getCommonRollData()
      rollData.mode = "power"
      rollData.power = power
-      rollData.powerLevel = power.system.level
+      rollData.powerLevel = Number(power.system.level)
      rollData.img = power.img
      rollData.hasBM = false
      this.startRoll(rollData)
    }
  }
-  
+
  /* -------------------------------------------- */
  async startRoll(rollData) {
    this.syncRoll(rollData)
--- a/modules/warhero-combat.js
+++ b/modules/warhero-combat.js
@@ -9,7 +9,7 @@ export class WarheroCombat extends Combat {
    for (let cId = 0; cId < ids.length; cId++) {
      const c = this.combatants.get(ids[cId]);
      let id = c._id || c.id;
-      let initBonus = c.actor ? c.actor.getInitiativeScore( this.id, id ) : -1;
+      let initBonus = c.actor ? await c.actor.getInitiativeScore( this.id, id ) : -1;
      await this.updateEmbeddedDocuments("Combatant", [ { _id: id, initiative: initBonus } ]);
    }

--- a/modules/warhero-config.js
+++ b/modules/warhero-config.js
@@ -21,6 +21,10 @@ export const WARHERO_CONFIG = {
    medium:  {parry: "3", label: "WH.conf.mediumshield"},
    tower:  {parry: "5", label: "WH.conf.towershield"},
  },
+  
+  partySlotNames : {
+    storage: {nbslots: 2000, itemtype:"equipment", label: "WH.conf.partystorage"}
+  },

  slotNames : {
    head: {nbslots: 1, itemtype:"armor", label: "WH.conf.head"},
@@ -31,20 +35,77 @@ export const WARHERO_CONFIG = {
    ring:  {nbslots: 10, itemtype:"equipment",label: "WH.conf.ring"},
    dress:  {nbslots: 1, itemtype:"equipment",label: "WH.conf.dress"},
    boots:  {nbslots: 1, itemtype:"equipment",label: "WH.conf.boots"},
-    belt:  {nbslots: 6, itemtype:"equipment",label: "WH.conf.belt"},
-    quiver:  {nbslots: 20, itemtype:"equipment",label: "WH.conf.quiver"},
    armor:  {nbslots: 1, itemtype:"armor",label: "WH.conf.armor"},
    shield:  {nbslots: 1, itemtype:"shield",label: "WH.conf.shield"},
-    backpack:  {nbslots: 12, itemtype:"equipment",label: "WH.conf.backpack"},
-    beltpouch1:  {nbslots: 4, itemtype:"equipment",label: "WH.conf.beltpouch1"},
-    beltpouch2:  {nbslots: 4, itemtype:"equipment", label: "WH.conf.beltpouch2"},
-    beltpouch3:  {nbslots: 4, itemtype:"equipment", label: "WH.conf.beltpouch3"},
+    belt:  {nbslots: 6, itemtype:"equipment", container: true, available: true, parent: undefined, label: "WH.conf.belt"},
+    quiver:  {nbslots: 20, itemtype:"equipment",container: true, available: true, parent: undefined, label: "WH.conf.quiver"},
+    backpack:  {nbslots: 12, itemtype:"equipment",container: true, available: true, parent: undefined, label: "WH.conf.backpack"},
+    beltpouch1:  {nbslots: 4, itemtype:"equipment",container: true, available: true, parent: undefined, label: "WH.conf.beltpouch1"},
+    beltpouch2:  {nbslots: 4, itemtype:"equipment", container: true, available: true, parent: undefined, label: "WH.conf.beltpouch2"},
+    beltpouch3:  {nbslots: 4, itemtype:"equipment", container: true, available: true, parent: undefined, label: "WH.conf.beltpouch3"},
+    scrollcase:  {nbslots: 17, itemtype:"equipment", container: true, available: false, parent: undefined, label: "WH.conf.scrollcase"},
+    wandcase:  {nbslots: 10, itemtype:"equipment", container: true, available: false, parent: undefined, label: "WH.conf.wandcase"},
+    potioncase:  {nbslots: 8, itemtype:"equipment", container: true, available: false, parent: undefined, label: "WH.conf.potioncase"},
+    bagholding:  {nbslots: 30, itemtype:"equipment", container: true, available: false, parent: undefined, label: "WH.conf.bagholding"},
+    quiverholding:  {nbslots: 9999, itemtype:"equipment", container: true, available: false, parent: undefined, label: "WH.conf.quiverholding"},
+    backpackholding:  {nbslots: 90, itemtype:"equipment", container: true, available: false, parent: undefined, label: "WH.conf.backpackholding"},
+    smallchest:  {nbslots: 6, itemtype:"equipment", container: true, available: false, parent: undefined, label: "WH.conf.smallchest"},
+    mediumchest:  {nbslots: 12, itemtype:"equipment", container: true, available: false, parent: undefined, label: "WH.conf.mediumchest"},
+    largechest:  {nbslots: 24, itemtype:"equipment", container: true, available: false, parent: undefined, label: "WH.conf.largechest"},
+    hugechest:  {nbslots: 24, itemtype:"equipment", container: true, available: false, parent: undefined, label: "WH.conf.hugechest"},
  },

  progressionList: {
    "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"
+  },
+  magicCharge: {
+    notapplicable: "WH.ui.notapplicable",
+    chargedaily: "WH.ui.chargedaily",
+    chargelimited: "WH.ui.chargelimited",
+  },
+  identifiedState: {
+    unknown: "WH.conf.unknown",
+    yes:"WH.conf.yes",
+    no:"WH.conf.no",
+    notapplicable:"WH.conf.notapplicable"
  }

 }
--- a/modules/warhero-item-sheet.js
+++ b/modules/warhero-item-sheet.js
@@ -69,12 +69,6 @@ export class WarheroItemSheet extends ItemSheet {
      owner: this.document.isOwner,
      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;
@@ -130,11 +124,6 @@ export class WarheroItemSheet extends ItemSheet {
      const item = this.object.options.actor.getOwnedItem(li.data("item-id"));
      item.sheet.render(true);
    });
-
-    html.find('.delete-spec').click(ev => {
-      this.object.update({ "data.specialisation": [{ name: 'None' }] });
-    });
-
    html.find('.delete-subitem').click(ev => {
      this.deleteSubitem(ev);
    });
@@ -145,15 +134,6 @@ export class WarheroItemSheet extends ItemSheet {
      let itemId = li.data("item-id");
      let itemType = li.data("item-type");
    });
-
-    html.find('.view-subitem').click(ev => {
-      this.viewSubitem(ev);
-    });
-
-    html.find('.view-spec').click(ev => {
-      this.manageSpec();
-    });
-
  }

  
--- a/modules/warhero-item.js
+++ b/modules/warhero-item.js
@@ -11,6 +11,7 @@ export const defaultItemImg = {
  money: "systems/fvtt-warhero/images/icons/two-coins.svg",
  power: "systems/fvtt-warhero/images/icons/magia.webp",
  condition: "systems/fvtt-warhero/images/icons/stordenti.webp",
+  language: "systems/fvtt-warhero/images/icons/linguaggi.webp"
 }

 /**
--- a/modules/warhero-main.js
+++ b/modules/warhero-main.js
@@ -11,6 +11,7 @@
 import { WarheroActor } from "./warhero-actor.js";
 import { WarheroItemSheet } from "./warhero-item-sheet.js";
 import { WarheroActorSheet } from "./warhero-actor-sheet.js";
+import { WarheroPartySheet } from "./warhero-party-sheet.js";
 import { WarheroNPCSheet } from "./warhero-npc-sheet.js";
 import { WarheroMonsterSheet } from "./warhero-monster-sheet.js";
 import { WarheroUtility } from "./warhero-utility.js";
@@ -56,7 +57,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
@@ -64,6 +64,7 @@ Hooks.once("init", async function () {
  Actors.registerSheet("fvtt-warhero", WarheroActorSheet, { types: ["character"], makeDefault: true });
  Actors.registerSheet("fvtt-warhero", WarheroNPCSheet, { types: ["npc"], makeDefault: false });
  Actors.registerSheet("fvtt-warhero", WarheroMonsterSheet, { types: ["monster"], makeDefault: false });
+  Actors.registerSheet("fvtt-warhero", WarheroPartySheet, { types: ["party"], makeDefault: false });

  Items.unregisterSheet("core", ItemSheet);
  Items.registerSheet("fvtt-warhero", WarheroItemSheet, { makeDefault: true });
@@ -71,16 +72,6 @@ Hooks.once("init", async function () {
  WarheroUtility.init()
 });

-/* -------------------------------------------- */
-function welcomeMessage() {
-  ChatMessage.create({
-    user: game.user.id,
-    whisper: [game.user.id],
-    content: `<div id="welcome-message-crucible"><span class="rdd-roll-part">
-    <strong>Welcome to the Warhero RPG.</strong>
-    ` });
-}
-
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
 /* -------------------------------------------- */
@@ -89,29 +80,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: "<b>WARNING</b> 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()
-  WarheroCommands.init()
-  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);
@@ -120,5 +97,5 @@ Hooks.on("chatMessage", (html, content, msg) => {
    }
  }
  return true;
-});
+});*/

--- a/modules/warhero-party-sheet.js
+++ b/modules/warhero-party-sheet.js
@@ -0,0 +1,57 @@
+/**
+ * Extend the basic ActorSheet with some very simple modifications
+ * @extends {ActorSheet}
+ */
+import { WarheroActorSheet } from "./warhero-actor-sheet.js";
+import { WarheroUtility } from "./warhero-utility.js";
+
+/* -------------------------------------------- */
+export class WarheroPartySheet extends WarheroActorSheet {
+
+  /** @override */
+  static get defaultOptions() {
+
+    return mergeObject(super.defaultOptions, {
+      classes: ["warhero-rpg", "sheet", "actor"],
+      template: "systems/fvtt-warhero/templates/party-sheet.html",
+      width: 640,
+      height: 720,
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "stats" }],
+      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
+      editScore: true
+    });
+  }
+
+  /* -------------------------------------------- */
+  async getData() {
+
+    const objectData = duplicate(this.object.system)
+
+    let formData = {
+      title: this.title,
+      id: this.actor.id,
+      type: this.actor.type,
+      img: this.actor.img,
+      name: this.actor.name,
+      editable: this.isEditable,
+      cssClass: this.isEditable ? "editable" : "locked",
+      system: objectData,
+      limited: this.object.limited,
+      totalMoney: this.actor.computeTotalMoney(),
+      equipments: duplicate(this.actor.getEquipmentsOnly()),
+      //moneys: duplicate(this.actor.getMoneys()),
+      description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}),
+      notes: await TextEditor.enrichHTML(this.object.system.biodata.notes, {async: true}),
+      options: this.options,
+      owner: this.document.isOwner,
+      editScore: this.options.editScore,
+      isGM: game.user.isGM
+    }    
+    formData.partySlots = this.actor.buildPartySlots()
+
+    this.formData = formData
+    console.log("PARTY : ", formData, this.object);
+    return formData;
+  }
+
+}
--- a/modules/warhero-utility.js
+++ b/modules/warhero-utility.js
@@ -19,7 +19,16 @@ export class WarheroUtility {
    this.defenderStore = {}

    WarheroCommands.init();
-
+    
+    Handlebars.registerHelper('concat', function () {
+      var outStr = '';
+      for (var arg in arguments) {
+        if (typeof arguments[arg] != 'object') {
+          outStr += arguments[arg];
+        }
+      }
+      return outStr;
+    });
    Handlebars.registerHelper('count', function (list) {
      return list.length;
    })
@@ -222,6 +231,7 @@ export class WarheroUtility {
      'systems/fvtt-warhero/templates/partial-item-description.html',
      'systems/fvtt-warhero/templates/partial-item-common-equipment.html',
      'systems/fvtt-warhero/templates/partial-actor-equipment.html',
+      'systems/fvtt-warhero/templates/partial-container.html',
    ]
    return loadTemplates(templatePaths);
  }
@@ -543,7 +553,7 @@ export class WarheroUtility {
    let actor = game.actors.get(rollData.actorId)

    if (rollData.mode == "power") {
-      let manaCost = Array.from(rollData.powerLevel)[0]
+      let manaCost = rollData.powerLevel
      if (actor.spentMana(manaCost)) {
        let powerKey = "level" + rollData.powerLevel
        rollData.powerText = rollData.power.system[powerKey]
@@ -575,7 +585,7 @@ export class WarheroUtility {
    }

    let diceFormula
-    if (rollData.weapon.system.weapontype == "special") {
+    if (rollData.weapon && rollData.weapon.system.weapontype == "special") {
      diceFormula = rollData.weapon.system.rollformula
    } else {
      // ability/save/size => 0
@@ -583,6 +593,9 @@ export class WarheroUtility {
      if (rollData.stat) {
        diceFormula += "+" + rollData.stat.value
      }
+      if (rollData.statBonus) {
+        diceFormula += "+" + rollData.statBonus.value
+      }
    }
    if (rollData.usemWeaponMalus) {
      diceFormula += "+" + rollData.mWeaponMalus
@@ -606,6 +619,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)
    })
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -876,16 +876,35 @@ li {

 /*  background: rgb(105,85,65) url("../images/ui/texture_feuille_perso_onglets.webp") no-repeat right bottom;*/

-#sidebar.collapsed {
-  height: 470px !important;
-}
-
 #sidebar-tabs > .collapsed,
 #chat-controls .chat-control-icon {
  color: rgba(220, 220, 220, 0.75);
  text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.75);
 }

+#sidebar-tabs {
+  flex: 0 0 28px;
+  box-sizing: border-box;
+  margin: 0 0 3px;
+  border-bottom: 1px solid rgba(0,0,0,0);
+  box-shadow: inset 0 0 2rem rgba(0,0,0,0.5);
+}
+
+#sidebar-tabs > .item.active {
+  border: 1px solid rgba(114,98,72,1);
+  background: rgba(30, 25, 20, 0.75);
+  box-shadow: 0 0 6px inset rgba(114,98,72,1);
+}
+
+#sidebar #sidebar-tabs i{
+  width: 23px;
+  height: 23px;
+  /*display: inline-block;*/
+  background-position:center;
+  background-size:cover;
+  text-shadow: 1px 1px 0 rgba(0,0,0,0.75);
+}
+
 .sidebar-tab .directory-list .entity {
  border-top: 1px dashed rgba(0, 0, 0, 0.25);
  border-bottom: 0 none;
@@ -896,6 +915,7 @@ li {
  background: rgba(0, 0, 0, 0.05);
  cursor: pointer;
 }
+
 .chat-message-header {
  background: rgba(220, 220, 210, 0.5);
  font-size: 1.1rem;
@@ -910,6 +930,7 @@ li {
 .chat-message .message-header .whisper-to {
  font-size: 0.9rem;
 }
+
 .chat-actor-name {
  padding: 4px;
 }
@@ -1028,21 +1049,6 @@ li {
  box-shadow: inset 0 0 2rem rgba(0, 0, 0, 0.5);
 }

-#sidebar-tabs > .item.active {
-  border: 1px solid rgba(114, 98, 72, 1);
-  background: rgba(30, 25, 20, 0.75);
-  box-shadow: 0 0 6px inset rgba(114, 98, 72, 1);
-}
-
-#sidebar #sidebar-tabs i {
-  width: 25px;
-  height: 25px;
-  display: inline-block;
-  background-position: center;
-  background-size: cover;
-  text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.75);
-}
-
 /*--------------------------------------------------------------------------*/
 /* Control, Tool, hotbar & navigation */

@@ -1486,11 +1492,22 @@ li {
  max-width: 22rem;
  min-width: 22rem;
 }
+.item-name-label-long3 {
+  flex-grow: 2;
+  max-width: 32rem;
+  min-width: 32rem;
+}
 .item-name-label-level2 {
  flex-grow: 2;
  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;
@@ -1550,4 +1567,8 @@ form .notes {
 }
 a.content-link, a.inline-roll {
  color: #222;
+}
+.journal-page-header,
+.journal-page-content {
+  color: #222;
 }
--- a/system.json
+++ b/system.json
@@ -107,7 +107,7 @@
  "styles": [
    "styles/simple.css"
  ],
-  "version": "10.0.27",
+  "version": "10.0.47",
  "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.27.zip",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-warhero/archive/fvtt-warhero-10.0.47.zip",
  "url": "https://www.uberwald.me/gitea/public/fvtt-warhero",
  "background": "images/ui/warhero_welcome_page.webp",
  "id": "fvtt-warhero"
--- a/template.json
+++ b/template.json
@@ -3,14 +3,15 @@
    "types": [
      "character",
      "npc",
-      "monster"
+      "monster",
+      "party"
    ],
    "templates": {
      "biodata": {
        "biodata": {
          "class": "",
          "age": 0,
-          "size": 0,
+          "size": "medium",
          "weight": "",
          "height": "",
          "hair": "",
@@ -61,8 +62,8 @@
            "style": "edit",
            "hasmax": true,
            "isheader": true,
-            "max": 1,
-            "value": 1
+            "max": 30,
+            "value": 30
          },
          "knowledge": {
            "label": "WH.ui.Knowledge",
@@ -70,15 +71,16 @@
            "style": "edit",
            "hasmax": false,
            "roll": true,
-            "max": 1,
-            "value": 1
+            "max": 0,
+            "value": 0
          },
          "def": {
            "label": "WH.ui.Defence",
            "abbrev": "def",
            "style": "edit",
-            "max": 1,
-            "value": 1
+            "iscombat": true,
+            "max": 12,
+            "value": 12
          },
          "txcm": {
            "label": "WH.ui.Throw2HitM",
@@ -86,8 +88,9 @@
            "istxc": true,
            "style": "edit",
            "roll": true,
-            "max": 1,
-            "value": 1
+            "iscombat": true,
+            "max": 0,
+            "value": 0
          },
          "txcr": {
            "label": "WH.ui.Throw2HitR",
@@ -95,8 +98,9 @@
            "istxc": true,
            "style": "edit",
            "roll": true,
-            "max": 1,
-            "value": 1
+            "iscombat": true,
+            "max": 0,
+            "value": 0
          },
          "mana": {
            "label": "WH.ui.Mana",
@@ -104,36 +108,38 @@
            "style": "edit",
            "hasmax": true,
            "isheader": true,
-            "max": 1,
-            "value": 1
+            "max": 3,
+            "value": 3
          },
          "ini": {
            "label": "WH.ui.Initiative",
            "abbrev": "ini",
            "style": "edit",
-            "max": 1,
-            "value": 1
+            "iscombat": true,
+            "roll": true,
+            "max": 0,
+            "value": 0
          },
          "movearth": {
            "label": "WH.ui.Movement",
            "abbrev": "mov",
            "style": "edit",
-            "max": 1,
-            "value": 1
+            "max": 6,
+            "value": 6
          },
          "movswim": {
            "label": "WH.ui.MovementSwim",
            "abbrev": "mov",
            "style": "edit",
-            "max": 1,
-            "value": 1
+            "max": 0,
+            "value": 0
          },
          "movfly": {
            "label": "WH.ui.MovementFly",
            "abbrev": "mov",
            "style": "edit",
-            "max": 1,
-            "value": 1
+            "max": 0,
+            "value": 0
          }
        },
        "secondary": {
@@ -147,6 +153,7 @@
          "malusmultiweapon": {
            "label": "WH.ui.malusmultiweapon",
            "abbrev": "malusmultiweapon",
+            "iscombat": true,
            "style": "edit",
            "value": 0
          },
@@ -154,6 +161,7 @@
            "label": "WH.ui.drbonus",
            "abbrev": "drbonus",
            "style": "edit",
+            "iscombat": true,
            "value": 0
          },
          "drbonustotal": {
@@ -161,12 +169,28 @@
            "abbrev": "drbonustotal",
            "disabled": true,
            "style": "edit",
+            "iscombat": true,
+            "value": 0
+          },
+          "meleedamagebonus": {
+            "label": "WH.ui.meleedamagebonus",
+            "abbrev": "meleedamagebonus",
+            "iscombat": true,
+            "style": "edit",
+            "value": 0
+          },
+          "rangeddamagebonus": {
+            "label": "WH.ui.rangeddamagebonus",
+            "abbrev": "rangeddamagebonus",
+            "iscombat": true,
+            "style": "edit",
            "value": 0
          },
          "parrybonus": {
            "label": "WH.ui.parrybonus",
            "abbrev": "parrybonus",
            "isparrybonus": true,
+            "iscombat": true,
            "style": "edit",
            "value": 0
          },
@@ -175,16 +199,22 @@
            "abbrev": "parrybonustotal",
            "disabled": true,
            "style": "edit",
+            "iscombat": true,
            "roll": true,
            "value": 0
          },
          "counterspell": {
            "label": "WH.ui.counterspell",
+            "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",
@@ -206,6 +236,11 @@
        "description": ""
      }
    },
+    "party": {
+      "templates": [
+        "biodata"
+      ]
+    },
    "character": {
      "templates": [
        "biodata",
@@ -236,7 +271,13 @@
      "power",
      "language",
      "condition",
-      "class"
+      "class",
+      "money",
+      "potion",
+      "poison",
+      "trap",
+      "classitem",
+      "competency"
    ],
    "templates": {
      "commonclassrace": {
@@ -260,14 +301,80 @@
        }
      }
    },
+    "competency": {
+      "description": ""
+    },
+    "potion": {
+      "cost": 0,
+      "quantity": 1,
+      "slotused": 1,
+      "slotlocation": "backpack",
+      "isidentified": "unknown",
+      "alchemycost": "",
+      "preparetime": "",
+      "durationround": 0,
+      "description": ""
+    },
+    "poison": {
+      "cost": 0,
+      "quantity": 1,
+      "slotused": 1,
+      "slotlocation": "backpack",
+      "isidentified": "unknown",
+      "application": "",
+      "preparecost": "",
+      "preparetime": "",
+      "damageroll": "",
+      "durationround": 0,
+      "savesdc": 0,
+      "savetype": "",
+      "description": ""
+    },
+    "trap": {
+      "cost": 0,
+      "quantity": 1,
+      "slotused": 1,
+      "slotlocation": "backpack",
+      "isidentified": "unknown",
+      "dcfind": 0,
+      "dcdisable": 0,
+      "throwtohit": 0,
+      "damageroll": "",
+      "description": ""
+    },
+    "classitem": {
+      "cost": 0,
+      "quantity": 1,
+      "slotused": 1,
+      "slotlocation": "backpack",
+      "isidentified": "unknown",
+      "class": "",
+      "mandatoryfor": "",
+      "description": ""
+    },
+    "money": {
+      "quantity": 0,
+      "slotlocation": "backpack",
+      "description": ""
+    },
    "condition": {
+      "conditiontype": "",
+      "duration": "",
+      "begin": "",
+      "specialduration": "",
+      "durationvalue": 0,
+      "durationunit": "",
      "shortdescription": "",
+      "dcsave": 0,
+      "incubationtime": "",
+      "diseaseduration": "",
      "description": ""
    },
    "class": {
      "templates": [
        "commonclassrace"
      ],
+      "issecondary": false,
      "description": ""
    },
    "race": {
@@ -286,8 +393,10 @@
      "description": ""
    },
    "skill": {
+      "raceskill": false,
      "classskill": false,
      "unlimited": false,
+      "acquiredatlevel": 0,
      "currentuse": 0,
      "maxuse": 0,
      "description": ""
@@ -303,6 +412,9 @@
      "quantity": 1,
      "slotused": 1,
      "slotlocation": "weapon1",
+      "isidentified": "unknown",
+      "magiccharge": "notapplicable",
+      "chargevalue": 0,
      "description": ""
    },
    "armor": {
@@ -313,6 +425,9 @@
      "quantity": 1,
      "slotused": 1,
      "slotlocation": "armor",
+      "isidentified": "unknown",
+      "magiccharge": "notapplicable",
+      "chargevalue": 0,
      "description": ""
    },
    "shield": {
@@ -323,6 +438,9 @@
      "quantity": 1,
      "slotused": 1,
      "slotlocation": "shield",
+      "isidentified": "unknown",
+      "magiccharge": "notapplicable",
+      "chargevalue": 0,
      "description": ""
    },
    "equipment": {
@@ -332,6 +450,10 @@
      "equipped": false,
      "slotused": 1,
      "slotlocation": "backpack",
+      "providedslot": 0,
+      "isidentified": "unknown",
+      "magiccharge": "notapplicable",
+      "chargevalue": 0,
      "description": ""
    },
    "power": {
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -27,17 +27,42 @@
                    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
                  </div>  
                </li>  
-                <li class="item flexrow list-item" data-item-id="{{class._id}}">
+                <li class="item flexrow list-item " data-item-id="{{mainClass._id}}">
                  <label class="item-field-label-medium">{{localize "WH.ui.class"}}</label>
-                  <a class="item-edit"><img class="sheet-competence-img" src="{{class.img}}"></a>
-                  <input type="text" class="item-field-label-medium" disabled value="{{class.name}}" data-dtype="String" />
+                  {{#if mainClass}}
+                  <a class="item-edit"><img class="sheet-competence-img" src="{{mainClass.img}}"></a>
+                  <input type="text" class="item-field-label-medium" disabled value="{{mainClass.name}}" data-dtype="String" />
+                  <div class="item-controls item-controls-fixed">
+                    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                  </div>
+                  {{else}}
+                    <a class="item-edit"><img class="sheet-competence-img" src="icons/svg/mystery-man.svg"></a>
+                  {{/if}}
+                </li>  
+                <li class="item flexrow list-item " data-item-id="{{secondaryClass._id}}">
+                  <label class="item-field-label-medium">{{localize "WH.ui.secondaryclass"}}</label>
+                  {{#if secondaryClass}}
+                  <a class="item-edit"><img class="sheet-competence-img" src="{{secondaryClass.img}}"></a>
+                  <input type="text" class="item-field-label-medium" disabled value="{{secondaryClass.name}}" data-dtype="String" />
                  <div class="item-controls item-controls-fixed">
                    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
                  </div>  
+                  {{else}}
+                    <a class="item-edit"><img class="sheet-competence-img" src="icons/svg/mystery-man.svg"></a>
+                  {{/if}}
                </li>  
                <li class="item flexrow list-item" >
                  <label class="item-field-label-medium">{{localize "WH.ui.religion"}}</label>
                  <input type="text" class="item-field-label-medium" name="system.biodata.religion" value="{{system.biodata.religion}}" data-dtype="String" />
+                  &nbsp;&nbsp;
+                  <label class="item-field-label-short">{{localize "WH.ui.size"}}</label>
+                  <select class="item-field-label-short" type="text" name="system.biodata.size" value="{{system.biodata.size}}" data-dtype="Number">
+                      {{#select system.biodata.size}}
+                      <option value="small">Small</option>
+                      <option value="medium">Medium</option>
+                      <option value="large">Large</option>
+                      {{/select}}
+                  </select>       
                </li>  
              </ul>
            </div>      
@@ -75,7 +100,7 @@
  {{!-- Sheet Body --}}
  <section class="sheet-body">

-    {{!-- Skills Tab --}}
+    {{!-- Main Tab --}}
    <div class="tab main" data-group="primary" data-tab="main">
      
      <div class="flexrow">
@@ -83,42 +108,13 @@
        <div class="ability-item">
          <ul>
            {{#each system.attributes as |attr key|}}
+            {{#if (not attr.iscombat)}}
              {{#if (not attr.isheader)}}
                {{> systems/fvtt-warhero/templates/partial-actor-stat-block.html stat=attr key=key path="attributes" fieldClass="item-field-label-vlong"}}
              {{/if}}
+            {{/if}}
            {{/each}}
          </ul>
-
-          <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.competency"}}</label></h3>
-                </span>
-              </li>
-              {{#each competency.weapons as |cdata key|}}
-                {{#if cdata}}
-                  <li class="item flexrow list-item list-item-shadow" data-item-id="{{language._id}}">
-                    <span class="item-name-label-long">{{localize "WH.ui.weapons"}} {{localize cdata.label}}</span>
-                    </li>
-                {{/if}}
-              {{/each}}
-              {{#each competency.shields as |flag key|}}
-                {{#if flag}}
-                  <li class="item flexrow list-item list-item-shadow" data-item-id="{{language._id}}">
-                    <span class="item-name-label-long">{{localize "WH.ui.shields"}} {{key}}</span>
-                    </li>
-                  {{/if}}
-                {{/each}}
-              {{#each competency.armors as |flag key|}}
-                {{#if flag}}
-                  <li class="item flexrow list-item list-item-shadow" data-item-id="{{language._id}}">
-                    <span class="item-name-label-long">{{localize "WH.ui.armors"}} {{key}}</span>
-                    </li>
-                {{/if}}
-              {{/each}}
-            </ul>
-          </div>
  
        </div>

@@ -135,7 +131,9 @@


            {{#each system.secondary as |second key|}}
-            {{> systems/fvtt-warhero/templates/partial-actor-stat-block.html stat=second key=key path="secondary" fieldClass="item-field-label-vlong"}}
+              {{#if (not second.iscombat)}}
+                {{> systems/fvtt-warhero/templates/partial-actor-stat-block.html stat=second key=key path="secondary" fieldClass="item-field-label-vlong"}}
+              {{/if}}
            {{/each}}

          </ul>
@@ -170,8 +168,34 @@

    {{!-- Combat Tab --}}
    <div class="tab combat" data-group="primary" data-tab="combat">
+      
      <div class="flexcol">

+        <div class="grid grid2col">
+          <ul class="stat-list alternate-list">
+            {{#with system.attributes.def as |stat|}}
+            {{> systems/fvtt-warhero/templates/partial-actor-stat-block.html stat=stat key="def" path="attributes" fieldClass="item-field-label-vlong"}}
+            {{/with}}
+            {{#with system.attributes.ini as |stat|}}
+            {{> systems/fvtt-warhero/templates/partial-actor-stat-block.html stat=stat key="ini" path="attributes" fieldClass="item-field-label-vlong"}}
+            {{/with}}
+            {{#with system.secondary.meleedamagebonus as |stat|}}
+            {{> systems/fvtt-warhero/templates/partial-actor-stat-block.html stat=stat key="meleedamagebonus" path="secondary" fieldClass="item-field-label-vlong"}}
+            {{/with}}
+          </ul>
+          <ul class="stat-list alternate-list">
+            {{#with system.attributes.txcm as |stat|}}
+            {{> systems/fvtt-warhero/templates/partial-actor-stat-block.html stat=stat key="txcm" path="attributes" fieldClass="item-field-label-vlong"}}
+            {{/with}}
+            {{#with system.attributes.txcr as |stat|}}
+            {{> systems/fvtt-warhero/templates/partial-actor-stat-block.html stat=stat key="txch" path="attributes" fieldClass="item-field-label-vlong"}}
+            {{/with}}
+            {{#with system.secondary.rangeddamagebonus as |stat|}}
+            {{> systems/fvtt-warhero/templates/partial-actor-stat-block.html stat=stat key="rangeddamagebonus" path="secondary" fieldClass="item-field-label-vlong"}}
+            {{/with}}
+          </ul>
+        </div>
+
        <div>
          <ul class="stat-list alternate-list">
            <li class="item flexrow list-item items-title-bg">
@@ -185,13 +209,13 @@
                <label class="short-label">{{localize "WH.ui.Damage"}}</label>
              </span>
            </li>
-            {{#each weapons as |weapon key|}}
+            {{#each equippedWeapons as |weapon key|}}
            <li class="item flexrow list-item list-item-shadow" data-item-id="{{weapon._id}}">
              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
                  src="{{weapon.img}}" /></a>
              <span class="item-name-label-long"><a class="roll-weapon"><i class="fa-solid fa-dice-d20"></i>{{weapon.name}}</a></span>

-              <span class="item-field-label-medium">{{weapon.system.weapontype}}</span>
+              <span class="item-field-label-medium">{{localize (concat "WH.conf." weapon.system.weapontype)}}</span>
              
              {{#if (eq system.weapontype "special")}}
              <span class="item-field-label-medium"><a class="roll-damage"><i class="fa-solid fa-dice-d20"></i>{{weapon.system.damageformula}}</a></span>
@@ -212,6 +236,19 @@
          </ul>
        </div>

+        <div class="grid grid2col">
+          <ul class="stat-list alternate-list">
+            {{#with system.secondary.parrybonus as |stat|}}
+            {{> systems/fvtt-warhero/templates/partial-actor-stat-block.html stat=stat key="parrybonus" path="secondary" fieldClass="item-field-label-vlong"}}
+            {{/with}}
+          </ul>
+          <ul class="stat-list alternate-list">
+            {{#with system.secondary.parrybonustotal as |stat|}}
+            {{> systems/fvtt-warhero/templates/partial-actor-stat-block.html stat=stat key="parrybonustotal" path="secondary" fieldClass="item-field-label-vlong"}}
+            {{/with}}
+          </ul>
+        </div>
+
        <div>
          <ul class="stat-list alternate-list">
            <li class="item flexrow list-item items-title-bg">
@@ -225,7 +262,7 @@
                <label class="short-label">{{localize "WH.ui.parrybonus"}}</label>
              </span>
            </li>
-            {{#each shields as |shield key|}}
+            {{#each equippedShields as |shield key|}}
            <li class="item flexrow list-item list-item-shadow" data-item-id="{{shield._id}}">
              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
                  src="{{shield.img}}" /></a>
@@ -243,6 +280,19 @@
            {{/each}}
          </ul>
        </div>
+        
+        <div class="grid grid2col">
+          <ul class="stat-list alternate-list">
+            {{#with system.secondary.drbonus as |stat|}}
+            {{> systems/fvtt-warhero/templates/partial-actor-stat-block.html stat=stat key="drbonus" path="secondary" fieldClass="item-field-label-vlong"}}
+            {{/with}}
+          </ul>
+          <ul class="stat-list alternate-list">
+            {{#with system.secondary.drbonustotal as |stat|}}
+            {{> systems/fvtt-warhero/templates/partial-actor-stat-block.html stat=stat key="drbonustotal" path="secondary" fieldClass="item-field-label-vlong"}}
+            {{/with}}
+          </ul>
+        </div>

        <div>
          <ul class="stat-list alternate-list">
@@ -257,7 +307,7 @@
                <label class="short-label">{{localize "WH.ui.damagereduction"}}</label>
              </span>
            </li>
-            {{#each armors as |armor key|}}
+            {{#each equippedArmors as |armor key|}}
            <li class="item flexrow list-item list-item-shadow" data-item-id="{{armor._id}}">
              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
                  src="{{armor.img}}" /></a>
@@ -276,6 +326,51 @@
          </ul>
        </div>

+        <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.competency"}}</label></h3>
+              </span>
+            </li>
+            {{#each competency.weapons as |cdata key|}}
+              {{#if cdata}}
+                <li class="item flexrow list-item list-item-shadow" data-item-id="{{language._id}}">
+                  <span class="item-name-label-long">{{localize "WH.ui.weapons"}} {{localize cdata.label}}</span>
+                  </li>
+              {{/if}}
+            {{/each}}
+            {{#each competency.shields as |cdata key|}}
+              {{#if cdata}}
+                <li class="item flexrow list-item list-item-shadow" data-item-id="{{language._id}}">
+                  <span class="item-name-label-long">{{localize "WH.ui.shields"}} {{localize cdata.label}}</span>
+                  </li>
+                {{/if}}
+              {{/each}}
+            {{#each competency.armors as |cdata key|}}
+              {{#if cdata}}
+                <li class="item flexrow list-item list-item-shadow" data-item-id="{{language._id}}">
+                  <span class="item-name-label-long">{{localize "WH.ui.armors"}} {{localize cdata.label}}</span>
+                  </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>
+
      </div>
    </div>

@@ -283,6 +378,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">
@@ -306,7 +439,9 @@
              <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}}</span>
+              <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}}

@@ -404,10 +539,10 @@
            <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{power._id}}">
              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
                  src="{{power.img}}" /></a>
-              <span class="item-name-label">
+              <span class="item-name-label-long3">
                <a class="power-roll"><i class="fa-solid fa-dice-d20"></i>{{power.name}}</a>
              </span>
-              <span class="item-name-label">
+              <span class="item-name-label-medium">
                <a class="power-roll">{{power.system.level}}</a>
              </span>
              <div class="item-filler">&nbsp;</div>
@@ -426,54 +561,23 @@
    {{!-- Equipement Tab --}}
    <div class="tab equipment" data-group="primary" data-tab="equipment">

-      {{#each slotEquipments as |slot slotKey|}}
-      <ul class="item-list alternate-list">
-        <li class="item flexrow list-item items-title-bg {{#if (gt slot.slotUsed slot.nbslots)}}items-title-bg-red{{/if}}">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">{{localize slot.label}}</label></h3>
-          </span>          
-          <span class="item-field-label-medium">
-            <label class="short-label">{{localize "WH.ui.Type"}}</label>
-          </span>
-          <span class="item-field-label-long">
-            <label class="short-label">{{localize "WH.ui.Qty"}}</label>
-          </span>
-          <span class="item-field-label-medium">
-            <label class="short-label">{{localize "WH.ui.maxslots"}}: {{slot.nbslots}}</label>
-          </span>
-          <span class="item-field-label-medium">
-            <label class="short-label">{{localize "WH.ui.slotsused"}}: {{slot.slotUsed}}</label>
-          </span>
-          <div class="item-filler">&nbsp;</div>
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="{{itemtype}}" title="Create Item"><i class="fas fa-plus"></i></a>
-          </div>
-        </li>
-        {{#each slot.content as |item itemKey|}}
-        <li class="item flexrow list-item list-item-shadow" data-item-id="{{item._id}}">
-          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{item.img}}" /></a>
-          <span class="item-name-label">{{item.name}}</span>
+      <div class="flexrow">
+        <label class="">{{localize "WH.ui.totalmoney"}} : {{totalMoney}}</label>
+      </div>

-          <span class="item-field-label-medium">
-            <label class="short-label">{{upperFirst item.type}}</label>
-          </span>
+      <hr>
+      <h3>{{localize "WH.ui.bodyslots"}} : </h3>

-          <span class="item-field-label-long"><label>
-              {{item.system.quantity}}
-              (<a class="quantity-minus plus-minus-button"> -</a>/<a class="quantity-plus plus-minus-button">+</a>)
-            </label>
-          </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>
+      {{#each bodyContainers as |slot slotKey|}}
+        {{> systems/fvtt-warhero/templates/partial-container.html slot=slot slotKey=slotKey}}
      {{/each}}

+      <hr>
+      <h3>{{localize "WH.ui.containerslot"}} : </h3>
+
+      {{#each equipmentContainers as |slot slotKey|}}
+        {{> systems/fvtt-warhero/templates/partial-container.html slot=slot slotKey=slotKey}}
+      {{/each}}

      <hr>

@@ -486,50 +590,37 @@
          <ul class="item-list alternate-list">
            <li class="item flexrow">
              <label class="generic-label">{{localize "WH.ui.origin"}}</label>
-              <input type="text" class="" name="system.biodata.origin" value="{{data.biodata.origin}}"
+              <input type="text" class="" name="system.biodata.origin" value="{{system.biodata.origin}}"
                data-dtype="String" />
            </li>
            <li class="item flexrow">
              <label class="generic-label">{{localize "WH.ui.age"}}</label>
-              <input type="text" class="" name="system.biodata.age" value="{{data.biodata.age}}" data-dtype="String" />
+              <input type="text" class="" name="system.biodata.age" value="{{system.biodata.age}}" data-dtype="String" />
            </li>
            <li class="item flexrow">
              <label class="generic-label">{{localize "WH.ui.height"}}</label>
-              <input type="text" class="" name="system.biodata.height" value="{{data.biodata.height}}" data-dtype="String" />
+              <input type="text" class="" name="system.biodata.height" value="{{system.biodata.height}}" data-dtype="String" />
            </li>
            <li class="flexrow item">
              <label class="generic-label">{{localize "WH.ui.preferredhand"}}</label>
-              <input type="text" class="" name="system.biodata.preferredhand" value="{{data.biodata.preferredhand}}"
+              <input type="text" class="" name="system.biodata.preferredhand" value="{{system.biodata.preferredhand}}"
                data-dtype="String" />
            </li>
          </ul>
        </div>
       <div>
          <ul>
-            <li class="flexrow item">
-              <label class="generic-label">{{localize "WH.ui.size"}}</label>
-              <select class="competence-base flexrow" type="text" name="system.biodata.size" value="{{data.biodata.size}}" data-dtype="Number">
-                {{#select data.biodata.size}}
-                <option value="1">Tiny</option>
-                <option value="2">Small</option>
-                <option value="3">Medium</option>
-                <option value="4">Large</option>
-                <option value="5">Huge</option>
-                <option value="6">Gargantuan</option>
-                {{/select}}
-              </select> 
-            </li>
            <li class="flexrow item">
              <label class="generic-label">{{localize "WH.ui.gender"}}</label>
-              <input type="text" class="" name="system.biodata.sex" value="{{data.biodata.sex}}" data-dtype="String" />
+              <input type="text" class="" name="system.biodata.sex" value="{{system.biodata.sex}}" data-dtype="String" />
            </li>
            <li class="item flexrow">
              <label class="generic-label">{{localize "WH.ui.eyes"}}</label>
-              <input type="text" class="" name="system.biodata.eyes" value="{{data.biodata.eyes}}" data-dtype="String" />
+              <input type="text" class="" name="system.biodata.eyes" value="{{system.biodata.eyes}}" data-dtype="String" />
            </li>
            <li class="item flexrow">
              <label class="generic-label">{{localize "WH.ui.hair"}}</label>
-              <input type="text" class="" name="system.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
+              <input type="text" class="" name="system.biodata.hair" value="{{system.biodata.hair}}" data-dtype="String" />
            </li>
          </ul>
        </div>
--- a/templates/item-class-sheet.html
+++ b/templates/item-class-sheet.html
@@ -13,7 +13,7 @@
    <div class="tab details" data-group="primary" data-tab="description">

      <label class="generic-label">{{localize "WH.ui.description"}}</label>
-      <div class="medium-editor item-text-long-line">
+      <div class="editor item-text-long-line">
        {{editor description target="system.description" button=true owner=owner editable=editable}}
      </div>
    </div>
@@ -21,8 +21,12 @@
    <div class="tab details" data-group="primary" data-tab="details">
      <ul>

+        <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.isclasssecondary"}}</label>
+          <input type="checkbox" name="system.issecondary" {{checked system.issecondary}}/>
+        </li>
+
        {{#each system.weapons as |weaponflag key|}}
-          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.weapons"}} {{key}}</label>
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.weapons"}} {{localize (concat "WH.conf." key)}}</label>
            <input type="checkbox" class="padd-right status-small-label color-class-common item-field-label-short"
                  name="system.weapons.{{key}}" {{checked weaponflag}}/>

@@ -30,7 +34,7 @@
        {{/each}}

        {{#each system.armors as |armorflag key|}}
-          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.armors"}} {{key}}</label>
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.armors"}} {{localize (concat "WH.conf." key "armor")}}</label>
            <input type="checkbox" class="padd-right status-small-label color-class-common item-field-label-short"
                  name="system.armors.{{key}}" {{checked armorflag}}/>

@@ -38,7 +42,7 @@
        {{/each}}

        {{#each system.shields as |shieldflag key|}}
-        <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.shields"}} {{key}}</label>
+        <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.shields"}} {{localize (concat "WH.conf." key "shield")}}</label>
          <input type="checkbox" class="padd-right status-small-label color-class-common item-field-label-short"
                name="system.shields.{{key}}" {{checked shieldflag}}/>

--- a/templates/item-classitem-sheet.html
+++ b/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>
--- a/templates/item-competency-sheet.html
+++ b/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>
--- a/templates/item-condition-sheet.html
+++ b/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>
--- a/templates/item-equipment-sheet.html
+++ b/templates/item-equipment-sheet.html
@@ -16,6 +16,10 @@
    <div class="tab details" data-group="primary" data-tab="details">
      <ul>

+        <li class="flexrow"><label class="item-field-label-medium ">{{localize "WH.ui.providedslot"}}</label>
+          <input type="text" class="item-field-label-medium " name="system.providedslot" value="{{system.providedslot}}" data-dtype="Number"/>
+        </li>
+        
        {{> systems/fvtt-warhero/templates/partial-item-common-equipment.html}}

      </ul>
--- a/templates/item-genericitem-sheet.html
+++ b/templates/item-genericitem-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>
--- a/templates/item-money-sheet.html
+++ b/templates/item-money-sheet.html
@@ -0,0 +1,37 @@
+<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.quantity"}}</label>
+          <input type="text" class="item-field-label-long" name="system.quantity" value="{{system.quantity}}" data-dtype="Number"/>
+        </li>  
+      <li class="flexrow"><label class="item-field-label-medium ">{{localize "WH.ui.slotlocation"}}</label>
+        <select class="item-field-label-long " type="text" name="system.slotlocation" value="{{system.slotlocation}}" data-dtype="String">
+          {{#select system.slotlocation}}
+            {{#each config.slotNames as |type key|}}
+              <option value="{{key}}">{{localize type.label}}</option>
+            {{/each}}
+          {{/select}}
+        </select> 
+      </li>
+    </ul>
+      
+    </div>
+
+  </section>
+</form>
--- a/templates/item-poison-sheet.html
+++ b/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>
--- a/templates/item-potion-sheet.html
+++ b/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>
--- a/templates/item-race-sheet.html
+++ b/templates/item-race-sheet.html
@@ -13,7 +13,7 @@
    <div class="tab details" data-group="primary" data-tab="description">

      <label class="generic-label">Description</label>
-      <div class="medium-editor item-text-long-line">
+      <div class="editor item-text-long-line">
        {{editor description target="system.description" button=true owner=owner editable=editable}}
      </div>
    </div>
@@ -64,7 +64,7 @@
        </li>

        {{#each system.weapons as |weaponflag key|}}
-          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.weapons"}} {{key}}</label>
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.weapons"}} {{localize (concat "WH.conf." key)}}</label>
            <input type="checkbox" class="padd-right status-small-label color-class-common item-field-label-short"
                  name="system.weapons.{{key}}" {{checked weaponflag}}/>

@@ -72,7 +72,7 @@
        {{/each}}

        {{#each system.armors as |armorflag key|}}
-          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.armors"}} {{key}}</label>
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.armors"}} {{localize (concat "WH.conf." key "armor")}}</label>
            <input type="checkbox" class="padd-right status-small-label color-class-common item-field-label-short"
                  name="system.armors.{{key}}" {{checked armorflag}}/>

@@ -80,7 +80,7 @@
        {{/each}}

        {{#each system.shields as |shieldflag key|}}
-        <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.shields"}} {{key}}</label>
+        <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.shields"}} {{localize (concat "WH.conf." key "shield")}}</label>
          <input type="checkbox" class="padd-right status-small-label color-class-common item-field-label-short"
                name="system.shields.{{key}}" {{checked shieldflag}}/>

--- a/templates/item-skill-sheet.html
+++ b/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>
@@ -23,6 +27,10 @@
            <input type="checkbox" name="system.unlimited" {{checked system.unlimited}}/>
          </li>

+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.skilllevelacquired"}}</label>
+            <input type="text" class="item-field-label-medium " name="system.acquiredatlevel" value="{{system.acquiredatlevel}}" data-dtype="Number"/>
+          </li>
+
          {{#if system.unlimited}}

          {{else}}
--- a/templates/item-trap-sheet.html
+++ b/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>
--- a/templates/partial-actor-stat-block.html
+++ b/templates/partial-actor-stat-block.html
@@ -31,14 +31,20 @@
    {{#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"/>
+      <label class="item-field-label-2rem">&nbsp;/&nbsp;</label>
+      <input type="text" class="item-field-label-short " name="system.{{path}}.{{key}}.maxuse" value="{{stat.maxuse}}" data-dtype="Number"/>
+    {{/if}}
+  
  {{/if}}
  
  {{#if hassave}}
-    <span class="item-field-label-short" name="{{key}}">
-      <h4 class="item-field-label-short">
+    <span class="item-field-label-medium" name="{{key}}">
+      <h4 class="item-field-label-medium">
      <i class="fa-solid fa-dice-d20"></i>
        <a class="roll-save stat-margin" data-type="{{path}}" data-key="{{key}}">
-          {{localize "WH.ui.save"}}
+          {{localize (concat "WH.ui.save" key)}}
        </a>
      </h4>
    </span>
--- a/templates/partial-container.html
+++ b/templates/partial-container.html
@@ -0,0 +1,49 @@
+<ul class="item-list alternate-list">
+  <li class="item flexrow list-item items-title-bg {{#if (gt slot.slotUsed slot.nbslots)}}items-title-bg-red{{/if}}">
+    <span class="item-name-label-header">
+      <h3><label class="items-title-text">{{localize slot.label}}</label></h3>
+    </span>          
+    <span class="item-field-label-medium">
+      <label class="short-label">{{localize "WH.ui.Type"}}</label>
+    </span>
+    <span class="item-field-label-long">
+      <label class="short-label">{{localize "WH.ui.Qty"}}</label>
+    </span>
+    <span class="item-field-label-medium">
+      <label class="short-label">{{localize "WH.ui.maxslots"}}: {{slot.nbslots}}</label>
+    </span>
+    <span class="item-field-label-medium">
+      <label class="short-label">{{localize "WH.ui.slotsused"}}: {{slot.slotUsed}}</label>
+    </span>
+    <div class="item-filler">&nbsp;</div>
+    <div class="item-controls item-controls-fixed">
+      <a class="item-control item-add" data-type="{{itemtype}}" data-slot="{{slotKey}}" title="Create Item"><i class="fas fa-plus"></i></a>
+    </div>
+  </li>
+  {{#each slot.content as |item itemKey|}}
+  <li class="item flexrow list-item list-item-shadow" data-item-id="{{item._id}}">
+    <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+        src="{{item.img}}" /></a>
+    <span class="item-name-label">{{item.name}}</span>
+
+    <span class="item-field-label-medium">
+      <label class="short-label">{{upperFirst item.type}}</label>
+    </span>
+
+    <span class="item-field-label-long"><label>
+        {{item.system.quantity}}
+        (<a class="quantity-minus plus-minus-button"> -</a>/<a class="quantity-plus plus-minus-button">+</a>)
+      </label>
+    </span>
+
+    <span class="item-field-label-medium">
+      <label class="short-label">{{localize (concat "WH.conf." item.system.isidentified)}}</label>
+    </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>
--- a/templates/partial-item-common-equipment.html
+++ b/templates/partial-item-common-equipment.html
@@ -10,9 +10,35 @@
    {{/select}}
  </select> 
 </li>
-  <li class="flexrow"><label class="item-field-label-medium ">{{localize "WH.ui.quantity"}}</label>
+
+<li class="flexrow"><label class="item-field-label-medium ">{{localize "WH.ui.identified"}}</label>
+  <select class="item-field-label-long " type="text" name="system.isidentified" value="{{system.isidentified}}" data-dtype="String">
+    {{#select system.isidentified}}
+      {{#each config.identifiedState as |type key|}}
+        <option value="{{key}}">{{localize type}}</option>
+      {{/each}}
+    {{/select}}
+  </select> 
+</li>
+
+<li class="flexrow"><label class="item-field-label-medium ">{{localize "WH.ui.magiccharge"}}</label>
+  <select class="item-field-label-long " type="text" name="system.magiccharge" value="{{system.magiccharge}}" data-dtype="String">
+    {{#select system.magiccharge}}
+      {{#each config.magicCharge as |type key|}}
+        <option value="{{key}}">{{localize type}}</option>
+      {{/each}}
+    {{/select}}
+  </select> 
+</li>
+
+<li class="flexrow"><label class="item-field-label-medium ">{{localize "WH.ui.chargevalue"}}</label>
+  <input type="text" class="item-field-label-medium " name="system.chargevalue" value="{{system.chargevalue}}" data-dtype="Number"/>
+</li>
+
+<li class="flexrow"><label class="item-field-label-medium ">{{localize "WH.ui.quantity"}}</label>
    <input type="text" class="item-field-label-medium " name="system.quantity" value="{{system.quantity}}" data-dtype="Number"/>
-  </li>
-  <li class="flexrow"><label class="item-field-label-medium">{{localize "WH.ui.cost"}}</label>
-    <input type="text" class="item-field-label-medium " name="system.cost" value="{{system.cost}}" data-dtype="Number"/>
-  </li>
+</li>
+
+<li class="flexrow"><label class="item-field-label-medium">{{localize "WH.ui.cost"}}</label>
+  <input type="text" class="item-field-label-medium " name="system.cost" value="{{system.cost}}" data-dtype="Number"/>
+</li>
--- a/templates/partial-item-description.html
+++ b/templates/partial-item-description.html
@@ -1,7 +1,7 @@
 <div class="tab description" data-group="primary" data-tab="description">
  <div>
    <label class="generic-label">{{localize "WH.ui.description"}}</label>
-    <div class="medium-editor item-text-long-line">
+    <div class="editor item-text-long-line">
    {{editor description target="system.description" button=true owner=owner editable=editable}}
    </div>
  </div>
--- a/templates/party-sheet.html
+++ b/templates/party-sheet.html
@@ -0,0 +1,100 @@
+<form class="{{cssClass}}" autocomplete="off">
+
+  {{!-- Sheet Header --}}
+  <header class="sheet-header">
+    <div class="header-fields">
+      <h1 class="charname margin-right"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
+      <div class="flexrow">
+        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
+        <div class="flexcol">
+        </div>
+      </div>
+
+    </div>
+  </header>
+
+  {{!-- Sheet Tab Navigation --}}
+  <nav class="sheet-tabs tabs" data-group="primary">
+    <a class="item" data-tab="equipment">{{localize "WH.ui.equipment"}}</a>
+    <a class="item" data-tab="biodata">{{localize "WH.ui.biography"}}</a>
+  </nav>
+
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+
+
+    {{!-- Equipement Tab --}}
+    <div class="tab equipment" data-group="primary" data-tab="equipment">
+
+      {{#each partySlots as |slot slotKey|}}
+      <ul class="item-list alternate-list">
+        <li class="item flexrow list-item items-title-bg {{#if (gt slot.slotUsed slot.nbslots)}}items-title-bg-red{{/if}}">
+          <span class="item-name-label-header">
+            <h3><label class="items-title-text">{{localize slot.label}}</label></h3>
+          </span>          
+          <span class="item-field-label-medium">
+            <label class="short-label">{{localize "WH.ui.Type"}}</label>
+          </span>
+          <span class="item-field-label-long">
+            <label class="short-label">{{localize "WH.ui.Qty"}}</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">{{localize "WH.ui.maxslots"}}: {{slot.nbslots}}</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">{{localize "WH.ui.slotsused"}}: {{slot.slotUsed}}</label>
+          </span>
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-add" data-type="{{itemtype}}" title="Create Item"><i class="fas fa-plus"></i></a>
+          </div>
+        </li>
+        {{#each slot.content as |item itemKey|}}
+        <li class="item flexrow list-item list-item-shadow" data-item-id="{{item._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{item.img}}" /></a>
+          <span class="item-name-label">{{item.name}}</span>
+
+          <span class="item-field-label-medium">
+            <label class="short-label">{{upperFirst item.type}}</label>
+          </span>
+
+          <span class="item-field-label-long"><label>
+              {{item.system.quantity}}
+              (<a class="quantity-minus plus-minus-button"> -</a>/<a class="quantity-plus plus-minus-button">+</a>)
+            </label>
+          </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>
+      {{/each}}
+
+
+      <hr>
+
+    </div>
+
+    {{!-- Biography Tab --}}
+    <div class="tab biodata" data-group="primary" data-tab="biodata">
+      <hr>
+      <h3>{{localize "WH.ui.background"}} : </h3>
+      <div class="form-group editor">
+        {{editor description target="system.biodata.description" button=true owner=owner
+        editable=editable}}
+      </div>
+      <hr>
+      <h3>{{localize "WH.ui.notes"}} : </h3>
+      <div class="form-group editor">
+        {{editor notes target="system.biodata.notes" button=true owner=owner editable=editable}}
+      </div>
+      <hr>
+      </article>
+    </div>
+
+  </section>
+</form>
--- a/templates/roll-dialog-generic.html
+++ b/templates/roll-dialog-generic.html
@@ -26,7 +26,7 @@
              {{#if is2hands}}
                <span class="item-field-label-vlong">{{weapon.damageFormula2Hands}}</span>
              {{else}}
-                <span class="item-field-label-vlong">{{weapon.damage}}</span>
+                <span class="item-field-label-vlong">{{weapon.damageFormula}}</span>
              {{/if}}
            </div>
          {{/if}}
@@ -54,7 +54,7 @@

        {{#if stat.istxc}}
        <div class="flexrow">
-          <span class="item-field-label-vlong">{{localize "WH.chat.mweaponmalus}}" ({{mWeaponMalus}})? </span>
+          <span class="item-field-label-vlong">{{localize "WH.chat.mweaponmalus"}} ({{mWeaponMalus}})? </span>
          <span class="item-field-label-medium"><input type="checkbox" id="usemWeaponMalus" name="usemWeaponMalus" {{checked usemWeaponMalus}}/></span>          
        {{/if}}
        </div>
Author	SHA1	Message	Date
LeRatierBretonnien	2e4b018834	New combat features	2023-03-24 13:40:20 +01:00
LeRatierBretonnien	fb3d0dfd7f	New combat features	2023-03-24 13:29:53 +01:00
LeRatierBretonnien	e573f5b382	New combat features	2023-03-24 13:29:19 +01:00
LeRatierBretonnien	ed494e69b9	Fix DR/Parry bonuses	2023-03-22 13:38:49 +01:00
LeRatierBretonnien	2813e5a694	some re-org	2023-03-20 21:01:00 +01:00
LeRatierBretonnien	09974cd323	Fix inventory	2023-03-19 23:13:46 +01:00
LeRatierBretonnien	6b8710b94c	Fix inventory	2023-03-19 23:13:24 +01:00
LeRatierBretonnien	6b7d943649	New slots	2023-03-10 18:32:42 +01:00
LeRatierBretonnien	c2a7fbb4b5	New slots	2023-03-10 18:32:13 +01:00
LeRatierBretonnien	36c9945886	Update	2023-03-09 17:35:09 +01:00
LeRatierBretonnien	bfad3d1e5f	Update	2023-03-09 13:53:19 +01:00
LeRatierBretonnien	7827e07e1c	Minot fixes	2023-03-04 17:34:18 +01:00
LeRatierBretonnien	3a8ad674bd	Add new items	2023-02-27 22:04:03 +01:00
LeRatierBretonnien	c8f7c7c1e5	Money	2023-02-21 17:53:00 +01:00
LeRatierBretonnien	d922d77736	Minor changes	2023-02-20 18:38:00 +01:00
LeRatierBretonnien	7137de0983	Minor changes	2023-02-20 10:16:17 +01:00
LeRatierBretonnien	46b129cf81	Various fixes	2023-02-18 23:19:10 +01:00