Fix manifest link

README.md

@@ -2,8 +2,17 @@ This is the official Hero System 6th Edition game system for FoundryVTT, based o
 
 The Hero System game system is not usable standalone. To play this game you need a copy of the core rulebook.
 
+It features : 
+
+- PC/NPC sheets
+- Roll management and associated helpers
+- Segment and Turn management in the combat tracker
+- Official compendiums
+
+![Snapshot](https://www.lahiette.com/leratierbretonnien/wp-content/uploads/2023/08/hero6_snapshot_02.webp "Snapshot")
+
 Installation
-Manifest URL: https://github.com/Legendsmiths-LLC/
+Manifest URL: https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6
 
 For manual installation, use the provided manifest URL in the "Install System" popup window while managing game systems.
 

lang/en.json

@@ -5,17 +5,17 @@
         "minion": "Minion"
       },
       "Item": {
-        "Skill": "Skill",
+        "skill": "Skill",
-        "Perk": "Perk",
+        "perk": "Perk",
-        "Power": "Power",
+        "power": "Power",
-        "Talent": "Talent",
+        "talent": "Talent",
-        "Advantage": "Advantage",
+        "advantage": "Advantage",
-        "Martialart": "Martial art",
+        "martialart": "Martial art",
-        "Limitation": "Limitation",
+        "limitation": "Limitation",
-        "Complication": "Complication",
+        "complication": "Complication",
-        "Equipment": "Equipment",
+        "equipment": "Equipment",
-        "Currency": "Currency",
+        "currency": "Currency",
-        "Maneuver": "Maneuver"  
+        "maneuver": "Maneuver"  
       }
     },
     "COMBAT": {

modules/hero6-actor-sheet.js

@@ -50,7 +50,8 @@ export class Hero6ActorSheet extends ActorSheet {
       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.getEquipmentsMoneys()) ),
+      moneys: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getMoneys())),
+      equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipments()) ),
       subActors: duplicate(this.actor.getSubActors()),
       race: duplicate(this.actor.getRace()),
       encCapacity: this.actor.getEncumbranceCapacity(),

modules/hero6-actor.js

@@ -326,6 +326,11 @@ export class Hero6Actor extends Actor {
     Hero6Utility.sortArrayObjectsByName(list)
     return list
   }
+  getMoneys() {
+    let list = this.items.filter(item => item.type == "equipment" && item.system.subtype == "money");
+    Hero6Utility.sortArrayObjectsByName(list)
+    return list
+  }
   getWeapons() {
     let list = this.items.filter(item => item.type == "equipment" && item.system.subtype == "weapon");
     Hero6Utility.sortArrayObjectsByName(list)

modules/hero6-utility.js

@@ -52,6 +52,9 @@ export class Hero6Utility {
       }
       return false
     })
+    Handlebars.registerHelper('fixNum', function (value) {
+      return Number(value) || 0
+    })
     Handlebars.registerHelper('checkInit', function (value) {
       let myValue = Number(value) || 0
       return myValue > 0

packs/complications/CURRENT

@@ -1 +1 @@
-MANIFEST-000070
+MANIFEST-000098

packs/complications/LOG

@@ -1,8 +1,3 @@
-2023/08/15-21:47:51.923693 7fa0ddffb6c0 Recovering log #68
+2023/08/24-20:28:52.588130 7fda7bbff6c0 Recovering log #96
-2023/08/15-21:47:52.020246 7fa0ddffb6c0 Delete type=3 #66
+2023/08/24-20:28:52.597974 7fda7bbff6c0 Delete type=3 #94
-2023/08/15-21:47:52.020324 7fa0ddffb6c0 Delete type=0 #68
+2023/08/24-20:28:52.598068 7fda7bbff6c0 Delete type=0 #96
-2023/08/15-22:11:19.852100 7f9e3ffff6c0 Level-0 table #73: started
-2023/08/15-22:11:19.852160 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
-2023/08/15-22:11:19.858657 7f9e3ffff6c0 Delete type=0 #71
-2023/08/15-22:11:19.859003 7f9e3ffff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
-2023/08/15-22:11:19.859027 7f9e3ffff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)

packs/complications/LOG.old

@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.564375 7fd68f7fe6c0 Recovering log #64
+2023/08/24-20:11:49.190057 7fda7abfd6c0 Recovering log #92
-2023/08/10-13:03:20.579793 7fd68f7fe6c0 Delete type=3 #62
+2023/08/24-20:11:49.204015 7fda7abfd6c0 Delete type=3 #90
-2023/08/10-13:03:20.579835 7fd68f7fe6c0 Delete type=0 #64
+2023/08/24-20:11:49.204065 7fda7abfd6c0 Delete type=0 #92
-2023/08/10-13:05:41.069254 7fd40dfff6c0 Level-0 table #69: started
+2023/08/24-20:28:26.993087 7fda79bfb6c0 Level-0 table #97: started
-2023/08/10-13:05:41.069298 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
+2023/08/24-20:28:26.993130 7fda79bfb6c0 Level-0 table #97: 0 bytes OK
-2023/08/10-13:05:41.080890 7fd40dfff6c0 Delete type=0 #67
+2023/08/24-20:28:27.002024 7fda79bfb6c0 Delete type=0 #95
-2023/08/10-13:05:41.092975 7fd40dfff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/24-20:28:27.002188 7fda79bfb6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.100392 7fd40dfff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/24-20:28:27.002221 7fda79bfb6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)

