From b9e2a77e880404c0a319a3a2bb347e082e90baa0 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Wed, 16 Aug 2023 21:17:34 +0200 Subject: [PATCH] Needs babele, fix translation, fix margine --- lang/en.json | 3 ++- lang/fr.json | 3 ++- modules/common/ecryme-utility.js | 2 +- modules/ecryme-main.js | 2 +- packs/equipment/000056.log | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 10 +++------- packs/equipment/LOG.old | 14 +++++++------- packs/equipment/MANIFEST-000054 | Bin 173 -> 0 bytes packs/maneuvers/000056.log | 0 packs/maneuvers/CURRENT | 2 +- packs/maneuvers/LOG | 10 +++------- packs/maneuvers/LOG.old | 14 +++++++------- packs/maneuvers/MANIFEST-000054 | Bin 168 -> 0 bytes packs/specialisation/000056.log | 0 packs/specialisation/CURRENT | 2 +- packs/specialisation/LOG | 10 +++------- packs/specialisation/LOG.old | 14 +++++++------- packs/specialisation/MANIFEST-000054 | Bin 170 -> 0 bytes packs/traits/000056.log | 0 packs/traits/CURRENT | 2 +- packs/traits/LOG | 10 +++------- packs/traits/LOG.old | 14 +++++++------- packs/traits/MANIFEST-000054 | Bin 170 -> 0 bytes system.json | 9 +++++++++ 25 files changed, 59 insertions(+), 64 deletions(-) delete mode 100644 packs/equipment/000056.log delete mode 100644 packs/equipment/MANIFEST-000054 delete mode 100644 packs/maneuvers/000056.log delete mode 100644 packs/maneuvers/MANIFEST-000054 delete mode 100644 packs/specialisation/000056.log delete mode 100644 packs/specialisation/MANIFEST-000054 delete mode 100644 packs/traits/000056.log delete mode 100644 packs/traits/MANIFEST-000054 diff --git a/lang/en.json b/lang/en.json index 40bb738..2f5ef54 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1,7 +1,8 @@ { "TYPES": { "Actor": { - "character": "PC", + "pc": "Player Character", + "npc": "Non-Player Character", "annency": "Annency" }, "Item": { diff --git a/lang/fr.json b/lang/fr.json index ffe681b..3951f36 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -1,7 +1,8 @@ { "TYPES": { "Actor":{ - "character": "Personnage", + "pc": "Personnage Joueur", + "npc": "Personnage Non Joueur", "annency": "Anence" }, "Item": { diff --git a/modules/common/ecryme-utility.js b/modules/common/ecryme-utility.js index 6554d64..ac11454 100644 --- a/modules/common/ecryme-utility.js +++ b/modules/common/ecryme-utility.js @@ -492,7 +492,7 @@ export class EcrymeUtility { rollData.margin = rollData.total - rollData.difficulty if (rollData.total > rollData.difficulty) { rollData.isSuccess = true - let maxMargin = rollData.skill.value + (rollData.spec) ? 2 : 0 + let maxMargin = rollData.skill.value + ((rollData.spec) ? 2 : 0) rollData.margin = Math.min(rollData.margin, maxMargin) } } diff --git a/modules/ecryme-main.js b/modules/ecryme-main.js index dc65f44..5e41fff 100644 --- a/modules/ecryme-main.js +++ b/modules/ecryme-main.js @@ -68,7 +68,7 @@ Hooks.once("init", async function () { EcrymeUtility.init() console.log("Babele INIT!") - Babele.get().setSystemTranslationsDir("translated"); + Babele.get().setSystemTranslationsDir("translated") }); diff --git a/packs/equipment/000056.log b/packs/equipment/000056.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index 17608f2..717cf9a 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000054 +MANIFEST-000058 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index f431424..e81e096 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,7 +1,3 @@ -2023/08/08-18:04:51.701446 7f5afcdf86c0 Recovering log #52 -2023/08/08-18:04:51.711602 7f5afcdf86c0 Delete type=3 #50 -2023/08/08-18:04:51.711652 7f5afcdf86c0 Delete type=0 #52 -2023/08/08-18:04:59.546696 7f58677fe6c0 Level-0 table #57: started -2023/08/08-18:04:59.546715 7f58677fe6c0 Level-0 table #57: 0 bytes OK -2023/08/08-18:04:59.552809 7f58677fe6c0 Delete type=0 #55 -2023/08/08-18:04:59.560028 7f58677fe6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) +2023/08/16-21:16:40.386789 7fa0de7fc6c0 Recovering log #56 +2023/08/16-21:16:40.397720 7fa0de7fc6c0 Delete type=0 #56 +2023/08/16-21:16:40.397771 7fa0de7fc6c0 Delete type=3 #54 diff --git a/packs/equipment/LOG.old b/packs/equipment/LOG.old index 5d936e0..f431424 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,7 +1,7 @@ -2023/08/08-17:50:40.597296 7f5afd5f96c0 Recovering log #48 -2023/08/08-17:50:40.655447 7f5afd5f96c0 Delete type=3 #46 -2023/08/08-17:50:40.655509 7f5afd5f96c0 Delete type=0 #48 -2023/08/08-18:04:06.340910 7f58677fe6c0 Level-0 table #53: started -2023/08/08-18:04:06.340947 7f58677fe6c0 Level-0 table #53: 0 bytes OK -2023/08/08-18:04:06.347333 7f58677fe6c0 Delete type=0 #51 -2023/08/08-18:04:06.361314 7f58677fe6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) +2023/08/08-18:04:51.701446 7f5afcdf86c0 Recovering log #52 +2023/08/08-18:04:51.711602 7f5afcdf86c0 Delete type=3 #50 +2023/08/08-18:04:51.711652 7f5afcdf86c0 Delete type=0 #52 +2023/08/08-18:04:59.546696 7f58677fe6c0 Level-0 table #57: started +2023/08/08-18:04:59.546715 7f58677fe6c0 Level-0 table #57: 0 bytes OK +2023/08/08-18:04:59.552809 7f58677fe6c0 Delete type=0 #55 +2023/08/08-18:04:59.560028 7f58677fe6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/MANIFEST-000054 b/packs/equipment/MANIFEST-000054 deleted file mode 100644 index 89cb1762c1fb92dc3e82ff574f128db29114e30d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmY$I+i{_dfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfDVUNN&IHMdx?s@Occ zC_N&>B`7bYq%bLmv7P}8*cmyS&oU}1rse0Pq!tw`8oC#S`pgoS$2eSd>_jU&P8Fub5eqnp>=xA6#0J zlay*%Ug;E-oSd7+$j<-Pi_#VI9+QGx*s*cmzhNGmF)<>#cN78NVHWR`m*mAE@*heTGC6lX**8bOrd kG{ylUe>89A4GsoICUZ^(W(yXt>ZR6eKwJwT*NVjp04o_Ti~s-t diff --git a/system.json b/system.json index 76f1ebb..7d2661a 100644 --- a/system.json +++ b/system.json @@ -88,6 +88,15 @@ "styles": [ "styles/ecryme.css" ], + "relationships": { + "requires": [ + { + "id": "babele", + "type": "module", + "compatibility": {} + } + ] + }, "title": "Ecryme, le Jeu de Rôles", "url": "https://www.uberwald.me/gitea/uberwald/fvtt-ecryme", "version": "11.0.19",