From 5861268e8c4a68130435ad81c795ed654fc27238 Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Fri, 28 Feb 2025 01:26:29 -0500
Subject: [PATCH] Add a location picker for selecting a location in a town or
 outdoor sector.

It's currently used in special node editing and in advanced town details.
---
 proj/vs2013/ScenEdit/Scen Editor.vcxproj      |   2 +
 .../ScenEdit/Scen Editor.vcxproj.filters      |   6 +
 .../Scenario Editor/Scenario Editor.vcxproj   |   2 +
 .../Scenario Editor.vcxproj.filters           |   6 +
 proj/xc12/BoE.xcodeproj/project.pbxproj       |   8 ++
 rsrc/dialogs/choose-location.xml              |  19 +++
 rsrc/dialogs/edit-town-advanced.xml           |   8 +-
 src/dialogxml/dialogs/strchoice.cpp           |   2 +-
 src/dialogxml/dialogs/strchoice.hpp           |   2 +-
 src/dialogxml/widgets/container.hpp           |   2 +-
 src/dialogxml/widgets/tilemap.cpp             |  60 +++++++-
 src/dialogxml/widgets/tilemap.hpp             |  12 ++
 src/scenario/special-condition.cpp            |   6 +-
 src/scenario/special-general.cpp              |   6 +-
 src/scenario/special-outdoor.cpp              |   3 +-
 src/scenario/special-rect.cpp                 |  20 +--
 src/scenario/special-town.cpp                 |  47 +++----
 src/scenario/special.cpp                      |  21 ++-
 src/scenario/special.hpp                      |  13 +-
 src/scenedit/SConscript                       |   3 +-
 src/scenedit/scen.keydlgs.cpp                 |  83 +++++++++++
 src/scenedit/scen.locpicker.cpp               | 130 ++++++++++++++++++
 src/scenedit/scen.locpicker.hpp               |  37 +++++
 src/scenedit/scen.townout.cpp                 |  45 ++++++
 24 files changed, 484 insertions(+), 59 deletions(-)
 create mode 100644 rsrc/dialogs/choose-location.xml
 create mode 100644 src/scenedit/scen.locpicker.cpp
 create mode 100644 src/scenedit/scen.locpicker.hpp

diff --git a/proj/vs2013/ScenEdit/Scen Editor.vcxproj b/proj/vs2013/ScenEdit/Scen Editor.vcxproj
index 43296608..fd724be6 100644
--- a/proj/vs2013/ScenEdit/Scen Editor.vcxproj	
+++ b/proj/vs2013/ScenEdit/Scen Editor.vcxproj	
@@ -107,6 +107,7 @@
     <ClCompile Include="..\..\..\src\scenedit\scen.fileio.cpp" />
     <ClCompile Include="..\..\..\src\scenedit\scen.graphics.cpp" />
     <ClCompile Include="..\..\..\src\scenedit\scen.keydlgs.cpp" />
+    <ClCompile Include="..\..\..\src\scenedit\scen.locpicker.cpp" />
     <ClCompile Include="..\..\..\src\scenedit\scen.main.cpp" />
     <ClCompile Include="..\..\..\src\scenedit\scen.menus.win.cpp" />
     <ClCompile Include="..\..\..\src\scenedit\scen.townout.cpp" />
@@ -119,6 +120,7 @@
     <ClInclude Include="..\..\..\src\scenedit\scen.global.hpp" />
     <ClInclude Include="..\..\..\src\scenedit\scen.graphics.hpp" />
     <ClInclude Include="..\..\..\src\scenedit\scen.keydlgs.hpp" />
+    <ClInclude Include="..\..\..\src\scenedit\scen.locpicker.hpp" />
     <ClInclude Include="..\..\..\src\scenedit\scen.menus.hpp" />
     <ClInclude Include="..\..\..\src\scenedit\scen.townout.hpp" />
     <ClInclude Include="..\..\..\rsrc\menus\scenresource.h" />
diff --git a/proj/vs2013/ScenEdit/Scen Editor.vcxproj.filters b/proj/vs2013/ScenEdit/Scen Editor.vcxproj.filters
index 5b9ed789..e87e1c45 100644
--- a/proj/vs2013/ScenEdit/Scen Editor.vcxproj.filters	
+++ b/proj/vs2013/ScenEdit/Scen Editor.vcxproj.filters	
@@ -24,6 +24,9 @@
     <ClCompile Include="..\..\..\src\scenedit\scen.main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\scenedit\scen.locpicker.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\scenedit\scen.keydlgs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -53,6 +56,9 @@
     <ClInclude Include="..\..\..\src\scenedit\scen.menus.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\scenedit\scen.locpicker.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\src\scenedit\scen.keydlgs.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/proj/vs2017/Scenario Editor/Scenario Editor.vcxproj b/proj/vs2017/Scenario Editor/Scenario Editor.vcxproj
index b501ee0e..eea56802 100644
--- a/proj/vs2017/Scenario Editor/Scenario Editor.vcxproj	
+++ b/proj/vs2017/Scenario Editor/Scenario Editor.vcxproj	
@@ -161,6 +161,7 @@
     <ClCompile Include="..\..\..\src\scenedit\scen.fileio.cpp" />
     <ClCompile Include="..\..\..\src\scenedit\scen.graphics.cpp" />
     <ClCompile Include="..\..\..\src\scenedit\scen.keydlgs.cpp" />
+    <ClCompile Include="..\..\..\src\scenedit\scen.locpicker.cpp" />
     <ClCompile Include="..\..\..\src\scenedit\scen.main.cpp" />
     <ClCompile Include="..\..\..\src\scenedit\scen.menus.win.cpp" />
     <ClCompile Include="..\..\..\src\scenedit\scen.townout.cpp" />
@@ -177,6 +178,7 @@
     <ClInclude Include="..\..\..\src\scenedit\scen.global.hpp" />
     <ClInclude Include="..\..\..\src\scenedit\scen.graphics.hpp" />
     <ClInclude Include="..\..\..\src\scenedit\scen.keydlgs.hpp" />
+    <ClInclude Include="..\..\..\src\scenedit\scen.locpicker.hpp" />
     <ClInclude Include="..\..\..\src\scenedit\scen.menus.hpp" />
     <ClInclude Include="..\..\..\src\scenedit\scen.townout.hpp" />
   </ItemGroup>
diff --git a/proj/vs2017/Scenario Editor/Scenario Editor.vcxproj.filters b/proj/vs2017/Scenario Editor/Scenario Editor.vcxproj.filters
index 44179fc6..ebaf5561 100644
--- a/proj/vs2017/Scenario Editor/Scenario Editor.vcxproj.filters	
+++ b/proj/vs2017/Scenario Editor/Scenario Editor.vcxproj.filters	
@@ -33,6 +33,9 @@
     <ClCompile Include="..\..\..\src\scenedit\scen.keydlgs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\scenedit\scen.locpicker.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\scenedit\scen.main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -74,6 +77,9 @@
     <ClInclude Include="..\..\..\src\scenedit\scen.keydlgs.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\scenedit\scen.locpicker.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\src\scenedit\scen.menus.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/proj/xc12/BoE.xcodeproj/project.pbxproj b/proj/xc12/BoE.xcodeproj/project.pbxproj
