diff --git a/HeroSystem6eHeroic/HeroSystem6eHeroic.css b/HeroSystem6eHeroic/HeroSystem6eHeroic.css index f8f3738786..1748b2b6b8 100644 --- a/HeroSystem6eHeroic/HeroSystem6eHeroic.css +++ b/HeroSystem6eHeroic/HeroSystem6eHeroic.css @@ -1272,6 +1272,14 @@ select:focus + .focus { } } +.item-characteristics-propulsion-system-essentials, +.item-characteristics-propulsion-system-more { + flex-direction: column; + justify-content: space-between; + max-width: 146px; + min-height: 68px; +} + .item-characteristics-power-system-block, .item-characteristics-propulsion-system-block { display: flex; @@ -1376,30 +1384,17 @@ select:focus + .focus { font-weight: bold; } +.item-characteristics-propulsion-systems-row .subitem-characteristics-system-cost { + padding-top: 3px; + background-color: yellowgreen; +} + .subitem-characteristics-system-value { display: flex; flex-direction: row; justify-content: space-between; align-items: baseline; -} - -.item-characteristics-propulsion-system-row:nth-child(1) .subitem-characteristics-system-value { - min-width: 67px; -} - -.subitem-characteristics-system-value .container-checkbox-small { - top: -13px; - left: -10px; - margin: 0px; - padding: 0px; -} - -.item-characteristics-propulsion-system-row:nth-child(2) .subitem-characteristics-system-value:nth-child(1) { - min-width: 72px; -} - -.item-characteristics-propulsion-system-row:nth-child(2) .subitem-characteristics-system-value:nth-child(2) { - min-width: 63px; + min-width: 70px; } .item-characteristics-power-system-row .custom-select-alternate { @@ -1416,6 +1411,14 @@ select:focus + .focus { border: solid 1px #8da5ed; } +.item-characteristics-propulsion-system-more .item-characteristics-propulsion-system-row:first-child { + padding-top: 2px; +} + +.item-characteristics-propulsion-system-more .item-characteristics-propulsion-system-row:nth-child(2) { + padding-bottom: 2px; +} + .item-characteristics-propulsion-system-essentials .item-characteristics-propulsion-system-row:nth-child(3) .custom-select-propulsion { min-width: 40px; } @@ -1480,18 +1483,6 @@ select:focus + .focus { } } -.item-characteristics-propulsion-system-essentials, -.item-characteristics-propulsion-system-more { - flex-direction: column; - justify-content: space-between; - max-width: 146px; - min-height: 68px; -} - -.item-characteristics-propulsion-system-more .item-characteristics-propulsion-system-row:first-child { - margin-top: 2px; -} - /* Show additional modifiers for propulsion systems */ .show-primary-propulsion[value="essentials"] ~ div.item-characteristics-propulsion-system-essentials, .show-primary-propulsion[value="more"] ~ div.item-characteristics-propulsion-system-more, diff --git a/HeroSystem6eHeroic/HeroSystem6eHeroic.html b/HeroSystem6eHeroic/HeroSystem6eHeroic.html index c90ef075d5..374500a185 100644 --- a/HeroSystem6eHeroic/HeroSystem6eHeroic.html +++ b/HeroSystem6eHeroic/HeroSystem6eHeroic.html @@ -448,7 +448,7 @@

Lim

- +
@@ -472,7 +472,7 @@
- +
@@ -513,7 +513,7 @@
- +
@@ -538,7 +538,7 @@

Lim

- +
@@ -550,7 +550,7 @@
- + @@ -579,23 +579,9 @@

REC

-
- +
+

Lim

+
@@ -620,23 +606,9 @@

REC

-
- +
+

Lim

+
@@ -15820,7 +15792,7 @@
- +
@@ -16916,8 +16888,8 @@ version = 4.10; } - if (version < 4.40) { - version = 4.40; + if (version < 4.41) { + version = 4.41; } if (version != origVersion) { @@ -18036,12 +18008,12 @@ // Vehicle Power Systems - on("change:mainReserveEND change:mainReserveREC change:mainReserveLIM", function () { - getAttrs(["mainReserveEND", "mainReserveREC", "mainReserveLIM"], function(values) { + on("change:mainReserveEND change:mainReserveREC change:mainReserveLimitations", function () { + getAttrs(["mainReserveEND", "mainReserveREC", "mainReserveLimitations"], function(values) { const endValue = Math.max(0, parseInt(values.mainReserveEND)||0); const recValue = Math.max(0, parseInt(values.mainReserveREC)||0); - const limValue = Math.max(0, parseFloat(values.mainReserveLIM)||0); + const limValue = Math.max(0, parseFloat(values.mainReserveLimitations)||0); const endCost = 1; const recCost = 2; @@ -18677,8 +18649,8 @@ // Update primary propulsion mode for vehicles. - on("change:primaryPropulsionMode change:primaryPropulsion change:primaryPropulsionMod change:primaryNoncombatMultiple change:primaryPropulsionLim change:primaryPropulsionAdv change:weightMovePenalty change:primaryPropulsionSlotType change:primaryPropulsionCostsEND", function() { - getAttrs(["primaryPropulsionMode", "primaryPropulsion", "primaryPropulsionMod", "primaryNoncombatMultiple", "primaryPropulsionAdv", "primaryPropulsionLim", "primaryPropulsionSlotType", "primaryPropulsionCostsEND", "weightMovePenalty"], function(values) { + on("change:primaryPropulsionMode change:primaryPropulsion change:primaryPropulsionMod change:primaryNoncombatMultiple change:primaryPropulsionLimitations change:primaryPropulsionAdv change:weightMovePenalty change:primaryPropulsionSlotType change:primaryPropulsionCostsEND", function() { + getAttrs(["primaryPropulsionMode", "primaryPropulsion", "primaryPropulsionMod", "primaryNoncombatMultiple", "primaryPropulsionAdv", "primaryPropulsionLimitations", "primaryPropulsionSlotType", "primaryPropulsionCostsEND", "weightMovePenalty"], function(values) { const statValue = Math.max(0, parseInt(values.primaryPropulsion)||0); const statMod = parseInt(values.primaryPropulsionMod)||0; @@ -18689,7 +18661,7 @@ let statCP = 0; const costsEND = (values.primaryPropulsionCostsEND === "noEND") ? 0 : ((values.primaryPropulsionCostsEND === "costsENDhalf") ? 0.25 : 0.5); const advantages = Math.max(0, parseFloat(values.primaryPropulsionAdv)||0); - const limitations = Math.max(0, parseFloat(values.primaryPropulsionLim)||0) + costsEND; + const limitations = Math.max(0, parseFloat(values.primaryPropulsionLimitations)||0) + costsEND; let endurance = 0; let netMove = "NA"; const slotType = values.primaryPropulsionSlotType; @@ -18754,8 +18726,8 @@ // Update secondary propulsion mode for vehicles. - on("change:secondaryPropulsionMode change:secondaryPropulsion change:secondaryPropulsionMod change:secondaryNoncombatMultiple change:secondaryPropulsionAdv change:secondaryPropulsionLim change:secondaryPropulsionSlotType change:secondaryPropulsionCostsEND change:weightMovePenalty", function() { - getAttrs(["secondaryPropulsionMode", "secondaryPropulsion", "secondaryPropulsionMod", "secondaryNoncombatMultiple", "secondaryPropulsionAdv", "secondaryPropulsionLim", "secondaryPropulsionSlotType", "secondaryPropulsionCostsEND", "weightMovePenalty"], function(values) { + on("change:secondaryPropulsionMode change:secondaryPropulsion change:secondaryPropulsionMod change:secondaryNoncombatMultiple change:secondaryPropulsionAdv change:secondaryPropulsionLimitations change:secondaryPropulsionSlotType change:secondaryPropulsionCostsEND change:weightMovePenalty", function() { + getAttrs(["secondaryPropulsionMode", "secondaryPropulsion", "secondaryPropulsionMod", "secondaryNoncombatMultiple", "secondaryPropulsionAdv", "secondaryPropulsionLimitations", "secondaryPropulsionSlotType", "secondaryPropulsionCostsEND", "weightMovePenalty"], function(values) { const statValue = Math.max(0, parseInt(values.secondaryPropulsion)||0); const statMod = parseInt(values.secondaryPropulsionMod)||0; @@ -18766,7 +18738,7 @@ let statCP = 0; let costsEND = (values.secondaryPropulsionCostsEND === "noEND") ? 0 : ((values.secondaryPropulsionCostsEND === "costsENDhalf") ? 0.25 : 0.5); let advantages = Math.max(0, parseFloat(values.secondaryPropulsionAdv)||0); - let limitations = Math.max(0, parseFloat(values.secondaryPropulsionLim)||0) + costsEND; + let limitations = Math.max(0, parseFloat(values.secondaryPropulsionLimitations)||0) + costsEND; let endurance = 0; let netMove = "NA"; const slotType = values.secondaryPropulsionSlotType; diff --git a/HeroSystem6eHeroic/images/vehicle-sheet-scaled.png b/HeroSystem6eHeroic/images/vehicle-sheet-scaled.png index 70d8d4356a..6b2938dcba 100644 Binary files a/HeroSystem6eHeroic/images/vehicle-sheet-scaled.png and b/HeroSystem6eHeroic/images/vehicle-sheet-scaled.png differ diff --git a/HeroSystem6eHeroic/images/vehicle-sheet.png b/HeroSystem6eHeroic/images/vehicle-sheet.png index 19550dbe3f..9b80170492 100644 Binary files a/HeroSystem6eHeroic/images/vehicle-sheet.png and b/HeroSystem6eHeroic/images/vehicle-sheet.png differ