Merge branch 'master' of github.com:Cocobug/sys_d10

This commit is contained in:
Dandaedre 2018-10-03 17:15:06 +02:00
commit 3573752b6c
3 changed files with 52 additions and 42 deletions

View File

@ -6,6 +6,7 @@ Perfection P
Prescience_ @Reserve
Rage_primale @Reserve
A_corps_perdu @Reserve
undescored_name :
Defence
Encaissement @Defence
@ -34,7 +35,7 @@ Coup_en_Puissance @Reserve
Coup_Double @Reserve
Coup_dechirant D
Fauchage F
Coup_mortel (Rappel)@Reserve
Coup_mortel (Rappel)@Reserve
Combat_acrobatique (Rappel)
Assaut_implacable (Rappel)
Tir_en_mouvement (Rappel)
@ -52,6 +53,8 @@ Special
Tir_mortel @Reserve
Tir_precis T_1
Tir_precis T_2
replace L
add_to_add l
Tir_implacable i
Charge C
Charge_Mortelle (Rappel)

57
crit.js
View File

@ -174,7 +174,7 @@ function show_rolls(who,d_vars){
" I 4 "+d_vars.defense_i_2+" R "+d_vars.rempart_p+" F "+d_vars.fauchage+
" E 0 "+d_vars.exploiter_p_0+" E 1 "+d_vars.exploiter_p_1+" E 4 "+d_vars.exploiter_p_2+" T 0 "+d_vars.tir_p_0+" T 2 "+d_vars.tir_p_1+
" i "+d_vars.tir_i+" C "+d_vars.charge+" N "+d_vars.charge_i+" + "+(d_vars.nb_2add+d_vars.technique_result+d_vars.encaissement_result)+" - "+d_vars.nb_2sub+
" r ?{Relances ?} "+" s "+d_vars.seuil+" 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+" : "+d_vars.player_name;
" r ?{Relances ?}"+" s "+d_vars.seuil+" 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+" : "+d_vars.player_name;
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>";
var sum=0;
@ -186,28 +186,29 @@ function show_rolls(who,d_vars){
logit(dice_stats);
if (d_vars.player_name!=""){
who=d_vars.player_name;
who_pr=d_vars.player_name.replace(/_/g," ");
who_pr=d_vars.player_name.replace(/_/g," ").replace(/\//g,"'");
}
switch(d_vars.action){
case "a":
msg+=who_pr+" attaque</span></td>";
break;
msg+=who_pr+" attaque</span></td>";
break;
case "e":
msg+=who_pr+" esquive</span></td>";
m_esq=2; // It's a hit
break;
msg+=who_pr+" esquive</span></td>";
m_esq=2; // It's a hit
break;
case "d":
msg+=who_pr+" se defend</span></td>";
break;
msg+=who_pr+" se defend</span></td>";
break;
default:
msg+=who_pr+" lance "+d_vars.nb_dices+" dés</span></td>";
msg+=who_pr+" lance "+d_vars.nb_dices+" dés</span></td>";
}
if (dice_stats.is_crit) {if ((d_vars.nb_dices+d_vars.nb_flat_dices)>(d_vars.attribute/2)){
m_crit=2; // It's a crit
} else {
if (d_vars.nb_dices==0){m_crit=1;} // That's not a crit
else {m_crit=1.5;} // Only half a crit
if (dice_stats.is_crit) {
if ((d_vars.nb_dices+d_vars.nb_flat_dices)>(d_vars.attribute/2)){
m_crit=2; // It's a full crit
} else {
if (d_vars.nb_dices+d_vars.nb_flat_dices==0){m_crit=1;} // That's not a crit
else {m_crit=1.5;} // Only half a crit
}};
//Add the rolls
@ -216,27 +217,28 @@ function show_rolls(who,d_vars){
if (d_vars.fauchage!=0) msg+=add_thoose_dices(d_vars,d_vars.cleave,"Fauchage: ",m_esq,m_crit);
if (d_vars.coup_d!=0) msg_adds+="<tr><td class='sheet-additional'>Coup déchirant: "+d_vars.coup_d_results.join(" ")+"</tr></td>"; // Coup déchirant
if (d_vars.technique_m!=0) msg_adds+="<tr><td class='sheet-additional'>Technique martiale: "+d_vars.technique_result+"</tr></td>"; // Technique martiale
if (d_vars.relances!=0) msg_adds+="<tr><td class='sheet-additional'>Relances: "+d_vars.relances+"</tr></td>"; // Technique martiale
if (d_vars.encaissement!=0) msg_adds+="<tr><td class='sheet-additional'>Encaissement: "+d_vars.encaissement_result+"</tr></td>"; // Technique martiale
if (d_vars.relances!=0) msg_adds+="<tr><td class='sheet-additional'>Relances: "+d_vars.relances+"</tr></td>"; // Relances
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 (dice_stats.is_crit==1) msg+="<tr><td class='sheet-critical'>L'action est une réussite critique</tr></td>";
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){
if (d_vars.seuil!=0){
if (d_vars.action=="a"){
msg+="<tr><td class='sheet-hit'>L'attaque parvient à toucher sa cible</tr></td>";
msg+="<tr><td class='sheet-hit'>L'attaque parvient à toucher sa cible (seuil "+d_vars.seuil+")</tr></td>";
} else if (d_vars.action=="d"||d_vars.action=="e"){
// Can't miss a block or a dodge, can be a shitty roll tho
} else {
msg+="<tr><td class='sheet-sucess'>L'action est un succes</tr></td>";
msg+="<tr><td class='sheet-sucess'>L'action est un succes (seuil "+d_vars.seuil+")</tr></td>";
}
}
} else {
if (d_vars.action=="a"){
msg+="<tr><td class='sheet-miss'>L'attaque ne touche pas sa cible</tr></td>";
msg+="<tr><td class='sheet-miss'>L'attaque ne touche pas sa cible (seuil "+d_vars.seuil+")</tr></td>";
} else if (d_vars.action=="d"||d_vars.action=="e"){
// Can't miss a block or a dodge
} else {
msg+="<tr><td class='sheet-fail'>L'action est un echec</tr></td>";
msg+="<tr><td class='sheet-fail'>L'action est un echec (seuil "+d_vars.seuil+")</tr></td>";
}
}
msg+=msg_adds;
@ -257,7 +259,7 @@ function add_thoose_dices(d_vars,results,name,m_esq,m_crit){
dices+="<span class='sheet-rolltemplate-d10fight-grey'>"; //Start greying everything
is_below=1;
}
if (results[i]>t_hit && is_below==1){
if (results[i]>=t_hit && is_below==1){
dices+="</span>"; //Stop greying everithing
is_below=2;
}
@ -266,8 +268,8 @@ function add_thoose_dices(d_vars,results,name,m_esq,m_crit){
is_acrit=1;
}
// Only add to the sum if you pass the threshold
if (results[i]>t_hit) {
if (d_vars.replace>=0) {
if (results[i]>=t_hit) {
if (d_vars.replace>0) {
sum+=d_vars.replace+d_vars.add_to_all;
} else {
sum+=results[i]+d_vars.add_to_all;
@ -281,8 +283,9 @@ 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.on_hit_c+d_vars.attribute!=0){
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+"]";
};
@ -308,7 +311,7 @@ function parse_command(message){
"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,"nb_flat_dices":0,"action":"","flat_dices":[],"results":[],"technique_result":0,
"cleave":[],"on_hit_c":0,"attribute":0,"encaissement":0,"encaissement_dices":"","encaissement_result":0,
"replace":-1,"add_to_all":0,"max_dices":-1,"player_name":""};
"replace":0,"add_to_all":0,"max_dices":-1,"player_name":""};
var tab=message.split(" ");
var len_args=tab.length;
var i;

View File

@ -141,7 +141,7 @@
// undescored_name
on("change:character_name change:character_race", function() {
getAttrs(["character_name"], function(values) {
setAttrs({"undescored_name":values.character_name.replace(/ /g,"_")});
setAttrs({"undescored_name":values.character_name.replace(/ /g,"_").replace(/'/g,"/")});
});
});
</script>
@ -401,16 +401,18 @@
<input type="radio" name="attr_secondary_tab" class="small_tab secondary_tab3" value="3" title="Défensives" />
<input type="radio" name="attr_secondary_tab" class="small_tab secondary_tab4" value="4" title="Tir & Charge" />
<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}]]}}">Initiative</button>
<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 @{nb_attack_dices} P @{general_effective_Perfection} 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} + @{base_damage_dices} + @{exal_damage_dices} A @{Skill_general_attribute_select_attaque} a a : @{undescored_name} + @{general_effective_weapon1} + @{general_effective_weapon2} + @{general_effective_weapon3}">Attaque de base</button>
<input type="number" class="sheet-numberbox" name="attr_nb_attack_dices" title="Nombre de des d'attaque" value="0"/>d10+
<button type='roll' class="sheet-Attack_roll" value="!crit ?{Nombre de des d'attaque} P @{general_effective_Perfection} 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} + @{base_damage_dices} + @{exal_damage_dices} A @{Skill_general_attribute_select_attaque} s @{general_attack_threshold} l @{general_attack_addall} a a : @{undescored_name} + @{general_effective_weapon1} + @{general_effective_weapon2} + @{general_effective_weapon3}">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" value="0"/>+
<input type="number" class="sheet-numberbox" type="number" name="attr_exal_damage_dices" title="Modificateur temporaire" value="0"/>
<select class="sheet-skill_select" style="margin-right:4px" name="attr_Skill_general_attribute_select_attaque">
<option value="@{base-Force} A @{exal-Force}">For</option>
<option value="@{base-Agilite} A @{exal-Agilite}">Agi</option>
</select>
><input type="number" class="sheet-numberbox" name="attr_general_attack_threshold" title="Seuil pour toucher l'attaque" value="0"/>
&forall;<input type="number" class="sheet-numberbox" name="attr_general_attack_addall" title="Modificateur sur chaque des" value="0"/>
<br/>
<!--supernatural_reflexes -->
@ -595,8 +597,8 @@
<!--Defense -->
<div class="sheet-tab-content sheet-secondary_tab3">
<button type='roll' class="sheet-Attack_roll" value="!crit @{nb_defense_dices} I @{skillcost_Defense_impenetrable} @{general_effective_Defense_impenetrable} R @{general_effective_Rempart_parfait} S @{general_skilllevel_Encaissement} @{general_effective_Encaissement} + @{base_defense_dices} + @{exal_defense_dices} A @{Skill_general_attribute_select_defense} - ?{Dégats a parer|0} a d : @{undescored_name} + @{general_effective_shield1} + @{general_effective_shield2} + @{general_effective_shield3}">Parade</button>
<input type="number" class="sheet-numberbox" name="attr_nb_defense_dices" title="Nombre de des de defense" value="0"/>d10+
<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} S @{general_skilllevel_Encaissement} @{general_effective_Encaissement} + @{base_defense_dices} + @{exal_defense_dices} s @{general_defense_threshold} l @{general_defense_addall} A @{Skill_general_attribute_select_defense} - ?{Dégats a parer|0} a d : @{undescored_name} + @{general_effective_shield1} + @{general_effective_shield2} + @{general_effective_shield3}">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" value="0"/>+
<input type="number" class="sheet-numberbox" name="attr_exal_defense_dices" title="Modificateur temporaire" value="0"/>
<select class="sheet-skill_select" style="margin-right:4px" name="attr_Skill_general_attribute_select_defense">
@ -605,9 +607,11 @@
<option value="@{base-Volonte} A @{exal-Volonte}">Vol</option>
<option value="@{base-Psyche} A @{exal-Psyche}">Psy</option>
</select>
><input type="number" class="sheet-numberbox" name="attr_general_defense_threshold" title="Seuil pour toucher l'attaque" value="0"/>
&forall;<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 @{nb_dodge_dices} I @{skillcost_Defense_impenetrable} @{general_effective_Defense_impenetrable} R @{general_effective_Rempart_parfait} + @{base_dodge_dices} A @{Skill_general_attribute_select_dodge} s ?{Seuil d'esquive} - ?{Dégats a esquiver|0} a e : @{undescored_name}">Esquive</button>
<input type="number" class="sheet-numberbox" name="attr_nb_dodge_dices" title="Nombre de des d'esquive" value="0"/>d10+
<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} + @{base_dodge_dices} A @{Skill_general_attribute_select_dodge} s ?{Seuil d'esquive} - ?{Dégats a esquiver|0} a e : @{undescored_name}">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">
<option value="@{base-Chance} A @{exal-Chance}">Chn</option>
@ -631,7 +635,7 @@
<input class="sheet-skill_name" style="margin-right: 4px;" type="text" name="attr_general_item_shield3_name" value="Equipement 3" />
<input class="sheet-skill_name" value="0" style="margin-right: 4px;" type="number" name="attr_general_item_shield3" title="Valeur de l'équipemet" />
<input type="checkbox" class="sheet-skill_activation" value="1" name="attr_item_shield3_activation" />
<input class="sheet-skill_hidden" value="0" type="number" name="attr_general_effective_shield3" />
<input class="sheet-skill_hidden" value="0" type="number" name="attr_general_effective_shield3" /> <br/>
<!--Defense_impenetrable -->
<input class="sheet-skill_name" style="margin-right: 4px;" type="text" name="attr_general_skill_Defense_impenetrable" disabled="true" value="Defense impenetrable" />
@ -735,9 +739,9 @@
<!--TIR & CHARGE -->
<div class="sheet-tab-content sheet-secondary_tab4">.
<button type='roll' class="sheet-Attack_roll" value="!crit @{nb_shoot_dices} 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} l @{add_shoot_dices} s ?{Seuil de tir|6} a a : @{undescored_name}">Tir</button>
<input type="number" class="sheet-numberbox" name="attr_nb_shoot_dices" tile="Nombre de des de tir" value="0"/>d10 &#8728;
<input type="number" class="sheet-numberbox" name="attr_base_shoot_dices" title="Valeur de dégat des des" value="0"/>+
<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} l @{add_shoot_dices} s ?{Seuil de tir|6} a a : @{undescored_name}">Tir</button>
<!--<input type="number" class="sheet-numberbox" name="attr_nb_shoot_dices" tile="Nombre de des de tir" value="0"/>d10 -->&#8728;
<input type="number" class="sheet-numberbox" name="attr_base_shoot_dices" title="Valeur de dégat des des" value="0"/>&forall;
<input type="number" class="sheet-numberbox" name="attr_add_shoot_dices" title="Modificateur" value="0"/>
<select class="sheet-skill_select" value="0" style="margin-right:4px" name="attr_Skill_general_attribute_select_shoot">
<option value="@{base-Force} + @{exal-Force}">For</option>
@ -889,10 +893,10 @@
<tr><th class="roll-title">{{name}} &mdash; {{roll_name}}</th></tr>
<tr><td class="roll-sucess"> 1d10+{{value}} = {{result}}
{{#rollWasCrit() result}}
<span class="inline fullcrit">+{{value}}</span>
<span class="inline fullcrit">+{{base}}</span>
{{/rollWasCrit() result}}
{{#rollWasFumble() result}}
{{result}}<span class="inline fullfail">-{{value}}</span>
{{result}}<span class="inline fullfail">-{{base}}</span>
{{/rollWasFumble() result}}
</td></tr>
</tr>