v5.0.15

Author: Saibot393

lang/de.json

@@ -940,6 +940,14 @@
 					"settings" : {
 						"target" : {
 							"name"			: "Ziel"
+						},
+						"ConfirmDialogBehaviour" : {
+							"name"			: "Bestätigungs Dialog Verhalten",
+							"options" : {
+								"world"		: "Welt Einstellung",
+								"force"		: "Dialog erzwingen",
+								"skip"		: "Dialog überspringen"
+							}
 						}
 					}
 				},

lang/en.json

@@ -940,6 +940,14 @@
 					"settings" : {
 						"target" : {
 							"name"			: "Target"
+						},
+						"ConfirmDialogBehaviour" : {
+							"name"			: "Confirm dialog behaviour",
+							"options" : {
+								"world"		: "World setting",
+								"force"		: "Force dialog",
+								"skip"		: "Skip dialog"
+							}
 						}
 					}
 				},

module.json

@@ -7,7 +7,7 @@
     "name": "saibot"
     }
   ],
-  "version": "5.0.14",
+  "version": "5.0.15",
   "compatibility": {
     "minimum": "11",
     "verified": "13"
@@ -88,7 +88,7 @@
 	}
   ],
   "url": "https://github.com/Saibot393/perceptive",
-  "download": "https://github.com/Saibot393/perceptive/archive/refs/tags/v5.0.14.zip",
+  "download": "https://github.com/Saibot393/perceptive/archive/refs/tags/v5.0.15.zip",
   "manifest": "https://github.com/Saibot393/perceptive/releases/latest/download/module.json",
   "readme": "https://github.com/Saibot393/perceptive/blob/main/README.md",
   "changelog": "https://github.com/Saibot393/perceptive/blob/main/CHANGELOG.md"

scripts/SpottingScript.js

@@ -782,7 +782,7 @@ class SpottingManager {
 							Tiles : PerceptiveUtils.IDsfromWalls(pObjects.filter(vObject => vObject.documentName == "Tile"))};
 
 		if (game.user.isGM) {
-			if (["always"].includes(game.settings.get(cModuleName, "GMSpotconfirmDialogbehaviour")) || pInfos.forceConfirmDialog) {
+			if ((["always"].includes(game.settings.get(cModuleName, "GMSpotconfirmDialogbehaviour")) && !pInfos.skipConfirmDialog) || pInfos.forceConfirmDialog) {
 				SpottingManager.openSpottingDialoge(vObjectIDs, PerceptiveUtils.IDsfromTokens(pSpotters), canvas.scene.id, pInfos);
 			}
 			else {
@@ -801,7 +801,7 @@ class SpottingManager {
 
 	static async SpotObjectsRequest(pObjectIDs, pSpotterIDs, pSceneID, pInfos) {
 		if (game.user.isGM) {
-			if (["playersonly", "always"].includes(game.settings.get(cModuleName, "GMSpotconfirmDialogbehaviour")) || pInfos.forceConfirmDialog) {
+			if ((["playersonly", "always"].includes(game.settings.get(cModuleName, "GMSpotconfirmDialogbehaviour")) && !pInfos.skipConfirmDialog) || pInfos.forceConfirmDialog) {
 				SpottingManager.openSpottingDialoge(pObjectIDs, pSpotterIDs, pSceneID, pInfos);
 			}
 			else {

scripts/compatibility/PerceptiveCompatibility.js

@@ -398,8 +398,22 @@ Hooks.once("setupTileActions", (pMATT) => {
 						options: { show: ['token', 'tile', 'within', 'players', 'previous', 'tagger'] },
 						required: true,
 						restrict: (entity) => { return ((entity instanceof Token) || (entity instanceof Wall) || (entity instanceof Tile)); }
+					},
+					{
+						id: "ConfirmDialogBehaviour",
+						name: Translate(cMATT + ".actions." + "spot-object" + ".settings." + "ConfirmDialogBehaviour" + ".name"),
+						list: "ConfirmDialogBehaviour",
+						type: "list",
+						defvalue: "world"
 					}
 				],
+				values: {
+					"ConfirmDialogBehaviour": {
+						"world": Translate(cMATT + ".actions." + "spot-object" + ".settings." + "ConfirmDialogBehaviour" + ".options." + "world"),
+						"force": Translate(cMATT + ".actions." + "spot-object" + ".settings." + "ConfirmDialogBehaviour" + ".options." + "force"),
+						"skip": Translate(cMATT + ".actions." + "spot-object" + ".settings." + "ConfirmDialogBehaviour" + ".options." + "skip")
+					}
+				},
 				group: cModuleName,
 				fn: async (args = {}) => {
 					const { action } = args;
@@ -408,15 +422,18 @@ Hooks.once("setupTileActions", (pMATT) => {
 
 					let vSpotted = await pMATT.getEntities(args, "tokens", action.data?.targets);
 
+					let vConfirmDialogBehaviour = action.data?.ConfirmDialogBehaviour;
+					
 					let vTokenSpotted = {};
 
 					for (let i = 0; i < vSpotted.length; i++) {
 						vTokenSpotted[vSpotted[i].id] = true; //technically only tokens and tiles are required, but oh well
 					}
-					
 					let vInfos = {TokenSpotted : vTokenSpotted,
 								  sendingPlayer : args.userid,
-							      forceConfirmDialog : true};
+							      forceConfirmDialog : vConfirmDialogBehaviour == "force",
+								  skipConfirmDialog : vConfirmDialogBehaviour == "skip",
+								  sendingPlayer : game.user.id};
 
 					SpottingManager.RequestSpotObjects(vSpotted, vSpotters, vInfos);
 				},

scripts/settings/PerceptiveSettings.js

@@ -291,7 +291,7 @@ Hooks.once("init", () => {  // game.settings.get(cModuleName, "")
 			"playersonly" :	Translate("Settings.GMSpotconfirmDialogbehaviour.options.playersonly"),
 			"always" : Translate("Settings.GMSpotconfirmDialogbehaviour.options.always")
 		},
-		default: false
+		default: "off"
 	  }); 
 
 	  game.settings.register(cModuleName, "ShowfailuresinGMconfirm", {