packs/equipment/CURRENT

@@ -1 +1 @@
-MANIFEST-000070
+MANIFEST-000100

packs/equipment/LOG

@@ -1,7 +1,3 @@
-2023/08/15-21:47:51.802290 7fa0dd7fa6c0 Recovering log #68
+2023/08/24-20:28:52.572724 7fda7a3fc6c0 Recovering log #97
-2023/08/15-21:47:51.859664 7fa0dd7fa6c0 Delete type=3 #66
+2023/08/24-20:28:52.584112 7fda7a3fc6c0 Delete type=3 #95
-2023/08/15-21:47:51.859782 7fa0dd7fa6c0 Delete type=0 #68
+2023/08/24-20:28:52.584178 7fda7a3fc6c0 Delete type=0 #97
-2023/08/15-22:11:19.813491 7f9e3ffff6c0 Level-0 table #73: started
-2023/08/15-22:11:19.813538 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
-2023/08/15-22:11:19.819750 7f9e3ffff6c0 Delete type=0 #71
-2023/08/15-22:11:19.829889 7f9e3ffff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/equipment/LOG.old

@@ -1,7 +1,15 @@
-2023/08/10-13:03:20.538109 7fd6a4bfa6c0 Recovering log #64
+2023/08/24-20:11:49.176021 7fda7b3fe6c0 Recovering log #92
-2023/08/10-13:03:20.547376 7fd6a4bfa6c0 Delete type=3 #62
+2023/08/24-20:11:49.186442 7fda7b3fe6c0 Delete type=3 #90
-2023/08/10-13:03:20.547429 7fd6a4bfa6c0 Delete type=0 #64
+2023/08/24-20:11:49.186511 7fda7b3fe6c0 Delete type=0 #92
-2023/08/10-13:05:41.019934 7fd40dfff6c0 Level-0 table #69: started
+2023/08/24-20:28:26.929251 7fda79bfb6c0 Level-0 table #98: started
-2023/08/10-13:05:41.019967 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
+2023/08/24-20:28:26.933483 7fda79bfb6c0 Level-0 table #98: 61208 bytes OK
-2023/08/10-13:05:41.026189 7fd40dfff6c0 Delete type=0 #67
+2023/08/24-20:28:26.940562 7fda79bfb6c0 Delete type=0 #96
-2023/08/10-13:05:41.026358 7fd40dfff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/24-20:28:26.961338 7fda79bfb6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/08/24-20:28:26.961409 7fda79bfb6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at '!items!zFQRJSrYV4E12NgW' @ 355 : 1
+2023/08/24-20:28:26.961416 7fda79bfb6c0 Compacting 1@1 + 1@2 files
+2023/08/24-20:28:26.966548 7fda79bfb6c0 Generated table #99@1: 125 keys, 61208 bytes
+2023/08/24-20:28:26.966578 7fda79bfb6c0 Compacted 1@1 + 1@2 files => 61208 bytes
+2023/08/24-20:28:26.974691 7fda79bfb6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2023/08/24-20:28:26.974830 7fda79bfb6c0 Delete type=2 #94
+2023/08/24-20:28:26.975013 7fda79bfb6c0 Delete type=2 #98
+2023/08/24-20:28:27.002145 7fda79bfb6c0 Manual compaction at level-1 from '!items!zFQRJSrYV4E12NgW' @ 355 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)

packs/maneuvers/CURRENT

@@ -1 +1 @@
-MANIFEST-000062
+MANIFEST-000090

packs/maneuvers/LOG

@@ -1,8 +1,3 @@
-2023/08/15-21:47:51.927283 7fa0dcff96c0 Recovering log #60
+2023/08/24-20:28:52.601708 7fda7a3fc6c0 Recovering log #88
-2023/08/15-21:47:52.038744 7fa0dcff96c0 Delete type=3 #58
+2023/08/24-20:28:52.613896 7fda7a3fc6c0 Delete type=3 #86
-2023/08/15-21:47:52.038839 7fa0dcff96c0 Delete type=0 #60
+2023/08/24-20:28:52.614012 7fda7a3fc6c0 Delete type=0 #88
-2023/08/15-22:11:19.865715 7f9e3ffff6c0 Level-0 table #65: started
-2023/08/15-22:11:19.865740 7f9e3ffff6c0 Level-0 table #65: 0 bytes OK
-2023/08/15-22:11:19.872425 7f9e3ffff6c0 Delete type=0 #63
-2023/08/15-22:11:19.879299 7f9e3ffff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
-2023/08/15-22:11:19.879345 7f9e3ffff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)

packs/maneuvers/LOG.old

