Fix size

.gitignore

@@ -0,0 +1 @@
+.history/

README.md

@@ -1,2 +1,4 @@
-# fvtt-pegasus-rpg
+# fvtt-warhero
+
+
 

lang/en.json

@@ -203,6 +203,19 @@
   "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.allitems": "All items",
+  "WH.ui.small": "Small",
+  "WH.ui.medium": "Medium",
+  "WH.ui.large": "Large",
   
   "WH.ui.bodyslots": "Body",
   "WH.ui.containerslot": "Containers",

lang/it.json

@@ -1,24 +1,49 @@
 {
+  "ACTOR": {
+    "TypeCharacter": "PG",
+    "TypeNpc": "PNG",
+    "TypeMonster": "Mostro",
+	"TypeParty": "Gruppo"
+  },
+  "ITEM": {
+    "TypeWeapon": "Arma",
+    "TypeEquipment": "Equipaggiamento",
+    "TypeRace": "Razza",
+    "TypeArmor": "Armatura",
+    "TypeShield": "Scudo",
+    "TypeSkill": "Abilità",
+    "TypePower": "Potere",
+    "TypeLanguage": "Lingua",
+    "TypeCondition": "Status",
+    "TypeClass": "Classe",
+    "TypeMoney": "Mo",
+    "TypePotion": "Pozione",
+    "TypePoison": "Veleno",
+    "TypeTrap": "Trappola",
+    "TypeClassitem": "Classe",
+    "TypeCompetency": "Competenza"
+  },
+
   "WH.conf.short": "Corte",
   "WH.conf.long": "Lunghe",
-  "WH.conf.twohanded": "A Due mani",
-  "WH.conf.shooting": "Da tiro",
-  "WH.conf.throwing": "Da lancio",
+  "WH.conf.twohanded": "A due mani",
+  "WH.conf.shooting": "Da Tiro",
+  "WH.conf.throwing": "Da Lancio",
   "WH.conf.lightarmor" : "Leggera",
   "WH.conf.mediumarmor": "Media",
   "WH.conf.heavyarmor": "Pesante", 
   "WH.conf.lightshield": "Leggero",
   "WH.conf.mediumshield": "Medio",
   "WH.conf.towershield": "Torre",
-  "WH.conf.polearm": "Armi in asta",
-  "WH.conf.special": "Speciali",
+  "WH.conf.polearm": "In asta",
+  "WH.conf.special": "Speciale",
 
   "WH.conf.head": "Testa",
   "WH.conf.cloak": "Mantello",
-  "WH.conf.weapon1": "Mano primaria",
-  "WH.conf.weapon2": "Mano secondaria",
+  "WH.conf.weapon1": "Arma 1",
+  "WH.conf.weapon2": "Arma 2",
   "WH.conf.gloves": "Guanti",
-  "WH.conf.dress": "Abito",
+  "WH.conf.dress": "Vestito",
   "WH.conf.boots": "Stivali",
   "WH.conf.ring": "Anelli",
   "WH.conf.belt": "Cintura",
@@ -29,13 +54,30 @@
   "WH.conf.beltpouch1": "Borsa da cintura 1",
   "WH.conf.beltpouch2": "Borsa da cintura 2",
   "WH.conf.beltpouch3": "Borsa da cintura 3",
+  "WH.conf.scrollcase": "Contenitore per mappe o pergamene",
+  "WH.conf.wandcase": "Porta bacchette",
+  "WH.conf.potioncase": "Porta pozioni",
+  "WH.conf.bagholding": "Borsa conservante",
+  "WH.conf.quiverholding": "Faretra conservante",
+  "WH.conf.backpackholding": "Zaino conservante",
+  "WH.conf.smallchest": "Scrigno piccolo",
+  "WH.conf.mediumchest": "Scrigno medio",
+  "WH.conf.largechest": "Scrigno grande",
+  "WH.conf.hugechest": "Scrigno enorme",
+  "WH.conf.partystorage": "Scrigno di gruppo",
 
+  "WH.conf.unknown": "Non sai se è magico",
+  "WH.conf.yes": "Identificato",
+  "WH.conf.no": "Non identificato",
+  "WH.conf.notapplicable": "Non applicabile",
+  "WH.conf.undefined": "Not applicable",
+  
   "WH.ui.level": "Livello",
   "WH.ui.notes": "Note",
 
   "WH.ui.hpprog": "Progressione PF",
   "WH.ui.lan": "Lingue",
-  "WH.ui.attrbonus": "Attributi",
+  "WH.ui.attrbonus": "Attributo",
   "WH.ui.weapons": "Armi",
   "WH.ui.armors": "Armature",
   "WH.ui.shields": "Scudi",
@@ -44,12 +86,15 @@
   "WH.ui.Strength": "Fisico",
   "WH.ui.Instinct": "Istinto",
   "WH.ui.Dexterity": "Istinto",
+  "WH.ui.savestr": "Ts Fisico",
+  "WH.ui.savedex": "Ts Istinto",
+  "WH.ui.savemin": "Ts Mente",
   "WH.ui.Mind": "Mente",
   "WH.ui.Type": "Tipo",
   "WH.ui.HitPoints": "Punti ferita",
   "WH.ui.Defence": "Difesa",
-  "WH.ui.Throw2HitM": "TxC (corpo a corpo)",
-  "WH.ui.Throw2HitR": "TxC (distanza)",
+  "WH.ui.Throw2HitM": "Txc (corpo a corpo)",
+  "WH.ui.Throw2HitR": "Txc (distanza)",
   "WH.ui.Mana": "Mana",
   "WH.ui.Initiative": "Iniziativa",
   "WH.ui.Movement": "Movimento (Terra)",
@@ -76,7 +121,8 @@
   "WH.ui.classSkills": "Abilitá di classe",
   "WH.ui.skills": "Abilitá Aggiuntiva",
   "WH.ui.isclassskill": "Abilitá di classe?",
-  "WH.ui.unlimited": "Usi illimitati?",
+  "WH.ui.israceskill": "Abilitàa di razza?",
+  "WH.ui.unlimited": "Unlimited use ?",
   "WH.ui.currentuse": "Numero di usi",
   "WH.ui.maxuse": "Usi Massimi",
   "WH.ui.languages": "Lingue",
@@ -87,41 +133,104 @@
   
   "WH.ui.main": "Principale",
   "WH.ui.combat": "Combattimento",
-  "WH.ui.skillstab": "Abilitá ed effetti",
+  "WH.ui.skillstab": "Abilità ed effetti",
   "WH.ui.powers": "Poteri",
   "WH.ui.equipment": "Equipaggiamento",
   "WH.ui.biography": "Biografia",
   "WH.ui.race": "Razza",
   "WH.ui.class": "Classe",
-  "WH.ui.religion": "Religione",
+  "WH.ui.religion": "Fede",
   "WH.ui.origin": "Origine",
-  "WH.ui.age": "Etá",
+  "WH.ui.age": "Età",
   "WH.ui.height": "Altezza",
   "WH.ui.eyes": "Occhi",
   "WH.ui.hair": "Capelli",
   "WH.ui.preferredhand": "Mano preferita",
   "WH.ui.size": "Taglia",
-  "WH.ui.gender": "Sesso",
+  "WH.ui.gender": "Gender",
   "WH.ui.background": "Storia",
   "WH.ui.type": "Tipo",
   "WH.ui.description": "Descrizione",
-  "WH.ui.rawroll": "Formula TXC (ex: 1d20+@statistics.str.value)",
-  "WH.ui.rawdamage": "Formula Danni (ex: 1d6+(@statistics.str.value/2))",
+  "WH.ui.rawroll": "Formula del dado (es: 1d20+@statistics.str.value)",
+  "WH.ui.rawdamage": "Formula danni (ex: 1d6+(@statistics.str.value/2))",
   "WH.ui.damage": "Danno",
   "WH.ui.2hdamage": "Danno a 2 mani",
-  "WH.ui.slotlocation": "Slot",
-  "WH.ui.quantity": "Quantitá",
+  "WH.ui.slotlocation": "Posizione dello slot",
+  "WH.ui.quantity": "Quantità",
   "WH.ui.cost": "Costo",
   "WH.ui.details": "Dettagli",
+  "WH.ui.magicschool": "Scuola di magia",
+  "WH.ui.providedslot": "Slot forniti",
+  "WH.ui.skilllevelacquired": "Acquisito a livello",
+  "WH.ui.totalmoney": "Total monete guadagnate",
+  "WH.ui.preparetime": "Tempo di preparazione",
+  "WH.ui.durationrounds": "Durata (in round)",
+  "WH.ui.application": "Tipo di applicazione",
+  "WH.ui.savesdc": "CD TS",
+  "WH.ui.savetype": "Tipo del tiro salvezza",
+  "WH.ui.Touch": "Tocco", 
+  "WH.ui.Ingestion": "Ingestione", 
+  "WH.ui.Weapon": "Arma", 
+  "WH.ui.halfdamage": "Dimezza",
+  "WH.ui.ignore": "Nega",
+  "WH.ui.dcfind": "CD per trovare",
+  "WH.ui.dcdisable": "CD per disattivare ",
+  "WH.ui.throwtohit": "Tiro per colpire",
+  "WH.ui.mandatoryfor": "Obbligatorio per",
+  "WH.ui.generic": "Generico",
+  "WH.ui.bless": "Benedizione",
+  "WH.ui.spell": "Incantesimo (Potere)",
+  "WH.ui.poison": "Veleno",
+  "WH.ui.disease": "Malattia",
+  "WH.ui.curse": "Maledizione",
+  "WH.ui.permanent": "Permanente", 
+  "WH.ui.temporary": "Temporanea", 
+  "WH.ui.begin": "Inizio",
+  "WH.ui.specialduration": "Durata speciale",
+  "WH.ui.infinite": "Infinita", 
+  "WH.uiwithineor": "Entro la fine del round",
+  "WH.ui.beginr": "All' inizio del prossimo round", 
+  "WH.ui.nextr": "Prossimo round", 
+  "WH.ui.nextcombat": "Al prossimo combattimento",
+  "WH.ui.untilendcombat": "Fino alla fine del combattimento",
+  "WH.ui.beginturn": "Inizio del turno",
+  "WH.ui.endturn": "Fine del turno",
+  "WH.ui.durationvalue": "Durata",
+  "WH.ui.durationunit": "Durata (unità di misura)",
+  "WH.ui.dcsave": "CD",
+  "WH.ui.incubationtime": "Tempo di incubazione",
+  "WH.ui.diseaseduration": "Durata malattia",
+  "WH.ui.ignoreeffect": "Ignora effetto",
+  "WH.ui.raceSkills": "Abilità di razza",
+  "WH.ui.identified": "Identificato",
+  "WH.ui.isclasssecondary": "Classe secondaria?",
+  "WH.ui.secondaryclass": "Super warhero",
+  "WH.ui.meleedamagebonus": "Bonus ai danni in corpo a corpo",
+  "WH.ui.rangeddamagebonus": "Bonus ai danni a distanza",
+  "WH.ui.notapplicable": "Non applicabile",
+  "WH.ui.chargedaily": "Al giorno",
+  "WH.ui.chargelimited": "Limitate",
+  "WH.ui.magiccharge": "Cariche magiche",
+  "WH.ui.chargevalue": "Valore delle cariche",
+  "WH.ui.allitems": "Tutti gli oggetti",
+  "WH.ui.small": "Piccola",
+  "WH.ui.medium": "Media",
+  "WH.ui.large": "Grande",
+  
+  "WH.ui.bodyslots": "Corpo",
+  "WH.ui.containerslot": "Contenitori",
 
-  "WH.chat.save": "Tiro salvezza",
-  "WH.chat.mweaponmalus": "Malus nell uso di due armi",
+  "WH.chat.save": "Salva",
+  "WH.chat.mweaponmalus": "Malus attacchi con più armi",
   "WH.chat.diceresult": "Risultato del dado",
   "WH.chat.result": "Risultato",
-  "WH.chat.parysuccess": "Hai parato con successo",
-  "WH.chat.paryfailed": "Hai fallito azione di parata",
-  "WH.chat.rollformula": "Formula per il tiro di dado",
-  "WH.chat.useshield":"Usa lo scudo?",
+  "WH.chat.parysuccess": "Parato con successo !",
+  "WH.chat.paryfailed": "Parata fallita !",
+  "WH.chat.rollformula": "Formula del dado",
+  "WH.chat.useshield":"Usare scudo?",
   "WH.chat.power": "Potere",
-  "WH.chat.powerlevel": "Livello di potere"
+  "WH.chat.powerlevel": "Livello di potere",
+
+  "WH.notif.skillmaxuse": "Usi massimi raggiunti",
+  "WH.notif.toomanyuses": "Usi massimi raggiunti"
 }

