Sanitize handling of the input() values.

- avoid potential hacks for old scripts that use `input()` script
commands.

Signed-off-by: Haru <haru@dotalux.com>

12 files changed, 241 insertions, 248 deletions

diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt
index c3133af30..67c69f8e8 100644
--- a/npc/other/arena/arena_party.txt
+++ b/npc/other/arena/arena_party.txt
@@ -1059,7 +1059,7 @@ prt_are_in,77,135,3	script	Staff#party-2	1_F_02,{
 			donpcevent "Ponox::OnStart";
 		}
 		specialeffect(EH_HIT5, AREA, playerattached());
- 		donpcevent "cast#pt::OnNomal1";
+		donpcevent "cast#pt::OnNomal1";
 		warp "arena_room",100,75;
 		end;
 	} else {
@@ -1078,7 +1078,7 @@ prt_are_in,77,135,3	script	Staff#party-2	1_F_02,{
 			next;
 			switch( select( "Ok.","Let me think." ) )  {
 			case 1:
-				input .@arnparty$;
+				input(.@arnparty$);
 				mes "[Staff]";
 				mes "You have entered ^3131FF"+.@arnparty$+"^000000. Is it correct?";
 				next;
diff --git a/npc/other/arena/arena_point.txt b/npc/other/arena/arena_point.txt
index 5292ebab3..c2ef52e6a 100644
--- a/npc/other/arena/arena_point.txt
+++ b/npc/other/arena/arena_point.txt
@@ -80,70 +80,66 @@ prt_are_in,103,11,3	script	Arena Point Manager	4_M_JOB_HUNTER,{
 			mes "value you may enter is 20.";
 			mes "To cancel, enter ''^3355FF0^000000.''";
 			next;
-			input .@input;
-			if (.@input == 0) {
+			input(.@input);
+			if (.@input <= 0) {
 				mes "[Arena Point Manager]";
 				mes "You have";
 				mes "canceled";
 				mes "this service.";
 				close;
 			}
-			else if (.@input > 20) {
+			if (.@input > 20) {
 				mes "[Arena Point Manager]";
 				mes "Your request exceeds";
 				mes "the maximum limit. Please";
 				mes "enter a value no greater than 20.";
 				close;
 			}
-			else {
-				.@want_point1 = 10 * .@input;
-				.@want_point = 5 * .@input;
-				.@my_arena_all = arena_point + .@want_point;
-				.@my_turbo_all = tt_point - .@want_point1;
-				if (.@my_arena_all > 28999) {
-					mes "[Arena Point Manager]";
-					mes "You will exceed the";
-					mes "maximum amount of";
-					mes "Arena Points if we proceed";
-					mes "with this conversion of your";
-					mes "Turbo Track Points. You cannot";
-					mes "have more than 29,000 Arena Points.";
-					next;
-					mes "[Arena Point Manager]";
-					mes "Please spend some of";
-					mes "your Arena Points before";
-					mes "using this service again.";
-					mes "Thank you for your patronage.";
-					close;
-				}
-				if (.@my_turbo_all < 0) {
-					mes "[Arena Point Manager]";
-					mes "I'm sorry, but";
-					mes "you don't have enough";
-					mes "Turbo Track Points to";
-					mes "perform this Arena";
-					mes "Point conversion.";
-					close;
-				}
-				else {
-					mes "[Arena Point Manager]";
-					mes "You have converted";
-					mes "10 Turbo Track Points";
-					mes "into 5 Arena Points " + .@input + " times.";
-					mes "A total of " + .@want_point1 + " Turbo Track Points were converted into";
-					mes "" + .@want_point +" Arena Points.";
-					tt_point -= .@want_point1;
-					arena_point += .@want_point;
-					next;
-					mes "[Arena Point Manager]";
-					mes "" + strcharinfo(PC_NAME) + ",";
-					mes "you now have";
-					mes "^4682B4" + arena_point + "^000000 Arena Points";
-					mes "and ^00688B" + tt_point + "^000000 Turbo Track Points.";
-					mes "Thank you for your patronage.";
-					close;
-				}
+			.@want_point1 = 10 * .@input;
+			.@want_point = 5 * .@input;
+			.@my_arena_all = arena_point + .@want_point;
+			.@my_turbo_all = tt_point - .@want_point1;
+			if (.@my_arena_all > 28999) {
+				mes "[Arena Point Manager]";
+				mes "You will exceed the";
+				mes "maximum amount of";
+				mes "Arena Points if we proceed";
+				mes "with this conversion of your";
+				mes "Turbo Track Points. You cannot";
+				mes "have more than 29,000 Arena Points.";
+				next;
+				mes "[Arena Point Manager]";
+				mes "Please spend some of";
+				mes "your Arena Points before";
+				mes "using this service again.";
+				mes "Thank you for your patronage.";
+				close;
+			}
+			if (.@my_turbo_all < 0) {
+				mes "[Arena Point Manager]";
+				mes "I'm sorry, but";
+				mes "you don't have enough";
+				mes "Turbo Track Points to";
+				mes "perform this Arena";
+				mes "Point conversion.";
+				close;
 			}
+			mes "[Arena Point Manager]";
+			mes "You have converted";
+			mes "10 Turbo Track Points";
+			mes "into 5 Arena Points " + .@input + " times.";
+			mes "A total of " + .@want_point1 + " Turbo Track Points were converted into";
+			mes "" + .@want_point +" Arena Points.";
+			tt_point -= .@want_point1;
+			arena_point += .@want_point;
+			next;
+			mes "[Arena Point Manager]";
+			mes "" + strcharinfo(PC_NAME) + ",";
+			mes "you now have";
+			mes "^4682B4" + arena_point + "^000000 Arena Points";
+			mes "and ^00688B" + tt_point + "^000000 Turbo Track Points.";
+			mes "Thank you for your patronage.";
+			close;
 		case 6:
 			mes "[Arena Point Manager]";
 			mes "You have";
diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt
index b8806e112..b70ce7e4c 100644
--- a/npc/other/arena/arena_room.txt
+++ b/npc/other/arena/arena_room.txt
@@ -520,9 +520,9 @@ sec_in02,72,180,3	script	Arena Manager#arena	4_NFWISP,{
 				//mes "If not, please enter a value for minutes first and then seconds.";
 				mes "Please enter a value for minutes first and then seconds.";
 				next;
-				input .@arenamin;
+				input(.@arenamin, 0);
 				setd .@min$,.@arenamin;
-				input .@arenasec;
+				input(.@arenasec, 0);
 				setd .@sec$,.@arenasec;
 				mes "[Arena Manager]";
 				mes "Current "+.@mode$+" ranker's play time has been rearranged to ^FF0000"+getd(.@min$)+"^000000 minutes and ^FF0000"+getd(.@sec$)+"^000000 seconds.";
@@ -1011,12 +1011,13 @@ function	script	Func_Are_Rew	{
 	mes "You can exchange ^3131FF"+getarg(2)+" arena points with "+getarg(1)+" "+getitemname(getarg(0))+"^000000.";
 	mes "If you wish to cancel, please enter 0. If you don't, please enter how many ^3131FFtimes^000000 of arena points you wish to spend.";
 	next;
-	input .@reward;
-	if (.@reward == 0) {
+	input(.@reward);
+	if (.@reward <= 0) {
 		mes "[Givu]";
 		mes "You have canceled your request.";
 		close;
-	} else if (.@reward > 1500) {
+	}
+	if (.@reward > 1500) {
 		mes "[Givu]";
 		mes "You have exceeded the maximum capacity.";
 		close;
diff --git a/npc/other/card_trader.txt b/npc/other/card_trader.txt
index 514a032b0..1fca99440 100644
--- a/npc/other/card_trader.txt
+++ b/npc/other/card_trader.txt
@@ -121,7 +121,7 @@ prontera,115,90,0	script	Putty	4_F_01,{
 			mes "[Putty]";
 			mes "Please tell me what card you want to exchange.";
 			next;
-			input .@i$;
+			input(.@i$);
 			.@input$ = "_"+.@i$;
 			.@card = 0;
 			freeloop(1);
diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt
index bd2b0d692..dab52fbbc 100644
--- a/npc/other/comodo_gambling.txt
+++ b/npc/other/comodo_gambling.txt
@@ -540,14 +540,15 @@ mjolnir_02,85,362,3	script	Blacksmith Miner	4_F_JOB_BLACKSMITH,{
 		mes "If you change your mind,";
 		mes "please enter '0' to cancel.";
 		next;
-		input .@amount;
-		if (.@amount == 0) {
+		input(.@amount);
+		if (.@amount <= 0) {
 			mes "[Dwayne]";
 			mes "Alright, you've";
 			mes "canceled the trade.";
 			mes "Take care!";
 			close;
-		} else if (.@amount < 1 || .@amount > 500){
+		}
+		if (.@amount > 500) {
 			mes "[Dwayne]";
 			mes "The maximum";
 			mes "amount is 500.";
diff --git a/npc/other/fortune.txt b/npc/other/fortune.txt
index 23d65e88f..c3bec40f3 100644
--- a/npc/other/fortune.txt
+++ b/npc/other/fortune.txt
@@ -57,23 +57,21 @@ payon_in03,117,128,5	script	Fortune Teller	4_M_BIBI,{
 			mes "Then...";
 			mes "Please pay your fee with all of your sincerity.";
 			next;
-			input .@input;
-			if (.@input == 0) {
+			input(.@input);
+			if (.@input <= 0) {
 				mes "[Lhimetorra]";
 				mes "Ah...?!";
 				mes "You have angered the monster spirits!";
 				close;
 			}
-			else if (.@input > Zeny) {
+			if (.@input > Zeny) {
 				mes "[Lhimetorra]";
 				mes "There's no need to overdo it. Just give with all your heart... *Tsk tsk*";
 				close;
 			}
-			else {
-				mes "[Lhimetorra]";
-				mes "I accept your heart and your devotion with my gratitude. Thoughts are more important than the amount when paying a fortune teller.";
-				Zeny -= .@input;
-			}
+			mes "[Lhimetorra]";
+			mes "I accept your heart and your devotion with my gratitude. Thoughts are more important than the amount when paying a fortune teller.";
+			Zeny -= .@input;
 			next;
 			mes "[Lhimetorra]";
 			mes "Then, I will begin to tell the fortune of your wish. Concentrate on yourself...";
diff --git a/npc/other/gm_npcs.txt b/npc/other/gm_npcs.txt
index d86535104..b4ee7028e 100644
--- a/npc/other/gm_npcs.txt
+++ b/npc/other/gm_npcs.txt
@@ -63,7 +63,7 @@ function	script	F_GM_NPC	{
 			if (.@error)
 				return -2;
 		} else
-			input .@input;
+			input(.@input, 0);
 		if (.@input == 0)
 			return -1;
 		else
diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt
index 9c7b87ee4..bf64d7105 100644
--- a/npc/other/hugel_bingo.txt
+++ b/npc/other/hugel_bingo.txt
@@ -481,7 +481,7 @@ OnTouch:
 			mes "Quickly, say ''^FF0000Bingo^000000!''";
 			mes "Remember, you'll only";
 			mes "have one chance to say it!";
-			input @bingoyell$;
+			input(@bingoyell$);
 			if (@bingoyell$ == "Bingo") {
 				if ($@hu_bingoa == 5) {
 					$@hu_bingoa = 6;
@@ -500,14 +500,13 @@ OnTouch:
 					mes "next time, alright?";
 					close;
 				}
-			} else {
-				next;
-				mes "I'm sorry, but you";
-				mes "said it wrong. Next time,";
-				mes "make sure that you yell";
-				mes "out the word, ''^FF0000Bingo^000000,'' okay?";
-				close;
 			}
+			next;
+			mes "I'm sorry, but you";
+			mes "said it wrong. Next time,";
+			mes "make sure that you yell";
+			mes "out the word, ''^FF0000Bingo^000000,'' okay?";
+			close;
 		}
 		close;
 	}
@@ -860,11 +859,17 @@ function	script	Func_Bingo	{
 			}
 		}
 		next;
-		input .@bingoinput;
-		if(.@bingoinput < 1 || .@bingoinput > 25) { @bingo_case = .@i; return 0; }
-		if(.@i > 1) {
-			for(.@j = .@i; .@j > 0; --.@j) {
-				if(.@bingoinput == @bingoplate[.@j -1]) { @bingo_case = .@i; return 0; }
+		input(.@bingoinput);
+		if (.@bingoinput < 1 || .@bingoinput > 25) {
+			@bingo_case = .@i;
+			return 0;
+		}
+		if (.@i > 1) {
+			for (.@j = .@i; .@j > 0; --.@j) {
+				if (.@bingoinput == @bingoplate[.@j -1]) {
+					@bingo_case = .@i;
+					return 0;
+				}
 			}
 		}
 		setarray @bingoplate[.@i],.@bingoinput;
diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt
index 0f640af2a..42c817957 100644
--- a/npc/other/marriage.txt
+++ b/npc/other/marriage.txt
@@ -188,7 +188,7 @@ prt_church,97,100,4	script	Wedding Staff#w	1_F_LIBRARYGIRL,{
 		mes "name of your partner using";
 		mes "the method I just described.";
 		next;
-		input .@partner$;
+		input(.@partner$);
 		mes "[Marry Happy]";
 		mes "Alright, after you've";
 		mes "decided to get married,";
@@ -329,7 +329,7 @@ prt_church,97,100,4	script	Wedding Staff#w	1_F_LIBRARYGIRL,{
 			mes "down your exact name here.";
 			next;
 			while(1) {
-				input .@name$;
+				input(.@name$);
 				if (.@name$ == strcharinfo(PC_NAME))
 					break;
 				mes "[Marry Happy]";
@@ -599,7 +599,7 @@ prt_church,100,128,4	script	Bishop#w	1_M_PASTOR,{
 						mes "her and protect her. Now, may";
 						mes "I know the name of your bride?";
 						next;
-						input $@wed_bride$;
+						input($@wed_bride$);
 						mes "[Vomars]";
 						mes "Mr. " + strcharinfo(PC_NAME) + "...";
 						mes "Do you swear on your life";
diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt
index 4b0878e79..cc7364bf4 100644
--- a/npc/other/mercenary_rent.txt
+++ b/npc/other/mercenary_rent.txt
@@ -252,8 +252,8 @@ pay_arche,99,167,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Bow	4_M_J
 	mes "each cost " + .@str_cost$ + " zeny.";
 	mes "How many would you like?";
 	next;
-	input .@input;
-	if (!.@input) {
+	input(.@input);
+	if (.@input <= 0) {
 		mes "[Mercenary Goods Merchant]";
 		mes "You changed your mind?";
 		mes "Alright, feel free to come";
@@ -261,7 +261,7 @@ pay_arche,99,167,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Bow	4_M_J
 		mes "to buy any Mercenary Potions.";
 		close;
 	}
-	if (.@input < 0 || .@input > 10000) {
+	if (.@input > 10000) {
 		mes "[Mercenary Goods Merchant]";
 		mes "I'm sorry, but you";
 		mes "can only buy up to";
diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt
index 9e938c663..84087fb6d 100644
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -348,7 +348,7 @@ p_track01,67,45,5	script	Medal Distributor#single	4_F_RACING,{
 				mes "Oh! Congratulations, you";
 				mes "won! May I have your name?";
 				next;
-				input .@input$;
+				input(.@input$);
 				if (.@input$ == strcharinfo(PC_NAME)) {
 					.@insa = rand(1,1000);
 					mes "[Medal Distributor]";
@@ -359,14 +359,15 @@ p_track01,67,45,5	script	Medal Distributor#single	4_F_RACING,{
 					mes "number now. Your ticket";
 					mes "exchange number is ^FF0000" + .@insa + "^000000.";
 					next;
-					input .@input; //,0,1000;
-					if (!.@input) {
+					input(.@input);
+					if (.@input == 0) {
 						mes "[Medal Distributor]";
 						mes "Oh? You don't want";
 						mes "to exchange your";
 						mes "winning ticket?";
 						close;
-					} else if (.@input == .@insa) {
+					}
+					if (.@input == .@insa) {
 						mes "[Medal Distributor]";
 						mes "Thank you! You entered";
 						mes "the correct number...";
@@ -2534,8 +2535,8 @@ S_Reward:
 				mes "number greater than 100.";
 				next;
 				while (true) {
-					input .@input;
-					if (!.@input) {
+					input(.@input);
+					if (.@input <= 0) {
 						mes "[Ei'felle]";
 						mes "Aw, so you've decided";
 						mes "to cancel? Well, it's your";
@@ -2543,7 +2544,8 @@ S_Reward:
 						mes "disappointed. Please come";
 						mes "back if you change your mind...";
 						close;
-					} else if (.@input < 1 || .@input > 100) {
+					}
+					if (.@input > 100) {
 						mes "[Ei'felle]";
 						mes "Remember, you can only";
 						mes "enter a number from 1 to 100.";
@@ -2551,7 +2553,9 @@ S_Reward:
 						mes "medals, then perhaps you";
 						mes "should just give them all to me~";
 						next;
-					} else break;
+						continue;
+					}
+					break;
 				}
 				if (countitem(Marvelous_Medal) < .@input) {
 					mes "[Ei'felle]";
diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt
index f70c97427..948f190ba 100644
--- a/npc/other/turbo_track.txt
+++ b/npc/other/turbo_track.txt
@@ -4126,15 +4126,15 @@ turbo_room,93,117,5	script	Point Exchange Helper	4_M_TELEPORTER,{
 				mes "you wish to have. To cancel,";
 				mes "please enter ''^3355FF0^000000.''";
 				next;
-				input .@input;
-				if (.@input == 0) {
+				input(.@input);
+				if (.@input <= 0) {
 					mes "[Item Exchange Helper]";
 					mes "You have";
 					mes "canceled";
 					mes "your request.";
 					close;
 				}
-				else if (.@input < 0 || .@input > 50) {
+				if (.@input > 50) {
 					mes "[Item Exchange Helper]";
 					mes "Your request exceeds";
 					mes "the maximum limit. You";
@@ -4142,28 +4142,26 @@ turbo_room,93,117,5	script	Point Exchange Helper	4_M_TELEPORTER,{
 					mes "of 50 tickets at once.";
 					close;
 				}
-				else {
-					.@total_point = 10 * .@input;
-					if (.@total_point > tt_point) {
-						mes "[Item Exchange Helper]";
-						mes "I'm sorry, but you do";
-						mes "not have enough Turbo";
-						mes "Track Points. Please check";
-						mes "the amount of Turbo Track";
-						mes "Points you have earned before";
-						mes "redeeming your points again.";
-						close;
-					}
-					tt_point -= .@total_point;
-					getitem Warp_Free_Ticket,.@input;
+				.@total_point = 10 * .@input;
+				if (.@total_point > tt_point) {
 					mes "[Item Exchange Helper]";
-					mes "Thank you for";
-					mes "your patronage.";
-					mes "We hope you enjoy";
-					mes "your time here in";
-					mes "the Turbo Track~";
+					mes "I'm sorry, but you do";
+					mes "not have enough Turbo";
+					mes "Track Points. Please check";
+					mes "the amount of Turbo Track";
+					mes "Points you have earned before";
+					mes "redeeming your points again.";
 					close;
 				}
+				tt_point -= .@total_point;
+				getitem Warp_Free_Ticket,.@input;
+				mes "[Item Exchange Helper]";
+				mes "Thank you for";
+				mes "your patronage.";
+				mes "We hope you enjoy";
+				mes "your time here in";
+				mes "the Turbo Track~";
+				close;
 			case 2:
 				mes "[Item Exchange Helper]";
 				mes "Each Magic Scroll costs";
@@ -4214,15 +4212,15 @@ turbo_room,93,117,5	script	Point Exchange Helper	4_M_TELEPORTER,{
 				mes "you would like to receive.";
 				mes "To cancel, enter ''^3355FF0^000000.''";
 				next;
-				input .@input;
-				if (.@input == 0) {
+				input(.@input);
+				if (.@input <= 0) {
 					mes "[Item Exchange Helper]";
 					mes "You have";
 					mes "canceled";
 					mes "your request.";
 					close;
 				}
-				else if (.@input < 0 || .@input > 50) {
+				if (.@input > 50) {
 					mes "[Item Exchange Helper]";
 					mes "I'm sorry, but your";
 					mes "request has exceeded the";
@@ -4230,28 +4228,26 @@ turbo_room,93,117,5	script	Point Exchange Helper	4_M_TELEPORTER,{
 					mes "request up to 50 scrolls at once.";
 					close;
 				}
-				else {
-					.@total_point = 12 * .@input;
-					if (.@total_point > tt_point) {
-						mes "[Item Exchange Helper]";
-						mes "I'm sorry, but you do";
-						mes "not have enough Turbo";
-						mes "Track Points. Please check";
-						mes "the amount of Turbo Track";
-						mes "Points you have earned before";
-						mes "redeeming your points again.";
-						close;
-					}
-					tt_point -= .@total_point;
-					getitem .@scroll,.@input;
+				.@total_point = 12 * .@input;
+				if (.@total_point > tt_point) {
 					mes "[Item Exchange Helper]";
-					mes "Thank you for";
-					mes "your patronage.";
-					mes "We hope you enjoy";
-					mes "your time here in";
-					mes "the Turbo Track~";
+					mes "I'm sorry, but you do";
+					mes "not have enough Turbo";
+					mes "Track Points. Please check";
+					mes "the amount of Turbo Track";
+					mes "Points you have earned before";
+					mes "redeeming your points again.";
 					close;
 				}
+				tt_point -= .@total_point;
+				getitem .@scroll,.@input;
+				mes "[Item Exchange Helper]";
+				mes "Thank you for";
+				mes "your patronage.";
+				mes "We hope you enjoy";
+				mes "your time here in";
+				mes "the Turbo Track~";
+				close;
 			case 3:
 				mes "[Item Exchange Helper]";
 				mes "You can exchange";
@@ -4298,15 +4294,15 @@ turbo_room,93,117,5	script	Point Exchange Helper	4_M_TELEPORTER,{
 				mes "diamonds you would like to receive.";
 				mes "To cancel, enter ''^3355FF0^000000.''";
 				next;
-				input .@input;
-				if (.@input == 0) {
+				input(.@input);
+				if (.@input <= 0) {
 					mes "[Item Exchange Helper]";
 					mes "You have";
 					mes "canceled";
 					mes "your request.";
 					close;
 				}
-				else if (.@input < 0 || .@input > 10) {
+				if (.@input > 10) {
 					mes "[Item Exchange Helper]";
 					mes "Your request exceeds";
 					mes "the maximum limit. You";
@@ -4314,28 +4310,26 @@ turbo_room,93,117,5	script	Point Exchange Helper	4_M_TELEPORTER,{
 					mes "of 10 diamonds at once.";
 					close;
 				}
-				else {
-					.@total_point = 150 * .@input;
-					if (.@total_point > tt_point) {
-						mes "[Item Exchange Helper]";
-						mes "I'm sorry, but you do";
-						mes "not have enough Turbo";
-						mes "Track Points. Please check";
-						mes "the amount of Turbo Track";
-						mes "Points you have earned before";
-						mes "redeeming your points again.";
-						close;
-					}
-					tt_point -= .@total_point;
-					getitem Crystal_Jewel__,.@input;
+				.@total_point = 150 * .@input;
+				if (.@total_point > tt_point) {
 					mes "[Item Exchange Helper]";
-					mes "Thank you for";
-					mes "your patronage.";
-					mes "We hope you enjoy";
-					mes "your time here in";
-					mes "the Turbo Track~";
+					mes "I'm sorry, but you do";
+					mes "not have enough Turbo";
+					mes "Track Points. Please check";
+					mes "the amount of Turbo Track";
+					mes "Points you have earned before";
+					mes "redeeming your points again.";
 					close;
 				}
+				tt_point -= .@total_point;
+				getitem Crystal_Jewel__,.@input;
+				mes "[Item Exchange Helper]";
+				mes "Thank you for";
+				mes "your patronage.";
+				mes "We hope you enjoy";
+				mes "your time here in";
+				mes "the Turbo Track~";
+				close;
 			case 5:
 				mes "[Item Exchange Helper]";
 				mes "You can exchange";
@@ -4345,15 +4339,15 @@ turbo_room,93,117,5	script	Point Exchange Helper	4_M_TELEPORTER,{
 				mes "that you'd like to receive.";
 				mes "To cancel, enter ''^3355FF0^000000.''";
 				next;
-				input .@input;
-				if (.@input == 0) {
+				input(.@input);
+				if (.@input <= 0) {
 					mes "[Item Exchange Helper]";
 					mes "You have";
 					mes "canceled";
 					mes "your request.";
 					close;
 				}
-				else if (.@input < 0 || .@input > 10) {
+				if (.@input > 10) {
 					mes "[Item Exchange Helper]";
 					mes "Your request exceeds";
 					mes "the maximum limit. You";
@@ -4361,28 +4355,26 @@ turbo_room,93,117,5	script	Point Exchange Helper	4_M_TELEPORTER,{
 					mes "of 10 Gift Boxes at once.";
 					close;
 				}
-				else {
-					.@total_point = 300 * .@input;
-					if (.@total_point > tt_point) {
-						mes "[Item Exchange Helper]";
-						mes "I'm sorry, but you do";
-						mes "not have enough Turbo";
-						mes "Track Points. Please check";
-						mes "the amount of Turbo Track";
-						mes "Points you have earned before";
-						mes "redeeming your points again.";
-						close;
-					}
-					tt_point -= .@total_point;
-					getitem Gift_Box,.@input;
+				.@total_point = 300 * .@input;
+				if (.@total_point > tt_point) {
 					mes "[Item Exchange Helper]";
-					mes "Thank you for";
-					mes "your patronage.";
-					mes "We hope you enjoy";
-					mes "your time here in";
-					mes "the Turbo Track~";
+					mes "I'm sorry, but you do";
+					mes "not have enough Turbo";
+					mes "Track Points. Please check";
+					mes "the amount of Turbo Track";
+					mes "Points you have earned before";
+					mes "redeeming your points again.";
 					close;
 				}
+				tt_point -= .@total_point;
+				getitem Gift_Box,.@input;
+				mes "[Item Exchange Helper]";
+				mes "Thank you for";
+				mes "your patronage.";
+				mes "We hope you enjoy";
+				mes "your time here in";
+				mes "the Turbo Track~";
+				close;
 			case 6:
 				mes "[Item Exchange Helper]";
 				mes "You can exchange";
@@ -4392,15 +4384,15 @@ turbo_room,93,117,5	script	Point Exchange Helper	4_M_TELEPORTER,{
 				mes "that you'd like to receive.";
 				mes "To cancel, enter ''^3355FF0^000000.''";
 				next;
-				input .@input;
-				if (.@input == 0) {
+				input(.@input);
+				if (.@input <= 0) {
 					mes "[Item Exchange Helper]";
 					mes "You have";
 					mes "canceled";
 					mes "your request.";
 					close;
 				}
-				else if (.@input < 0 || .@input > 10) {
+				if (.@input > 10) {
 					mes "[Item Exchange Helper]";
 					mes "Your request exceeds";
 					mes "the maximum limit. You";
@@ -4408,28 +4400,26 @@ turbo_room,93,117,5	script	Point Exchange Helper	4_M_TELEPORTER,{
 					mes "of 10 potions at once.";
 					close;
 				}
-				else {
-					.@total_point = 400 * .@input;
-					if (.@total_point > tt_point) {
-						mes "[Item Exchange Helper]";
-						mes "I'm sorry, but you do";
-						mes "not have enough Turbo";
-						mes "Track Points. Please check";
-						mes "the amount of Turbo Track";
-						mes "Points you have earned before";
-						mes "redeeming your points again.";
-						close;
-					}
-					tt_point -= .@total_point;
-					getitem Speed_Up_Potion,.@input;
+				.@total_point = 400 * .@input;
+				if (.@total_point > tt_point) {
 					mes "[Item Exchange Helper]";
-					mes "Thank you for";
-					mes "your patronage.";
-					mes "We hope you enjoy";
-					mes "your time here in";
-					mes "the Turbo Track~";
+					mes "I'm sorry, but you do";
+					mes "not have enough Turbo";
+					mes "Track Points. Please check";
+					mes "the amount of Turbo Track";
+					mes "Points you have earned before";
+					mes "redeeming your points again.";
 					close;
 				}
+				tt_point -= .@total_point;
+				getitem Speed_Up_Potion,.@input;
+				mes "[Item Exchange Helper]";
+				mes "Thank you for";
+				mes "your patronage.";
+				mes "We hope you enjoy";
+				mes "your time here in";
+				mes "the Turbo Track~";
+				close;
 			case 7:
 				mes "[Item Exchange Helper]";
 				mes "This Item Exchange";
@@ -4506,59 +4496,57 @@ turbo_room,106,117,3	script	Point Manager#tt	4_M_ZONDAOYAJI,{
 			mes "Please enter the number of times you wish to convert 10 Arena Points into Turbo Track Points. The largest value you may enter";
 			mes "is 20. To cancel, enter '^3355FF0^000000.'";
 			next;
-			input .@input;
-			if (.@input == 0) {
+			input(.@input);
+			if (.@input <= 0) {
 				mes "[Turbo Track Point Manager]";
 				mes "You have";
 				mes "canceled";
 				mes "your request.";
 				close;
 			}
-			else if (.@input > 20) {
+			if (.@input > 20) {
 				mes "[Turbo Track Point Manager]";
 				mes "Your request exceeds";
 				mes "the maximum limit. Please";
 				mes "enter a value no greater than 20.";
 				close;
 			}
+			.@want_point1 = 10 * .@input;
+			.@want_point = 5 * .@input;
+			.@my_turbo_all = tt_point+.@want_point;
+			.@my_arena_all = arena_point-.@want_point1;
+			if (.@my_turbo_all > 28999) {
+				mes "[Turbo Track Point Manager]";
+				mes "Unfortunately, your Turbo Track Points will exceed the maximum limit if we proceed with point conversion. Please spend more";
+				mes "of your Turbo Track Points before using this service. Thank you.";
+				close;
+			}
+			if (.@my_arena_all < 0) {
+				mes "[Turbo Track Point Manager]";
+				mes "I am sorry, but you do";
+				mes "not have enough Arena Points";
+				mes "to perform this Turbo Track";
+				mes "Point conversion.";
+				close;
+			}
 			else {
-				.@want_point1 = 10 * .@input;
-				.@want_point = 5 * .@input;
-				.@my_turbo_all = tt_point+.@want_point;
-				.@my_arena_all = arena_point-.@want_point1;
-				if (.@my_turbo_all > 28999) {
-					mes "[Turbo Track Point Manager]";
-					mes "Unfortunately, your Turbo Track Points will exceed the maximum limit if we proceed with point conversion. Please spend more";
-					mes "of your Turbo Track Points before using this service. Thank you.";
-					close;
-				}
-				if (.@my_arena_all < 0) {
-					mes "[Turbo Track Point Manager]";
-					mes "I am sorry, but you do";
-					mes "not have enough Arena Points";
-					mes "to perform this Turbo Track";
-					mes "Point conversion.";
-					close;
-				}
-				else {
-					mes "[Turbo Track Point Manager]";
-					mes "You have converted";
-					mes "10 Arena Points into";
-					mes "Turbo Track Points " + .@input + " times.";
-					mes "A total of " + .@want_point1 + " Arena Points";
-					mes "has been converted into";
-					mes "" + .@want_point +" Turbo Track Points.";
-					arena_point = .@my_arena_all; //arena_point
-					tt_point = .@my_turbo_all;
-					next;
-					mes "[Turbo Track Point Manager]";
-					mes "" + strcharinfo(PC_NAME) + ",";
-					mes "you now have";
-					mes "^00688B" + tt_point + "^000000 Turbo Track Points";
-					mes "and ^4682B4" + arena_point + "^000000 Arena Points.";
-					mes "Thank you for your patronage.";
-					close;
-				}
+				mes "[Turbo Track Point Manager]";
+				mes "You have converted";
+				mes "10 Arena Points into";
+				mes "Turbo Track Points " + .@input + " times.";
+				mes "A total of " + .@want_point1 + " Arena Points";
+				mes "has been converted into";
+				mes "" + .@want_point +" Turbo Track Points.";
+				arena_point = .@my_arena_all; //arena_point
+				tt_point = .@my_turbo_all;
+				next;
+				mes "[Turbo Track Point Manager]";
+				mes "" + strcharinfo(PC_NAME) + ",";
+				mes "you now have";
+				mes "^00688B" + tt_point + "^000000 Turbo Track Points";
+				mes "and ^4682B4" + arena_point + "^000000 Arena Points.";
+				mes "Thank you for your patronage.";
+				close;
 			}
 		case 6:
 			mes "[Turbo Track Point Manager]";