diff --git a/css/mosh.css b/css/mosh.css
index 1e994bf..9954e56 100644
--- a/css/mosh.css
+++ b/css/mosh.css
@@ -2338,6 +2338,26 @@ p {
box-shadow: none !important;
}
+/* Skill picker scroll list — thin scrollbar, no overflow on the dialog */
+.macro-popup-dialog .sla-skill-scroll-list {
+ scrollbar-width: thin;
+ scrollbar-color: #aaa #e6e6e6;
+}
+.macro-popup-dialog .sla-skill-scroll-list::-webkit-scrollbar {
+ width: 6px;
+}
+.macro-popup-dialog .sla-skill-scroll-list::-webkit-scrollbar-track {
+ background: #e6e6e6;
+ border-radius: 3px;
+}
+.macro-popup-dialog .sla-skill-scroll-list::-webkit-scrollbar-thumb {
+ background: #aaa;
+ border-radius: 3px;
+}
+.macro-popup-dialog .sla-skill-scroll-list::-webkit-scrollbar-thumb:hover {
+ background: #888;
+}
+
.mosh .sla-panel {
margin-bottom: 14px;
padding: 12px;
diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js
index 2dfbc42..1f9eba5 100644
--- a/module/actor/actor-sheet.js
+++ b/module/actor/actor-sheet.js
@@ -826,7 +826,7 @@ export class MothershipActorSheet extends foundry.appv1.sheets.ActorSheet {
var item;
item = foundry.utils.duplicate(this.actor.getEmbeddedDocument("Item", li.dataset.itemId));
- this.actor.rollCheck(null, null, null, item.name, item.system.bonus, null);
+ this.actor.rollCheck(null, null, null, item.name, item.system.bonus, null, null, { promptModifier: true });
});
html.find('.sla-ebb-skill-roll').click(ev => {
@@ -858,7 +858,7 @@ export class MothershipActorSheet extends foundry.appv1.sheets.ActorSheet {
//const item = duplicate(this.actor.getEmbeddedDocument("Item", li.dataset.itemId));
var item;
item = foundry.utils.duplicate(this.actor.getEmbeddedDocument("Item", li.dataset.itemId));
- this.actor.rollWeaponAttack(item);
+ this.actor.rollWeaponAttack(item, { promptModifier: true });
});
// Rollable Damage
diff --git a/module/actor/actor.js b/module/actor/actor.js
index 7a63d3d..29f82a2 100644
--- a/module/actor/actor.js
+++ b/module/actor/actor.js
@@ -4,6 +4,21 @@ import { SLADrugSystem } from "../sla-drug-system.js";
import { SLA_SPECIES_BALANCE_VERSION, getSlaSpeciesStatAdjustments } from "../sla-species-balance.js";
import { buildSlaTraumaResponseText } from "../sla-trauma.js";
+// Global event delegation to handle interactive range slider value updates
+// in a way that is fully compatible with Foundry VTT's HTML sanitization.
+if (typeof document !== "undefined") {
+ document.addEventListener("input", (event) => {
+ const target = event.target;
+ if (target && target.tagName === "INPUT" && target.name === "rollModifier") {
+ const value = Number(target.value) || 0;
+ const label = target.closest(".resource")?.querySelector(".slider-value");
+ if (label) {
+ label.innerText = (value >= 0 ? "+" : "") + value;
+ }
+ }
+ });
+}
+
const SLA_AMMO_TYPES = {
STD: { label: "Standard", multiplier: 1, damageBonus: "", woundEffect: "", summary: "Standard ammunition." },
AP: { label: "AP", multiplier: 2, damageBonus: "-1", woundEffect: "Gunshot [-]", summary: "Armour-piercing ammunition. Treat target armour as halved and reduce damage by 1." },
@@ -1770,11 +1785,21 @@ export class MothershipActor extends Actor {
//wrap skill list in a scrollable container so long lists don't push buttons off-screen
const scrollableSkillList = `${skillList}
`;
//create final dialog data
+ const showModifier = !foundry.utils.hasProperty(context.attackContext ?? {}, "rollModifier");
+ const modifierHtml = showModifier ? `
+
+
+
+
+ ` : "";
const dialogData = {
window: {title: dlgTitle},
classes: ["macro-popup-dialog"],
position: {width: 600},
- content: skillHeader + scrollableSkillList + buttonDesc,
+ content: skillHeader + scrollableSkillList + modifierHtml + buttonDesc,
buttons: []
};
//add adv/normal/dis buttons if we need a rollString
@@ -1788,8 +1813,9 @@ export class MothershipActor extends Actor {
rollString = `1d100 [+]`;
skill = button.form.querySelector("input[name='skill']:checked")?.getAttribute("id");
skillValue = button.form.querySelector("input[name='skill']:checked")?.getAttribute("value");
- resolve([rollString, skill, skillValue]);
- slaDebug(`User left the chooseSkill dialog with: rollString:${rollString}, skill:${skill}, skillValue:${skillValue}`);
+ const rollModifier = showModifier ? (Number(button.form.querySelector("input[name='rollModifier']")?.value ?? 0) || 0) : (Number(context.attackContext?.rollModifier ?? 0) || 0);
+ resolve([rollString, skill, skillValue, rollModifier]);
+ slaDebug(`User left the chooseSkill dialog with: rollString:${rollString}, skill:${skill}, skillValue:${skillValue}, modifier:${rollModifier}`);
},
icon: `fas fa-angle-double-up`
},
@@ -1800,8 +1826,9 @@ export class MothershipActor extends Actor {
rollString = `1d100`;
skill = button.form.querySelector("input[name='skill']:checked")?.getAttribute("id");
skillValue = button.form.querySelector("input[name='skill']:checked")?.getAttribute("value");
- resolve([rollString, skill, skillValue]);
- slaDebug(`User left the chooseSkill dialog with: rollString:${rollString}, skill:${skill}, skillValue:${skillValue}`);
+ const rollModifier = showModifier ? (Number(button.form.querySelector("input[name='rollModifier']")?.value ?? 0) || 0) : (Number(context.attackContext?.rollModifier ?? 0) || 0);
+ resolve([rollString, skill, skillValue, rollModifier]);
+ slaDebug(`User left the chooseSkill dialog with: rollString:${rollString}, skill:${skill}, skillValue:${skillValue}, modifier:${rollModifier}`);
},
icon: `fas fa-minus`
},
@@ -1812,8 +1839,9 @@ export class MothershipActor extends Actor {
rollString = `1d100 [-]`;
skill = button.form.querySelector("input[name='skill']:checked")?.getAttribute("id");
skillValue = button.form.querySelector("input[name='skill']:checked")?.getAttribute("value");
- resolve([rollString, skill, skillValue]);
- slaDebug(`User left the chooseSkill dialog with: rollString:${rollString}, skill:${skill}, skillValue:${skillValue}`);
+ const rollModifier = showModifier ? (Number(button.form.querySelector("input[name='rollModifier']")?.value ?? 0) || 0) : (Number(context.attackContext?.rollModifier ?? 0) || 0);
+ resolve([rollString, skill, skillValue, rollModifier]);
+ slaDebug(`User left the chooseSkill dialog with: rollString:${rollString}, skill:${skill}, skillValue:${skillValue}, modifier:${rollModifier}`);
},
icon: `fas fa-angle-double-down`
}
@@ -1827,8 +1855,9 @@ export class MothershipActor extends Actor {
callback: (event, button, dialog) => {
skill = button.form.querySelector("input[name='skill']:checked")?.getAttribute("id");
skillValue = button.form.querySelector("input[name='skill']:checked")?.getAttribute("value");
- resolve([rollString, skill, skillValue]);
- slaDebug(`User left the chooseSkill dialog with: rollString:${rollString}, skill:${skill}, skillValue:${skillValue}`);
+ const rollModifier = showModifier ? (Number(button.form.querySelector("input[name='rollModifier']")?.value ?? 0) || 0) : (Number(context.attackContext?.rollModifier ?? 0) || 0);
+ resolve([rollString, skill, skillValue, rollModifier]);
+ slaDebug(`User left the chooseSkill dialog with: rollString:${rollString}, skill:${skill}, skillValue:${skillValue}, modifier:${rollModifier}`);
},
icon: `fas fa-chevron-circle-right`
}
@@ -1849,19 +1878,29 @@ export class MothershipActor extends Actor {
let dieAdv = die + ` [+]`;
let dieDis = die + ` [-]`;
//create final dialog data
+ const modifierHtml = `
+
+
+
+
+ `;
const dialogData = {
window: {title: dlgTitle},
classes: ["macro-popup-dialog"],
position: {width: 600},
- content: `` + game.i18n.localize("Mosh.SelectYourRollType") + `:
`,
+ content: ``,
buttons: [
{
label: game.i18n.localize("Mosh.Advantage"),
action: `action_advantage`,
callback: (event, button, dialog) => {
rollString = dieAdv;
- resolve([rollString]);
- slaDebug(`User left the chooseAdvantage dialog with: rollString:${rollString}`);
+ const rollModifier = Number(button.form.querySelector("input[name='rollModifier']")?.value ?? 0) || 0;
+ resolve([rollString, rollModifier]);
+ slaDebug(`User left the chooseAdvantage dialog with: rollString:${rollString}, modifier:${rollModifier}`);
},
icon: `fas fa-angle-double-up`
},
@@ -1870,8 +1909,9 @@ export class MothershipActor extends Actor {
action: `action_normal`,
callback: (event, button, dialog) => {
rollString = die;
- resolve([rollString]);
- slaDebug(`User left the chooseAdvantage dialog with: rollString:${rollString}`);
+ const rollModifier = Number(button.form.querySelector("input[name='rollModifier']")?.value ?? 0) || 0;
+ resolve([rollString, rollModifier]);
+ slaDebug(`User left the chooseAdvantage dialog with: rollString:${rollString}, modifier:${rollModifier}`);
},
icon: `fas fa-minus`
},
@@ -1880,8 +1920,9 @@ export class MothershipActor extends Actor {
action: `action_disadvantage`,
callback: (event, button, dialog) => {
rollString = dieDis;
- resolve([rollString]);
- slaDebug(`User left the chooseAdvantage dialog with: rollString:${rollString}`);
+ const rollModifier = Number(button.form.querySelector("input[name='rollModifier']")?.value ?? 0) || 0;
+ resolve([rollString, rollModifier]);
+ slaDebug(`User left the chooseAdvantage dialog with: rollString:${rollString}, modifier:${rollModifier}`);
},
icon: `fas fa-angle-double-down`
}
@@ -2474,6 +2515,9 @@ export class MothershipActor extends Actor {
rollString = chosenSkills[0];
skill = chosenSkills[1];
skillValue = chosenSkills[2];
+ if (chosenSkills[3] !== undefined) {
+ attackContext.rollModifier = chosenSkills[3];
+ }
}
//if rollString is STILL blank, redirect player to choose the roll
if (!rollString) {
@@ -2481,6 +2525,9 @@ export class MothershipActor extends Actor {
let chosenRollType = await this.chooseAdvantage(this.system.stats[attribute].rollLabel, '1d100');
//set variables
rollString = chosenRollType[0];
+ if (chosenRollType[1] !== undefined) {
+ attackContext.rollModifier = chosenRollType[1];
+ }
}
//if this is a weapon roll
if (weapon) {
@@ -2635,6 +2682,18 @@ export class MothershipActor extends Actor {
} else {
rollTarget = rollTargetOverride;
}
+ const modifier = Number(attackContext?.rollModifier ?? 0) || 0;
+ if (modifier) {
+ rollTarget += modifier;
+ if (effectiveRollBreakdown) {
+ effectiveRollBreakdown.parts.push({
+ label: "Roll Modifier",
+ value: modifier
+ });
+ effectiveRollBreakdown.total += modifier;
+ effectiveRollBreakdown.formulaText += ` ${modifier >= 0 ? "+" : ""}${modifier}`;
+ }
+ }
rollTarget = this.clampSlaRollTarget(rollTarget, rollString);
if (effectiveRollBreakdown && (String(rollString ?? "").includes("1d100"))) {
effectiveRollBreakdown = {
@@ -4005,10 +4064,58 @@ export class MothershipActor extends Actor {
return { total, parts };
}
- async chooseWeaponAttackOptions(weapon) {
+ async promptRollModifier(title = "Roll Modifier") {
+ return new Promise((resolve) => {
+ const dialogData = {
+ window: { title },
+ content: `
+
+ `,
+ buttons: [
+ {
+ label: "Roll",
+ action: "roll",
+ icon: "fas fa-dice-d20",
+ callback: (_event, button) => {
+ const modifier = Number(button.form.querySelector("input[name='rollModifier']")?.value ?? 0) || 0;
+ resolve(modifier);
+ }
+ },
+ {
+ label: "Cancel",
+ action: "cancel",
+ icon: "fas fa-times",
+ callback: () => resolve(null)
+ }
+ ],
+ close: () => resolve(null)
+ };
+ new foundry.applications.api.DialogV2(dialogData).render({ force: true });
+ });
+ }
+
+ async chooseWeaponAttackOptions(weapon, attackContext = {}) {
const fireModes = this.getWeaponFireModes(weapon);
const activeFireMode = this.getActiveWeaponFireMode(weapon);
const ammoChoices = this.getWeaponAmmoChoices(weapon);
+ const showModifier = Boolean(attackContext?.promptModifier);
return new Promise((resolve) => {
const fireOptions = fireModes.map((mode) => `
@@ -4018,20 +4125,40 @@ export class MothershipActor extends Actor {
`).join("");
+ const modifierHtml = showModifier ? `
+
+
+
+
+ -30
+ -20
+ -10
+ 0
+ +10
+ +20
+ +30
+
+