diff --git a/lang/en.json b/lang/en.json index 2f5ef54..4016283 100644 --- a/lang/en.json +++ b/lang/en.json @@ -18,7 +18,8 @@ "cogs": "Cogs", "cephaly": "Cephaly", "boheme": "Boheme", - "amertume": "Amertume" + "amertume": "Amertume", + "gamelevel": "Game level" }, "chat": { "formula": "Formula", diff --git a/lang/fr.json b/lang/fr.json index 3951f36..808111d 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -18,7 +18,8 @@ "cogs": "Engrenages", "cephaly": "Céphalie", "boheme": "Bohême", - "amertume": "Amertume" + "amertume": "Amertume", + "gamelevel": "Niveau de jeu" }, "chat": { "formula": "Formule", @@ -36,10 +37,10 @@ }, "rule": { "cephaly-success-12": "Durée : 1 scène - Impact : Superficiel - Bonus : 1 - Elegie : 1", - "cephaly-success-34": "Durée : 1 semaine - Impact : Léger - Bonus : 2 - Elegie : 2", - "cephaly-success-56": "Durée : 1 mois - Impact : Grave - Bonus : 3 - Elegie : 3", - "cephaly-success-78": "Durée : 1 année - Impact : Majeur - Bonus : 4 - Elegie : 4", - "cephaly-success-910": "Durée : Permanent - Impact : Mort - Bonus : 5 - Elegie : 5", + "cephaly-success-4": "Durée : 1 semaine - Impact : Léger - Bonus : 2 - Elegie : 2", + "cephaly-success-6": "Durée : 1 mois - Impact : Grave - Bonus : 3 - Elegie : 3", + "cephaly-success-8": "Durée : 1 année - Impact : Majeur - Bonus : 4 - Elegie : 4", + "cephaly-success-10": "Durée : Permanent - Impact : Mort - Bonus : 5 - Elegie : 5", "cephaly-failure-2": "Durée : 1 scène - Impact : Superficiel - Malus : 1 - Symptôme non visible et sans gravité - Altération bégigne difficilement repérable", "cephaly-failure-4": "Durée : 1 semaine - Impact : Léger - Malus : 2 - Symptôme visible non incapacitant - Altération repérable", "cephaly-failure-6": "Durée : 1 mois - Impact : Grave - Malus : 3 - Symptôme incapacitant - Altération repérable et fâcheuse", diff --git a/modules/actors/ecryme-actor.js b/modules/actors/ecryme-actor.js index 83d12c2..d7adc5e 100644 --- a/modules/actors/ecryme-actor.js +++ b/modules/actors/ecryme-actor.js @@ -348,7 +348,7 @@ export class EcrymeActor extends Actor { /* -------------------------------------------- */ modifyConfrontBonus( modifier ) { - let newBonus = this.system.internals.confrontbonus + bonus + let newBonus = this.system.internals.confrontbonus + modifier this.update({'system.internals.confrontbonus': newBonus}) } @@ -457,6 +457,8 @@ export class EcrymeActor extends Actor { rollData.title = game.i18n.localize("ECRY.ui.confrontation") + " : " + game.i18n.localize(rollData.skill.name) rollData.executionTotal = rollData.skill.value rollData.preservationTotal = rollData.skill.value + rollData.traitsBonus = duplicate(rollData.traits) + rollData.traitsMalus = duplicate(rollData.traits) rollData.applyTranscendence = "execution" let confrontStartDialog = await EcrymeConfrontStartDialog.create(this, rollData) confrontStartDialog.render(true) diff --git a/packs/equipment/000059.log b/packs/equipment/000068.log similarity index 100% rename from packs/equipment/000059.log rename to packs/equipment/000068.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index 717cf9a..7873dc6 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000058 +MANIFEST-000066 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index e81e096..58de86d 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,3 +1,7 @@ -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 +2023/08/17-08:30:06.224452 7fa0dcff96c0 Recovering log #64 +2023/08/17-08:30:06.244297 7fa0dcff96c0 Delete type=3 #62 +2023/08/17-08:30:06.244357 7fa0dcff96c0 Delete type=0 #64 +2023/08/17-08:31:03.278842 7f9e3ffff6c0 Level-0 table #69: started +2023/08/17-08:31:03.278870 7f9e3ffff6c0 Level-0 table #69: 0 bytes OK +2023/08/17-08:31:03.285336 7f9e3ffff6c0 Delete type=0 #67 +2023/08/17-08:31:03.285445 7f9e3ffff6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/LOG.old b/packs/equipment/LOG.old index f431424..14cb642 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,7 +1,7 @@ -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/17-08:11:25.804724 7fa0ddffb6c0 Recovering log #60 +2023/08/17-08:11:25.814678 7fa0ddffb6c0 Delete type=3 #58 +2023/08/17-08:11:25.814742 7fa0ddffb6c0 Delete type=0 #60 +2023/08/17-08:27:23.377433 7f9e3ffff6c0 Level-0 table #65: started +2023/08/17-08:27:23.377511 7f9e3ffff6c0 Level-0 table #65: 0 bytes OK +2023/08/17-08:27:23.561640 7f9e3ffff6c0 Delete type=0 #63 +2023/08/17-08:27:23.806374 7f9e3ffff6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/MANIFEST-000058 b/packs/equipment/MANIFEST-000066 similarity index 73% rename from packs/equipment/MANIFEST-000058 rename to packs/equipment/MANIFEST-000066 index 90d6a29..a241696 100644 Binary files a/packs/equipment/MANIFEST-000058 and b/packs/equipment/MANIFEST-000066 differ diff --git a/packs/maneuvers/000059.log b/packs/help/000004.log similarity index 100% rename from packs/maneuvers/000059.log rename to packs/help/000004.log diff --git a/packs/help/000005.ldb b/packs/help/000005.ldb new file mode 100644 index 0000000..5a54d3d Binary files /dev/null and b/packs/help/000005.ldb differ diff --git a/packs/help/CURRENT b/packs/help/CURRENT new file mode 100644 index 0000000..1a84852 --- /dev/null +++ b/packs/help/CURRENT @@ -0,0 +1 @@ +MANIFEST-000002 diff --git a/packs/specialisation/000059.log b/packs/help/LOCK similarity index 100% rename from packs/specialisation/000059.log rename to packs/help/LOCK diff --git a/packs/help/LOG b/packs/help/LOG new file mode 100644 index 0000000..3191035 --- /dev/null +++ b/packs/help/LOG @@ -0,0 +1,5 @@ +2023/08/17-08:30:06.273842 7fa0dd7fa6c0 Delete type=3 #1 +2023/08/17-08:31:03.298799 7f9e3ffff6c0 Level-0 table #5: started +2023/08/17-08:31:03.302135 7f9e3ffff6c0 Level-0 table #5: 2278 bytes OK +2023/08/17-08:31:03.309094 7f9e3ffff6c0 Delete type=0 #3 +2023/08/17-08:31:03.309619 7f9e3ffff6c0 Manual compaction at level-0 from '!journal!N3XOO6dRLuKwQfp2' @ 72057594037927935 : 1 .. '!journal.pages!N3XOO6dRLuKwQfp2.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) diff --git a/packs/help/MANIFEST-000002 b/packs/help/MANIFEST-000002 new file mode 100644 index 0000000..b334a4f Binary files /dev/null and b/packs/help/MANIFEST-000002 differ diff --git a/packs/traits/000059.log b/packs/maneuvers/000068.log similarity index 100% rename from packs/traits/000059.log rename to packs/maneuvers/000068.log diff --git a/packs/maneuvers/CURRENT b/packs/maneuvers/CURRENT index 717cf9a..7873dc6 100644 --- a/packs/maneuvers/CURRENT +++ b/packs/maneuvers/CURRENT @@ -1 +1 @@ -MANIFEST-000058 +MANIFEST-000066 diff --git a/packs/maneuvers/LOG b/packs/maneuvers/LOG index 900fd0a..2ac7f72 100644 --- a/packs/maneuvers/LOG +++ b/packs/maneuvers/LOG @@ -1,3 +1,7 @@ -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 +2023/08/17-08:30:06.246354 7fa0de7fc6c0 Recovering log #64 +2023/08/17-08:30:06.257748 7fa0de7fc6c0 Delete type=3 #62 +2023/08/17-08:30:06.257814 7fa0de7fc6c0 Delete type=0 #64 +2023/08/17-08:31:03.285529 7f9e3ffff6c0 Level-0 table #69: started +2023/08/17-08:31:03.285609 7f9e3ffff6c0 Level-0 table #69: 0 bytes OK +2023/08/17-08:31:03.291891 7f9e3ffff6c0 Delete type=0 #67 +2023/08/17-08:31:03.309552 7f9e3ffff6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/LOG.old b/packs/maneuvers/LOG.old index 2bc10f9..cf939e6 100644 --- a/packs/maneuvers/LOG.old +++ b/packs/maneuvers/LOG.old @@ -1,7 +1,7 @@ -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/17-08:11:25.818427 7fa0de7fc6c0 Recovering log #60 +2023/08/17-08:11:25.837207 7fa0de7fc6c0 Delete type=3 #58 +2023/08/17-08:11:25.837263 7fa0de7fc6c0 Delete type=0 #60 +2023/08/17-08:27:24.349456 7f9e3ffff6c0 Level-0 table #65: started +2023/08/17-08:27:24.349508 7f9e3ffff6c0 Level-0 table #65: 0 bytes OK +2023/08/17-08:27:24.639947 7f9e3ffff6c0 Delete type=0 #63 +2023/08/17-08:27:24.640153 7f9e3ffff6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/MANIFEST-000058 b/packs/maneuvers/MANIFEST-000066 similarity index 76% rename from packs/maneuvers/MANIFEST-000058 rename to packs/maneuvers/MANIFEST-000066 index 6b85264..8850d6b 100644 Binary files a/packs/maneuvers/MANIFEST-000058 and b/packs/maneuvers/MANIFEST-000066 differ diff --git a/packs/specialisation/000068.log b/packs/specialisation/000068.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/specialisation/CURRENT b/packs/specialisation/CURRENT index 717cf9a..7873dc6 100644 --- a/packs/specialisation/CURRENT +++ b/packs/specialisation/CURRENT @@ -1 +1 @@ -MANIFEST-000058 +MANIFEST-000066 diff --git a/packs/specialisation/LOG b/packs/specialisation/LOG index 585fdb7..366384b 100644 --- a/packs/specialisation/LOG +++ b/packs/specialisation/LOG @@ -1,3 +1,7 @@ -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 +2023/08/17-08:30:06.224380 7fa0dd7fa6c0 Recovering log #64 +2023/08/17-08:30:06.241271 7fa0dd7fa6c0 Delete type=3 #62 +2023/08/17-08:30:06.241353 7fa0dd7fa6c0 Delete type=0 #64 +2023/08/17-08:31:03.262782 7f9e3ffff6c0 Level-0 table #69: started +2023/08/17-08:31:03.262832 7f9e3ffff6c0 Level-0 table #69: 0 bytes OK +2023/08/17-08:31:03.268889 7f9e3ffff6c0 Delete type=0 #67 +2023/08/17-08:31:03.285415 7f9e3ffff6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) diff --git a/packs/specialisation/LOG.old b/packs/specialisation/LOG.old index af5548c..7228720 100644 --- a/packs/specialisation/LOG.old +++ b/packs/specialisation/LOG.old @@ -1,7 +1,7 @@ -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/17-08:11:25.804724 7fa0de7fc6c0 Recovering log #60 +2023/08/17-08:11:25.814678 7fa0de7fc6c0 Delete type=3 #58 +2023/08/17-08:11:25.814740 7fa0de7fc6c0 Delete type=0 #60 +2023/08/17-08:27:23.561781 7f9e3ffff6c0 Level-0 table #65: started +2023/08/17-08:27:23.561812 7f9e3ffff6c0 Level-0 table #65: 0 bytes OK +2023/08/17-08:27:23.806078 7f9e3ffff6c0 Delete type=0 #63 +2023/08/17-08:27:23.998146 7f9e3ffff6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) diff --git a/packs/specialisation/MANIFEST-000058 b/packs/specialisation/MANIFEST-000066 similarity index 75% rename from packs/specialisation/MANIFEST-000058 rename to packs/specialisation/MANIFEST-000066 index a2f2a7d..363cbdf 100644 Binary files a/packs/specialisation/MANIFEST-000058 and b/packs/specialisation/MANIFEST-000066 differ diff --git a/packs/traits/000068.log b/packs/traits/000068.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/traits/CURRENT b/packs/traits/CURRENT index 717cf9a..7873dc6 100644 --- a/packs/traits/CURRENT +++ b/packs/traits/CURRENT @@ -1 +1 @@ -MANIFEST-000058 +MANIFEST-000066 diff --git a/packs/traits/LOG b/packs/traits/LOG index 23ed533..ca5ca29 100644 --- a/packs/traits/LOG +++ b/packs/traits/LOG @@ -1,3 +1,7 @@ -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 +2023/08/17-08:30:06.243329 7fa0ddffb6c0 Recovering log #64 +2023/08/17-08:30:06.257748 7fa0ddffb6c0 Delete type=3 #62 +2023/08/17-08:30:06.257816 7fa0ddffb6c0 Delete type=0 #64 +2023/08/17-08:31:03.292149 7f9e3ffff6c0 Level-0 table #69: started +2023/08/17-08:31:03.292214 7f9e3ffff6c0 Level-0 table #69: 0 bytes OK +2023/08/17-08:31:03.298635 7f9e3ffff6c0 Delete type=0 #67 +2023/08/17-08:31:03.309589 7f9e3ffff6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) diff --git a/packs/traits/LOG.old b/packs/traits/LOG.old index 52a7c68..8fe679e 100644 --- a/packs/traits/LOG.old +++ b/packs/traits/LOG.old @@ -1,7 +1,7 @@ -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/17-08:11:25.818235 7fa0dd7fa6c0 Recovering log #60 +2023/08/17-08:11:25.834285 7fa0dd7fa6c0 Delete type=3 #58 +2023/08/17-08:11:25.834340 7fa0dd7fa6c0 Delete type=0 #60 +2023/08/17-08:27:23.998178 7f9e3ffff6c0 Level-0 table #65: started +2023/08/17-08:27:23.998242 7f9e3ffff6c0 Level-0 table #65: 0 bytes OK +2023/08/17-08:27:24.319466 7f9e3ffff6c0 Delete type=0 #63 +2023/08/17-08:27:24.640134 7f9e3ffff6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) diff --git a/packs/traits/MANIFEST-000058 b/packs/traits/MANIFEST-000066 similarity index 75% rename from packs/traits/MANIFEST-000058 rename to packs/traits/MANIFEST-000066 index 616ac3b..774eb03 100644 Binary files a/packs/traits/MANIFEST-000058 and b/packs/traits/MANIFEST-000066 differ diff --git a/system.json b/system.json index 7d2661a..fd9cd07 100644 --- a/system.json +++ b/system.json @@ -73,6 +73,18 @@ "PLAYER": "OBSERVER", "ASSISTANT": "OWNER" } + }, + { + "label": "Help/Aides", + "type": "JournalEntry", + "name": "help", + "path": "packs/help", + "system": "fvtt-ecryme", + "flags": {}, + "ownership": { + "PLAYER": "OBSERVER", + "ASSISTANT": "OWNER" + } } ], "license": "LICENSE.txt",