index bd243b2a..9ea0b275 100755
--- a/proj/xc12/BoE.xcodeproj/project.pbxproj
+++ b/proj/xc12/BoE.xcodeproj/project.pbxproj
@@ -117,6 +117,8 @@
 		915473CE2C800AB000EB1C94 /* enchant.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 915473CC2C800AB000EB1C94 /* enchant.hpp */; };
 		915473CF2C800AB000EB1C94 /* enchant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 915473CD2C800AB000EB1C94 /* enchant.cpp */; };
 		915AF9E81BBF8B5C008AEF49 /* scrollpane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 919B13A81BBE2B54009905A4 /* scrollpane.cpp */; };
+		9170C50F2D717F24009B6E7C /* scen.locpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9170C50C2D717F24009B6E7C /* scen.locpicker.cpp */; };
+		9170C5102D717F24009B6E7C /* scen.locpicker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 9170C50D2D717F24009B6E7C /* scen.locpicker.hpp */; };
 		9176FEC71D550EFE006EF694 /* out_legacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9176FEC01D550EFC006EF694 /* out_legacy.cpp */; };
 		9176FEC81D550EFE006EF694 /* scen_legacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9176FEC11D550EFC006EF694 /* scen_legacy.cpp */; };
 		9176FECB1D550EFE006EF694 /* talk_legacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9176FEC41D550EFD006EF694 /* talk_legacy.cpp */; };
@@ -734,6 +736,8 @@
 		9169C31B1B37A5D50041002B /* Blades of Exile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Blades of Exile.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		9169C31D1B37A5D50041002B /* BoE Character Editor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "BoE Character Editor.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		9169C31F1B37A5D50041002B /* BoE Scenario Editor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "BoE Scenario Editor.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		9170C50C2D717F24009B6E7C /* scen.locpicker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = scen.locpicker.cpp; sourceTree = "<group>"; };
+		9170C50D2D717F24009B6E7C /* scen.locpicker.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = scen.locpicker.hpp; sourceTree = "<group>"; };
 		9176FEC01D550EFC006EF694 /* out_legacy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = out_legacy.cpp; sourceTree = "<group>"; };
 		9176FEC11D550EFC006EF694 /* scen_legacy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scen_legacy.cpp; sourceTree = "<group>"; };
 		9176FEC41D550EFD006EF694 /* talk_legacy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = talk_legacy.cpp; sourceTree = "<group>"; };
@@ -1446,6 +1450,7 @@
 				91B3EEDE0F969BA700BF5B67 /* scen.global.hpp */,
 				91B3EEE50F969BA700BF5B67 /* scen.graphics.hpp */,
 				91B3EEE00F969BA700BF5B67 /* scen.keydlgs.hpp */,
+				9170C50D2D717F24009B6E7C /* scen.locpicker.hpp */,
 				914CA4641909B00100B6ADD1 /* scen.menus.hpp */,
 				91B3EEE60F969BA700BF5B67 /* scen.townout.hpp */,
 			);
@@ -1463,6 +1468,7 @@
 				91B3EEF30F969BA700BF5B67 /* scen.graphics.cpp */,
 				91B3EEEE0F969BA700BF5B67 /* scen.keydlgs.cpp */,
 				91B3EEEB0F969BA700BF5B67 /* scen.main.cpp */,
+				9170C50C2D717F24009B6E7C /* scen.locpicker.cpp */,
 				914CA45719074D0A00B6ADD1 /* scen.menus.mac.mm */,
 				91B3EEF40F969BA700BF5B67 /* scen.townout.cpp */,
 			);
@@ -1713,6 +1719,7 @@
 				91F3205123E65EA3009650AF /* framerate_limiter.hpp in Headers */,
 				9149924C25913E3F00B5BE97 /* container.hpp in Headers */,
 				9149924E25913E3F00B5BE97 /* led.hpp in Headers */,
+				9170C5102D717F24009B6E7C /* scen.locpicker.hpp in Headers */,
 				9143044B2970EDC1003A3967 /* keymods.hpp in Headers */,
 				9149925025913E3F00B5BE97 /* ledgroup.hpp in Headers */,
 				915473CE2C800AB000EB1C94 /* enchant.hpp in Headers */,
@@ -2198,6 +2205,7 @@
 				413AAF662D38A4A0002E9BF1 /* creature.cpp in Sources */,
 				413AAF652D38A48E002E9BF1 /* pc.cpp in Sources */,
 				413AAF642D38A47C002E9BF1 /* population.cpp in Sources */,
+				9170C50F2D717F24009B6E7C /* scen.locpicker.cpp in Sources */,
 				413AAF632D38A1B8002E9BF1 /* party.cpp in Sources */,
 				413AAF622D38A076002E9BF1 /* universe.cpp in Sources */,
 				413AAF612D389F94002E9BF1 /* fileio_party.cpp in Sources */,
diff --git a/rsrc/dialogs/choose-location.xml b/rsrc/dialogs/choose-location.xml
new file mode 100644
index 00000000..2b70207c
--- /dev/null
+++ b/rsrc/dialogs/choose-location.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
+<dialog defbtn='done'>
+	<pict name='mainpic' type='dlog' num='16' top='6' left='6'/>
+	<text name='prompt' anchor='mainpic' relative='pos pos-in' size='large' top='0' left='12' width='248' height='14'>Select a location:</text>
+	<tilemap name='map' anchor='mainpic' relative='pos-in pos' framed='true' top='8' left='0' rows='18' cols='18'>
+		<pict framed='false' type='map' num='0' top='0' left='0'/>
+	</tilemap>
+	<!-- The name begins with Z to ensure it's drawn on top of the map picts, whose auto-generated names begin with X -->
+	<pict name='zpointer' type='item' anchor='map' relative='pos-in' size='small' outline='double' filled='false' num='131' top='3' left='3'/>
+	<text name='help' anchor='left' relative='pos-in pos' top='0' left='6' width='422' height='16'>Click on a space to select.<br/>Use arrows to change pages.</text>
+	<button name='left' anchor='map' relative='pos-in pos' type='left' top='10' left='0' def-key='left'/>
+	<button name='down' anchor='left' relative='pos pos-in' type='down' top='0' left='121' def-key='down'/>
+	<button name='right' anchor='down' relative='pos pos-in' type='right' top='0' left='121' def-key='right'/>
+	<button name='cancel' anchor='done' relative='neg pos-in' type='regular' top='0' left='67' def-key='esc'>Cancel</button>
+	<button name='done' anchor='right' relative='pos-in pos' type='done' top='4' left='0'/>
+	<button name='up' anchor='down' relative='pos-in neg' type='up' top='473' left='0' def-key='up'/>
+	<button name='switch' anchor='right' relative='pos-in neg' type='regular' top='473' left='0'>Switch</button>
+</dialog>
diff --git a/rsrc/dialogs/edit-town-advanced.xml b/rsrc/dialogs/edit-town-advanced.xml
index b258e395..eaf83fcf 100644
--- a/rsrc/dialogs/edit-town-advanced.xml
+++ b/rsrc/dialogs/edit-town-advanced.xml
@@ -35,16 +35,16 @@
 	<text relative='pos-in' anchor='exits' top='3' left='3' width='197' height='15'>Exit town locations:</text>
 	<text name='exit-x' relative='pos-in pos' rel-anchor='prev' top='4' left='100' width='35' height='15'>X</text>
 	<text name='exit-y' relative='pos pos-in' rel-anchor='prev' top='0' left='12' width='35' height='15'>Y</text>
-	<text name='exit1' relative='pos-in pos' anchor='exit-x' top='4' left='-100' width='96' height='15'>Top</text>
+	<button name='exit1' relative='pos-in pos' anchor='exit-x' type='tiny' top='4' left='-100' width='96' height='15' text-size='10'>Top</button>
 	<field name='exit1-x' relative='pos-in pos' anchor='exit-x' top='4' left='-8' width='39' height='16'/>
 	<field name='exit1-y' relative='pos-in pos' anchor='exit-y' top='4' left='-8' width='39' height='16'/>
