From 6aa0b3a58daf5e8a04145ad59cc43cfdbee20dce Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Sat, 15 Nov 2025 21:59:42 +0100 Subject: [PATCH] Fix robot weapon, and rework encumbrance --- module/models/character.mjs | 5 +---- module/models/robot.mjs | 6 ++---- .../ftl-nomad-items/{000134.log => 000138.log} | 0 packs/ftl-nomad-items/CURRENT | 2 +- packs/ftl-nomad-items/LOG | 14 +++++++------- packs/ftl-nomad-items/LOG.old | 14 +++++++------- .../{MANIFEST-000132 => MANIFEST-000136} | Bin 177 -> 177 bytes .../{000112.log => 000116.log} | 0 packs/ftl-nomad-vehicles/CURRENT | 2 +- packs/ftl-nomad-vehicles/LOG | 14 +++++++------- packs/ftl-nomad-vehicles/LOG.old | 14 +++++++------- .../{MANIFEST-000110 => MANIFEST-000114} | Bin 174 -> 174 bytes templates/robot-equipment.hbs | 3 ++- templates/roll-dialog.hbs | 2 +- 14 files changed, 36 insertions(+), 40 deletions(-) rename packs/ftl-nomad-items/{000134.log => 000138.log} (100%) rename packs/ftl-nomad-items/{MANIFEST-000132 => MANIFEST-000136} (72%) rename packs/ftl-nomad-vehicles/{000112.log => 000116.log} (100%) rename packs/ftl-nomad-vehicles/{MANIFEST-000110 => MANIFEST-000114} (73%) diff --git a/module/models/character.mjs b/module/models/character.mjs index 6c8d966..e51413c 100644 --- 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) { diff --git a/module/models/robot.mjs b/module/models/robot.mjs index 1af0091..b7af472 100644 --- 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) { diff --git a/packs/ftl-nomad-items/000134.log b/packs/ftl-nomad-items/000138.log similarity index 100% rename from packs/ftl-nomad-items/000134.log rename to packs/ftl-nomad-items/000138.log diff --git a/packs/ftl-nomad-items/CURRENT b/packs/ftl-nomad-items/CURRENT index c39c670..0eb07d3 100644 --- a/packs/ftl-nomad-items/CURRENT +++ b/packs/ftl-nomad-items/CURRENT @@ -1 +1 @@ -MANIFEST-000132 +MANIFEST-000136 diff --git a/packs/ftl-nomad-items/LOG b/packs/ftl-nomad-items/LOG index d8b2da3..c4da9f9 100644 --- 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) diff --git a/packs/ftl-nomad-items/LOG.old b/packs/ftl-nomad-items/LOG.old index 5a43db2..d8b2da3 100644 --- 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) diff --git a/packs/ftl-nomad-items/MANIFEST-000132 b/packs/ftl-nomad-items/MANIFEST-000136 similarity index 72% rename from packs/ftl-nomad-items/MANIFEST-000132 rename to packs/ftl-nomad-items/MANIFEST-000136 index 876f46d22b2fe1d207962d73cf1262455300ec49..e6e7db694452c327e952ff592fbbc2e927962309 100644 GIT binary patch delta 43 scmdnUxRG%}ugZyPJ4tQ^My5_iP6p;KMwW-HuV3AG3=-)AiS&R(02$8=1poj5 delta 43 tcmdnUxRG%}uga!BxktDe7@1lbIT@JS7+D^&p8vLdF-W8hB+>yA0RTIn47mUR diff --git a/packs/ftl-nomad-vehicles/000112.log b/packs/ftl-nomad-vehicles/000116.log similarity index 100% rename from packs/ftl-nomad-vehicles/000112.log rename to packs/ftl-nomad-vehicles/000116.log diff --git a/packs/ftl-nomad-vehicles/CURRENT b/packs/ftl-nomad-vehicles/CURRENT index a451d53..3182b19 100644 --- a/packs/ftl-nomad-vehicles/CURRENT +++ b/packs/ftl-nomad-vehicles/CURRENT @@ -1 +1 @@ -MANIFEST-000110 +MANIFEST-000114 diff --git a/packs/ftl-nomad-vehicles/LOG b/packs/ftl-nomad-vehicles/LOG index 0e01826..19efdd3 100644 --- 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) diff --git a/packs/ftl-nomad-vehicles/LOG.old b/packs/ftl-nomad-vehicles/LOG.old index 75c406a..0e01826 100644 --- 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) diff --git a/packs/ftl-nomad-vehicles/MANIFEST-000110 b/packs/ftl-nomad-vehicles/MANIFEST-000114 similarity index 73% rename from packs/ftl-nomad-vehicles/MANIFEST-000110 rename to packs/ftl-nomad-vehicles/MANIFEST-000114 index adedd3b19b1df851d98e48ab3a4d973e45d4af5c..fca541d9f9d892fba87defae4fcbfd5ba95eb24e 100644 GIT binary patch delta 37 pcmZ3-xQ=nc1i63i&NDa|7@3MW8JJ60D!3neUj}hYfZQ^c3INj;3BUjV delta 37 pcmZ3-xQ=nc1i8K{hdUe$j7<5Q49o>A73!4_r-HZzKyDFB1pv}o3BCXT diff --git a/templates/robot-equipment.hbs b/templates/robot-equipment.hbs index 03ee0a4..b1c1a60 100644 --- a/templates/robot-equipment.hbs +++ b/templates/robot-equipment.hbs @@ -26,8 +26,9 @@ src="{{item.img}}" data-tooltip="{{item.name}}" /> +
diff --git a/templates/roll-dialog.hbs b/templates/roll-dialog.hbs index 36ed878..73a6ff5 100644 --- a/templates/roll-dialog.hbs +++ b/templates/roll-dialog.hbs @@ -31,7 +31,7 @@ {{/if}} {{#if isEncumbered}} -
Encumbered : -1D
+
Encumbered : -1D for Physical Attacks
{{/if}}