Mostly chat styles, a bit of AI Assistant API

Eunomiac · Nov 23, 2023 · 6ddff47 · 6ddff47
1 parent 83298d7
commit 6ddff47
Show file tree

Hide file tree

Showing 29 changed files with 1,681 additions and 304 deletions.
diff --git a/assets/BladesInTheDark.pdf b/assets/BladesInTheDark.pdf
diff --git a/...ence-icons/accept-complication-severe.svg → ...nce-icons/accept-complication-serious.svg b/...ence-icons/accept-complication-severe.svg → ...nce-icons/accept-complication-serious.svg
diff --git a/...quence-icons/base-complication-severe.svg → ...uence-icons/base-complication-serious.svg b/...quence-icons/base-complication-severe.svg → ...uence-icons/base-complication-serious.svg
diff --git a/...ence-icons/resist-complication-severe.svg → ...nce-icons/resist-complication-serious.svg b/...ence-icons/resist-complication-severe.svg → ...nce-icons/resist-complication-serious.svg
diff --git a/...nce-icons/special-complication-severe.svg → ...ce-icons/special-complication-serious.svg b/...nce-icons/special-complication-severe.svg → ...ce-icons/special-complication-serious.svg
diff --git a/css/style.min.css b/css/style.min.css
diff --git a/css/tinymce/content.min.css b/css/tinymce/content.min.css
@@ -117,6 +117,7 @@ html, :root {
   --blades-red-nums: 200, 0, 0;
   --blades-red-dark-nums: 150, 0, 0;
   --blades-red-darkest-nums: 50, 0, 0;
+  --blades-red-black-nums: 25, 0, 0;
   --blades-green-bright-nums: 20, 220, 60;
   --blades-green-nums: 0, 204, 0;
   --blades-green-dark-nums: 0, 122, 0;
@@ -182,6 +183,7 @@ html, :root {
   --blades-red: rgba(var(--blades-red-nums), 1);
   --blades-red-dark: rgba(var(--blades-red-dark-nums), 1);
   --blades-red-darkest: rgba(var(--blades-red-darkest-nums), 1);
+  --blades-red-black: rgba(var(--blades-red-black-nums), 1);
   --blades-green-bright: rgba(var(--blades-green-bright-nums), 1);
   --blades-green: rgba(var(--blades-green-nums), 1);
   --blades-green-dark: rgba(var(--blades-green-dark-nums), 1);
@@ -1188,8 +1190,8 @@ html .comp.consequence-display-container .consequence-icon-container, :root .com
   max-width: var(--container-height);
   background: transparent;
   left: var(--container-left-shift);
-  z-index: 1;
   pointer-events: auto;
+  z-index: 2;
   transition: 0.2s;
 }
 html .comp.consequence-display-container .consequence-icon-container:hover, :root .comp.consequence-display-container .consequence-icon-container:hover {
@@ -1259,6 +1261,7 @@ html .comp.consequence-display-container .consequence-icon-container .consequenc
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
+  pointer-events: none !important;
   bottom: 0px;
 }
 html .comp.consequence-display-container .consequence-icon-container .consequence-button-container .consequence-button-bg, :root .comp.consequence-display-container .consequence-icon-container .consequence-button-container .consequence-button-bg {
@@ -1286,12 +1289,14 @@ html .comp.consequence-display-container .consequence-icon-container .consequenc
   color: var(--blades-grey);
   font-weight: 800;
   text-shadow: 0px 0px 1px var(--blades-black-dark);
+  pointer-events: none !important;
   letter-spacing: 1;
   text-transform: uppercase;
   white-space: nowrap;
 }
 html .comp.consequence-display-container .consequence-icon-container .consequence-button-container .button-icon, :root .comp.consequence-display-container .consequence-icon-container .consequence-button-container .button-icon {
   position: unset;
+  pointer-events: none !important;
   height: 14px;
   width: 14px;
 }
@@ -1320,6 +1325,18 @@ html .comp.consequence-display-container .consequence-icon-container .consequenc
   right: 100%;
   bottom: 12px;
 }
+html .comp.consequence-display-container .consequence-blocker, :root .comp.consequence-display-container .consequence-blocker {
+  height: 100%;
+  background: var(--blades-black-dark);
+  transform-origin: 0% 50%;
+  opacity: 0;
+  position: absolute;
+  z-index: 10;
+  top: 0;
+  width: 100%;
+  z-index: 1;
+  left: calc(0.5 * var(--container-height) + 5px);
+}
 html .comp.consequence-display-container .consequence-type-container, :root .comp.consequence-display-container .consequence-type-container {
   position: absolute;
   height: calc(var(--container-height) * 0.33);
@@ -2816,8 +2833,8 @@ html .comp.consequence-display-container .consequence-icon-container, :root .com
   max-width: var(--container-height);
   background: transparent;
   left: var(--container-left-shift);
-  z-index: 1;
   pointer-events: auto;
+  z-index: 2;
   transition: 0.2s;
 }
 html .comp.consequence-display-container .consequence-icon-container:hover, :root .comp.consequence-display-container .consequence-icon-container:hover {
@@ -2887,6 +2904,7 @@ html .comp.consequence-display-container .consequence-icon-container .consequenc
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
+  pointer-events: none !important;
   bottom: 0px;
 }
 html .comp.consequence-display-container .consequence-icon-container .consequence-button-container .consequence-button-bg, :root .comp.consequence-display-container .consequence-icon-container .consequence-button-container .consequence-button-bg {
@@ -2914,12 +2932,14 @@ html .comp.consequence-display-container .consequence-icon-container .consequenc
   color: var(--blades-grey);
   font-weight: 800;
   text-shadow: 0px 0px 1px var(--blades-black-dark);
+  pointer-events: none !important;
   letter-spacing: 1;
   text-transform: uppercase;
   white-space: nowrap;
 }
 html .comp.consequence-display-container .consequence-icon-container .consequence-button-container .button-icon, :root .comp.consequence-display-container .consequence-icon-container .consequence-button-container .button-icon {
   position: unset;
+  pointer-events: none !important;
   height: 14px;
   width: 14px;
 }
