Skip to content

Commit

Permalink
fix: Keeping up with the Macro Faeries. Also: Update types. Update de…
Browse files Browse the repository at this point in the history
…pendencies. Increase minimum pf2e version to 5.6.2 and minimum foundry version to 11.311
  • Loading branch information
xdy committed Sep 30, 2023
1 parent 5eeab87 commit 85917a8
Show file tree
Hide file tree
Showing 148 changed files with 1,991 additions and 1,587 deletions.
401 changes: 200 additions & 201 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@
"@semantic-release/commit-analyzer": "^10.0.4",
"@semantic-release/exec": "^6.0.3",
"@semantic-release/git": "^10.0.1",
"@semantic-release/github": "^9.0.7",
"@semantic-release/github": "^9.2.1",
"@semantic-release/release-notes-generator": "^11.0.7",
"@types/fs-extra": "^11.0.2",
"@types/glob": "^8.1.0",
"@types/jquery": "^3.5.19",
"@types/jquery": "^3.5.20",
"@types/jsdom": "^21.1.3",
"@types/luxon": "^3.3.2",
"@types/node": "^18.17.19",
"@types/node": "^18.18.1",
"@types/prompts": "^2.4.5",
"@types/sortablejs": "^1.15.2",
"@types/sortablejs": "^1.15.3",
"@types/tooltipster": "^0.0.32",
"@types/yaireo__tagify": "^4.17.2",
"@typescript-eslint/eslint-plugin": "^6.7.2",
"@typescript-eslint/parser": "^6.7.2",
"@types/yaireo__tagify": "^4.17.3",
"@typescript-eslint/eslint-plugin": "^6.7.3",
"@typescript-eslint/parser": "^6.7.3",
"classic-level": "^1.3.0",
"es-jest": "^2.1.0",
"eslint": "^8.50.0",
Expand Down
4 changes: 2 additions & 2 deletions src/module/feature/conditionHandler/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export function checkIfLatestDamageMessageIsNonlethal(actor: ActorPF2e, option:
const relevant = getRelevantMessages(actor);
const lastDamageRoll = relevant.findLast((message) => message.flags.pf2e.context?.type === "damage-roll");
const totalDamage = lastDamageRoll?.rolls?.[0]?.total ?? 0;
return (totalDamage >= hp.value && lastDamageRoll?.item?.system?.traits?.value.includes("nonlethal")) ?? false;
return (totalDamage >= hp.value && lastDamageRoll?.item?.system?.traits?.value?.includes("nonlethal")) ?? false;
}
return false;
}
Expand Down Expand Up @@ -131,7 +131,7 @@ export function checkIfLatestDamageMessageHasDeathTrait(actor: ActorPF2e, option
const relevant = getRelevantMessages(actor);
const damageRollMessages = filterMessagesByContextType(relevant, "damage-roll");
const lastDamageRollMessage = damageRollMessages[damageRollMessages.length - 1];
const isDeathTrait = lastDamageRollMessage?.item?.system?.traits?.value.includes("death") ?? false;
const isDeathTrait = lastDamageRollMessage?.item?.system?.traits?.value?.includes("death") ?? false;
const damageTotal = lastDamageRollMessage?.rolls?.[0]?.total ?? 0;
return isDeathTrait && damageTotal >= hp.value;
}
Expand Down
8 changes: 4 additions & 4 deletions static/module.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"version": "5.18.3",
"id": "xdy-pf2e-workbench",
"compatibility": {
"minimum": "11.309",
"verified": "11.309",
"minimum": "11.311",
"verified": "11.311",
"maximum": "11"
},
"relationships": {
Expand All @@ -15,8 +15,8 @@
"type": "system",
"manifest": "https://github.com/foundryvtt/pf2e/releases/download/latest/system.json",
"compatibility": {
"minimum": "5.5.3",
"verified": "5.5.3"
"minimum": "5.6.2",
"verified": "5.6.2"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion submodules/my-foundryvtt-macros
Submodule my-foundryvtt-macros updated from 58b3bb to bbcb06
288 changes: 147 additions & 141 deletions types/en.json

Large diffs are not rendered by default.

26 changes: 20 additions & 6 deletions types/kingmaker-en.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,31 @@
"stability": "Stability"
},
"AbilityScores": "Ability Scores",
"Confirm": "Confirm",
"Consumption": {
"Base": "Base Consumption",
"Base": "Base",
"Label": "Consumption",
"Reduced": "Consumption Reduction"
"Reduction": "Reduction"
},
"Event": {
"Details": "Ongoing Event Details",
"Random": "Random Event"
},
"KingdomBuilder": {
"ActivationMessage": "Begin the Kingdom Creation process? Make sure your players are ready before proceeding.",
"Aspiration": "Aspiration",
"AssignBoostsHeader": "Assign your boosts",
"Boost": "Boost",
"BoostsLabel": "Ability Boosts",
"Builder": "Builder",
"CancelCreation": "Cancel Creation",
"Complete": "Complete",
"Feat": "Kingdom Feat",
"FinalizeHeader": "Finalize Kingdom",
"Flaw": "Flaw",
"FlawLabel": "Ability Flaw",
"Free": "Free",
"Skills": "Kingdom Skills",
"ManualToggle": "Use Manual Modifiers",
"Missing": {
"Charter": "Choose a charter to select boosts.",
Expand Down Expand Up @@ -58,7 +67,7 @@
"Title": "Collect Resources",
"Header": "Upkeep: Resource Collection",
"Description": "Roll {dice} resource dice and generate the following?",
"Disclaimer": "NOTE: This will replace your current resource points (which should have been converted into experience points). Excess commodities will be lost."
"Disclaimer": "This will replace your current resource points (which should have been converted into experience points). Excess commodities will be lost. Only the game master can collect resources."
},
"Commodity": {
"food": "Food",
Expand Down Expand Up @@ -134,6 +143,7 @@
"strife": "Strife"
},
"Size": "Size",
"Storage": "Storage",
"Tabs": {
"Main": "Main",
"Activities": "Activities",
Expand Down Expand Up @@ -168,8 +178,12 @@
"Penalty": "Penalty",
"Settlement": {
"Blocks": "Blocks",
"Name": "Settlement Name",
"Details": "Settlement Details",
"Header": "Kingdom Settlements",
"LevelRange": "Level Range",
"Name": "Settlement Name",
"Overcrowded": "Overcrowded",
"Population": "Population",
"Type": {
"village": "Village",
"town": "Town",
Expand Down Expand Up @@ -275,11 +289,11 @@
},
"republic": {
"Name": "Republic",
"Description": "Your nation draws its leadership from its own citizens. Elected representatives meet in parliamentary bodies to guide the nation. "
"Description": "Your nation draws its leadership from its own citizens. Elected representatives meet in parliamentary bodies to guide the nation."
},
"thaumocracy": {
"Name": "Thaumocracy",
"Description": "Your nation is governed by those most skilled in magic, using their knowledge and power to determine the best ways to rule. While the type of magic wielded by the nation's rulers can adjust its themes (or even its name—a thaumocracy run by divine spellcasters would be a theocracy, for example), the details below remain the same whether it's arcane, divine, occult, primal, or any combination of the four. "
"Description": "Your nation is governed by those most skilled in magic, using their knowledge and power to determine the best ways to rule. While the type of magic wielded by the nation's rulers can adjust its themes (or even its name—a thaumocracy run by divine spellcasters would be a theocracy, for example), the details below remain the same whether it's arcane, divine, occult, primal, or any combination of the four."
},
"yeomanry": {
"Name": "Yeomanry",
Expand Down
Loading

0 comments on commit 85917a8

Please sign in to comment.