-	<text name='exit2' relative='pos-in pos' anchor='exit1' top='9' left='0' width='96' height='15'>Left</text>
+	<button name='exit2' relative='pos-in pos' anchor='exit1' type='tiny' top='9' left='0' width='96' height='15' text-size='10'>Left</button>
 	<field name='exit2-x' relative='pos-in pos' anchor='exit1-x' top='8' left='0' width='39' height='16'/>
 	<field name='exit2-y' relative='pos-in pos' anchor='exit1-y' top='8' left='0' width='39' height='16'/>
-	<text name='exit3' relative='pos-in pos' anchor='exit2' top='9' left='0' width='96' height='15'>Bottom</text>
+	<button name='exit3' relative='pos-in pos' anchor='exit2' type='tiny' top='9' left='0' width='96' height='15' text-size='10'>Bottom</button>
 	<field name='exit3-x' relative='pos-in pos' anchor='exit2-x' top='8' left='0' width='39' height='16'/>
 	<field name='exit3-y' relative='pos-in pos' anchor='exit2-y' top='8' left='0' width='39' height='16'/>
-	<text name='exit4' relative='pos-in pos' anchor='exit3' top='9' left='0' width='96' height='15'>Right</text>
+	<button name='exit4' relative='pos-in pos' anchor='exit3' type='tiny' top='9' left='0' width='96' height='15' text-size='10'>Right</button>
 	<field name='exit4-x' relative='pos-in pos' anchor='exit3-x' top='8' left='0' width='39' height='16'/>
 	<field name='exit4-y' relative='pos-in pos' anchor='exit3-y' top='8' left='0' width='39' height='16'/>
 	<button name='exit-help' type='help' relative='neg-in pos-in' anchor='exits' top='2' left='18'/>
diff --git a/src/dialogxml/dialogs/strchoice.cpp b/src/dialogxml/dialogs/strchoice.cpp
index 59ad767c..4f173c86 100644
--- a/src/dialogxml/dialogs/strchoice.cpp
+++ b/src/dialogxml/dialogs/strchoice.cpp
@@ -23,7 +23,7 @@ cStringChoice::cStringChoice(cDialog* parent, bool editable)
 	, dlg(*ResMgr::dialogs.get(editable ? "choose-edit-string" : "choose-string"), parent)
 {}
 
