From 731edb26e384ce186a3a414c2133b5e02703a964 Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Wed, 28 May 2025 14:23:02 -0500
Subject: [PATCH] edit special node: allow create/edit

---
 rsrc/dialogs/edit-special-assign.xml | 13 ++++---
 src/scenedit/scen.keydlgs.cpp        | 53 +++++++++++++++++++---------
 2 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/rsrc/dialogs/edit-special-assign.xml b/rsrc/dialogs/edit-special-assign.xml
index 0f44edb8..8e2aa8f2 100644
--- a/rsrc/dialogs/edit-special-assign.xml
+++ b/rsrc/dialogs/edit-special-assign.xml
@@ -2,13 +2,16 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='okay' escbtn='cancel'>
-	<field name='num' type='uint' top='64' left='209' width='75' height='16'/>
 	<pict type='dlog' num='16' top='8' left='8'/>
-	<button name='okay' type='regular' top='87' left='311'>OK</button>
 	<text size='large' top='6' left='50' width='256' height='17'>Set Special Number:</text>
-	<text top='25' left='50' width='323' height='27'>
-		Which special node should be called when this space is entered/examined?
+	<text name='prompt' top='25' left='50' width='323' height='27'>
+		Which special node should be called when this space is entered/examined? (0-{{max-num}} for existing, {{next-num}} for new.)
 	</text>
 	<text top='64' left='120' width='84' height='16'>Special node:</text>
-	<button name='cancel' type='regular' top='87' left='246'>Cancel</button>
+	<field name='num' type='uint' top='64' left='209' width='75' height='16'/>
+	<!--TODO add a picker-->
+
+	<button name='cancel' type='regular' top='87' left='5'>Cancel</button>
+	<button name='edit' type='large' top='87' left='180'>Create/Edit</button>
+	<button name='okay' type='regular' top='87' left='286'>OK</button>
 </dialog>
diff --git a/src/scenedit/scen.keydlgs.cpp b/src/scenedit/scen.keydlgs.cpp
index 524f0ec6..180ce150 100644
--- a/src/scenedit/scen.keydlgs.cpp
+++ b/src/scenedit/scen.keydlgs.cpp
@@ -1615,34 +1615,55 @@ void edit_dialog_text(eStrMode mode,short *str1,cDialog* parent) {
 	edit.run();
 }
 
-static bool edit_special_num_event_filter(cDialog& me, std::string item_hit, short spec_mode) {
-	size_t num_specs = 0;
-	switch(spec_mode) {
-		case 0: num_specs = scenario.scen_specials.size(); break;
-		case 1: num_specs = current_terrain->specials.size(); break;
-		case 2: num_specs = town->specials.size(); break;
-	}
-	
-	if(item_hit == "cancel") me.setResult<short>(-1);
-	else if(item_hit == "okay") {
+static bool edit_special_num_event_filter(cDialog& me, std::string item_hit, short spec_mode, short num_specs) {
+	std::string range = num_specs
+		? "The available range is 0 to " + std::to_string(num_specs - 1) + "."
+		: "There are currently no nodes defined at all.";
+	std::string how_to_create = "To create a new node, use " + std::to_string(num_specs) + " or -1";
+	if(item_hit == "cancel"){
+		me.setResult<short>(-1);
+		me.toast(false);
+	}else if(item_hit == "edit"){
+		short i = me["num"].getTextAsNum();
+		if(i > num_specs){
+			showWarning("There is no special node with that number. " + range, how_to_create + ".", &me);
+		}else{
+			if(i < 0 || i == num_specs)
+				i = get_fresh_spec(spec_mode);
+			me.setResult<short>(i);
+			edit_spec_enc(i, spec_mode, &me);
+			me.toast(true);
+		}
+	}else if(item_hit == "okay") {
 		short i = me["num"].getTextAsNum();
 		if(i < 0 || i >= num_specs) {
-			std::string range = num_specs
-				? "The available range is 0 to " + std::to_string(num_specs - 1) + "."
-				: "There are currently no nodes defined at all.";
-			showWarning("There is no special node with that number. " + range,"The node has been set anyway. To create it, select Edit Special Nodes from the menu, scroll to the bottom, and select Create new Node.",&me);
+			showWarning("There is no special node with that number. " + range, how_to_create + " and press Create/Edit.", &me);
+			// The editor used to make the node spot anyway, no matter how high the node number.
+			// I think that was a bad idea because you'd have to create every intermediate node number
+			// in order to create a specific high number node. Now we only allow creating the next node.
+			return true;
 		}
 		me.setResult(i);
 		me.toast(true);
-	} me.toast(false);
+	}
+
 	return true;
 }
 
 short edit_special_num(short mode,short what_start) {
 	using namespace std::placeholders;
+
+	size_t num_specs = 0;
+	switch(mode) {
+		case 0: num_specs = scenario.scen_specials.size(); break;
+		case 1: num_specs = current_terrain->specials.size(); break;
+		case 2: num_specs = town->specials.size(); break;
+	}
 	
 	cDialog edit(*ResMgr::dialogs.get("edit-special-assign"));
-	edit.attachClickHandlers(std::bind(edit_special_num_event_filter, _1, _2, mode), {"okay", "cancel"});
+	edit["prompt"].replaceText("{{max-num}}", std::to_string(num_specs - 1));
+	edit["prompt"].replaceText("{{next-num}}", std::to_string(num_specs));
+	edit.attachClickHandlers(std::bind(edit_special_num_event_filter, _1, _2, mode, num_specs), {"okay", "edit", "cancel"});
 	
 	edit["num"].setTextToNum(what_start);