Trap Handling

Completed Trap handling, fixed bug with attacks bool toggle
Lumenita · Dec 15, 2024 · 56da573 · 56da573
1 parent ee50613
commit 56da573
Show file tree

Hide file tree

Showing 19 changed files with 506 additions and 101 deletions.
diff --git a/css/abfalter.css b/css/abfalter.css
@@ -3829,12 +3829,20 @@ h6 {
     border: 1px solid var(--boxColor);
 }
 .weapon-item .weaponSubHeaderContainer {
-    display: grid;
-    grid-template-columns: 1fr auto;
-    align-items: center;
+    display: flex;
     width: 100%;
     padding: 5px 0 0 0;
 }
+.wepSubLeft {
+    display: flex;
+    justify-content: flex-start;
+    width: 50%;
+}
+.wepSubRight {
+    display: flex;
+    justify-content: flex-end;
+    width: 50%;
+}
 .weaponSubTrap {
     display: flex;
     align-items: center;
@@ -3851,16 +3859,15 @@ h6 {
     display: flex;
     align-items: center;
     white-space: nowrap;
-    justify-self: end;
 }
 .weaponSubThrow > span:nth-of-type(2) {
-    padding: 0 5px 0 3px;
+    padding: 0 3px 0 5px;
 }
 .weaponSubThrow > a {
     font-size: 13px;
 }
-.weaponSubThrow > span:nth-of-type(3) {
-    padding: 0 2px 0 2px;
+.weaponSubThrow > span:nth-of-type(1) {
+    padding: 0 5px;
 }
 /* #endregion */
 
@@ -5966,7 +5973,7 @@ h6 {
     width: 5%;
 }
 /* #endregion */
-/* #region Weapon Attack Prompt */
+/* #region Weapon Attack Prompt & Chat Card */
 .wepAtkDiceRoll {
     padding: 0 3%;
 }
@@ -5989,4 +5996,63 @@ h6 {
 .wepAtkDiceRoll > label > select {
     width: 45%;
 }
+
+.weaponChatRollMsg > div:first-of-type {
+    display: grid;
+    font-size: 23px;
+    justify-items: center;
+}
+.weaponChatRollMsg > div:first-of-type > span:nth-of-type(2) {
+    text-decoration: underline;
+    font-style: italic;
+    font-size: 15px;
+}
+.chatAtkRoll {
+    font-size: 17px;
+    display: flex;
+    justify-content: space-between;
+}
+.chatAtkRoll > span:nth-of-type(1) {
+    padding-left: 7%;
+    max-width: 75%;
+}
+.chatAtkRoll > span:nth-of-type(2) {
+    padding-right: 7%;
+    align-self: center;
+}
+.weaponChatRollMsg > div:nth-last-of-type(2) {
+    border-image: url(../img/border.png) 10 stretch;
+    border-top: 5px solid black;
+    border-bottom: 5px solid black;
+    margin-top: 3px;
+    margin-bottom: 3px;
+}
+
+
+
+.atkCustomTitleContainer {
+  position: relative;
+}
+.atkCustomTitle {
+  visibility: hidden;
+  opacity: 0;
+  background-color: #333;
+  color: #fff; 
+  text-align: center;
+  border-radius: 4px;
+  padding: 5px;
+  position: absolute;
+  top: 100%; /* Position it below the container */
+  z-index: 10;
+  left: 50%;
+  width: 200px;
+  transform: translateX(-50%);
+  transition: opacity 0.2s ease-in-out;
+  font-size: 14px;
+  pointer-events: none;
+}
+.atkCustomTitleContainer:hover .atkCustomTitle {
+  visibility: visible;
+  opacity: 1;
+}
 /* #endregion */
diff --git a/lang/en.json b/lang/en.json
@@ -798,6 +798,8 @@
     "trapRoll": "Trap opp. rolls are",
     "fortitudeShort": "Fort",
     "breakageShort": "Break",
+    "targetAim": "Direct atk. target",
+
 
     "armoryTab": {
       "wearArmor": "Wear Armor",

diff --git a/module/abfalter.js b/module/abfalter.js
@@ -933,11 +933,11 @@ class weaponDataModel extends foundry.abstract.DataModel {
                 quantityConsumed: makeBoolField(),
                 consumedValue:  makeIntField(),
                 ignorePrecision: makeBoolField(),
-                ignoreVorpal: makeBoolField(),
-                ignoreTrapping: makeBoolField(),
+                ignoreVorpal: makeBoolField(false),
+                ignoreTrapping: makeBoolField(false),
                 trappingType: makeBoolField(),                
                 trappingValue: makeIntField(),
-                parentPercision: makeBoolField(),
+                parentPrecision: makeBoolField(),
                 parentVorpal: makeBoolField(),
                 parentTrapping: makeBoolField(),
                 parentThrowable: makeBoolField(),

diff --git a/module/chat.js b/module/chat.js
@@ -1,10 +1,14 @@
 import { openRollFunction } from "./diceroller.js";
+import { wepOpenRollFunction } from "./diceroller.js";
 import { fumbleRollFunction } from "./diceroller.js";
 
 export function addChatListeners(html, _msg) {
     html.find('button.secOpenRoll').click(ev => {
         openRollFunction(_msg.message);
     });
+    html.find('button.wepOpenRoll').click(ev => {
+        wepOpenRollFunction(_msg.message);
+    });
 
     html.find('button.secFumbleRoll').click(ev => {
         fumbleRollFunction(_msg.message);

diff --git a/module/config.js b/module/config.js
@@ -529,6 +529,9 @@ export const abfalter = {
     activeActionMod: "abfalter.activeActionMod",
     directedAttackPrompt: "abfalter.directedAttackPrompt",
     trapRoll: "abfalter.trapRoll",
+    fortitudeShort: "abfalter.fortitudeShort",
+    breakageShort: "abfalter.breakageShort",
+    targetAim: "abfalter.targetAim",
 };
 abfalter.kiTab = {
     kiAbilities: "abfalter.kiTab.kiAbilities",