Merge pull request #157 from jeremyregnerus/tokenimage

Add switch to show token image instead of profile image
zeel01 · Feb 27, 2022 · f718dde · f718dde
2 parents 4c7a2d4 + d08fd0c
commit f718dde
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 14 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -161,8 +161,11 @@
 		"HideMaxHP": "Hide maximum hit points",
 		"ShowCurrentHP": "Show current hit points",
 		"HideCurrentHP": "Hide current hit points",
+		"ProfileImage": "Profile Image",
 		"ShowProfileImage": "Show profile image",
 		"HideProfileImage": "Hide profile image",
+		"UseTokenImage": "Use token image",
+		"UseProfileImage": "Use profile image",
 		"ShowLair": "Show lair actions",
 		"HideLair": "Hide lair actions",
 		"OpenTokenizer": "Open VTTA Tokenizer",

diff --git a/scripts/Flags.js b/scripts/Flags.js
@@ -22,6 +22,7 @@ export default class Flags {
 			"inline-secrets"    : { type: Boolean, default: false    , hidden: false },
 			"hidden-secrets"    : { type: Boolean, default: false    , hidden: false },
 			"hide-profile-image": { type: Boolean, default: false    , hidden: false },
+			"use-token-image"   : { type: Boolean, default: false    , hidden: false },
 			"theme-choice"      : { type: String , default: "default", hidden: true, setting: "default-theme" },
 			"custom-theme-class": { type: String , default: ""       , hidden: false },
 			"editing"           : { type: Boolean, default: true     , hidden: false },

diff --git a/scripts/dnd5e/MonsterBlock5e.js b/scripts/dnd5e/MonsterBlock5e.js
@@ -168,7 +168,7 @@ export default class MonsterBlock5e extends ActorSheet5eNPC {
 		}
 
 		// Process editable images
-		const images = form.querySelectorAll("img[data-edit]")
+		const images = form.querySelectorAll("img[data-edit], token.img[data-edit]")
 		for (let img of images) {
 			if (img.getAttribute("disabled")) continue;
 			let basePath = window.location.origin + "/";
@@ -631,6 +631,7 @@ export default class MonsterBlock5e extends ActorSheet5eNPC {
 			"current-hit-points": game.settings.get("monsterblock", "current-hit-points"),
 			"maximum-hit-points": game.settings.get("monsterblock", "maximum-hit-points"),
 			"hide-profile-image": game.settings.get("monsterblock", "hide-profile-image"),
+			"use-token-image": false,
 			"show-lair-actions": game.settings.get("monsterblock", "show-lair-actions"),
 			"theme-choice": game.settings.get("monsterblock", "default-theme"),
 			"custom-theme-class": game.settings.get("monsterblock", "custom-theme-class"),
@@ -687,7 +688,7 @@ export default class MonsterBlock5e extends ActorSheet5eNPC {
 		html.find(".profile-image").click((event) => {
 			event.preventDefault();
 
-			new ImagePopout(this.actor.data.img, {
+			new ImagePopout(event.target.currentSrc, {
 				title: this.actor.name,
 				shareable: true,
 				uuid: this.actor.uuid
@@ -870,6 +871,7 @@ export default class MonsterBlock5e extends ActorSheet5eNPC {
 			// Detect and activate TinyMCE rich text editors
 			html.find(".editor-content[data-edit]").each((i, div) => this._activateEditor(div));
 			html.find("img[data-edit]").contextmenu(ev => this._onEditImage(ev));
+			html.find("token.img[data-edit]").contextmenu(ev => this._onEditImage(ev));
 		}
 
 		if (!this.lastSelection) this.lastSelection = {};

diff --git a/templates/dnd5e/parts/header/identity.hbs b/templates/dnd5e/parts/header/identity.hbs
@@ -24,7 +24,12 @@
 </div>
 {{#unless flags.hide-profile-image}}
 	<figure class="profile-image">
-		<img src="{{actor.img}}" data-edit="img"
-			title="{{actor.name}}{{#if flags.editing}} - {{ localize "MOBLOKS5E.EditHint" }}{{/if}}">
+			<img 
+				{{#if flags.use-token-image}}
+					src="{{actor.token.img}}" data-edit="token.img"
+				{{else}}
+					src="{{actor.img}}" data-edit="img"
+				{{/if}}
+				title="{{actor.name}}{{#if flags.editing}} - {{ localize "MOBLOKS5E.EditHint" }}{{/if}}">
 	</figure>
 {{/unless}}
diff --git a/templates/dnd5e/parts/switch.hbs b/templates/dnd5e/parts/switch.hbs
@@ -6,4 +6,7 @@
 			{{~ localize off ~}}
 		{{~/if~}}
 	</a>
+	{{#if @partial-block}}
+		{{> @partial-block }}
+	{{/if}}
 </li>
diff --git a/templates/dnd5e/switches.hbs b/templates/dnd5e/switches.hbs
@@ -85,12 +85,35 @@
 				}}
 			</ul>
 		</li>
-		{{> "modules/monsterblock/templates/dnd5e/parts/switch.hbs" 
+
+		{{#> "modules/monsterblock/templates/dnd5e/parts/switch.hbs"
 			flag=flags.hide-profile-image
-			control="hide-profile-image" 
-			on="MOBLOKS5E.ShowProfileImage" 
-			off="MOBLOKS5E.HideProfileImage"
+			control="hide-profile-image"
+			on="MOBLOKS5E.ProfileImage"
+			off="MOBLOKS5E.ProfileImage"
 		}}
+			<ul>
+				{{> "modules/monsterblock/templates/dnd5e/parts/switch.hbs"
+					flag=flags.hide-profile-image
+					control="hide-profile-image"
+					on="MOBLOKS5E.ShowProfileImage"
+					off="MOBLOKS5E.HideProfileImage"
+				}}
+				{{> "modules/monsterblock/templates/dnd5e/parts/switch.hbs"
+					flag=flags.use-token-image
+					control="use-token-image"
+					on="MOBLOKS5E.UseProfileImage"
+					off="MOBLOKS5E.UseTokenImage"
+				}}
+				{{#if info.vttatokenizer}}
+					{{> "modules/monsterblock/templates/dnd5e/parts/trigger.hbs"
+						control="openTokenizer"
+						title="MOBLOKS5E.OpenTokenizer"
+					}}
+				{{/if}}
+			</ul>
+		{{/"modules/monsterblock/templates/dnd5e/parts/switch.hbs"}}
+
 		{{#if info.hasLair}}
 			{{> "modules/monsterblock/templates/dnd5e/parts/switch.hbs" 
 				flag=flags.show-lair-actions
@@ -105,12 +128,6 @@
 			on="MOBLOKS5E.HideBio" 
 			off="MOBLOKS5E.ShowBio"
 		}}
-		{{#if info.vttatokenizer}}
-			{{> "modules/monsterblock/templates/dnd5e/parts/trigger.hbs"
-				control="openTokenizer"
-				title="MOBLOKS5E.OpenTokenizer"
-			}}
-		{{/if}}
 		{{> "modules/monsterblock/templates/dnd5e/parts/trigger.hbs"
 			control="resetDefaults"
 			title="MOBLOKS5E.resetDefaults.label"