-cStringChoice::cStringChoice(std::vector<std::string>& strs, std::string title, cDialog* parent, bool editable)
+cStringChoice::cStringChoice(const std::vector<std::string>& strs, std::string title, cDialog* parent, bool editable)
 	: cStringChoice(parent, editable)
 {
 	setTitle(title);
diff --git a/src/dialogxml/dialogs/strchoice.hpp b/src/dialogxml/dialogs/strchoice.hpp
index 5d552cd3..08666b65 100644
--- a/src/dialogxml/dialogs/strchoice.hpp
+++ b/src/dialogxml/dialogs/strchoice.hpp
@@ -41,7 +41,7 @@ public:
 	/// @param strs A list of all strings in the dialog.
 	/// @param title The title to show in the dialog.
 	/// @param parent Optionally, a parent dialog.
-	explicit cStringChoice(std::vector<std::string>& strs, std::string title, cDialog* parent = nullptr, bool editable = false);
+	explicit cStringChoice(const std::vector<std::string>& strs, std::string title, cDialog* parent = nullptr, bool editable = false);
 	/// Initializes a dialog from an iterator pair.
 	/// @param begin An iterator to the first string in the dialog.
 	/// @param end An iterator to one past the last string in the dialog.
diff --git a/src/dialogxml/widgets/container.hpp b/src/dialogxml/widgets/container.hpp
index fd1e1718..7617291c 100644
--- a/src/dialogxml/widgets/container.hpp
+++ b/src/dialogxml/widgets/container.hpp
@@ -16,8 +16,8 @@ typedef std::map<std::string,cControl*>::iterator ctrlIter;
 /// A superclass to represent a control that contains other controls.
 class cContainer : public cControl {
 	void callHandler(event_fcn<EVT_CLICK>::type onClick, cDialog& me, std::string id, eKeyMod mods) override;
-	std::string clicking;
 protected:
+	std::string clicking;
 	/// Parses a child control.
 	/// @param elem The element defining the control.
 	/// @param controls The map into which the control will be inserted.
diff --git a/src/dialogxml/widgets/tilemap.cpp b/src/dialogxml/widgets/tilemap.cpp
index 27e3ad5f..e0ae9ff2 100644
--- a/src/dialogxml/widgets/tilemap.cpp
+++ b/src/dialogxml/widgets/tilemap.cpp
@@ -32,6 +32,18 @@ location cTilemap::getCell(const std::string& id) const {
 	return location(std::stoi(x_str) * cellWidth, std::stoi(y_str) * cellHeight);
 }
 
+location cTilemap::getCellPos(size_t x, size_t y) const {
+	rectangle bounds = getBounds();
+	bounds.offset(x * cellWidth, y * cellHeight);
+	return bounds.topLeft();
+}
+
+location cTilemap::getCellPos(cControl& child) const {
+	// If it's not ours, return origin.
+	if(!hasChild(child.getName())) return location();
+	return getCell(child.getName());
+}
+
 std::string cTilemap::buildId(const std::string& base, size_t x, size_t y) {
 	std::ostringstream sout;
 	if(!base.empty()) {
@@ -92,14 +104,37 @@ bool cTilemap::isScrollable() const {
 	return false;
 }
 
+bool cTilemap::handleClick(location where, cFramerateLimiter& fps_limiter) {
+	bool success = false;
+	isHandlingClick = true;
+	forEach([&](std::string id, cControl& ctrl) {
+		rectangle bounds = ctrl.getBounds();
+		bounds.offset(getBounds().topLeft());
+		bounds.offset(getCell(id));
+		if(!success && ctrl.isClickable() && bounds.contains(where)) {
+			rectangle localBounds = ctrl.getBounds();
+			ctrl.setBounds(bounds);
+			clicking = id;
+			if(ctrl.handleClick(where, fps_limiter)){
+				success = true;
+			} else clicking.clear();
+			ctrl.setBounds(localBounds);
+		}
+	});
+	isHandlingClick = false;
+	return success;
+}
+
 void cTilemap::draw() {
 	if(!isVisible()) return;
 	for(auto& ctrl : controls) {
 		rectangle localBounds = ctrl.second->getBounds();
 		rectangle globalBounds = localBounds;
-		globalBounds.offset(getBounds().topLeft());
-		globalBounds.offset(getCell(ctrl.first));
-		ctrl.second->setBounds(globalBounds);
+		if(isHandlingClick ? ctrl.first != clicking : true) {
+			globalBounds.offset(getBounds().topLeft());
+			globalBounds.offset(getCell(ctrl.first));
+			ctrl.second->setBounds(globalBounds);
+		}
 		ctrl.second->draw();
 		ctrl.second->setBounds(localBounds);
 	}
@@ -134,6 +169,25 @@ void cTilemap::recalcRect() {
 	frame.bottom -= spacing;
 }
 
+void cTilemap::attachClickHandlers(std::function<bool(cDialog&,std::string,eKeyMod)> handler, std::string prefix) {
+	for(auto& ctrl : controls) {
+		bool matches = false;
+		if(prefix.empty()) {
+			size_t first_x = ctrl.first.find_first_of("x"), last_x = ctrl.first.find_last_of("x"), first_y = ctrl.first.find_first_of("y"), last_y = ctrl.first.find_last_of("y");
+			if(first_x == 0 && last_x == 0 && first_y != std::string::npos && first_y == last_y) {
+				matches = true;
+			}
+		} else {
+			if(ctrl.first.compare(0, prefix.size(), prefix)) {
+				matches = true;
+			}
+		}
+		if(matches) {
+			ctrl.second->attachClickHandler(handler);
+		}
+	}
+}
+
 void cTilemap::fillTabOrder(std::vector<int>& specificTabs, std::vector<int>& reverseTabs) {
 	for(auto p : controls) {
 		cControl& ctrl = *p.second;
diff --git a/src/dialogxml/widgets/tilemap.hpp b/src/dialogxml/widgets/tilemap.hpp
index 88590e71..c138b86a 100644
--- a/src/dialogxml/widgets/tilemap.hpp
+++ b/src/dialogxml/widgets/tilemap.hpp
@@ -19,6 +19,7 @@ class cTilemap : public cContainer {
 	static std::string buildId(const std::string& base, size_t x, size_t y);
 	std::string current_cell;
 	mutable int id_tries = 0;
+	bool isHandlingClick = false;
 public:
 	std::string generateId(const std::string& baseId) const override;
 	bool parseAttribute(ticpp::Attribute& attr, std::string tagName, std::string fname) override;
@@ -34,6 +35,17 @@ public:
 	cControl& getChild(std::string id, size_t x, size_t y);
 	bool hasChild(size_t x, size_t y) const;
 	cControl& getChild(size_t x, size_t y);
+	location getCellPos(size_t x, size_t y) const;
+	location getCellPos(cControl& child) const;
+	/// Attach the same click handler to every instance of a child control.
+	/// @param handler The handler to attach.
+	/// @param prefix The unique ID of the control template.
+	/// @throw xHandlerNotSupported if any of the controls do not support click handlers.
+	/// @throw std::invalid_argument if any of the controls do not exist.
+	/// @see cControl::attachClickHandler()
+	/// @deprecated in favour of @ref attachEventHandlers
+	void attachClickHandlers(std::function<bool(cDialog&,std::string,eKeyMod)> handler, std::string prefix);
+	bool handleClick(location where, cFramerateLimiter& fps_limiter) override;
 	/// Recalculate the tilemap's bounding rect based on its contained controls.
 	void recalcRect() override;
 	/// Adds any fields in this tilemap to the tab order building arrays.
diff --git a/src/scenario/special-condition.cpp b/src/scenario/special-condition.cpp
index 578a328e..cf25a153 100644
--- a/src/scenario/special-condition.cpp
+++ b/src/scenario/special-condition.cpp
@@ -28,7 +28,7 @@ namespace {
 		.sdf(eSpecField::EX1A, eSpecField::EX1B)
 		.ex2b(eSpecPicker::NODE);
 	node_properties_t S_TERRAIN = node_builder_t(eSpecType::IF_TER_TYPE)
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_AUTO)
 		.ex2a(STRT_TER)
 		.ex2b(eSpecPicker::NODE);
 	node_properties_t S_ALIVE = node_builder_t(eSpecType::IF_ALIVE)
@@ -41,7 +41,7 @@ namespace {
 		.ex1b(eSpecPicker::NODE)
 		.ex2a(eSpecPicker::TOGGLE);
 	node_properties_t S_ITEM_THERE = node_builder_t(eSpecType::IF_ITEM_CLASS_ON_SPACE)
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN)
 		.ex2a(eSpecPicker::ITEM_CLASS)
 		.ex2b(eSpecPicker::NODE)
 		.ex2c(eSpecPicker::TOGGLE);
@@ -72,7 +72,7 @@ namespace {
 	node_properties_t S_DAY = node_builder_t(eSpecType::IF_DAY_REACHED)
 		.ex1b(eSpecPicker::NODE);
 	node_properties_t S_FIELDS = node_builder_t(eSpecType::IF_FIELDS)
-		.rect()
+		.rect(eLocType::ACTIVE_TOWN)
 		.msg1(eSpecPicker::FIELD)
 		.msg2(eSpecPicker::NODE);
 	node_properties_t S_PARTY_SIZE = node_builder_t(eSpecType::IF_PARTY_SIZE)
diff --git a/src/scenario/special-general.cpp b/src/scenario/special-general.cpp
index ed23b914..e1a8baec 100644
--- a/src/scenario/special-general.cpp
+++ b/src/scenario/special-general.cpp
@@ -117,16 +117,16 @@ namespace{
 		.msg();
 	node_properties_t S_TERCHANGE = node_builder_t(eSpecType::CHANGE_TER)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_AUTO)
 		.ex2a(STRT_TER);
 	node_properties_t S_TERSWAP = node_builder_t(eSpecType::SWAP_TER)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_AUTO)
 		.ex2a(STRT_TER)
 		.ex2b(STRT_TER);
 	node_properties_t S_TERTRANS = node_builder_t(eSpecType::TRANS_TER)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B);
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_AUTO);
 	node_properties_t S_BUF_CLEAR = node_builder_t(eSpecType::CLEAR_BUF);
 	node_properties_t S_BUF_ADDSTR = node_builder_t(eSpecType::APPEND_STRING)
 		.ex1a(eSpecPicker::MSG_SINGLE)
diff --git a/src/scenario/special-outdoor.cpp b/src/scenario/special-outdoor.cpp
index 97e48730..5a64248c 100644
--- a/src/scenario/special-outdoor.cpp
+++ b/src/scenario/special-outdoor.cpp
@@ -14,11 +14,12 @@ namespace {
 	node_properties_t S_WANDER = node_builder_t(eSpecType::OUT_MAKE_WANDER);
 	node_properties_t S_TOWN = node_builder_t(eSpecType::OUT_FORCE_TOWN)
 		.msg()
+		.loc(eSpecField::EX2A, eSpecField::EX2B, eLocType::SPECIFIED_TOWN, eSpecField::EX1A)
 		.ex1a(STRT_TOWN)
 		.ex1b(STRT_DIR);
 	node_properties_t S_ENCOUNTER = node_builder_t(eSpecType::OUT_PLACE_ENCOUNTER)
 		.msg();
 	node_properties_t S_TELEPORT = node_builder_t(eSpecType::OUT_MOVE_PARTY)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B);
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_OUT);
 }
diff --git a/src/scenario/special-rect.cpp b/src/scenario/special-rect.cpp
index b84d2dd9..1a922099 100644
--- a/src/scenario/special-rect.cpp
+++ b/src/scenario/special-rect.cpp
@@ -13,36 +13,36 @@ node_category_info_t CAT_RECT{eSpecType::RECT_PLACE_FIELD, eSpecType::RECT_UNLOC
 namespace {
 	node_properties_t S_FIELDS = node_builder_t(eSpecType::RECT_PLACE_FIELD)
 		.msg()
-		.rect()
+		.rect(eLocType::ACTIVE_TOWN)
 		.sdf2(+eSpecPicker::FIELD);
 	node_properties_t S_EXPLORE = node_builder_t(eSpecType::RECT_SET_EXPLORED)
 		.msg()
-		.rect()
+		.rect(eLocType::ACTIVE_AUTO)
 		.sdf1(eSpecPicker::TOGGLE);
 	node_properties_t S_MOVE = node_builder_t(eSpecType::RECT_MOVE_ITEMS)
 		.msg()
-		.rect()
+		.rect(eLocType::ACTIVE_TOWN)
 		.msg3(eSpecPicker::TOGGLE)
-		.loc(eSpecField::SDF1, eSpecField::SDF2);
+		.loc(eSpecField::SDF1, eSpecField::SDF2, eLocType::ACTIVE_TOWN);
 	node_properties_t S_DESTROY = node_builder_t(eSpecType::RECT_DESTROY_ITEMS)
 		.msg()
-		.rect();
+		.rect(eLocType::ACTIVE_TOWN);
 	node_properties_t S_CHANGE = node_builder_t(eSpecType::RECT_CHANGE_TER)
 		.msg()
-		.rect()
+		.rect(eLocType::ACTIVE_AUTO)
 		.sdf1(STRT_TER);
 	node_properties_t S_SWAP = node_builder_t(eSpecType::RECT_SWAP_TER)
 		.msg()
-		.rect()
+		.rect(eLocType::ACTIVE_AUTO)
 		.sdf1(STRT_TER)
 		.sdf2(STRT_TER);
 	node_properties_t S_TRANS = node_builder_t(eSpecType::RECT_TRANS_TER)
 		.msg()
-		.rect();
+		.rect(eLocType::ACTIVE_AUTO);
 	node_properties_t S_LOCK = node_builder_t(eSpecType::RECT_LOCK)
 		.msg()
-		.rect();
+		.rect(eLocType::ACTIVE_TOWN);
 	node_properties_t S_UNLOCK = node_builder_t(eSpecType::RECT_UNLOCK)
 		.msg()
-		.rect();
+		.rect(eLocType::ACTIVE_TOWN);
 }
diff --git a/src/scenario/special-town.cpp b/src/scenario/special-town.cpp
index e6d25871..0281658f 100644
--- a/src/scenario/special-town.cpp
+++ b/src/scenario/special-town.cpp
@@ -17,38 +17,39 @@ namespace {
 	node_properties_t S_MISSILE = node_builder_t(eSpecType::TOWN_RUN_MISSILE)
 		.msg()
 		.pict(PIC_MISSILE)
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
-		.loc(eSpecField::EX2A, eSpecField::EX2B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN)
+		.loc(eSpecField::EX2A, eSpecField::EX2B, eLocType::ACTIVE_TOWN)
 		.ex1c(STRT_PATH)
 		.ex2c(eSpecPicker::SOUND);
 	node_properties_t S_ATTACK = node_builder_t(eSpecType::TOWN_MONST_ATTACK)
-		.msg();
+		.msg()
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN);
 	node_properties_t S_BOOM = node_builder_t(eSpecType::TOWN_BOOM_SPACE)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN)
 		.ex2a(PIC_BOOM)
 		.ex2c(eSpecPicker::SOUND);
 	node_properties_t S_TELEPORT = node_builder_t(eSpecType::TOWN_MOVE_PARTY)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN)
 		.ex2a(eSpecPicker::TOGGLE);
 	node_properties_t S_HIT = node_builder_t(eSpecType::TOWN_HIT_SPACE)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN)
 		.ex2b(eSpecPicker::DAMAGE_TYPE);
 	node_properties_t S_EXPLODE = node_builder_t(eSpecType::TOWN_EXPLODE_SPACE)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN)
 		.ex2b(eSpecPicker::DAMAGE_TYPE);
 	node_properties_t S_LOCK = node_builder_t(eSpecType::TOWN_LOCK_SPACE)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B);
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN);
 	node_properties_t S_UNLOCK = node_builder_t(eSpecType::TOWN_UNLOCK_SPACE)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B);
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN);
 	node_properties_t S_BURST = node_builder_t(eSpecType::TOWN_SFX_BURST)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN)
 		.ex2a(eSpecPicker::EXPLOSION)
 		.ex2b(eSpecPicker::TOGGLE)
 		.ex2c(eSpecPicker::SOUND);