@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.566148 7fd6a4bfa6c0 Recovering log #56
+2023/08/24-20:11:49.203061 7fda7bbff6c0 Recovering log #84
-2023/08/10-13:03:20.582806 7fd6a4bfa6c0 Delete type=3 #54
+2023/08/24-20:11:49.219726 7fda7bbff6c0 Delete type=3 #82
-2023/08/10-13:03:20.582865 7fd6a4bfa6c0 Delete type=0 #56
+2023/08/24-20:11:49.219820 7fda7bbff6c0 Delete type=0 #84
-2023/08/10-13:05:41.081044 7fd40dfff6c0 Level-0 table #61: started
+2023/08/24-20:28:27.002307 7fda79bfb6c0 Level-0 table #89: started
-2023/08/10-13:05:41.081087 7fd40dfff6c0 Level-0 table #61: 0 bytes OK
+2023/08/24-20:28:27.002338 7fda79bfb6c0 Level-0 table #89: 0 bytes OK
-2023/08/10-13:05:41.092838 7fd40dfff6c0 Delete type=0 #59
+2023/08/24-20:28:27.008560 7fda79bfb6c0 Delete type=0 #87
-2023/08/10-13:05:41.100288 7fd40dfff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/24-20:28:27.051981 7fda79bfb6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.109268 7fd40dfff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/24-20:28:27.052022 7fda79bfb6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)

packs/perks/CURRENT

@@ -1 +1 @@
-MANIFEST-000070
+MANIFEST-000098

packs/perks/LOG

@@ -1,8 +1,3 @@
-2023/08/15-21:47:52.040277 7fa0ddffb6c0 Recovering log #68
+2023/08/24-20:28:52.601706 7fda7abfd6c0 Recovering log #96
-2023/08/15-21:47:52.138553 7fa0ddffb6c0 Delete type=3 #66
+2023/08/24-20:28:52.613896 7fda7abfd6c0 Delete type=3 #94
-2023/08/15-21:47:52.138627 7fa0ddffb6c0 Delete type=0 #68
+2023/08/24-20:28:52.613994 7fda7abfd6c0 Delete type=0 #96
-2023/08/15-22:11:19.859141 7f9e3ffff6c0 Level-0 table #73: started
-2023/08/15-22:11:19.859174 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
-2023/08/15-22:11:19.865615 7f9e3ffff6c0 Delete type=0 #71
-2023/08/15-22:11:19.879276 7f9e3ffff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
-2023/08/15-22:11:19.879335 7f9e3ffff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)

packs/perks/LOG.old

@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.581819 7fd68f7fe6c0 Recovering log #64
+2023/08/24-20:11:49.205472 7fda7b3fe6c0 Recovering log #92
-2023/08/10-13:03:20.598440 7fd68f7fe6c0 Delete type=3 #62
+2023/08/24-20:11:49.222633 7fda7b3fe6c0 Delete type=3 #90
-2023/08/10-13:03:20.598503 7fd68f7fe6c0 Delete type=0 #64
+2023/08/24-20:11:49.222697 7fda7b3fe6c0 Delete type=0 #92
-2023/08/10-13:05:41.093002 7fd40dfff6c0 Level-0 table #69: started
+2023/08/24-20:28:27.019936 7fda79bfb6c0 Level-0 table #97: started
-2023/08/10-13:05:41.093032 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
+2023/08/24-20:28:27.019979 7fda79bfb6c0 Level-0 table #97: 0 bytes OK
-2023/08/10-13:05:41.100152 7fd40dfff6c0 Delete type=0 #67
+2023/08/24-20:28:27.051866 7fda79bfb6c0 Delete type=0 #95
-2023/08/10-13:05:41.109249 7fd40dfff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/24-20:28:27.052012 7fda79bfb6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.109302 7fd40dfff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/24-20:28:27.052040 7fda79bfb6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)

packs/powers/CURRENT

@@ -1 +1 @@
-MANIFEST-000071
+MANIFEST-000099

packs/powers/LOG

@@ -1,8 +1,3 @@
-2023/08/15-21:47:51.861656 7fa0dcff96c0 Recovering log #69
+2023/08/24-20:28:52.588130 7fda7abfd6c0 Recovering log #97
-2023/08/15-21:47:51.916356 7fa0dcff96c0 Delete type=3 #67
+2023/08/24-20:28:52.597915 7fda7abfd6c0 Delete type=3 #95
-2023/08/15-21:47:51.916435 7fa0dcff96c0 Delete type=0 #69
+2023/08/24-20:28:52.597970 7fda7abfd6c0 Delete type=0 #97
-2023/08/15-22:11:19.843844 7f9e3ffff6c0 Level-0 table #74: started
-2023/08/15-22:11:19.843905 7f9e3ffff6c0 Level-0 table #74: 0 bytes OK
-2023/08/15-22:11:19.851729 7f9e3ffff6c0 Delete type=0 #72
-2023/08/15-22:11:19.858992 7f9e3ffff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
-2023/08/15-22:11:19.859036 7f9e3ffff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)

