From d66905940392e2b1bf11d7c4fa1bcc30d47c1ca1 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Thu, 17 Aug 2023 08:31:22 +0200 Subject: [PATCH] Corrections diverses --- lang/en.json | 3 ++- lang/fr.json | 11 ++++++----- modules/actors/ecryme-actor.js | 4 +++- packs/equipment/{000059.log => 000068.log} | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 10 +++++++--- packs/equipment/LOG.old | 14 +++++++------- .../{MANIFEST-000058 => MANIFEST-000066} | Bin 157 -> 173 bytes packs/{maneuvers/000059.log => help/000004.log} | 0 packs/help/000005.ldb | Bin 0 -> 2278 bytes packs/help/CURRENT | 1 + packs/{specialisation/000059.log => help/LOCK} | 0 packs/help/LOG | 5 +++++ packs/help/MANIFEST-000002 | Bin 0 -> 161 bytes .../{traits/000059.log => maneuvers/000068.log} | 0 packs/maneuvers/CURRENT | 2 +- packs/maneuvers/LOG | 10 +++++++--- packs/maneuvers/LOG.old | 14 +++++++------- .../{MANIFEST-000058 => MANIFEST-000066} | Bin 153 -> 168 bytes packs/specialisation/000068.log | 0 packs/specialisation/CURRENT | 2 +- packs/specialisation/LOG | 10 +++++++--- packs/specialisation/LOG.old | 14 +++++++------- .../{MANIFEST-000058 => MANIFEST-000066} | Bin 155 -> 170 bytes packs/traits/000068.log | 0 packs/traits/CURRENT | 2 +- packs/traits/LOG | 10 +++++++--- packs/traits/LOG.old | 14 +++++++------- .../traits/{MANIFEST-000058 => MANIFEST-000066} | Bin 155 -> 170 bytes system.json | 12 ++++++++++++ 30 files changed, 89 insertions(+), 51 deletions(-) rename packs/equipment/{000059.log => 000068.log} (100%) rename packs/equipment/{MANIFEST-000058 => MANIFEST-000066} (73%) rename packs/{maneuvers/000059.log => help/000004.log} (100%) create mode 100644 packs/help/000005.ldb create mode 100644 packs/help/CURRENT rename packs/{specialisation/000059.log => help/LOCK} (100%) create mode 100644 packs/help/LOG create mode 100644 packs/help/MANIFEST-000002 rename packs/{traits/000059.log => maneuvers/000068.log} (100%) rename packs/maneuvers/{MANIFEST-000058 => MANIFEST-000066} (76%) create mode 100644 packs/specialisation/000068.log rename packs/specialisation/{MANIFEST-000058 => MANIFEST-000066} (75%) create mode 100644 packs/traits/000068.log rename packs/traits/{MANIFEST-000058 => MANIFEST-000066} (75%) 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 90d6a29bd2bf05edcc738dac1defaa45fa13261d..a2416969ca5e04e6b241a0be136dfa26297af0d1 100644 GIT binary patch delta 39 qcmbQsxR!B3uflALAO%haMkZ%Y24)wQb&S(Dd0YnZU4VQyARhq5&IsB7 delta 23 fcmZ3>IG1rkufTVqwW~Q97@4d&8JKNY)-eJAS^)+f 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 0000000000000000000000000000000000000000..5a54d3de7c6a251468c528445b8678609c8e5d3a GIT binary patch literal 2278 zcmaJ?du$v>8K1HDdXL!V5;=(z95lDJvEAOCZ|~*1>-E|@zn!xkCrCm!LmhMEa#g{31jXddj5hC#Pn%=Hu(wQTG$X)3B1eIObi z9-YkTkD0~ASkFLwW`O^Um(Od8L=8TnT8iT3wI!7rtSIYzVvUz*UbGaGPXxStVPZZO zUlNP`3yVXO=1_)DgetIE5er~{jn8QYc(zsn*=Lz4ns1UvT6Eg&RBr} zyu5SY&@nJ0YbvM&!5{Doao%ei3br6eDA0rVwi;A4sWd5j&>$(B z$$2?=0L3DqSU46A#=X2EGIO-i)0|m>^9rfUh}8U$Ylc%xI0+V+X4K-SI0Aoc^0zCQ zmoW0DRxyWh`#BD+HKsTrfHCq4Kh5@PYTnRP2m<_Lu-9DCJy+Z&T{iihCsUIMcRVed zN-bQT6}2TkVHy?%Cuo@}d_n-za!D*;!d1M^gI-vb*Nl<~<^|7GOf{(rQ$DGulHGa= z+uN84)(R;h+1=>UiH~F{0U%JzAOh*sEHXOMMObxRp*j5e<0>VJNOD?9udc&MIZ9xK z(jgipN_2pa^HT@5K1Vv`oCYiB_C{z_}N$QU(Qcl))z?%~W#UvxMk#Ir*IX(3ng+4dq|>UoTO z?b@`j93F|6kM&Kadjrx`Z(8;1YGIDY*P1mYl~iPZ0i#gruc$@UEJ(C+;JVH_#C%@P z6)6$RGzShc0)8<+84zU?Hx5~(0Iq}YJ`n4Qn4?D5a)Yihx$6uvcK5i6B&y8Tgjm;G zZpcxM-G%iDC*CkaJEB~%0MGghSC}7 zX9$#uRM!il(yp~X>jr>`y64?i3OK61LLxr3aRT)OCyAK*zBJpo>F%q$#crpEo?N4cZ;<%r3l^FgP^2!gTKRMBJ;w6Wu>%N_y z#umAxi#d~dLiiKzc}=yL@8q_hoAq-^WoB}!zjU}i6c`*klpR~#cMEktd4EGUAmZY4 z?lQDN?aa?w0qZ~^g`NMfp{yy^79s(E1Xu`Q{M#GX$2mT6=3`D<8oOw3@CjZ%bNe0# zG_PClY}uho{dm^N2k8jW8L|ELAdAj!jMy zkEj2Me|)FLZ&fZ+(MsPY3)BMAS*GvCzBbViOHeZaoO3e0;f8lXY1->*Ad*Eq8!gpW zf#M0WeYI}%YU*Bm!<8H?k4~vmM}~q+G;;%WG+VCJPj+y)F1lHVf=!29Gru9dK#!uR$TWR!xYl&ex$=x-Ra3YAf;tkW zvw?I9T^B6}w4vaVvyF5HySzlVWOm$5L zMmj@XU7meE44N*K-Swg)IB1Wbc2H*Sk2v-mcX__O|6$i2-Ere6r-=Av!sK~qZ)SD< z`V3NbopscVo_c=Iw1bo6reC^RfeY1jFJVp3xmqA{Rjhum>DN0vf}<=dw#!_u*!0^S z9A!9-$Mzp@;5voI&Fzoy$VWJt9nXgjmm*nX@!*1xo*q7R{=tV5Pr1%K;(N%Qm*F>` zez}&XktFVV0GYlAwkx&^mD#uJl6?!=X_fWPADWmcuVgblyMFV#(p`uW6p4)OJQSuv^Mzw@J#=KUE9 zzGXF|Xj*CDjw<+`dsl5&?JQ(#cxM1P>v{a2y8~^w|EF6&+nfEfJ8*jE-kRwDkEwru L;bfaN`1}6?1A*7$ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b334a4f1b80c2a638114cf1e17cfa824f1952ea0 GIT binary patch literal 161 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAe$kRS-TOEg7@3$k8JJmE z7=ESORA&IWEI=+B3ky3F>oY+`#jO0&qP)Z$ML**Re}A)-AfHn2^1!qLBSsbmFtC8B i&?`txPc6n!r&p1YY@Sh=?_-gj5^k1Llr9fO4AlHqh5CF$p2)Y0O delta 22 dcmZ3*IGb@o5C3=7Z8;naj7-*?49qqxg#b~U1+)MF 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 616ac3b20f72b33f964c56a1fed320e2e999ceee..774eb03552b57b4d687cd7af4b46e41de8baeeab 100644 GIT binary patch delta 37 pcmbQuxQcN?kDPJWDJc#HMkZ%Y24)u)FE!Om@gS}Xkn6_c1putS2YLVi delta 22 dcmZ3*IGb@o5C5W&l^Z!27@4d&8JKNYyZ}+31)l%_ 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",