Combat tab

WIP Hero 6
2023-03-22 22:43:30 +01:00 · 2023-03-21 20:43:41 +01:00 · 2023-03-21 14:01:27 +01:00
13 changed files with 513 additions and 188 deletions
--- a/lang/en.json
+++ b/lang/en.json
@ -12,6 +12,7 @@
      "TypeLimitation": "Limitation",
      "TypeComplication": "Complication",
      "TypeEquipment": "Equipment",
-      "TypeCurrency": "Currency"
+      "TypeCurrency": "Currency",
+      "TypeManeuver": "Maneuver"
    }
  }
--- a/modules/hero6-actor-sheet.js
+++ b/modules/hero6-actor-sheet.js
@ -14,8 +14,8 @@ export class Hero6ActorSheet extends ActorSheet {
    return mergeObject(super.defaultOptions, {
      classes: ["fvtt-hero-system-6", "sheet", "actor"],
      template: "systems/fvtt-hero-system-6/templates/actors/actor-sheet.hbs",
-      width: 960,
-      height: 720,
+      width: 1124,
+      height: 916,
      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "main" }],
      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
      editScore: true
@ -36,6 +36,8 @@ export class Hero6ActorSheet extends ActorSheet {
      cssClass: this.isEditable ? "editable" : "locked",
      system: objectData,
      characteristics: this.actor.prepareCharac(),
+      defenses: duplicate(this.actor.system.defenses),
+      movements: duplicate(this.actor.system.movements),
      limited: this.object.limited,
      skills: this.actor.getSkills( ),
      perks: this.actor.getPerks( ),
@ -43,13 +45,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}),
@ -150,6 +152,12 @@ export class Hero6ActorSheet extends ActorSheet {
      const characKey = $(event.currentTarget).data("charac-key");
      this.actor.rollCharac(characKey);
    });
+    html.find('.roll-direct').click((event) => {
+      const rollFormula = $(event.currentTarget).data("roll-formula");
+      let roll = new Roll(rollFormula).roll({async: false})
+      roll.toMessage()
+    });
+    
    html.find('.roll-item').click((event) => {
      const li = $(event.currentTarget).parents(".item");
      let itemId = li.data("item-id")
@ -179,7 +187,11 @@ export class Hero6ActorSheet extends ActorSheet {

    html.find('.update-field').change(ev => {
      const fieldName = $(ev.currentTarget).data("field-name");
-      let value = Number(ev.currentTarget.value);
+      const fieldType = $(ev.currentTarget).data("dtype");
+      let value = ev.currentTarget.value
+      if (fieldType.toLowerCase() == "Number") {
+        value = Number(value)
+      }
      this.actor.update( { [`${fieldName}`]: value } );
    });    
  }
--- a/modules/hero6-actor.js
+++ b/modules/hero6-actor.js
@ -66,6 +66,10 @@ export class Hero6Actor extends Actor {
    if (this.type == "character") {
    }
  }
+  computeDicesValue() {
+    this.system.biodata.presenceattack = Hero6Utility.getDerivatedDiceValue(this.system.characteristics.pre.value )
+    this.system.characteristics.str.strdice = Hero6Utility.getDerivatedDiceValue(this.system.characteristics.str.value )
+  }
  /* -------------------------------------------- */
  prepareDerivedData() {

@ -73,6 +77,7 @@ export class Hero6Actor extends Actor {
      this.system.encCapacity = this.getEncumbranceCapacity()
      this.buildContainerTree()
      this.computeHitPoints()
+      this.computeDicesValue()
    }

    super.prepareDerivedData();
@ -274,8 +279,14 @@ export class Hero6Actor extends Actor {
    }
    return 0;
  }
-
-  /* ------------------------------------------- */
+  getManeuvers() {
+    let maneuvers = { 
+      general: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "general"),
+      offensive: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "offensive"),
+      defensive: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "defensive")
+    }
+    return maneuvers
+  }
  getEquipments() {
    return this.items.filter(item => item.type == "equipment" && item.system.subtype == "equipment");
  }
