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 89cb176..0000000 Binary files a/packs/equipment/MANIFEST-000054 and /dev/null differ diff --git a/packs/maneuvers/000056.log b/packs/maneuvers/000056.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/maneuvers/CURRENT b/packs/maneuvers/CURRENT index 17608f2..717cf9a 100644 --- a/packs/maneuvers/CURRENT +++ b/packs/maneuvers/CURRENT @@ -1 +1 @@ -MANIFEST-000054 +MANIFEST-000058 diff --git a/packs/maneuvers/LOG b/packs/maneuvers/LOG index 2bc10f9..900fd0a 100644 --- a/packs/maneuvers/LOG +++ b/packs/maneuvers/LOG @@ -1,7 +1,3 @@ -2023/08/08-18:04:51.714583 7f5afcdf86c0 Recovering log #52 -2023/08/08-18:04:51.723706 7f5afcdf86c0 Delete type=3 #50 -2023/08/08-18:04:51.723766 7f5afcdf86c0 Delete type=0 #52 -2023/08/08-18:04:59.560163 7f58677fe6c0 Level-0 table #57: started -2023/08/08-18:04:59.560198 7f58677fe6c0 Level-0 table #57: 0 bytes OK -2023/08/08-18:04:59.566320 7f58677fe6c0 Delete type=0 #55 -2023/08/08-18:04:59.566452 7f58677fe6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) +2023/08/16-21:16:40.404167 7fa0dcff96c0 Recovering log #56 +2023/08/16-21:16:40.425125 7fa0dcff96c0 Delete type=0 #56 +2023/08/16-21:16:40.425189 7fa0dcff96c0 Delete type=3 #54 diff --git a/packs/maneuvers/LOG.old b/packs/maneuvers/LOG.old index dfe7c69..2bc10f9 100644 --- a/packs/maneuvers/LOG.old +++ b/packs/maneuvers/LOG.old @@ -1,7 +1,7 @@ -2023/08/08-17:50:40.659050 7f5afd5f96c0 Recovering log #48 -2023/08/08-17:50:40.767128 7f5afd5f96c0 Delete type=3 #46 -2023/08/08-17:50:40.767167 7f5afd5f96c0 Delete type=0 #48 -2023/08/08-18:04:06.354489 7f58677fe6c0 Level-0 table #53: started -2023/08/08-18:04:06.354521 7f58677fe6c0 Level-0 table #53: 0 bytes OK -2023/08/08-18:04:06.361236 7f58677fe6c0 Delete type=0 #51 -2023/08/08-18:04:06.361331 7f58677fe6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) +2023/08/08-18:04:51.714583 7f5afcdf86c0 Recovering log #52 +2023/08/08-18:04:51.723706 7f5afcdf86c0 Delete type=3 #50 +2023/08/08-18:04:51.723766 7f5afcdf86c0 Delete type=0 #52 +2023/08/08-18:04:59.560163 7f58677fe6c0 Level-0 table #57: started +2023/08/08-18:04:59.560198 7f58677fe6c0 Level-0 table #57: 0 bytes OK +2023/08/08-18:04:59.566320 7f58677fe6c0 Delete type=0 #55 +2023/08/08-18:04:59.566452 7f58677fe6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/MANIFEST-000054 b/packs/maneuvers/MANIFEST-000054 deleted file mode 100644 index 283cdab..0000000 Binary files a/packs/maneuvers/MANIFEST-000054 and /dev/null differ diff --git a/packs/specialisation/000056.log b/packs/specialisation/000056.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/specialisation/CURRENT b/packs/specialisation/CURRENT index 17608f2..717cf9a 100644 --- a/packs/specialisation/CURRENT +++ b/packs/specialisation/CURRENT @@ -1 +1 @@ -MANIFEST-000054 +MANIFEST-000058 diff --git a/packs/specialisation/LOG b/packs/specialisation/LOG index af5548c..585fdb7 100644 --- a/packs/specialisation/LOG +++ b/packs/specialisation/LOG @@ -1,7 +1,3 @@ -2023/08/08-18:04:51.701446 7f5afddfa6c0 Recovering log #52 -2023/08/08-18:04:51.711597 7f5afddfa6c0 Delete type=3 #50 -2023/08/08-18:04:51.711643 7f5afddfa6c0 Delete type=0 #52 -2023/08/08-18:04:59.539283 7f58677fe6c0 Level-0 table #57: started -2023/08/08-18:04:59.539308 7f58677fe6c0 Level-0 table #57: 0 bytes OK -2023/08/08-18:04:59.546617 7f58677fe6c0 Delete type=0 #55 -2023/08/08-18:04:59.560019 7f58677fe6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) +2023/08/16-21:16:40.386863 7fa0dd7fa6c0 Recovering log #56 +2023/08/16-21:16:40.401655 7fa0dd7fa6c0 Delete type=0 #56 +2023/08/16-21:16:40.401757 7fa0dd7fa6c0 Delete type=3 #54 diff --git a/packs/specialisation/LOG.old b/packs/specialisation/LOG.old index 19afaba..af5548c 100644 --- a/packs/specialisation/LOG.old +++ b/packs/specialisation/LOG.old @@ -1,7 +1,7 @@ -2023/08/08-17:50:40.597326 7f5afcdf86c0 Recovering log #48 -2023/08/08-17:50:40.655429 7f5afcdf86c0 Delete type=3 #46 -2023/08/08-17:50:40.655471 7f5afcdf86c0 Delete type=0 #48 -2023/08/08-18:04:06.323953 7f58677fe6c0 Level-0 table #53: started -2023/08/08-18:04:06.324001 7f58677fe6c0 Level-0 table #53: 0 bytes OK -2023/08/08-18:04:06.330360 7f58677fe6c0 Delete type=0 #51 -2023/08/08-18:04:06.340887 7f58677fe6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) +2023/08/08-18:04:51.701446 7f5afddfa6c0 Recovering log #52 +2023/08/08-18:04:51.711597 7f5afddfa6c0 Delete type=3 #50 +2023/08/08-18:04:51.711643 7f5afddfa6c0 Delete type=0 #52 +2023/08/08-18:04:59.539283 7f58677fe6c0 Level-0 table #57: started +2023/08/08-18:04:59.539308 7f58677fe6c0 Level-0 table #57: 0 bytes OK +2023/08/08-18:04:59.546617 7f58677fe6c0 Delete type=0 #55 +2023/08/08-18:04:59.560019 7f58677fe6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) diff --git a/packs/specialisation/MANIFEST-000054 b/packs/specialisation/MANIFEST-000054 deleted file mode 100644 index 141b05f..0000000 Binary files a/packs/specialisation/MANIFEST-000054 and /dev/null differ diff --git a/packs/traits/000056.log b/packs/traits/000056.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/traits/CURRENT b/packs/traits/CURRENT index 17608f2..717cf9a 100644 --- a/packs/traits/CURRENT +++ b/packs/traits/CURRENT @@ -1 +1 @@ -MANIFEST-000054 +MANIFEST-000058 diff --git a/packs/traits/LOG b/packs/traits/LOG index 52a7c68..23ed533 100644 --- a/packs/traits/LOG +++ b/packs/traits/LOG @@ -1,7 +1,3 @@ -2023/08/08-18:04:51.714581 7f5afd5f96c0 Recovering log #52 -2023/08/08-18:04:51.723695 7f5afd5f96c0 Delete type=3 #50 -2023/08/08-18:04:51.723729 7f5afd5f96c0 Delete type=0 #52 -2023/08/08-18:04:59.552915 7f58677fe6c0 Level-0 table #57: started -2023/08/08-18:04:59.552934 7f58677fe6c0 Level-0 table #57: 0 bytes OK -2023/08/08-18:04:59.559910 7f58677fe6c0 Delete type=0 #55 -2023/08/08-18:04:59.560044 7f58677fe6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) +2023/08/16-21:16:40.403458 7fa0de7fc6c0 Recovering log #56 +2023/08/16-21:16:40.421198 7fa0de7fc6c0 Delete type=0 #56 +2023/08/16-21:16:40.421254 7fa0de7fc6c0 Delete type=3 #54 diff --git a/packs/traits/LOG.old b/packs/traits/LOG.old index df95f7b..52a7c68 100644 --- a/packs/traits/LOG.old +++ b/packs/traits/LOG.old @@ -1,7 +1,7 @@ -2023/08/08-17:50:40.658993 7f5afcdf86c0 Recovering log #48 -2023/08/08-17:50:40.748499 7f5afcdf86c0 Delete type=3 #46 -2023/08/08-17:50:40.748566 7f5afcdf86c0 Delete type=0 #48 -2023/08/08-18:04:06.347462 7f58677fe6c0 Level-0 table #53: started -2023/08/08-18:04:06.347507 7f58677fe6c0 Level-0 table #53: 0 bytes OK -2023/08/08-18:04:06.354352 7f58677fe6c0 Delete type=0 #51 -2023/08/08-18:04:06.361324 7f58677fe6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) +2023/08/08-18:04:51.714581 7f5afd5f96c0 Recovering log #52 +2023/08/08-18:04:51.723695 7f5afd5f96c0 Delete type=3 #50 +2023/08/08-18:04:51.723729 7f5afd5f96c0 Delete type=0 #52 +2023/08/08-18:04:59.552915 7f58677fe6c0 Level-0 table #57: started +2023/08/08-18:04:59.552934 7f58677fe6c0 Level-0 table #57: 0 bytes OK +2023/08/08-18:04:59.559910 7f58677fe6c0 Delete type=0 #55 +2023/08/08-18:04:59.560044 7f58677fe6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) diff --git a/packs/traits/MANIFEST-000054 b/packs/traits/MANIFEST-000054 deleted file mode 100644 index f2e262d..0000000 Binary files a/packs/traits/MANIFEST-000054 and /dev/null differ 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",