From 973d8733b28b7e526fa4e470af599dfe8162f25c Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Mon, 30 Sep 2024 13:41:44 +0200 Subject: [PATCH] Sync with latest fixes --- lang/en.json | 5 ++++- module/sheets/items/rmfrp_weapon_sheet.js | 1 + .../{000170.log => 000186.log} | 0 packs/skill_categories/CURRENT | 2 +- packs/skill_categories/LOG | 16 +++++++-------- packs/skill_categories/LOG.old | 11 +++++++--- .../{MANIFEST-000168 => MANIFEST-000184} | Bin 176 -> 176 bytes packs/skills/{000076.log => 000092.log} | 0 packs/skills/CURRENT | 2 +- packs/skills/LOG | 16 +++++++-------- packs/skills/LOG.old | 11 +++++++--- .../{MANIFEST-000074 => MANIFEST-000090} | Bin 173 -> 173 bytes system.json | 18 ++++++++++++++++- .../sheets/items/rmfrp-weapon-sheet.html | 19 ++++++++++++++++++ 14 files changed, 75 insertions(+), 26 deletions(-) rename packs/skill_categories/{000170.log => 000186.log} (100%) rename packs/skill_categories/{MANIFEST-000168 => MANIFEST-000184} (72%) rename packs/skills/{000076.log => 000092.log} (100%) rename packs/skills/{MANIFEST-000074 => MANIFEST-000090} (73%) diff --git a/lang/en.json b/lang/en.json index cc75f0d..3767ea4 100644 --- a/lang/en.json +++ b/lang/en.json @@ -212,7 +212,10 @@ "critical_table": "Critical Table", "lsl_crit_column": "LSL", "range_modifier": "Range Modifier", - "weapon_bonus": "Weapon Bonus" + "weapon_bonus": "Weapon Bonus", + "fumble_value": "Fumble Max Value", + "fumble_table": "Fumble Table", + "fumble_column": "Fumble Column" }, "herb_or_poison": { "codes": "Codes", diff --git a/module/sheets/items/rmfrp_weapon_sheet.js b/module/sheets/items/rmfrp_weapon_sheet.js index e31a350..ee3afe0 100644 --- a/module/sheets/items/rmfrp_weapon_sheet.js +++ b/module/sheets/items/rmfrp_weapon_sheet.js @@ -31,6 +31,7 @@ export default class RMFRPWeaponSheet extends ItemSheet { skills: {}, criticalTables: {}, attackTables: game.rmfrp.attackTables.getTableDef(), + fumbleTables: {}, enrichedDescription: enrichedDescription } console.log("Parent", this.object) diff --git a/packs/skill_categories/000170.log b/packs/skill_categories/000186.log similarity index 100% rename from packs/skill_categories/000170.log rename to packs/skill_categories/000186.log diff --git a/packs/skill_categories/CURRENT b/packs/skill_categories/CURRENT index 57112f5..cce82a3 100644 --- a/packs/skill_categories/CURRENT +++ b/packs/skill_categories/CURRENT @@ -1 +1 @@ -MANIFEST-000168 +MANIFEST-000184 diff --git a/packs/skill_categories/LOG b/packs/skill_categories/LOG index c6b5019..3975682 100644 --- a/packs/skill_categories/LOG +++ b/packs/skill_categories/LOG @@ -1,8 +1,8 @@ -2024/08/23-11:39:46.394926 7fa527e006c0 Recovering log #167 -2024/08/23-11:39:46.405233 7fa527e006c0 Delete type=0 #167 -2024/08/23-11:39:46.405284 7fa527e006c0 Delete type=3 #166 -2024/08/23-11:44:39.425049 7fa525a006c0 Level-0 table #171: started -2024/08/23-11:44:39.425122 7fa525a006c0 Level-0 table #171: 0 bytes OK -2024/08/23-11:44:39.431462 7fa525a006c0 Delete type=0 #169 -2024/08/23-11:44:39.441660 7fa525a006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end) -2024/08/23-11:44:39.441685 7fa525a006c0 Manual compaction at level-1 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end) +2024/09/17-13:11:02.171459 7fe046a006c0 Recovering log #182 +2024/09/17-13:11:02.180765 7fe046a006c0 Delete type=3 #180 +2024/09/17-13:11:02.180823 7fe046a006c0 Delete type=0 #182 +2024/09/17-13:12:47.967572 7fe045a006c0 Level-0 table #187: started +2024/09/17-13:12:47.967635 7fe045a006c0 Level-0 table #187: 0 bytes OK +2024/09/17-13:12:47.974711 7fe045a006c0 Delete type=0 #185 +2024/09/17-13:12:47.987784 7fe045a006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end) +2024/09/17-13:12:47.987823 7fe045a006c0 Manual compaction at level-1 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end) diff --git a/packs/skill_categories/LOG.old b/packs/skill_categories/LOG.old index 509631c..c381242 100644 --- a/packs/skill_categories/LOG.old +++ b/packs/skill_categories/LOG.old @@ -1,3 +1,8 @@ -2024/08/23-10:14:01.919789 7f67a10006c0 Recovering log #164 -2024/08/23-10:14:01.965430 7f67a10006c0 Delete type=3 #162 -2024/08/23-10:14:01.965586 7f67a10006c0 Delete type=0 #164 +2024/09/17-13:09:49.649559 7fe046a006c0 Recovering log #178 +2024/09/17-13:09:49.660314 7fe046a006c0 Delete type=3 #176 +2024/09/17-13:09:49.660452 7fe046a006c0 Delete type=0 #178 +2024/09/17-13:10:57.956214 7fe045a006c0 Level-0 table #183: started +2024/09/17-13:10:57.956237 7fe045a006c0 Level-0 table #183: 0 bytes OK +2024/09/17-13:10:57.965294 7fe045a006c0 Delete type=0 #181 +2024/09/17-13:10:57.986257 7fe045a006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end) +2024/09/17-13:10:57.986302 7fe045a006c0 Manual compaction at level-1 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end) diff --git a/packs/skill_categories/MANIFEST-000168 b/packs/skill_categories/MANIFEST-000184 similarity index 72% rename from packs/skill_categories/MANIFEST-000168 rename to packs/skill_categories/MANIFEST-000184 index 2842e2a54a7f591d1d8df883f3fcc878e56c5714..6eff61388ecf90428ec05d7a46efb385eed74e89 100644 GIT binary patch delta 43 tcmdnMxPfs(kIHF(T_$b@My8#NoD9sn7+J0{zPNXa3na1&B(eu20sspM3ta#J delta 43 tcmdnMxPfs(kIELG?U%S27@1ZwaxyTlVr03-D1Ikq6-ZxR!B3ufpAwX@Z;#j7-s-49qbs9c+QO=Ntj?V}SfPARhqWl?l@T delta 39 qcmZ3>xR!B3ufmV6mIIs&j7;8~49q?(9c(6|eP2O*A0Xck$Oi!H6$!Bb diff --git a/system.json b/system.json index 993288c..8e8c571 100644 --- a/system.json +++ b/system.json @@ -49,5 +49,21 @@ "distance": 5, "units": "ft" }, - "license": "LICENSE.txt" + "license": "LICENSE.txt", + "flags": { + "hotReload": { + "extensions": [ + "css", + "hbs", + "html", + "json" + ], + "paths": [ + "./", + "lang/", + "assets/", + "templates/" + ] + } + } } diff --git a/templates/sheets/items/rmfrp-weapon-sheet.html b/templates/sheets/items/rmfrp-weapon-sheet.html index aac6bf4..d1fd1a0 100644 --- a/templates/sheets/items/rmfrp-weapon-sheet.html +++ b/templates/sheets/items/rmfrp-weapon-sheet.html @@ -74,6 +74,25 @@ + + + + + + + + + +
{{localize "rmfrp.weapon.fumble_value"}}{{localize "rmfrp.weapon.fumble_table"}}{{localize "rmfrp.weapon.fumble_column"}}
+ + + + + +
+
{{localize "rmfrp.weapon.critical_table"}}