@ -288,7 +299,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 +542,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)
--- a/modules/hero6-config.js
+++ b/modules/hero6-config.js
@ -4,7 +4,13 @@ export const Hero6_CONFIG = {
    equipment: "Equipment",
    weapon: "Weapon",
    armor: "Armor",
-    shield: "Shield"
+    shield: "Shield",
+    money: "Money"
+  },
+  maneuverTypes: {
+    "general": "General",
+    "offensive": "Offensive",
+    "defensive": "Defensive"
  },
  rollCharac  : {
    "str": "Strength",
--- a/modules/hero6-main.js
+++ b/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()
--- a/modules/hero6-utility.js
+++ b/modules/hero6-utility.js
@ -76,6 +76,15 @@ export class Hero6Utility {
    })    */
  }

+
+  /*-------------------------------------------- */
+  static getDerivatedDiceValue(value) {
+    let dices = Math.floor(value/5) +"d6"
+    if ( value % 5 > 2) {
+      dices += "+1d3"
+    }
+    return dices
+  }
  /*-------------------------------------------- */
  static upperFirst(text) {
    if (typeof text !== 'string') return text
@ -298,7 +307,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 +315,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
--- a/styles/simple.css
+++ b/styles/simple.css
@ -173,19 +173,6 @@ table { border: 1px solid #7a7971;}
  grid-template-columns: repeat(12, minmax(0, 1fr));
 }

-.flex-group-center,
-.flex-group-left,
-.flex-group-right {
-  -webkit-box-pack: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  text-align: center;
-  padding: 5px;
-}
-
 .flex-group-left {
  -webkit-box-pack: start;
  -ms-flex-pack: start;
@ -952,7 +939,7 @@ ul, li {
 }

 #sidebar #sidebar-tabs i{
-  width: 25px;
+  /*width: 25px;*/
  height: 25px;
  display: inline-block;
  background-position:center;
@ -1420,6 +1407,11 @@ Focus FOC: #ff0084
  max-width: 8rem;
  min-width: 8rem;
 }
+.item-field-label-long-img {
+  flex-grow:1;
+  max-width: 10rem;
+  min-width: 10rem;
+}
 .item-field-label-long2 {
  flex-grow:1;
  max-width: 16rem;
--- a/system.json
+++ b/system.json
@ -91,7 +91,7 @@
  "styles": [
    "styles/simple.css"
  ],
-  "version": "10.0.14",
+  "version": "10.0.29",
  "compatibility": {
    "minimum": "10",
    "verified": "10",
@ -99,7 +99,7 @@
  },
  "title": "Hero System v6 for FoundrtVTT (Official)",
  "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/main/system.json",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.14.zip",   
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.29.zip",   
  "url": "https://www.uberwald.me/gitea/uberwald/",
  "background": "images/ui/hro6_welcome_page.webp",
  "id": "fvtt-hero-system-6"
--- a/template.json
+++ b/template.json
@ -26,6 +26,12 @@
          "appearance": "",
          "description": "",
          "notes": "",
+          "points": 0,
+          "complications": 0,
+          "xpearned": 0,
+          "xpspent": 0,
+          "combatskills": "",
+          "presenceattack": "",
          "gmnotes": ""
        }
      },
@ -36,6 +42,10 @@
            "value": 10,
            "base": 10,
            "category": "main",
+            "strdice": "",
+            "lift": "",
+            "strend": 0,
+            "hasroll": true,
            "realcost": 0,
            "activecost": 0
          },
@ -43,34 +53,40 @@
            "label": "Dexterity",
            "value": 10,
            "base": 10,