@@ -2948,6 +2968,18 @@ html .comp.consequence-display-container .consequence-icon-container .consequenc
   right: 100%;
   bottom: 12px;
 }
+html .comp.consequence-display-container .consequence-blocker, :root .comp.consequence-display-container .consequence-blocker {
+  height: 100%;
+  background: var(--blades-black-dark);
+  transform-origin: 0% 50%;
+  opacity: 0;
+  position: absolute;
+  z-index: 10;
+  top: 0;
+  width: 100%;
+  z-index: 1;
+  left: calc(0.5 * var(--container-height) + 5px);
+}
 html .comp.consequence-display-container .consequence-type-container, :root .comp.consequence-display-container .consequence-type-container {
   position: absolute;
   height: calc(var(--container-height) * 0.33);

diff --git a/module/BladesDialog.js b/module/BladesDialog.js
@@ -4,7 +4,6 @@ import { BladesActor, BladesPC } from "./documents/BladesActorProxy.js";
 import BladesRoll from "./BladesRoll.js";
 import C, { RollResult, ConsequenceType, AttributeTrait, Position } from "./core/constants.js";
 import BladesAI, { AGENTS } from "./core/ai.js";
-// eslint-disable-next-line no-shadow
 export var SelectionCategory;
 (function (SelectionCategory) {
     SelectionCategory["Heritage"] = "Heritage";
@@ -29,7 +28,6 @@ export var SelectionCategory;
     SelectionCategory["Member"] = "Member";
     SelectionCategory["Contact"] = "Contact";
 })(SelectionCategory || (SelectionCategory = {}));
-// eslint-disable-next-line no-shadow
 export var BladesDialogType;
 (function (BladesDialogType) {
     BladesDialogType["Selection"] = "Selection";
@@ -271,7 +269,7 @@ class BladesDialog extends Dialog {
         const resistOptions = cData.resistOptions ?? {};
         // Clear 'resistTo' (will be redetermined below)
         delete cData.resistTo;
-        html.find(".consequence-resist-option").each((_, elem) => {
+        csqElem$.find(".consequence-resist-option").each((_, elem) => {
             const resCsqID = $(elem).data("csq-id");
             resistOptions[resCsqID] ??= { id: resCsqID, name: "", type: undefined, isSelected: false };
             // Update Resistance Option Type
@@ -301,6 +299,7 @@ class BladesDialog extends Dialog {
         if (!this.csqData) {
             return;
         }
+        eLog.checkLog3("dialog", "updateConsequenceDialog() this.csqData INCOMING", { ...this.csqData });
         const { csqData } = this;
         const { rollPrimaryDoc } = this.parent;
         if (!(rollPrimaryDoc instanceof BladesPC)) {
@@ -314,7 +313,7 @@ class BladesDialog extends Dialog {
             csqData[rollPos] = positionCsqData;
         });
         this.csqData = csqData;
-        eLog.checkLog3("dialog", "updateConsequenceDialog() this.csqData", { ...this.csqData });
+        eLog.checkLog3("dialog", "updateConsequenceDialog() this.csqData OUTGOING", { ...this.csqData });
         if (isRendering) {
             this.render();
         }

diff --git a/module/blades.js b/module/blades.js
@@ -16,7 +16,7 @@ import BladesNPCSheet from "./sheets/actor/BladesNPCSheet.js";
 import BladesFactionSheet from "./sheets/actor/BladesFactionSheet.js";
 import BladesRoll, { BladesRollMod, BladesRollPrimary, BladesRollOpposition, BladesRollParticipant } from "./BladesRoll.js";
 import BladesDialog from "./BladesDialog.js";
-import BladesAI, { AGENTS } from "./core/ai.js";
+import BladesAI, { AGENTS, AIAssistant } from "./core/ai.js";
 import BladesActiveEffect from "./BladesActiveEffect.js";
 import BladesGMTrackerSheet from "./sheets/item/BladesGMTrackerSheet.js";
 import BladesClockKeeperSheet from "./sheets/item/BladesClockKeeperSheet.js";
@@ -265,6 +265,7 @@ class GlobalGetter {
     BladesClockKeeperSheet,
     BladesGMTrackerSheet,
     BladesAI,
+    AIAssistant,
     AGENTS
 }); /* !DEVCODE*/
 // #endregion Globals