Should work on most cases, the debug aint gonna be fun
Sanitysing should be done asap
This commit is contained in:
Maximilien Rigaut 2017-02-19 18:59:44 +01:00
parent b51b0133fb
commit 9bbd17914b
2 changed files with 31 additions and 12 deletions

21
crit.js
View File

@ -14,9 +14,9 @@ if(msg.type == "api" && msg.content.indexOf("!crit ") !== -1) {
//d_vars.results=new Array(Number(d_vars.nb_dices));
d_vars.perfection=Math.min(10,d_vars.perfection);
d_vars.rempart_p=Math.min(10,d_vars.rempart_p);
d_vars.nb_dices+=d_vars.tir_p_0+d_vars.tir_p_1;
d_vars.nb_dices+=d_vars.tir_i;
d_vars.fauchage=Math.min(d_vars.fauchage,d_vars.nb_dices);
d_vars.seuil=Math.max(d_vars.seuil-d_vars.tir_i,0);
d_vars.seuil=Math.max(d_vars.seuil-d_vars.tir_p_0-d_vars.tir_p_1,0);
// Let's be honests no one really cares if it's a defensive or offensive perfection
d_vars.perfection=Math.max(d_vars.perfection,d_vars.rempart_p);
@ -159,15 +159,15 @@ function show_rolls(who,d_vars){
//Return a beautiful table showing the results and some information depending on the type of action "e":Dodge "a":Attack "d":Defense
var msg_head="<div style='border-radius: 6px; border: 2px solid #898989;'> <table style='text-align: left;' width=100% border='0' cellpadding='3' cellspacing='0'> <tbody>"
var msg="<tr><td style='background-color: #999999;'>";
var msg="<tr><td style='border-radius: 6px; border: 2px solid #898989; background-color: #999999;'>";
var msg_foot="</tr></td></table></div>";
var msg_adds="";
var msg_relance="[Relancer ce jet](!crit 0 P "+d_vars.perfection+" I 0 "+d_vars.defense_i_0+" I 1 "+d_vars.defense_i_1+
var msg_relance="<a style='text-align:right; background-color: #999999;' href='!crit 0 P "+d_vars.perfection+" I 0 "+d_vars.defense_i_0+" I 1 "+d_vars.defense_i_1+
" I 4 "+d_vars.defense_i_2+" R "+d_vars.rempart_p+" D "+d_vars.coup_d+" 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.nb_2sub+" r ?{Relances ?} "+" s "+d_vars.seuil+" a "+d_vars.action;
for (var i=0,len=d_vars.results.length;i<len;i++) msg_relance+=" d "+d_vars.results[i];
msg_relance+=")";
msg_relance+="'>Relancer ce jet</a>";
var sum=0;
var m_esq=1,m_crit=1; //The multiplier from dodge or crit
@ -190,7 +190,11 @@ function show_rolls(who,d_vars){
default:
msg+=who+" lance "+d_vars.nb_dices+" dés</span></td>";
}
if (dice_stats.is_crit) m_crit=2; // It's a crit
if (dice_stats.is_crit) {if (d_vars.nb_dices>1){
m_crit=2; // It's a crit
} else {
m_crit=1.5; // Only half a crit
}};
//Add the rolls
@ -199,6 +203,7 @@ function show_rolls(who,d_vars){
msg+=add_thoose_dices(d_vars,d_vars.cleave,"Fauchage: ",m_esq,m_crit);
if (d_vars.coup_d!=0) msg_adds+="<tr><td style='padding-left:10px'>Coup déchirant: "+d_vars.coup_d+"</tr></td>"; // Coup déchirant
if (d_vars.technique_m!=0) msg_adds+="<tr><td style='padding-left:10px'>Technique martiale: "+d_vars.technique_result+"</tr></td>"; // Technique martiale
if (d_vars.relances!=0) msg_adds+="<tr><td style='padding-left:10px'>Relances: "+d_vars.relances+"</tr></td>"; // Technique martiale
if (dice_stats.is_crit==1) msg+="<tr><td style='background-color:#b0d6ad;'>L'action est une réussite critique</tr></td>";
if (dice_stats.is_hit==1){
@ -255,6 +260,8 @@ function add_thoose_dices(d_vars,results,name,m_esq,m_crit){
dices+="</span>"; //Stop greening everything
is_acrit=2;
}
if (d_vars.nb_2add!=0){dices+=" + "+d_vars.nb_2add;};
if (d_vars.nb_2sub!=0){dices+=" - "+d_vars.nb_2sub;};
// Add everything to the sum
sum=((sum*m_esq)+d_vars.nb_2add)*m_crit-d_vars.nb_2sub;
sum+=d_vars.defense_i_0+d_vars.exploiter_p_0+d_vars.charge+d_vars.technique_result;
@ -286,7 +293,7 @@ function parse_command(message){
for (i = 1; i < len_args;) {
switch(tab[i]) {
case "+":
d_vars.nb_2add=to_number(tab[i+1]);
d_vars.nb_2add+=to_number(tab[i+1]);
i+=2;
break;
case "-":

View File

@ -1,6 +1,12 @@
<head><link rel="stylesheet" type="text/css" href="style.css"><link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
<script type="text/worker">
on("change:base_damage_dices", function() {
getAttrs(["base_damage_dices"], function(values) {
setAttrs({"effective_base_damage_dices":values.base_damage_dices});
});
});
// Perfection
on("change:skill_Perfection_activation change:general_skilllevel_Perfection", function() {
getAttrs(["skill_Perfection_activation", "general_skilllevel_Perfection"], function(values) {
@ -355,7 +361,7 @@
<div class="sheet-tab-content sheet-secondary_tab1">
<button type='roll' class="sheet-Initiative_roll" value="/e tire son initiative [[@{base-Agilite} + @{exal-Agilite} + @{Initiative} + 1d10 &{tracker}]]">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} + @{effective_base_damage_dices} a a">Attaque de base</button>
<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} + @{effective_base_damage_dices} + @{Skill_general_attribute_select_attaque} a a">Attaque de base</button>
<input type="number" class="sheet-numberbox" name="attr_nb_attack_dices" value="0"/>d10+
<input type="number" class="sheet-numberbox" name="attr_base_damage_dices" value="0"/>
<select class="sheet-skill_select" style="margin-right:4px" name="attr_Skill_general_attribute_select_attaque"><option value="@{base-Force} + @{exal-Force}">For</option><option value="@{base-Agilite} + @{exal-Agilite}">Agi</option></select>
@ -454,12 +460,12 @@
<!--Defense -->
<div class="sheet-tab-content sheet-secondary_tab3">
<button type='roll' class="sheet-Attack_roll" value="/e se defend: [[?{Dégats a defendre}-(@{nb_defense_dices}d10+@{base_defense_dices}+@{Skill_general_attribute_select_defense})]]">Defense</button>
<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} + @{base_defense_dices} + @{Skill_general_attribute_select_defense} - ?{Dégats a parrer|0} a d">Parade</button>
<input type="number" class="sheet-numberbox" name="attr_nb_defense_dices" value="0"/>d10+
<input type="number" class="sheet-numberbox" name="attr_base_defense_dices" value="0"/>
<select class="sheet-skill_select" style="margin-right:4px" name="attr_Skill_general_attribute_select_defense"><option value="@{base-Force} + @{exal-Force}">For</option><option value="@{base-Agilite} + @{exal-Agilite}">Agi</option></select>
<select class="sheet-skill_select" style="margin-right:4px" name="attr_Skill_general_attribute_select_defense"><option value="@{base-Force} + @{exal-Force}">For</option><option value="@{base-Agilite} + @{exal-Agilite}">Agi</option><option value="@{base-Volonte} + @{exal-Volonte}">Vol</option><option value="@{base-Psyche} + @{exal-Psyche}">Psy</option></select>
<br/>
<button type='roll' class="sheet-Attack_roll" value="/e se defend: [[?{Dégats a defendre}-(@{nb_dodge_dices}d10+@{base_dodge_dices}+@{Skill_general_attribute_select_dodge})]]">Esquive</button>
<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} + @{SSkill_general_attribute_select_dodge} s ?{Seuil d'esquive}- ?{Dégats a esquiver|0} a d">Esquive</button>
<input type="number" class="sheet-numberbox" name="attr_nb_dodge_dices" value="0"/>d10+
<input type="number" class="sheet-numberbox" name="attr_base_dodge_dices" value="0"/>
<select class="sheet-skill_select" style="margin-right:4px" name="attr_Skill_general_attribute_select_dodge"><option value="@{base-Chance} + @{exal-Chance}">Chn</option><option value="@{base-Agilite} + @{exal-Agilite}">Agi</option></select>
@ -514,7 +520,13 @@
</div>
<!--TIR & CHARGE -->
<div class="sheet-tab-content sheet-secondary_tab4">
<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} + @{base_shoot_dices} + @{Skill_general_attribute_select_shoot} s ?{Seuil de tir|6} a a">Tir</button>
<input type="number" class="sheet-numberbox" name="attr_nb_shoot_dices" value="0"/>d10+
<input type="number" class="sheet-numberbox" name="attr_base_shoot_dices" value="0"/>
<select class="sheet-skill_select" style="margin-right:4px" name="attr_Skill_general_attribute_select_shoot"><option value="@{base-Force} + @{exal-Force}">For</option><option value="@{base-Perception} + @{exal-Perception}">Per</option></select>
<br/>
<!--Tir_precis -->
<input class="sheet-skill_name" style="margin-right: 4px;" type="text" name="attr_general_skill_Tir_precis" disabled="true" value="Tir_precis" />
<input type="number" min="0" name="attr_skillcost_Tir_precis" />