packs/powers/LOG.old

@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.550530 7fd6a4bfa6c0 Recovering log #65
+2023/08/24-20:11:49.190059 7fda7a3fc6c0 Recovering log #93
-2023/08/10-13:03:20.564384 7fd6a4bfa6c0 Delete type=3 #63
+2023/08/24-20:11:49.201012 7fda7a3fc6c0 Delete type=3 #91
-2023/08/10-13:03:20.564676 7fd6a4bfa6c0 Delete type=0 #65
+2023/08/24-20:11:49.201080 7fda7a3fc6c0 Delete type=0 #93
-2023/08/10-13:05:41.056785 7fd40dfff6c0 Level-0 table #70: started
+2023/08/24-20:28:26.985277 7fda79bfb6c0 Level-0 table #98: started
-2023/08/10-13:05:41.056809 7fd40dfff6c0 Level-0 table #70: 0 bytes OK
+2023/08/24-20:28:26.985305 7fda79bfb6c0 Level-0 table #98: 0 bytes OK
-2023/08/10-13:05:41.069063 7fd40dfff6c0 Delete type=0 #68
+2023/08/24-20:28:26.992913 7fda79bfb6c0 Delete type=0 #96
-2023/08/10-13:05:41.081017 7fd40dfff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/24-20:28:27.002175 7fda79bfb6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.092990 7fd40dfff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/24-20:28:27.002210 7fda79bfb6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)

packs/skills/CURRENT

@@ -1 +1 @@
-MANIFEST-000070
+MANIFEST-000098

packs/skills/LOG

@@ -1,8 +1,3 @@
-2023/08/15-21:47:51.861659 7fa0ddffb6c0 Recovering log #68
+2023/08/24-20:28:52.572723 7fda7b3fe6c0 Recovering log #96
-2023/08/15-21:47:51.916357 7fa0ddffb6c0 Delete type=3 #66
+2023/08/24-20:28:52.584114 7fda7b3fe6c0 Delete type=3 #94
-2023/08/15-21:47:51.916429 7fa0ddffb6c0 Delete type=0 #68
+2023/08/24-20:28:52.584178 7fda7b3fe6c0 Delete type=0 #96
-2023/08/15-22:11:19.830017 7f9e3ffff6c0 Level-0 table #73: started
-2023/08/15-22:11:19.830056 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
-2023/08/15-22:11:19.836953 7f9e3ffff6c0 Delete type=0 #71
-2023/08/15-22:11:19.858959 7f9e3ffff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
-2023/08/15-22:11:19.859011 7f9e3ffff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)

packs/skills/LOG.old

@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.550530 7fd68f7fe6c0 Recovering log #64
+2023/08/24-20:11:49.176021 7fda7bbff6c0 Recovering log #92
-2023/08/10-13:03:20.561274 7fd68f7fe6c0 Delete type=3 #62
+2023/08/24-20:11:49.186443 7fda7bbff6c0 Delete type=3 #90
-2023/08/10-13:03:20.561313 7fd68f7fe6c0 Delete type=0 #64
+2023/08/24-20:11:49.186509 7fda7bbff6c0 Delete type=0 #92
-2023/08/10-13:05:41.037917 7fd40dfff6c0 Level-0 table #69: started
+2023/08/24-20:28:26.975180 7fda79bfb6c0 Level-0 table #97: started
-2023/08/10-13:05:41.037949 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
+2023/08/24-20:28:26.975225 7fda79bfb6c0 Level-0 table #97: 0 bytes OK
-2023/08/10-13:05:41.044140 7fd40dfff6c0 Delete type=0 #67
+2023/08/24-20:28:26.985137 7fda79bfb6c0 Delete type=0 #95
-2023/08/10-13:05:41.069221 7fd40dfff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/24-20:28:27.002160 7fda79bfb6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.081033 7fd40dfff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/24-20:28:27.002199 7fda79bfb6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)

packs/talents/CURRENT

@@ -1 +1 @@
-MANIFEST-000070
+MANIFEST-000098

packs/talents/LOG

@@ -1,8 +1,3 @@
-2023/08/15-21:47:52.052796 7fa0de7fc6c0 Recovering log #68
+2023/08/24-20:28:52.617237 7fda7abfd6c0 Recovering log #96
-2023/08/15-21:47:52.154403 7fa0de7fc6c0 Delete type=3 #66
+2023/08/24-20:28:52.627761 7fda7abfd6c0 Delete type=3 #94
-2023/08/15-21:47:52.154479 7fa0de7fc6c0 Delete type=0 #68
+2023/08/24-20:28:52.627835 7fda7abfd6c0 Delete type=0 #96
-2023/08/15-22:11:19.872538 7f9e3ffff6c0 Level-0 table #73: started
-2023/08/15-22:11:19.872564 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
-2023/08/15-22:11:19.878867 7f9e3ffff6c0 Delete type=0 #71
-2023/08/15-22:11:19.879310 7f9e3ffff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
-2023/08/15-22:11:19.879353 7f9e3ffff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)

packs/talents/LOG.old

