Nighthawk/roll20-character-sheets
1
0
Fork 0
mirror of https://github.com/Nighthawk42/roll20-character-sheets.git synced 2026-08-30 03:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Hitos] Fix calculation of combat and health characteristics (#7118)

Browse Source 
* [Hitos] Fix calculation of combat and health characteristics

* [Hitos] Improve french translation
This commit is contained in:
Baskit
2020-08-10 09:55:48 -04:00
committed by GitHub
parent ecfef4f21d
commit a16a77c0d7
2 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Hitos/hitos.html
+50 -50
View File
@@ -32,8 +32,8 @@
</tbody>
</table>
</div>
<div class="sheet-break"></div>
<div class="sheet-section-aspects sheet-section">
<div class="sheet-header" data-i18n="hitos-y-complicaciones-u">HITOS Y COMPLICACIONES</div>
@@ -66,8 +66,8 @@
</tr>
</tbody>
</table>
<div class="sheet-section-stunts sheet-section sheet-half">
<div class="sheet-header"" data-i18n="salud-u">SALUD</div>
<table style="width: 410px;">
@@ -75,10 +75,10 @@
<tr>
<td><strong data-i18n="aguante-u">AGUANTE</strong></td>
<td style="text-align: right; "><button style="width: 33px;" type="roll" value="/r {3d10dh1}kh1+ floor(@{aguante}) +?{Modificador|0} "></button></td>
<td style="text-align: right;"><input style="width: 40px;" disabled="true" name="attr_aguante" type="number" value="round(@{VOLUNTAD}/2)+@{FORTALEZA}" /></td>
<td style="text-align: right;"><input style="width: 40px;" disabled="true" name="attr_aguante" type="number" value="floor(@{VOLUNTAD}/2)+@{FORTALEZA}" /></td>
<td><strong data-i18n="entereza-u">ENTEREZA</strong></td>
<td style="text-align: right; "><button style="width: 33px;" type="roll" value="/r {3d10dh1}kh1+ floor(@{ENTEREZA})+?{Modificador|0} "></button></td>
<td style="text-align: right;"><input style="width: 40px;" disabled="true" name="attr_ENTEREZA" type="number" value="round(@{INTELECTO} / 2) + @{VOLUNTAD}" /></td>
<td style="text-align: right;"><input style="width: 40px;" disabled="true" name="attr_ENTEREZA" type="number" value="floor(@{INTELECTO} / 2) + @{VOLUNTAD}" /></td>
</tr>
<tr>
<td style="text-align: right;" data-i18n="puntos-u">PUNTOS RR&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
@@ -133,10 +133,10 @@
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div class="sheet-section-Specialisations sheet-section sheet-half">
<div class="sheet-header" data-i18n="combate-u">COMBATE</div>
<table style="height: 100%;">
@@ -151,9 +151,9 @@
</tr>
<tr>
<td ><strong data-i18n="daño-cac-u">DAÑO CaC</strong></td>
<td ><strong><input style="width: 40px;" name="attr_DAÑOCaC" type="number" value="round((@{FORTALEZA}+@{COMBATE}) / 4)" disabled="true"/></strong></td>
<td ><strong><input style="width: 40px;" name="attr_DAÑOCaC" type="number" value="floor((@{FORTALEZA}+@{COMBATE}) / 4)" disabled="true"/></strong></td>
<td style="width: 100px;" ><strong data-i18n="daño-dis-u">DAÑO DIS</strong></td>
<td ><strong><input style="width: 40px;" name="attr_DAÑODIS" type="number" value="round(@{COMBATE} / 4)" disabled="true"/></strong></td>
<td ><strong><input style="width: 40px;" name="attr_DAÑODIS" type="number" value="floor(@{COMBATE} / 4)" disabled="true"/></strong></td>
<td style="width: 100px;" ><strong data-i18n="desprevenido-u">DESPREVENIDO</strong></td>
<td ><strong><input style="width: 40px;" name="attr_DESPREVENIDO" type="number" value="round((@{REFLEJOS}+@{COMBATE})+5-2)" disabled="true"/></strong></td>
</tr>
@@ -167,15 +167,15 @@
<table style="height: 100%;">
<tbody>
<tr>
<input class="sheet-invisible" style="width: 310px;" name="attr_arma1" type="text" />
<input class="sheet-invisible" style="width: 310px;" name="attr_arma1" type="text" />
<input class="sheet-invisible" style="width: 100px;" name="attr_daño1" type="text" />
</tr>
<tr>
<input class="sheet-invisible" style="width: 310px;" name="attr_arma2" type="text" />
<input class="sheet-invisible" style="width: 310px;" name="attr_arma2" type="text" />
<input class="sheet-invisible" style="width: 100px;" name="attr_daño2" type="text" />
</tr>
<tr>
<input class="sheet-invisible" style="width: 310px;" name="attr_arma3" type="text" />
<input class="sheet-invisible" style="width: 310px;" name="attr_arma3" type="text" />
<input class="sheet-invisible" style="width: 100px;" name="attr_daño3" type="text" />
</tr>
</tbody>
@@ -188,18 +188,18 @@
<table style="height: 100%;">
<tbody>
<tr>
<input class="sheet-invisible" style="width: 310px;" name="attr_proteccion1" type="text" />
<input class="sheet-invisible" style="width: 310px;" name="attr_proteccion1" type="text" />
<input class="sheet-invisible" style="width: 100px;" name="attr_pro1" type="text" />
</tr>
<tr>
<input class="sheet-invisible" style="width: 310px;" name="attr_proteccion2" type="text" />
<input class="sheet-invisible" style="width: 310px;" name="attr_proteccion2" type="text" />
<input class="sheet-invisible" style="width: 100px;" name="attr_pro2" type="text" />
</tr>
</tbody>
</table>
</div>
<div class="sheet-section-aspects sheet-section">
<div class="sheet-header" data-i18n="caracteristicas-u">CARACTERISTICAS</div>
</div>
@@ -287,8 +287,8 @@
</tr>
</tbody>
</table>
<div class="sheet-header" data-i18n="poderes-especialidades-notas-u">PODERES, ESPECIALIDADES & NOTAS</div>
<textarea style="width: 99%; height: 212px;" name="attr_Extra"></textarea>
</div>
@@ -321,7 +321,7 @@
</tr>
</tbody>
</table>
</div>
</div>
<div class="sheet-section-stunts sheet-section sheet-half">
<div class="sheet-header" data-i18n="salud-u">SALUD</div>
<table style="width: 410px;">
@@ -329,10 +329,10 @@
<tr>
<td><strong data-i18n="aguante-u">AGUANTE</strong></td>
<td style="text-align: right; "><button style="width: 33px;" type="roll" value="/r {3d10dh1}kh1+ floor(@{aguante_pnj}) +?{Modificador|0} "></button></td>
<td style="text-align: right;"><input style="width: 40px;" disabled="true" name="attr_aguante_pnj" type="number" value="round(@{VOLUNTAD_pnj}/2)+@{FORTALEZA_pnj}" /></td>
<td style="text-align: right;"><input style="width: 40px;" disabled="true" name="attr_aguante_pnj" type="number" value="floor(@{VOLUNTAD_pnj}/2)+@{FORTALEZA_pnj}" /></td>
<td><strong data-i18n="entereza-u">ENTEREZA</strong></td>
<td style="text-align: right; "><button style="width: 33px;" type="roll" value="/r {3d10dh1}kh1+ floor(@{ENTEREZA_pnj})+?{Modificador|0} "></button></td>
<td style="text-align: right;"><input style="width: 40px;" disabled="true" name="attr_ENTEREZA_pnj" type="number" value="round(@{INTELECTO_pnj} / 2) + @{VOLUNTAD_pnj}" /></td>
<td style="text-align: right;"><input style="width: 40px;" disabled="true" name="attr_ENTEREZA_pnj" type="number" value="floor(@{INTELECTO_pnj} / 2) + @{VOLUNTAD_pnj}" /></td>
</tr>
<tr>
<td style="text-align: right;" data-i18n="puntos-rr-u">PUNTOS RR&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
@@ -380,9 +380,9 @@
</tr>
<tr>
<td ><strong data-i18n="daño-cac-u">DAÑO CaC</strong></td>
<td ><strong><input style="width: 40px;" name="attr_DAÑOCaC_pnj" type="number" value="round((@{FORTALEZA_pnj}+@{COMBATE_pnj}) / 4)" disabled="true"/></strong></td>
<td ><strong><input style="width: 40px;" name="attr_DAÑOCaC_pnj" type="number" value="floor((@{FORTALEZA_pnj}+@{COMBATE_pnj}) / 4)" disabled="true"/></strong></td>
<td style="width: 100px;" ><strong data-i18n="daño-dis-u">DAÑO DIS</strong></td>
<td ><strong><input style="width: 40px;" name="attr_DAÑODIS_pnj" type="number" value="round(@{COMBATE_pnj} / 4)" disabled="true"/></strong></td>
<td ><strong><input style="width: 40px;" name="attr_DAÑODIS_pnj" type="number" value="floor(@{COMBATE_pnj} / 4)" disabled="true"/></strong></td>
<td style="width: 100px;" ><strong data-i18n="desprevenido-u">DESPREVENIDO</strong></td>
<td ><strong><input style="width: 40px;" name="attr_DESPREVENIDO_pnj" type="number" value="round((@{REFLEJOS_pnj}+@{COMBATE_pnj})+5-2)" disabled="true"/></strong></td>
</tr>
@@ -396,11 +396,11 @@
<table style="height: 100%;">
<tbody>
<tr>
<input class="sheet-invisible" style="width: 310px;" name="attr_arma1_pnj" type="text" />
<input class="sheet-invisible" style="width: 310px;" name="attr_arma1_pnj" type="text" />
<input class="sheet-invisible" style="width: 100px;" name="attr_daño1_pnj" type="text" />
</tr>
<tr>
<input class="sheet-invisible" style="width: 310px;" name="attr_arma2_pnj" type="text" />
<input class="sheet-invisible" style="width: 310px;" name="attr_arma2_pnj" type="text" />
<input class="sheet-invisible" style="width: 100px;" name="attr_daño2_pnj" type="text" />
</tr>
</tbody>
@@ -413,7 +413,7 @@
<table style="height: 100%;">
<tbody>
<tr>
<input class="sheet-invisible" style="width: 310px;" name="attr_proteccion1_pnj" type="text" />
<input class="sheet-invisible" style="width: 310px;" name="attr_proteccion1_pnj" type="text" />
<input class="sheet-invisible" style="width: 100px;" name="attr_pro1_pnj" type="text" />
</tr>
</tbody>
@@ -473,11 +473,11 @@
</tr>
</tbody>
</table>
<div class="sheet-header" data-i18n="poderes-especialidades-notas-u">PODERES, ESPECIALIDADES & NOTAS</div>
<textarea style="width: 99%; height: 212px;" name="attr_Extra_pnj"></textarea>
</div>
</div>
@@ -561,10 +561,10 @@
<div class="sheet-section-aspects sheet-section">
<div class="sheet-header" data-i18n="especial-u">ESPECIAL</div>
<textarea style="width: 99%; height: 100px;" name="attr_Extra_vehiculo"></textarea>
</div>
</div>
<!-- 3st Tab End -->
<div class="sheet-tab-content sheet-tab4">
@@ -641,10 +641,10 @@
<div class="sheet-section-aspects sheet-section">
<div class="sheet-header" data-i18n="notas-u">NOTAS</div>
<textarea style="width: 99%; height: 100px;" name="attr_Extra_organizacion"></textarea>
</div>
</div>
<!-- 4st Tab End -->
@@ -653,13 +653,13 @@
getAttrs(["RESISTENCIA","FORTALEZA","VOLUNTAD", "aguante"], function(values) {
let aguante = parseInt(values.aguante)||0;
let RESISTENCIA = parseInt(values.RESISTENCIA)||0;
let VOLUNTAD = parseInt(values.VOLUNTAD)||0;
let FORTALEZA = parseInt(values.FORTALEZA)||0;
let VOLUNTAD = parseInt(values.VOLUNTAD)||0;
let FORTALEZA = parseInt(values.FORTALEZA)||0;
let status = getTranslationByKey("sano-u");
if(RESISTENCIA <= Math.round( (VOLUNTAD/2+FORTALEZA)*2) ) status = getTranslationByKey("herido-u")+" (-2)";
if(RESISTENCIA <= Math.round( (VOLUNTAD/2+FORTALEZA)*1) ) status = getTranslationByKey("incapacit-short-u")+" (-5)";
if(RESISTENCIA <= Math.floor( (VOLUNTAD/2+FORTALEZA)*2) ) status = getTranslationByKey("herido-u")+" (-2)";
if(RESISTENCIA <= Math.floor( (VOLUNTAD/2+FORTALEZA)*1) ) status = getTranslationByKey("incapacit-short-u")+" (-5)";
if(RESISTENCIA <= 0) status = getTranslationByKey("moribundo-u");
setAttrs({
setAttrs({
fisico:status
});
});
@@ -670,29 +670,29 @@
getAttrs(["SALUD_MENTAL","VOLUNTAD","INTELECTO", "aguante"], function(values) {
let aguante = parseInt(values.aguante)||0;
let SALUD_MENTAL = parseInt(values.SALUD_MENTAL)||0;
let INTELECTO = parseInt(values.INTELECTO)||0;
let VOLUNTAD = parseInt(values.VOLUNTAD)||0;
let INTELECTO = parseInt(values.INTELECTO)||0;
let VOLUNTAD = parseInt(values.VOLUNTAD)||0;
let status = getTranslationByKey("cuerdo-u");
if(SALUD_MENTAL <= Math.round( (INTELECTO/2+VOLUNTAD)*2) ) status = getTranslationByKey("alterado-u")+" (-2)";
if(SALUD_MENTAL <= Math.round( (INTELECTO/2+VOLUNTAD)*1) ) status = getTranslationByKey("trastorn-short-u")+" (-5)";
if(SALUD_MENTAL <= Math.floor( (INTELECTO/2+VOLUNTAD)*2) ) status = getTranslationByKey("alterado-u")+" (-2)";
if(SALUD_MENTAL <= Math.floor( (INTELECTO/2+VOLUNTAD)*1) ) status = getTranslationByKey("trastorn-short-u")+" (-5)";
if(SALUD_MENTAL <= 0) status = getTranslationByKey("eloquecido-u");
setAttrs({
setAttrs({
Estado_Mental:status
});
});
});
</script>
<script type="text/worker">
on("sheet:opened", function(eventInfo){
setAttrs({
eligeCaracterística: getTranslationByKey("elige-caracteristica"),
fortalezaName: getTranslationByKey("fortaleza-u"),
voluntadName: getTranslationByKey("voluntad-u"),
reflejosName: getTranslationByKey("reflejos-u"),
intelectoName: getTranslationByKey("intelecto-u")
});
});
});
</script>
</script>
Hitos/translations/fr.json
+2 -2
View File
@@ -13,7 +13,7 @@
"Valor-extra": "Valeur Ajoutée",
"salud-u": "SANTE",
"aguante-u": "ENDURANCE",
"entereza-u": "FORCE",
"entereza-u": "SANG-FROID",
"puntos-u": "POINTS SANTE",
"salud-mental-u": "SANTE MENTALE",
"consolidado": "Stabilité",
@@ -77,4 +77,4 @@
"trastorn-short-u": "DERANGE",
"eloquecido-u": "fou",
"elige-caracteristica": "Choix Caractéristique"
}
}