Merge pull request #13197 from Kurohyou/Alien/Fix-roll-errors

Alien RPG: Fixes hostile syntax errors, radiation rolls, and push rolls
Roll20 · Aug 13, 2024 · 70b6443 · 70b6443
2 parents 9357bb7 + 1df25a9
commit 70b6443
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 47 deletions.
diff --git a/alien_rpg/alien_rpg.css b/alien_rpg/alien_rpg.css
@@ -893,39 +893,6 @@
   position: relative;
   padding: 1rem;
 }
-.sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-body .inlinerollresult {
-  display: grid;
-  place-content: center;
-  font-size: 1em;
-  line-height: 0.9;
-  position: relative;
-  padding: 2px;
-  color: var(--col-alien-white);
-  height: 24px;
-  aspect-ratio: 1;
-  border: none;
-  border-radius: 6px;
-  background: var(--col-alien-black);
-  text-align: center;
-  font-family: var(--font-thick-header);
-  font-weight: normal;
-}
-.sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-body .inlinerollresult::after {
-  position: absolute;
-  inset: 2px;
-  content: "";
-}
-.sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-body .inlinerollresult.fullcrit, .sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-body .inlinerollresult[original-title="Rolling 6 = 6"], .sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-body .inlinerollresult[title="Rolling 6 = 6"] {
-  order: 1;
-  color: transparent;
-}
-.sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-body .inlinerollresult.fullcrit::after, .sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-body .inlinerollresult[original-title="Rolling 6 = 6"]::after, .sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-body .inlinerollresult[title="Rolling 6 = 6"]::after {
-  background: var(--img-dice-success);
-  background-size: contain;
-}
-.sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-body .inlinerollresult[original-title*="computed value"], .sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-body .inlinerollresult[title*="computed value"] {
-  pointer-events: none;
-}
 .sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-body::before {
   position: absolute;
   inset: 0;
@@ -1028,6 +995,39 @@
   clip-path: polygon(0 0, 2rem 0, 2rem var(--border-width), calc(100% - 2rem) var(--border-width), calc(100% - 2rem) 0, 100% 0, 100% 100%, calc(100% - 2rem) 100%, calc(100% - 2rem) calc(100% - var(--border-width)), 2rem calc(100% - var(--border-width)), 2rem 100%, 0 100%);
   z-index: -1;
 }
+.sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-results .inlinerollresult {
+  display: grid;
+  place-content: center;
+  font-size: 1em;
+  line-height: 0.9;
+  position: relative;
+  padding: 2px;
+  color: var(--col-alien-white);
+  height: 24px;
+  aspect-ratio: 1;
+  border: none;
+  border-radius: 6px;
+  background: var(--col-alien-black);
+  text-align: center;
+  font-family: var(--font-thick-header);
+  font-weight: normal;
+}
+.sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-results .inlinerollresult::after {
+  position: absolute;
+  inset: 2px;
+  content: "";
+}
+.sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-results .inlinerollresult[original-title*="computed value"], .sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-results .inlinerollresult[title*="computed value"] {
+  pointer-events: none;
+}
+.sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-results:not(.sheet-plain) .inlinerollresult.fullcrit, .sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-results:not(.sheet-plain) .inlinerollresult[original-title="Rolling 6 = 6"], .sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-results:not(.sheet-plain) .inlinerollresult[title="Rolling 6 = 6"] {
+  order: 1;
+  color: transparent;
+}
+.sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-results:not(.sheet-plain) .inlinerollresult.fullcrit::after, .sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-results:not(.sheet-plain) .inlinerollresult[original-title="Rolling 6 = 6"]::after, .sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-results:not(.sheet-plain) .inlinerollresult[title="Rolling 6 = 6"]::after {
+  background: var(--img-dice-success);
+  background-size: contain;
+}
 .sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-results a {
   background-color: var(--col-teal);
   text-transform: uppercase;
@@ -1043,7 +1043,6 @@
 }
 .sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-base .inlinerollresult:not(.fullcrit):not([original-title="Rolling 6 = 6"]):not([title="Rolling 6 = 6"]) {
   order: 2;
-  color: var(--col-alien-medium);
 }
 .sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-base .inlinerollresult.fullcrit::after, .sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-base .inlinerollresult[original-title="Rolling 6 = 6"]::after, .sheet-rolltemplate-alien.sheet-rolltemplate-alien .sheet-base .inlinerollresult[title="Rolling 6 = 6"]::after {
   filter: invert(1);
@@ -1108,6 +1107,9 @@
   content: ":";
   margin-left: var(--tiny-gap);
 }
+.ui-dialog .tab-content .charsheet *:has(> .camelBox) {
+  isolation: isolate;
+}
 .ui-dialog .tab-content .charsheet .tooltip-container {
   display: grid;
   position: relative;