@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.584203 7fd6a4bfa6c0 Recovering log #64
+2023/08/24-20:11:49.221624 7fda7a3fc6c0 Recovering log #92
-2023/08/10-13:03:20.602339 7fd6a4bfa6c0 Delete type=3 #62
+2023/08/24-20:11:49.232090 7fda7a3fc6c0 Delete type=3 #90
-2023/08/10-13:03:20.602426 7fd6a4bfa6c0 Delete type=0 #64
+2023/08/24-20:11:49.232138 7fda7a3fc6c0 Delete type=0 #92
-2023/08/10-13:05:41.100405 7fd40dfff6c0 Level-0 table #69: started
+2023/08/24-20:28:27.008700 7fda79bfb6c0 Level-0 table #97: started
-2023/08/10-13:05:41.100432 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
+2023/08/24-20:28:27.008737 7fda79bfb6c0 Level-0 table #97: 0 bytes OK
-2023/08/10-13:05:41.109117 7fd40dfff6c0 Delete type=0 #67
+2023/08/24-20:28:27.019736 7fda79bfb6c0 Delete type=0 #95
-2023/08/10-13:05:41.109289 7fd40dfff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/24-20:28:27.051993 7fda79bfb6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.109316 7fd40dfff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/24-20:28:27.052030 7fda79bfb6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)

packs/weapons/CURRENT

@@ -1 +1 @@
-MANIFEST-000070
+MANIFEST-000086

packs/weapons/LOG

@@ -1,7 +1,7 @@
-2023/08/15-21:47:51.802282 7fa0dcff96c0 Recovering log #68
+2023/08/24-15:57:43.392826 7fab4affd6c0 Recovering log #84
-2023/08/15-21:47:51.859665 7fa0dcff96c0 Delete type=3 #66
+2023/08/24-15:57:43.403060 7fab4affd6c0 Delete type=3 #82
-2023/08/15-21:47:51.859740 7fa0dcff96c0 Delete type=0 #68
+2023/08/24-15:57:43.403157 7fab4affd6c0 Delete type=0 #84
-2023/08/15-22:11:19.837182 7f9e3ffff6c0 Level-0 table #73: started
+2023/08/24-15:59:11.995583 7fab497fa6c0 Level-0 table #89: started
-2023/08/15-22:11:19.837243 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
+2023/08/24-15:59:11.995614 7fab497fa6c0 Level-0 table #89: 0 bytes OK
-2023/08/15-22:11:19.843628 7f9e3ffff6c0 Delete type=0 #71
+2023/08/24-15:59:12.004480 7fab497fa6c0 Delete type=0 #87
-2023/08/15-22:11:19.858980 7f9e3ffff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/24-15:59:12.025495 7fab497fa6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/weapons/LOG.old

@@ -1,7 +1,7 @@
-2023/08/10-13:03:20.538110 7fd68f7fe6c0 Recovering log #64
+2023/08/24-15:09:37.452353 7fab4b7fe6c0 Recovering log #80
-2023/08/10-13:03:20.547376 7fd68f7fe6c0 Delete type=3 #62
+2023/08/24-15:09:37.462595 7fab4b7fe6c0 Delete type=3 #78
-2023/08/10-13:03:20.547427 7fd68f7fe6c0 Delete type=0 #64
+2023/08/24-15:09:37.462673 7fab4b7fe6c0 Delete type=0 #80
-2023/08/10-13:05:41.044355 7fd40dfff6c0 Level-0 table #69: started
+2023/08/24-15:56:20.976153 7fab497fa6c0 Level-0 table #85: started
-2023/08/10-13:05:41.044380 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
+2023/08/24-15:56:20.976179 7fab497fa6c0 Level-0 table #85: 0 bytes OK
-2023/08/10-13:05:41.056662 7fd40dfff6c0 Delete type=0 #67
+2023/08/24-15:56:20.984268 7fab497fa6c0 Delete type=0 #83
-2023/08/10-13:05:41.069241 7fd40dfff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/24-15:56:20.984458 7fab497fa6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

styles/simple.css

@@ -649,6 +649,11 @@ ul, li {
   align-content: center;
 }
 
+.content-center {
+  align-content: center;
+  text-align: center;
+}
+
 .attribut-value,
 .carac-value {
   flex-grow: 0;
@@ -1147,8 +1152,8 @@ ul, li {
 }
 
 #logo {
-  content : url(../images/ui/crucible_game_logo.png);
+  content : url(../images/ui/logo_hex_yellow_01.webp);
-  width: 100px;
+  width: 60px;
   height: 60px;
 }
 
@@ -1411,7 +1416,12 @@ Focus FOC: #ff0084
 }
 .item-controls-fixed {
   min-width:2rem;
-  max-width: 2rem;
+  /*max-width: 2rem;*/
+}
+.item-controls-fixed-small {
+  min-width:1rem;
+  font-size: 0.8rem;
+  /*max-width: 2rem;*/
 }
 .biodata-portrait {
   min-height: 512px;
@@ -1431,3 +1441,6 @@ Focus FOC: #ff0084
   display: none;
   visibility: hidden;
 }
