Merge pull request #11422 from Stexinator/Shadowrun5thA_fix_technomancer_css_issues

[Shadowrun5thA] fix some technomancer css issues
This commit is contained in:
Miguel Peres
2023-02-07 05:16:08 -03:00
committed by GitHub
2 changed files with 38 additions and 38 deletions
+9 -20
View File
@@ -99,11 +99,13 @@ input[type=number]::-webkit-inner-spin-button {
color:#aaaaee;
}
.show-mage:not(:checked) ~ button.magic {
.show-mage:not(:checked) ~ button.magic,
.show-mage:not(:checked) ~ div.magic {
display:none;
}
.show-mage:checked ~ button.magic {
.show-mage:checked ~ button.magic,
.show-mage:checked ~ div.magic {
}
.show-critter:not(:checked) ~ button.critter {
@@ -113,11 +115,13 @@ input[type=number]::-webkit-inner-spin-button {
.show-critter:checked ~ button.critter {
}
.show-technomancy:not(:checked) ~ button.technomancy {
.show-technomancy:not(:checked) ~ button.technomancy,
.show-technomancy:not(:checked) ~ div.technomancy {
display:none;
}
.show-technomancy:checked ~ button.technomancy {
.show-technomancy:checked ~ button.technomancy,
.show-technomancy:checked ~ div.technomancy {
}
.wrapper h2{
@@ -399,15 +403,6 @@ input[type=checkbox].hiddencheckbox{
color:inherit;
}
.magicianinitiation,
input.technomancycheckbox:checked ~ div.technomancerinitiation,
input.technomancycheckbox:checked ~ div.labeltechnomancer,
input.technomancycheckbox:checked ~ div label.labeltechnomancer{
display:block;
}
.weaponrangerollwrapper,
.weaponmodewrapper select,
.hiddenmelee:checked ~ div.weaponmodewrapper input,
@@ -514,7 +509,6 @@ input.technomancycheckbox:checked ~ div label.labeltechnomancer{
.technomancycheckbox,
div .labeltechnomancer,
.technomancer,
.technomancerinitiation,
.rollbuttonnospec,
.skillshowspec,
.skillshowspec:checked ~ button.rollbuttonspec,
@@ -522,11 +516,6 @@ div .labeltechnomancer,
.mskillshowspec:checked ~ button.rollbuttonspec,
.knowledgeshowspec,
.knowledgeshowspec:checked ~ button.rollbuttonspec,
.technomancycheckbox:checked ~ div.labelmage,
.technomancycheckbox:checked ~ label.labelmage,
.technomancycheckbox:checked ~ div.magician,
.technomancycheckbox:checked ~ div.magicianinitiation,
.technomancycheckbox:checked ~ div.mage,
.hiddentextfield,
.hiddenmelee
{
@@ -1500,7 +1489,6 @@ input[disabled="true"]{
.charinforow,
.rollrow,
.defenserow,
.spellrow,
.limitfields,
.limitlabels,
.woundsrow,
@@ -1513,6 +1501,7 @@ input[disabled="true"]{
margin-top:0.3em;
}
.spellrow,
.spiriterow,
.warerow,
.martialrow,
+29 -18
View File
@@ -48,11 +48,10 @@
<div class="statlabel"><label>Logic</label></div>
<div class="statlabel"><label>Charisma</label></div>
<div class="statlabel"><label>Intuition</label></div>
<div class="statlabel">
<input class="technomancycheckbox" type="checkbox" name="attr_istechnomancer" value="1">
<div class="labelmage"><label>Magic</label></div>
<div class="labeltechnomancer"><label>Resonance</label></div>
</div>
<input class="show-mage" name="attr_ismage" type="checkbox" checked hidden/>
<div class="statlabel magic"><label>Magic</label></div>
<input class="show-technomancy" name="attr_istechnomancer" type="checkbox" checked hidden/>
<div class="statlabel technomancy"><label>Resonance</label></div>
<div class="statlabel"><label>Edge</label></div>
</div>
<div class="statcol2">
@@ -67,7 +66,10 @@
<div class="statinputwrapper"><input type="number" class="statinput" name="attr_log_base" title="Base Attribute unaugmented"></div>
<div class="statinputwrapper"><input type="number" class="statinput" name="attr_cha_base" title="Base Attribute unaugmented"></div>
<div class="statinputwrapper"><input type="number" class="statinput" name="attr_int_base" title="Base Attribute unaugmented"></div>
<div class="statinputwrapper"><input type="number" class="statinput" name="attr_mag_base" title="Base Attribute unaugmented"></div>
<input class="show-mage" name="attr_ismage" type="checkbox" checked hidden/>
<div class="statinputwrapper magic"><input type="number" class="statinput" name="attr_mag_base" title="Base Attribute unaugmented"></div>
<input class="show-technomancy" name="attr_istechnomancer" type="checkbox" checked hidden/>
<div class="statinputwrapper technomancy"><input type="number" class="statinput" name="attr_mag_base" title="Base Attribute unaugmented"></div>
<div class="statinputwrapper"><input type="number" class="statinput" name="attr_edg_total" title="Base Attribute unaugmented"></div>
</div>
<div class="statcol3">
@@ -83,7 +85,10 @@
<div class="statinputwrapper"><input type="number" class="statinput" name="attr_log_aug" value="0" title="Bonuses from Augmentations"></div>
<div class="statinputwrapper"><input type="number" class="statinput" name="attr_cha_aug" value="0" title="Bonuses from Augmentations"></div>
<div class="statinputwrapper"><input type="number" class="statinput" name="attr_int_aug" value="0" title="Bonuses from Augmentations"></div>
<div class="statinputwrapper"><input type="number" class="statinput" name="attr_mag_aug" value="0" title="Bonuses from Augmentations"></div>
<input class="show-mage" name="attr_ismage" type="checkbox" checked hidden/>
<div class="statinputwrapper magic"><input type="number" class="statinput" name="attr_mag_aug" value="0" title="Bonuses from Augmentations"></div>
<input class="show-technomancy" name="attr_istechnomancer" type="checkbox" checked hidden/>
<div class="statinputwrapper technomancy"><input type="number" class="statinput" name="attr_mag_aug" value="0" title="Bonuses from Augmentations"></div>
</div>
<div class="statsubcol">
<div class="statheading">
@@ -97,7 +102,10 @@
<div class="statinputwrapper"><input type="number" class="statinput" name="attr_log_total" value="@{log_base}+@{log_aug}" title="Base + Bonus" disabled></div>
<div class="statinputwrapper"><input type="number" class="statinput" name="attr_cha_total" value="@{cha_base}+@{cha_aug}" title="Base + Bonus" disabled></div>
<div class="statinputwrapper"><input type="number" class="statinput" name="attr_int_total" value="@{int_base}+@{int_aug}" title="Base + Bonus" disabled></div>
<div class="statinputwrapper"><input type="number" class="statinput" name="attr_mag_total" value="@{mag_base}+@{mag_aug}" title="Base + Bonus" disabled></div>
<input class="show-mage" name="attr_ismage" type="checkbox" checked hidden/>
<div class="statinputwrapper magic"><input type="number" class="statinput" name="attr_mag_total" value="@{mag_base}+@{mag_aug}" title="Base + Bonus" disabled></div>
<input class="show-technomancy" name="attr_istechnomancer" type="checkbox" checked hidden/>
<div class="statinputwrapper technomancy"><input type="number" class="statinput" name="attr_mag_total" value="@{mag_base}+@{mag_aug}" title="Base + Bonus" disabled></div>
</div>
<div class="rollcol">
<div class="statheading">
@@ -127,8 +135,13 @@
<div class="statinputwrapper">
<button type="action" class="standardroll" name="act_roll" title="Roll Intuition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Intuition}}{{val1=Intuition}}{{val1_num=[[@{int_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{sustainedspells=[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]}}{{result=[[(@{int_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]-[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>
</div>
<div class="statinputwrapper">
<button type="action" class="standardroll" name="act_roll" title="Roll Magic/Res" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Magic/Res}}{{val1=Magic/Res}}{{val1_num=[[@{mag_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{sustainedspells=[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]}}{{result=[[(@{mag_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]-[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>
<input class="show-mage" name="attr_ismage" type="checkbox" checked hidden/>
<div class="statinputwrapper magic">
<button type="action" class="standardroll" name="act_roll" title="Roll Magic" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Magic/Res}}{{val1=Magic/Res}}{{val1_num=[[@{mag_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{sustainedspells=[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]}}{{result=[[(@{mag_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]-[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>
</div>
<input class="show-technomancy" name="attr_istechnomancer" type="checkbox" checked hidden/>
<div class="statinputwrapper technomancy">
<button type="action" class="standardroll" name="act_roll" title="Roll Res" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Magic/Res}}{{val1=Magic/Res}}{{val1_num=[[@{mag_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{sustainedspells=[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]}}{{result=[[(@{mag_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]-[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>
</div>
</div>
<div class="edgewrapper">
@@ -8042,9 +8055,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
</div>
</div>
<fieldset class="repeating_spells">
<div class="spellrow">
<details>
<summary>
<summary class="spellrow">
<div class="spellnamewrapper">
<input type="text" name="attr_spellname" title="Name of the Spell">
</div>
@@ -8094,7 +8106,6 @@ make sure to enter what the spell is resisted with">
</summary>
<textarea name="attr_spelldescription" rows="6"></textarea>
</details>
</div>
</fieldset>
<br>
<h2>Rituals</h2>
@@ -8283,7 +8294,7 @@ make sure to enter what the spell is resisted with">
</fieldset>
</div>
<div class="spirits">
<div class="magicianinitiation">
<div>
<h2>Spirits</h2>
<div class="spiriterow">
<div class="spiritelabel"><label>Summon Spirit</label></div>
@@ -8300,7 +8311,7 @@ make sure to enter what the spell is resisted with">
</div>
</div>
<div class="initiation">
<div class="magicianinitiation">
<div>
<h2>Initiation</h2>
<div class="initiationrow">
<div class="initiationspacer"> </div>
@@ -8610,7 +8621,7 @@ make sure to enter what the spell is resisted with">
</div>
</div>
<div class="initiation">
<div class="technomancerinitiation">
<div>
<h2>Submersion</h2>
<div class="initiationrow">
<div class="metamagicnamewrapper">
@@ -16622,7 +16633,7 @@ on('clicked:roll', async (event) => {
var reroll = {
dice: results.results.result.dice.length,
successes: results.results.result.result,
limit: results.results.limit_num != undefined ? results.results.limit_num.result + results.results.limit_mod.result : 100
limit: (results.results.limit_num?.result ?? 100) + (results.results.limit_mod?.result ?? 0)
}
finishRoll(
@@ -16660,7 +16671,7 @@ on('clicked:repeating_knowledge:roll clicked:repeating_alchemy:roll clicked:repe
var reroll = {
dice: results.results.result.dice.length,
successes: results.results.result.result,
limit: results.results.limit_num != undefined ? results.results.limit_num.result + results.results.limit_mod.result : 100
limit: results.results.limit_num?.result ?? 100 + results.results.limit_mod?.result ?? 0
}
finishRoll(