diff --git a/Exalted 3/Ex3-Sheet.css b/Exalted 3/Ex3-Sheet.css index a7a60cc745..a227474def 100644 --- a/Exalted 3/Ex3-Sheet.css +++ b/Exalted 3/Ex3-Sheet.css @@ -235,19 +235,25 @@ input, select, option, optgroup, textarea, .sheet-normal-caps, .btn:not([type=ro height: calc(6em + 30px); } -.sheet-motes { +.sheet-motes, +.sheet-battle-group-row { margin-top: 10px; clear: right; position: relative; padding-left: 30px; } -.sheet-motes input[type=number] { +.sheet-motes input[type=number], +.sheet-battle-group-row input[type=number] { width: 1.75em; font-size: 16px; } -.sheet-motes:last-child input[type=number] { width: 71px; } +.sheet-motes:last-child input[type=number], +.sheet-battle-group-row:last-child input[type=number], +.sheet-battle-group-row select { + width: 71px; +} input[type=number]::-webkit-inner-spin-button, input[type=number]::-webkit-outer-spin-button { @@ -259,14 +265,23 @@ input[type=number] { -moz-appearance: textfield; } -.sheet-motes span { display: inline-block; } +.sheet-motes span, +.sheet-battle-group-row span { + display: inline-block; +} -.sheet-motes span:last-child { +.sheet-motes span:last-child, +.sheet-battle-group-row span:last-child { position: absolute; right: 40px; font-size: 20px; } +.sheet-battle-group-row select:last-child { + position: absolute; + right: 40px; +} + textarea { resize: none; width: 96%; @@ -644,6 +659,17 @@ input.sheet-tab-settings-sheet:checked ~ div.sheet-tab-settings-sheet, display: block; } +.sheet-battle-group[value="0"] ~ div.sheet-tab-character-sheet .sheet-battle-group-header, +.sheet-battle-group[value="0"] ~ div.sheet-tab-character-sheet .sheet-battle-group-body { + display: none; +} + +.sheet-battle-group[value="1"] ~ div.sheet-tab-character-sheet > .sheet-health-track, +.sheet-battle-group[value="1"] ~ div.sheet-tab-character-sheet > .sheet-health-header { + display: none; +} + + input.sheet-tab { width: 140px; height: 30px; diff --git a/Exalted 3/Ex3-Sheet.html b/Exalted 3/Ex3-Sheet.html index a6c8b4f5ee..9192b0baa9 100644 --- a/Exalted 3/Ex3-Sheet.html +++ b/Exalted 3/Ex3-Sheet.html @@ -49,6 +49,12 @@ })).execute(); })); + on('sheet:opened change:battlegroup change:battlegroup-size change:battlegroup-health-levels', TAS._fn(function updateBattleGroupMagnitude(e) { + getAttrs(["battlegroup-size", "battlegroup-health-levels"], TAS._fn(function determineBattleGroupMagnitude(values) { + setAttrs({"battlegroup-magnitude_max": parseInt(values["battlegroup-size"]) + parseInt(values["battlegroup-health-levels"])}); + })); + })); + on('change:caste', TAS._fn(function updateMotePool(eventInfo){ getAttrs(["caste"], TAS._fn(function determineMotePool(values){ var periEquation = "0"; @@ -544,6 +550,7 @@ TAS=TAS||function(){"use strict";var e="0.2.4",n=1457098091,t={debug:{key:"debug +