From 797464b89910c4a04d0381a831001f4a7591ad28 Mon Sep 17 00:00:00 2001
From: AnnieRuru <jeankofannie2@gmail.com>
Date: Thu, 11 Apr 2019 00:50:28 +0800
Subject: Add 3 pc variables just for the input limit ... sd->npc_amount_min
 and sd->npc_amount_max to limit input range and sd->npc_input_capped_range
 because the documentation ask for it

---
 src/map/clif.c   | 15 ++++++++++++---
 src/map/pc.h     |  3 +++
 src/map/script.c |  9 ++++++---
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/map/clif.c b/src/map/clif.c
index cd3131181..037e168d0 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -12587,10 +12587,19 @@ static void clif_parse_NpcAmountInput(int fd, struct map_session_data *sd)
 	int npcid = RFIFOL(fd,2);
 	int amount = RFIFOL(fd,6);
 
-	if (amount >= 0)
+	if (amount < sd->npc_amount_min) {
+		sd->npc_amount = sd->npc_amount_min;
+		sd->npc_input_capped_range = -1;
+	}
+	else if (amount > sd->npc_amount_max) {
+		sd->npc_amount = sd->npc_amount_max;
+		sd->npc_input_capped_range = 1;
+	}
+	else {
 		sd->npc_amount = amount;
-	else
-		sd->npc_amount = 0;
+		sd->npc_input_capped_range = 0;
+	}
+
 	npc->scriptcont(sd, npcid, false);
 }
 
diff --git a/src/map/pc.h b/src/map/pc.h
index b2069d4df..41384b484 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -273,6 +273,9 @@ struct map_session_data {
 	int npc_item_flag; //Marks the npc_id with which you can change equipments during interactions with said npc (see script command enable_itemuse)
 	int npc_menu; // internal variable, used in npc menu handling
 	int npc_amount;
+	int npc_amount_min;
+	int npc_amount_max;
+	int npc_input_capped_range;
 	struct script_state *st;
 	char npc_str[CHATBOX_SIZE]; // for passing npc input box text to script engine
 	int npc_timer_id; //For player attached npc timers. [Skotlex]
diff --git a/src/map/script.c b/src/map/script.c
index 2a4cbd4f2..391fb34c4 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -6983,10 +6983,13 @@ static BUILDIN(input)
 		// first invocation, display npc input box
 		sd->state.menu_or_input = 1;
 		st->state = RERUNLINE;
-		if (is_string_variable(name))
+		if (is_string_variable(name)) {
 			clif->scriptinputstr(sd, st->oid);
-		else
+		} else {
+			sd->npc_amount_min = min;
+			sd->npc_amount_max = max;
 			clif->scriptinput(sd, st->oid);
+		}
 	} else {
 		// take received text/value and store it in the designated variable
 		sd->state.menu_or_input = 0;
@@ -6997,7 +7000,7 @@ static BUILDIN(input)
 		} else {
 			int amount = sd->npc_amount;
 			script->set_reg(st, sd, uid, name, (const void *)h64BPTRSIZE(cap_value(amount,min,max)), script_getref(st,2));
-			script_pushint(st, (amount > max ? 1 : amount < min ? -1 : 0));
+			script_pushint(st, sd->npc_input_capped_range);
 		}
 		st->state = RUN;
 	}
-- 
cgit v1.2.3-60-g2f50