+.compendium .directory-list .directory-item .folder-header h3 {
+  color:#000
+}

system.json

@@ -30,15 +30,6 @@
       "private": false,
       "flags": {}
     },
-    {
-      "type": "Item",
-      "label": "Weapons",
-      "name": "weapons",
-      "path": "packs/weapons.db",
-      "system": "fvtt-hero-system-6",
-      "private": false,
-      "flags": {}
-    },
     {
       "type": "Item",
       "label": "Skills",
@@ -100,14 +91,14 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "11.0.7",
+  "version": "11.0.13",
   "compatibility": {
     "minimum": "11",
     "verified": "11"
   },
   "title": "Hero System v6 for FoundrtVTT (Official)",
-  "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/main/system.json",
+  "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/master/system.json",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.7.zip",   
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.13.zip",
   "url": "https://www.uberwald.me/gitea/uberwald/",
   "background": "systems/fvtt-hero-system-6/images/ui/hero_foundry_cover.webp",
   "id": "fvtt-hero-system-6"

template.json

@@ -416,7 +416,19 @@
       "subtype": "equipment",
       "value": 0,
       "weight": 0,
-      "moneycost": 0
+      "moneycost": 0,
+      "ocv": 0,
+      "omcv": 0,
+      "dmcv": 0,
+      "rmod": 0,
+      "pd": 0,
+      "ed": 0,
+      "rpd": 0, 
+      "red": 0,
+      "mentaldefense": 0,
+      "powerdefense": 0,
+      "flashdefense": 0,
+      "otherdefense": 0
     },
     "attack": {
       "templates": [

templates/actors/actor-sheet.hbs

@@ -672,6 +672,9 @@
         <span class="small-label">Total value : {{totalValue}}</span>
       </div>
 
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Money"
+      items=moneys}}
+
       {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Weapons"
       items=weapons}}
 

templates/chat/chat-attack-defense-result.hbs

@@ -7,12 +7,6 @@
 
   <hr>
   
