From e99aab5ef21b1cbbb47654e00da497ee59bf8297 Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Sat, 24 Aug 2019 20:30:36 +0200 Subject: [PATCH] Pcthealing & some minor changes --- Helpers/Characters/God.ini | 4 ++-- Helpers/Characters/frene.ini | 5 +++-- Helpers/Characters/npc.ini | 22 +++++++++++++++----- Helpers/Characters/tian.ini | 2 +- Helpers/Characters/voile.ini | 2 +- Helpers/Generated/frene.html | 1 + Helpers/Generated/frene_macro.html | 3 ++- Helpers/Generated/npc_macro.html | 14 ++++++++----- Helpers/Generated/tian.html | 2 +- Helpers/Generated/tian_macro.html | 2 +- Helpers/Generated/voile.html | 2 +- Helpers/Generated/voile_macro.html | 2 +- crit.js | 17 +++++++++------ feuille_sysd10.html | 33 +++++++++++++++++++++++------- 14 files changed, 77 insertions(+), 34 deletions(-) diff --git a/Helpers/Characters/God.ini b/Helpers/Characters/God.ini index 633b856..768cd56 100644 --- a/Helpers/Characters/God.ini +++ b/Helpers/Characters/God.ini @@ -34,8 +34,8 @@ b_momentum_max=20 b_momentum_esq=2 b_momentum_sec=0.15 - b_impact=2.5 - b_impact_size=0.2 + b_impact=2.2 + b_impact_size=0.02 b_impact_size_base=4 b_adagio=2 b_tempo_dep=4 diff --git a/Helpers/Characters/frene.ini b/Helpers/Characters/frene.ini index 30d5e61..0c41b91 100644 --- a/Helpers/Characters/frene.ini +++ b/Helpers/Characters/frene.ini @@ -42,7 +42,7 @@ {prelude} fois par combat, si le personnage devrait subir des dégâts létaux, Stase Cryogénique est utilisé sur lui-même a la place. Il vous reste {colere} utilisations de **[Colere de l'Aspect]** others= - macro={vset} {you} --temp_dmg|0 --temp_pdmg|0 --temp_esq|0 --temp_def|0 --temp_pdef|0 --regen|0 --dot|0 --frostdamage|0 --frostshield|0 --mana|@{{you}|mana|max} --pctreceived_b|0 --pctreceived_s|0 --general_item_shield3|[[floor({garde}*{a_air}/{b_garde_aspect})]] --colere_stacks|[[{colere}{b_colere_max}]] --elem_omega|0 --pcthealing|100 --shieldregen|0 --grieviouswounds|1 + macro={vset} {you} --temp_dmg|0 --temp_pdmg|0 --temp_esq|0 --temp_def|0 --temp_pdef|0 --regen|0 --dot|0 --frostdamage|0 --frostshield|0 --mana|@{{you}|mana|max} --pctreceived_b|0 --pctreceived_s|0 --general_item_shield3|[[floor({garde}*(@{Jinyah|elem_air_tot}/2+@{Eisvogel|elem_air_tot})/{b_garde_aspect})]] --colere_stacks|[[{colere}{b_colere_max}]] --elem_omega|0 --pcthealing|100 --shieldregen|0 --grieviouswounds|1 [turn] description=Macro de début de tour @@ -113,9 +113,10 @@ description= self= others=**Revigoration** [Coût : {mp}] Soigne {target} de [[floor({marques_s}*{X}*{a_eau}/{b_revigoration})]] points de vie. + [Appliquer le soin](! {m}healit [[{floor(@{{you}|pcthealing}*(@{target|target|Life_Points}+{marques_s}*{X}*{a_eau}/{b_revigoration})/100),@{target|target|Life_Points|max}}kl1]] special= macro={manasub}-{mp} - #!setattr --charid @{target|target|character_id} --Life_Points|[[{@{target|target|Life_Points}+{marques_s}*{X}*{a_eau}/{b_revigoration},@{target|target|Life_Points|max}}kl1]] + #!setattr --charid @{target|target|character_id} --Life_Points|[[{floor(@{{you}|pcthealing}*(@{target|target|Life_Points}+{marques_s}*{X}*{a_eau}/{b_revigoration})/100),@{target|target|Life_Points|max}}kl1]] [transfert_froid] level=Avancée diff --git a/Helpers/Characters/npc.ini b/Helpers/Characters/npc.ini index ee45d31..f8dec8a 100644 --- a/Helpers/Characters/npc.ini +++ b/Helpers/Characters/npc.ini @@ -17,21 +17,21 @@ description=Macro d'attaque self= others= - macro=!crit ?{Nombre de des d'attaque} P @{selected|general_effective_Perfection} c @{selected|crit_level} M @{selected|skillcost_Technique_martiale} @{selected|general_effective_Technique_martiale} E @{selected|skillcost_Exploiter_les_points_faibles} @{selected|general_effective_Exploiter_les_points_faibles} F @{selected|general_effective_Fauchage} D @{selected|general_effective_Coup_dechirant} H @{selected|base_damage_dices} H @{selected|exal_damage_dices} A @{selected|Skill_general_attribute_select_attaque} s @{selected|general_attack_threshold} l @{selected|general_attack_addall} a a n @{selected|undescored_name} + @{selected|additional_damage_dices} + @{selected|general_effective_weapon1} + @{selected|general_effective_weapon2} t @{selected|transcendence} + @{selected|general_effective_weapon3} f @{selected|pctinflicted} f @{selected|pctinflicted_s} f @{selected|pctinflicted_b} + @{selected|temp_dmg} f @{selected|temp_pdmg} + macro=!crit ?{Nombre de des d'attaque|0} P @{selected|general_effective_Perfection} c @{selected|crit_level} M @{selected|skillcost_Technique_martiale} @{selected|general_effective_Technique_martiale} E @{selected|skillcost_Exploiter_les_points_faibles} @{selected|general_effective_Exploiter_les_points_faibles} F @{selected|general_effective_Fauchage} D @{selected|general_effective_Coup_dechirant} H @{selected|base_damage_dices} H @{selected|exal_damage_dices} A @{selected|Skill_general_attribute_select_attaque} s @{selected|general_attack_threshold} l @{selected|general_attack_addall} a a n @{selected|undescored_name} + @{selected|additional_damage_dices} + @{selected|general_effective_weapon1} + @{selected|general_effective_weapon2} t @{selected|transcendence} + @{selected|general_effective_weapon3} f @{selected|pctinflicted} f @{selected|pctinflicted_s} f @{selected|pctinflicted_b} + @{selected|temp_dmg} f @{selected|temp_pdmg} !setattr --charid @{selected|character_id} --temp_pdmg|0 --temp_dmg|0 [esquive_macro] description=Macro d'esquive self= others= - macro=!crit ?{Nombre de des d'esquive} I @{selected|skillcost_Defense_impenetrable} @{selected|general_effective_Defense_impenetrable} R @{selected|general_effective_Rempart_parfait} c @{selected|crit_level} H @{selected|base_dodge_dices} A @{selected|Skill_general_attribute_select_dodge} t @{selected|transcendence} s ?{selected|Seuil d'esquive} - ?{Dégats a esquiver|0} a e n @{selected|undescored_name} v @{selected|pctreceived} v @{selected|pctreceived_s} v @{selected|pctreceived_b} + @{selected|temp_esq} + macro=!crit ?{Nombre de des d'esquive|0} I @{selected|skillcost_Defense_impenetrable} @{selected|general_effective_Defense_impenetrable} R @{selected|general_effective_Rempart_parfait} c @{selected|crit_level} H @{selected|base_dodge_dices} A @{selected|Skill_general_attribute_select_dodge} t @{selected|transcendence} s ?{selected|Seuil d'esquive|0} - ?{Dégats a esquiver|0} a e n @{selected|undescored_name} v @{selected|pctreceived} v @{selected|pctreceived_s} v @{selected|pctreceived_b} + @{selected|temp_esq} !setattr --charid @{selected|character_id} --temp_esq|0 [parade_macro] description=Macro de parade self= others= - macro=!crit ?{Nombre de des de defense} I @{selected|skillcost_Defense_impenetrable} @{selected|general_effective_Defense_impenetrable} R @{selected|general_effective_Rempart_parfait} c @{selected|crit_level} S @{selected|general_skilllevel_Encaissement} @{selected|general_effective_Encaissement} H @{selected|base_defense_dices} H @{selected|exal_defense_dices} s @{selected|general_defense_threshold} l @{selected|general_defense_addall} A @{selected|Skill_general_attribute_select_defense} t @{selected|transcendence} - ?{Dégats a parer|0} a d n @{selected|undescored_name} + @{selected|general_effective_shield1} + @{selected|general_effective_shield2} + @{selected|general_effective_shield3} v @{selected|pctreceived} v @{selected|pctreceived_s} v @{selected|pctreceived_b} v @{selected|temp_pdef} + @{selected|temp_def} + ?{Type d'attaque|Physique,@{selected|general_skilllevel_res_physique_effective}|Magique,@{selected|general_skilllevel_res_magique_effective}|Voile,@{selected|general_skilllevel_res_voile_effective}|Divine,@{selected|general_skilllevel_res_divine_effective}|Existence,0} + @{selected|general_skilllevel_res_omega_effective} + macro=!crit ?{Nombre de des de defense|0} I @{selected|skillcost_Defense_impenetrable} @{selected|general_effective_Defense_impenetrable} R @{selected|general_effective_Rempart_parfait} c @{selected|crit_level} S @{selected|general_skilllevel_Encaissement} @{selected|general_effective_Encaissement} H @{selected|base_defense_dices} H @{selected|exal_defense_dices} s @{selected|general_defense_threshold} l @{selected|general_defense_addall} A @{selected|Skill_general_attribute_select_defense} t @{selected|transcendence} - ?{Dégats a parer|0} a d n @{selected|undescored_name} + @{selected|general_effective_shield1} + @{selected|general_effective_shield2} + @{selected|general_effective_shield3} v @{selected|pctreceived} v @{selected|pctreceived_s} v @{selected|pctreceived_b} v @{selected|temp_pdef} + @{selected|temp_def} + ?{Type d'attaque|Physique,@{selected|general_skilllevel_res_physique_effective}|Magique,@{selected|general_skilllevel_res_magique_effective}|Voile,@{selected|general_skilllevel_res_voile_effective}|Divine,@{selected|general_skilllevel_res_divine_effective}|Existence,0} + @{selected|general_skilllevel_res_omega_effective} !setattr --charid @{selected|character_id} --temp_pdef|0 --temp_def|0 [parade_brute_macro] @@ -45,7 +45,7 @@ description=Macro de Tir self= others= - macro=!crit ?{Nombre de des de tir} T @{selected|skillcost_Tir_precis} @{selected|general_effective_Tir_precis} i @{selected|general_effective_Tir_implacable} M @{selected|skillcost_Technique_martiale} @{selected|general_effective_Technique_martiale} E @{selected|skillcost_Exploiter_les_points_faibles} @{selected|general_effective_Exploiter_les_points_faibles} L @{selected|base_shoot_dices} c @{selected|crit_level} l @{selected|add_shoot_dices} t @{selected|transcendence} s ?{Seuil de tir|6} a a n @{selected|undescored_name} f @{selected|pctinflicted} f @{selected|pctinflicted_s} f @{selected|pctinflicted_b} + macro=!crit ?{Nombre de des de tir|0} T @{selected|skillcost_Tir_precis} @{selected|general_effective_Tir_precis} i @{selected|general_effective_Tir_implacable} M @{selected|skillcost_Technique_martiale} @{selected|general_effective_Technique_martiale} E @{selected|skillcost_Exploiter_les_points_faibles} @{selected|general_effective_Exploiter_les_points_faibles} L @{selected|base_shoot_dices} c @{selected|crit_level} l @{selected|add_shoot_dices} t @{selected|transcendence} s ?{Seuil de tir|6} a a n @{selected|undescored_name} f @{selected|pctinflicted} f @{selected|pctinflicted_s} f @{selected|pctinflicted_b} [place_aoe] description= @@ -117,4 +117,16 @@ description= self= others= - macro=&{template:d10skillcheck}{{name=@{selected|character_name}}} {{roll_name=Jet de résistance}} {{result=[[?{Type|Magique, @{selected|general_skilllevel_res_magique}|Physique, @{selected|general_skilllevel_res_physique}|Voile, @{selected|general_skilllevel_res_voile}|Divine, @{selected|general_skilllevel_res_divine}|Existence, @{selected|general_skilllevel_res_omega}}+(?{Caractèristique|Volonté, @{selected|base-Volonte}+@{selected|exal-Volonte}|Force, @{selected|base-Force}+@{selected|exal-Force}|Spéciale, @{selected|base-custom}+@{selected|exal-custom}})-d?{Des|10}cs1]]}} + macro=&{template:d10skillcheck}{{name=@{selected|character_name}}} {{roll_name=Jet de résistance}} {{result=[[?{Type|Magique, @{selected|general_skilllevel_res_magique}|Physique, @{selected|general_skilllevel_res_physique}|Mentale, @{selected|general_skilllevel_res_mentale}|Voile, @{selected|general_skilllevel_res_voile}|Divine, @{selected|general_skilllevel_res_divine}|Existence, @{selected|general_skilllevel_res_omega}}+(?{Caractèristique|Volonté, @{selected|base-Volonte}+@{selected|exal-Volonte}|Force, @{selected|base-Force}+@{selected|exal-Force}|Spéciale, @{selected|base-custom}+@{selected|exal-custom}})-d?{Des|10}cs1]]}} + +[aurore] + description= + self= + others= + macro=!setattr --sel --mod --temp_def| + +[healit] + description= + self= + others= + macro=!setattr --charid @{target|character_id} --Life_Points| diff --git a/Helpers/Characters/tian.ini b/Helpers/Characters/tian.ini index 83c57d8..036da7a 100644 --- a/Helpers/Characters/tian.ini +++ b/Helpers/Characters/tian.ini @@ -112,7 +112,7 @@ description = Permet de régénérer contre du Qi le corps de l’utilisateur et/ou toute structure en harmonie(mémorisée) avec l’utilisateur. self = Vous régenerez [[{X}*{b_energymat_heal}]] points de vie, cette regeneration ne peut etre réduite vous pouvez regenerer une structure auquelle vous etes en harmonie a hauteur de [[{X}d10]] points de vie. type = Actif/Action et Réaction - others = **D’énergie et de matière** [Coût : {b_energy_cost} {D}] *{you} se régénère de [[{X}*{b_energymat_heal}]] PV irréductibles, @{target|T1|character_name} reçoit un soin supplémentaire de {X}d10 PV irréductibles.* + others = **D’énergie et de matière** [Coût : {b_energy_cost} {D}] *{you} se régénère de [[{X}*{b_energymat_heal}]] PV irréductibles, @{target|T1|character_name} reçoit un soin supplémentaire de [[{X}d10]] PV irréductibles.* cost = 8 X = @{Tian-Hu|repeating_general-combat-skills_-LkUznJg8I5Pu2dcLVPr_general_combat_skilllevel} macro = !setattr --name {you} --mod --qi|-{b_energy_cost} diff --git a/Helpers/Characters/voile.ini b/Helpers/Characters/voile.ini index cb509b3..026ca7b 100644 --- a/Helpers/Characters/voile.ini +++ b/Helpers/Characters/voile.ini @@ -329,7 +329,7 @@ others=** Contresang ** Le sang jaillit des veines de la main gauche de Voile pour combler les blessures. special = macro = {vset} {door} --mod --blood_gate|[[-{b_contresang_charge_level}*@{Voile|multiple_seals}]] - {vset} {you} --Life_Points|[[{@{{you}|Life_Points}+[[{b_contresang_soin}*@{Voile|multiple_seals}]],@{{you}|Life_Points|max}}kl1]] + {vset} {you} --Life_Points|[[{@{{you}|Life_Points}+[[floor(@{{you}|pcthealing}*{b_contresang_soin}/100)*@{Voile|multiple_seals}]],@{{you}|Life_Points|max}}kl1]] {reset_multiple} [Sang_de_Feu] diff --git a/Helpers/Generated/frene.html b/Helpers/Generated/frene.html index 83d0e2e..497c856 100644 --- a/Helpers/Generated/frene.html +++ b/Helpers/Generated/frene.html @@ -34,6 +34,7 @@ Actif/Instant Description publique **Revigoration** [Coût : 2] Soigne @{target|target|character_name} de [[floor(@{target|target|frostshield}*@{Jinyah|repeating_magic-aspected-skills_-Lk-Gm0UQajXFD5z2zat_magic_aspected_skilllevel}*(@{Jinyah|elem_eau_tot}/2+@{Eisvogel|elem_eau_tot}+@{Jinyah|elem_omega})/2)]] points de vie. + [Appliquer le soin](!
#healit [[{floor(@{Jinyah|pcthealing}*(@{target|target|Life_Points}+@{target|target|frostshield}*@{Jinyah|repeating_magic-aspected-skills_-Lk-Gm0UQajXFD5z2zat_magic_aspected_skilllevel}*(@{Jinyah|elem_eau_tot}/2+@{Eisvogel|elem_eau_tot}+@{Jinyah|elem_omega})/2)/100),@{target|target|Life_Points|max}}kl1]] [Avancée] Transfert de Froid [2] Type de technique diff --git a/Helpers/Generated/frene_macro.html b/Helpers/Generated/frene_macro.html index 21bd949..5f6780b 100644 --- a/Helpers/Generated/frene_macro.html +++ b/Helpers/Generated/frene_macro.html @@ -9,7 +9,7 @@
 Characters/frene.ini
 [start]
-!setattr --name Jinyah --temp_dmg|0 --temp_pdmg|0 --temp_esq|0 --temp_def|0 --temp_pdef|0 --regen|0 --dot|0 --frostdamage|0 --frostshield|0 --mana|@{Jinyah|mana|max} --pctreceived_b|0 --pctreceived_s|0 --general_item_shield3|[[floor(@{Jinyah|repeating_magic-aspected-skills_-Lk-H3by-ofAR9GZF4QH_magic_aspected_skilllevel}*(@{Jinyah|elem_air_tot}/2+@{Eisvogel|elem_air_tot}+@{Jinyah|elem_omega})/@{God|b_garde_aspect})]] --colere_stacks|[[@{Jinyah|repeating_magic-aspected-skills_-Lk-H4mC0xWsyjFR0rGK_magic_aspected_skilllevel}@{God|b_colere_max}]] --elem_omega|0 --pcthealing|100 --shieldregen|0 --grieviouswounds|1
+!setattr --name Jinyah --temp_dmg|0 --temp_pdmg|0 --temp_esq|0 --temp_def|0 --temp_pdef|0 --regen|0 --dot|0 --frostdamage|0 --frostshield|0 --mana|@{Jinyah|mana|max} --pctreceived_b|0 --pctreceived_s|0 --general_item_shield3|[[floor(@{Jinyah|repeating_magic-aspected-skills_-Lk-H3by-ofAR9GZF4QH_magic_aspected_skilllevel}*(@{Jinyah|elem_air_tot}/2+@{Eisvogel|elem_air_tot})/@{God|b_garde_aspect})]] --colere_stacks|[[@{Jinyah|repeating_magic-aspected-skills_-Lk-H4mC0xWsyjFR0rGK_magic_aspected_skilllevel}@{God|b_colere_max}]] --elem_omega|0 --pcthealing|100 --shieldregen|0 --grieviouswounds|1
 /w Jinyah Début du combat
 /w Jinyah Si vous ne pouvez plus agir, votre aspect gagne [[floor(@{Jinyah|repeating_magic-aspected-skills_-Lk-H0A4ZvDP4YcBL1NS_magic_aspected_skilllevel}@{God|b_simulation_aspect})]] actions supplémentaires jusqu'à la reprise de contrôle du personnage.
 /w Jinyah Reduit les dégats subits de [[floor(@{Jinyah|repeating_magic-aspected-skills_-Lk-H3by-ofAR9GZF4QH_magic_aspected_skilllevel}*(@{Jinyah|elem_air_tot}/2+@{Eisvogel|elem_air_tot}+@{Jinyah|elem_omega})/@{God|b_garde_aspect})]]
@@ -34,6 +34,7 @@
 [revigoration]
 !setattr --name Jinyah --mod --mana|-2
 **Revigoration** [Coût : 2]  Soigne @{target|target|character_name} de [[floor(@{target|target|frostshield}*@{Jinyah|repeating_magic-aspected-skills_-Lk-Gm0UQajXFD5z2zat_magic_aspected_skilllevel}*(@{Jinyah|elem_eau_tot}/2+@{Eisvogel|elem_eau_tot}+@{Jinyah|elem_omega})/@{God|b_revigoration})]] points de vie.
+[Appliquer le soin](!
#healit [[{floor(@{Jinyah|pcthealing}*(@{target|target|Life_Points}+@{target|target|frostshield}*@{Jinyah|repeating_magic-aspected-skills_-Lk-Gm0UQajXFD5z2zat_magic_aspected_skilllevel}*(@{Jinyah|elem_eau_tot}/2+@{Eisvogel|elem_eau_tot}+@{Jinyah|elem_omega})/@{God|b_revigoration})/100),@{target|target|Life_Points|max}}kl1]]
 [transfert_froid]
 !setattr --name Jinyah --mod --mana|-3
 **Transfert de Froid** [Coût : 3] Test DD+[[floor((@{Jinyah|elem_glace_tot}/2+@{Eisvogel|elem_glace_tot}+@{Jinyah|elem_omega})/@{God|b_transfert})]] pour resister. Transfère jusqu'à @{Jinyah|repeating_magic-aspected-skills_-Lk-Gn2T4CvHCEcxPHaZ_magic_aspected_skilllevel} effets Morsure de l'hiver d'une cible ennemie vers une autre au choix.
diff --git a/Helpers/Generated/npc_macro.html b/Helpers/Generated/npc_macro.html
index e9de5ae..3fc911e 100644
--- a/Helpers/Generated/npc_macro.html
+++ b/Helpers/Generated/npc_macro.html
@@ -15,19 +15,19 @@
 !setattr --sel --Life_Points|[[{@{selected|Life_Points}+floor(@{selected|regen}*@{selected|pcthealing}/100)-1*(@{selected|dot}),@{selected|Life_Points|max}}kl1]] --shield|[[{@{selected|shield}+@{selected|shieldregen},@{selected|shield|max}}]]
 /w gm Tour de @{selected|character_name}
 [attaque_macro]
-!crit ?{Nombre de des d'attaque} P @{selected|general_effective_Perfection} c @{selected|crit_level} M @{selected|skillcost_Technique_martiale} @{selected|general_effective_Technique_martiale} E @{selected|skillcost_Exploiter_les_points_faibles} @{selected|general_effective_Exploiter_les_points_faibles} F @{selected|general_effective_Fauchage} D @{selected|general_effective_Coup_dechirant} H @{selected|base_damage_dices} H @{selected|exal_damage_dices} A @{selected|Skill_general_attribute_select_attaque} s @{selected|general_attack_threshold} l @{selected|general_attack_addall} a a n @{selected|undescored_name} + @{selected|additional_damage_dices} + @{selected|general_effective_weapon1} + @{selected|general_effective_weapon2} t @{selected|transcendence} + @{selected|general_effective_weapon3} f @{selected|pctinflicted} f @{selected|pctinflicted_s} f @{selected|pctinflicted_b} + @{selected|temp_dmg} f @{selected|temp_pdmg}
+!crit ?{Nombre de des d'attaque|0} P @{selected|general_effective_Perfection} c @{selected|crit_level} M @{selected|skillcost_Technique_martiale} @{selected|general_effective_Technique_martiale} E @{selected|skillcost_Exploiter_les_points_faibles} @{selected|general_effective_Exploiter_les_points_faibles} F @{selected|general_effective_Fauchage} D @{selected|general_effective_Coup_dechirant} H @{selected|base_damage_dices} H @{selected|exal_damage_dices} A @{selected|Skill_general_attribute_select_attaque} s @{selected|general_attack_threshold} l @{selected|general_attack_addall} a a n @{selected|undescored_name} + @{selected|additional_damage_dices} + @{selected|general_effective_weapon1} + @{selected|general_effective_weapon2} t @{selected|transcendence} + @{selected|general_effective_weapon3} f @{selected|pctinflicted} f @{selected|pctinflicted_s} f @{selected|pctinflicted_b} + @{selected|temp_dmg} f @{selected|temp_pdmg}
 !setattr --charid @{selected|character_id} --temp_pdmg|0 --temp_dmg|0
 [esquive_macro]
-!crit ?{Nombre de des d'esquive} I @{selected|skillcost_Defense_impenetrable} @{selected|general_effective_Defense_impenetrable} R @{selected|general_effective_Rempart_parfait} c @{selected|crit_level} H @{selected|base_dodge_dices} A @{selected|Skill_general_attribute_select_dodge} t @{selected|transcendence} s ?{selected|Seuil d'esquive} - ?{Dégats a esquiver|0} a e n @{selected|undescored_name} v @{selected|pctreceived} v @{selected|pctreceived_s} v @{selected|pctreceived_b} + @{selected|temp_esq}
+!crit ?{Nombre de des d'esquive|0} I @{selected|skillcost_Defense_impenetrable} @{selected|general_effective_Defense_impenetrable} R @{selected|general_effective_Rempart_parfait} c @{selected|crit_level} H @{selected|base_dodge_dices} A @{selected|Skill_general_attribute_select_dodge} t @{selected|transcendence} s ?{selected|Seuil d'esquive|0} - ?{Dégats a esquiver|0} a e n @{selected|undescored_name} v @{selected|pctreceived} v @{selected|pctreceived_s} v @{selected|pctreceived_b} + @{selected|temp_esq}
 !setattr --charid @{selected|character_id} --temp_esq|0
 [parade_macro]
-!crit ?{Nombre de des de defense} I @{selected|skillcost_Defense_impenetrable} @{selected|general_effective_Defense_impenetrable} R @{selected|general_effective_Rempart_parfait} c @{selected|crit_level} S @{selected|general_skilllevel_Encaissement} @{selected|general_effective_Encaissement} H @{selected|base_defense_dices} H @{selected|exal_defense_dices} s @{selected|general_defense_threshold} l @{selected|general_defense_addall} A @{selected|Skill_general_attribute_select_defense} t @{selected|transcendence} - ?{Dégats a parer|0} a d n @{selected|undescored_name} + @{selected|general_effective_shield1} + @{selected|general_effective_shield2} + @{selected|general_effective_shield3} v @{selected|pctreceived} v @{selected|pctreceived_s} v @{selected|pctreceived_b} v @{selected|temp_pdef} + @{selected|temp_def} + ?{Type d'attaque|Physique,@{selected|general_skilllevel_res_physique_effective}|Magique,@{selected|general_skilllevel_res_magique_effective}|Voile,@{selected|general_skilllevel_res_voile_effective}|Divine,@{selected|general_skilllevel_res_divine_effective}|Existence,0} + @{selected|general_skilllevel_res_omega_effective}
+!crit ?{Nombre de des de defense|0} I @{selected|skillcost_Defense_impenetrable} @{selected|general_effective_Defense_impenetrable} R @{selected|general_effective_Rempart_parfait} c @{selected|crit_level} S @{selected|general_skilllevel_Encaissement} @{selected|general_effective_Encaissement} H @{selected|base_defense_dices} H @{selected|exal_defense_dices} s @{selected|general_defense_threshold} l @{selected|general_defense_addall} A @{selected|Skill_general_attribute_select_defense} t @{selected|transcendence} - ?{Dégats a parer|0} a d n @{selected|undescored_name} + @{selected|general_effective_shield1} + @{selected|general_effective_shield2} + @{selected|general_effective_shield3} v @{selected|pctreceived} v @{selected|pctreceived_s} v @{selected|pctreceived_b} v @{selected|temp_pdef} + @{selected|temp_def} + ?{Type d'attaque|Physique,@{selected|general_skilllevel_res_physique_effective}|Magique,@{selected|general_skilllevel_res_magique_effective}|Voile,@{selected|general_skilllevel_res_voile_effective}|Divine,@{selected|general_skilllevel_res_divine_effective}|Existence,0} + @{selected|general_skilllevel_res_omega_effective}
 !setattr --charid @{selected|character_id} --temp_pdef|0 --temp_def|0
 [parade_brute_macro]
 !crit ?{Nombre de des de defense} I @{selected|skillcost_Defense_impenetrable} @{selected|general_effective_Defense_impenetrable} R @{selected|general_effective_Rempart_parfait} c @{selected|crit_level} S @{selected|general_skilllevel_Encaissement} @{selected|general_effective_Encaissement} H @{selected|base_defense_dices} H @{selected|exal_defense_dices} s @{selected|general_defense_threshold} l @{selected|general_defense_addall} A @{selected|Skill_general_attribute_select_defense} t @{selected|transcendence} - ?{Dégats a parer|0} a d n @{selected|undescored_name} + @{selected|general_item_shield3} v @{selected|pctreceived} v @{selected|pctreceived_s} v @{selected|pctreceived_b} v @{selected|temp_pdef} + @{selected|temp_def} + ?{Type d'attaque|Physique,@{selected|general_skilllevel_res_physique_effective}|Magique,@{selected|general_skilllevel_res_magique_effective}|Voile,@{selected|general_skilllevel_res_voile_effective}|Divine,@{selected|general_skilllevel_res_divine_effective}|Existence,0} + @{selected|general_skilllevel_res_omega_effective}
 !setattr --charid @{selected|character_id} --temp_pdef|0 --temp_def|0
 [tir_macro]
-!crit ?{Nombre de des de tir} T @{selected|skillcost_Tir_precis} @{selected|general_effective_Tir_precis} i @{selected|general_effective_Tir_implacable} M @{selected|skillcost_Technique_martiale} @{selected|general_effective_Technique_martiale} E @{selected|skillcost_Exploiter_les_points_faibles} @{selected|general_effective_Exploiter_les_points_faibles} L @{selected|base_shoot_dices} c @{selected|crit_level} l @{selected|add_shoot_dices} t @{selected|transcendence} s ?{Seuil de tir|6} a a n @{selected|undescored_name} f @{selected|pctinflicted} f @{selected|pctinflicted_s} f @{selected|pctinflicted_b}
+!crit ?{Nombre de des de tir|0} T @{selected|skillcost_Tir_precis} @{selected|general_effective_Tir_precis} i @{selected|general_effective_Tir_implacable} M @{selected|skillcost_Technique_martiale} @{selected|general_effective_Technique_martiale} E @{selected|skillcost_Exploiter_les_points_faibles} @{selected|general_effective_Exploiter_les_points_faibles} L @{selected|base_shoot_dices} c @{selected|crit_level} l @{selected|add_shoot_dices} t @{selected|transcendence} s ?{Seuil de tir|6} a a n @{selected|undescored_name} f @{selected|pctinflicted} f @{selected|pctinflicted_s} f @{selected|pctinflicted_b}
 [place_aoe]
 !areasOfEffectApplyEffectAtToken @{target|token_id} ?{Specify radius:}
 [direction_aoe]
@@ -53,7 +53,11 @@
 [dmg.threshold]
 !setattr --charid @{target|T1|character_id} --general_attack_threshold|?{Seuil de defence}
 [resist]
-&{template:d10skillcheck}{{name=@{selected|character_name}}} {{roll_name=Jet de résistance}} {{result=[[?{Type|Magique, @{selected|general_skilllevel_res_magique}|Physique, @{selected|general_skilllevel_res_physique}|Voile, @{selected|general_skilllevel_res_voile}|Divine, @{selected|general_skilllevel_res_divine}|Existence, @{selected|general_skilllevel_res_omega}}+(?{Caractèristique|Volonté, @{selected|base-Volonte}+@{selected|exal-Volonte}|Force, @{selected|base-Force}+@{selected|exal-Force}|Spéciale, @{selected|base-custom}+@{selected|exal-custom}})-d?{Des|10}cs1]]}}
+&{template:d10skillcheck}{{name=@{selected|character_name}}} {{roll_name=Jet de résistance}} {{result=[[?{Type|Magique, @{selected|general_skilllevel_res_magique}|Physique, @{selected|general_skilllevel_res_physique}|Mentale, @{selected|general_skilllevel_res_mentale}|Voile, @{selected|general_skilllevel_res_voile}|Divine, @{selected|general_skilllevel_res_divine}|Existence, @{selected|general_skilllevel_res_omega}}+(?{Caractèristique|Volonté, @{selected|base-Volonte}+@{selected|exal-Volonte}|Force, @{selected|base-Force}+@{selected|exal-Force}|Spéciale, @{selected|base-custom}+@{selected|exal-custom}})-d?{Des|10}cs1]]}}
+[aurore]
+!setattr --sel --mod --temp_def|
+[healit]
+!setattr --charid @{target|character_id} --Life_Points|
 
diff --git a/Helpers/Generated/tian.html b/Helpers/Generated/tian.html index ecb029b..25a8885 100644 --- a/Helpers/Generated/tian.html +++ b/Helpers/Generated/tian.html @@ -39,7 +39,7 @@ Description personelle Vous régenerez [[@{Tian-Hu|repeating_general-combat-skills_-LkUznJg8I5Pu2dcLVPr_general_combat_skilllevel}*18]] points de vie, cette regeneration ne peut etre réduite vous pouvez regenerer une structure auquelle vous etes en harmonie a hauteur de [[@{Tian-Hu|repeating_general-combat-skills_-LkUznJg8I5Pu2dcLVPr_general_combat_skilllevel}d10]] points de vie. Description publique - **D’énergie et de matière** [Coût : 4 ☸] *Tian-Hu se régénère de [[@{Tian-Hu|repeating_general-combat-skills_-LkUznJg8I5Pu2dcLVPr_general_combat_skilllevel}*18]] PV irréductibles, @{target|T1|character_name} reçoit un soin supplémentaire de @{Tian-Hu|repeating_general-combat-skills_-LkUznJg8I5Pu2dcLVPr_general_combat_skilllevel}d10 PV irréductibles.* + **D’énergie et de matière** [Coût : 4 ☸] *Tian-Hu se régénère de [[@{Tian-Hu|repeating_general-combat-skills_-LkUznJg8I5Pu2dcLVPr_general_combat_skilllevel}*18]] PV irréductibles, @{target|T1|character_name} reçoit un soin supplémentaire de [[@{Tian-Hu|repeating_general-combat-skills_-LkUznJg8I5Pu2dcLVPr_general_combat_skilllevel}d10]] PV irréductibles.* [Avancée] Apothéose [8] Type de technique diff --git a/Helpers/Generated/tian_macro.html b/Helpers/Generated/tian_macro.html index 3679206..516b8d1 100644 --- a/Helpers/Generated/tian_macro.html +++ b/Helpers/Generated/tian_macro.html @@ -36,7 +36,7 @@ !setattr --name Tian-Hu --mod --qi|-@{God|b_energy_cost} !setattr --name Tian-Hu --Life_Points|[[{@{Tian-Hu|Life_Points}+@{Tian-Hu|repeating_general-combat-skills_-LkUznJg8I5Pu2dcLVPr_general_combat_skilllevel}*@{God|b_energymat_heal},@{Tian-Hu|Life_Points|max}}kl1]] /w Tian-Hu Vous régenerez [[@{Tian-Hu|repeating_general-combat-skills_-LkUznJg8I5Pu2dcLVPr_general_combat_skilllevel}*@{God|b_energymat_heal}]] points de vie, cette regeneration ne peut etre réduite vous pouvez regenerer une structure auquelle vous etes en harmonie a hauteur de [[@{Tian-Hu|repeating_general-combat-skills_-LkUznJg8I5Pu2dcLVPr_general_combat_skilllevel}d10]] points de vie. -**D’énergie et de matière** [Coût : @{God|b_energy_cost} ☸] *Tian-Hu se régénère de [[@{Tian-Hu|repeating_general-combat-skills_-LkUznJg8I5Pu2dcLVPr_general_combat_skilllevel}*@{God|b_energymat_heal}]] PV irréductibles, @{target|T1|character_name} reçoit un soin supplémentaire de @{Tian-Hu|repeating_general-combat-skills_-LkUznJg8I5Pu2dcLVPr_general_combat_skilllevel}d10 PV irréductibles.* +**D’énergie et de matière** [Coût : @{God|b_energy_cost} ☸] *Tian-Hu se régénère de [[@{Tian-Hu|repeating_general-combat-skills_-LkUznJg8I5Pu2dcLVPr_general_combat_skilllevel}*@{God|b_energymat_heal}]] PV irréductibles, @{target|T1|character_name} reçoit un soin supplémentaire de [[@{Tian-Hu|repeating_general-combat-skills_-LkUznJg8I5Pu2dcLVPr_general_combat_skilllevel}d10]] PV irréductibles.* [volonte_transcendantale] !setattr --name Tian-Hu --mod --qi|-@{God|b_volontee_cost} /w Tian-Hu Vous pouvez effectuer un jet de volonté pour resister a n’importe quelle altération, réduisez le DD de ce test de @{Tian-Hu|repeating_defensive-combat-skills_-LkV8B1ACFXFLZE7LqMT_defensive_combat_skilllevel}. diff --git a/Helpers/Generated/voile.html b/Helpers/Generated/voile.html index c398b30..4650198 100644 --- a/Helpers/Generated/voile.html +++ b/Helpers/Generated/voile.html @@ -124,7 +124,7 @@ Vous perdez votre momentum [Placer l'Impact](!
#place_aoe Impact) Description publique - ** Impact ** Un terrible impact sur une zone de [[floor((@{Voile|repeating_skills_-Lk0Mb-NlPrZS0G8qZEt_general_skilllevel}+4)*0.2*@{Voile|momentum})]] mètres infligeant [[@{Voile|repeating_skills_-Lk0Mb-NlPrZS0G8qZEt_general_skilllevel}*2.5*@{Voile|momentum}]] dégâts bonus à l’attaque + ** Impact ** Un terrible impact sur une zone de [[floor((@{Voile|repeating_skills_-Lk0Mb-NlPrZS0G8qZEt_general_skilllevel}+4)*0.02*@{Voile|momentum})]] mètres infligeant [[@{Voile|repeating_skills_-Lk0Mb-NlPrZS0G8qZEt_general_skilllevel}*2.2*@{Voile|momentum}]] dégâts bonus à l’attaque Spécial Système de stack augmentant en combat et diminuant lors de l’utilisation active des techniques liées. diff --git a/Helpers/Generated/voile_macro.html b/Helpers/Generated/voile_macro.html index 9afea4a..75f69ba 100644 --- a/Helpers/Generated/voile_macro.html +++ b/Helpers/Generated/voile_macro.html @@ -115,7 +115,7 @@ La vitesse et la puissance de Voile augmente, ne laissant apparaitre qu'une silh ** Sang ** Un éclat de douleur dans un éclat d'acier, voile inflige [[@{God|b_sang_dmg}*@{Voile|repeating_magic-vital-skills_-Lk0Ikx5LI0341mCvRDZ_magic_vital_skilllevel}*@{Voile|multiple_seals}]] blessures sur une cible a [[@{Voile|repeating_magic-vital-skills_-Lk0Ikx5LI0341mCvRDZ_magic_vital_skilllevel}]] metres d'elle. [Contresang] !setattr --name Hellsdoor --mod --blood_gate|[[-@{God|b_contresang_charge_level}*@{Voile|multiple_seals}]] -!setattr --name Voile --Life_Points|[[{@{Voile|Life_Points}+[[@{God|b_contresang_soin}*@{Voile|multiple_seals}]],@{Voile|Life_Points|max}}kl1]] +!setattr --name Voile --Life_Points|[[{@{Voile|Life_Points}+[[floor(@{Voile|pcthealing}*@{God|b_contresang_soin}/100)*@{Voile|multiple_seals}]],@{Voile|Life_Points|max}}kl1]] !setattr --name Voile --multiple_seals|1 /w Voile Vous regagnez [[@{God|b_contresang_soin}*@{Voile|repeating_magic-vital-skills_-Lk0J6g4u8NBNAFB3asT_magic_vital_skilllevel}*@{Voile|multiple_seals}]] points de vie ** Contresang ** Le sang jaillit des veines de la main gauche de Voile pour combler les blessures. diff --git a/crit.js b/crit.js index 65c81d9..5c8df31 100644 --- a/crit.js +++ b/crit.js @@ -160,6 +160,9 @@ on("chat:message", function(msg) { if (return_data.nb_hit>=Math.floor(hit_percent*len)){ return_data.is_hit=1; + if(d_vars.action=="e"&&return_data.nb_hit==0) { + return_data.is_hit=0; + } } if (return_data.nb_crit>=needed_to_crit){ return_data.is_crit=1; @@ -222,8 +225,8 @@ function show_rolls(who,d_vars){ //Add the rolls - msg+=add_thoose_dices(d_vars,d_vars.results,"",m_esq,m_crit); - if (d_vars.fauchage!=0) msg+=add_thoose_dices(d_vars,d_vars.cleave,"Fauchage: ",m_esq,m_crit); + msg+=add_thoose_dices(d_vars,d_vars.results,"",m_esq,m_crit,dice_stats); + if (d_vars.fauchage!=0) msg+=add_thoose_dices(d_vars,d_vars.cleave,"Fauchage: ",m_esq,m_crit,dice_stats); if (d_vars.coup_d!=0) msg_adds+="Coup déchirant: "+d_vars.coup_d_results.join(" ")+""; // Coup déchirant if (d_vars.technique_m!=0) msg_adds+="Technique martiale: "+d_vars.technique_result+""; // Technique martiale if (d_vars.relances!=0) msg_adds+="Relances: "+d_vars.relances+""; // Relances @@ -247,8 +250,10 @@ function show_rolls(who,d_vars){ } else { if (d_vars.action=="a"){ msg+="L'attaque ne touche pas sa cible (seuil "+d_vars.seuil+")"; - } else if (d_vars.action=="d"||d_vars.action=="e"){ - // Can't miss a block or a dodge + } else if (d_vars.action=="d"){ + // Can't miss a block + }else if (d_vars.action=="e"){ + msg+="L'esquive échoue (seuil "+d_vars.seuil+")"; } else { msg+="L'action est un echec (seuil "+d_vars.seuil+")"; } @@ -258,7 +263,7 @@ function show_rolls(who,d_vars){ //logit(msg_head+msg+msg_foot); } -function add_thoose_dices(d_vars,results,name,m_esq,m_crit){ +function add_thoose_dices(d_vars,results,name,m_esq,m_crit,dice_stats){ logit(results); var dices=" "+name; var is_below=0,is_acrit=0; @@ -310,7 +315,7 @@ function add_thoose_dices(d_vars,results,name,m_esq,m_crit){ if (d_vars.nb_2add!=0){dices+=")";}; if (d_vars.nb_2sub!=0){dices+=" - "+d_vars.nb_2sub;}; // Add everything to the sum - if (sum!=0){ + if (dice_stats.is_hit==1){ // If is_below never becomes 2, the action never was a hit sum+=Math.floor(((sum*m_esq+d_vars.on_hit_c+d_vars.attribute))*m_crit)+d_vars.nb_2add; } sum+=d_vars.defense_i_0+d_vars.exploiter_p_0+d_vars.charge+d_vars.technique_result+d_vars.encaissement_result; diff --git a/feuille_sysd10.html b/feuille_sysd10.html index 5e29fdb..92efcb4 100644 --- a/feuille_sysd10.html +++ b/feuille_sysd10.html @@ -919,11 +919,11 @@
- - - - - + + + - - + +
@@ -958,6 +958,25 @@
+ + + + + + + +