diff --git a/Helpers/Characters/God.ini b/Helpers/Characters/God.ini
index 78014b4..ce1dfe0 100644
--- a/Helpers/Characters/God.ini
+++ b/Helpers/Characters/God.ini
@@ -156,7 +156,8 @@
b_split_sec=4
b_d_split_sec=4
b_aureola=2
- b_fluctus_res=0.25
+ b_fluctus_res=0.11
+ b_fluctus_base_res=2
b_fluctus_dmg=0.27
b_fluctus_max=40
b_dilluvium=4
diff --git a/Helpers/Characters/frene.ini b/Helpers/Characters/frene.ini
index 3384bef..48e4760 100644
--- a/Helpers/Characters/frene.ini
+++ b/Helpers/Characters/frene.ini
@@ -54,7 +54,7 @@
description=Macro de parade
self=
others=
- macro=!crit ?{Nombre de des de defense} I @{{you}|skillcost_Defense_impenetrable} @{{you}|general_effective_Defense_impenetrable} R @{{you}|general_effective_Rempart_parfait} c @{{you}|crit_level} S @{{you}|general_skilllevel_Encaissement} @{{you}|general_effective_Encaissement} H @{{you}|base_defense_dices} H @{{you}|exal_defense_dices} s @{{you}|general_defense_threshold} l @{{you}|general_defense_addall} A @{{you}|Skill_general_attribute_select_defense} t @{{you}|transcendence} - ?{Dégats a parer|0} a d n @{{you}|undescored_name} + @{{you}|general_item_shield3} v @{{you}|pctreceived} v @{{you}|pctreceived_s} v @{{you}|pctreceived_b} v @{{you}|temp_pdef} + @{{you}|temp_def}
+ macro=!crit ?{Nombre de des de defense} I @{{you}|skillcost_Defense_impenetrable} @{{you}|general_effective_Defense_impenetrable} R @{{you}|general_effective_Rempart_parfait} c @{{you}|crit_level} S @{{you}|general_skilllevel_Encaissement} @{{you}|general_effective_Encaissement} H @{{you}|base_defense_dices} H @{{you}|exal_defense_dices} s @{{you}|general_defense_threshold} l @{{you}|general_defense_addall} A @{{you}|Skill_general_attribute_select_defense} t @{{you}|transcendence} - ?{Dégats a parer|0} a d n @{{you}|undescored_name} + @{{you}|general_item_shield3} v @{{you}|pctreceived} v @{{you}|pctreceived_s} v @{{you}|pctreceived_b} v @{{you}|temp_pdef} + @{{you}|temp_def} + ?{Type d'attaque|Physique,@{{you}|general_skilllevel_res_physique_effective}|Magique,@{{you}|general_skilllevel_res_magique_effective}|Voile,@{{you}|general_skilllevel_res_voile_effective}|Divine,@{{you}|general_skilllevel_res_divine_effective}|Existence,0} + @{{you}|general_skilllevel_res_omega_effective}
!setattr --name @{{you}|character_name} --temp_pdef|0 --temp_def|0
[refresh_marques]
diff --git a/Helpers/Characters/npc.ini b/Helpers/Characters/npc.ini
index 5f8cc4a..6152070 100644
--- a/Helpers/Characters/npc.ini
+++ b/Helpers/Characters/npc.ini
@@ -31,7 +31,7 @@
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}|selected,@{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} 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 t--name @{selected|character_name} --temp_pdef|0 --temp_def|0
[parade_brute_macro]
diff --git a/Helpers/Characters/reginald.ini b/Helpers/Characters/reginald.ini
index b55328b..a26c2a7 100644
--- a/Helpers/Characters/reginald.ini
+++ b/Helpers/Characters/reginald.ini
@@ -55,7 +55,7 @@
description=Macro de parade
self=
others=
- macro=!crit ?{Nombre de des de defense} I @{{you}|skillcost_Defense_impenetrable} @{{you}|general_effective_Defense_impenetrable} R @{{you}|general_effective_Rempart_parfait} c @{{you}|crit_level} S @{{you}|general_skilllevel_Encaissement} @{{you}|general_effective_Encaissement} H @{{you}|base_defense_dices} H @{{you}|exal_defense_dices} s @{{you}|general_defense_threshold} l @{{you}|general_defense_addall} A @{{you}|Skill_general_attribute_select_defense} t @{{you}|transcendence} - ?{Dégats a parer|0} a d n @{{you}|undescored_name} + @{{you}|general_effective_shield1} + @{{you}|general_effective_shield2} + @{{you}|general_effective_shield3} v @{{you}|pctreceived} v @{{you}|pctreceived_s} v @{{you}|pctreceived_b} v @{{you}|temp_pdef} v @{{you}|cylpeos_res} + @{{you}|temp_def} + ?{Type d'attaque|Physique,@{{you}|general_skilllevel_res_physique_effective}|Magique,@{{you}|general_skilllevel_res_magique_effective}|{you},@{{you}|general_skilllevel_res_voile_effective}|Divine,@{{you}|general_skilllevel_res_divine_effective}|Existence,0} + @{{you}|general_skilllevel_res_omega_effective}
+ macro=!crit ?{Nombre de des de defense} I @{{you}|skillcost_Defense_impenetrable} @{{you}|general_effective_Defense_impenetrable} R @{{you}|general_effective_Rempart_parfait} c @{{you}|crit_level} S @{{you}|general_skilllevel_Encaissement} @{{you}|general_effective_Encaissement} H @{{you}|base_defense_dices} H @{{you}|exal_defense_dices} s @{{you}|general_defense_threshold} l @{{you}|general_defense_addall} A @{{you}|Skill_general_attribute_select_defense} t @{{you}|transcendence} - ?{Dégats a parer|0} a d n @{{you}|undescored_name} + @{{you}|general_effective_shield1} + @{{you}|general_effective_shield2} + @{{you}|general_effective_shield3} v @{{you}|pctreceived} v @{{you}|pctreceived_s} v @{{you}|pctreceived_b} v @{{you}|temp_pdef} v @{{you}|cylpeos_res} + @{{you}|temp_def} + ?{Type d'attaque|Physique,@{{you}|general_skilllevel_res_physique_effective}|Magique,@{{you}|general_skilllevel_res_magique_effective}|Voile,@{{you}|general_skilllevel_res_voile_effective}|Divine,@{{you}|general_skilllevel_res_divine_effective}|Existence,0} + @{{you}|general_skilllevel_res_omega_effective}
!setattr --name @{{you}|character_name} --temp_pdef|0 --temp_def|0
[turn]
@@ -281,10 +281,10 @@
display_name = Praeter Arcanum : Fluctus
type = Passif/Reserve
description = Quand vous lancez un arcanum, gagnez un points de flux. Cette ressource expire en [[{X}]] heures. Pour chaque point de flux que vous avez bénéficiez d'une reduction des dégats de [[{X}*{b_fluctus_res}]]% et une augmentation de toutes vos affinitées de [[floor({X}*{b_fluctus_dmg})]]
- self = &{template:default} {{name=Fluctus}} {{Total=[[@{{you}|fluctus}]]}} {{Dégats reduits=[[{floor({X}*{b_fluctus_res}*@{{you}|fluctus}),89+{X}}kl1]]}} {{Affinité=[[{floor({X}*{b_fluctus_dmg}*@{{you}|fluctus}),20+{X}}kl1]]}}
+ self = &{template:default} {{name=Fluctus}} {{Total=[[@{{you}|fluctus}]]}} {{Dégats reduits=[[-1*{floor(({X}+{b_fluctus_base_res})*{b_fluctus_res}*@{{you}|fluctus}),89+{X}}kl1]]}} {{Affinité=[[{floor({X}*{b_fluctus_dmg}*@{{you}|fluctus}),20+{X}}kl1]]}}
others =
X = @{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}
- macro = !setattr --name {you} --pctreceived_s|[[-1*{floor({X}*{b_fluctus_res}*@{{you}|fluctus}),89+{X}}kl1]] --elem_omega|[[{floor({X}*{b_fluctus_dmg}*@{{you}|fluctus}),20+{X}}kl1]]
+ macro = !setattr --name {you} --pctreceived_s|[[-1*{floor(({X}+{b_fluctus_base_res})*{b_fluctus_res}*@{{you}|fluctus}),89+{X}}kl1]] --elem_omega|[[{floor({X}*{b_fluctus_dmg}*@{{you}|fluctus}),20+{X}}kl1]]
special =
[gain_fluctus]
diff --git a/Helpers/Characters/tian.ini b/Helpers/Characters/tian.ini
index c292d46..fefad37 100644
--- a/Helpers/Characters/tian.ini
+++ b/Helpers/Characters/tian.ini
@@ -58,7 +58,7 @@
description=Macro de parade magique
self=
others=
- macro=!crit ?{Nombre de des de defense} I @{{you}|skillcost_Defense_impenetrable} @{{you}|general_effective_Defense_impenetrable} R @{{you}|general_effective_Rempart_parfait} c @{{you}|crit_level} S @{{you}|general_skilllevel_Encaissement} @{{you}|general_effective_Encaissement} H @{{you}|base_defense_dices} H @{{you}|exal_defense_dices} s @{{you}|general_defense_threshold} l @{{you}|general_defense_addall} A @{{you}|Skill_general_attribute_select_defense} t @{{you}|transcendence} - ?{Dégats a parer|0} a d n @{{you}|undescored_name} + @{{you}|general_effective_shield3} v @{{you}|pctreceived} v @{{you}|pctreceived_s} v @{{you}|pctreceived_b} v @{{you}|temp_pdef} + @{{you}|temp_def} + @{Tian-Hu|elemental_dmg} + ?{Type d'attaque|Magique,@{{you}|general_skilllevel_res_magique_effective}|{you},@{{you}|general_skilllevel_res_voile_effective}|Divine,@{{you}|general_skilllevel_res_divine_effective}|Existence,0|Physique,@{{you}|general_skilllevel_res_physique_effective}} + @{{you}|general_skilllevel_res_omega_effective}
+ macro=!crit ?{Nombre de des de defense} I @{{you}|skillcost_Defense_impenetrable} @{{you}|general_effective_Defense_impenetrable} R @{{you}|general_effective_Rempart_parfait} c @{{you}|crit_level} S @{{you}|general_skilllevel_Encaissement} @{{you}|general_effective_Encaissement} H @{{you}|base_defense_dices} H @{{you}|exal_defense_dices} s @{{you}|general_defense_threshold} l @{{you}|general_defense_addall} A @{{you}|Skill_general_attribute_select_defense} t @{{you}|transcendence} - ?{Dégats a parer|0} a d n @{{you}|undescored_name} + @{{you}|general_effective_shield3} v @{{you}|pctreceived} v @{{you}|pctreceived_s} v @{{you}|pctreceived_b} v @{{you}|temp_pdef} + @{{you}|temp_def} + @{Tian-Hu|elemental_dmg} + ?{Type d'attaque|Magique,@{{you}|general_skilllevel_res_magique_effective}|Voile,@{{you}|general_skilllevel_res_voile_effective}|Divine,@{{you}|general_skilllevel_res_divine_effective}|Existence,0|Physique,@{{you}|general_skilllevel_res_physique_effective}} + @{{you}|general_skilllevel_res_omega_effective}
!setattr --name {you} --temp_pdef|0 --temp_def|0
[esquive]
diff --git a/Helpers/Characters/voile.ini b/Helpers/Characters/voile.ini
index 51c3723..52f55d2 100644
--- a/Helpers/Characters/voile.ini
+++ b/Helpers/Characters/voile.ini
@@ -114,7 +114,7 @@
description=Macro de parade
self=
others=
- macro=!crit ?{Nombre de des de defense} I @{{you}|skillcost_Defense_impenetrable} @{{you}|general_effective_Defense_impenetrable} R @{{you}|general_effective_Rempart_parfait} c @{{you}|crit_level} S @{{you}|general_skilllevel_Encaissement} @{{you}|general_effective_Encaissement} H @{{you}|base_defense_dices} H @{{you}|exal_defense_dices} s @{{you}|general_defense_threshold} l @{{you}|general_defense_addall} A @{{you}|Skill_general_attribute_select_defense} t @{{you}|transcendence} - ?{Dégats a parer|0} a d n @{{you}|undescored_name} + @{{you}|general_effective_shield1} + @{{you}|general_effective_shield2} + @{{you}|general_effective_shield3} v @{{you}|pctreceived} v @{{you}|pctreceived_s} v @{{you}|pctreceived_b} v @{{you}|temp_pdef} + @{{you}|temp_def} + @{{you}|momentum_esq} + @{{you}|tempo_par} + ?{Type d'attaque|Physique,@{{you}|general_skilllevel_res_physique_effective}|Magique,@{{you}|general_skilllevel_res_magique_effective}|{you},@{{you}|general_skilllevel_res_voile_effective}|Divine,@{{you}|general_skilllevel_res_divine_effective}|Existence,0} + @{{you}|general_skilllevel_res_omega_effective}
+ macro=!crit ?{Nombre de des de defense} I @{{you}|skillcost_Defense_impenetrable} @{{you}|general_effective_Defense_impenetrable} R @{{you}|general_effective_Rempart_parfait} c @{{you}|crit_level} S @{{you}|general_skilllevel_Encaissement} @{{you}|general_effective_Encaissement} H @{{you}|base_defense_dices} H @{{you}|exal_defense_dices} s @{{you}|general_defense_threshold} l @{{you}|general_defense_addall} A @{{you}|Skill_general_attribute_select_defense} t @{{you}|transcendence} - ?{Dégats a parer|0} a d n @{{you}|undescored_name} + @{{you}|general_effective_shield1} + @{{you}|general_effective_shield2} + @{{you}|general_effective_shield3} v @{{you}|pctreceived} v @{{you}|pctreceived_s} v @{{you}|pctreceived_b} v @{{you}|temp_pdef} + @{{you}|temp_def} + @{{you}|momentum_esq} + @{{you}|tempo_par} + ?{Type d'attaque|Physique,@{{you}|general_skilllevel_res_physique_effective}|Magique,@{{you}|general_skilllevel_res_magique_effective}|Voile,@{{you}|general_skilllevel_res_voile_effective}|Divine,@{{you}|general_skilllevel_res_divine_effective}|Existence,0} + @{{you}|general_skilllevel_res_omega_effective}
!setattr --name {you} --temp_pdef|0 --temp_def|0 --tempo_par|0
{m}change_momentum
@@ -122,7 +122,7 @@
description=Macro de parade magique
self=
others=
- macro=!crit ?{Nombre de des de defense} I @{{you}|skillcost_Defense_impenetrable} @{{you}|general_effective_Defense_impenetrable} R @{{you}|general_effective_Rempart_parfait} c @{{you}|crit_level} S @{{you}|general_skilllevel_Encaissement} @{{you}|general_effective_Encaissement} H @{{you}|base_defense_dices} H @{{you}|exal_defense_dices} s @{{you}|general_defense_threshold} l @{{you}|general_defense_addall} A @{{you}|Skill_general_attribute_select_defense} t @{{you}|transcendence} - ?{Dégats a parer|0} a d n @{{you}|undescored_name} + @{{you}|general_effective_shield3} v @{{you}|pctreceived} v @{{you}|pctreceived_s} v @{{you}|pctreceived_b} v @{{you}|temp_pdef} + @{{you}|temp_def} + @{{you}|momentum_esq} + ?{Type d'attaque|Magique,@{{you}|general_skilllevel_res_magique_effective}|{you},@{{you}|general_skilllevel_res_voile_effective}|Divine,@{{you}|general_skilllevel_res_divine_effective}|Existence,0|Physique,@{{you}|general_skilllevel_res_physique_effective}} + @{{you}|general_skilllevel_res_omega_effective}
+ macro=!crit ?{Nombre de des de defense} I @{{you}|skillcost_Defense_impenetrable} @{{you}|general_effective_Defense_impenetrable} R @{{you}|general_effective_Rempart_parfait} c @{{you}|crit_level} S @{{you}|general_skilllevel_Encaissement} @{{you}|general_effective_Encaissement} H @{{you}|base_defense_dices} H @{{you}|exal_defense_dices} s @{{you}|general_defense_threshold} l @{{you}|general_defense_addall} A @{{you}|Skill_general_attribute_select_defense} t @{{you}|transcendence} - ?{Dégats a parer|0} a d n @{{you}|undescored_name} + @{{you}|general_effective_shield3} v @{{you}|pctreceived} v @{{you}|pctreceived_s} v @{{you}|pctreceived_b} v @{{you}|temp_pdef} + @{{you}|temp_def} + @{{you}|momentum_esq} + ?{Type d'attaque|Magique,@{{you}|general_skilllevel_res_magique_effective}|Voile,@{{you}|general_skilllevel_res_voile_effective}|Divine,@{{you}|general_skilllevel_res_divine_effective}|Existence,0|Physique,@{{you}|general_skilllevel_res_physique_effective}} + @{{you}|general_skilllevel_res_omega_effective}
!setattr --name {you} --temp_pdef|0 --temp_def|0
{m}change_momentum
diff --git a/Helpers/Generated/frene_macro.html b/Helpers/Generated/frene_macro.html
index 9dadf84..d3218bb 100644
--- a/Helpers/Generated/frene_macro.html
+++ b/Helpers/Generated/frene_macro.html
@@ -18,7 +18,7 @@
[turn]
!setattr --name Jinyah --Life_Points|[[{@{Jinyah|Life_Points}+@{Jinyah|regen}-1*(@{Jinyah|dot}),@{Jinyah|Life_Points|max}}kl1]] --mana|[[{@{Jinyah|mana}+floor((@{Jinyah|base-psyche}+@{Eisvogel|base-psyche})/2+@{Jinyah|magic_skilllevel_vortex_mana}+@{Eisvogel|magic_skilllevel_vortex_mana}),@{Jinyah|mana|max}}kl1]]
[parade_brute_macro]
-!crit ?{Nombre de des de defense} I @{Jinyah|skillcost_Defense_impenetrable} @{Jinyah|general_effective_Defense_impenetrable} R @{Jinyah|general_effective_Rempart_parfait} c @{Jinyah|crit_level} S @{Jinyah|general_skilllevel_Encaissement} @{Jinyah|general_effective_Encaissement} H @{Jinyah|base_defense_dices} H @{Jinyah|exal_defense_dices} s @{Jinyah|general_defense_threshold} l @{Jinyah|general_defense_addall} A @{Jinyah|Skill_general_attribute_select_defense} t @{Jinyah|transcendence} - ?{Dégats a parer|0} a d n @{Jinyah|undescored_name} + @{Jinyah|general_item_shield3} v @{Jinyah|pctreceived} v @{Jinyah|pctreceived_s} v @{Jinyah|pctreceived_b} v @{Jinyah|temp_pdef} + @{Jinyah|temp_def}
+!crit ?{Nombre de des de defense} I @{Jinyah|skillcost_Defense_impenetrable} @{Jinyah|general_effective_Defense_impenetrable} R @{Jinyah|general_effective_Rempart_parfait} c @{Jinyah|crit_level} S @{Jinyah|general_skilllevel_Encaissement} @{Jinyah|general_effective_Encaissement} H @{Jinyah|base_defense_dices} H @{Jinyah|exal_defense_dices} s @{Jinyah|general_defense_threshold} l @{Jinyah|general_defense_addall} A @{Jinyah|Skill_general_attribute_select_defense} t @{Jinyah|transcendence} - ?{Dégats a parer|0} a d n @{Jinyah|undescored_name} + @{Jinyah|general_item_shield3} v @{Jinyah|pctreceived} v @{Jinyah|pctreceived_s} v @{Jinyah|pctreceived_b} v @{Jinyah|temp_pdef} + @{Jinyah|temp_def} + ?{Type d'attaque|Physique,@{Jinyah|general_skilllevel_res_physique_effective}|Magique,@{Jinyah|general_skilllevel_res_magique_effective}|Voile,@{Jinyah|general_skilllevel_res_voile_effective}|Divine,@{Jinyah|general_skilllevel_res_divine_effective}|Existence,0} + @{Jinyah|general_skilllevel_res_omega_effective}
!setattr --name @{Jinyah|character_name} --temp_pdef|0 --temp_def|0
[refresh_marques]
!token-mod --ignore-selected --set statusmarkers|frozen-orb:[[@{target|target|frostdamage}]]|bolt-shield:[[@{target|target|frostshield}]] --ids @{target|target|token_id}
diff --git a/Helpers/Generated/npc_macro.html b/Helpers/Generated/npc_macro.html
index 91fb34d..4e130f8 100644
--- a/Helpers/Generated/npc_macro.html
+++ b/Helpers/Generated/npc_macro.html
@@ -21,7 +21,7 @@
!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}
!setattr --name @{selected|character_name} --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}|selected,@{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} 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 t--name @{selected|character_name} --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}
diff --git a/Helpers/Generated/reginald.html b/Helpers/Generated/reginald.html
index d1a8907..c4db2f2 100644
--- a/Helpers/Generated/reginald.html
+++ b/Helpers/Generated/reginald.html
@@ -77,9 +77,9 @@
Type de technique
Passif/Reserve
Description
- Quand vous lancez un arcanum, gagnez un points de flux. Cette ressource expire en [[@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}]] heures. Pour chaque point de flux que vous avez bénéficiez d'une reduction des dégats de [[@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}*0.25]]% et une augmentation de toutes vos affinitées de [[floor(@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}*0.27)]]
+ Quand vous lancez un arcanum, gagnez un points de flux. Cette ressource expire en [[@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}]] heures. Pour chaque point de flux que vous avez bénéficiez d'une reduction des dégats de [[@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}*0.11]]% et une augmentation de toutes vos affinitées de [[floor(@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}*0.27)]]
Description personelle
- &{template:default} {{name=Fluctus}} {{Total=[[@{Reginald|fluctus}]]}} {{Dégats reduits=[[{floor(@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}*0.25*@{Reginald|fluctus}),89+@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}}kl1]]}} {{Affinité=[[{floor(@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}*0.27*@{Reginald|fluctus}),20+@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}}kl1]]}}
+ &{template:default} {{name=Fluctus}} {{Total=[[@{Reginald|fluctus}]]}} {{Dégats reduits=[[-1*{floor((@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}+2)*0.11*@{Reginald|fluctus}),89+@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}}kl1]]}} {{Affinité=[[{floor(@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}*0.27*@{Reginald|fluctus}),20+@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}}kl1]]}}
[Ultime] Arcanum Magnum : Diluvium [8]
Type de technique
diff --git a/Helpers/Generated/reginald_macro.html b/Helpers/Generated/reginald_macro.html
index 36e26d9..ec702cf 100644
--- a/Helpers/Generated/reginald_macro.html
+++ b/Helpers/Generated/reginald_macro.html
@@ -28,7 +28,7 @@ Foudre, [Elemental Arcana : Foudre] Reginald inflige [[[[floor((@{Reginald|elem_
!crit ?{Nombre de des de defense} I @{Reginald|skillcost_Defense_impenetrable} @{Reginald|general_effective_Defense_impenetrable} R @{Reginald|general_effective_Rempart_parfait} c @{Reginald|crit_level} S @{Reginald|general_skilllevel_Encaissement} @{Reginald|general_effective_Encaissement} H @{Reginald|base_defense_dices} H @{Reginald|exal_defense_dices} s @{Reginald|general_defense_threshold} l @{Reginald|general_defense_addall} A @{Reginald|Skill_general_attribute_select_defense} t @{Reginald|transcendence} - ?{Dégats a parer|0} a d n @{Reginald|undescored_name} + @{Reginald|general_effective_shield3} v @{Reginald|pctreceived} v @{Reginald|pctreceived_s} v @{Reginald|pctreceived_b} v @{Reginald|temp_pdef} v @{Reginald|cylpeos_res} + @{Reginald|temp_def} + ?{Type d'attaque|Magique,@{Reginald|general_skilllevel_res_magique_effective}|Reginald,@{Reginald|general_skilllevel_res_voile_effective}|Divine,@{Reginald|general_skilllevel_res_divine_effective}|Existence,0|Physique,@{Reginald|general_skilllevel_res_physique_effective}} + @{Reginald|general_skilllevel_res_omega_effective}
!setattr --name Reginald --temp_pdef|0 --temp_def|0
[parade_macro]
-!crit ?{Nombre de des de defense} I @{Reginald|skillcost_Defense_impenetrable} @{Reginald|general_effective_Defense_impenetrable} R @{Reginald|general_effective_Rempart_parfait} c @{Reginald|crit_level} S @{Reginald|general_skilllevel_Encaissement} @{Reginald|general_effective_Encaissement} H @{Reginald|base_defense_dices} H @{Reginald|exal_defense_dices} s @{Reginald|general_defense_threshold} l @{Reginald|general_defense_addall} A @{Reginald|Skill_general_attribute_select_defense} t @{Reginald|transcendence} - ?{Dégats a parer|0} a d n @{Reginald|undescored_name} + @{Reginald|general_effective_shield1} + @{Reginald|general_effective_shield2} + @{Reginald|general_effective_shield3} v @{Reginald|pctreceived} v @{Reginald|pctreceived_s} v @{Reginald|pctreceived_b} v @{Reginald|temp_pdef} v @{Reginald|cylpeos_res} + @{Reginald|temp_def} + ?{Type d'attaque|Physique,@{Reginald|general_skilllevel_res_physique_effective}|Magique,@{Reginald|general_skilllevel_res_magique_effective}|Reginald,@{Reginald|general_skilllevel_res_voile_effective}|Divine,@{Reginald|general_skilllevel_res_divine_effective}|Existence,0} + @{Reginald|general_skilllevel_res_omega_effective}
+!crit ?{Nombre de des de defense} I @{Reginald|skillcost_Defense_impenetrable} @{Reginald|general_effective_Defense_impenetrable} R @{Reginald|general_effective_Rempart_parfait} c @{Reginald|crit_level} S @{Reginald|general_skilllevel_Encaissement} @{Reginald|general_effective_Encaissement} H @{Reginald|base_defense_dices} H @{Reginald|exal_defense_dices} s @{Reginald|general_defense_threshold} l @{Reginald|general_defense_addall} A @{Reginald|Skill_general_attribute_select_defense} t @{Reginald|transcendence} - ?{Dégats a parer|0} a d n @{Reginald|undescored_name} + @{Reginald|general_effective_shield1} + @{Reginald|general_effective_shield2} + @{Reginald|general_effective_shield3} v @{Reginald|pctreceived} v @{Reginald|pctreceived_s} v @{Reginald|pctreceived_b} v @{Reginald|temp_pdef} v @{Reginald|cylpeos_res} + @{Reginald|temp_def} + ?{Type d'attaque|Physique,@{Reginald|general_skilllevel_res_physique_effective}|Magique,@{Reginald|general_skilllevel_res_magique_effective}|Voile,@{Reginald|general_skilllevel_res_voile_effective}|Divine,@{Reginald|general_skilllevel_res_divine_effective}|Existence,0} + @{Reginald|general_skilllevel_res_omega_effective}
!setattr --name @{Reginald|character_name} --temp_pdef|0 --temp_def|0
[turn]
!setattr --name Reginald --Life_Points|[[{@{Reginald|Life_Points}+@{Reginald|regen}-1*(@{Reginald|dot}),@{Reginald|Life_Points|max}}kl1]]
@@ -92,8 +92,8 @@ L'arcane dure [[(?{Magna Arcanum|0}*@{God|b_power_arcana}+1)@{God|b_duration}]]
/w Reginald **[Arcane Ultime : Aureola]** Si votre cible devait mourir ce tour ci, elle devient inciblable pendant une action a la place, elle récupére [[@{God|b_aureola}*@{Reginald|repeating_magic-arcanist-skills_-LkQOfa4fiV2tjKEmu7C_magic_arcanist_skilllevel}]] dés de sa reserve active et [[(@{Reginald|elem_eau_tot}+@{Reginald|elem_omega})*@{Reginald|repeating_magic-arcanist-skills_-LkQOfa4fiV2tjKEmu7C_magic_arcanist_skilllevel}]] points de vie. Si la cible est sous l'effet d'une ou plusieurs alterations d'état négatives, retirez les, et appliquez les soins normalement.
Une auréole se forme au dessus de votre tête et une voix angélique vous murmure : "N'aie peur, car je suis a tes cotés; ne crains pas l'adversité car je suis ton alliée; la mort n'aura pas de prise sur toi tant que je serai là"
[show_fluctus]
-!setattr --name Reginald --pctreceived_s|[[-1*{floor(@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}*@{God|b_fluctus_res}*@{Reginald|fluctus}),89+@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}}kl1]] --elem_omega|[[{floor(@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}*@{God|b_fluctus_dmg}*@{Reginald|fluctus}),20+@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}}kl1]]
-/w Reginald &{template:default} {{name=Fluctus}} {{Total=[[@{Reginald|fluctus}]]}} {{Dégats reduits=[[{floor(@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}*@{God|b_fluctus_res}*@{Reginald|fluctus}),89+@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}}kl1]]}} {{Affinité=[[{floor(@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}*@{God|b_fluctus_dmg}*@{Reginald|fluctus}),20+@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}}kl1]]}}
+!setattr --name Reginald --pctreceived_s|[[-1*{floor((@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}+@{God|b_fluctus_base_res})*@{God|b_fluctus_res}*@{Reginald|fluctus}),89+@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}}kl1]] --elem_omega|[[{floor(@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}*@{God|b_fluctus_dmg}*@{Reginald|fluctus}),20+@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}}kl1]]
+/w Reginald &{template:default} {{name=Fluctus}} {{Total=[[@{Reginald|fluctus}]]}} {{Dégats reduits=[[-1*{floor((@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}+@{God|b_fluctus_base_res})*@{God|b_fluctus_res}*@{Reginald|fluctus}),89+@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}}kl1]]}} {{Affinité=[[{floor(@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}*@{God|b_fluctus_dmg}*@{Reginald|fluctus}),20+@{Reginald|repeating_magic-arcanist-skills_-LkQWgSHgZEPZZfjYA7Q_magic_arcanist_skilllevel}}kl1]]}}
[gain_fluctus]
!setattr --name Reginald --fluctus|[[{@{Reginald|fluctus}+@{God|b_fluctus_gain},@{God|b_fluctus_max}}kl1]]
[diluvium]
diff --git a/Helpers/Generated/tian_macro.html b/Helpers/Generated/tian_macro.html
index ebe87da..ce403ff 100644
--- a/Helpers/Generated/tian_macro.html
+++ b/Helpers/Generated/tian_macro.html
@@ -20,7 +20,7 @@
!crit ?{Nombre de des de defense} I @{Tian-Hu|skillcost_Defense_impenetrable} @{Tian-Hu|general_effective_Defense_impenetrable} R @{Tian-Hu|general_effective_Rempart_parfait} c @{Tian-Hu|crit_level} S @{Tian-Hu|general_skilllevel_Encaissement} @{Tian-Hu|general_effective_Encaissement} H @{Tian-Hu|base_defense_dices} H @{Tian-Hu|exal_defense_dices} s @{Tian-Hu|general_defense_threshold} l @{Tian-Hu|general_defense_addall} A @{Tian-Hu|Skill_general_attribute_select_defense} t @{Tian-Hu|transcendence} - ?{Dégats a parer|0} a d n @{Tian-Hu|undescored_name} + @{Tian-Hu|general_effective_shield1} + @{Tian-Hu|general_effective_shield2} + @{Tian-Hu|general_effective_shield3} v @{Tian-Hu|pctreceived} v @{Tian-Hu|pctreceived_s} v @{Tian-Hu|pctreceived_b} v @{Tian-Hu|temp_pdef} + @{Tian-Hu|temp_def} v @{Tian-Hu|pctreceived_in} + @{Tian-Hu|elemental_dmg} + ?{Type d'attaque|Physique,@{Tian-Hu|general_skilllevel_res_physique_effective}|Magique,@{Tian-Hu|general_skilllevel_res_magique_effective}|Voile,@{Tian-Hu|general_skilllevel_res_voile_effective}|Divine,@{Tian-Hu|general_skilllevel_res_divine_effective}|Existence,0} + @{Tian-Hu|general_skilllevel_res_omega_effective}
!setattr --name Tian-Hu --temp_pdef|0 --temp_def|0
[parade_brute_macro]
-!crit ?{Nombre de des de defense} I @{Tian-Hu|skillcost_Defense_impenetrable} @{Tian-Hu|general_effective_Defense_impenetrable} R @{Tian-Hu|general_effective_Rempart_parfait} c @{Tian-Hu|crit_level} S @{Tian-Hu|general_skilllevel_Encaissement} @{Tian-Hu|general_effective_Encaissement} H @{Tian-Hu|base_defense_dices} H @{Tian-Hu|exal_defense_dices} s @{Tian-Hu|general_defense_threshold} l @{Tian-Hu|general_defense_addall} A @{Tian-Hu|Skill_general_attribute_select_defense} t @{Tian-Hu|transcendence} - ?{Dégats a parer|0} a d n @{Tian-Hu|undescored_name} + @{Tian-Hu|general_effective_shield3} v @{Tian-Hu|pctreceived} v @{Tian-Hu|pctreceived_s} v @{Tian-Hu|pctreceived_b} v @{Tian-Hu|temp_pdef} + @{Tian-Hu|temp_def} + @{Tian-Hu|elemental_dmg} + ?{Type d'attaque|Magique,@{Tian-Hu|general_skilllevel_res_magique_effective}|Tian-Hu,@{Tian-Hu|general_skilllevel_res_voile_effective}|Divine,@{Tian-Hu|general_skilllevel_res_divine_effective}|Existence,0|Physique,@{Tian-Hu|general_skilllevel_res_physique_effective}} + @{Tian-Hu|general_skilllevel_res_omega_effective}
+!crit ?{Nombre de des de defense} I @{Tian-Hu|skillcost_Defense_impenetrable} @{Tian-Hu|general_effective_Defense_impenetrable} R @{Tian-Hu|general_effective_Rempart_parfait} c @{Tian-Hu|crit_level} S @{Tian-Hu|general_skilllevel_Encaissement} @{Tian-Hu|general_effective_Encaissement} H @{Tian-Hu|base_defense_dices} H @{Tian-Hu|exal_defense_dices} s @{Tian-Hu|general_defense_threshold} l @{Tian-Hu|general_defense_addall} A @{Tian-Hu|Skill_general_attribute_select_defense} t @{Tian-Hu|transcendence} - ?{Dégats a parer|0} a d n @{Tian-Hu|undescored_name} + @{Tian-Hu|general_effective_shield3} v @{Tian-Hu|pctreceived} v @{Tian-Hu|pctreceived_s} v @{Tian-Hu|pctreceived_b} v @{Tian-Hu|temp_pdef} + @{Tian-Hu|temp_def} + @{Tian-Hu|elemental_dmg} + ?{Type d'attaque|Magique,@{Tian-Hu|general_skilllevel_res_magique_effective}|Voile,@{Tian-Hu|general_skilllevel_res_voile_effective}|Divine,@{Tian-Hu|general_skilllevel_res_divine_effective}|Existence,0|Physique,@{Tian-Hu|general_skilllevel_res_physique_effective}} + @{Tian-Hu|general_skilllevel_res_omega_effective}
!setattr --name Tian-Hu --temp_pdef|0 --temp_def|0
[esquive]
!crit ?{Nombre de des d'esquive} I @{Tian-Hu|skillcost_Defense_impenetrable} @{Tian-Hu|general_effective_Defense_impenetrable} R @{Tian-Hu|general_effective_Rempart_parfait} c @{Tian-Hu|crit_level} H @{Tian-Hu|base_dodge_dices} A @{Tian-Hu|Skill_general_attribute_select_dodge} t @{Tian-Hu|transcendence} s ?{Seuil d'esquive} - ?{Dégats a esquiver|0} a e n @{Tian-Hu|undescored_name} v @{Tian-Hu|pctreceived} v @{Tian-Hu|pctreceived_s} v @{Tian-Hu|pctreceived_b} + @{Tian-Hu|temp_esq} + @{Tian-Hu|temp_pdef} v @{Tian-Hu|pctreceived_in}