From 0a7b6be25df512fbf9bb9ddff12a3b7c8aa27d73 Mon Sep 17 00:00:00 2001 From: Lockbox313 <8994813+Lockbox313@users.noreply.github.com> Date: Sun, 20 Nov 2022 10:37:41 +0000 Subject: [PATCH] Add files via upload --- RunequestGQS/RunequestGQS.css | 3 ++- RunequestGQS/RunequestGQS.html | 37 +++++++++++++++------------------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/RunequestGQS/RunequestGQS.css b/RunequestGQS/RunequestGQS.css index 95be9e3158..6e83e5cd45 100644 --- a/RunequestGQS/RunequestGQS.css +++ b/RunequestGQS/RunequestGQS.css @@ -848,7 +848,8 @@ button[type="roll"]:hover { .sheet-rolltemplate-HL-Melee div.sheet-loc_wrapper{ - border: 1px solid black; + border: 1px solid black; + width:239px; } .sheet-rolltemplate-HL-Melee div.sheet-template_header{ diff --git a/RunequestGQS/RunequestGQS.html b/RunequestGQS/RunequestGQS.html index be758b3ba7..781162f465 100644 --- a/RunequestGQS/RunequestGQS.html +++ b/RunequestGQS/RunequestGQS.html @@ -894,7 +894,7 @@
- +
@@ -916,7 +916,7 @@
- +
@@ -1038,7 +1038,7 @@
- +
@@ -5493,7 +5493,7 @@ - on("change:repeating_missle2:skilltotal change:repeating_missle2:skillWpnMod change:repeating_missle2_skillReduct", function(eventInfo) { + on("change:repeating_missle2:skilltotal change:repeating_missle2:skillWpnMod change:repeating_missle2:skillReduct", function(eventInfo) { getAttrs(["repeating_missle2_skilltotal","repeating_missle2_skillWpnMod","repeating_missle2_skillReduct","skillMods"], function(values) { @@ -5507,9 +5507,9 @@ let skillTotal = parseInt(values.repeating_missle2_skilltotal); let wpnMod = eval(values.repeating_missle2_skillWpnMod); - let skillReduct = Math.ceil(parseInt(values.repeating_missle2_skillReduct)); + let skillReduct = parseFloat(values.repeating_missle2_skillReduct); let skillMods = eval(values.skillMods); - let tot = Math.max((skillTotal*skillReduct)+skillMods+wpnMod); + let tot = Math.max(Math.ceil(skillTotal*skillReduct)+skillMods+wpnMod,5); console.log("tot :"+ tot); /*let oppattkmod=0 @@ -5525,10 +5525,10 @@ - on("change:repeating_melee2:skilltotal change:repeating_melee2:skillWpnMod change:repeating_melee2:skillParryMod change:repeating_melee2_skillReduct change:repeating_melee2:oppattk", function(eventInfo) { - getAttrs(["repeating_melee2_skilltotal","repeating_melee2_skillWpnMod","repeating_melee2_skillParryMod","repeating_melee2_skillParryMod","repeating_melee2_skillReduct","skillMods","prevdefends","repeating_melee2_oppattk","prevdefends"], function(values) { + on("change:repeating_melee2:skilltotal change:repeating_melee2:skillWpnMod change:repeating_melee2:skillParryMod change:repeating_melee2:skillReduct change:repeating_melee2:oppattkmod", function(eventInfo) { + getAttrs(["repeating_melee2_skilltotal","repeating_melee2_skillWpnMod","repeating_melee2_skillParryMod","repeating_melee2_skillParryMod","repeating_melee2_skillReduct","skillMods","prevdefends","repeating_melee2_oppattkmod","prevdefends"], function(values) { - + console.log("values "+JSON.stringify(values)); console.log("skilltotal: "+values.repeating_melee2_skilltotal); @@ -5536,18 +5536,18 @@ console.log("parry mod: "+values.repeating_melee2_skillParryMod); console.log("skillReduct:"+values.repeating_melee2_skillReduct); console.log("skillMods:"+values.skillMods); - console.log("oppattk: "+values.repeating_melee2_oppattk); + console.log("oppattk: "+values.repeating_melee2_oppattkmod); let skillTotal = parseInt(values.repeating_melee2_skilltotal); /*let wpnMod = parseInt(values.repeating_melee2_skillWpnMod);*/ let wpnMod = eval(values.repeating_melee2_skillWpnMod); - let skillReduct = Math.ceil(parseInt(values.repeating_melee2_skillReduct)); + let skillReduct = parseFloat(values.repeating_melee2_skillReduct); /*let skillMods = parseInt(values.skillMods);*/ let skillMods = eval(values.skillMods); /*let skillParryMod = parseInt(values.repeating_melee2_skillParryMod);*/ let skillParryMod = eval(values.repeating_melee2_skillParryMod); - let oppattk = values.repeating_melee2_oppattk; + let oppattk = values.repeating_melee2_oppattkmod; let prevdefends = parseInt(values.prevdefends); let defMod = 0-(prevdefends*20); @@ -5559,9 +5559,9 @@ console.log("oppattk2: "+oppattk); - let tot = Math.max((skillTotal*skillReduct)+skillMods+wpnMod,5); + let tot = Math.max(Math.ceil(skillTotal*skillReduct)+skillMods+wpnMod,5); console.log("tot :"+ tot); - let tot2 = Math.max((skillTotal*skillReduct)+skillMods+skillParryMod+defMod,5); + let tot2 = Math.max(Math.ceil(skillTotal*skillReduct)+skillMods+skillParryMod+defMod,5); console.log("tot2 :"+ tot2); let oppattkmod=0 @@ -9995,12 +9995,8 @@ } - console.log("!!!!1 WHAT IS FUCKING VAL "+val); setAttrs({repeating_melee2_skillReduct:val}); - - - }); }); @@ -10017,7 +10013,6 @@ } - console.log("!!!!1 WHAT IS FUCKING VAL "+val); setAttrs({repeating_missle2_skillReduct:val}); @@ -10801,7 +10796,7 @@ -
+
{{name}}
@@ -11905,4 +11900,4 @@ - + \ No newline at end of file