-  {{#if img}}
-  <div >
-    <img class="chat-icon" src="{{img}}" alt="{{name}}" />
-  </div>
-  {{/if}}
-
   <div class="flexcol">
     </div>
 

templates/chat/chat-damage-result.hbs

@@ -7,12 +7,6 @@
 
   <hr>
   
-  {{#if img}}
-  <div >
-    <img class="chat-icon" src="{{img}}" alt="{{name}}" />
-  </div>
-  {{/if}}
-
   <div class="flexcol">
     </div>
 

templates/chat/chat-generic-result.hbs

@@ -7,12 +7,6 @@
 
   <hr>
   
-  {{#if img}}
-  <div >
-    <img class="chat-icon" src="{{img}}" alt="{{name}}" />
-  </div>
-  {{/if}}
-
   <div class="flexcol">
     </div>
 

templates/chat/chat-lift-dice-result.hbs

@@ -7,12 +7,6 @@
 
   <hr>
   
-  {{#if img}}
-  <div >
-    <img class="chat-icon" src="{{img}}" alt="{{name}}" />
-  </div>
-  {{/if}}
-
   <div class="flexcol">
     </div>
 

templates/items/item-equipment-sheet.hbs

@@ -56,8 +56,88 @@
           </select>
         </li>
 
-        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
+        {{#if (eq system.subtype "weapon") }}
+        <li class="flexrow"><label class="item-field-label-long">OCV</label>
+          <input type="text" class="item-field-label-short" name="system.ocv" value="{{system.ocv}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">OMCV</label>
+          <input type="text" class="item-field-label-short" name="system.omcv" value="{{system.omcv}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">RMod</label>
+          <input type="text" class="item-field-label-short" name="system.rmod" value="{{system.rmod}}"
+            data-dtype="Number" />
+        </li>
+        {{/if}}
 
+        {{#if (eq system.subtype "shield") }}
+        <li class="flexrow"><label class="item-field-label-long">OCV</label>
+          <input type="text" class="item-field-label-short" name="system.ocv" value="{{system.ocv}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">DCV</label>
+          <input type="text" class="item-field-label-short" name="system.dcv" value="{{system.dcv}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">OMCV</label>
+          <input type="text" class="item-field-label-short" name="system.omcv" value="{{system.omcv}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">DMCV</label>
+          <input type="text" class="item-field-label-short" name="system.dmcv" value="{{system.dmcv}}"
+            data-dtype="Number" />
+        </li>
+        {{/if}}
+
+        {{#if (eq system.subtype "armor") }}
+        <li class="flexrow"><label class="item-field-label-long">DCV</label>
+          <input type="text" class="item-field-label-short" name="system.dcv" value="{{system.dcv}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">DMCV</label>
+          <input type="text" class="item-field-label-short" name="system.dmcv" value="{{system.dmcv}}"
+            data-dtype="Number" />
+        </li>
+        {{/if}}
+
+
+        {{#if (or (eq system.subtype "armor") (eq system.subtype "shield")) }}
+        <li class="flexrow"><label class="item-field-label-long">PD</label>
+          <input type="text" class="item-field-label-short" name="system.pd" value="{{system.pd}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">ED</label>
+          <input type="text" class="item-field-label-short" name="system.ed" value="{{system.ed}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">rPD</label>
+          <input type="text" class="item-field-label-short" name="system.rpd" value="{{system.rpd}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">rED</label>
+          <input type="text" class="item-field-label-short" name="system.red" value="{{system.red}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Mental Defense</label>
+          <input type="text" class="item-field-label-short" name="system.mentaldefense" value="{{system.mentaldefense}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Power Defense</label>
+          <input type="text" class="item-field-label-short" name="system.powerdefense" value="{{system.powerdefense}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Flash Defense</label>
+          <input type="text" class="item-field-label-short" name="system.flashdefense" value="{{system.flashdefense}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Other Defense</label>
+          <input type="text" class="item-field-label-short" name="system.otherdefense" value="{{system.otherdefense}}"
+            data-dtype="Number" />
+        </li>
+        {{/if}}
+
+        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
 
 
         {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}

templates/partials/partial-actor-equipment-section.hbs

@@ -3,33 +3,114 @@
           <span class="item-name-img">
             <label class="">&nbsp;</label>
           </span>
-          <span class="item-field-label-short">
+          <span class="item-field-label-very-short">
-            <label class="item-field-label-short">Qty</label>
+            <label class="item-field-label-very-short">Qty</label>
           </span>
-          <span class="item-field-label-long3">
+          <span class="item-field-label-long2">
-            <label class="item-field-label-long3">{{title}}</label>
+            <label class="item-field-label-long2">{{title}}</label>
           </span>
-          <span class="item-field-label-long">
+
-            <label class="item-field-label-long4">Display</label>
+          {{#if (or (eq title "Money") (eq title "Equipment"))}}
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">&nbsp;</label>
           </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">&nbsp;</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">&nbsp;</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">&nbsp;</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">&nbsp;</label>
+          </span>
+          {{/if}}
+
+          {{#if (eq title "Weapons")}}
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">OCV</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">DCV</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">rMod</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">Rng</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">&nbsp;</label>
+          </span>
+          {{/if}}
+          
+          {{#if (eq title "Shields")}}
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">OCV</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">DCV</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">OMCV</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">DMCV</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">&nbsp;</label>
+          </span>
+          {{/if}}
+
+          {{#if (eq title "Armor")}}
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">PD</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">ED</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">rPD</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">rED</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">DCV</label>
+          </span>
+          {{/if}}
+
+          <span class="item-field-label-long2">
+            <label class="item-field-label-long2">Display</label>
+          </span>
+          
+          {{#if (and (ne title "Armor") (ne title "Shields"))}}
           <span class="item-field-label-short">
             <label class="item-field-label-short">Effect</label>
           </span>
+          {{else}}
+          <span class="item-field-label-short">
+            <label class="item-field-label-short">&nbsp;</label>
+          </span>
+          {{/if}}
+          
           <span class="item-field-label-short">
             <label class="item-field-label-short">Roll</label>
           </span>
-          <span class="item-field-label-short">
+          <span class="item-field-label-very-short">
-            <label class="item-field-label-short">END</label>
+            <label class="item-field-label-very-short">END</label>
           </span>
-          <span class="item-field-label-short">
+          <span class="item-field-label-very-short">
-            <label class="item-field-label-short">Value</label>
+            <label class="item-field-label-very-short">Value</label>
           </span>
           <span class="item-field-label-short">
             <label class="item-field-label-short">Weight</label>
           </span>
-          <div class="item-filler">&nbsp;</div>
+        
-          <div class="item-controls item-controls-fixed">
+          <div class="item-controls item-controls-fixed-small">
-            <a class="item-control item-add" data-type="equipment" title="Create Item"><i class="fas fa-plus"></i></a>
+            <a class="item-control item-add" data-type="equipment" title="Create Item"><i class="fas fa-plus item-controls-fixed-small"></i></a>
           </div>
 
         </li>

templates/partials/partial-actor-equipment.hbs

@@ -1,17 +1,53 @@
 <li class="item flexrow list-item list-item-shadow" data-item-id="{{equip._id}}">
   <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{equip.img}}" /></a>
 
-  <span class="item-field-label-short"><label>{{equip.system.quantity}}</label>  </span>          
+  <span class="item-field-label-very-short content-center" ><label class="content-center">{{equip.system.quantity}}</label>  </span>          
 
-  <span class="item-field-label-long3">{{equip.name}}</span>
+  <span class="item-field-label-long2">{{equip.name}}</span>
 
-  <span class="item-field-label-long"><label>{{equip.system.displayname}}
+  {{#if (or (eq equip.system.subtype "money") (eq equip.system.subtype "equipment"))}}
+  <span class="item-field-label-very-short"><label>&nbsp;</label>  </span>          
+  <span class="item-field-label-very-short"><label>&nbsp;</label>  </span>          
+  <span class="item-field-label-very-short"><label>&nbsp;</label>  </span>          
+  <span class="item-field-label-very-short"><label>&nbsp;</label>  </span>          
+  <span class="item-field-label-very-short"><label>&nbsp;</label>  </span>          
+  {{/if}}
+
+  {{#if (eq equip.system.subtype "weapon")}}
+  <span class="item-field-label-very-short content-center"><label>{{numberFormat (fixNum equip.system.ocv) decimals=0 sign=true}}</label>  </span>          
+  <span class="item-field-label-very-short content-center"><label>{{numberFormat (fixNum equip.system.omcv) decimals=0 sign=true}}</label>  </span>          
+  <span class="item-field-label-very-short content-center"><label>{{numberFormat (fixNum equip.system.rmod) decimals=0 sign=true}}</label>  </span>          
+  <span class="item-field-label-very-short content-center"><label>{{equip.system.range}}</label>  </span>          
+  <span class="item-field-label-very-short content-center"><label>&nbsp;</label>  </span>          
+  {{/if}}
+
+  {{#if (eq equip.system.subtype "shield")}}
+  <span class="item-field-label-very-short content-center"><label>{{numberFormat (fixNum equip.system.ocv) decimals=0 sign=true}}</label>  </span>          
+  <span class="item-field-label-very-short content-center"><label>{{numberFormat (fixNum equip.system.dcv) decimals=0 sign=true}}</label>  </span>          
+  <span class="item-field-label-very-short content-center"><label>{{numberFormat (fixNum equip.system.omcv) decimals=0 sign=true}}</label>  </span>          
+  <span class="item-field-label-very-short content-center"><label>{{numberFormat (fixNum equip.system.dmcv) decimals=0 sign=true}}</label>  </span>          
+  <span class="item-field-label-very-short content-center"><label>&nbsp;</label>  </span>          
+  {{/if}}
+
+  {{#if (eq equip.system.subtype "armor")}}
+  <span class="item-field-label-very-short content-center"><label>{{equip.system.pd}}</label>  </span>          
+  <span class="item-field-label-very-short content-center"><label>{{equip.system.ed}}</label>  </span>          
+  <span class="item-field-label-very-short content-center"><label>{{equip.system.rpd}}</label>  </span>          
+  <span class="item-field-label-very-short content-center"><label>{{equip.system.red}}</label>  </span>          
+  <span class="item-field-label-very-short content-center"><label>{{numberFormat (fixNum equip.system.dcv) decimals=0 sign=true}}</label>  </span>          
+  {{/if}}
+
+  <span class="item-field-label-long2"><label>{{equip.system.displayname}}
   </label>
   </span>          
 
+  {{#if (and (ne equip.system.subtype "armor") (ne equip.system.subtype "shield"))}}
   <span class="item-field-label-short"><label><a class="roll-damage" data-type="perk"><i class="fas fa-dice"></i>{{equip.system.damage}}</a>
   </label>
   </span>
+  {{else}}
+  <span class="item-field-label-short"><label>&nbsp;</label></span>
+  {{/if}}
 
   {{#if equip.system.hasroll}}          
   <span class="item-field-label-short"><a class="roll-item" data-type="perk"><i class="fas fa-dice"></i>{{equip.system.roll}}-</a></span>
@@ -19,13 +55,12 @@
   <span class="item-field-label-short">&nbsp;</span>
   {{/if}}
 
-  <span class="item-field-label-short"><label>{{equip.system.endurance}}</label>  </span>          
+  <span class="item-field-label-very-short content-center"><label>{{equip.system.endurance}}</label>  </span>          
 
-  <span class="item-field-label-short"><label>{{mul equip.system.quantity equip.system.value}}</label>  </span>          
+  <span class="item-field-label-very-short"><label>{{mul equip.system.quantity equip.system.value}}</label>  </span>          
 
-  <span class="item-field-label-short"><label>{{mul equip.system.quantity equip.system.weight}}</label>  </span>          
+  <span class="item-field-label-short content-center"><label>{{mul equip.system.quantity equip.system.weight}}</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>

templates/partials/partial-power-equipment-cost.hbs

@@ -22,12 +22,15 @@
         <label class="item-field-label-medium"><input type="checkbox" name="system.senseaffecting" {{checked system.senseaffecting}}/></label>
       </li>
 
+      {{#if (and (ne system.subtype "armor") (ne system.subtype "shield"))}}
       <li class="flexrow"><label class="item-field-label-long">Range</label>
         <input type="text" class="item-field-label-medium" name="system.range" value="{{system.range}}" data-dtype="String"/>
       </li>
       <li class="flexrow"><label class="item-field-label-long">Damage</label>
         <input type="text" class="item-field-label-medium" name="system.damage" value="{{system.damage}}" data-dtype="String"/>
       </li>
+      {{/if}}
+
       <li class="flexrow"><label class="item-field-label-long">Endurance</label>
         <input type="text" class="item-field-label-short" name="system.endurance" value="{{system.endurance}}" data-dtype="Number"/>
       </li>