Added % damage dealt and received
This commit is contained in:
parent
89e04978c5
commit
3ed2c2ddde
26
crit.js
26
crit.js
|
|
@ -172,7 +172,7 @@ function show_rolls(who,d_vars){
|
|||
var msg="<tr><td class='sheet-name'>";
|
||||
var msg_foot="</tr></td></table></div>";
|
||||
var msg_adds="";
|
||||
var msg_relance="<a class='sheet-rolltemplate-d10fight' href='!crit 0 P "+d_vars.perfection+" I 1 "+d_vars.defense_i_0+" I 2 "+d_vars.defense_i_1+" I 4 "+d_vars.defense_i_2+" R "+d_vars.rempart_p+" F "+d_vars.fauchage+" E 1 "+d_vars.exploiter_p_0+" E 2 "+d_vars.exploiter_p_1+" E 4 "+d_vars.exploiter_p_2+" T 2 "+d_vars.tir_p_0+" T 4 "+d_vars.tir_p_1+" i "+d_vars.tir_i+" C "+d_vars.charge+" N "+d_vars.charge_i+" - "+d_vars.nb_2sub+" s "+d_vars.oseuil+" a "+d_vars.action+" H "+d_vars.on_hit_c+" A "+d_vars.attribute+" L "+d_vars.replace+" l "+d_vars.add_to_all+" m "+d_vars.max_dices+" n "+d_vars.player_name+" c "+d_vars.crit_level+" t "+d_vars.transcendence+" + "+(d_vars.nb_2add+d_vars.technique_result+d_vars.encaissement_result)+" r ?{Relances ?}";
|
||||
var msg_relance="<a class='sheet-rolltemplate-d10fight' href='!crit 0 A "+d_vars.attribute+" L "+d_vars.replace+" t "+d_vars.transcendence+" T 2 "+d_vars.tir_p_0+" s "+d_vars.seuil+" R "+d_vars.rempart_p+" i "+d_vars.tir_i+" f "+d_vars.pctinflicted+" l "+d_vars.add_to_all+" - "+d_vars.nb_2sub+" C "+d_vars.charge+" c "+d_vars.crit_level+" m "+d_vars.max_dices+" F "+d_vars.fauchage+" v "+d_vars.pctreceived+" P "+d_vars.perfection+" E 2 "+d_vars.exploiter_p_1+" E 1 "+d_vars.exploiter_p_0+" E 4 "+d_vars.exploiter_p_2+" I 4 "+d_vars.defense_i_2+" I 1 "+d_vars.defense_i_0+" I 2 "+d_vars.defense_i_1+" N "+d_vars.charge_i+" n "+d_vars.player_name+" H "+d_vars.on_hit_c+" T 4 "+d_vars.tir_p_1+" a "+d_vars.action+" + "+(d_vars.nb_2add+d_vars.technique_result+d_vars.encaissement_result)+" r ?{Relances ?}";
|
||||
for (var i=0,len=d_vars.results.length;i<len;i++) msg_relance+=" d "+d_vars.results[i];
|
||||
msg_relance+="'>Relancer ce jet</a>";
|
||||
logit(msg_relance);
|
||||
|
|
@ -224,6 +224,8 @@ function show_rolls(who,d_vars){
|
|||
if (d_vars.encaissement!=0) msg_adds+="<tr><td class='sheet-additional'>Encaissement: "+d_vars.encaissement_result+"</tr></td>"; // Encaissement
|
||||
if (d_vars.add_to_all!=0){msg_adds+=" <tr><td class='sheet-additional'>Modificateur de des: "+d_vars.add_to_all;}; //Dice modifier
|
||||
if (d_vars.transcendence!=3){msg_adds+=" <tr><td class='sheet-additional'>Transcendence: "+d_vars.transcendence;}; //Transcendence
|
||||
//if (d_vars.pctreceived!=0){msg_adds+=" <tr><td class='sheet-additional'>Réduction de dégats: "+d_vars.pctreceived+"%";}; //Transcendence
|
||||
//if (d_vars.pctinflicted!=0){msg_adds+=" <tr><td class='sheet-additional'>Augmentation de dégats: "+d_vars.pctinflicted+"%";}; //Transcendence
|
||||
|
||||
if (dice_stats.is_crit==1&&m_crit>1) msg+="<tr><td class='sheet-critical'>L'action est une réussite critique</tr></td>";
|
||||
if (dice_stats.is_hit==1){
|
||||
|
|
@ -287,12 +289,18 @@ function add_thoose_dices(d_vars,results,name,m_esq,m_crit){
|
|||
is_acrit=2;
|
||||
}
|
||||
|
||||
|
||||
if (m_esq==2) {dices+=" [x2]";};
|
||||
if (d_vars.nb_2add!=0){dices+=" + ("+d_vars.nb_2add;};
|
||||
if (d_vars.attribute+d_vars.attribute!=0){ //&&!=0
|
||||
dices+=" + "+(d_vars.on_hit_c+d_vars.attribute);
|
||||
if (m_crit>1) dices+=" [x"+m_crit+"]";
|
||||
};
|
||||
if (d_vars.pctreceived!=0 && d_vars.action!="a"){
|
||||
d_vars.pctreceived=(100+d_vars.pctreceived);
|
||||
d_vars.nb_2sub=Math.floor(d_vars.nb_2sub*d_vars.pctreceived/100);
|
||||
dices+=" [x"+d_vars.pctreceived+"%]";
|
||||
}
|
||||
if (d_vars.nb_2add!=0){dices+=")";};
|
||||
if (d_vars.nb_2sub!=0){dices+=" - "+d_vars.nb_2sub;};
|
||||
// Add everything to the sum
|
||||
|
|
@ -302,6 +310,12 @@ function add_thoose_dices(d_vars,results,name,m_esq,m_crit){
|
|||
else {
|
||||
if (d_vars.transcendence<3) { sum=Math.floor(sum/(2**(3-d_vars.transcendence)));}
|
||||
}
|
||||
if (d_vars.pctinflicted!=0 && d_vars.action=="a"){
|
||||
d_vars.pctinflicted=(100+d_vars.pctinflicted);
|
||||
sum=Math.floor(sum*d_vars.pctinflicted/100);
|
||||
dices+=' [x'+d_vars.pctinflicted+'%]';
|
||||
}
|
||||
|
||||
sum+=-d_vars.nb_2sub;
|
||||
dices+="<tr><td class='sheet-sum'> Total: "+sum+"</tr></td>";
|
||||
|
||||
|
|
@ -314,7 +328,7 @@ function parse_command(message){
|
|||
// Parse a string formated in the following fashion
|
||||
// 4 P 2 I 2 4 E 4 1 T 1 4 + 11 - 22 s 2 d 4 d 5 d 8 d 1
|
||||
// And add everithing in the related Variables
|
||||
var d_vars={"perfection":0,"defense_i_0":0,"defense_i_1":0,"defense_i_2":0,"rempart_p":0,"technique_m":0,"coup_d":0,"fauchage":0,"exploiter_p_0":0,"exploiter_p_1":0,"exploiter_p_2":0,"tir_p_0":0,"tir_p_1":0,"tir_i":0,"charge":0,"charge_i":0,"nb_2add":0,"nb_2sub":0,"relances":0,"seuil":0,"action":"","flat_dices":[],"on_hit_c":0,"attribute":0,"encaissement":0,"replace":-1,"add_to_all":0,"max_dices":-1,"player_name":"","crit_level":2,"transcendence":3,"nb_dices":0,"nb_flat_dices":0,"encaissement_dices":"","results":[],"cleave":[],"encaissement_result":0,"technique_result":0,"coup_d_results":[]};
|
||||
var d_vars={"perfection":0,"defense_i_0":0,"defense_i_1":0,"defense_i_2":0,"rempart_p":0,"technique_m":0,"coup_d":0,"fauchage":0,"exploiter_p_0":0,"exploiter_p_1":0,"exploiter_p_2":0,"tir_p_0":0,"tir_p_1":0,"tir_i":0,"charge":0,"charge_i":0,"nb_2add":0,"nb_2sub":0,"relances":0,"seuil":0,"action":"","flat_dices":[],"on_hit_c":0,"attribute":0,"encaissement":0,"replace":-1,"add_to_all":0,"max_dices":-1,"player_name":"","crit_level":2,"transcendence":3,"pctreceived":0,"pctinflicted":0,"nb_dices":0,"nb_flat_dices":0,"encaissement_dices":"","results":[],"cleave":[],"encaissement_result":0,"technique_result":0,"coup_d_results":[]};
|
||||
var tab=message.split(" ");
|
||||
var len_args=tab.length;
|
||||
var i;
|
||||
|
|
@ -421,6 +435,14 @@ function parse_command(message){
|
|||
d_vars.transcendence=to_p_number(tab[i+1]);
|
||||
i+=2;
|
||||
break;
|
||||
case "v":
|
||||
d_vars.pctreceived=to_number(tab[i+1]);
|
||||
i+=2;
|
||||
break;
|
||||
case "f":
|
||||
d_vars.pctinflicted=to_number(tab[i+1]);
|
||||
i+=2;
|
||||
break;
|
||||
case "I":
|
||||
switch (tab[i+1]) {
|
||||
case "1":
|
||||
|
|
|
|||
|
|
@ -416,7 +416,7 @@
|
|||
<div class="sheet-tab-content sheet-secondary_tab1">
|
||||
<button type='roll' class="sheet-Initiative_roll" value="&{template:d10init}{{name=@{character_name}}} {{roll_name=Initiative}} {{result=[[@{base-Agilite} + @{exal-Agilite} + @{Initiative} + 1d10 &{tracker}]]}} {{value=[[@{base-Agilite} + @{exal-Agilite} + @{Initiative}]]}} {{base=[[@{Initiative}]]}}">Initiative</button>
|
||||
<input type="number" class="sheet-numberbox" name="attr_Initiative" value="0"/>
|
||||
<button type='roll' class="sheet-Attack_roll" value="!crit ?{Nombre de des d'attaque} P @{general_effective_Perfection} c @{crit_level} M @{skillcost_Technique_martiale} @{general_effective_Technique_martiale} E @{skillcost_Exploiter_les_points_faibles} @{general_effective_Exploiter_les_points_faibles} F @{general_effective_Fauchage} D @{general_effective_Coup_dechirant} H @{base_damage_dices} H @{exal_damage_dices} A @{Skill_general_attribute_select_attaque} s @{general_attack_threshold} l @{general_attack_addall} a a n @{undescored_name} + @{additional_damage_dices} + @{general_effective_weapon1} + @{general_effective_weapon2} t @{transcendence} + @{general_effective_weapon3}">Attaque</button>
|
||||
<button type='roll' class="sheet-Attack_roll" value="!crit ?{Nombre de des d'attaque} P @{general_effective_Perfection} c @{crit_level} M @{skillcost_Technique_martiale} @{general_effective_Technique_martiale} E @{skillcost_Exploiter_les_points_faibles} @{general_effective_Exploiter_les_points_faibles} F @{general_effective_Fauchage} D @{general_effective_Coup_dechirant} H @{base_damage_dices} H @{exal_damage_dices} A @{Skill_general_attribute_select_attaque} s @{general_attack_threshold} l @{general_attack_addall} a a n @{undescored_name} + @{additional_damage_dices} + @{general_effective_weapon1} + @{general_effective_weapon2} t @{transcendence} + @{general_effective_weapon3} f @{pctinflicted}">Attaque</button>
|
||||
<!-- <input type="number" class="sheet-numberbox" name="attr_nb_attack_dices" title="Nombre de des d'attaque" value="0"/>d10+ -->
|
||||
<input type="number" class="sheet-numberbox" type="number" name="attr_base_damage_dices" title="Base de dégats (crit)" value="0"/>+
|
||||
<input type="number" class="sheet-numberbox" type="number" name="attr_exal_damage_dices" title="Modificateur temporaire (crit)" value="0"/>+
|
||||
|
|
@ -611,7 +611,7 @@
|
|||
|
||||
<!--Defense -->
|
||||
<div class="sheet-tab-content sheet-secondary_tab3">
|
||||
<button type='roll' class="sheet-Attack_roll" value="!crit ?{Nombre de des de defense} I @{skillcost_Defense_impenetrable} @{general_effective_Defense_impenetrable} R @{general_effective_Rempart_parfait} c @{crit_level} S @{general_skilllevel_Encaissement} @{general_effective_Encaissement} H @{base_defense_dices} H @{exal_defense_dices} s @{general_defense_threshold} l @{general_defense_addall} A @{Skill_general_attribute_select_defense} t @{transcendence} - ?{Dégats a parer|0} a d n @{undescored_name} + @{general_effective_shield1} + @{general_effective_shield2} + @{general_effective_shield3}">Parade</button>
|
||||
<button type='roll' class="sheet-Attack_roll" value="!crit ?{Nombre de des de defense} I @{skillcost_Defense_impenetrable} @{general_effective_Defense_impenetrable} R @{general_effective_Rempart_parfait} c @{crit_level} S @{general_skilllevel_Encaissement} @{general_effective_Encaissement} H @{base_defense_dices} H @{exal_defense_dices} s @{general_defense_threshold} l @{general_defense_addall} A @{Skill_general_attribute_select_defense} t @{transcendence} - ?{Dégats a parer|0} a d n @{undescored_name} + @{general_effective_shield1} + @{general_effective_shield2} + @{general_effective_shield3} v @{pctreceived} ">Parade</button>
|
||||
<!--<input type="number" class="sheet-numberbox" name="attr_nb_defense_dices" title="Nombre de des de defense" value="0"/>d10+-->
|
||||
<input type="number" class="sheet-numberbox" name="attr_base_defense_dices" title="Base de defense (crit)" value="0"/>+
|
||||
<input type="number" class="sheet-numberbox" name="attr_exal_defense_dices" title="Modificateur temporaire (crit)" value="0"/>
|
||||
|
|
@ -624,7 +624,7 @@
|
|||
><input type="number" class="sheet-numberbox" name="attr_general_defense_threshold" title="Seuil pour toucher l'attaque" value="0"/>
|
||||
∀<input type="number" class="sheet-numberbox" name="attr_general_defense_addall" title="Modificateur sur chaque des" value="0"/>
|
||||
<br/>
|
||||
<button type='roll' class="sheet-Attack_roll" value="!crit ?{Nombre de des d'esquive} I @{skillcost_Defense_impenetrable} @{general_effective_Defense_impenetrable} R @{general_effective_Rempart_parfait} c @{crit_level} H @{base_dodge_dices} A @{Skill_general_attribute_select_dodge} t @{transcendence} s ?{Seuil d'esquive} - ?{Dégats a esquiver|0} a e n @{undescored_name}">Esquive</button>
|
||||
<button type='roll' class="sheet-Attack_roll" value="!crit ?{Nombre de des d'esquive} I @{skillcost_Defense_impenetrable} @{general_effective_Defense_impenetrable} R @{general_effective_Rempart_parfait} c @{crit_level} H @{base_dodge_dices} A @{Skill_general_attribute_select_dodge} t @{transcendence} s ?{Seuil d'esquive} - ?{Dégats a esquiver|0} a e n @{undescored_name} v @{pctreceived}">Esquive</button>
|
||||
<!--<input type="number" class="sheet-numberbox" name="attr_nb_dodge_dices" title="Nombre de des d'esquive" value="0"/>d10+-->
|
||||
<input type="number" class="sheet-numberbox" name="attr_base_dodge_dices" title="Modificateur d'esquive" value="0"/>
|
||||
<select class="sheet-skill_select" style="margin-right:4px" name="attr_Skill_general_attribute_select_dodge">
|
||||
|
|
@ -753,7 +753,7 @@
|
|||
|
||||
<!--TIR & CHARGE -->
|
||||
<div class="sheet-tab-content sheet-secondary_tab4">.
|
||||
<button type='roll' class="sheet-Attack_roll" value="!crit ?{Nombre de des de tir} T @{skillcost_Tir_precis} @{general_effective_Tir_precis} i @{general_effective_Tir_implacable} M @{skillcost_Technique_martiale} @{general_effective_Technique_martiale} E @{skillcost_Exploiter_les_points_faibles} @{general_effective_Exploiter_les_points_faibles} L @{base_shoot_dices} c @{crit_level} l @{add_shoot_dices} t @{transcendence} s ?{Seuil de tir|6} a a n @{undescored_name}">Tir</button>
|
||||
<button type='roll' class="sheet-Attack_roll" value="!crit ?{Nombre de des de tir} T @{skillcost_Tir_precis} @{general_effective_Tir_precis} i @{general_effective_Tir_implacable} M @{skillcost_Technique_martiale} @{general_effective_Technique_martiale} E @{skillcost_Exploiter_les_points_faibles} @{general_effective_Exploiter_les_points_faibles} L @{base_shoot_dices} c @{crit_level} l @{add_shoot_dices} t @{transcendence} s ?{Seuil de tir|6} a a n @{undescored_name} f @{pctinflicted}">Tir</button>
|
||||
<!--<input type="number" class="sheet-numberbox" name="attr_nb_shoot_dices" tile="Nombre de des de tir" value="0"/>d10 -->∘
|
||||
<input type="number" class="sheet-numberbox" name="attr_base_shoot_dices" title="Valeur de dégat des des" value="0"/>∀
|
||||
<input type="number" class="sheet-numberbox" name="attr_add_shoot_dices" title="Modificateur" value="0"/>
|
||||
|
|
@ -871,6 +871,12 @@
|
|||
<br/>
|
||||
<input class="sheet-skill_name" style="margin-right: 4px;" type="text" name="attr_general_skill_transcendence" disabled="true" value="Transcendence" />
|
||||
<input type="number" min="0" name="attr_transcendence" title="Transcendence humaine = 3" value="3"/>
|
||||
<br/>
|
||||
<input class="sheet-skill_name" style="margin-right: 4px;" type="text" name="attr_general_skill_pctinflicted" disabled="true" value="Dégats supplémentaires (%)" />
|
||||
<input type="number" name="attr_pctinflicted" title="Dégats additionnels infligés" value="0"/>
|
||||
<br/>
|
||||
<input class="sheet-skill_name" style="margin-right: 4px;" type="text" name="attr_general_skill_pctreceived" disabled="true" value="Réduction de dégats (%)" />
|
||||
<input type="number" name="attr_pctreceived" title="Réduction de dégats" value="0"/>
|
||||
</div>
|
||||
|
||||
<!--EQUIPEMENT<div class="sheet-tab-content sheet-secondary_tab6"></div>-->
|
||||
|
|
|
|||
|
|
@ -80,8 +80,11 @@ list.append(['replace','Des de substitution',1,'int','L',0,-1,"",None])
|
|||
list.append(['add_to_all','Valeur d\'ajout aux des',1,'int','l',0,0,"",None])
|
||||
list.append(['max_dices','Nombre de des max',1,'pint','m',0,-1,"",None])
|
||||
list.append(['player_name','Nom du joueur',1,'str','n',0,'""',"",None])
|
||||
|
||||
list.append(['crit_level','Niveau de critique',1,'pint','c',0,2,"",None])
|
||||
list.append(['transcendence','Transcendence',1,'pint','t',0,3,"",None])
|
||||
list.append(['pctreceived','Pourcentage dégats recus',1,'int','v',0,0,"",None])
|
||||
list.append(['pctinflicted','Pourcentage dégats infligés',1,'int','f',0,0,"",None])
|
||||
|
||||
list.append(['nb_dices','Nombre de des',1,'pint','',0,0,"",None])
|
||||
list.append(['nb_flat_dices','Nombre de des fixes',1,'pint','',0,0,"",None])
|
||||
|
|
@ -92,6 +95,9 @@ list.append(['encaissement_result','Resultat d\'encaissement',1,'pint','',0,0,""
|
|||
list.append(['technique_result','Dégats technique martiale',1,'int','',0,0,"",None])
|
||||
list.append(['coup_d_results','Coup déchirant results',1,'pint','',0,"[]","",None])
|
||||
|
||||
|
||||
|
||||
|
||||
class megaListWrapper():
|
||||
def __init__(self,table=list):
|
||||
self.table=table
|
||||
|
|
|
|||
Loading…
Reference in New Issue