diff --git a/Tormenta20 - Jogo do Ano/icons/punch.png b/Tormenta20 - Jogo do Ano/icons/punch.png index 579f3745cd..3d08fb00a5 100644 Binary files a/Tormenta20 - Jogo do Ano/icons/punch.png and b/Tormenta20 - Jogo do Ano/icons/punch.png differ diff --git a/Tormenta20 - Jogo do Ano/icons/resistence.png b/Tormenta20 - Jogo do Ano/icons/resistence.png new file mode 100644 index 0000000000..7d0b8a71a6 Binary files /dev/null and b/Tormenta20 - Jogo do Ano/icons/resistence.png differ diff --git a/Tormenta20 - Jogo do Ano/sheet.json b/Tormenta20 - Jogo do Ano/sheet.json index 58249eef7a..c9e20111de 100644 --- a/Tormenta20 - Jogo do Ano/sheet.json +++ b/Tormenta20 - Jogo do Ano/sheet.json @@ -5,5 +5,5 @@ "preview": "tormenta20.png", "instructions": "Ficha de Tormenta20 oficial da Jambo Editora.", "legacy": true, - "printable": true + "printable": false } \ No newline at end of file diff --git a/Tormenta20 - Jogo do Ano/tormenta20.css b/Tormenta20 - Jogo do Ano/tormenta20.css index 80d6473042..31cf33f4fc 100644 --- a/Tormenta20 - Jogo do Ano/tormenta20.css +++ b/Tormenta20 - Jogo do Ano/tormenta20.css @@ -552,7 +552,17 @@ margin-bottom: 22px } -.sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-box-proficiencies { +.sheet-main .sheet-left-container .sheet-size-and-move-container { + width: 100%; + display: grid; + grid-template-columns: 294px auto; + column-gap: 22px; + min-height: 70px; + margin-bottom: 22px +} + +.sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-box-proficiencies, +.sheet-main .sheet-left-container .sheet-size-and-move-container .sheet-container-size { box-sizing: border-box } @@ -565,6 +575,35 @@ height: 150px } +.sheet-main .sheet-left-container .sheet-size-and-move-container .sheet-container-size select { + height: 23px; + font-size: 12px; + text-align: center; + line-height: 20px; + border: 0; + border-bottom-color: currentcolor; + border-bottom-style: none; + border-bottom-width: 0px; + border-bottom: 2px solid black; + width: 100%; +} + +.sheet-main .sheet-left-container .sheet-size-and-move-container .sheet-container-move input { + height: 20px; + font-size: 12px; + text-align: center; + line-height: 20px; + border: 0; + border-bottom-color: currentcolor; + border-bottom-style: none; + border-bottom-width: 0px; + border-bottom-color: currentcolor; + border-bottom-style: none; + border-bottom-width: 0px; + border-bottom: 2px solid black; + width: 100%; +} + .sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-container-defense-armor-shield { display: grid; grid-template-rows: 1fr; @@ -585,12 +624,21 @@ row-gap: 5px } +.sheet-main .sheet-left-container .sheet-size-and-move-container .sheet-container-size .sheet-inside-negative-corner { + height: 100%; + padding-left: 10px; + padding-right: 10px; + display: grid; + grid-template-columns: auto; +} + .sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-container-defense-armor-shield .sheet-container-defense, .sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-container-defense-armor-shield .sheet-container-defense .sheet-inside-negative-corner { height: 100% !important } -.sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-container-defense-armor-shield .sheet-container-defense .sheet-inside-negative-corner .sheet-signal { +.sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-container-defense-armor-shield .sheet-container-defense .sheet-inside-negative-corner .sheet-signal, +.sheet-main .sheet-left-container .sheet-size-and-move-container .sheet-container-size .sheet-inside-negative-corner .sheet-signal { font-family: Arial, Verdana; width: 100%; height: 26px; @@ -601,7 +649,8 @@ 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 { +.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, +.sheet-main .sheet-left-container .sheet-size-and-move-container .sheet-container-size .sheet-inside-negative-corner .sheet-big-signal { font-size: 14px !important; font-family: Arial, Verdana; width: 100%; @@ -633,6 +682,22 @@ border-bottom: 2px solid black } +.sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-container-defense-armor-shield .sheet-container-move .sheet-inside-negative-corner input { + height: 20px; + font-size: 12px; + text-align: center; + line-height: 20px; + border: 0; + border-bottom-color: currentcolor; + border-bottom-style: none; + border-bottom-width: 0px; + border-bottom-color: currentcolor; + border-bottom-style: none; + border-bottom-width: 0px; + 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 .sheet-select_mod_defesa { height: 26px; font-size: 10px; @@ -655,6 +720,17 @@ grid-template-rows: 16px auto auto } +.sheet-main .sheet-left-container .sheet-size-and-move-container .sheet-container-size .sheet-inside-negative-corner, +.sheet-main .sheet-left-container .sheet-size-and-move-container .sheet-container-move .sheet-inside-negative-corner { + height: 76px; + padding-left: 10px; + padding-right: 10px; + display: grid; + column-gap: 10px; + grid-template-columns: auto; + grid-template-rows: auto +} + .sheet-main .sheet-left-container .sheet-defense-and-proeficience-container .sheet-container-defense-armor-shield .sheet-container-armor-shield .sheet-inside-negative-corner input { height: 20px; font-size: 12px; @@ -3027,7 +3103,7 @@ padding-left: 10px; padding-right: 10px; column-gap: 7px; - grid-template-columns: 24% 24% 24% 24%; + grid-template-columns: 19% 19% 19% 19% 19%; grid-template-rows: 24px auto; padding-bottom: 20px; } @@ -3103,7 +3179,7 @@ } .sheet-attack-span, .sheet-damage-span, .sheet-roll-span, .sheet-skills-span, -.sheet-defense-span, .sheet-armor-span, .sheet-shield-span { +.sheet-defense-span, .sheet-armor-span, .sheet-shield-span, .sheet-resist-span { font-size: 15px; font-weight: bold; color: #a91e27; @@ -3128,7 +3204,19 @@ .sheet-header-global { height: 84px; - width: 100% + width: 100%; + position: relative; +} + +.sheet-header-position { + position: absolute; + bottom: 0px; +} + +.sheet-header-button-position{ + position: absolute; + bottom: 0px; + right: 0px; } .sheet-global-container-conditions{ diff --git a/Tormenta20 - Jogo do Ano/tormenta20.html b/Tormenta20 - Jogo do Ano/tormenta20.html index 1fe49404bd..da0c4dcfe8 100644 --- a/Tormenta20 - Jogo do Ano/tormenta20.html +++ b/Tormenta20 - Jogo do Ano/tormenta20.html @@ -135,16 +135,25 @@
+ + + - + + + + + + +
@@ -221,7 +230,7 @@
- + @@ -290,11 +299,11 @@ Chance de Erro
- + Melhor Dado
- + Pior Dado
@@ -367,9 +376,6 @@
- - -
@@ -424,6 +430,43 @@ +
+
+
+
+ Tamanho +
+
+ +
+
+
+
+
+
+
+
+
+
+ Deslocamento +
+
+ +
+
+
+
+
+
+
+
@@ -713,7 +756,7 @@
- +
=
@@ -742,7 +785,7 @@
- +
=
+
=
+
=
+
=
+
@@ -2614,7 +2665,7 @@ - + @@ -2888,12 +2939,12 @@ }); }); - on(`sheet:opened change:rolltemp change:ataquetemp change:danotemp change:periciatemp change:defesafaketemp change:defesaarmaduratemp change:defesaescudotemp change:defesaoutrostemp change:fortemp change:destemp change:contemp change:inttemp change:sabtemp change:cartemp change:abalado change:agarrado change:alquebrado change:apavorado change:atordoado change:caido change:cego change:confuso change:debilitado change:desprevenido change:doente change:emchama change:enfeiticado change:enjoado change:enreado change:envenenado change:esmorecido change:exausto change:fascinado change:fatigado change:fraco change:frustrado change:imovel change:inconsciente change:indefeso change:lento change:ofuscado change:paralizado change:pasmo change:petrificacao change:sangrando change:surdo change:surpreendido change:vulneravel`, function(){ + on(`sheet:opened change:rolltemp change:ataquetemp change:danotemp change:resistemp change:periciatemp change:defesafaketemp change:defesaarmaduratemp change:defesaescudotemp change:defesaoutrostemp change:fortemp change:destemp change:contemp change:inttemp change:sabtemp change:cartemp change:abalado change:agarrado change:alquebrado change:apavorado change:atordoado change:caido change:cego change:confuso change:debilitado change:desprevenido change:doente change:emchama change:enfeiticado change:enjoado change:enreado change:envenenado change:esmorecido change:exausto change:fascinado change:fatigado change:fraco change:frustrado change:imovel change:inconsciente change:indefeso change:lento change:ofuscado change:paralizado change:pasmo change:petrificacao change:sangrando change:surdo change:surpreendido change:vulneravel`, function(){ getAttrs([ "abalado","agarrado","alquebrado","apavorado","atordoado","caido","cego","confuso","debilitado","desprevenido","doente","emchama","enfeiticado","enjoado","enreado", "envenenado","esmorecido","exausto","fascinado","fatigado","fraco","frustrado","imovel","inconsciente","indefeso","lento","ofuscado","paralizado","pasmo","petrificacao", "sangrando","surdo","surpreendido","vulneravel", "desafesaoutrostemp", - "rolltemp", "ataquetemp", "periciatemp", "danotemp", "defesafaketemp", "defesaarmaduratemp", "defesaescudotemp", "defesaoutrostemp", + "rolltemp", "ataquetemp", "periciatemp", "danotemp", "resistemp", "defesafaketemp", "defesaarmaduratemp", "defesaescudotemp", "defesaoutrostemp", "fortemp", "destemp", "contemp", "inttemp", "sabtemp", "cartemp" ], function(v){ @@ -2959,10 +3010,11 @@ [parseInt(v.danotemp), '.sheet-damage-span', '.sheet-damage-icon'], [parseInt(v.defesafaketemp) + parseInt(v.defesaoutrostemp) + parseInt(defesa), '.sheet-defense-span', '.sheet-defense-icon'], [v.defesaarmaduratemp, '.sheet-armor-span', '.sheet-armor-icon'], - [v.defesaescudotemp, '.sheet-shield-span', '.sheet-shield-icon'] + [v.defesaescudotemp, '.sheet-shield-span', '.sheet-shield-icon'], + [parseInt(v.resistemp), '.sheet-resist-span', '.sheet-resist-icon'] ]; - for(i = 0; i <= 6; i++){ + for(i = 0; i <= 7; i++){ if(parseInt(global_array[i][0]) != 0){ $20(global_array[i][1]).removeClass('sheet-hiddenelement'); $20(global_array[i][2]).removeClass('sheet-hiddenelement'); @@ -3010,6 +3062,7 @@ "defenseicon": global_array[4][0], "armoricon": global_array[5][0], "shieldicon": global_array[6][0], + "resisticon": global_array[7][0] }); }); @@ -3251,21 +3304,21 @@ //Calculando Defesa Total: - on("sheet:opened change:condicaodefesa change:defesafaketemp change:defesaatributo change:armaduradefesa1 change:armaduradefesa2 change:defesaoutros change:for_mod change:des_mod change:con_mod change:int_mod change:sab_mod change:car_mod change:modatributodefesa change:caido", function(e){ - getAttrs(["condicaodefesa", "defesafaketemp", "defesaatributo", "armaduradefesa1", "armaduradefesa2", "defesaoutros", "for_mod", "des_mod", "con_mod", "int_mod", "sab_mod", "car_mod", "modatributodefesa", "caido"], function(v){ + on("sheet:opened change:condicaodefesa change:defesaoutrostemp change:defesaarmaduratemp change:defesaescudotemp change:defesafaketemp change:defesaatributo change:armaduradefesa1 change:armaduradefesa2 change:defesaoutros change:for_mod change:des_mod change:con_mod change:int_mod change:sab_mod change:car_mod change:modatributodefesa change:caido", function(e){ + getAttrs(["condicaodefesa", "defesafaketemp", "defesaarmaduratemp", "defesaescudotemp", "defesaatributo", "armaduradefesa1", "armaduradefesa2", "defesaoutros", "for_mod", "des_mod", "con_mod", "int_mod", "sab_mod", "car_mod", "modatributodefesa", "caido"], function(v){ let total = 10; //Armadura if(!isNaN(v.armaduradefesa1)){ - total = total + parseInt(v.armaduradefesa1); + total = total + parseInt(v.armaduradefesa1) + parseInt(v.defesaarmaduratemp); } //Escudo if(!isNaN(v.armaduradefesa2)){ - total = total + parseInt(v.armaduradefesa2); + total = total + parseInt(v.armaduradefesa2) + parseInt(v.defesaescudotemp); } //Outros if(!isNaN(v.defesaoutros)){ - total = total + parseInt(v.defesaoutros); + total = total + parseInt(v.defesaoutros) + parseInt(v.defesaoutrostemp); } //Mod de Atributo let modAttributo = parseInt(v[`${v.modatributodefesa}`]); @@ -3590,7 +3643,7 @@ newrowattrs[`${menace_attack}_${rowId}_${menace_description}`] = createAttack(ataque_fim, values[`repeating_attacks_${id}_bonusataque`], values[`repeating_attacks_${id}_danoataque`], values[`repeating_attacks_${id}_dadoextraataque`], - parseInt(values[`repeating_attacks_${id}_danoextraataque`]) + parseInt(values.rolltemp) + parseInt(values.danotemp), + parseInt(values[`repeating_attacks_${id}_danoextraataque`]) + parseInt(values.danotemp), values[`repeating_attacks_${id}_margemcriticoataque`], values[`repeating_attacks_${id}_multiplicadorcriticoataque`]); diff --git a/Tormenta20 - Jogo do Ano/translation.json b/Tormenta20 - Jogo do Ano/translation.json index f63ed058f2..f146d36f1f 100644 --- a/Tormenta20 - Jogo do Ano/translation.json +++ b/Tormenta20 - Jogo do Ano/translation.json @@ -214,5 +214,13 @@ "tipo_critico": "Crítico", "dilacerante": "Dilacerante", "lancinante": "Lancinante", - "dado_extra": "Dados Extra" + "dado_extra": "Dados Extra", + "medio": "Médio", + "minusculo": "Minúsculo", + "pequeno": "Pequeno", + "grande": "Grande", + "enorme": "Enorme", + "colossal": "Colossal", + "tamanho": "Tamanho", + "resistencias": "Resistências" } \ No newline at end of file