Add armorRegular

2025-11-24 19:49:15 +01:00
parent 21dca4446f
commit 748c4480c9
15 changed files with 42 additions and 34 deletions
--- a/lang/en.json
+++ b/lang/en.json
@@ -622,6 +622,9 @@
        "armorCritical": {
          "label": "Armor (Crit.)"
        },
+        "armorRegular": {
+          "label": "Armor (Reg.)"
+        },
        "guns" : {
          "label": "Guns"
        },
@@ -728,6 +731,9 @@
        "armorCritical": {
          "label": "Armor (Crit.)"
        },
+        "armorRegular": {
+          "label": "Armor (Reg.)"
+        },
        "crew": {
          "label": "Crew"
        },
--- a/module/models/starship.mjs
+++ b/module/models/starship.mjs
@@ -11,6 +11,7 @@ export default class FTLNomadStarship extends foundry.abstract.TypeDataModel {
    schema.hullType = new fields.StringField({ required: true, initial: "small", choices: SYSTEM.STARSHIP_HULL })
    schema.endurance = new fields.StringField({ required: true, initial: "" })
    schema.armor = new fields.StringField({ required: true, initial: "" })
+    schema.armorRegular = new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 })
    schema.armorCritical = new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 })
    schema.crewList = new fields.ArrayField(new fields.StringField({ required: true }), { initial: [] })
    schema.crewCapacity = new fields.StringField({ required: true, initial: "" })
--- a/module/models/vehicle.mjs
+++ b/module/models/vehicle.mjs
@@ -9,6 +9,7 @@ export default class FTLNomadVehicle extends foundry.abstract.TypeDataModel {

    schema.agility = new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 })
    schema.armor = new fields.StringField({ required: true, initial: "" })
+    schema.armorRegular = new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 })
    schema.armorCritical = new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 })
    schema.cargo = new fields.StringField({ required: true, initial: "" })
    schema.crewList = new fields.ArrayField(new fields.StringField({ required: true }), { initial: [] })