+            "hasroll": true,
            "category": "main"
          },
          "con": {
            "label": "Constitution",
+            "hasroll": true,
            "category": "main",
            "value": 10,
            "base": 10
          },
          "int": {
            "label": "Intelligence",
+            "hasroll": true,
            "category": "main",
            "value": 10,
            "base": 10
          },
          "ego": {
            "label": "Ego",
+            "hasroll": true,
            "category": "main",
            "value": 10,
            "base": 10
          },
          "pre": {
            "label": "Presence",
+            "hasroll": true,
            "category": "main",
            "value": 10,
            "base": 10
          },
          "ocv": {
            "label": "OCV",
+            "hasroll": false,
            "base": 3,
            "autoMod": "0",
            "userMod": "0",
@ -79,6 +95,7 @@
          },
          "dcv": {
            "label": "DCV",
+            "hasroll": false,
            "base": 3,
            "autoMod": "0",
            "userMod": "0",
@ -87,6 +104,7 @@
          },
          "omcv": {
            "label": "OMCV",
+            "hasroll": false,
            "base": 3,
            "autoMod": "0",
            "userMod": "0",
@ -95,6 +113,7 @@
          },
          "dmcv": {
            "label": "DMCV",
+            "hasroll": false,
            "base": 3,
            "autoMod": "0",
            "userMod": "0",
@ -103,11 +122,14 @@
          },
          "spd": {
            "label": "Speed",
+            "hasroll": false,
            "value": 2,
            "base": 2
          },
          "pd": {
            "label": "PD",
+            "hasroll": false,
+            "isdefense": true,
            "value": 2,
            "base": 2,
            "pd_nonresistant_total": 0,
@ -117,6 +139,8 @@
          },
          "ed": {
            "label": "ED",
+            "hasroll": false,
+            "isdefense": true,
            "value": 2,
            "base": 2,
            "ed_nonresistant_total": 0,
@ -126,21 +150,39 @@
          },
          "rec": {
            "label": "REC",
+            "hasroll": false,
            "value": 4,
            "base": 4
          },
          "end": {
            "label": "END",
+            "hasroll": false,
+            "isvital": true,
+            "damage": 0,
            "value": 20,
            "max": 20
          },
          "stun": {
            "label": "STUN",
+            "hasroll": false,
+            "isvital": true,
+            "damage": 0,
+            "value": 20,
+            "max": 20
+          },
+          "other": {
+            "label": "OTHER",
+            "hasroll": false,
+            "isvital": true,
+            "damage": 0,
            "value": 20,
            "max": 20
          },
          "body": {
-            "label": "Body",
+            "label": "BODY",
+            "hasroll": false,
+            "isvital": true,
+            "damage": 0,
            "value": 10,
            "max": 10,
            "loc": {
@ -164,27 +206,91 @@
          },
          "running": {
            "label": "Running",
+            "ismovement": true,
+            "hasroll": false,
            "value": 12,
            "base": 12
          },
          "swimming": {
            "label": "Swimming",
+            "ismovement": true,
+            "hasroll": false,
            "value": 4,
            "base": 4
          },
          "leaping": {
            "label": "Leaping",
+            "ismovement": true,
+            "hasroll": false,
            "value": 4,
            "base": 4,
            "leaping_horizontal_base": 0,
            "leaping_horizontal_total": 0,
            "leaping_vertical_base": 0,
            "leaping_vertical_total": 0
+          }
+        }
+      },
+      "movements": {
+        "movements": {
+          "fly": {
+            "label": "Fly",
+            "value": 0
          },
-          "flying": {
-            "label": "Flying",
+          "teleport": {
+            "label": "Teleport",
+            "value": 0
+          },
+          "tunnel": {
+            "label": "Tunnel",
+            "value": 0
+          },
+          "move1": {
+            "label": "N/A",
+            "iseditable": true,
+            "value": 0
+          },
+          "move2": {
+            "label": "N/A",
+            "iseditable": true,
+            "value": 0
+          }
+        }
+      },
+      "defenses": {
+        "defenses": {
+          "mental": {
+            "label": "Mental",
            "value": 0,
-            "base": 0
+            "resistant": ""
+          },
+          "power": {
+            "label": "Power",
+            "value": 0,
+            "resistant": ""
+          },
+          "flash": {
+            "label": "Flash",
+            "value": 0,
+            "resistant": ""
+          },
+          "def1": {
+            "label": "N/A",
+            "value": 0,
+            "iseditable": true,
+            "resistant": ""
+          },
+          "def2": {
+            "label": "N/A",
+            "value": 0,
+            "iseditable": true,
+            "resistant": ""
+          },
+          "def3": {
+            "label": "N/A",
+            "value": 0,
+            "iseditable": true,
+            "resistant": ""
          }
        }
      },
@ -193,7 +299,9 @@
    "character": {
      "templates": [
        "biodata",
-        "characteristics"
+        "characteristics",
+        "defenses",
+        "movements"
      ],
      "subactors": []
    }
@ -205,11 +313,11 @@
      "talent",
      "power",
      "advantage",
+      "maneuver",
      "martialart",
      "limitation",
      "complication",
-      "equipment",
-      "currency"
+      "equipment"
    ],
    "templates": {
      "common": {
@ -239,11 +347,15 @@
        "items": {}
      }
    },