@@ -56,23 +57,23 @@ namespace {
 		.msg();
 	node_properties_t S_SPAWN = node_builder_t(eSpecType::TOWN_PLACE_MONST)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN)
 		.ex2a(STRT_MONST)
 		.ex2b(eSpecPicker::TOGGLE);
 	node_properties_t S_KILL = node_builder_t(eSpecType::TOWN_DESTROY_MONST)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B);
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN);
 	node_properties_t S_NUKE = node_builder_t(eSpecType::TOWN_NUKE_MONSTS)
 		.msg()
 		.ex1a(STRT_MONST);
 	node_properties_t S_LEVER_G = node_builder_t(eSpecType::TOWN_GENERIC_LEVER)
 		.ex1b(eSpecPicker::NODE);
 	node_properties_t S_PORTAL_G = node_builder_t(eSpecType::TOWN_GENERIC_PORTAL)
-		.loc(eSpecField::EX1A, eSpecField::EX1B);
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN);
 	node_properties_t S_BUTTON_G = node_builder_t(eSpecType::TOWN_GENERIC_BUTTON)
 		.ex1b(eSpecPicker::NODE);
 	node_properties_t S_STAIR_G = node_builder_t(eSpecType::TOWN_GENERIC_STAIR)
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::SPECIFIED_TOWN, eSpecField::EX2A)
 		.ex2a(STRT_TOWN)
 		.ex2b(STRT_STAIR)
 		.ex2c(STRT_STAIR_MODE)
@@ -84,11 +85,11 @@ namespace {
 	node_properties_t S_PORTAL = node_builder_t(eSpecType::TOWN_PORTAL)
 		.msg1(eSpecPicker::MSG_SEQUENCE)
 		.pic()
-		.loc(eSpecField::EX1A, eSpecField::EX1B);
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN);
 	node_properties_t S_STAIR = node_builder_t(eSpecType::TOWN_STAIR)
 		.msg1(eSpecPicker::MSG_SEQUENCE)
 		.pic()
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::SPECIFIED_TOWN, eSpecField::EX2A)
 		.ex2a(STRT_TOWN)
 		.ex2b(eSpecPicker::TOGGLE)
 		.ex2c(STRT_STAIR_MODE)
@@ -96,15 +97,15 @@ namespace {
 	node_properties_t S_OUTDOOR = node_builder_t(eSpecType::TOWN_RELOCATE)
 		.msg()
 		.field_pair(eSpecField::EX1A, eSpecField::EX1B, STRT_SECTOR)
-		.loc(eSpecField::EX2A, eSpecField::EX2B);
+		.loc(eSpecField::EX2A, eSpecField::EX2B, eLocType::SPECIFIED_OUT, eSpecField::EX1A);
 	node_properties_t S_ITEM = node_builder_t(eSpecType::TOWN_PLACE_ITEM)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN)
 		.ex2a(STRT_ITEM)
 		.ex2b(eSpecPicker::TOGGLE);
 	node_properties_t S_SPLIT = node_builder_t(eSpecType::TOWN_SPLIT_PARTY)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN)
 		.ex2a(eSpecPicker::SOUND);
 	node_properties_t S_REUNITE = node_builder_t(eSpecType::TOWN_REUNITE_PARTY)
 		.msg()
@@ -133,21 +134,21 @@ namespace {
 		.ex2c(eSpecPicker::TOGGLE);
 	node_properties_t S_FIELDS = node_builder_t(eSpecType::TOWN_SPELL_PAT_FIELD)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN)
 		.ex1c(+STRT_SPELL_PAT)
 		.ex2a(+eSpecPicker::FIELD);
 	node_properties_t S_PATTERN = node_builder_t(eSpecType::TOWN_SPELL_PAT_BOOM)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN)
 		.ex1c(+STRT_SPELL_PAT)
 		.ex2a(eSpecPicker::DAMAGE_TYPE)
 		.ex2c(STRT_SPELL_PAT_MODE);
 	node_properties_t S_WARP = node_builder_t(eSpecType::TOWN_RELOCATE_CREATURE)
 		.msg()
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN)
 		.ex2b(STRT_POS_MODE);
 	node_properties_t S_LABEL = node_builder_t(eSpecType::TOWN_PLACE_LABEL)
 		.msg1(eSpecPicker::MSG_SINGLE)