--- a/packs/ftl-nomad-items/000146.log
+++ b/packs/ftl-nomad-items/000146.log
--- a/packs/ftl-nomad-items/CURRENT
+++ b/packs/ftl-nomad-items/CURRENT
@@ -1 +1 @@
-MANIFEST-000140
+MANIFEST-000144
--- a/packs/ftl-nomad-items/LOG
+++ b/packs/ftl-nomad-items/LOG
@@ -1,7 +1,7 @@
-2025/11/16-13:42:15.516505 7f47817fa6c0 Recovering log #138
-2025/11/16-13:42:15.531915 7f47817fa6c0 Delete type=3 #136
-2025/11/16-13:42:15.531986 7f47817fa6c0 Delete type=0 #138
-2025/11/16-13:48:27.487704 7f4780bff6c0 Level-0 table #143: started
-2025/11/16-13:48:27.487749 7f4780bff6c0 Level-0 table #143: 0 bytes OK
-2025/11/16-13:48:27.494893 7f4780bff6c0 Delete type=0 #141
-2025/11/16-13:48:27.501327 7f4780bff6c0 Manual compaction at level-0 from '!folders!AuBtSOj1mJmh88qx' @ 72057594037927935 : 1 .. '!items!zv9dwgL3p7ThQn7j' @ 0 : 0; will stop at (end)
+2025/11/24-19:41:43.032349 7f91477fe6c0 Recovering log #142
+2025/11/24-19:41:43.121482 7f91477fe6c0 Delete type=3 #140
+2025/11/24-19:41:43.121644 7f91477fe6c0 Delete type=0 #142
+2025/11/24-19:48:51.201740 7f91467fc6c0 Level-0 table #147: started
+2025/11/24-19:48:51.201811 7f91467fc6c0 Level-0 table #147: 0 bytes OK
+2025/11/24-19:48:51.208431 7f91467fc6c0 Delete type=0 #145
+2025/11/24-19:48:51.222941 7f91467fc6c0 Manual compaction at level-0 from '!folders!AuBtSOj1mJmh88qx' @ 72057594037927935 : 1 .. '!items!zv9dwgL3p7ThQn7j' @ 0 : 0; will stop at (end)
--- a/packs/ftl-nomad-items/LOG.old
+++ b/packs/ftl-nomad-items/LOG.old
@@ -1,7 +1,7 @@
-2025/11/15-21:57:15.481581 7f4781ffb6c0 Recovering log #134
-2025/11/15-21:57:15.491519 7f4781ffb6c0 Delete type=3 #132
-2025/11/15-21:57:15.491588 7f4781ffb6c0 Delete type=0 #134
-2025/11/15-21:59:21.237179 7f4780bff6c0 Level-0 table #139: started
-2025/11/15-21:59:21.237222 7f4780bff6c0 Level-0 table #139: 0 bytes OK
-2025/11/15-21:59:21.302054 7f4780bff6c0 Delete type=0 #137
-2025/11/15-21:59:21.450579 7f4780bff6c0 Manual compaction at level-0 from '!folders!AuBtSOj1mJmh88qx' @ 72057594037927935 : 1 .. '!items!zv9dwgL3p7ThQn7j' @ 0 : 0; will stop at (end)
+2025/11/16-13:42:15.516505 7f47817fa6c0 Recovering log #138
+2025/11/16-13:42:15.531915 7f47817fa6c0 Delete type=3 #136
+2025/11/16-13:42:15.531986 7f47817fa6c0 Delete type=0 #138
+2025/11/16-13:48:27.487704 7f4780bff6c0 Level-0 table #143: started
+2025/11/16-13:48:27.487749 7f4780bff6c0 Level-0 table #143: 0 bytes OK
+2025/11/16-13:48:27.494893 7f4780bff6c0 Delete type=0 #141
+2025/11/16-13:48:27.501327 7f4780bff6c0 Manual compaction at level-0 from '!folders!AuBtSOj1mJmh88qx' @ 72057594037927935 : 1 .. '!items!zv9dwgL3p7ThQn7j' @ 0 : 0; will stop at (end)
--- a/packs/ftl-nomad-items/MANIFEST-000144
+++ b/packs/ftl-nomad-items/MANIFEST-000144
--- a/packs/ftl-nomad-vehicles/000124.log
+++ b/packs/ftl-nomad-vehicles/000124.log
--- a/packs/ftl-nomad-vehicles/CURRENT
+++ b/packs/ftl-nomad-vehicles/CURRENT
@@ -1 +1 @@
-MANIFEST-000118
+MANIFEST-000122
--- a/packs/ftl-nomad-vehicles/LOG
+++ b/packs/ftl-nomad-vehicles/LOG
@@ -1,7 +1,7 @@
-2025/11/16-13:42:15.536081 7f4781ffb6c0 Recovering log #116
-2025/11/16-13:42:15.550548 7f4781ffb6c0 Delete type=3 #114
-2025/11/16-13:42:15.550621 7f4781ffb6c0 Delete type=0 #116
-2025/11/16-13:48:27.494999 7f4780bff6c0 Level-0 table #121: started
-2025/11/16-13:48:27.495027 7f4780bff6c0 Level-0 table #121: 0 bytes OK
-2025/11/16-13:48:27.501164 7f4780bff6c0 Delete type=0 #119
-2025/11/16-13:48:27.501339 7f4780bff6c0 Manual compaction at level-0 from '!actors!0FQ6XaRi24OorI21' @ 72057594037927935 : 1 .. '!folders!vRnrOJqSMlxbSgyX' @ 0 : 0; will stop at (end)
+2025/11/24-19:41:43.155366 7f9146ffd6c0 Recovering log #120
+2025/11/24-19:41:43.249081 7f9146ffd6c0 Delete type=3 #118
+2025/11/24-19:41:43.249224 7f9146ffd6c0 Delete type=0 #120
+2025/11/24-19:48:51.208632 7f91467fc6c0 Level-0 table #125: started
+2025/11/24-19:48:51.208686 7f91467fc6c0 Level-0 table #125: 0 bytes OK
+2025/11/24-19:48:51.216157 7f91467fc6c0 Delete type=0 #123
+2025/11/24-19:48:51.222968 7f91467fc6c0 Manual compaction at level-0 from '!actors!0FQ6XaRi24OorI21' @ 72057594037927935 : 1 .. '!folders!vRnrOJqSMlxbSgyX' @ 0 : 0; will stop at (end)
--- a/packs/ftl-nomad-vehicles/LOG.old
+++ b/packs/ftl-nomad-vehicles/LOG.old
@@ -1,7 +1,7 @@
-2025/11/15-21:57:15.495359 7f47817fa6c0 Recovering log #112
-2025/11/15-21:57:15.505936 7f47817fa6c0 Delete type=3 #110
-2025/11/15-21:57:15.505987 7f47817fa6c0 Delete type=0 #112
-2025/11/15-21:59:21.388865 7f4780bff6c0 Level-0 table #117: started
-2025/11/15-21:59:21.388934 7f4780bff6c0 Level-0 table #117: 0 bytes OK
-2025/11/15-21:59:21.450426 7f4780bff6c0 Delete type=0 #115
-2025/11/15-21:59:21.450606 7f4780bff6c0 Manual compaction at level-0 from '!actors!0FQ6XaRi24OorI21' @ 72057594037927935 : 1 .. '!folders!vRnrOJqSMlxbSgyX' @ 0 : 0; will stop at (end)
+2025/11/16-13:42:15.536081 7f4781ffb6c0 Recovering log #116
+2025/11/16-13:42:15.550548 7f4781ffb6c0 Delete type=3 #114
+2025/11/16-13:42:15.550621 7f4781ffb6c0 Delete type=0 #116
+2025/11/16-13:48:27.494999 7f4780bff6c0 Level-0 table #121: started
+2025/11/16-13:48:27.495027 7f4780bff6c0 Level-0 table #121: 0 bytes OK
+2025/11/16-13:48:27.501164 7f4780bff6c0 Delete type=0 #119
+2025/11/16-13:48:27.501339 7f4780bff6c0 Manual compaction at level-0 from '!actors!0FQ6XaRi24OorI21' @ 72057594037927935 : 1 .. '!folders!vRnrOJqSMlxbSgyX' @ 0 : 0; will stop at (end)
--- a/packs/ftl-nomad-vehicles/MANIFEST-000122
+++ b/packs/ftl-nomad-vehicles/MANIFEST-000122
--- a/templates/starship-main.hbs
+++ b/templates/starship-main.hbs
@@ -24,8 +24,8 @@
          }}

          {{formField
-            systemFields.armor
-            value=system.armor
+            systemFields.armorRegular
+            value=system.armorRegular
            localize=true
            disabled=isPlayMode
          }}
--- a/templates/vehicle-main.hbs
+++ b/templates/vehicle-main.hbs
@@ -21,8 +21,8 @@
            disabled=isPlayMode
          }}
          {{formField
-            systemFields.armor
-            value=system.armor
+            systemFields.armorRegular
+            value=system.armorRegular
            localize=true
            disabled=isPlayMode
          }}