Fix robot weapon, and rework encumbrance

2025-11-15 21:59:42 +01:00
parent 810271c2a2
commit 6aa0b3a58d
14 changed files with 36 additions and 40 deletions
--- a/module/models/character.mjs
+++ b/module/models/character.mjs
@@ -77,10 +77,7 @@ export default class FTLNomadProtagonist extends foundry.abstract.TypeDataModel
  prepareDerivedData() {
    super.prepareDerivedData();

-    let encMax = 10 + (2 * this.skills.physical.value)
-    if (encMax !== this.enc.max) {
-      this.enc.max = encMax
-    }
+    let encMax = this.enc.max // 10 + (2 * this.skills.physical.value)
    let enc = 0
    let armor = 0
    for (let i of this.parent.items) {
--- a/module/models/robot.mjs
+++ b/module/models/robot.mjs
@@ -49,10 +49,8 @@ export default class FTLNomadRobot extends foundry.abstract.TypeDataModel {

  prepareDerivedData() {
    super.prepareDerivedData();
-    let encMax = this.durability + (2 * this.skills.physical.value)
-    if (encMax !== this.enc.max) {
-      this.enc.max = encMax
-    }
+
+    let encMax = this.enc.max // this.durability + (2 * this.skills.physical.value)
    let enc = 0
    for (let i of this.parent.items) {
      if (i.system?.enc) {
--- a/packs/ftl-nomad-items/000138.log
+++ b/packs/ftl-nomad-items/000138.log
--- a/packs/ftl-nomad-items/CURRENT
+++ b/packs/ftl-nomad-items/CURRENT
@@ -1 +1 @@
-MANIFEST-000132
+MANIFEST-000136
--- a/packs/ftl-nomad-items/LOG
+++ b/packs/ftl-nomad-items/LOG
@@ -1,7 +1,7 @@
-2025/11/11-09:55:29.500472 7f0922ffd6c0 Recovering log #130
-2025/11/11-09:55:29.510925 7f0922ffd6c0 Delete type=3 #128
-2025/11/11-09:55:29.511008 7f0922ffd6c0 Delete type=0 #130
-2025/11/11-12:13:09.876661 7f0920bff6c0 Level-0 table #135: started
-2025/11/11-12:13:09.876709 7f0920bff6c0 Level-0 table #135: 0 bytes OK
-2025/11/11-12:13:09.882679 7f0920bff6c0 Delete type=0 #133
-2025/11/11-12:13:09.882804 7f0920bff6c0 Manual compaction at level-0 from '!folders!AuBtSOj1mJmh88qx' @ 72057594037927935 : 1 .. '!items!zv9dwgL3p7ThQn7j' @ 0 : 0; will stop at (end)
+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)
--- a/packs/ftl-nomad-items/LOG.old
+++ b/packs/ftl-nomad-items/LOG.old
@@ -1,7 +1,7 @@
-2025/11/11-09:17:46.334216 7f0921ffb6c0 Recovering log #126
-2025/11/11-09:17:46.344001 7f0921ffb6c0 Delete type=3 #124
-2025/11/11-09:17:46.344052 7f0921ffb6c0 Delete type=0 #126
-2025/11/11-09:53:31.537774 7f0920bff6c0 Level-0 table #131: started
-2025/11/11-09:53:31.537826 7f0920bff6c0 Level-0 table #131: 0 bytes OK
-2025/11/11-09:53:31.544859 7f0920bff6c0 Delete type=0 #129
-2025/11/11-09:53:31.558512 7f0920bff6c0 Manual compaction at level-0 from '!folders!AuBtSOj1mJmh88qx' @ 72057594037927935 : 1 .. '!items!zv9dwgL3p7ThQn7j' @ 0 : 0; will stop at (end)
+2025/11/11-09:55:29.500472 7f0922ffd6c0 Recovering log #130
+2025/11/11-09:55:29.510925 7f0922ffd6c0 Delete type=3 #128
+2025/11/11-09:55:29.511008 7f0922ffd6c0 Delete type=0 #130
+2025/11/11-12:13:09.876661 7f0920bff6c0 Level-0 table #135: started
+2025/11/11-12:13:09.876709 7f0920bff6c0 Level-0 table #135: 0 bytes OK
+2025/11/11-12:13:09.882679 7f0920bff6c0 Delete type=0 #133
+2025/11/11-12:13:09.882804 7f0920bff6c0 Manual compaction at level-0 from '!folders!AuBtSOj1mJmh88qx' @ 72057594037927935 : 1 .. '!items!zv9dwgL3p7ThQn7j' @ 0 : 0; will stop at (end)
--- a/packs/ftl-nomad-items/MANIFEST-000136
+++ b/packs/ftl-nomad-items/MANIFEST-000136
--- a/packs/ftl-nomad-vehicles/000116.log
+++ b/packs/ftl-nomad-vehicles/000116.log
--- a/packs/ftl-nomad-vehicles/CURRENT
+++ b/packs/ftl-nomad-vehicles/CURRENT
@@ -1 +1 @@
-MANIFEST-000110
+MANIFEST-000114
--- a/packs/ftl-nomad-vehicles/LOG
+++ b/packs/ftl-nomad-vehicles/LOG
@@ -1,7 +1,7 @@
-2025/11/11-09:55:29.516089 7f0921ffb6c0 Recovering log #108
-2025/11/11-09:55:29.525977 7f0921ffb6c0 Delete type=3 #106
-2025/11/11-09:55:29.526050 7f0921ffb6c0 Delete type=0 #108
-2025/11/11-12:13:09.863976 7f0920bff6c0 Level-0 table #113: started
-2025/11/11-12:13:09.864017 7f0920bff6c0 Level-0 table #113: 0 bytes OK
-2025/11/11-12:13:09.870509 7f0920bff6c0 Delete type=0 #111
-2025/11/11-12:13:09.882783 7f0920bff6c0 Manual compaction at level-0 from '!actors!0FQ6XaRi24OorI21' @ 72057594037927935 : 1 .. '!folders!vRnrOJqSMlxbSgyX' @ 0 : 0; will stop at (end)
+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)
--- a/packs/ftl-nomad-vehicles/LOG.old
+++ b/packs/ftl-nomad-vehicles/LOG.old
@@ -1,7 +1,7 @@
-2025/11/11-09:17:46.347112 7f09217fa6c0 Recovering log #104
-2025/11/11-09:17:46.357554 7f09217fa6c0 Delete type=3 #102
-2025/11/11-09:17:46.357636 7f09217fa6c0 Delete type=0 #104
-2025/11/11-09:53:31.551245 7f0920bff6c0 Level-0 table #109: started
-2025/11/11-09:53:31.551306 7f0920bff6c0 Level-0 table #109: 0 bytes OK
-2025/11/11-09:53:31.558404 7f0920bff6c0 Delete type=0 #107
-2025/11/11-09:53:31.558535 7f0920bff6c0 Manual compaction at level-0 from '!actors!0FQ6XaRi24OorI21' @ 72057594037927935 : 1 .. '!folders!vRnrOJqSMlxbSgyX' @ 0 : 0; will stop at (end)
+2025/11/11-09:55:29.516089 7f0921ffb6c0 Recovering log #108
+2025/11/11-09:55:29.525977 7f0921ffb6c0 Delete type=3 #106
+2025/11/11-09:55:29.526050 7f0921ffb6c0 Delete type=0 #108
+2025/11/11-12:13:09.863976 7f0920bff6c0 Level-0 table #113: started
+2025/11/11-12:13:09.864017 7f0920bff6c0 Level-0 table #113: 0 bytes OK
+2025/11/11-12:13:09.870509 7f0920bff6c0 Delete type=0 #111
+2025/11/11-12:13:09.882783 7f0920bff6c0 Manual compaction at level-0 from '!actors!0FQ6XaRi24OorI21' @ 72057594037927935 : 1 .. '!folders!vRnrOJqSMlxbSgyX' @ 0 : 0; will stop at (end)
--- a/packs/ftl-nomad-vehicles/MANIFEST-000114
+++ b/packs/ftl-nomad-vehicles/MANIFEST-000114
--- a/templates/robot-equipment.hbs
+++ b/templates/robot-equipment.hbs
@@ -26,8 +26,9 @@
              src="{{item.img}}"
              data-tooltip="{{item.name}}"
            />
+            <i class="fa-regular fa-dice"></i>
            <div
-              class="name"
+              class="name rollable"
              data-roll-type="weapon"
              data-tooltip="{{{item.system.description}}}"
            >
--- a/templates/roll-dialog.hbs
+++ b/templates/roll-dialog.hbs
@@ -31,7 +31,7 @@
    {{/if}}

    {{#if isEncumbered}}
-      <div class="dialog-skill red-warning">Encumbered : -1D</div>
+      <div class="dialog-skill red-warning">Encumbered : -1D for Physical Attacks</div>
    {{/if}}

  </fieldSet>