WIP Hero 6

modules/hero6-actor-sheet.js

@@ -36,6 +36,7 @@ export class Hero6ActorSheet extends ActorSheet {
       cssClass: this.isEditable ? "editable" : "locked",
       system: objectData,
       characteristics: this.actor.prepareCharac(),
+      defenses: duplicate(this.actor.system.defenses),
       limited: this.object.limited,
       skills: this.actor.getSkills( ),
       perks: this.actor.getPerks( ),
@@ -43,13 +44,13 @@ export class Hero6ActorSheet extends ActorSheet {
       talents: this.actor.getTalents( ),
       complications: this.actor.getComplications( ),
       martialarts: this.actor.getMartialArts( ),
+      maneuvers: this.actor.getManeuvers( ),
       weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ),
       armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())),
       shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())),
-      equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsOnly()) ),
+      equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsMoneys()) ),
       subActors: duplicate(this.actor.getSubActors()),
       race: duplicate(this.actor.getRace()),
-      moneys: duplicate(this.actor.getMoneys()),
       encCapacity: this.actor.getEncumbranceCapacity(),
       description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}),
       motivation: await TextEditor.enrichHTML(this.object.system.biodata.motivation, {async: true}),

modules/hero6-actor.js

@@ -274,8 +274,10 @@ export class Hero6Actor extends Actor {
     }
     return 0;
   }
-
   /* ------------------------------------------- */
+  getManeuvers() {
+    return this.items.filter(item => item.type == "maneuver" );
+  }
   getEquipments() {
     return this.items.filter(item => item.type == "equipment" && item.system.subtype == "equipment");
   }
@@ -288,7 +290,9 @@ export class Hero6Actor extends Actor {
   getShields() {
     return this.items.filter(item => item.type == "equipment" && item.system.subtype == "shield");
   }
-  /* ------------------------------------------- */
+  getEquipmentsMoneys() {
+    return duplicate(this.items.filter(item => item.type == "equipment" && (item.system.subtype == "equipment" || item.system.subtype == "money")) || [])
+  }
   getEquipmentsOnly() {
     return duplicate(this.items.filter(item => item.type == "equipment" && item.system.subtype == "equipment") || [])
   }
@@ -529,7 +533,7 @@ export class Hero6Actor extends Actor {
     let rollData = this.getCommonRollData()
     rollData.mode = "item"
     rollData.item = duplicate(item)
-    if ( item.type == "skill") {
+    if (item.type == "skill") {
       this.prepareSkill(rollData.item)
     }
     this.startRoll(rollData)

modules/hero6-config.js

@@ -4,7 +4,8 @@ export const Hero6_CONFIG = {
     equipment: "Equipment",
     weapon: "Weapon",
     armor: "Armor",
-    shield: "Shield"
+    shield: "Shield",
+    money: "Money"
   },
   rollCharac  : {
     "str": "Strength",

modules/hero6-main.js

@@ -91,12 +91,6 @@ Hooks.once("ready", function () {
     });
   }
   
-  // CSS patch for v9
-  if (game.version) {
-    let sidebar = document.getElementById("sidebar");
-    sidebar.style.width = "min-content";
-  }
-
   welcomeMessage();
   Hero6Utility.ready()
   Hero6Commands.init()

modules/hero6-utility.js

@@ -298,7 +298,7 @@ export class Hero6Utility {
     let actor = game.actors.get(rollData.actorId)
 
     // ability/save/size => 0
-    let diceFormula = "3d6+" + rollData.bonusMalus
+    let diceFormula = "3d6" 
     let target = 10
     if (rollData.charac) {
       target = rollData.charac.roll
@@ -306,7 +306,8 @@ export class Hero6Utility {
     if (rollData.item) {
       target = rollData.item.roll || rollData.item.system.roll
     }
-
+    target += rollData.bonusMalus
+    
     // Performs roll
     console.log("Roll formula", diceFormula)
     let myRoll = rollData.roll