Skip to content

Add reset HP option to creature menu #315

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
Trantion897 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Add reset HP option to creature menu #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3860f3b
Add reset HP option to creature menu
Trantion897 Mar 24, 2025
71bce09
Add submenu for resetting HP to current max or max
Trantion897 Apr 2, 2025
de7d969
Add reset HP / status options to encounter menu
Trantion897 Apr 23, 2025
21f9364
Change wording of hp-status input help text
Trantion897 Apr 23, 2025
646047d
Highlight creatures with altered max HP
Trantion897 Apr 23, 2025
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
34 changes: 29 additions & 5 deletions src/tracker/stores/tracker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import type {
} from "src/utils/rpg-system";
import type { StackRoller } from "@javalent/dice-roller";


type HPUpdate = {
saved: boolean;
resist: boolean;
Expand Down Expand Up @@ -834,15 +835,38 @@ function createTracker() {
}
return creatures;
}),
reset: () =>
reset: (resetHp:boolean=true, resetMaxHp:boolean=true, resetStatus:boolean=true, resetAc:boolean=true) =>
updateAndSave((creatures) => {
for (let creature of creatures) {
creature.current_ac = creature.ac;
creature.hp = creature.current_max = creature.max;
if (resetAc) {
creature.current_ac = creature.ac;
}
if (resetMaxHp) {
creature.current_max = creature.max;
}
if (resetHp) {
creature.hp = creature.current_max;
}
if (resetStatus) {
creature.status.clear();
}
creature.enabled = true;
creature.status.clear();
}
_logger?.log("Encounter HP & Statuses reset");
const logMsg = [];
if (resetAc) {
logMsg.push("AC");
}
if (resetHp) {
logMsg.push("HP");
}
if (resetMaxHp) {
logMsg.push("Max HP");
}
if (resetStatus) {
logMsg.push("Statuses");
}

_logger?.log("Encounter " + logMsg.join(", ") + " reset");
return creatures;
}),

Expand Down
34 changes: 30 additions & 4 deletions src/tracker/ui/Controls.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,37 @@
.setTitle("Add Creatures")
.onClick(() => dispatch("add-creatures"));
});
menu.addItem((item) => {
item.setIcon(REDO)
.setTitle("Reset HP / Status")
.onClick(() => tracker.reset());

const resetItem = menu.addItem((item) => {
item.setIcon(REDO).setTitle("Reset HP / Status");

const resetMenu = item.setSubmenu();

resetMenu.addItem((item) => {
item.setIcon("fold-vertical")
.setTitle("Reset HP to current max")
.onClick(() => tracker.reset(true, false, false, true))
});

resetMenu.addItem((item) => {
item.setIcon("fold-vertical")
.setTitle("Reset HP to current max and clear statuses")
.onClick(() => tracker.reset(true, false, true, true))
});

resetMenu.addItem((item) => {
item.setIcon("tent")
.setTitle("Reset max HP and clear statuses")
.onClick(() => tracker.reset())
});

resetMenu.addItem((item) => {
item.setIcon("undo")
.setTitle("Clear statuses")
.onClick(() => tracker.reset(false, false, true, true))
});
});

menu.addItem((item) => {
item.setIcon(DICE)
.setTitle("Re-roll Initiatives")
Expand Down
4 changes: 2 additions & 2 deletions src/tracker/ui/Updating.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@
<div class="hp-status">
{#if plugin.data.beginnerTips}
<small class="label">
Apply damage, (-)healing, (t)temp HP, or (m)max HP
Apply damage, (-)healing, (t)temp HP, or (m)reduce max HP
</small>
{/if}
<div class="input">
<tag
use:hpIcon
aria-label="Apply damage, (-)healing, (t)temp HP, or (m)max HP"
aria-label="Apply damage, (-)healing, (t)temp HP, or (m)reduce max HP"
style="margin: 0 0.2rem 0 0.7rem"
/>
<input
Expand Down
35 changes: 33 additions & 2 deletions src/tracker/ui/creatures/CreatureControls.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
HIDDEN,
HP,
REMOVE,
TAG
TAG,
REDO
} from "src/utils";
import type { Creature } from "src/utils/creature";
import type TrackerView from "src/tracker/view";
Expand Down Expand Up @@ -35,9 +36,39 @@
tracker.setUpdate(creature, e);
});
});
if (creature.hp != creature.current_max || creature.current_max != creature.max) {
const resetHpItem = menu.addItem((item) => {
item.setTitle("Reset HP").setIcon(REDO);

const resetHpMenu = item.setSubmenu();

if (creature.hp != creature.current_max) {
resetHpMenu.addItem((item) => {
item.setIcon("fold-vertical")
.setTitle("Reset HP to current max")
.onClick((e: MouseEvent) => {
creature.hp = creature.current_max;
tracker.updateAndSave();
})
});
}
if (creature.current_max != creature.max) {
resetHpMenu.addItem((item) => {
item.setIcon("tent")
.setTitle("Reset max HP")
.onClick((e: MouseEvent) => {
creature.current_max = creature.max;
creature.hp = creature.max;
tracker.updateAndSave();
})
});
}
});
}

if (creature.current_ac != creature.ac) {
menu.addItem((item) => {
item.setIcon(HP)
item.setIcon("undo")
.setTitle("Reset AC")
.onClick((e: MouseEvent) => {
creature.current_ac = creature.ac;
Expand Down
6 changes: 5 additions & 1 deletion src/utils/creature.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,12 @@ export class Creature {
this.temp > 0
? `aria-label="Temp HP: ${this.temp}" style="font-weight:bold"`
: "";
const maxMods =
this.current_max != this.max
? `aria-label="Normal max HP: ${this.max}" style="font-weight:bold"`
: ""
return `
<span ${tempMods}>${this.hp + this.temp}</span><span>/${
<span ${tempMods}>${this.hp + this.temp}</span><span ${maxMods}>/${
this.current_max
}</span>
`;
Expand Down