diff --git a/SkyfallRPG/skyfall.css b/SkyfallRPG/skyfall.css index c16b57baac..52cbfcb85a 100644 --- a/SkyfallRPG/skyfall.css +++ b/SkyfallRPG/skyfall.css @@ -520,10 +520,10 @@ .sheet-main .sheet-left-container .sheet-defense-and-proeficience-container { width: 100%; display: grid; - grid-template-rows: 110px auto; + grid-template-rows: 70px auto; row-gap: 22px; min-height: 176px; - margin-bottom: 22px + margin-bottom: 22px; } .sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-box-proficiencies { @@ -539,15 +539,67 @@ height: 150px } -.sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-container-defense-armor-shield { +.sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-container-defense-armor-shield .sheet-container-defense { + height: 76px +} + +.sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-container-defense-armor-shield .sheet-container-defense .sheet-inside-negative-corner { + height: 76px; + padding-left: 10px; + padding-right: 10px; display: grid; - grid-template-rows: 1fr; - row-gap: 22px + grid-template-columns: auto 10px 20px 7px 46px 7px 40px 7px 40px 7px 38px; + grid-template-rows: 28px auto; + row-gap: 5px +} + +.sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-container-defense-armor-shield .sheet-container-defense .sheet-inside-negative-corner .sheet-signal { + font-family: Arial, Verdana; + width: 100%; + height: 26px; + display: flex; + font-weight: bold; + justify-content: center; + align-items: center; + font-size: 10px !important +} + +.sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-container-defense-armor-shield .sheet-container-defense .sheet-inside-negative-corner .sheet-big-signal { + font-size: 14px !important; + font-family: Arial, Verdana; + width: 100%; + height: 26px; + display: flex; + font-weight: bold; + justify-content: center; + align-items: center +} + +.sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-container-defense-armor-shield .sheet-container-defense .sheet-inside-negative-corner input { + height: 26px; + font-size: 12px; + text-align: center; + line-height: 26px; + border: 0; + border-bottom: 2px solid black; + width: 100% +} + +.sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-container-defense-armor-shield .sheet-container-defense .sheet-inside-negative-corner select { + height: 26px; + margin: 0; + font-size: 10px; + padding: 2px; + padding-right: 1px; + width: 100%; + border: 0; + border-bottom: 2px solid black } .sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-container-defense-armor-shield .sheet-container-armor-shield .sheet-inside-negative-corner { padding-left: 10px; padding-right: 10px; + padding-bottom: 10px; display: grid; column-gap: 10px; grid-template-columns: auto 38px 38px 50px; @@ -561,7 +613,7 @@ line-height: 20px; border: 0; border-bottom: 2px solid black; - width: 100% + width: 100%; } .sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-container-defense-armor-shield .sheet-container-armor-shield .sheet-inside-negative-corner select { @@ -1101,6 +1153,20 @@ border-bottom: 1px solid black } +.sheet-main .sheet-right-container .sheet-skills-container .sheet-inside-negative-corner .sheet-skill-grid-template .sheet-oficio .sheet-sup-treinada { + position: relative +} + +.sheet-main .sheet-right-container .sheet-skills-container .sheet-inside-negative-corner .sheet-skill-grid-template .sheet-oficio .sheet-sup-treinada::before { + content: "*"; + position: absolute; + height: 20px; + top: -3px; + width: 5px; + right: -5px; + vertical-align: super +} + .sheet-main .sheet-right-container .sheet-skills-container .sheet-inside-negative-corner .sheet-skill-grid-template .sheet-oficio .sheet-skill-button { width: auto; text-align: left; @@ -1200,21 +1266,6 @@ vertical-align: super } -.sheet-main .sheet-right-container .sheet-languages-container { - width: 100%; - display: block; - margin-bottom: 22px -} - -.sheet-main .sheet-right-container .sheet-languages-container .sheet-inside-negative-corner { - padding: 5px -} - -.sheet-main .sheet-left-container .sheet-languages-container textarea { - width: 100%; - height: 70px !important; -} - .sheet-main .sheet-right-container .sheet-equipment-container { width: 100%; display: block; @@ -2512,3 +2563,22 @@ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px } + +.sheet-main .sheet-right-container .sheet-languages-container { + width: 100%; + display: block; + margin-bottom: 22px +} + +.sheet-main .sheet-right-container .sheet-languages-container .sheet-inside-negative-corner { + padding: 5px +} + +.sheet-main .sheet-left-container .sheet-languages-container textarea { + width: 100%; + height: 70px !important; +} + +.sheet-defesa-total { + font-size: 17px !important; +} \ No newline at end of file diff --git a/SkyfallRPG/skyfall.html b/SkyfallRPG/skyfall.html index dca8dc46b7..dbcde9f42a 100644 --- a/SkyfallRPG/skyfall.html +++ b/SkyfallRPG/skyfall.html @@ -45,7 +45,7 @@ - +
@@ -63,7 +63,7 @@ - +
@@ -81,7 +81,7 @@ - +
@@ -99,7 +99,7 @@ - +
@@ -117,7 +117,7 @@ - +
@@ -135,7 +135,7 @@ - +
@@ -146,7 +146,7 @@ - +
@@ -197,7 +197,7 @@
- +
@@ -252,7 +252,7 @@
Crítico
-
+
@@ -281,7 +281,7 @@
Perícia utilizada @@ -294,7 +294,7 @@ Alcance
- +
+
+
=
+
10
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+ +
+
+
+
+
+
+
@@ -418,7 +463,7 @@
- +
@@ -454,7 +499,7 @@
- +
@@ -486,7 +531,7 @@
- +
3º Círculo
@@ -626,7 +671,7 @@
- +
@@ -636,9 +681,9 @@ - - - + + +
@@ -696,7 +741,7 @@
+
- +
-
@@ -1891,9 +1940,9 @@ getAttrs([stat], function(v){ let mod = calc_mod(v[stat] ||10); setAttrs({ - [`${stat}_mod`]: mod + [`${stat}_mod`]: mod }); - }); + }); }); }); @@ -1910,9 +1959,9 @@ bonusnivel = 2; } setAttrs({ - "bonus_treino": bonusnivel + "bonus_treino": bonusnivel }); - }); + }); }); //Penalidades de Armadura: @@ -1921,11 +1970,11 @@ let penalidade1 = isNaN(v.armadurapenalidade1) ? 0 : v.armadurapenalidade1; let penalidade2 = isNaN(v.armadurapenalidade2) ? 0 : v.armadurapenalidade2; - let total = parseInt(penalidade1) + parseInt(penalidade2); + let total = parseInt(penalidade1) + parseInt(penalidade2); setAttrs({ "penalidades_armadura": total }); - }); + }); }); //Calculando o dano de um acerto critico @@ -1936,7 +1985,7 @@ "repeating_attacks_multiplicadorcriticoataque" ], function(v) { let dano = ''; - + if(typeof v.repeating_attacks_danoataque === 'string'){ dano = v.repeating_attacks_danoataque; }else{ @@ -1949,13 +1998,13 @@ for(let i=0; i < multiplicador - 1; i++){ resultado = resultado + " + " + dano; } - + setAttrs({ "repeating_attacks_danocriticoataque": resultado }); }); }); - + //Importador: on("sheet:opened", function(e){ setAttrs({ @@ -1987,7 +2036,7 @@ "created_by_linki": "" }); } - }); + }); }); //Repeating Sum [https://wiki.roll20.net/RepeatingSum] @@ -1998,9 +2047,9 @@ getAttrs(["for", ...attrArray], v => { console.log("===== values of v: "+ JSON.stringify(v) +" ====="); // getValue: if not a number, returns 1 if it is 'on' (checkbox), otherwise returns 0.. - const getValue = (section, id,field) => parseFloat(v[`repeating_${section}_${id}_${field}`]) || (v[`repeating_${section}_${id}_${field}`] === 'on' ? 1 : 0); + const getValue = (section, id,field) => parseFloat(v[`repeating_${section}_${id}_${field}`]) || (v[`repeating_${section}_${id}_${field}`] === 'on' ? 1 : 0); const sumTotal = idArray.reduce((total, id) => total + fields.reduce((subtotal,field) => subtotal * getValue(section, id,field),1),0); - + let cargalimit = 3 * parseInt(v.for); let cargamax = 10 * parseInt(v.for); @@ -2027,7 +2076,7 @@ //Calculando carga e seus efeitos: on('sheet:opened change:repeating_equipment remove:repeating_equipment', function() { - repeatingSumModified("carga","equipment",["equipquantity","equipweight"], " kg"); + repeatingSumModified("carga","equipment",["equipquantity","equipweight"], " kg"); }); /* // Usar para adicionar uma arma ao criar a ficha @@ -2037,19 +2086,52 @@ */ + //Calculando Defesa Total: + on("sheet:opened change:defesadestreza change:armaduradefesa1 change:armaduradefesa2 change:armaduradefesa3 change:des_mod", function(e){ + getAttrs(["defesadestreza", "armaduradefesa1", "armaduradefesa2", "armaduradefesa3", "des_mod"], function(v){ + + let total = 10; + + console.error(v); + + //Armadura + if(!isNaN(v.armaduradefesa1)){ + total = total + parseInt(v.armaduradefesa1); + } + //Escudo + if(!isNaN(v.armaduradefesa2)){ + total = total + parseInt(v.armaduradefesa2); + } + //Outros + if(!isNaN(v.armaduradefesa3)){ + total = total + parseInt(v.armaduradefesa3); + } + //Mod de Destreza + if(!isNaN(v.des_mod) && v.defesadestreza == '1'){ + total = total + parseInt(v.des_mod); + } + + console.error("total final", total); + + setAttrs({ + "defesatotal": total + }); + }); + }); + //Compatibilidade para o nome (FAZ O BOTÃO DE EDITAR A FICHA SUMIR) /*on("sheet:opened", function(e){ getAttrs(["charname"], function(v){ - + if(v.charname != '' || v.charname.length < 1){ - let newname = v.charname; + let newname = v.charname; setAttrs({ "character_name": newname }); } - }); + }); });*/ - + ['vida', 'mana'].forEach(max => { on(`change:${max}total change:${max}temp`, () => { getAttrs([`${max}total`, `${max}temp`], v => { @@ -2061,7 +2143,7 @@ }); }); }); + - - + \ No newline at end of file