Skip to content

Fixed actor selection issue in V10 #13

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
OsiJr wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed actor selection issue in V10 #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48f43ba
Fixed actor selection issue in V10
OsiJr Sep 20, 2022
991ab50
Fixed issues with the template in V10
OsiJr Sep 20, 2022
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
21 changes: 14 additions & 7 deletions scripts/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ class VSpellPoints {
})
return unsupported;
}

static isV10() {
return !foundry.utils.isNewerVersion(10, game.version ?? game?.data?.version);
}
}

class VSpellPointsData {
Expand Down Expand Up @@ -489,7 +493,7 @@ Hooks.once('ready', () => {
icon: "fas fa-book",
onclick: async (event) => {
const clickedElement = $(event.currentTarget);
const actorID = clickedElement.parents('[id]')?.attr("id")?.replace("actor-", "")
const actorID = clickedElement.parents('[id]')?.attr("id")?.split("-").pop()
const actor = game.actors.get(actorID)
const previousChoice = VSpellPointsData.getPointsEnabled(actor)
const selectedAttribute = `selected="selected"`
Expand Down Expand Up @@ -681,11 +685,14 @@ Hooks.once('ready', () => {
if (!VSpellPointsData.isCharacter(actor) || !VSpellPointsData.isSpellcaster(actor)) return;

// only apply on spells that cost resources
let preparation = item?.system?.preparation;
if (!preparation) preparation = item?.data?.data?.preparation;

if (item?.data?.type !== "spell"
|| item?.labels?.level === "Cantrip"
|| item?.data?.data?.preparation?.mode === "atwill"
|| item?.data?.data?.preparation?.mode === "innate"
|| html.find("#ability-use-form").find(".form-group").find("select[name=level]").length === 0){
|| preparation?.mode === "atwill"
|| preparation?.mode === "innate"
|| html.find("#ability-use-form").find(".form-group").find(VSpellPoints.isV10() ? "select[name=consumeSpellLevel]" : "select[name=level]").length === 0){
VSpellPoints.log("not using a resource spell")
return;
}
Expand All @@ -701,11 +708,11 @@ Hooks.once('ready', () => {
// change consume spell slot text
let consumeText = $(html)
.find("#ability-use-form")
.find("input[name='consumeSlot']")
.find(VSpellPoints.isV10() ? "input[name='consumeSpellSlot']" : "input[name='consumeSlot']")
.parent()
.contents().filter(function () {
// get only text elements
return this.nodeType === 3;
return (this.nodeType === 3 && (this.textContent?.trim().length > 0));
});

if (VSpellPointsData.isWarlock(actor))
Expand All @@ -716,7 +723,7 @@ Hooks.once('ready', () => {
// modify the "cast at level" list
$(html)
.find("#ability-use-form")
.find("select[name='level']")
.find(VSpellPoints.isV10() ? "select[name=consumeSpellLevel]" : "select[name=level]")
.find("option")
.each(function (i) {
let spellValue = $(this).attr("value")
Expand Down