modules/warhero-actor-sheet.js

@@ -51,11 +51,16 @@ export class WarheroActorSheet extends ActorSheet {
       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(),
+      allItems: this.actor.getAllItems(),
       subActors: duplicate(this.actor.getSubActors()),
       competency: this.actor.getCompetency(),
       race: duplicate(race),
-      classes: duplicate(this.actor.getClasses()),
+      mainClass: this.actor.getMainClass(),
+      secondaryClass: this.actor.getSecondaryClass(),
       totalMoney: this.actor.computeTotalMoney(),
       equipments: duplicate(this.actor.getEquipmentsOnly()),
       //moneys: duplicate(this.actor.getMoneys()),

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)
@@ -146,7 +151,17 @@ export class WarheroActor extends Actor {
     }
     return schools
   }
+  getAllItems() {
+    let comp = duplicate(this.items || []);
+    WarheroUtility.sortArrayObjectsByName(comp)
+    return comp;
+  }
   /* -------------------------------------------- */
+  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 +173,13 @@ 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") || []);
@@ -279,9 +298,25 @@ export class WarheroActor extends Actor {
       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) {
@@ -478,17 +513,23 @@ export class WarheroActor extends Actor {
   }
   getCompetency() {
     let myRace = this.getRace()
-    let myClass = this.getClass()
+    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)
     }
