diff --git a/lang/en.json b/lang/en.json index 3b0c8eb..40bb738 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1,7 +1,8 @@ { "TYPES": { "Actor": { - "Personnage": "PC" + "character": "PC", + "annency": "Annency" }, "Item": { "trait": "Trait", @@ -156,7 +157,8 @@ "oniricform": "Oniric shape (Boheme)", "ideals": "Ideals", "politic": "Political ideal", - "boheme": "Boheme" + "boheme": "Boheme", + "annencybonus": "Annency bonus" } } } \ No newline at end of file diff --git a/lang/fr.json b/lang/fr.json index 465c1e2..ffe681b 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -1,7 +1,8 @@ { "TYPES": { "Actor":{ - "Personnage": "PJ" + "character": "Personnage", + "annency": "Anence" }, "Item": { "trait": "Trait", @@ -157,7 +158,8 @@ "oniricform": "Forme Onorique (Bohême)", "ideals": "Idéaux", "politic": "Idéaux politiques", - "boheme": "Bohême" + "boheme": "Bohême", + "annencybonus": "Bonus d'Anence" } } } \ No newline at end of file diff --git a/modules/actors/ecryme-actor.js b/modules/actors/ecryme-actor.js index 658e30c..8b16fce 100644 --- a/modules/actors/ecryme-actor.js +++ b/modules/actors/ecryme-actor.js @@ -416,6 +416,7 @@ export class EcrymeActor extends Actor { let rollData = this.getCommonRollData() rollData.mode = "cephaly" rollData.skill = duplicate(this.system.cephaly.skilllist[skillKey]) + rollData.annency = duplicate(this.getAnnency()) rollData.img = rollData.skill.img rollData.skill.categKey = "cephaly" rollData.skill.skillKey = skillKey diff --git a/modules/common/ecryme-utility.js b/modules/common/ecryme-utility.js index 34b9b2e..6554d64 100644 --- a/modules/common/ecryme-utility.js +++ b/modules/common/ecryme-utility.js @@ -221,7 +221,7 @@ export class EcrymeUtility { let msg = await this.createChatWithRollMode(this.confrontData1.alias, { content: await renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-confrontation-result.hbs`, confront) }) - msg.setFlag("world", "ecryme-rolldata", confront) + await msg.setFlag("world", "ecryme-rolldata", confront) console.log("Confront result", confront) this.lastConfront = confront @@ -539,6 +539,9 @@ export class EcrymeUtility { diceFormula += "+" + rollData.bonusMalusTraits diceFormula += "+" + rollData.bonusMalusPerso diceFormula += "+" + rollData.impactMalus + if (rollData.annency) { + diceFormula += "+" + rollData.annencyBonus + } rollData.diceFormula = diceFormula return diceFormula } @@ -567,7 +570,7 @@ export class EcrymeUtility { let msg = await this.createChatWithRollMode(rollData.alias, { content: await renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-generic-result.hbs`, rollData) }) - msg.setFlag("world", "ecryme-rolldata", rollData) + await msg.setFlag("world", "ecryme-rolldata", rollData) console.log("Rolldata result", rollData) } @@ -584,7 +587,7 @@ export class EcrymeUtility { let msg = await this.createChatWithRollMode(rollData.alias, { content: await renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-generic-result.hbs`, rollData) }) - msg.setFlag("world", "ecryme-rolldata", rollData) + await msg.setFlag("world", "ecryme-rolldata", rollData) } /* -------------------------------------------- */ @@ -684,6 +687,7 @@ export class EcrymeUtility { bonusMalusPerso: 0, bonusMalusSituation: 0, bonusMalusDef: 0, + annencyBonus: 0, bonusMalusPortee: 0, skillTranscendence: 0, rollMode: game.settings.get("core", "rollMode"), diff --git a/modules/dialogs/ecryme-confront-dialog.js b/modules/dialogs/ecryme-confront-dialog.js index e1579c9..5d98492 100644 --- a/modules/dialogs/ecryme-confront-dialog.js +++ b/modules/dialogs/ecryme-confront-dialog.js @@ -245,7 +245,9 @@ export class EcrymeConfrontDialog extends Dialog { this.rollData.applyTranscendence = $('#roll-apply-transcendence').val() this.computeTotals() }) - + html.find('#annency-bonus').change((event) => { + this.rollData.annencyBonus = Number(event.currentTarget.value) + }) } } \ No newline at end of file diff --git a/packs/equipment/000048.log b/packs/equipment/000056.log similarity index 100% rename from packs/equipment/000048.log rename to packs/equipment/000056.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index a6d5883..17608f2 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000054 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index 4d95011..f431424 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,7 +1,7 @@ -2023/08/08-14:38:49.036882 7f5afcdf86c0 Recovering log #44 -2023/08/08-14:38:49.124780 7f5afcdf86c0 Delete type=3 #42 -2023/08/08-14:38:49.124893 7f5afcdf86c0 Delete type=0 #44 -2023/08/08-14:54:21.588098 7f58677fe6c0 Level-0 table #49: started -2023/08/08-14:54:21.588122 7f58677fe6c0 Level-0 table #49: 0 bytes OK -2023/08/08-14:54:21.594444 7f58677fe6c0 Delete type=0 #47 -2023/08/08-14:54:21.607310 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/LOG.old b/packs/equipment/LOG.old index e9370e5..5d936e0 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,7 +1,7 @@ -2023/08/08-14:36:00.338439 7f5867fff6c0 Recovering log #40 -2023/08/08-14:36:00.347950 7f5867fff6c0 Delete type=3 #38 -2023/08/08-14:36:00.348021 7f5867fff6c0 Delete type=0 #40 -2023/08/08-14:38:45.882749 7f58677fe6c0 Level-0 table #45: started -2023/08/08-14:38:45.882812 7f58677fe6c0 Level-0 table #45: 0 bytes OK -2023/08/08-14:38:45.920058 7f58677fe6c0 Delete type=0 #43 -2023/08/08-14:38:45.981054 7f58677fe6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) +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) diff --git a/packs/equipment/MANIFEST-000046 b/packs/equipment/MANIFEST-000054 similarity index 73% rename from packs/equipment/MANIFEST-000046 rename to packs/equipment/MANIFEST-000054 index 52d87e3..89cb176 100644 Binary files a/packs/equipment/MANIFEST-000046 and b/packs/equipment/MANIFEST-000054 differ diff --git a/packs/maneuvers/000048.log b/packs/maneuvers/000056.log similarity index 100% rename from packs/maneuvers/000048.log rename to packs/maneuvers/000056.log diff --git a/packs/maneuvers/CURRENT b/packs/maneuvers/CURRENT index a6d5883..17608f2 100644 --- a/packs/maneuvers/CURRENT +++ b/packs/maneuvers/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000054 diff --git a/packs/maneuvers/LOG b/packs/maneuvers/LOG index e840f93..2bc10f9 100644 --- a/packs/maneuvers/LOG +++ b/packs/maneuvers/LOG @@ -1,7 +1,7 @@ -2023/08/08-14:38:49.155473 7f5867fff6c0 Recovering log #44 -2023/08/08-14:38:49.260893 7f5867fff6c0 Delete type=3 #42 -2023/08/08-14:38:49.260950 7f5867fff6c0 Delete type=0 #44 -2023/08/08-14:54:21.600756 7f58677fe6c0 Level-0 table #49: started -2023/08/08-14:54:21.600776 7f58677fe6c0 Level-0 table #49: 0 bytes OK -2023/08/08-14:54:21.607211 7f58677fe6c0 Delete type=0 #47 -2023/08/08-14:54:21.607330 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/LOG.old b/packs/maneuvers/LOG.old index 73f50ce..dfe7c69 100644 --- a/packs/maneuvers/LOG.old +++ b/packs/maneuvers/LOG.old @@ -1,7 +1,7 @@ -2023/08/08-14:36:00.351163 7f5867fff6c0 Recovering log #40 -2023/08/08-14:36:00.363535 7f5867fff6c0 Delete type=3 #38 -2023/08/08-14:36:00.363690 7f5867fff6c0 Delete type=0 #40 -2023/08/08-14:38:46.072007 7f58677fe6c0 Level-0 table #45: started -2023/08/08-14:38:46.072050 7f58677fe6c0 Level-0 table #45: 0 bytes OK -2023/08/08-14:38:46.103317 7f58677fe6c0 Delete type=0 #43 -2023/08/08-14:38:46.137931 7f58677fe6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) +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) diff --git a/packs/maneuvers/MANIFEST-000046 b/packs/maneuvers/MANIFEST-000054 similarity index 76% rename from packs/maneuvers/MANIFEST-000046 rename to packs/maneuvers/MANIFEST-000054 index 6893ee9..283cdab 100644 Binary files a/packs/maneuvers/MANIFEST-000046 and b/packs/maneuvers/MANIFEST-000054 differ diff --git a/packs/specialisation/000048.log b/packs/specialisation/000056.log similarity index 100% rename from packs/specialisation/000048.log rename to packs/specialisation/000056.log diff --git a/packs/specialisation/CURRENT b/packs/specialisation/CURRENT index a6d5883..17608f2 100644 --- a/packs/specialisation/CURRENT +++ b/packs/specialisation/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000054 diff --git a/packs/specialisation/LOG b/packs/specialisation/LOG index f9a205e..af5548c 100644 --- a/packs/specialisation/LOG +++ b/packs/specialisation/LOG @@ -1,7 +1,7 @@ -2023/08/08-14:38:49.036954 7f5867fff6c0 Recovering log #44 -2023/08/08-14:38:49.153034 7f5867fff6c0 Delete type=3 #42 -2023/08/08-14:38:49.153108 7f5867fff6c0 Delete type=0 #44 -2023/08/08-14:54:21.558302 7f58677fe6c0 Level-0 table #49: started -2023/08/08-14:54:21.558341 7f58677fe6c0 Level-0 table #49: 0 bytes OK -2023/08/08-14:54:21.572779 7f58677fe6c0 Delete type=0 #47 -2023/08/08-14:54:21.573011 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/LOG.old b/packs/specialisation/LOG.old index 702f257..19afaba 100644 --- a/packs/specialisation/LOG.old +++ b/packs/specialisation/LOG.old @@ -1,7 +1,7 @@ -2023/08/08-14:36:00.338438 7f5afd5f96c0 Recovering log #40 -2023/08/08-14:36:00.347864 7f5afd5f96c0 Delete type=3 #38 -2023/08/08-14:36:00.347905 7f5afd5f96c0 Delete type=0 #40 -2023/08/08-14:38:46.031269 7f58677fe6c0 Level-0 table #45: started -2023/08/08-14:38:46.031315 7f58677fe6c0 Level-0 table #45: 0 bytes OK -2023/08/08-14:38:46.071808 7f58677fe6c0 Delete type=0 #43 -2023/08/08-14:38:46.137889 7f58677fe6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) +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) diff --git a/packs/specialisation/MANIFEST-000046 b/packs/specialisation/MANIFEST-000054 similarity index 75% rename from packs/specialisation/MANIFEST-000046 rename to packs/specialisation/MANIFEST-000054 index 7120b94..141b05f 100644 Binary files a/packs/specialisation/MANIFEST-000046 and b/packs/specialisation/MANIFEST-000054 differ diff --git a/packs/traits/000048.log b/packs/traits/000056.log similarity index 100% rename from packs/traits/000048.log rename to packs/traits/000056.log diff --git a/packs/traits/CURRENT b/packs/traits/CURRENT index a6d5883..17608f2 100644 --- a/packs/traits/CURRENT +++ b/packs/traits/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000054 diff --git a/packs/traits/LOG b/packs/traits/LOG index a2051b0..52a7c68 100644 --- a/packs/traits/LOG +++ b/packs/traits/LOG @@ -1,7 +1,7 @@ -2023/08/08-14:38:49.127661 7f5afcdf86c0 Recovering log #44 -2023/08/08-14:38:49.237408 7f5afcdf86c0 Delete type=3 #42 -2023/08/08-14:38:49.237452 7f5afcdf86c0 Delete type=0 #44 -2023/08/08-14:54:21.594546 7f58677fe6c0 Level-0 table #49: started -2023/08/08-14:54:21.594573 7f58677fe6c0 Level-0 table #49: 0 bytes OK -2023/08/08-14:54:21.600659 7f58677fe6c0 Delete type=0 #47 -2023/08/08-14:54:21.607322 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/LOG.old b/packs/traits/LOG.old index 2d8b795..df95f7b 100644 --- a/packs/traits/LOG.old +++ b/packs/traits/LOG.old @@ -1,7 +1,7 @@ -2023/08/08-14:36:00.351163 7f5afd5f96c0 Recovering log #40 -2023/08/08-14:36:00.360537 7f5afd5f96c0 Delete type=3 #38 -2023/08/08-14:36:00.360576 7f5afd5f96c0 Delete type=0 #40 -2023/08/08-14:38:46.103419 7f58677fe6c0 Level-0 table #45: started -2023/08/08-14:38:46.103439 7f58677fe6c0 Level-0 table #45: 0 bytes OK -2023/08/08-14:38:46.137624 7f58677fe6c0 Delete type=0 #43 -2023/08/08-14:38:46.137971 7f58677fe6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) +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) diff --git a/packs/traits/MANIFEST-000046 b/packs/traits/MANIFEST-000054 similarity index 75% rename from packs/traits/MANIFEST-000046 rename to packs/traits/MANIFEST-000054 index d9f3b55..f2e262d 100644 Binary files a/packs/traits/MANIFEST-000046 and b/packs/traits/MANIFEST-000054 differ diff --git a/templates/chat/chat-cephaly-result.hbs b/templates/chat/chat-cephaly-result.hbs index e4e611d..3d9d9f6 100644 --- a/templates/chat/chat-cephaly-result.hbs +++ b/templates/chat/chat-cephaly-result.hbs @@ -16,14 +16,21 @@