2.7.11

MrVauxs · Dec 20, 2022 · d279102 · d279102
1 parent b3fd591
commit d279102
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Version 2.7.11
 - Updated Mirror Image to be compatible with free version of JB2A. Also made scaled tokens work in it.
 - Fixed a bug when trying to hide a folder that didn't yet exist. (#9)
+- Fixed an issue regarding Tokenmagic Automatic Wounds and Summons being bloodied when freshly summoned.
 
 # Version 2.7.10
 - Fixed a bug in Spiritual Weapon.

diff --git a/module/pf2e-animation-macros.js b/module/pf2e-animation-macros.js
@@ -783,7 +783,14 @@ pf2eAnimations.playerSummons = async function playerSummons({ args = [], importe
 	spawnArgs.options = { ...spawnArgs.options, ...{ controllingActor: tokenD.actor } }
 
 	let importedToken = importedActor.prototypeToken
-	Object.assign(importedToken.flags, { "pf2e-jb2a-macros": { "scrollingText": game.settings.get("core", "scrollingStatusText"), "bloodsplatter": game.modules.get("splatter")?.active ? game.settings.get("splatter", "enableBloodsplatter") : null } })
+	Object.assign(importedToken.flags,
+		{
+			"pf2e-jb2a-macros": {
+				"scrollingText": game.settings.get("core", "scrollingStatusText"),
+				"bloodsplatter": game.modules.get("splatter")?.active ? game.settings.get("splatter", "enableBloodsplatter") : null
+			}
+		}
+	)
 
 	spawnArgs.updates = { token: importedToken, actor: importedActor.data.toObject() }
 
@@ -824,8 +831,8 @@ pf2eAnimations.askGMforSummon = async function askGMforSummon(args) {
 
 	args.callbacks.pre = async (location, updates) => {
 		mergeObject(updates, {
-			token: {
-				alpha: 0
+			"token": {
+				"alpha": 0
 			}
 		})
 		await game.settings.set("core", "scrollingStatusText", false);
@@ -857,6 +864,11 @@ pf2eAnimations.askGMforSummon = async function askGMforSummon(args) {
 		await AutomatedAnimations.playAnimation(token, item ?? { name: `Summoning Animation Template (${args.origins.itemName})` }, { targets: [spawnedTokenDoc.object] });
 		if (updates.token.flags["pf2e-jb2a-macros"]?.scrollingText) await game.settings.set("core", "scrollingStatusText", true);
 		if (updates.token.flags["pf2e-jb2a-macros"]?.bloodsplatter) await game.settings.set("splatter", "enableBloodsplatter", true);
+		if (game.modules.get("tokenmagic-automatic-wounds")?.active) {
+			// This doesn't actually work and is instead in "Opacity 1" macro but for posterity's sake, it's also included here.
+			// Not sure why it works in the macro but not in here. It just doesn't.
+			await TokenMagicAutomaticWounds.removeWoundsOnToken(token)
+		}
 	};
 
 	new Dialog({