diff --git a/HeroSystem6eHeroic/HeroSystem6eHeroic.css b/HeroSystem6eHeroic/HeroSystem6eHeroic.css index 5f6a547104..a14e6482c5 100644 --- a/HeroSystem6eHeroic/HeroSystem6eHeroic.css +++ b/HeroSystem6eHeroic/HeroSystem6eHeroic.css @@ -21,7 +21,7 @@ button[type=roll] { box-shadow: none; /* Set global border radius of 'Roll' buttons here. */ - border-radius: 3px; + border-radius: 2px; /* Set global font weight and size here. */ font-style: normal; @@ -105,7 +105,7 @@ textarea { input { font-size: 13px; border: hidden; - border-radius: 3px; + border-radius: 2px; padding: 0px; text-align: center; } @@ -2219,7 +2219,7 @@ select:focus + .focus { .buttonRollAttack, .buttonRollActivate, .buttonRollNormalAttack, -.buttonRollShow, +.buttonShow, .buttonManeuverEND, .buttonRollPowerArmor { padding-left: 3px; @@ -2249,7 +2249,7 @@ select:focus + .focus { min-width: 48px; max-width: 50px; background-color: #90A8EE; - border-radius: 3px; + border-radius: 2px; } .button:hover, @@ -2259,7 +2259,7 @@ select:focus + .focus { .buttonRollAttack:hover, .buttonRollActivate:hover, .buttonRollNormalAttack:hover, -.buttonRollShow:hover, +.buttonShow:hover, .buttonRollPower:hover, .buttonRollPowerArmor:hover, .button-system-more:hover { @@ -2278,18 +2278,18 @@ select:focus + .focus { margin-right: 3px; margin-left: 3px; background-color: #E69F00; - border-radius: 3px; + border-radius: 2px; } .buttonRollAttack { background-color: #D55E00; - border-radius: 2.5px; + border-radius: 2px; } -.item-talent-heading .buttonRollShow, -.item-complication-heading .buttonRollShow, +.item-talent-heading .buttonShow, +.item-complication-heading .buttonShow, .item-flex-maneuver .buttonRollAttack, -.item-flex-maneuver .buttonRollShow, +.item-flex-maneuver .buttonShow, .item-flex-maneuver .buttonManeuverEND { margin-right: 3px; margin-left: 3px; @@ -2451,15 +2451,15 @@ select:focus + .focus { margin-right: 3px; margin-left: 3px; background-color: #0072B2; - border-radius: 3px; + border-radius: 2px; } .buttonRollNormalAttack, .buttonManeuverEND, -.buttonRollShow { +.buttonShow { margin-right: 3px; margin-left: 3px; - border-radius: 3px; + border-radius: 2px; min-width: 34px; max-width: 36px; } @@ -2469,8 +2469,7 @@ select:focus + .focus { background-color: #D55E00; } -.button-Power-END, -.buttonManeuverEND { +.button-Power-END { background-color: #8A8A8A; font-weight: bold; } @@ -2481,13 +2480,13 @@ select:focus + .focus { border-radius: 0px; } -.buttonRollShow { +.buttonShow, +.buttonManeuverEND { background-color: #8A8A8A; } -.buttonRollShieldAttack { - background-color: #4ba6ff; - border-radius: 2.5px; +.item-power-block-heading-container .buttonShow { + background-color: #1e90ff; } .buttonRollPower { @@ -2501,7 +2500,7 @@ select:focus + .focus { max-width: 68px; height: 18px; border: solid 1px #F0E442; - border-radius: 3px; + border-radius: 2px; padding: 0px; &:hover { @@ -2538,7 +2537,7 @@ select:focus + .focus { color: white; font-weight: bold; background-color: #E69F00; - border-radius: 3px; + border-radius: 2px; border: solid 1px #b87f00; max-height: 19px; width: 45px; @@ -2928,7 +2927,7 @@ select:focus + .focus { width: 19px; background-color: #6787e7; border: none; - border-radius: 3px; + border-radius: 2px; pointer-events: none; } @@ -2947,7 +2946,7 @@ select:focus + .focus { .container-speed-indicator input:checked ~ .checkmark12 { background-color: hotpink; border: none; - border-radius: 3px; + border-radius: 2px; } /* Custom segment indicator checkbox 01. Active/checked. */ @@ -4230,16 +4229,17 @@ select:focus + .focus { display: flex; flex-direction: row; align-items: center; - width: 17%; background-color: transparent; } .item-power-block-heading-container:nth-child(1) { justify-content: flex-start; + width: 70px; } .item-power-block-heading-container:nth-child(3) { - justify-content: flex-end; + justify-content: space-between; + gap: 5px; padding-right: 3px; } diff --git a/HeroSystem6eHeroic/HeroSystem6eHeroic.html b/HeroSystem6eHeroic/HeroSystem6eHeroic.html index 9e7137a74f..eb43e4ce8f 100644 --- a/HeroSystem6eHeroic/HeroSystem6eHeroic.html +++ b/HeroSystem6eHeroic/HeroSystem6eHeroic.html @@ -3676,7 +3676,7 @@
- +
@@ -3881,7 +3881,7 @@
- +
@@ -4086,7 +4086,7 @@
- +
@@ -4291,7 +4291,7 @@
- +
@@ -4496,7 +4496,7 @@
- +
@@ -4701,7 +4701,7 @@
- +
@@ -4906,7 +4906,7 @@
- +
@@ -5111,7 +5111,7 @@
- +
@@ -5316,7 +5316,7 @@
- +
@@ -5521,7 +5521,7 @@
- +
@@ -10368,6 +10368,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- +
@@ -14515,7 +14535,7 @@
- +
@@ -14568,7 +14588,7 @@
- +
@@ -14621,7 +14641,7 @@
- +
@@ -14674,7 +14694,7 @@
- +
@@ -14727,7 +14747,7 @@
- +
@@ -14780,7 +14800,7 @@
- +
@@ -14833,7 +14853,7 @@
- +
@@ -14886,7 +14906,7 @@
- +
@@ -14939,7 +14959,7 @@
- +
@@ -15092,7 +15112,7 @@
- +
@@ -15168,7 +15188,7 @@
- +
@@ -15244,7 +15264,7 @@
- +
@@ -15320,7 +15340,7 @@
- +
@@ -15396,7 +15416,7 @@
- +
@@ -15472,7 +15492,7 @@
- +
@@ -15548,7 +15568,7 @@
- +
@@ -15624,7 +15644,7 @@
- +
@@ -15700,7 +15720,7 @@
- +
@@ -15776,7 +15796,7 @@
- +
@@ -19055,6 +19075,37 @@ }); + /* Show Power XX */ + arrayOf(maxPowerNum).forEach(num => { + var powerId = String(num).padStart(2,'0'); + on(`clicked:showPower${powerId}`, (info) => { + getAttrs(["whisperToGM", "character_title", "powerName"+powerId, "powerDice"+powerId, "powerActivate"+powerId, "dingbat"], function(values) { + var theRoll = values.whisperToGM||""; + const dingbat = ((values.character_title).replace(/\s/g, '') != '') ? (" "+values.dingbat+" ") : ""; + const lesserDingbat = " ⬩ "; + const hasName = (values["powerName"+powerId].trim() !== "") ? true : false; + const hasDice = (values["powerDice"+powerId] !== "0") ? true : false; + const hasActivationRoll = (values["powerActivate"+powerId] !== "on") ? false : true; + + theRoll += "&{template:custom-show} {{title=@{character_name}" + dingbat + "@{character_title}}} "; + theRoll += "{{subtitle= Power" + lesserDingbat + "@{powerName"+powerId+"}}} "; + + if (hasName) { + theRoll += "{{Effect=@{powerEffect"+powerId+"}}} "; + theRoll += hasDice ? "{{Dice=@{powerDice"+powerId+"}}}" : ""; + theRoll += hasActivationRoll ? "{{Activation=@{powerSkillRoll"+powerId+"}}}" : ""; + theRoll += "{{DCV=@{powerDCV"+powerId+"}}} "; + theRoll += "{{desc=@{powerText"+powerId+"}}}"; + } + + startRoll(theRoll, (results) => { + finishRoll(results.rollId, {}); + }); + }); + }); + }); + + /* Activate Power XX */ arrayOf(maxPowerNum).forEach(num => { var powerId = String(num).padStart(2,'0'); @@ -19302,8 +19353,6 @@ startRoll(theRoll, (results) => { // Roll activation and effect dice. If the option to auto apply endurance is TRUE, subtract the power's END once from endurance. - // - // let theResult = new Object(); // Subtract END cost if option checked. if (subtractEND) { @@ -21855,7 +21904,7 @@ /* Show Maneuver XX */ arrayOf(maxManeuverNum).forEach(num => { var maneuverId = String(num).padStart(2,'0'); - on(`clicked:showManeuverRoll${maneuverId}`, (info) => { + on(`clicked:showManeuver${maneuverId}`, (info) => { getAttrs(["whisperToGM", "character_title", "martialManeuverNormal"+maneuverId, "martialManeuverStunMod"+maneuverId, "dingbat"], function(values) { var theRoll = values.whisperToGM||""; let isNormal = values["martialManeuverNormal"+maneuverId] != 0;