Merge pull request #11497 from JonnesDerik/trinitycontinuum2e

Trinity-Continuum_2ed - Bugfix
This commit is contained in:
Nic Bradley
2023-02-20 09:15:50 -08:00
committed by GitHub
2 changed files with 185 additions and 29 deletions
+119 -5
View File
@@ -3731,7 +3731,6 @@ input.primaryColorFont::placeholder{
.colorOverHide[value="fulgurtech"] ~* .divisorLabel,
.colorOverHide[value="fulgurtech"] ~* .credTitle,
.colorOverHide[value="fulgurtech"] ~* .credName,
.colorOverHide[value="fulgurtech"] ~* .powerTypeExtension div,
.colorOverHide[value="fulgurtech"] ~ * .quantumPowerTypeAndExpander .powerTypeExtension .inputPathName[name="attr_powertypeextension-1"],
.colorOverHide[value="fulgurtech"] ~ * .quantumPowerTypeAndExpander .powerTypeExtension .inputPathName[name="attr_powertypeextension-2"],
.colorOverHide[value="fulgurtech"] ~ * .TCGifts .megaEdgeTypeAndExpander .megaEdgeTypeExtension .inputPathName {
@@ -3739,6 +3738,11 @@ input.primaryColorFont::placeholder{
transition: 1s;
}
.colorOverHide[value="fulgurtech"] ~* .powerTypeExtension div,
.colorOverHide[value="fulgurtech"] ~* .megaEdgeTypeExtension div{
color: #1A938F;
}
@@ -4220,7 +4224,7 @@ input.primaryColorFont::placeholder{
.colorOverHide[value="default"] + .selectedTier[value="anima"] ~* .megaEdgeTagsContainer,
.colorOverHide[value="fulgurtech"] ~* .megaEdgeTagsContainer{
height: 263px;
height: 276px;
}
@@ -4340,13 +4344,22 @@ input.primaryColorFont::placeholder{
.colorOverHide[value="fulgurtech"] ~ .pseudoBody .pseudoDisplay .headerStatsWeaponType input:focus{
background-color: #0000001a;
border-radius: 0px;
border-color: #008d88;
border-color: #008d88;
}
.colorOverHide[value="fulgurtech"] ~* .TCMegaAttributeAlternative .selectedMegaAttribute[value=""] + .inputPathName {
border-bottom: 1px solid #008d88;
border-radius: 0px;
}
.colorOverHide[value="default"] + .selectedTier[value="anima"] ~* .pathStatus,
.colorOverHide[value="default"] + .selectedTier[value="anima"] ~* .pseudoDisplay .TCGifts input.selectedPathStatus + .singleGift .pathStatus,
@@ -5168,6 +5181,37 @@ input.primaryColorFont::placeholder{
border-color: #c464f7a6;
}
.colorOverHide[value="fulgurtech"] ~ .pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .quantumPower,
.colorOverHide[value="fulgurtech"] ~ .pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .megaEdge{
background-color: transparent;
border-color: #008D88;
}
.colorOverHide[value="fulgurtech"] ~ .pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .quantumPower .dot::before,
.colorOverHide[value="fulgurtech"] ~ .pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .megaEdge .dot::before{
left: 5px;
}
.colorOverHide[value="fulgurtech"] ~ .pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .quantumPower .dot > span,
.colorOverHide[value="fulgurtech"] ~ .pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .megaEdge .dot > span{
left: 0px;
background: #86F7F3;
box-shadow: 0px 0px 13px #0FFFF796;
transition: none;
min-width: 8px;
height: 14px;
margin-top: -8px;
}
.colorOverHide[value="fulgurtech"] ~ .pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .quantumPower .powerSuiteColorSection,
.colorOverHide[value="fulgurtech"] ~ .pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .megaEdge .powerSuiteColorSection{
opacity: 0;
pointer-events: none;
}
/* ////////////////// PsiadTheme ////////////////// */
@@ -6804,10 +6848,22 @@ input.selectedTier[value="NPC"] ~ .sourceType[value="inspirationGog"] ~* .facets
input[value="technique"] ~* .megaEdgeTypeExtension,
input[value="variation"] ~* .megaEdgeTypeExtension,
input[value="component"] ~* .megaEdgeTypeExtension{
input[value="component"] ~* .megaEdgeTypeExtension,
input[value="maxouted"] ~* .megaEdgeTypeExtension{
display: flex;
}
input[value="maxouted"] ~* .megaEdgeTypeExtension{
margin-top: 8px;
margin-left: 5px;
}
input[value="maxouted"] ~* .megaEdgeTypeExtension div{
display: none;
}
.megaEdgeTypeExtension div{
font-size: 12px;
color: #5E5E5E;
@@ -6870,6 +6926,11 @@ input[value="component"] ~* .megaEdgeTypeExtension{
border-radius: 0px;
}
.megaEdge .selectedMegaAttribute[value=""] + select {
border: none;
background-color: transparent;
}
.megaEdge .traitHeader .dots{
padding: 0px;
padding-top: 3px;
@@ -7261,10 +7322,21 @@ input[value="component"] ~* .megaEdgeTypeExtension{
input[value="technique"] ~* .powerTypeExtension,
input[value="variation"] ~* .powerTypeExtension,
input[value="component"] ~* .powerTypeExtension{
input[value="component"] ~* .powerTypeExtension,
input[value="maxouted"] ~* .powerTypeExtension{
display: flex;
}
input[value="maxouted"] ~* .powerTypeExtension{
margin-top: 8px;
margin-left: 5px;
}
input[value="maxouted"] ~* .powerTypeExtension div{
display: none;
}
.powerTypeExtension div{
font-size: 12px;
color: #5E5E5E;
@@ -7994,6 +8066,48 @@ input[value="component"] ~* .powerTypeExtension{
.pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .quantumPower,
.pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .megaEdge{
background-color: transparent;
}
.pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .quantumPower .dot::before,
.pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .megaEdge .dot::before{
left: 5px;
}
.pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .quantumPower .dot > span,
.pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .megaEdge .dot > span{
min-width: 10px;
height: 10px;
background: #848484;
}
.pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .quantumPower .powerSuiteColorSection,
.pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .megaEdge .powerSuiteColorSection{
opacity: 0;
pointer-events: none;
}
.maxOutPlus{
display: none;
font-size: 19px;
margin-right: 4px;
}
.TCMegaAttributeAlternative .maxOutPlus{
margin-top: -9px;
}
.pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .quantumPower .maxOutPlus,
.pseudoBody .pseudoDisplay .pSection .powerType[value="maxouted"] ~ .megaEdge .maxOutPlus{
display: flex;
}
+66 -24
View File
@@ -2557,7 +2557,7 @@
<option value="psion">&nbsp;Psion</option>
<option value="qin">&nbsp;Qin</option>
<option value="inspired">&nbsp;Inspired</option>
<option disabled>&nbsp;Anima</option>
<option value="anima">&nbsp;Anima</option>
<option value="NPC">&nbsp;NPC</option>
<option class="optionTitle primaryColorBackground colorFont" disabled>SUPER-SCIENCE</option>
<option value="ftech">&nbsp;Flux-Tech</option>
@@ -2596,8 +2596,8 @@
<option value="inspiration">Inspiration [Talent]</option>
<option value="inspirationStalwart">Insp. [Stalwart]</option>
<option value="inspirationMesmerist">Insp. [Mesmerist]</option>
<option disabled>Insp. [Gog]</option>
<option disabled>Insp. [Magog]</option>
<option value="inspirationGog">Insp. [Gog]</option>
<option value="inspirationMagog">Insp. [Magog]</option>
<option value="inspirationAssassin">Insp. [Assassin]</option>
<option value="quantum">Quantum [Nova]</option>
<option value="jinketsupower">Jinketsu Power</option>
@@ -2617,7 +2617,7 @@
<select name="attr_talentTierlevel" class="inputLine talent">
<option value="default" selected>Default</option>
<option disabled>Tr**l**r</option>
<option value="trlr">Tr**l**r</option>
</select>
<select name="attr_psionTierLevel" class="inputLine psion">
@@ -2639,9 +2639,9 @@
<option value="daredevil" selected>Daredevil</option>
<option value="stalwart">Stalwart</option>
<option value="mesmerist">Mesmerist</option>
<option disabled>Squire</option>
<option disabled>Gog</option>
<option disabled>Magog</option>
<option value="squire">Squire</option>
<option value="gog">Gog</option>
<option value="magog">Magog</option>
<option value="assassin">Assassin</option>
</select>
@@ -2750,7 +2750,7 @@
<option value="psion">&nbsp;Psion</option>
<option value="qin">&nbsp;Qin</option>
<option value="inspired">&nbsp;Inspired</option>
<option disabled>&nbsp;Anima</option>
<option value="anima">&nbsp;Anima</option>
<option value="NPC">&nbsp;NPC</option>
<option class="optionTitle primaryColorBackground colorFont" disabled>SUPER-SCIENCE</option>
<option value="ftech">&nbsp;Flux-Tech</option>
@@ -2790,7 +2790,7 @@
<select name="attr_talentTierlevel" class="inputLine talent">
<option value="default" selected>Default</option>
<option disabled>Tr**l**r</option>
<option value="trlr">Tr**l**r</option>
</select>
<select name="attr_psionTierLevel" class="inputLine psion">
@@ -2915,7 +2915,7 @@
<option value="psion">&nbsp;Psion</option>
<option value="qin">&nbsp;Qin</option>
<option value="inspired">&nbsp;Inspired</option>
<option disabled>&nbsp;Anima</option>
<option value="anima">&nbsp;Anima</option>
<option value="NPC">&nbsp;NPC</option>
<option class="optionTitle primaryColorBackground colorFont" disabled>SUPER-SCIENCE</option>
<option value="ftech">&nbsp;Flux-Tech</option>
@@ -3038,7 +3038,7 @@
<option value="psion">&nbsp;Psion</option>
<option value="qin">&nbsp;Qin</option>
<option value="inspired">&nbsp;Inspired</option>
<option disabled>&nbsp;Anima</option>
<option value="anima">&nbsp;Anima</option>
<option value="NPC">&nbsp;NPC</option>
<option class="optionTitle primaryColorBackground colorFont" disabled>SUPER-SCIENCE</option>
<option value="ftech">&nbsp;Flux-Tech</option>
@@ -3152,7 +3152,7 @@
<option value="psion">&nbsp;Psion</option>
<option value="qin">&nbsp;Qin</option>
<option value="inspired">&nbsp;Inspired</option>
<option disabled>&nbsp;Anima</option>
<option value="anima">&nbsp;Anima</option>
<option value="NPC">&nbsp;NPC</option>
<option class="optionTitle primaryColorBackground colorFont" disabled>SUPER-SCIENCE</option>
<option value="ftech">&nbsp;Flux-Tech</option>
@@ -3281,7 +3281,7 @@
<option value="psion">&nbsp;Psion</option>
<option value="qin">&nbsp;Qin</option>
<option value="inspired">&nbsp;Inspired</option>
<option disabled>&nbsp;Anima</option>
<option value="anima">&nbsp;Anima</option>
<option value="NPC">&nbsp;NPC</option>
<option class="optionTitle primaryColorBackground colorFont" disabled>SUPER-SCIENCE</option>
<option value="ftech">&nbsp;Flux-Tech</option>
@@ -3421,7 +3421,7 @@
<option value="psion">&nbsp;Psion</option>
<option value="qin">&nbsp;Qin</option>
<option value="inspired">&nbsp;Inspired</option>
<option disabled>&nbsp;Anima</option>
<option value="anima">&nbsp;Anima</option>
<option value="NPC">&nbsp;NPC</option>
<option class="optionTitle primaryColorBackground colorFont" disabled>SUPER-SCIENCE</option>
<option value="ftech">&nbsp;Flux-Tech</option>
@@ -3569,7 +3569,7 @@
<option value="psion">&nbsp;Psion</option>
<option value="qin">&nbsp;Qin</option>
<option value="inspired">&nbsp;Inspired</option>
<option disabled>&nbsp;Anima</option>
<option value="anima">&nbsp;Anima</option>
<option value="NPC">&nbsp;NPC</option>
<option class="optionTitle primaryColorBackground colorFont" disabled>SUPER-SCIENCE</option>
<option value="ftech">&nbsp;Flux-Tech</option>
@@ -3668,7 +3668,7 @@
<button class="traitRollButton primaryColorFont" type="action" name="act_roll-aim">K</button>
<div class="input-label">
Aim:
&#11041
<!-- &#11041 -->
</div>
<input type="text" name="attr_aim_specialty" class="inputLine" />
@@ -8683,6 +8683,8 @@
<input type="hidden" class="expanderFlag" value="0" name="attr_mega-attributealternative_expand">
<input type="hidden" class="powerSuiteColor" value="default" name="attr_power-suite-color-1">
<input type="hidden" class="powerType" name='attr_megaedgetype-1' value='power' />
<div class="megaEdge secondaryColorBackground">
@@ -8700,6 +8702,7 @@
<option value="power" selected>Mega Attribute</option>
<option value="technique">Technique</option>
<option value="component">Component</option>
<option value="maxouted">Max-Outed</option>
</select>
<div class="megaEdgeTypeExtension">
@@ -8732,6 +8735,10 @@
<option value="megaComposure">Mega-Composure</option>
</select>
<div class="maxOutPlus">
+
</div>
<div class="dots">
<input type="hidden" name="attr_mega-edge-1-dots" class="dot" value="0" />
@@ -9350,7 +9357,9 @@
<input type="hidden" class="expanderFlag" value="0" name="attr_mega-attributealternative_expand">
<input type="hidden" class="powerSuiteColor" value="default" name="attr_power-suite-color-2">
<input type="hidden" class="powerSuiteColor" value="default" name="attr_power-suite-color-2">
<input type="hidden" class="powerType" name='attr_megaedgetype-2' value='power' />
<div class="megaEdge secondary secondaryColorBackground">
@@ -9365,6 +9374,7 @@
<option value="power" selected>Mega Attribute</option>
<option value="technique">Technique</option>
<option value="component">Component</option>
<option value="maxouted">Max-Outed</option>
</select>
<div class="megaEdgeTypeExtension">
@@ -9396,6 +9406,10 @@
<option value="megaComposure">Mega-Composure</option>
</select>
<div class="maxOutPlus">
+
</div>
<div class="dots">
<input type="hidden" name="attr_mega-edge-2-dots" class="dot" value="0" />
@@ -10051,6 +10065,8 @@
<input type="hidden" class="expanderFlag" value="0" name="attr_mega-edge_expand">
<input type="hidden" class="powerSuiteColor" value="default" name="attr_power-suite-color-1">
<input type="hidden" class="powerType" name='attr_megaedgetype-1' value='power' />
<div class="megaEdge secondaryColorBackground">
@@ -10068,6 +10084,7 @@
<option value="power" selected>Mega Edge</option>
<option value="technique">Technique</option>
<option value="component">Component</option>
<option value="maxouted">Max-Outed</option>
</select>
<div class="megaEdgeTypeExtension">
@@ -10088,6 +10105,10 @@
<input type="text" name="attr_mega-edge-1-trait-1" class="inputPathName" placeholder=" " />
<div class="maxOutPlus">
+
</div>
<div class="dots">
<input type="hidden" name="attr_mega-edge-1-dots" class="dot" value="0" />
@@ -10726,7 +10747,9 @@
<input type="hidden" class="expanderFlag" value="0" name="attr_mega-edge_expand">
<input type="hidden" class="powerSuiteColor" value="default" name="attr_power-suite-color-2">
<input type="hidden" class="powerSuiteColor" value="default" name="attr_power-suite-color-2">
<input type="hidden" class="powerType" name='attr_megaedgetype-2' value='power' />
<div class="megaEdge secondary secondaryColorBackground">
@@ -10741,6 +10764,7 @@
<option value="power" selected>Mega Edge</option>
<option value="technique">Technique</option>
<option value="component">Component</option>
<option value="maxouted">Max-Outed</option>
</select>
<div class="megaEdgeTypeExtension">
@@ -10761,6 +10785,10 @@
<input type="text" name="attr_mega-edge-2-trait-1" class="inputPathName" placeholder=" " />
<div class="maxOutPlus">
+
</div>
<div class="dots">
<input type="hidden" name="attr_mega-edge-2-dots" class="dot" value="0" />
@@ -11440,6 +11468,8 @@
<input type="hidden" class="expanderFlag" value="0" name="attr_quantum-power_expand">
<input type="hidden" class="powerSuiteColor" value="default" name="attr_power-suite-color-1">
<input type="hidden" class="powerType" name='attr_powertype-1' value='power' />
<div class="quantumPower secondaryColorBackground">
@@ -11458,11 +11488,12 @@
<option value="technique">Technique</option>
<option value="variation">Variation</option>
<option value="component">Component</option>
<option value="maxouted">Max-Outed</option>
</select>
<div class="powerTypeExtension">
<div class="flex aiCenter jcCenter">of</div>
<input type="text" name="attr_powertypeextension-1" class="inputPathName" placeholder=" " />
<input type="text" name="attr_powertypeextension-1" class="inputPathName primaryColorFont" placeholder=" " />
</div>
</div>
@@ -11477,9 +11508,13 @@
<div class="flex aiCenter jcSpaceBetween quantumPowerNameAndDots">
<input type="text" name="attr_quantum-power-1-trait-1" class="inputPathName" placeholder=" " />
<div class="maxOutPlus">
+
</div>
<div class="dots">
<input type="hidden" name="attr_quantum-power-1-dots" class="dot" value="0" />
@@ -12187,6 +12222,8 @@
<input type="hidden" class="expanderFlag" value="0" name="attr_quantum-power_expand">
<input type="hidden" class="powerSuiteColor" value="default" name="attr_power-suite-color-2">
<input type="hidden" class="powerType" name='attr_powertype-2' value='power' />
<div class="quantumPower secondary secondaryColorBackground">
@@ -12202,12 +12239,13 @@
<option value="power" selected>Quantum Power</option>
<option value="technique">Technique</option>
<option value="variation">Variation</option>
<option value="component">Component</option>
<option value="component">Component</option>
<option value="maxouted">Max-Outed</option>
</select>
<div class="powerTypeExtension">
<div class="flex aiCenter jcCenter">of</div>
<input type="text" name="attr_powertypeextension-2" class="inputPathName" placeholder=" " />
<input type="text" name="attr_powertypeextension-2" class="inputPathName primaryColorFont" placeholder=" " />
</div>
</div>
@@ -12225,6 +12263,10 @@
<input type="text" name="attr_quantum-power-2-trait-1" class="inputPathName" placeholder=" " />
<div class="maxOutPlus">
+
</div>
<div class="dots">
<input type="hidden" name="attr_quantum-power-2-dots" class="dot" value="0" />
@@ -16981,7 +17023,7 @@
<input type="text" name="attr_aptitudemodelevel-1-3-cost" class="inputLine"/>
</div>
</div>
r
</div>
<textarea name="attr_aptitudemodelevel-1-3_description" placeholder="Description" rows="4" spellcheck="false" class="description"></textarea>
@@ -36890,7 +36932,7 @@ function sectionIniciatorTwoValues(section, levels1, trait1, levels2, trait2, ba
// ############################### - FIM SET INITIATIVE - ###############################
on("clicked:core_roll clicked:generic_roll clicked:initiative_roll clicked:anima_initiative_roll clicked:repeating_customroll:genericroll01 clicked:repeating_customroll:genericroll02 clicked:repeating_customroll:genericroll03 clicked:repeating_custominitiative:custominitiative01 clicked:repeating_custominitiative:custominitiative02 clicked:repeating_custominitiative:custominitiative03", function(){
on("clicked:core_roll clicked:generic_roll clicked:initiative_roll clicked:anima_initiative_roll clicked:repeating_customroll:genericroll01 clicked:repeating_customroll:genericroll02 clicked:repeating_customroll:genericroll03 clicked:repeating_custominitiative:custominitiative01 clicked:repeating_custominitiative:custominitiative02 clicked:repeating_custominitiative:custominitiative03 clicked:npc_core_roll clicked:npc_generic_roll clicked:npc_initiative_roll", function(){
var today = new Date();
var dd = String(today.getDate()).padStart(2, '0');
var mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0!