-    "currency": {
-      "quantity": 0,
+    "maneuver": {
      "templates": [
        "common"
-      ]
+      ],
+      "maneuvertype": "general",
+      "pha": "",
+      "ocv": 0,
+      "dcv" : 0,
+      "active": false
    },
    "advantage": {
      "templates": [
@ -314,15 +426,6 @@
      "impenetrable": 0,
      "value": 0
    },
-    "maneuver": {
-      "templates": [
-        "common"
-      ],
-      "phase": 0,
-      "ocv": "+0",
-      "dcv": "+0",
-      "active": false
-    },
    "movement": {
      "templates": [
        "common"
--- a/templates/actors/actor-sheet.hbs
+++ b/templates/actors/actor-sheet.hbs
@ -40,29 +40,51 @@
                <input type="text" class="item-field-label-long3" name="system.biodata.hair" value="{{system.biodata.hair}}" data-dtype="String" />
              </li>
            </ul>
-          </div>
-          <div>
-          <ul class="item-list alternate-list">
-            <li class="flexrow item">
-              <label class="item-field-label-medium">Gender</label>
-              <input type="text" class="item-field-label-medium" name="system.biodata.gender" value="{{system.biodata.gender}}" data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="item-field-label-medium">Height</label>
-              <input type="text" class="item-field-label-medium" name="system.biodata.height" value="{{system.biodata.height}}" data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="item-field-label-medium">Mass</label>
-              <input type="text" class="item-field-label-medium" name="system.biodata.mass" value="{{system.biodata.mass}}" data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="item-field-label-medium">Eyes</label>
-              <input type="text" class="item-field-label-medium" name="system.biodata.eyes" value="{{system.biodata.eyes}}" data-dtype="String" />
-            </li>
-          </ul>
-        </div>
+            </div>
+            <div>
+            <ul class="item-list alternate-list">
+              <li class="flexrow item">
+                <label class="item-field-label-medium">Gender</label>
+                <input type="text" class="item-field-label-medium" name="system.biodata.gender" value="{{system.biodata.gender}}" data-dtype="String" />
+              </li>
+              <li class="item flexrow">
+                <label class="item-field-label-medium">Height</label>
+                <input type="text" class="item-field-label-medium" name="system.biodata.height" value="{{system.biodata.height}}" data-dtype="String" />
+              </li>
+              <li class="item flexrow">
+                <label class="item-field-label-medium">Mass</label>
+                <input type="text" class="item-field-label-medium" name="system.biodata.mass" value="{{system.biodata.mass}}" data-dtype="String" />
+              </li>
+              <li class="item flexrow">
+                <label class="item-field-label-medium">Eyes</label>
+                <input type="text" class="item-field-label-medium" name="system.biodata.eyes" value="{{system.biodata.eyes}}" data-dtype="String" />
+              </li>
+            </ul>
            </div>
          </div>
+
+          <div class="flexrow">
+            <ul class="item-list alternate-list">
+              <li class="item flexrow">
+                <label class="item-field-label-medium">Points</label>
+                <input type="text" class="item-field-label-short" name="system.biodata.points" value="{{system.biodata.origin}}" data-dtype="Number" />
+                <label class="">&nbsp;</label>
+      
+                <label class="item-field-label-medium">Complications</label>
+                <input type="text" class="item-field-label-short" name="system.biodata.complications" value="{{system.biodata.complications}}" data-dtype="Number" />
+                <label class="">&nbsp;</label>
+
+                <label class="item-field-label-medium">XP Earned</label>
+                <input type="text" class="item-field-label-short" name="system.biodata.xpearned" value="{{system.biodata.xpearned}}" data-dtype="Number" />
+                <label class="">&nbsp;</label>
+
+                <label class="item-field-label-medium">XP Spent</label>
+                <input type="text" class="item-field-label-short" name="system.biodata.xpspent" value="{{system.biodata.xpspent}}" data-dtype="Number" />
+                <label class="">&nbsp;</label>
+              </li>
+            </ul>
+          </div>
+
        </div>
      </div>
    </div>
@ -89,75 +111,223 @@

    {{!-- Combat Tab --}}
    <div class="tab combat" data-group="primary" data-tab="combat">
-      <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">Weapons</label></h3>
-              </span>
-              <span class="item-field-label-short">
-                <label class="short-label">Ability</label>
-              </span>
-              <span class="item-field-label-medium">
-                <label class="short-label">Range</label>
-              </span>
+      
+      <div class="grid grid2col">
+          <div>
+          <ul class="item-list alternate-list">
+            <li class="item">
+              <label class="item-field-label-medium">STR Dice</label>
+              <a class="roll-direct" data-roll-formula="{{characteristics.str.strdice}}"><i class="fas fa-dice"></i>{{characteristics.str.strdice}}</a>
+              <label class="item-field-label-short">&nbsp;</label>
+              <label class="item-field-label-medium">Lift</label>
+              <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.str.lift" value="{{characteristics.str.lift}}" data-dtype="String" />
+              <label class="item-field-label-short">&nbsp;</label>
+              <label class="item-field-label-medium">STR END</label>
+              <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.str.strend" value="{{characteristics.str.strend}}" data-dtype="Number" />
            </li>
-            {{#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">{{weapon.name}}</a></span>
-
-              <span class="item-field-label-short">{{weapon.system.ability}}</span>
-
-              <span class="item-field-label-medium">{{perk.system.range}}</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 class="flexrow item">
+              <label class="item-field-label-long">Presence attack</label>
+              <a class="roll-direct" data-roll-formula="{{system.biodata.presenceattack}}"><i class="fas fa-dice"></i>{{system.biodata.presenceattack}}</a>
            </li>
-            {{/each}}
          </ul>
-        </div>

+            {{#each maneuvers as |mlist key|}}
+            <ul class="stat-list alternate-list">
+              <li class="item flexrow list-item items-title-bg">
+                <span class="item-field-label-long-img">
+                  <label class="">{{upperFirst key}} Maneuvers</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">PHA</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">OCV</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">DCV</label>
+                </span>
+                <span class="item-field-label-medium">
+                  <label class="short-label">Effects</label>
+                </span>
+              </li>
+              {{#each mlist as |maneuver key|}}
+              <li class="item flexrow list-item list-item-shadow" data-item-id="{{maneuver._id}}">
+                <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                    src="{{maneuver.img}}" /></a>
+                <span class="item-field-label-long">{{maneuver.name}}</span>
+
+                <span class="item-field-label-short">{{maneuver.system.pha}}</span>
+                <span class="item-field-label-short">{{maneuver.system.ocv}}</span>
+                <span class="item-field-label-short">{{maneuver.system.dcv}}</span>
+
+                <span class="item-field-label-medium">{{maneuver.system.effects}}</span>
+
+                <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}}
+        </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">Feats</label></h3>
-              </span>
-              <span class="item-field-label-medium">
-                <label class="short-label">Feature Die?</label>
-              </span>
-              <span class="item-field-label-medium">
-                <label class="short-label">SL?</label>
-              </span>
-              <span class="item-field-label-medium">
-                <label class="short-label">SL</label>
-              </span>
+          <ul class="item-list alternate-list">
+            <li class="flexrow item">
+              <label class="item-field-label-medium">SPD</label>
+              <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.spd.value" value="{{characteristics.spd.value}}" data-dtype="Number" />
            </li>
-            {{#each feats as |feat key|}}
-            <li class="item flexrow list-item list-item-shadow" data-item-id="{{feat._id}}">
-              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-                  src="{{feat.img}}" /></a>
-              <span class="item-name-label-long">{{feat.name}}</span>
-
-              <span class="item-field-label-medium">{{upperFirst feat.system.isfeatdie}}</span>
-              <span class="item-field-label-medium">{{upperFirst feat.system.issl}}</span>
-              <span class="item-field-label-medium">{{feat.system.sl}}</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 class="grid grid2col">
+            <div>
+              <ul class="stat-list alternate-list">
+                <li class="item flexrow list-item items-title-bg">
+                <span class="item-field-label-long">
+                  <label class="">Vitals</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">Val.</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">Dam.</label>
+                </span>
+                </li>
+                {{#each characteristics as |char key|}} 
+                  {{#if char.isvital}}
+                  <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
+                    <span class="item-field-label-long">{{char.label}}</span>
+                    <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
+                    <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.damage" value="{{char.damage}}" data-dtype="Number" />
+                  </li>
+                  {{/if}}
+                {{/each}}
+              </ul>
+
+            </div>
+
+            <div>
+
+              <ul class="stat-list alternate-list">
+                <li class="item flexrow list-item items-title-bg">
+                <span class="item-field-label-long">
+                  <label class="">Defenses</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">Val.</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">Res.</label>
+                </span>
+                </li>
+                {{#each characteristics as |char key|}} 
+                  {{#if char.isdefense}}
+                  <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
+                    <span class="item-field-label-long">{{char.label}}</span>
+                    <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
+                    <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.resistant" value="{{char.resistant}}" data-dtype="Number" />
+                  </li>
+                  {{/if}}
+                {{/each}}
+                {{#each defenses as |def key|}} 
+                  <li class="item flexrow list-item list-item-shadow" data-defense-key="{{key}}">
+                    {{#if  def.iseditable}}
+                    <input type="text" class="item-field-label-long update-field" data-field-name="system.defenses.{{key}}.label" value="{{def.label}}" data-dtype="String" />
+                    {{else}}
+                    <span class="item-field-label-long">{{def.label}}</span>
+                    {{/if}}
+                    <input type="text" class="item-field-label-short update-field" data-field-name="system.defenses.{{key}}.value" value="{{def.value}}" data-dtype="Number" />
+                    <input type="text" class="item-field-label-short" name="system.defenses.{{key}}.resistant" value="{{def.resistant}}" data-dtype="Number" />
+                  </li>
+                {{/each}}
+              </ul>
+
+            </div>
+
+          </div>
+        
+          <div class="item">
+            <label class="item-field-label-short">OCV</label>
+            <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.ocv.value" value="{{characteristics.ocv.value}}" data-dtype="Number" />
+            <label class="item-field-label-short">&nbsp;</label>
+
+            <label class="item-field-label-short">DCV</label>
+            <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.dcv.value" value="{{characteristics.dcv.value}}" data-dtype="Number" />
+            <label class="item-field-label-short">&nbsp;</label>
+
+            <label class="item-field-label-short">OMCV</label>
+            <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.omcv.value" value="{{characteristics.omcv.value}}" data-dtype="Number" />
+            <label class="item-field-label-short">&nbsp;</label>
+
+            <label class="item-field-label-short">DMCV</label>
+            <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.dmcv.value" value="{{characteristics.dmcv.value}}" data-dtype="Number" />
+          </div>
+
+          <div class="flexrow">
+            <label class="item-field-label-long">Combat Skill Levels</label>
+            <textarea rows="4" type="text" class="padd-right" name="system.biodata.combatskills"
+              data-dtype="String">{{system.biodata.combatskills}}</textarea>
+          </div>
+  
+          <div class="grid grid2col">
+            <div>
+              <ul class="stat-list alternate-list">
+                <li class="item flexrow list-item items-title-bg">
+                <span class="item-field-label-long">
+                  <label class="">Senses</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">Val.</label>
+                </span>
+                </li>
+                {{#each senses as |sense key|}} 
+                  <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
+                    <span class="item-field-label-long">{{sense.label}}</span>
+                    <span class="item-field-label-short">{{sense.value}}</span>
+                  </li>
+                {{/each}}
+              </ul>
+            </div>
+
+            <div>
+              <ul class="stat-list alternate-list">
+                <li class="item flexrow list-item items-title-bg">
+                <span class="item-field-label-long">
+                  <label class="">Movement</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">C.</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">Non-C.</label>
+                </span>
+                </li>
+                {{#each characteristics as |char key|}} 
+                  {{#if char.ismovement}}
+                  <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
+                    <span class="item-field-label-long">{{char.label}}</span>
+                    <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
+                    <input type="text" class="item-field-label-short" value="{{mul char.value 2}}" disabled data-dtype="Number" />
+                  </li>
+                  {{/if}}
+                {{/each}}
+                {{#each movements as |move key|}} 
+                  <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
+                    {{#if  move.iseditable}}
+                    <input type="text" class="item-field-label-long update-field" data-field-name="system.movements.{{key}}.label" value="{{move.label}}" data-dtype="String" />
+                    {{else}}
+                    <span class="item-field-label-long">{{move.label}}</span>
+                    {{/if}}
+                    <input type="text" class="item-field-label-short update-field" data-field-name="system.movements.{{key}}.value" value="{{move.value}}" data-dtype="Number" />
+                    <input type="text" class="item-field-label-short" value="{{mul move.value 2}}" disabled data-dtype="Number" />
+                  </li>
+                {{/each}}
+              </ul>
+              
+            </div>
+          </div>
+        </div>
+      
      </div>
    </div>

@ -167,11 +337,11 @@
      <div class="charac-item">
        <ul>
          <li class="item flexrow list-item items-title-bg">
-          <span class="item-field-label-short">
-            <h3><label class="item-field-label-short">Value</label></h3>
+          <span class="item-field-label-medium">
+            <label class="">Value</label>
          </span>
          <span class="item-field-label-medium">
-            <label class="item-field-label-long">characteristic</label>
+            <label class="item-field-label-medium">CHAR</label>
          </span>
          <span class="item-field-label-short">
            <label class="short-label">Base</label>
@ -198,8 +368,8 @@

      <ul class="stat-list alternate-list item-list">
        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Skills</label></h3>
+          <span class="item-field-label-long-img">
+            <label class="">Skills</label>
          </span>
          <span class="item-field-label-long">
            <label class="short-label">CHAR</label>
@ -213,8 +383,8 @@
        <li class="item stat 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">{{skill.name}}</span>
-          <span class="item-field-label-short">{{upper skill.charac}}</span>
+          <span class="item-field-label-long">{{skill.name}}</span>
+          <span class="item-field-label-medium">{{upper skill.charac}}</span>
          <span class="item-field-label-short"><a class="roll-item" data-type="skill"><i class="fas fa-dice"></i>{{skill.roll}}-</a></span>
          <div class="item-filler">&nbsp;</div>
          <div class="item-controls item-controls-fixed">
@ -230,8 +400,8 @@

      <ul class="stat-list alternate-list item-list">
        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Perks</label></h3>
+          <span class="item-field-label-long-img">
+            <label class="">Perks</label>
          </span>
          <span class="item-field-label-short">
            <label class="short-label">Roll</label>
@ -261,8 +431,8 @@

      <ul class="stat-list alternate-list item-list">
        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Talents</label></h3>
+          <span class="item-field-label-long-img">
+            <label class="items-title-text">Talents</label>
          </span>
          <span class="item-field-label-short">
            <label class="short-label">Roll</label>
@ -292,8 +462,8 @@

      <ul class="stat-list alternate-list item-list">
        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Martial Arts</label></h3>
+          <span class="item-field-label-long-img">
+            <label class="">Martial Arts</label>
          </span>
          <span class="item-field-label-short">
            <label class="short-label">Roll</label>
@ -323,7 +493,9 @@

      <ul class="stat-list alternate-list item-list">
        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-img sheet-competence-img">&nbsp;</span>
+          <span class="item-name-img">
+            <label class="">&nbsp;</label>
+          </span>
          <span class="item-field-label-short">
            <label class="item-field-label-short">Cost</label>
          </span>
@ -345,7 +517,7 @@
          <span class="item-field-label-long4">{{{power.enrichDescription}}}
          </span>
          {{#if power.system.hasroll}}          
-          <span class="item-field-label-short"><a class="roll-item" data-type="perk"><i class="fas fa-dice"></i>{{power.system.roll}}-</a></span>
+          <span class="item-field-label-short"><a class="roll-item" data-type="power"><i class="fas fa-dice"></i>{{power.system.roll}}-</a></span>
          {{else}}
          <span class="item-field-label-short">&nbsp;</span>
          {{/if}}
@ -364,8 +536,8 @@

      <ul class="stat-list alternate-list item-list">
        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Complications</label></h3>
+          <span class="item-field-label-long-img">
+            <label class="">Complications</label>
          </span>
          <span class="item-field-label-short">
            <label class="short-label">Roll</label>
@ -399,38 +571,6 @@
        <span class="small-label">Capacity : {{encCapacity}}</span>
      </div>

-      <ul class="item-list alternate-list">
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Money</label></h3>
-          </span>
-          <span class="item-field-label-long">
-            <label class="short-label">Qty</label>
-          </span>
-          <div class="item-filler">&nbsp;</div>
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="currency" title="Create Item"><i class="fas fa-plus"></i></a>
-          </div>
-        </li>
-        {{#each moneys as |money key|}}
-        <li class="item flexrow list-item list-item-shadow" data-item-id="{{money._id}}">
-          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{money.img}}" /></a>
-          <span class="item-name-label">{{money.name}}</span>
-
-          <span class="item-field-label-long"><label>
-              {{money.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>
-
      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Weapons" items=weapons}}

      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Armor" items=armors}}
--- a/templates/items/item-maneuver-sheet.hbs
+++ b/templates/items/item-maneuver-sheet.hbs
@ -0,0 +1,50 @@
+<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-hero-system-6/templates/partials/partial-item-nav.hbs}}
+
+    {{!-- Sheet Body --}}
+    <section class="sheet-body">
+
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
+
+      <div class="tab details" data-group="primary" data-tab="details">
+
+        <ul>
+          
+          <li class="flexrow"><label class="item-field-label-long">Type</label>
+            <select class="item-field-label-long" type="text" name="system.maneuvertype" value="{{system.maneuvertype}}" data-dtype="String">
+              {{#select system.maneuvertype}}
+                {{#each config.maneuverTypes as |name key|}}
+                  <option value="{{key}}">{{name}}</option>
+                {{/each}}
+              {{/select}}
+            </select> 
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-medium">PHA</label>
+            <input type="text" class="item-field-label-medium" name="system.pha" value="{{system.pha}}" data-dtype="String"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-medium">OCV</label>
+            <input type="text" class="item-field-label-medium" name="system.ocv" value="{{system.ocv}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-medium">DCV</label>
+            <input type="text" class="item-field-label-medium" name="system.dcv" value="{{system.dcv}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-medium">Effects</label>
+            <input type="text" class="item-field-label-long" name="system.effects" value="{{system.effects}}" data-dtype="String"/>
+          </li>
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+
+        </ul>
+      </div>
+    </section>
+</form>
--- a/templates/partials/partial-actor-equipment-section.hbs
+++ b/templates/partials/partial-actor-equipment-section.hbs
@ -1,7 +1,7 @@
      <ul class="item-list alternate-list">
        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">{{title}}</label></h3>
+          <span class="item-field-label-long-img">
+            <label class="">{{title}}</label>
          </span>
          <span class="item-field-label-medium">
            <label class="item-field-label-medium">Value</label>
--- a/templates/partials/partial-actor-full-charac.hbs
+++ b/templates/partials/partial-actor-full-charac.hbs
@ -1,7 +1,7 @@

 <li class="item stat flexrow list-item list-item-shadow" data-attr-key="{{key}}">

-  <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.value" value="{{charac.value}}" data-dtype="Number"/>  
+  <input type="text" class="item-field-label-medium" name="system.characteristics.{{key}}.value" value="{{charac.value}}" data-dtype="Number"/>  

  <span class="item-field-label-medium" name="{{key}}">
    <h4 class="item-field-label-medium margin-item-list">{{charac.label}}</a></h4>
@ -9,7 +9,11 @@
  
  <h4 class="item-field-label-short margin-item-list">{{charac.base}}</h4>
  
+  {{#if charac.hasroll}}
  <h4 class="item-field-label-short margin-item-list"><a class="roll-charac" data-charac-key="{{key}}"><i class="fas fa-dice"></i>{{charac.roll}}-</a></h4>
+  {{else}}
+  <h4 class="item-field-label-short margin-item-list">&nbsp;</h4>
+  {{/if}}

  <input type="text" class="item-field-label-long2" name="system.characteristics.{{key}}.notes" value="{{charac.notes}}" data-dtype="String"/>
Author	SHA1	Message	Date
LeRatierBretonnien	4ca23257cb	Combat tab	2023-03-22 22:43:30 +01:00
LeRatierBretonnien	e0adf04753	Combat tab	2023-03-21 20:43:41 +01:00
LeRatierBretonnien	d399b29d84	WIP Hero 6	2023-03-21 14:01:27 +01:00