From 8a5d1cc1d899d3f70c814d1d3c6b473efe12b310 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Sat, 18 Oct 2025 18:03:30 +0200 Subject: [PATCH] Sync robot enc --- css/fvtt-ftl-nomad.css | 4 +++ lang/en.json | 9 +++++++ module/models/robot.mjs | 14 +++++++++- .../{000097.log => 000101.log} | 0 packs/ftl-nomad-items/CURRENT | 2 +- packs/ftl-nomad-items/LOG | 14 +++++----- packs/ftl-nomad-items/LOG.old | 14 +++++----- .../{MANIFEST-000095 => MANIFEST-000099} | Bin 173 -> 173 bytes .../{000075.log => 000079.log} | 0 packs/ftl-nomad-vehicles/CURRENT | 2 +- packs/ftl-nomad-vehicles/LOG | 14 +++++----- packs/ftl-nomad-vehicles/LOG.old | 14 +++++----- .../{MANIFEST-000073 => MANIFEST-000077} | Bin 174 -> 174 bytes styles/robot.less | 4 +++ templates/robot-main.hbs | 25 ++++++++++++++++++ 15 files changed, 85 insertions(+), 31 deletions(-) rename packs/ftl-nomad-items/{000097.log => 000101.log} (100%) rename packs/ftl-nomad-items/{MANIFEST-000095 => MANIFEST-000099} (73%) rename packs/ftl-nomad-vehicles/{000075.log => 000079.log} (100%) rename packs/ftl-nomad-vehicles/{MANIFEST-000073 => MANIFEST-000077} (73%) diff --git a/css/fvtt-ftl-nomad.css b/css/fvtt-ftl-nomad.css index 9128877..a6f7c89 100644 --- a/css/fvtt-ftl-nomad.css +++ b/css/fvtt-ftl-nomad.css @@ -1359,6 +1359,10 @@ i.fvtt-ftl-nomad { min-width: 25rem; max-width: 25rem; } +.fvtt-ftl-nomad .robot-main .robot-pc .robot-right .main-stats .encumbered { + color: red; + font-weight: bold; +} .fvtt-ftl-nomad .robot-main .robot-pc .robot-right .cargo label, .fvtt-ftl-nomad .robot-main .robot-pc .robot-right .capacity label { min-width: 4rem; diff --git a/lang/en.json b/lang/en.json index 650a436..d83acbc 100644 --- a/lang/en.json +++ b/lang/en.json @@ -304,6 +304,15 @@ "Gargantuan": "Gargantuan" }, "FIELDS": { + "enc": { + "label": "Enc", + "value": { + "label": "Enc Curr." + }, + "max": { + "label": "Enc Max" + } + }, "brain": { "label": "Brain" }, diff --git a/module/models/robot.mjs b/module/models/robot.mjs index edecc93..1af0091 100644 --- a/module/models/robot.mjs +++ b/module/models/robot.mjs @@ -49,7 +49,19 @@ 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 enc = 0 + for (let i of this.parent.items) { + if (i.system?.enc) { + enc += i.system.enc + } + } + if (enc !== this.enc.value) { + this.enc.value = enc + } } isEncumbered() { diff --git a/packs/ftl-nomad-items/000097.log b/packs/ftl-nomad-items/000101.log similarity index 100% rename from packs/ftl-nomad-items/000097.log rename to packs/ftl-nomad-items/000101.log diff --git a/packs/ftl-nomad-items/CURRENT b/packs/ftl-nomad-items/CURRENT index b993e6c..b86155c 100644 --- a/packs/ftl-nomad-items/CURRENT +++ b/packs/ftl-nomad-items/CURRENT @@ -1 +1 @@ -MANIFEST-000095 +MANIFEST-000099 diff --git a/packs/ftl-nomad-items/LOG b/packs/ftl-nomad-items/LOG index 051d7e5..9bd4cd1 100644 --- a/packs/ftl-nomad-items/LOG +++ b/packs/ftl-nomad-items/LOG @@ -1,7 +1,7 @@ -2025/10/16-19:48:48.571698 7f18a4ffa6c0 Recovering log #93 -2025/10/16-19:48:48.582163 7f18a4ffa6c0 Delete type=3 #91 -2025/10/16-19:48:48.582233 7f18a4ffa6c0 Delete type=0 #93 -2025/10/16-19:50:49.674486 7f189e7fc6c0 Level-0 table #98: started -2025/10/16-19:50:49.674520 7f189e7fc6c0 Level-0 table #98: 0 bytes OK -2025/10/16-19:50:49.681475 7f189e7fc6c0 Delete type=0 #96 -2025/10/16-19:50:49.691929 7f189e7fc6c0 Manual compaction at level-0 from '!folders!AuBtSOj1mJmh88qx' @ 72057594037927935 : 1 .. '!items!zv9dwgL3p7ThQn7j' @ 0 : 0; will stop at (end) +2025/10/18-17:56:08.077097 7f7b75bfa6c0 Recovering log #97 +2025/10/18-17:56:08.086491 7f7b75bfa6c0 Delete type=3 #95 +2025/10/18-17:56:08.086541 7f7b75bfa6c0 Delete type=0 #97 +2025/10/18-18:03:15.510704 7f7b6f3ff6c0 Level-0 table #102: started +2025/10/18-18:03:15.510749 7f7b6f3ff6c0 Level-0 table #102: 0 bytes OK +2025/10/18-18:03:15.548325 7f7b6f3ff6c0 Delete type=0 #100 +2025/10/18-18:03:15.624002 7f7b6f3ff6c0 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 5d5ebcb..051d7e5 100644 --- a/packs/ftl-nomad-items/LOG.old +++ b/packs/ftl-nomad-items/LOG.old @@ -1,7 +1,7 @@ -2025/10/15-21:50:26.265715 7f189ffff6c0 Recovering log #88 -2025/10/15-21:50:26.325136 7f189ffff6c0 Delete type=3 #86 -2025/10/15-21:50:26.325207 7f189ffff6c0 Delete type=0 #88 -2025/10/15-22:19:29.836460 7f189e7fc6c0 Level-0 table #94: started -2025/10/15-22:19:29.836492 7f189e7fc6c0 Level-0 table #94: 0 bytes OK -2025/10/15-22:19:29.881737 7f189e7fc6c0 Delete type=0 #92 -2025/10/15-22:19:29.944478 7f189e7fc6c0 Manual compaction at level-0 from '!folders!AuBtSOj1mJmh88qx' @ 72057594037927935 : 1 .. '!items!zv9dwgL3p7ThQn7j' @ 0 : 0; will stop at (end) +2025/10/16-19:48:48.571698 7f18a4ffa6c0 Recovering log #93 +2025/10/16-19:48:48.582163 7f18a4ffa6c0 Delete type=3 #91 +2025/10/16-19:48:48.582233 7f18a4ffa6c0 Delete type=0 #93 +2025/10/16-19:50:49.674486 7f189e7fc6c0 Level-0 table #98: started +2025/10/16-19:50:49.674520 7f189e7fc6c0 Level-0 table #98: 0 bytes OK +2025/10/16-19:50:49.681475 7f189e7fc6c0 Delete type=0 #96 +2025/10/16-19:50:49.691929 7f189e7fc6c0 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-000095 b/packs/ftl-nomad-items/MANIFEST-000099 similarity index 73% rename from packs/ftl-nomad-items/MANIFEST-000095 rename to packs/ftl-nomad-items/MANIFEST-000099 index 42850008707b919c5cb2d73decf963de2f3abd55..480a32e7642b4fbbbdf53d088b8cf3c5096b22cf 100644 GIT binary patch delta 39 qcmZ3>xR!B3uY$qnhmxEOj7%w<49ux44_S|$pPB>WrvmxuKt2HQlnUkm delta 39 qcmZ3>xR!B3ufqRj&o*%~Fft`@GB78yJY>zZ-slhFCj$A&Kt2Ei&I<$p diff --git a/packs/ftl-nomad-vehicles/000075.log b/packs/ftl-nomad-vehicles/000079.log similarity index 100% rename from packs/ftl-nomad-vehicles/000075.log rename to packs/ftl-nomad-vehicles/000079.log diff --git a/packs/ftl-nomad-vehicles/CURRENT b/packs/ftl-nomad-vehicles/CURRENT index 60f8f3c..c7a124b 100644 --- a/packs/ftl-nomad-vehicles/CURRENT +++ b/packs/ftl-nomad-vehicles/CURRENT @@ -1 +1 @@ -MANIFEST-000073 +MANIFEST-000077 diff --git a/packs/ftl-nomad-vehicles/LOG b/packs/ftl-nomad-vehicles/LOG index a3d5acd..e83f697 100644 --- a/packs/ftl-nomad-vehicles/LOG +++ b/packs/ftl-nomad-vehicles/LOG @@ -1,7 +1,7 @@ -2025/10/16-19:48:48.588685 7f189f7fe6c0 Recovering log #71 -2025/10/16-19:48:48.599841 7f189f7fe6c0 Delete type=3 #69 -2025/10/16-19:48:48.599924 7f189f7fe6c0 Delete type=0 #71 -2025/10/16-19:50:49.586198 7f189e7fc6c0 Level-0 table #76: started -2025/10/16-19:50:49.586239 7f189e7fc6c0 Level-0 table #76: 0 bytes OK -2025/10/16-19:50:49.598518 7f189e7fc6c0 Delete type=0 #74 -2025/10/16-19:50:49.610365 7f189e7fc6c0 Manual compaction at level-0 from '!actors!0FQ6XaRi24OorI21' @ 72057594037927935 : 1 .. '!folders!vRnrOJqSMlxbSgyX' @ 0 : 0; will stop at (end) +2025/10/18-17:56:08.089616 7f7b6ffff6c0 Recovering log #75 +2025/10/18-17:56:08.099835 7f7b6ffff6c0 Delete type=3 #73 +2025/10/18-17:56:08.099933 7f7b6ffff6c0 Delete type=0 #75 +2025/10/18-18:03:15.586602 7f7b6f3ff6c0 Level-0 table #80: started +2025/10/18-18:03:15.586654 7f7b6f3ff6c0 Level-0 table #80: 0 bytes OK +2025/10/18-18:03:15.623769 7f7b6f3ff6c0 Delete type=0 #78 +2025/10/18-18:03:15.624032 7f7b6f3ff6c0 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 3d227d7..a3d5acd 100644 --- a/packs/ftl-nomad-vehicles/LOG.old +++ b/packs/ftl-nomad-vehicles/LOG.old @@ -1,7 +1,7 @@ -2025/10/15-21:50:26.444225 7f18a4ffa6c0 Recovering log #66 -2025/10/15-21:50:26.495317 7f18a4ffa6c0 Delete type=3 #64 -2025/10/15-21:50:26.495386 7f18a4ffa6c0 Delete type=0 #66 -2025/10/15-22:19:30.067316 7f189e7fc6c0 Level-0 table #72: started -2025/10/15-22:19:30.067349 7f189e7fc6c0 Level-0 table #72: 0 bytes OK -2025/10/15-22:19:30.103968 7f189e7fc6c0 Delete type=0 #70 -2025/10/15-22:19:30.104104 7f189e7fc6c0 Manual compaction at level-0 from '!actors!0FQ6XaRi24OorI21' @ 72057594037927935 : 1 .. '!folders!vRnrOJqSMlxbSgyX' @ 0 : 0; will stop at (end) +2025/10/16-19:48:48.588685 7f189f7fe6c0 Recovering log #71 +2025/10/16-19:48:48.599841 7f189f7fe6c0 Delete type=3 #69 +2025/10/16-19:48:48.599924 7f189f7fe6c0 Delete type=0 #71 +2025/10/16-19:50:49.586198 7f189e7fc6c0 Level-0 table #76: started +2025/10/16-19:50:49.586239 7f189e7fc6c0 Level-0 table #76: 0 bytes OK +2025/10/16-19:50:49.598518 7f189e7fc6c0 Delete type=0 #74 +2025/10/16-19:50:49.610365 7f189e7fc6c0 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-000073 b/packs/ftl-nomad-vehicles/MANIFEST-000077 similarity index 73% rename from packs/ftl-nomad-vehicles/MANIFEST-000073 rename to packs/ftl-nomad-vehicles/MANIFEST-000077 index 06b93cc81bdf208c0cf670cf1c814ed719e11e1c..49b627e553e0fcba606bdbf0b71295fb25335b8a 100644 GIT binary patch delta 37 pcmZ3-xQ=nc1i6H+t&JQEj7)x<49xy46_3-W^?|tlKyDyQ1pv`(361~& delta 37 pcmZ3-xQ=nc1i3R;)c12RFfw^@GBA6yRAjc!^9FIffm~mf3INn{2~7Y1 diff --git a/styles/robot.less b/styles/robot.less index 254559f..a958dd9 100644 --- a/styles/robot.less +++ b/styles/robot.less @@ -75,6 +75,10 @@ .main-stats { min-width: 25rem; max-width: 25rem; + .encumbered { + color: red; + font-weight: bold; + } } .cargo, .capacity { diff --git a/templates/robot-main.hbs b/templates/robot-main.hbs index 5e04a12..420f719 100644 --- a/templates/robot-main.hbs +++ b/templates/robot-main.hbs @@ -79,6 +79,31 @@ disabled=isPlayMode }} +
+ {{#if isEncumbered}} + {{formField + systemFields.enc.fields.value + value=system.enc.value + rootId=partId + disabled=true + classes="encumbered" + }} + {{else}} + {{formField + systemFields.enc.fields.value + value=system.enc.value + rootId=partId + disabled=true + }} + {{/if}} +   + {{formField + systemFields.enc.fields.max + value=system.enc.max + rootId=partId + disabled=isPlayMode + }} +