-    if (myClass.system) {
-      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
   }
@@ -690,7 +731,7 @@ export class WarheroActor extends Actor {
   }
   /* -------------------------------------------- */
   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
@@ -699,7 +740,7 @@ export class WarheroActor extends Actor {
   }
   /* -------------------------------------------- */
   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

modules/warhero-config.js

@@ -96,7 +96,11 @@ export const WARHERO_CONFIG = {
     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",

styles/simple.css

@@ -1543,7 +1543,7 @@ li {
 }
 .alternate-list {
   margin-top: 4px;
-  fong2ex-wrap: nowrap;
+  flex-wrap: nowrap;
 }
 .item-filler {
   flex-grow: 6;

system.json

@@ -10,7 +10,7 @@
     "modules/warhero-main.js",
     "modules/import-global.js"
   ],
-  "gridDistance": 5,
+  "gridDistance": 1,
   "gridUnits": "m",
   "languages": [
     {
@@ -28,78 +28,6 @@
   ],
   "license": "LICENSE.txt",
   "packs": [
-    {
-      "type": "Item",
-      "label": "Races",
-      "name": "races",
-      "path": "packs/races.db",
-      "system": "fvtt-warhero",
-      "private": false,
-      "flags": {}
-    },
-    {
-      "type": "Item",
-      "label": "Shields",
-      "name": "shields",
-      "path": "packs/shields.db",
-      "system": "fvtt-warhero",
-      "private": false,
-      "flags": {}
-    },
-    {
-      "type": "Item",
-      "label": "Wepons",
-      "name": "weapons",
-      "path": "packs/weapons.db",
-      "system": "fvtt-warhero",
-      "private": false,
-      "flags": {}
-    },
-    {
-      "type": "Item",
-      "label": "Ammunitions",
-      "name": "ammunitions",
-      "path": "packs/ammunitions.db",
-      "system": "fvtt-warhero",
-      "private": false,
-      "flags": {}
-    },
-    {
-      "type": "Item",
-      "label": "Armors",
-      "name": "armors",
-      "path": "packs/armors.db",
-      "system": "fvtt-warhero",
-      "private": false,
-      "flags": {}
-    },
-    {
-      "type": "Item",
-      "label": "Classes",
-      "name": "classes",
-      "path": "packs/classes.db",
-      "system": "fvtt-warhero",
-      "private": false,
-      "flags": {}
-    },
-    {
-      "type": "Item",
-      "label": "Equipments",
-      "name": "equipments",
-      "path": "packs/equipments.db",
-      "system": "fvtt-warhero",
-      "private": false,
-      "flags": {}
-    },
-    {
-      "type": "Item",
-      "label": "Powers",
-      "name": "powers",
-      "path": "packs/powers.db",
-      "system": "fvtt-warhero",
-      "private": false,
-      "flags": {}
-    }
   ],
   "primaryTokenAttribute": "attributes.hp",
   "secondaryTokenAttribute": "attributes.mana",
@@ -107,15 +35,15 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "10.0.40",
+  "version": "10.0.53",
   "compatibility": {
     "minimum": "10",
     "verified": "10",
     "maximum": "10"
   },
   "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.40.zip",
+  "manifest": "https://www.uberwald.me/gitea/public/fvtt-warhero/raw/branch/master/system.json",  
+  "download": "https://www.uberwald.me/gitea/public/fvtt-warhero/archive/fvtt-warhero-10.0.53.zip",
   "url": "https://www.uberwald.me/gitea/public/fvtt-warhero",
   "background": "images/ui/warhero_welcome_page.webp",
   "id": "fvtt-warhero"

template.json

@@ -11,7 +11,7 @@
         "biodata": {
           "class": "",
           "age": 0,
-          "size": 3,
+          "size": "medium",
           "weight": "",
           "height": "",
           "hair": "",
@@ -62,8 +62,8 @@
             "style": "edit",
             "hasmax": true,
             "isheader": true,
-            "max": 1,
-            "value": 1
+            "max": 30,
+            "value": 30
           },
           "knowledge": {
             "label": "WH.ui.Knowledge",
@@ -71,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",
@@ -87,8 +88,9 @@
             "istxc": true,
             "style": "edit",
             "roll": true,
-            "max": 1,
-            "value": 1
+            "iscombat": true,
+            "max": 0,
+            "value": 0
           },
           "txcr": {
             "label": "WH.ui.Throw2HitR",
@@ -96,8 +98,9 @@
             "istxc": true,
             "style": "edit",
             "roll": true,
-            "max": 1,
-            "value": 1
+            "iscombat": true,
+            "max": 0,
+            "value": 0
           },
           "mana": {
             "label": "WH.ui.Mana",
@@ -105,37 +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",
+            "iscombat": true,
             "roll": true,
-            "max": 1,
-            "value": 1
+            "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": {
@@ -149,6 +153,7 @@
           "malusmultiweapon": {
             "label": "WH.ui.malusmultiweapon",
             "abbrev": "malusmultiweapon",
+            "iscombat": true,
             "style": "edit",
             "value": 0
           },
@@ -156,6 +161,7 @@
             "label": "WH.ui.drbonus",
             "abbrev": "drbonus",
             "style": "edit",
+            "iscombat": true,
             "value": 0
           },
           "drbonustotal": {
@@ -163,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
           },
@@ -177,6 +199,7 @@
             "abbrev": "parrybonustotal",
             "disabled": true,
             "style": "edit",
+            "iscombat": true,
             "roll": true,
             "value": 0
           },
@@ -351,6 +374,7 @@
       "templates": [
         "commonclassrace"
       ],
+      "issecondary": false,
       "description": ""
     },
     "race": {
@@ -389,6 +413,8 @@
       "slotused": 1,
       "slotlocation": "weapon1",
       "isidentified": "unknown",
+      "magiccharge": "notapplicable",
+      "chargevalue": 0,
       "description": ""
     },
     "armor": {
@@ -400,6 +426,8 @@
       "slotused": 1,
       "slotlocation": "armor",
       "isidentified": "unknown",
+      "magiccharge": "notapplicable",
+      "chargevalue": 0,
       "description": ""
     },
     "shield": {
@@ -411,6 +439,8 @@
       "slotused": 1,
       "slotlocation": "shield",
       "isidentified": "unknown",
+      "magiccharge": "notapplicable",
+      "chargevalue": 0,
       "description": ""
     },
     "equipment": {
@@ -422,6 +452,8 @@
       "slotlocation": "backpack",
       "providedslot": 0,
       "isidentified": "unknown",
+      "magiccharge": "notapplicable",
+      "chargevalue": 0,
       "description": ""
     },
     "power": {

templates/actor-sheet.html

@@ -21,25 +21,52 @@
               <ul>
                 <li class="item flexrow list-item " data-item-id="{{race._id}}">
                   <label class="item-field-label-medium">{{localize "WH.ui.race"}}</label>
+                  {{#if race}}
                   <a class="item-edit"><img class="sheet-competence-img" src="{{race.img}}"></a>
                   <input type="text" class="item-field-label-medium" disabled value="{{race.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="{{mainClass._id}}">
+                  <label class="item-field-label-medium">{{localize "WH.ui.class"}}</label>
+                  {{#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>  
-                {{#each classes as |class idx|}}
-                  <li class="item flexrow list-item" data-item-id="{{class._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" />
-                    <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}}
                 <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="String">
+                      {{#select system.biodata.size}}
+                      <option value="small">{{localize "WH.ui.small"}}</option>
+                      <option value="medium">{{localize "WH.ui.medium"}}</option>
+                      <option value="large">{{localize "WH.ui.large"}}</option>
+                      {{/select}}
+                  </select>       
                 </li>  
               </ul>
             </div>      
@@ -85,56 +112,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 |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>
 
@@ -151,7 +135,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>
@@ -186,8 +172,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">
@@ -201,7 +213,7 @@
                 <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>
@@ -228,6 +240,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">
@@ -241,7 +266,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>
@@ -259,6 +284,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">
@@ -273,7 +311,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>
@@ -292,6 +330,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>
 
@@ -490,14 +573,14 @@
       <h3>{{localize "WH.ui.bodyslots"}} : </h3>
 
       {{#each bodyContainers as |slot slotKey|}}
-        {{> systems/fvtt-warhero/templates/partial-container.html slot=slot}}
+        {{> 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}}
+        {{> systems/fvtt-warhero/templates/partial-container.html slot=slot slotKey=slotKey}}
       {{/each}}
 
       <hr>
@@ -531,19 +614,6 @@
         </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="{{system.biodata.size}}" data-dtype="Number">
-                {{#select system.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="{{system.biodata.sex}}" data-dtype="String" />
@@ -574,6 +644,35 @@
       </div>
       <hr>
       </article>
+
+      {{#if isGM}}
+      <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.allitems"}}</label></h3>
+            </span>
+            <span class="item-field-label-medium">
+              <label class="short-label">{{localize "WH.ui.type"}}</label>
+            </span>
+          </li>
+          {{#each allItems as |item key|}}
+          <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-long">{{item.name}}</span>
+
+            <span class="item-field-label-medium">{{upperFirst item.type}}</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>
+      {{/if}}
     </div>
 
   </section>

templates/item-class-sheet.html

@@ -21,6 +21,10 @@
     <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"}} {{localize (concat "WH.conf." key)}}</label>
             <input type="checkbox" class="padd-right status-small-label color-class-common item-field-label-short"

templates/partial-item-common-equipment.html

@@ -21,9 +21,24 @@
   </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>