-		.loc(eSpecField::EX1A, eSpecField::EX1B)
+		.loc(eSpecField::EX1A, eSpecField::EX1B, eLocType::ACTIVE_TOWN)
 		.ex2a(STRT_LABEL_ALIGN);
 }
diff --git a/src/scenario/special.cpp b/src/scenario/special.cpp
index 18f0b209..c63ad937 100644
--- a/src/scenario/special.cpp
+++ b/src/scenario/special.cpp
@@ -652,6 +652,11 @@ node_function_t::node_function_t(ePicType pic)
 	, pic_type(pic)
 {}
 
+node_function_t::node_function_t(eLocType loc)
+	: button(eSpecPicker::LOCATION)
+	, loc_type(loc)
+{}
+
 node_function_t operator+(eSpecPicker picker) {
 	node_function_t n(picker);
 	if(picker == eSpecPicker::NODE || picker == eSpecPicker::MSG_PAIR || picker == eSpecPicker::MSG_SINGLE || picker == eSpecPicker::MSG_SEQUENCE) {
@@ -765,10 +770,8 @@ node_builder_t& node_builder_t::msg() {
 	return field_pair(eSpecField::MSG1, eSpecField::MSG2, eSpecPicker::MSG_PAIR);
 };
 
-node_builder_t& node_builder_t::rect() {
-	// The intent is to specify that ex1a,ex1b, and ex2a,ex2b are locations.
-	// But specifying that two fields are a location isn't implemented yet.
-	return loc(eSpecField::EX1A, eSpecField::EX1B).loc(eSpecField::EX2A, eSpecField::EX2B).pict(eSpecPicker::TOGGLE);
+node_builder_t& node_builder_t::rect(eLocType type) {
+	return loc(eSpecField::EX1A, eSpecField::EX1B, type).loc(eSpecField::EX2A, eSpecField::EX2B, type).pict(eSpecPicker::TOGGLE);
 };
 
 node_builder_t& node_builder_t::pic() {
@@ -847,8 +850,14 @@ node_builder_t& node_builder_t::sdf(eSpecField a, eSpecField b) {
 	return field_pair(a, b, eSpecPicker::SDF);
 }
 
-node_builder_t& node_builder_t::loc(eSpecField a, eSpecField b) {
-	return field_pair(a, b, eSpecPicker::LOCATION);
+node_builder_t& node_builder_t::loc(eSpecField a, eSpecField b, eLocType type) {
+	return field_pair(a, b, type);
+}
+
+node_builder_t& node_builder_t::loc(eSpecField a, eSpecField b, eLocType type, eSpecField where) {
+	loc(a, b, type);
+	(node.*fields().map[b]).continuation = where;
+	return *this;
 }
 
 node_builder_t::operator node_properties_t() {
diff --git a/src/scenario/special.hpp b/src/scenario/special.hpp
index cc3a745a..571d040a 100644
--- a/src/scenario/special.hpp
+++ b/src/scenario/special.hpp
@@ -160,6 +160,11 @@ enum class eSpecPicker {
 	POINTER,
 };
 
+enum class eLocType {
+	ACTIVE_AUTO, ACTIVE_TOWN, ACTIVE_OUT,
+	SPECIFIED_TOWN, SPECIFIED_OUT
+};
+
 enum class eSpecField { NONE, SDF1, SDF2, MSG1, MSG2, MSG3, PICT, PTYP, EX1A, EX1B, EX1C, EX2A, EX2B, EX2C, JUMP };
 
 struct node_function_t {
@@ -167,6 +172,7 @@ struct node_function_t {
 	union {
 		eStrType str_type; // for eSpecPicker::STRING only
 		ePicType pic_type; // for eSpecPicker::PICTURE only; PIC_NONE = use pictype field from node
+		eLocType loc_type; // for eSpecPicker::LOCATION only
 		bool force_global; // for eSpecPicker::NODE and eSpecPicker::MSG_*
 		// other pickers don't put anything in here
 	};
@@ -179,6 +185,7 @@ struct node_function_t {
 	node_function_t(eSpecPicker button);
 	node_function_t(eStrType str);
 	node_function_t(ePicType pic);
+	node_function_t(eLocType loc);
 private:
 	eSpecType self = eSpecType::NONE;
 	std::string lbl;
@@ -246,11 +253,13 @@ struct node_builder_t {
 	// Specifies that ex1a,ex1b and ex2a,ex2b define opposing corners of a rectangle.
 	// DO NOT use for other cases where there are two points, for example defining a path!
 	// Also DO NOT use for cases where an outdoor sector is identified by its coordinates.
-	node_builder_t& rect();
+	node_builder_t& rect(eLocType type);
 	// Specifies that the indicated two fields combine to define an SDF.
 	node_builder_t& sdf(eSpecField a, eSpecField b);
 	// Specifies that the indicated two fields combine to define a location.
-	node_builder_t& loc(eSpecField a, eSpecField b);
+	node_builder_t& loc(eSpecField a, eSpecField b, eLocType type);
+	// As above, but also notes that the area the location is in will be specified by the indicated field.
+	node_builder_t& loc(eSpecField a, eSpecField b, eLocType type, eSpecField where);
 	operator node_properties_t();
 private:
 	node_properties_t node;
diff --git a/src/scenedit/SConscript b/src/scenedit/SConscript
index 0938951e..f5c01322 100644
--- a/src/scenedit/SConscript
+++ b/src/scenedit/SConscript
@@ -8,6 +8,7 @@ scened_sources = Split("""
 	scen.fileio.cpp
 	scen.graphics.cpp
 	scen.keydlgs.cpp
+	scen.locpicker.cpp
 	scen.main.cpp
 	scen.townout.cpp
 	../view_dialogs.cpp
@@ -49,4 +50,4 @@ else:
 
 env.Package(scened, install_dir, scened_info)
 if debug_symbols is not None:
-	env.Install(install_dir, debug_symbols)
\ No newline at end of file
+	env.Install(install_dir, debug_symbols)
diff --git a/src/scenedit/scen.keydlgs.cpp b/src/scenedit/scen.keydlgs.cpp
index def8d337..3c7456b6 100644
--- a/src/scenedit/scen.keydlgs.cpp
+++ b/src/scenedit/scen.keydlgs.cpp
@@ -11,6 +11,7 @@
 #include "utility.hpp"
 #include "scen.graphics.hpp"
 #include "scen.keydlgs.hpp"
+#include "scen.locpicker.hpp"
 #include "scen.core.hpp"
 #include "dialogxml/dialogs/dialog.hpp"
 #include "dialogxml/widgets/control.hpp"
@@ -1035,6 +1036,88 @@ static bool edit_spec_enc_value(cDialog& me, std::string item_hit, node_stack_t&
 			store = choose_graphic(val, type, &me);
 			if(store < 0) store = val;
 		} break;
+		case eSpecPicker::LOCATION: {
+			auto otherField = get_control_for_field(fcn.continuation);
+			location loc;
+			loc.x = val;
+			loc.y = me[otherField].getTextAsNum();
+			static const std::string townStr = "Select a location in the current town:";
+			static const std::string outStr = "Select a location in the current outdoors:";
+			static const std::string specStr = "Select a location in ";
+			switch(fcn.loc_type) {
+				case eLocType::ACTIVE_OUT: loc = cLocationPicker(loc, *current_terrain, outStr, &me).run(); break;
+				case eLocType::ACTIVE_TOWN: loc = cLocationPicker(loc, *town, townStr, &me).run(); break;
+				case eLocType::ACTIVE_AUTO: {
+					switch(edit_stack.top().mode) {
+						case 1: loc = cLocationPicker(loc, *current_terrain, outStr, &me).run(); break;
+						case 2: loc = cLocationPicker(loc, *town, townStr, &me).run(); break;
+						case 0: {
+							bool is_town = true;
+							cLocationPicker picker(loc, *town, townStr, &me);
+							auto& switchBtn = picker->getControl("switch");
+							switchBtn.show();
+							switchBtn.attachClickHandler([&picker, &is_town](cDialog&, std::string, eKeyMod) {
+								if(is_town) {
+									is_town = false;
+									picker.setArea(*current_terrain);
+									picker.setTitle(outStr);
+								} else {
+									is_town = true;
+									picker.setArea(*town);
+									picker.setTitle(townStr);
+								}
+								return true;
+							});
+							loc = picker.run();
+						} break;
+					}
+				} break;
+				case eLocType::SPECIFIED_TOWN: {
+					node_function_t y_fcn = get_field_function(spec, otherField);
+					auto townField = get_control_for_field(y_fcn.continuation);
+					int townNum = me[townField].getTextAsNum();
+					townNum = minmax(0, scenario.towns.size() - 1, townNum);
+					cLocationPicker picker(loc, *scenario.towns[townNum], specStr + scenario.towns[townNum]->name + ":", &me);
+					auto& switchBtn = picker->getControl("switch");
+					switchBtn.show();
+					switchBtn.attachClickHandler([&picker, &townNum](cDialog& me, std::string, eKeyMod) {
+						townNum = choose_text(STRT_TOWN, townNum, &me, "Which town?");
+						picker.setArea(*scenario.towns[townNum]);
+						picker.setTitle(specStr + scenario.towns[townNum]->name + ":");
+						return true;
+					});
+					loc = picker.run();
+					me[townField].setTextToNum(townNum);
+				} break;
+				case eLocType::SPECIFIED_OUT: {
+					node_function_t y_fcn = get_field_function(spec, otherField);
+					auto sectorXField = get_control_for_field(y_fcn.continuation);
+					int sectorX = me[sectorXField].getTextAsNum();
+					sectorX = minmax(0, scenario.outdoors.width() - 1, sectorX);
+					node_function_t sec_fcn = get_field_function(spec, sectorXField);
+					auto sectorYField = get_control_for_field(sec_fcn.continuation);
+					int sectorY = me[sectorYField].getTextAsNum();
+					sectorY = minmax(0, scenario.outdoors.height() - 1, sectorY);
+					cLocationPicker picker(loc, *scenario.outdoors[sectorX][sectorY], specStr + scenario.outdoors[sectorX][sectorY]->name + ":", &me);
+					auto& switchBtn = picker->getControl("switch");
+					switchBtn.show();
+					switchBtn.attachClickHandler([&picker, &sectorX, &sectorY](cDialog& me, std::string, eKeyMod) {
+						int val = sectorX * scenario.outdoors.height() + sectorY;
+						val = choose_text(STRT_SECTOR, val, &me, "Which sector?");
+						sectorY = val % scenario.outdoors.height();
+						sectorX = val / scenario.outdoors.height();
+						picker.setArea(*scenario.outdoors[sectorX][sectorY]);
+						picker.setTitle(specStr + scenario.outdoors[sectorX][sectorY]->name + ":");
+						return true;
+					});
+					loc = picker.run();
+					me[sectorXField].setTextToNum(sectorX);
+					me[sectorYField].setTextToNum(sectorY);
+				} break;
+			}
+			store = loc.x;
+			me[otherField].setTextToNum(loc.y);
+		} break;
 		case eSpecPicker::FIELD: store = choose_field_type(val, &me, fcn.augmented); break;
 		case eSpecPicker::DAMAGE_TYPE: store = choose_damage_type(val, &me, true); break;
 		case eSpecPicker::EXPLOSION: store = choose_boom_type(val, &me); break;
diff --git a/src/scenedit/scen.locpicker.cpp b/src/scenedit/scen.locpicker.cpp
new file mode 100644
index 00000000..f41f9723
--- /dev/null
+++ b/src/scenedit/scen.locpicker.cpp
@@ -0,0 +1,130 @@
+//
+//  scen.locpicker.cpp
+//  BoE
+//
+//  Created by Celtic Minstrel on 2025-02-28.
+//
+
+#include "scen.locpicker.hpp"
+
+#include "dialogxml/widgets/pict.hpp"
+#include "dialogxml/widgets/tilemap.hpp"
+#include "scenario/area.hpp"
+#include "scenario/scenario.hpp"
+#include "fileio/resmgr/res_dialog.hpp"
+
+extern cScenario scenario;
+
+cLocationPicker::cLocationPicker(location loc, cArea& area, const std::string& title, cDialog* parent)
+	: initial_loc(loc)
+	, chosen_loc(loc)
+	, area(&area)
+	, dlog(*ResMgr::dialogs.get("choose-location"), parent)
+{
+	clamp_loc();
+	map = dynamic_cast<cTilemap*>(&dlog["map"]);
+	fill_terrain();
+	handle_scroll(""); // Hide unusable scroll buttons
+	dlog["switch"].hide();
+	setTitle(title);
+	using namespace std::placeholders;
+	dlog.attachClickHandlers(std::bind(&cLocationPicker::handle_close, this, _2), {"done", "cancel"});
+	dlog.attachClickHandlers(std::bind(&cLocationPicker::handle_scroll, this, _2), {"up", "down", "left", "right"});
+	map->attachClickHandlers(std::bind(&cLocationPicker::handle_select, this, _2), "");
+}
+
+void cLocationPicker::clamp_loc() {
+	chosen_loc.x = minmax(0, area->max_dim - 1, chosen_loc.x);
+	chosen_loc.y = minmax(0, area->max_dim - 1, chosen_loc.y);
+	viewport.x = 18 * floor(chosen_loc.x / 18.0);
+	viewport.y = 18 * floor(chosen_loc.y / 18.0);
+}
+
+void cLocationPicker::setArea(cArea& newArea) {
+	area = &newArea;
+	clamp_loc();
+	fill_terrain();
+}
+
+void cLocationPicker::setTitle(const std::string& title) {
+	dlog["prompt"].setText(title);
+}
+
+void cLocationPicker::fill_terrain() {
+	for(int x = 0; x < 18; x++) {
+		for(int y = 0; y < 18; y++) {
+			auto& pict = dynamic_cast<cPict&>(map->getChild(x, y));
+			location ter_loc = viewport;
+			ter_loc.x += x;
+			ter_loc.y += y;
+			if(ter_loc.x >= area->max_dim || ter_loc.y >= area->max_dim) pict.setPict(74);
+			else {
+				ter_num_t ter = area->terrain[ter_loc.x][ter_loc.y];
+				pict.setPict(scenario.ter_types[ter].map_pic);
+			}
+		}
+	}
+	place_pointer();
+}
+
+void cLocationPicker::place_pointer() {
+	if(chosen_loc.x >= viewport.x && chosen_loc.x < viewport.x + 18 && chosen_loc.y >= viewport.y && chosen_loc.y < viewport.y + 18) {
+		location relative_loc = chosen_loc;
+		relative_loc.x -= viewport.x;
+		relative_loc.y -= viewport.y;
+		location ctrlPos = map->getCellPos(relative_loc.x, relative_loc.y);
+		ctrlPos.x += 3;
+		ctrlPos.y += 3;
+		dlog["zpointer"].relocate(ctrlPos);
+		dlog["zpointer"].show();
+	} else {
+		dlog["zpointer"].hide();
+	}
+}
+
+bool cLocationPicker::handle_close(std::string item_hit) {
+	dlog.toast(item_hit == "done");
+	return true;
+}
+
+bool cLocationPicker::handle_scroll(std::string item_hit) {
+	if(item_hit == "up") {
+		if(viewport.y > 0) viewport.y -= 9;
+	} else if(item_hit == "down") {
+		if(viewport.y < area->max_dim - 18) viewport.y += 9;
+	} else if(item_hit == "left") {
+		if(viewport.x > 0) viewport.x -= 9;
+	} else if(item_hit == "right") {
+		if(viewport.x < area->max_dim - 18) viewport.x += 9;
+	}
+	if(viewport.x == 0) dlog["left"].hide();
+	else dlog["left"].show();
+	if(viewport.y == 0) dlog["up"].hide();
+	else dlog["up"].show();
+	if(viewport.x >= area->max_dim - 18) dlog["right"].hide();
+	else dlog["right"].show();
+	if(viewport.y >= area->max_dim - 18) dlog["down"].hide();
+	else dlog["down"].show();
+	fill_terrain();
+	return true;
+}
+
+bool cLocationPicker::handle_select(std::string item_hit) {
+	location clickedLoc = map->getCellPos(dlog[item_hit]);
+	location check{viewport.x + clickedLoc.x / 24, viewport.y + clickedLoc.y / 24};
+	if(check.x < area->max_dim && check.y < area->max_dim) {
+		chosen_loc = check;
+		place_pointer();
+	}
+	return true;
+}
+
+location cLocationPicker::run() {
+	dlog.run();
+	if(dlog.accepted()) return chosen_loc;
+	return initial_loc;
+}
+
+cDialog* cLocationPicker::operator->() {
+	return &dlog;
+}
diff --git a/src/scenedit/scen.locpicker.hpp b/src/scenedit/scen.locpicker.hpp
new file mode 100644
index 00000000..d634a0e1
--- /dev/null
+++ b/src/scenedit/scen.locpicker.hpp
@@ -0,0 +1,37 @@
+//
+//  scen.locpicker.hpp
+//  BoE
+//
+//  Created by Celtic Minstrel on 2025-02-28.
+//
+
+#ifndef BoE_scen_locpicker_h
+#define BoE_scen_locpicker_h
+
+#include <string>
+#include "location.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+
+class cArea;
+class cTilemap;
+
+class cLocationPicker {
+	location initial_loc, chosen_loc, viewport;
+	cArea* area;
+	cDialog dlog;
+	cTilemap* map;
+	void clamp_loc();
+	void fill_terrain();
+	void place_pointer();
+	bool handle_close(std::string item_hit);
+	bool handle_scroll(std::string item_hit);
+	bool handle_select(std::string item_hit);
+public:
+	cLocationPicker(location loc, cArea& area, const std::string& title, cDialog* parent);
+	void setArea(cArea& newArea) ;
+	void setTitle(const std::string& title);
+	location run();
+	cDialog* operator->();
+};
+
+#endif
diff --git a/src/scenedit/scen.townout.cpp b/src/scenedit/scen.townout.cpp
index e3f59975..bfc68e93 100644
--- a/src/scenedit/scen.townout.cpp
+++ b/src/scenedit/scen.townout.cpp
@@ -13,11 +13,13 @@
 #include "scen.graphics.hpp"
 #include "scen.townout.hpp"
 #include "scen.keydlgs.hpp"
+#include "scen.locpicker.hpp"
 #include "scen.fileio.hpp"
 #include "scen.core.hpp"
 #include "mathutil.hpp"
 #include "dialogxml/widgets/button.hpp"
 #include "dialogxml/widgets/field.hpp"
+#include "dialogxml/dialogs/strchoice.hpp"
 #include "dialogxml/dialogs/strdlog.hpp"
 #include "dialogxml/dialogs/choicedlog.hpp"
 #include "tools/winutil.hpp"
@@ -815,6 +817,49 @@ void edit_advanced_town() {
 	town_dlg.attachFocusHandlers(loc_check, {"exit1-x", "exit2-x", "exit3-x", "exit4-x"});
 	town_dlg.attachFocusHandlers(loc_check, {"exit1-y", "exit2-y", "exit3-y", "exit4-y"});
 	town_dlg.attachClickHandlers(edit_advanced_town_special, {"edit-onexit1", "edit-onexit2", "edit-onexit3", "edit-onexit4", "edit-onenter", "edit-onenterdead", "edit-onhostile"});
+	town_dlg.attachClickHandlers([](cDialog& me, std::string which, eKeyMod) {
+		auto entrances = scenario.find_town_entrances(cur_town);
+		std::vector<location> sectors;
+		for(const auto& entrance : entrances) {
+			if(std::find(sectors.begin(), sectors.end(), entrance.out_sec) == sectors.end()) {
+				sectors.push_back(entrance.out_sec);
+			}
+		}
+		int which_sector = 0;
+		if(sectors.size() == 0) {
+			int sec =  -1;
+			sec = choose_text(STRT_SECTOR, 0, &me, "Exit to which sector?");
+			if(sec == -1) return true; // cancelled
+			sectors.emplace_back(sec / scenario.outdoors.height(), sec % scenario.outdoors.height());
+		}
+		location loc(me[which + "-x"].getTextAsNum(), me[which + "-y"].getTextAsNum());
+		if((loc.x < 0 || loc.y < 0 || loc.x >= 48 || loc.y >= 48) && !entrances.empty()) {
+			loc = entrances[0].loc;
+		}
+		static const std::string directions[4]{"top", "left", "bottom", "right"};
+		std::string title = "Select outdoor location when exiting from the " + directions[which.back() - '1'] + ":";
+		cLocationPicker picker(loc, *scenario.outdoors[sectors[which_sector].x][sectors[which_sector].y], title, &me);
+		if(sectors.size() > 1) {
+			std::vector<std::string> out_names;
+			for(const auto& sec : sectors) {
+				out_names.push_back(scenario.outdoors[sec.x][sec.y]->name);
+			}
+			cControl& switchBtn = picker->getControl("switch");
+			switchBtn.show();
+			switchBtn.attachClickHandler([out_names, &sectors, &which_sector, &picker](cDialog& me, std::string, eKeyMod) {
+				cStringChoice pickstr(out_names, "Exit to which sector?", &me);
+				which_sector = pickstr.show(which_sector);
+				picker.setArea(*scenario.outdoors[sectors[which_sector].x][sectors[which_sector].y]);
+				return true;
+			});
+		}
+		loc = picker.run();
+		if(picker->accepted()) {
+			me[which + "-x"].setTextToNum(loc.x);
+			me[which + "-y"].setTextToNum(loc.y);
+		}
+		return true;
+	}, {"exit1", "exit2", "exit3", "exit4"});
 	town_dlg.attachClickHandlers([](cDialog& me, std::string which, eKeyMod) -> bool {
 		std::string fld = which.replace(0, 4, "bg");
 		int bg_i = me[fld].getTextAsNum();