From 3e189cbe5f03690cafc38bf03b247c8cfad23db4 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Tue, 14 Mar 2023 02:38:21 +0100 Subject: [PATCH] Ajout des blessures sur encaissement --- icons/sante/blessure-mort.webp | Bin 0 -> 5190 bytes icons/sante/eraflure.webp | Bin 0 -> 4936 bytes icons/sante/mort.webp | Bin 0 -> 7766 bytes module/actor-sheet.js | 31 +- module/actor.js | 370 +++++++--------------- module/item/blessure.js | 143 +++++++-- module/rdd-bonus.js | 11 +- module/rdd-combat.js | 9 +- module/rdd-roll-encaisser.js | 5 +- module/rdd-token-hud.js | 5 +- module/rdd-utility.js | 55 ++-- styles/simple.css | 4 +- template.json | 6 +- templates/actor/blessure.hbs | 11 +- templates/actor/blessure.html | 27 -- templates/actor/blessures.html | 1 + templates/actor/header-effects.html | 4 +- templates/actor/header-etat.html | 6 +- templates/chat-resultat-encaissement.html | 18 +- templates/item-blessure-sheet.html | 15 +- 20 files changed, 304 insertions(+), 417 deletions(-) create mode 100644 icons/sante/blessure-mort.webp create mode 100644 icons/sante/eraflure.webp create mode 100644 icons/sante/mort.webp delete mode 100644 templates/actor/blessure.html diff --git a/icons/sante/blessure-mort.webp b/icons/sante/blessure-mort.webp new file mode 100644 index 0000000000000000000000000000000000000000..21294caf2e1bb163e4330e1e5549dc86a834a29f GIT binary patch literal 5190 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 literal 0 HcmV?d00001 diff --git a/icons/sante/eraflure.webp b/icons/sante/eraflure.webp new file mode 100644 index 0000000000000000000000000000000000000000..fc3b4a10258478daa9fd868853a854381039ae7c GIT binary patch literal 4936 zcmZ{kXIN9q7KS&WcQEu`6{NS&i-Z=MbP$ymN`L^NOEXc3NKsG_=|!pp=?ExDF9Onp zgGd*oDIi5aT5dS!$GJc5oxNwxJKtJs_RN~+*%mN8JuNT**y?JV*_bKWQ2_uTP3U-{ z%NGWPnpuGeQvhUzg!=@N5L`aKK>-%}+I)7m?D@#o0Ahd^UN5I& zx5K{xqD#+biOaSAcg+7)sa@Ry;Q&BHL5R?RqXL2mY(QY+&>++$rxKV6j&OD*a2bKc z0|*-=@WiF=@(-_Hvd2GscF6%&7Er?37zoVg@n7unUkpbC_z+?)iz4KM3?}U1?{;|- z8aH2SOTs8X=v+V`U;*d@+5jH_19Sl>00CqGWrBqO5`ZiqNtgluC;xJ7F2EG0e~mq0U&@NK%Afk6IOR4jP3;8jqo6Wu*>=r@(AtUx(2$-$^I=7(P#qz={z34 zFAM3&G*X(0HxmqJ^5cvC=USWV*uc7*T0&}O8{t$ z1pu~blyiXd-`^o7SdhCr0PK|l0PQUR0FMFy)$M<3M(|zwfx;;Ou!@>7ZH9-6H^Z#}1vLtCk@pvP(#ABn6iJr+n<{g%;_DXTP6Q52++ zMcr-8LFGa@$k1afpZ%;>M-*(tIAosepTU*Rev?wh{N*57r8329qQyJ)6IXe~CRdib z?d9*PEe9^%s6%a=(MfglC!n4wqVkq}7i)v$%y0X@y%5NxY$#2bvH}%M-;zo*9U+|y zf)B9jfx3dhNzmFZCy#t9Ki}P+!8XNcr|bDykrq9zr!d8nE2Gz%LQ_Ucr+4~xJ(h+j z)-R6RQFGs-^>ZE24LD6l72?vDj<`S#33mw$0S&r#j95s5FtVE@|)5p?E4K zvaf=?%dq<>BFTy%~NGFvX^o@)Cc+uMU9AlI`3{f^0^1x9)860s0>^% z69l|}R7fO9)m99XJ@0nJtY@C-t_c1%ZH}84&;khm7QQcZ05Dn#TR%JCXl0UMc;B_|N~gx4RQWW3tYswR1*4cfj} zBG;S|!ustsnD{Ec3fH(qY_eOS?V~wL;R}RFih{54ku8+OL@tt+iNGwl(KzA02nN+a0ayDPd%s%e-Ol)%+d7^<_}5=(irtaML4O%aOz`wcNyCt8ANBJV5CC z=_H9KRJ!KMNRfmqrCVmpOq+op9A-2Ut)oyf$m+j-s=;h{jQeNXD|_gUlz2_$K4SYQ z5p1MRQNMagwlmt*>1=1jUVL`+Fd3Gf$a_OkHixh~z%J9TA(Yf^O!UTy&gr}$o3OqK zjocc-_5~r&y!d(E7`fw#PbWR~O_6a0+!jrX`a|=n_n-sZ#x>%~5#hS^Hahn*N$G~^ z@5C81{K-{mj5n)idH89{%2J_`eihXB<)8&yUhiteG|>iH-;sgU$n_WKil|8;d7s<_ zPfEaOk%CBCtLGNS23@K)k*^Rwl||QOlR6ScEZh8ywZyLJ>XZwk3LIaX+-aK)A~kMk z-k7~bx66qn$$L=41F6V-@XDmu%7}u_n|w-YeOQz{X@J%#Mj@h~lyR}s1yW#Jd6)NY zpp_y>Go}@XZMj8EvZ#%XUMZL>)>9YGZOaj&Y6r9(7^OO{^?pm`yT}y_c8i>vF8X`RwsgC}In~ z81+Sw>+TT*_a3rt@*4M}hCeIIO@*P)*;d9~i3@{O@s}ofKGxa9h3JG}!&$qTqu9vn z7MCO}xL!QrD?&=7%gmz-@S zs40w0|G>NRS-cb;s0p@TLQX|6iToIO+-E!W4&K$2w0JBCHYX#DACYDEMLWu2joMFOMF7Unq!jEa#A)G{Vu(#5!3jC@|PiO zv@MKz>Y~5q^}QTH_KSqjEysbYl}xucm{gnJQl_(0d)f?A=&Usle1+D@|RrlRQomSFM_Zl*Fr7yX}eh zl&3Va$5^^gW0#Zo+N82o&{p(zz8!Pq(*xFFulwUk*(s%+eh(FC@{sligQdPf4P=N~ zaCCc(T)s?jGLR=`c2S_(=nm1zR{Nhh?OL)&2{GPCm9tqjZsl?QVMpOsGD!?m(Zl0< zeYboa|KV50k1D6|Rpbu%P6ji}7yKtQ*|!hEn3}9Q;*O}NI$7%^{jOnHZmr4QA3Kky zNeqe{I1U*sQz?`L=X{`j2o2evDd;f1sqhg{fvuD?<0dV>SbhO6e!8xeqN`d8zC5e? z^N9QjeXVp~-i@y%&U#lJp03&CKWWOZJjnLHRWSzBw}l5yq3Vw*t@ zG5yZbl%e;(&dPr8PkQV0={Od?F%A~i6VTu!*y z=j0uvmcB(di*TRX#Tuq0WDynpB83<{8EBB$O|j|EPOHGzmtxgZ?X}#_|GfRRv8E{p zk%;2%QC(c5{rnYo)ac$js{`l8tCEj8Htb1pei0sxky5QQbC{wW<`RuRj!GBq@vIRY zl!l^9PFhfyWw6v!`u)>5#$7c^w?gj?rw>Z=Vr~0xJ416PC$fAvf7!A(tbaNNNaT6b zbd|9=beqD$qiLCR`7J{fIO3G04^rYgX07c~i4IAp`5J6(^2L9qzjCaIc0I{e zJmk*EZN_@BiflP36vA!p!G}R-Z#c%hmmFYY0uDXWN-Qh;?{>p7OaIt z4wO6zs#-dwT@q5~_essK4;c9@w6uQ%o=%jovajp+e&(o_L|KT+ykO|EA0>6IQfydyQzS9ZR|8WaphF zj2`EjPZZeS8sD?Az2IaCI6!n9hp~gS z$3C@b_V)gbNYjq(VwX3BP|aoSsxJvtztED+JJ%*7?keq4VqO(+#MAgM7*3ScAL5%1 z?lAl)m3blAU@&RdQYcDlEUL0wE9#>CRh~j>HeKb@h($Wwk;X!EmgY#uvmAldRMyk6 zP3#o0b~v#dab56BU*ha=*T|O4`yu6{1|KRix@+3iy!pVpyDb!ofTIoVS)dQTWli)# zIfeIBq26|jk0?AwRpEzKiZi~bsBoE}=~oyazW8OUKyf>?E_Fyp*q@EU%T8sA?OR)~ z>f4)7xV#$DpB#-c9IBv~ksiC=A+HMV;aEr{&RP+tG*8L_MhLZd&u4gtryqR}?X>20cZqM(~ zsS~EI3f%BPOIy-CdCXMBdL$tt5EE(IFQI>aYvhVA6qXiI+ENeJzwn@b=~2l5 z@TzrtiuT7H{@^SS#*E>V3^wOdSb5euQ)oEzAD2Db)LhORJZ*U)qEQZSge2O}*jc%> z{kX9{^S%+YZx)Tj=WG{$n=lpeMpQzV<4_1WNuYZiW0 zSXZZ%o3>vBi(&dcsh@3o^*1dfdvm+Ja{es=Ie7C|Vgof`A#*FwN`f*`}zxUyJ+)saWk}a_SXBz*}t-Zo}MsyFOXcU(t zY=}cOD#Z*|Yr;hc{R#fydqt`GHmti8|Zm)0(y5UzP7VDKCY z=2u3u8&(baia2-rs$s$$6b_lad;z9WH(BL#yxG> zlJ;~N1rhUOa96oZN$6~ukTOQ~Xd9N4$~N``KzFLue=2`^WwWvUM9m`&xa^BwJ9k=x-Og}3qCWv40{CA?en)mZj z)s8y(x@S{c74~*iyT@4l32(WbtY3dZ`VXL;2b8xBxx=Fm#df%h+*>U^X#a+7n-0ne z+D%RLI>k141|v-ml}6S6C51zJTUoFHJL%) zQqfe2x0XSoCntGLM^x3bZ7fmn#X zcSp|baRgbCJ2+DS24P-cjc~lbZnafwkZp96t*UGOnvQWX?PNpx+av{dHYf!U1sk7z zS^oifahFSuu4)<+wYVQU6I*#Mw9%y73nzK_?M0}_hD&ni-D8Ky5qvQ9CqvQxxWEM!gQNIZM2NJ@iJOBUy literal 0 HcmV?d00001 diff --git a/icons/sante/mort.webp b/icons/sante/mort.webp new file mode 100644 index 0000000000000000000000000000000000000000..7bbe06269fc32d5020d92b7b0ab6b9dcc7a3a80f GIT binary patch literal 7766 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 WjCrhd>+U>1Jh>yU>#Rx$0RIIUyFU2< literal 0 HcmV?d00001 diff --git a/module/actor-sheet.js b/module/actor-sheet.js index e0101c55..5e33065a 100644 --- a/module/actor-sheet.js +++ b/module/actor-sheet.js @@ -153,43 +153,18 @@ export class RdDActorSheet extends RdDBaseActorSheet { this.createEmptyTache(); }); this.html.find('.creer-tache-blessure-legere').click(async event => { - RdDItemBlessure.createTacheSoinBlessure(this.actor, 'legere'); + RdDItemBlessure.createTacheSoinBlessure(this.actor, 2); }); this.html.find('.creer-tache-blessure-grave').click(async event => { - RdDItemBlessure.createTacheSoinBlessure(this.actor, 'grave'); + RdDItemBlessure.createTacheSoinBlessure(this.actor, 4); }); this.html.find('.creer-tache-blessure-critique').click(async event => { - RdDItemBlessure.createTacheSoinBlessure(this.actor, 'critique'); + RdDItemBlessure.createTacheSoinBlessure(this.actor, 6); }); this.html.find('.creer-une-oeuvre').click(async event => { this.selectTypeOeuvreToCreate(); }); - // Blessure control - this.html.find('.blessure-control').click(async event => { - const tr = this.html.find(event.currentTarget).parents(".item"); - let btype = tr.data("blessure-type"); - let index = tr.data('blessure-index'); - let active = this.html.find(event.currentTarget).data('blessure-active'); - //console.log(btype, index, active); - await this.actor.manageBlessureFromSheet(btype, index, active); - }); - - // Blessure data - this.html.find('.blessure-soins').change(async event => { - const tr = this.html.find(event.currentTarget).parents(".item"); - let btype = tr.data('blessure-type'); - let index = tr.data('blessure-index'); - let psoins = tr.find('.blessure-premiers_soins').val(); - let pcomplets = tr.find('.blessure-soins_complets').val(); - let jours = tr.find('.blessure-jours').val(); - let loc = tr.find('.blessure-localisation').val(); - let psdone = tr.find('.blessure-psdone:checked').val(); - let scdone = tr.find('.blessure-scdone:checked').val(); - console.log(btype, index, psoins, pcomplets, jours, loc, psdone, scdone); - await this.actor.setDataBlessureFromSheet(btype, index, psoins, pcomplets, jours, loc, psdone, scdone); - }); - this.html.find('.blessure-premierssoins-done').change(async event => { const blessure = this.getBlessure(event); await blessure?.setSoinsBlessure({ premierssoins: { done: event.currentTarget.checked } }); diff --git a/module/actor.js b/module/actor.js index 6dc88e88..f51ae2aa 100644 --- a/module/actor.js +++ b/module/actor.js @@ -26,7 +26,7 @@ import { DialogConsommer } from "./dialog-item-consommer.js"; import { DialogFabriquerPotion } from "./dialog-fabriquer-potion.js"; import { RollDataAjustements } from "./rolldata-ajustements.js"; import { RdDPossession } from "./rdd-possession.js"; -import { ENTITE_BLURETTE, ENTITE_INCARNE, ENTITE_NONINCARNE, SHOW_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js"; +import { ENTITE_INCARNE, ENTITE_NONINCARNE, SHOW_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js"; import { RdDConfirm } from "./rdd-confirm.js"; import { DialogValidationEncaissement } from "./dialog-validation-encaissement.js"; import { RdDRencontre } from "./item/rencontre.js"; @@ -46,7 +46,6 @@ const POSSESSION_SANS_DRACONIC = { } }; -const PAS_DE_BLESSURE = { "active": false, "psdone": false, "scdone": false, "premiers_soins": 0, "soins_complets": 0, "jours": 0, "loc": "" }; export const MAINS_DIRECTRICES = ['Droitier', 'Gaucher', 'Ambidextre'] /* -------------------------------------------- */ @@ -403,7 +402,7 @@ export class RdDActor extends RdDBaseActor { } await this._recupereChance(); await this.transformerStress(); - this.bonusRecuperationPotion = 0; // Reset potion + await this.setBonusPotionSoin(0); } await this.resetInfoSommeil() ChatMessage.create(message); @@ -414,11 +413,8 @@ export class RdDActor extends RdDBaseActor { const maladiesPoisons = this._maladiePoisons(message); const isMaladeEmpoisonne = maladiesPoisons.length > 0; this._messageRecuperationMaladiePoisons(maladiesPoisons, message); - const blessures = duplicate(this.system.blessures); - await this._recupererBlessures(message, "legere", blessures.legeres.liste.filter(b => b.active), [], isMaladeEmpoisonne); - await this._recupererBlessures(message, "grave", blessures.graves.liste.filter(b => b.active), blessures.legeres.liste, isMaladeEmpoisonne); - await this._recupererBlessures(message, "critique", blessures.critiques.liste.filter(b => b.active), blessures.graves.liste, isMaladeEmpoisonne); - await this.update({ "system.blessures": blessures }); + + await this._recuperationBlessures(message, isMaladeEmpoisonne); await this._recupererVie(message, isMaladeEmpoisonne); } @@ -460,7 +456,7 @@ export class RdDActor extends RdDBaseActor { await this._recupereChance(); await this.transformerStress(); await this.retourSeuilDeReve(message); - this.bonusRecuperationPotion = 0; // Reset potion + await this.setBonusPotionSoin(0); await this.retourSust(message); await this.verifierPotionsEnchantees(); if (message.content != "") { @@ -523,65 +519,36 @@ export class RdDActor extends RdDBaseActor { } /* -------------------------------------------- */ - async _recupererBlessures(message, type, liste, moindres, isMaladeEmpoisonne) { - if (!this.bonusRecuperationPotion) this.bonusRecuperationPotion = 0; - let count = 0; - const definitions = RdDUtility.getDefinitionsBlessures(); - let definition = definitions.find(d => d.type == type); - for (let blessure of liste) { - if (blessure.jours >= definition.facteur) { - let rolled = await this._jetRecuperationConstitution(Misc.toInt(blessure.soins_complets) + this.bonusRecuperationPotion, message); - blessure.soins_complets = 0; - if (!isMaladeEmpoisonne && rolled.isSuccess && this._retrograderBlessure(type, blessure, moindres)) { - message.content += ` -- une blessure ${type} cicatrise`; - count++; - } - else if (rolled.isETotal) { - message.content += ` -- une blessure ${type} s'infecte (temps de guérison augmenté de ${definition.facteur} jours, perte de vie)`; - blessure.jours = 0; - await this.santeIncDec("vie", -1); - } - else { - blessure.jours++; - message.content += ` -- une blessure ${type} reste stable`; - } - } - else { - blessure.jours++; - } - } + async _recuperationBlessures(message, isMaladeEmpoisonne) { + const timestamp = game.system.rdd.calendrier.getTimestamp() + const blessures = this.filterItems(it => it.gravite > 0, 'blessure').sort(Misc.ascending(it => it.system.gravite)) + + Promise.all(blessures.map(b => b.recuperationBlessure({ + actor: this, + timestamp, + message, + isMaladeEmpoisonne, + blessures + }))); + await this.supprimerBlessures(filterToDelete); } - /* -------------------------------------------- */ - _retrograderBlessure(type, blessure, blessuresMoindres) { - if (type != "legere") { - let retrograde = blessuresMoindres.find(b => !b.active); - if (!retrograde) { - return false; - } - mergeObject(retrograde, { "active": true, "psdone": blessure.psdone, "scdone": blessure.scdone, "premiers_soins": 0, "soins_complets": 0, "jours": 0, "loc": blessure.loc }); - } - this._supprimerBlessure(blessure); - return true; - } - - /* -------------------------------------------- */ - _supprimerBlessure(blessure) { - mergeObject(blessure, PAS_DE_BLESSURE); + async supprimerBlessures(filterToDelete) { + const toDelete = this.filterItems(filterToDelete, 'blessure') + .map(it => it.id); + await this.deleteEmbeddedDocuments('Item', toDelete); } /* -------------------------------------------- */ async _recupererVie(message, isMaladeEmpoisonne) { const tData = this.system - let blessures = [].concat(tData.blessures.legeres.liste).concat(tData.blessures.graves.liste).concat(tData.blessures.critiques.liste); - let nbBlessures = blessures.filter(b => b.active); + let blessures = this.filterItems(it => it.system.gravite > 0, 'blessure'); + if (blessures.length > 0) { + return + } let vieManquante = tData.sante.vie.max - tData.sante.vie.value; - if (nbBlessures == 0 && vieManquante > 0) { - let bonusSoins = 0; - for (let b of blessures) { - bonusSoins = Math.max(bonusSoins, Misc.toInt(b.soins_complets)); - } - let rolled = await this._jetRecuperationConstitution(bonusSoins, message) + if (vieManquante > 0) { + let rolled = await this.jetRecuperationConstitution(bonusSoins, message) if (!isMaladeEmpoisonne && rolled.isSuccess) { const gain = Math.min(rolled.isPart ? 2 : 1, vieManquante); message.content += " -- récupération de vie: " + gain; @@ -598,7 +565,7 @@ export class RdDActor extends RdDBaseActor { } /* -------------------------------------------- */ - async _jetRecuperationConstitution(bonusSoins, message = undefined) { + async jetRecuperationConstitution(bonusSoins, message = undefined) { let difficulte = Misc.toInt(bonusSoins) + Math.min(0, this.system.sante.vie.value - this.system.sante.vie.max); let rolled = await RdDResolutionTable.roll(this.system.carac.constitution.value, difficulte); if (message) { @@ -623,17 +590,13 @@ export class RdDActor extends RdDBaseActor { const updates = { 'system.sante.endurance.value': this.system.sante.endurance.max }; - if (!this.isEntite([ENTITE_INCARNE, ENTITE_BLURETTE])) { - if (this.system.blessures) { - updates['system.blessures.legeres.liste'] = [PAS_DE_BLESSURE, PAS_DE_BLESSURE, PAS_DE_BLESSURE, PAS_DE_BLESSURE, PAS_DE_BLESSURE]; - updates['system.blessures.graves.liste'] = [PAS_DE_BLESSURE, PAS_DE_BLESSURE]; - updates['system.blessures.critiques.liste'] = [PAS_DE_BLESSURE]; - } + if (this.isPersonnage() || this.isCreature()) { + await this.supprimerBlessures(it => true); updates['system.sante.vie.value'] = this.system.sante.vie.max; updates['system.sante.fatigue.value'] = 0; - if (this.isPersonnage()) { - updates['system.compteurs.ethylisme'] = { value: 1, nb_doses: 0, jet_moral: false }; - } + } + if (this.isPersonnage()) { + updates['system.compteurs.ethylisme'] = { value: 1, nb_doses: 0, jet_moral: false }; } await this.update(updates); await this.removeEffects(e => e.flags.core.statusId !== STATUSES.StatusDemiReve); @@ -1147,35 +1110,31 @@ export class RdDActor extends RdDBaseActor { } /* -------------------------------------------- */ - computeResumeBlessure(blessures = undefined) { - blessures = blessures ?? this.system.blessures; - if (!blessures) { - return "Pas de blessures possibles"; - } - let nbLegeres = this.countBlessures(blessures.legeres.liste); - let nbGraves = this.countBlessures(blessures.graves.liste); - let nbCritiques = this.countBlessures(blessures.critiques.liste); + computeResumeBlessure() { + const blessures = this.filterItems(it => it.system.gravite > 0, 'blessure') - let resume = "Blessures:"; - if (nbCritiques > 0 || nbGraves > 0 || nbLegeres > 0) { - if (nbLegeres > 0) { - resume += " " + nbLegeres + " légère" + (nbLegeres > 1 ? "s" : ""); - } - if (nbGraves > 0) { - if (nbLegeres > 0) - resume += ","; - resume += " " + nbGraves + " grave" + (nbGraves > 1 ? "s" : ""); - } - if (nbCritiques > 0) { - if (nbGraves > 0 || nbLegeres > 0) - resume += ","; - resume += " une CRITIQUE !"; - } - return resume; - } - else { + const nbLegeres = blessures.filter(it => it.isLegere()).length; + const nbGraves = blessures.filter(it => it.isGrave()).length; + const nbCritiques = blessures.filter(it => it.isCritique()).length; + + if (nbLegeres + nbGraves + nbCritiques == 0) { return "Aucune blessure"; } + let resume = "Blessures:"; + if (nbLegeres > 0) { + resume += " " + nbLegeres + " légère" + (nbLegeres > 1 ? "s" : ""); + } + if (nbGraves > 0) { + if (nbLegeres > 0) + resume += ","; + resume += " " + nbGraves + " grave" + (nbGraves > 1 ? "s" : ""); + } + if (nbCritiques > 0) { + if (nbGraves > 0 || nbLegeres > 0) + resume += ","; + resume += " une CRITIQUE !"; + } + return resume; } recompute() { @@ -1384,11 +1343,11 @@ export class RdDActor extends RdDBaseActor { ChatMessage.create({ content: `${this.name} n'est plus ${Misc.lowerFirst(game.i18n.localize(effect.system.label))} !` }); } } - if (this.type == 'personnage') { - // Gestion blessure graves : -1 pt endurance - let nbGraves = this.countBlessuresNonSoigneeByName('graves'); + if (this.isPersonnage() || this.isCreature()) { + const nbGraves = this.filterItems(it => it.isGrave(), 'blessure').length if (nbGraves > 0) { - await this.santeIncDec("endurance", -1); + // Gestion blessure graves : -1 pt endurance par blessure grave + await this.santeIncDec("endurance", - nbGraves); } } } @@ -1419,20 +1378,8 @@ export class RdDActor extends RdDBaseActor { } /* -------------------------------------------- */ - countBlessures(blessuresListe) { - return blessuresListe.filter(b => b.active).length - } - /* -------------------------------------------- */ - countBlessuresByName(name) { - return this.countBlessures(this.system.blessures[name].liste); - } - - countBlessuresNonSoigneeByName(name) { - if (this.system.blessures) { - let blessures = this.system.blessures[name].liste; - return blessures.filter(b => b.active && !b.psdone).length; - } - return 0; + countBlessures(filter = it => !it.isContusion()) { + return this.filterItems(filter, 'blessure').length } /* -------------------------------------------- */ @@ -1583,40 +1530,15 @@ export class RdDActor extends RdDBaseActor { /* -------------------------------------------- */ _computeEnduranceMax() { - let blessures = this.system.blessures; - let diffVie = this.system.sante.vie.max - this.system.sante.vie.value; - let maxEndVie = this.system.sante.endurance.max - (diffVie * 2); - let nbGraves = this.countBlessures(blessures.graves.liste); - let nbCritiques = this.countBlessures(blessures.critiques.liste); - let maxEndGraves = Math.floor(this.system.sante.endurance.max / (2 * nbGraves)); - let maxEndCritiques = nbCritiques > 0 ? 1 : this.system.sante.endurance.max; + const diffVie = this.system.sante.vie.max - this.system.sante.vie.value; + const maxEndVie = this.system.sante.endurance.max - (diffVie * 2); + const nbGraves = this.countBlessures(it => it.isGraves()) > 0 + const nbCritiques = this.countBlessures(it => it.isCritique()) > 0 + const maxEndGraves = Math.floor(this.system.sante.endurance.max / (2 * nbGraves)); + const maxEndCritiques = nbCritiques > 0 ? 1 : this.system.sante.endurance.max; return Math.max(0, Math.min(maxEndVie, maxEndGraves, maxEndCritiques)); } - /* -------------------------------------------- */ - async manageBlessureFromSheet(gravite, index) { - let listBlessures = duplicate(this.system.blessures); - let blessure = listBlessures[gravite + "s"].liste[index]; - blessure.active = !blessure.active; - if (!blessure.active) { - this._supprimerBlessure(blessure); - } - await this.update({ 'system.blessures': listBlessures }); - } - - /* -------------------------------------------- */ - async setDataBlessureFromSheet(gravite, index, psoins, pcomplets, jours, loc, psdone, scdone) { - let listBlessures = duplicate(this.system.blessures); - let blessure = listBlessures[gravite + "s"].liste[index]; - blessure.psdone = psdone; - blessure.scdone = scdone; - blessure.premiers_soins = psoins; - blessure.soins_complets = pcomplets; - blessure.jours = jours; - blessure.loc = loc; - await this.update({ 'system.blessures': listBlessures }); - } - /* -------------------------------------------- */ async jetDeMoral(situation, messageReussi = undefined, messageManque = undefined) { const jetMoral = await this._jetDeMoral(situation); @@ -2388,10 +2310,9 @@ export class RdDActor extends RdDBaseActor { /* -------------------------------------------- */ async creerTacheDepuisLivre(item, options = { renderSheet: true }) { - // TODO: déplacer vers Item pour livres const nomTache = "Lire " + item.name; - const filterTacheLecture = it => it.name == nomTache; - let tachesExistantes = this.filterItems(filterTacheLecture, 'tache'); + const filterTacheLecture = it => it.type == 'tache' && it.name == nomTache; + let tachesExistantes = this.filterItems(filterTacheLecture); if (tachesExistantes.length == 0) { const tache = { name: nomTache, type: 'tache', @@ -2407,14 +2328,14 @@ export class RdDActor extends RdDBaseActor { } } await this.createEmbeddedDocuments('Item', [tache], options); - tachesExistantes = this.filterItems(filterTacheLecture, 'tache'); + tachesExistantes = this.filterItems(filterTacheLecture); } return tachesExistantes.length > 0 ? tachesExistantes[0] : undefined; } blessuresASoigner() { // TODO or not TODO: filtrer les blessures poour lesquels on ne peut plus faire de premiers soins? - return this.filterItems(it => it.system.gravite > 0 && !(it.system.premierssoins.done && it.system.soinscomplets.done), 'blessure') + return this.filterItems(it => it.system.gravite > 0 && it.system.gravite <= 6 && !(it.system.premierssoins.done && it.system.soinscomplets.done), 'blessure') } async getTacheBlessure(blesse, blessure) { @@ -3155,8 +3076,8 @@ export class RdDActor extends RdDBaseActor { tache: Math.max(0, tache.system.points_de_tache_courant) } }) - if (bonus>=0) { - await tache.delete() + if (bonus >= 0) { + await this.deleteEmbeddedDocuments('Item', [tache.id]) } } } @@ -3311,11 +3232,11 @@ export class RdDActor extends RdDBaseActor { async _appliquerEncaissement(encaissement, show) { let santeOrig = duplicate(this.system.sante); - this.ajouterBlessure(encaissement); // Will upate the result table + const blessure = await this.ajouterBlessure(encaissement); // Will upate the result table const perteVie = this.isEntite() ? { newValue: 0 } : await this.santeIncDec("vie", -encaissement.vie); - const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance, encaissement.critiques > 0); + const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance, blessure?.isCritique()); mergeObject(encaissement, { alias: this.name, @@ -3325,6 +3246,7 @@ export class RdDActor extends RdDBaseActor { jetEndurance: perteEndurance.jetEndurance, endurance: santeOrig.endurance.value - perteEndurance.newValue, vie: this.isEntite() ? 0 : (santeOrig.vie.value - perteVie.newValue), + blessure: blessure, show: show ?? {} }); @@ -3344,73 +3266,33 @@ export class RdDActor extends RdDBaseActor { } /* -------------------------------------------- */ - ajouterBlessure(encaissement) { - if (this.type == 'entite') return; // Une entité n'a pas de blessures - if (encaissement.legeres + encaissement.graves + encaissement.critiques == 0) return; - + async ajouterBlessure(encaissement) { + if (this.isEntite()) return; // Une entité n'a pas de blessures + if (encaissement.gravite < 0) return; + if (encaissement.gravite > 0) { + while (this.countBlessures(it => it.system.gravite == encaissement.gravite) >= RdDItemBlessure.maxBlessures(encaissement.gravite) && encaissement.gravite <= 6) { + // Aggravation + encaissement.gravite += 2 + if (encaissement.gravite > 2) { + encaissement.vie += 2; + } + } + } const endActuelle = Number(this.system.sante.endurance.value); - let blessures = duplicate(this.system.blessures); - - let count = encaissement.legeres; - // Manage blessures - while (count > 0) { - let legere = blessures.legeres.liste.find(it => !it.active); - if (legere) { - this._setBlessure(legere, encaissement); - count--; - } - else { - encaissement.graves += count; - encaissement.legeres -= count; - break; - } + const blessure = await RdDItemBlessure.createBlessure(this, encaissement.gravite, encaissement.dmg.loc.label); + if (blessure.isCritique()) { + encaissement.endurance = endActuelle; } - count = encaissement.graves; - while (count > 0) { - let grave = blessures.graves.liste.find(it => !it.active); - if (grave) { - this._setBlessure(grave, encaissement); - count--; - } - else { - encaissement.critiques += count; - encaissement.graves -= count; - encaissement.endurance = endActuelle; - encaissement.vie = 4; - break; - } + if (blessure.isMort()) { + this.setEffect(STATUSES.StatusComma, true); + encaissement.mort = true; + ChatMessage.create({ + content: `charge + ${this.name} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !` + }); } - - count = encaissement.critiques; - while (count > 0) { - let critique = blessures.critiques.liste[0]; - if (!critique.active) { - this._setBlessure(critique, encaissement); - count--; - } else { - // TODO: status effect dead - this.setEffect(STATUSES.StatusComma, true); - ChatMessage.create({ - content: `charge - ${this.name} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !` - }); - encaissement.critiques -= count; - encaissement.mort = true; - break; - } - } - - encaissement.endurance = Math.max(encaissement.endurance, -endActuelle); - this.update({ "system.blessures": blessures }); - } - - /* -------------------------------------------- */ - _setBlessure(blessure, encaissement) { - blessure.active = true; - blessure.psdone = false; - blessure.scdone = false; - blessure.loc = encaissement.locName; + return blessure; } /* -------------------------------------------- */ @@ -3643,42 +3525,28 @@ export class RdDActor extends RdDBaseActor { /* -------------------------------------------- */ async buildPotionGuerisonList(pointsGuerison) { - let pointsGuerisonInitial = pointsGuerison; - let myData = this.system; - const blessures = duplicate(myData.blessures); - let guerisonData = { list: [], pointsConsommes: 0 } - - console.log(blessures); - for (let critique of blessures.critiques.liste) { - if (critique.active && pointsGuerison >= 6) { - pointsGuerison -= 6; - critique.active = false; - guerisonData.list.push("1 Blessure Critique (6 points)"); + const pointsGuerisonInitial = pointsGuerison; + const blessures = this.filterItems(it => it.isLegere() || it.isGrave() || it.isCritique()).sort(Misc.descending(it => it.system.gravite)) + const ids = [] + const guerisonData = { list: [], pointsConsommes: 0 } + for (let blessure of blessures) { + if (pointsGuerison >= blessure.system.gravite) { + pointsGuerison -= blessure.system.gravite; + guerisonData.list.push(`1 Blessure ${blessure.system.labelGravite} (${blessure.system.gravite} points)`); + ids.push(blessure.id) } } - for (let grave of blessures.graves.liste) { - if (grave.active && pointsGuerison >= 4) { - pointsGuerison -= 4; - grave.active = false; - guerisonData.list.push("1 Blessure Grave (4 points)"); - } + if (ids.length > 0) { + await this.supprimerBlessures(it => ids.includes(it.id)); } - for (let legere of blessures.legeres.liste) { - if (legere.active && pointsGuerison >= 2) { - pointsGuerison -= 2; - legere.active = false; - guerisonData.list.push("1 Blessure Légère (2 points)"); - } + if (blessures.length == ids.length) { + let pvManquants = this.system.sante.vie.max - this.system.sante.vie.value; + let pvSoignees = Math.min(pvManquants, Math.floor(pointsGuerison / 2)); + pointsGuerison -= pvSoignees * 2; + guerisonData.list.push(pvSoignees + " Points de Vie soignés"); + await this.santeIncDec('vie', +pvSoignees, false); } - await this.update({ "system.blessures": blessures }); - - let pvManquants = myData.sante.vie.max - myData.sante.vie.value; - let pvSoignees = Math.min(pvManquants, Math.floor(pointsGuerison / 2)); - pointsGuerison -= pvSoignees * 2; - guerisonData.list.push(pvSoignees + " Points de Vie soignés"); - await this.santeIncDec('vie', +pvSoignees, false); guerisonData.pointsConsommes = pointsGuerisonInitial - pointsGuerison; - return guerisonData; } @@ -3697,7 +3565,7 @@ export class RdDActor extends RdDBaseActor { } } if (!potionData.system.magique || potionData.rolled.isSuccess) { - this.bonusRecuperationPotion = potionData.system.herbeBonus; + await this.setBonusPotionSoin(potionData.system.herbeBonus); } ChatMessage.create({ whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name), @@ -3705,6 +3573,10 @@ export class RdDActor extends RdDBaseActor { }); } + async setBonusPotionSoin(bonus) { + await this.update({ 'sante.bonusPotion': bonus }); + } + /* -------------------------------------------- */ async consommerPotionRepos(potionData) { potionData.alias = this.name; diff --git a/module/item/blessure.js b/module/item/blessure.js index 0c71df22..063b7885 100644 --- a/module/item/blessure.js +++ b/module/item/blessure.js @@ -1,4 +1,6 @@ import { RdDItem } from "../item.js"; +import { Misc } from "../misc.js"; +import { RdDTimestamp } from "../rdd-timestamp.js"; const BASE_TACHE_SOIN_BLESSURE = { type: "tache", @@ -6,20 +8,30 @@ const BASE_TACHE_SOIN_BLESSURE = { system: { carac: "dexterite", competence: "Chirurgie", periodicite: "1 round", fatigue: 0, } } const TACHES_SOIN_BLESSURE = { - 'critique': { name: 'Blessure critique', system: { difficulte: -6, points_de_tache: 6 } }, - 'grave': { name: 'Blessure grave', system: { difficulte: -4, points_de_tache: 4 } }, - 'legere': { name: 'Blessure légère', system: { difficulte: -2, points_de_tache: 2 } }, 6: { name: 'Blessure critique', system: { difficulte: -6, points_de_tache: 6 } }, 4: { name: 'Blessure grave', system: { difficulte: -4, points_de_tache: 4 } }, 2: { name: 'Blessure légère', system: { difficulte: -2, points_de_tache: 2 } }, } +const definitionsBlessures = [ + { type: "contusion", gravite: 0, labelGravite: 'Contusion/éraflure', max: 100, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/eraflure.webp" }, + { type: "legere", gravite: 2, labelGravite: 'Légère', max: 5, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" }, + { type: "grave", gravite: 4, labelGravite: 'Grave', max: 2, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" }, + { type: "critique", gravite: 6, labelGravite: 'Critique', max: 1, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" }, + { type: "mort", gravite: 8, labelGravite: 'Mort', max: 1, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/mort.webp" } +] + export class RdDItemBlessure extends RdDItem { static get defaultIcon() { return "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp"; } + prepareDerivedData() { + super.prepareDerivedData(); + this.system.labelGravite = this.getLabelGravite() + } + static prepareTacheSoin(gravite) { const tache = TACHES_SOIN_BLESSURE[gravite] if (!tache) { @@ -28,7 +40,22 @@ export class RdDItemBlessure extends RdDItem { } return mergeObject(duplicate(BASE_TACHE_SOIN_BLESSURE), tache) } + static async createBlessure(actor, gravite, localisation) { + const definition = RdDItemBlessure.getDefinition(gravite) + const blessure = { + name: definition.labelGravite, + type: 'blessure', + img: definition.icon, + system: { + gravite: gravite, + difficulte: - gravite, + localisation: localisation + } + } + const blessures = await actor.createEmbeddedDocuments('Item', [blessure]) + return blessures[0] + } static async createTacheSoinBlessure(actor, gravite) { const tache = RdDItemBlessure.prepareTacheSoin(gravite) @@ -51,6 +78,54 @@ export class RdDItemBlessure extends RdDItem { } } + async setSoinsBlessure(systemUpdate = {}) { + systemUpdate = mergeObject(systemUpdate, this.system, { overwrite: false }), + systemUpdate.soinscomplets.done = systemUpdate.premierssoins.done && systemUpdate.soinscomplets.done + await this.update({ + img: this.getImgSoins(systemUpdate.gravite, systemUpdate.soinscomplets.done), + system: systemUpdate + }); + } + + async recuperationBlessure({ actor, timestamp, message, isMaladeEmpoisonne, blessures }) { + if (this.parent != actor || actor == undefined) { + return; + } + if (new RdDTimestamp(this.system.fin).isAfterIndexDate(timestamp)) { + // attente periode + return + } + if (this.system.gravite > 0) { + const update = { premierssoins: { bonus: 0 }, soinscomplets: { bonus: 0 } } + const gravite = this.system.gravite; + const graviteMoindre = gravite - 2; + const moindres = blessures.filter(it => it.system.gravite == graviteMoindre, 'blessures').length + const labelGravite = RdDItemBlessure.getLabelGravite(gravite); + + let rolled = await actor.jetRecuperationConstitution(Misc.toInt(this.system.soinscomplets.bonus) + actor.system.sante.bonusPotion, message); + + if (rolled.isETotal) { + message.content += ` -- une blessure ${labelGravite} s'infecte (temps de guérison augmenté de ${definition.facteur} jours, perte de vie)`; + mergeObject(update, { fin: { indexDate: timestamp.addJours(gravite).indexDate } }); + await actor.santeIncDec("vie", -1); + } + else { + if (!isMaladeEmpoisonne && rolled.isSuccess && this.peutRetrograder(graviteMoindre, moindres)) { + message.content += ` -- une blessure ${labelGravite} cicatrise`; + mergeObject(update, { gravite: graviteMoindre, fin: { indexDate: timestamp.addJours(graviteMoindre).indexDate } }); + } + else { + message.content += ` -- une blessure ${labelGravite} reste stable`; + } + } + await this.update(update); + } + } + + peutRetrograder(graviteMoindre, moindres) { + return moindres < RdDItemBlessure.getDefinition(graviteMoindre).max + } + async calculerFinPeriodeTemporel(debut) { return await debut.nouveauJour().addJours(this.system.gravite); } @@ -61,34 +136,42 @@ export class RdDItemBlessure extends RdDItem { } } - prepareDerivedData() { - super.prepareDerivedData(); - this.system.labelGravite = this.getLabelGravite() - } - - async setSoinsBlessure(systemUpdate = {}) { - systemUpdate = mergeObject(systemUpdate, this.system, { overwrite: false }), - systemUpdate.soinscomplets.done = systemUpdate.premierssoins.done && systemUpdate.soinscomplets.done - await this.update({ - img: this.getImgSoins(systemUpdate.soinscomplets.done), - system: systemUpdate - }); - } - - getImgSoins(soins) { - return `systems/foundryvtt-reve-de-dragon/icons/sante/${soins ? 'blessure-soins' : 'blessure'}.webp` + getImgSoins(gravite, soins) { + let img = 'blessure' + if (gravite > 6) { + img = 'mort' + } + if (gravite <= 0) { + img = 'eraflure' + } + return `systems/foundryvtt-reve-de-dragon/icons/sante/${soins ? 'blessure-soins' : img}.webp` } getLabelGravite() { - if (this.system.gravite >= 6) { - return 'Critique' - } - if (this.system.gravite >= 4) { - return 'Grave' - } - if (this.system.gravite >= 2) { - return 'Légère' - } - return 'Contusion/éraflure' + return RdDItemBlessure.getDefinition(this.system.gravite).labelGravite } -} \ No newline at end of file + + static getDefinition(gravite) { + return definitionsBlessures.sort(Misc.ascending(it => it.gravite)) + .find(it => it.gravite >= gravite); + } + static maxBlessures(gravite) { + return RdDItemBlessure.getDefinition(gravite).max + } + + isContusion() { + return this.system.gravite <= 0 + } + isLegere() { + return this.system.gravite > 0 && this.system.gravite <= 2 + } + isGrave() { + return this.system.gravite > 2 && this.system.gravite <= 4 + } + isCritique() { + return this.system.gravite > 4 && this.system.gravite <= 6 + } + isMort() { + return this.system.gravite > 6 + } +} diff --git a/module/rdd-bonus.js b/module/rdd-bonus.js index 25bbdb3e..2516b0ff 100644 --- a/module/rdd-bonus.js +++ b/module/rdd-bonus.js @@ -28,7 +28,7 @@ export class RdDBonus { } /* -------------------------------------------- */ - static dmg(rollData, dmgActor, isCauchemar = false) { + static dmg(rollData, dmgActor, isEntiteIncarnee = false) { let dmg = { total: 0 }; if (rollData.arme && rollData.arme.name.toLowerCase() == "esquive") { // Specific case management @@ -41,7 +41,7 @@ export class RdDBonus { dmg.dmgSurprise = RdDBonus.dmgBonus(rollData.ajustements?.attaqueDefenseurSurpris.used); dmg.dmgActor = rollData.selectedCarac ? RdDBonus._dmgPerso(dmgActor, rollData.selectedCarac.label, dmg.dmgArme) : 0; dmg.total = dmg.dmgSurprise + dmg.dmgTactique + dmg.dmgArme + dmg.dmgActor + dmg.dmgParticuliere; - dmg.mortalite = RdDBonus._calculMortalite(rollData, isCauchemar) + dmg.mortalite = RdDBonus._calculMortalite(rollData, isEntiteIncarnee) } return dmg; } @@ -62,11 +62,8 @@ export class RdDBonus { } /* -------------------------------------------- */ - static _calculMortalite(rollData, isCauchemar) { - if (isCauchemar) { - return "cauchemar"; - } - return isCauchemar ? "cauchemar" + static _calculMortalite(rollData, isEntiteIncarnee) { + return isEntiteIncarnee ? "entiteincarnee" : rollData.dmg?.mortalite ?? rollData.arme?.system.mortalite ?? "mortel"; diff --git a/module/rdd-combat.js b/module/rdd-combat.js index 904384d6..435be56d 100644 --- a/module/rdd-combat.js +++ b/module/rdd-combat.js @@ -1295,13 +1295,8 @@ export class RdDCombat { blessuresStatus: actor.computeResumeBlessure(), SConst: actor.getSConst(), actorId: actor.id, - isGrave: false, - isCritique: false - } - if (actor.countBlessuresNonSoigneeByName("critiques") > 0) { // Pour éviter le cumul grave + critique - formData.isCritique = true; - } else if (actor.countBlessuresNonSoigneeByName("graves") > 0) { - formData.isGrave = true; + isGrave: actor.countBlessures(it => it.isGraves()) > 0, + isCritique: actor.countBlessures(it => it.isCritique()) > 0 } ChatUtility.createChatWithRollMode(actor.name, { diff --git a/module/rdd-roll-encaisser.js b/module/rdd-roll-encaisser.js index 4d98e413..a9fc2d84 100644 --- a/module/rdd-roll-encaisser.js +++ b/module/rdd-roll-encaisser.js @@ -30,9 +30,9 @@ export class RdDEncaisser extends Dialog { }; } else if (actor.isEntite([ENTITE_BLURETTE, ENTITE_INCARNE])) { - dialogConf.default = "cauchemar" + dialogConf.default = "entiteincarnee" dialogConf.buttons = { - "cauchemar": { label: "Cauchemar", callback: html => this.performEncaisser("cauchemar") } + "entiteincarnee": { label: "Entité incarnée", callback: html => this.performEncaisser("entiteincarnee") } } } @@ -70,7 +70,6 @@ export class RdDEncaisser extends Dialog { total: Number(this.modifier), ajustement: Number(this.modifier), encaisserSpecial: this.encaisserSpecial, - loc: { result: 0, label: "" }, mortalite: mortalite } }); diff --git a/module/rdd-token-hud.js b/module/rdd-token-hud.js index d96bb139..12dcaf4d 100644 --- a/module/rdd-token-hud.js +++ b/module/rdd-token-hud.js @@ -88,10 +88,7 @@ export class RdDTokenHud { static async addExtensionHudSoins(html, sourceActor) { const target = Targets.getTarget({ warn: false }); if (target?.actor) { - const hudSoins = { - targetActor: target.actor, - blessures: target.actor.blessuresASoigner() ?? [] - }; + const hudSoins = { blessures: target.actor.blessuresASoigner() ?? [] }; if (hudSoins.blessures.length > 0) { // soins const controlIconTarget = html.find('.control-icon[data-action=combat]'); diff --git a/module/rdd-utility.js b/module/rdd-utility.js index 235d46ad..55e968de 100644 --- a/module/rdd-utility.js +++ b/module/rdd-utility.js @@ -19,7 +19,7 @@ import { RdDRaretes } from "./item/raretes.js"; /* -------------------------------------------- */ // This table starts at 0 -> niveau -10 const carac_array = ["taille", "apparence", "constitution", "force", "agilite", "dexterite", "vue", "ouie", "odoratgout", "volonte", "intellect", "empathie", "reve", "chance", "melee", "tir", "lancer", "derobee"]; -const difficultesLibres = Misc.intArray(0, -11); +const difficultesLibres = Misc.intArray(0, -11); const ajustementsConditions = Misc.intArray(-10, 11); const ajustementsEncaissement = Misc.intArray(-10, 26); @@ -66,38 +66,31 @@ const fatigueMarche = { "tresdifficile": { "4": 4, "6": 6 } } -/* -------------------------------------------- */ -const definitionsBlessures = [ - { type: "legere", facteur: 2 }, - { type: "grave", facteur: 4 }, - { type: "critique", facteur: 6 } -] - /* -------------------------------------------- */ const nomEthylisme = ["Emeché", "Gris", "Pinté", "Pas frais", "Ivre", "Bu", "Complètement fait", "Ivre mort"]; /* -------------------------------------------- */ const definitionsEncaissement = { "mortel": [ - { minimum: undefined, maximum: 0, endurance: "0", vie: "0", eraflures: 0, legeres: 0, graves: 0, critiques: 0 }, - { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", eraflures: 1, legeres: 0, graves: 0, critiques: 0 }, - { minimum: 11, maximum: 15, endurance: "1d6", vie: "0", eraflures: 0, legeres: 1, graves: 0, critiques: 0 }, - { minimum: 16, maximum: 19, endurance: "2d6", vie: "2", eraflures: 0, legeres: 0, graves: 1, critiques: 0 }, - { minimum: 20, maximum: undefined, endurance: "100", vie: "4 + @over20", eraflures: 0, legeres: 0, graves: 0, critiques: 1 }, + { minimum: undefined, maximum: 0, endurance: "0", vie: "0", gravite: -1}, + { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", gravite: 0}, + { minimum: 11, maximum: 15, endurance: "1d6", vie: "0", gravite: 2}, + { minimum: 16, maximum: 19, endurance: "2d6", vie: "2", gravite: 4}, + { minimum: 20, maximum: undefined, endurance: "100", vie: "4 + @over20", gravite: 6}, ], "non-mortel": [ - { minimum: undefined, maximum: 0, endurance: "0", vie: "0", eraflures: 0, legeres: 0, graves: 0, critiques: 0 }, - { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", eraflures: 1, legeres: 0, graves: 0, critiques: 0 }, - { minimum: 11, maximum: 15, endurance: "1d6", vie: "0", eraflures: 1, legeres: 0, graves: 0, critiques: 0 }, - { minimum: 16, maximum: 19, endurance: "2d6", vie: "0", eraflures: 0, legeres: 1, graves: 0, critiques: 0 }, - { minimum: 20, maximum: undefined, endurance: "100", vie: "0", eraflures: 0, legeres: 1, graves: 0, critiques: 0 }, + { minimum: undefined, maximum: 0, endurance: "0", vie: "0", gravite: -1}, + { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", gravite: 0 }, + { minimum: 11, maximum: 15, endurance: "1d6", vie: "0", gravite: 0 }, + { minimum: 16, maximum: 19, endurance: "2d6", vie: "0", gravite: 2 }, + { minimum: 20, maximum: undefined, endurance: "100", vie: "0", gravite: 2 }, ], - "cauchemar": [ - { minimum: undefined, maximum: 0, endurance: "0", vie: "0", eraflures: 0, legeres: 0, graves: 0, critiques: 0 }, - { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", eraflures: 1, legeres: 0, graves: 0, critiques: 0 }, - { minimum: 11, maximum: 15, endurance: "1d6", vie: "0", eraflures: 1, legeres: 0, graves: 0, critiques: 0 }, - { minimum: 16, maximum: 19, endurance: "2d6", vie: "0", eraflures: 1, legeres: 0, graves: 0, critiques: 0 }, - { minimum: 20, maximum: undefined, endurance: "3d6 + @over20", vie: "0", eraflures: 1, legeres: 0, graves: 0, critiques: 0 }, + "entiteincarnee": [ + { minimum: undefined, maximum: 0, endurance: "0", vie: "0", gravite: -1}, + { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", gravite: 0}, + { minimum: 11, maximum: 15, endurance: "1d6", vie: "0", gravite: 0 }, + { minimum: 16, maximum: 19, endurance: "2d6", vie: "0", gravite: 0 }, + { minimum: 20, maximum: undefined, endurance: "3d6 + @over20", vie: "0", gravite: 0 }, ] }; @@ -139,7 +132,6 @@ export class RdDUtility { 'systems/foundryvtt-reve-de-dragon/templates/actor/xp-competences.html', 'systems/foundryvtt-reve-de-dragon/templates/actor/combat.html', 'systems/foundryvtt-reve-de-dragon/templates/actor/blessures.html', - 'systems/foundryvtt-reve-de-dragon/templates/actor/blessure.html', 'systems/foundryvtt-reve-de-dragon/templates/actor/blessure.hbs', 'systems/foundryvtt-reve-de-dragon/templates/actor/maladies-poisons.html', 'systems/foundryvtt-reve-de-dragon/templates/actor/possessions.html', @@ -474,10 +466,6 @@ export class RdDUtility { return ajustementsEncaissement; } - static getDefinitionsBlessures() { - return definitionsBlessures; - } - /* -------------------------------------------- */ static getSegmentsFatigue(maxEnd) { maxEnd = Math.max(maxEnd, 1); @@ -618,17 +606,10 @@ export class RdDUtility { encaissement.dmg.loc.label = encaissement.dmg.loc.label ?? 'Corps;'; encaissement.roll = roll; encaissement.armure = armure; + encaissement.penetration = rollData.arme?.system.penetration ?? 0; encaissement.total = jetTotal; encaissement.vie = await RdDUtility._evaluatePerte(encaissement.vie, over20); encaissement.endurance = await RdDUtility._evaluatePerte(encaissement.endurance, over20); - encaissement.penetration = rollData.arme?.system.penetration ?? 0; - encaissement.blessures = ( - encaissement.critiques > 0 ? "Critique" : - encaissement.graves > 0 ? "Grave" : - encaissement.legeres > 0 ? "Légère" : - encaissement.eraflures > 0 ? "Contusions/Eraflures" : - 'Aucune' - ); return encaissement; } diff --git a/styles/simple.css b/styles/simple.css index df341346..f5144534 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -186,7 +186,7 @@ i:is(.fas, .far) { } .system-foundryvtt-reve-de-dragon .sheet-header :is(.header-compteurs,.header-etats,.profile-img, .profile-img-token){ - padding: 0 3%; + padding: 0 0.4rem; } .system-foundryvtt-reve-de-dragon .sheet-header :is(.profile-img, .profile-img-token) { @@ -213,11 +213,13 @@ i:is(.fas, .far) { } .system-foundryvtt-reve-de-dragon .sheet-header .header-compteurs { + width: calc(60% - 110px - 1rem); text-align: right; max-width: fit-content; } .system-foundryvtt-reve-de-dragon .sheet-header div.header-etats { + width: calc(40% - 32px - 1rem); height: 48px; max-width: fit-content; flex: initial; diff --git a/template.json b/template.json index 4d1cfd28..a58c064c 100644 --- a/template.json +++ b/template.json @@ -179,7 +179,8 @@ "value": 10, "label": "Endurance", "derivee": false - } + }, + "bonusPotion": 0 }, "attributs": { "plusdom": { @@ -364,7 +365,8 @@ "value": 0, "label": "Fatigue", "derivee": true - } + }, + "bonusPotion": 0 }, "attributs": { "sconst": { diff --git a/templates/actor/blessure.hbs b/templates/actor/blessure.hbs index 7fed6645..16d9bc12 100644 --- a/templates/actor/blessure.hbs +++ b/templates/actor/blessure.hbs @@ -2,15 +2,18 @@ - {{system.labelGravite}} ({{system.localisation}}) + {{system.labelGravite}} + {{#if (gt system.gravite 6)}} + + + {{else}} {{#if system.premierssoins.done}} {{else}} - {{/if}} @@ -23,6 +26,10 @@ {{/if}} + {{/if}} + + {{system.localisation}} + diff --git a/templates/actor/blessure.html b/templates/actor/blessure.html deleted file mode 100644 index fb5b863d..00000000 --- a/templates/actor/blessure.html +++ /dev/null @@ -1,27 +0,0 @@ -
  • - - - {{title}} - - {{#if blessure.active}} - - - - - - - - - - - {{else}} - - - - - {{/if}} -
    • diff --git a/templates/actor/blessures.html b/templates/actor/blessures.html index f5ce7fa2..0974c2a0 100644 --- a/templates/actor/blessures.html +++ b/templates/actor/blessures.html @@ -3,6 +3,7 @@ Blessures Premiers soins Soins complets + Loc. Actions {{#each blessures as |blessure|}} diff --git a/templates/actor/header-effects.html b/templates/actor/header-effects.html index 3a94f93e..a1d52317 100644 --- a/templates/actor/header-effects.html +++ b/templates/actor/header-effects.html @@ -1,4 +1,4 @@ - +
    {{#if effects}} {{#each effects as |effect key|}} @@ -9,4 +9,4 @@ {{else}} Aucun effet actif {{/if}} - +
    diff --git a/templates/actor/header-etat.html b/templates/actor/header-etat.html index a2e30510..8d928cf5 100644 --- a/templates/actor/header-etat.html +++ b/templates/actor/header-etat.html @@ -1,8 +1,8 @@
    - {{system.compteurs.etat.label}}: {{system.compteurs.etat.value}} - Sur-encombrement: {{calc.surenc}} - {{calc.resumeBlessures}} +
    {{system.compteurs.etat.label}}: {{system.compteurs.etat.value}}
    +
    Sur-encombrement: {{calc.surenc}}
    +
    {{calc.resumeBlessures}}
    {{>"systems/foundryvtt-reve-de-dragon/templates/actor/header-effects.html"}}
    diff --git a/templates/chat-resultat-encaissement.html b/templates/chat-resultat-encaissement.html index 04d3ccd6..1950bf63 100644 --- a/templates/chat-resultat-encaissement.html +++ b/templates/chat-resultat-encaissement.html @@ -1,4 +1,5 @@ {{#if isGM}} +{{log this}} {{#if (gt endurance 0)}} De plus, {{alias}} a perdu {{endurance}} points d'endurance @@ -11,7 +12,7 @@ {{numberFormat dmg.total decimals=0 sign=true}} {{#if (eq dmg.mortalite 'non-mortel')~}}(coups non mortels) - {{~else if (eq dmg.mortalite 'cauchemar')}}(entité de cauchemar) + {{~else if (eq dmg.mortalite 'entiteincarnee')}}(entité incarnée) {{~/if}} @@ -22,15 +23,16 @@ {{~/unless}}, total: {{total}}
    {{alias}} - {{#if (eq dmg.mortalite 'cauchemar')}}subit le coup - {{else if eraflures}}subit une contusion - {{else if legeres}}subit une blessure légère - {{else if graves}}subit une blessure grave - {{else if critiques}}subit une blessure critique + {{#if (eq dmg.mortalite 'entiteincarnee')}}subit le coup {{else if mort}}vient de mourir + {{else if blessure}} + {{#if (gt blessure.system.gravite 0)}}subit une blessure {{blessure.system.labelGravite}} + {{else}}subit une contusion + {{~/if~}} {{else}}s'en sort sans une égratignure {{~/if~}} - {{~#unless (eq dmg.mortalite 'cauchemar')}} + + {{~#unless (eq dmg.mortalite 'entiteincarnee')}} {{#if dmg.loc.label}} {{#if (gt roll.total 0)}}({{dmg.loc.label}}){{/if}} {{/if}} @@ -39,7 +41,7 @@ {{~#if hasPlayerOwner}}, a perdu {{endurance}} points d'endurance {{#if (ne vie 0)}}, {{vie}} points de vie{{/if}} {{/if}} - {{#if (ne dmg.mortalite 'cauchemar')}} + {{#if (ne dmg.mortalite 'entiteincarnee')}} {{#if (gt endurance 1)}}et {{#if sonne}}est sonnécharge jusqu'à la fin du prochain round{{else}}n'est pas sonné{{/if}}! {{#if hasPlayerOwner}}Jet d'endurance : Jet d'endurance : {{jetEndurance}} / {{resteEndurance}}{{/if}} diff --git a/templates/item-blessure-sheet.html b/templates/item-blessure-sheet.html index a476506e..83037f2b 100644 --- a/templates/item-blessure-sheet.html +++ b/templates/item-blessure-sheet.html @@ -9,19 +9,19 @@ + {{/select}} - -
    - - -
    -
    + {{#if (lt system.gravite 7)}} +
    + + +
    - + {{#if system.premierssoins.done}}
    {{/if}} + {{/if}} {{#if options.isOwned}} {{>"systems/foundryvtt-reve-de-dragon/templates/item/temporel.hbs" this labeldebut="Obtenue" labelfin="Prochain jet"}}