Skip to content

fix: keep creature modifier when adding from modal #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Myp3a wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: keep creature modifier when adding from modal #353

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
077044c
fix: keep creature modifier when adding from modal (#313)
Myp3a May 30, 2026
4594e7d
fix: rolling initiative respects new modifier
Myp3a May 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 36 additions & 26 deletions src/tracker/ui/create/Create.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import { confirmWithModal } from "./modal";

let creature: Creature = new Creature({});
let modifier = JSON.stringify(creature.modifier);
export let amount = 1;
export let plugin: InitiativeTracker;
export let adding: Writable<Array<[Creature, number]>>;
Expand All @@ -27,6 +28,7 @@
editing.subscribe((c) => {
if (!c) return;
creature = c;
modifier = JSON.stringify(creature.modifier);
});

$: {
Expand All @@ -35,8 +37,29 @@
}
}

let modifier = JSON.stringify(creature.modifier ?? 0);
const prior = modifier;
const tryUpdateCreatureModifier = () => {
let parsed_modifier: number | number[] | undefined;
try {
parsed_modifier = JSON.parse(`${modifier}`);
} catch (e) {
console.warn(
"Initiative Tracker: Non-parseable modifier provided to creature."
);
}
if (
(Array.isArray(parsed_modifier) &&
!parsed_modifier.every((m) => !isNaN(Number(m)))) ||
isNaN(Number(parsed_modifier))
) {
console.warn(
"Initiative Tracker: Non-numeric modifier provided to creature."
);
modifier = JSON.stringify(creature.modifier);
} else {
creature.modifier = parsed_modifier;
}
}

const saveButton = (node: HTMLElement) => {
new ExtraButtonComponent(node)
.setTooltip("Add Creature")
Expand All @@ -46,27 +69,9 @@
new Notice("Enter a name!");
return;
}
try {
creature.modifier = JSON.parse(`${modifier}`);
} catch (e) {
console.warn(
"Initiative Tracker: Non-parseable modifier provided to creature."
);
creature.modifier = JSON.parse(prior);
}
if (!creature.modifier) {
creature.modifier = JSON.parse(prior);
}
if (
(Array.isArray(creature.modifier) &&
!creature.modifier.every((m) => !isNaN(Number(m)))) ||
isNaN(Number(creature.modifier))
) {
console.warn(
"Initiative Tracker: Non-numeric modifier provided to creature."
);
creature.modifier = 0;
}

tryUpdateCreatureModifier();

if (
creature.initiative <= 0 ||
creature.initiative == null ||
Expand All @@ -88,6 +93,7 @@
$adding = $adding;
$editing = null;
creature = new Creature({});
modifier = JSON.stringify(creature.modifier);
});
};
const editButton = (node: HTMLElement) => {
Expand All @@ -99,9 +105,9 @@
new Notice("Enter a name!");
return;
}
if (!creature.modifier) {
creature.modifier = 0;
}

tryUpdateCreatureModifier();

if (
creature.initiative <= 0 ||
creature.initiative == null ||
Expand All @@ -128,6 +134,7 @@
$adding = $adding;
$editing = null;
creature = new Creature({});
modifier = JSON.stringify(creature.modifier);
});
};
const cancelButton = (node: HTMLElement) => {
Expand All @@ -136,13 +143,15 @@
.setIcon("reset")
.onClick(() => {
creature = new Creature({});
modifier = JSON.stringify(creature.modifier);
});
};
const diceButton = (node: HTMLElement) => {
new ExtraButtonComponent(node)
.setIcon(DICE)
.setTooltip("Roll Initiative")
.onClick(async () => {
tryUpdateCreatureModifier();
creature.initiative = await plugin.getInitiativeValue(
creature.modifier
);
Expand All @@ -164,6 +173,7 @@
modal.onSelect(async (selected) => {
if (selected.item) {
creature = Creature.from(selected.item);
modifier = JSON.stringify(creature.modifier);

creature.initiative = await plugin.getInitiativeValue(
creature.modifier
Expand Down