Fixing strange bug when using "npcName" as a name for a temporary variable

11 files changed, 24 insertions, 24 deletions

diff --git a/npc/001-1_Tulimshar/banker.txt b/npc/001-1_Tulimshar/banker.txt
index 965825ea..445b0ebf 100644
--- a/npc/001-1_Tulimshar/banker.txt
+++ b/npc/001-1_Tulimshar/banker.txt
@@ -2,7 +2,7 @@
 
 001-1.gat,57,52,0	script	Tybalt	107,{
 	callfunc "ClearVariables";
-	set @npcName$, "Tybalt";
+	set @npcname$, "Tybalt";
 	callfunc "Banker";
 	close;
 }
diff --git a/npc/001-1_Tulimshar/constable.txt b/npc/001-1_Tulimshar/constable.txt
index f6423d5a..6131f0b4 100644
--- a/npc/001-1_Tulimshar/constable.txt
+++ b/npc/001-1_Tulimshar/constable.txt
@@ -1,7 +1,7 @@
 //
 
 001-1.gat,37,35,0	script	Constable Perry Graf	150,{
-//	set @npcName$, "Constable Perry Graf";
+//	set @npcname$, "Constable Perry Graf";
 	set @canSkip, 1;
 	callfunc "GameRules";
 	close;
diff --git a/npc/001-2_Tulimshar/shops.txt b/npc/001-2_Tulimshar/shops.txt
index e607dd97..c70ad113 100644
--- a/npc/001-2_Tulimshar/shops.txt
+++ b/npc/001-2_Tulimshar/shops.txt
@@ -3,7 +3,7 @@
 001-2.gat,26,26,0	shop	InnKeeper	112,539:175,513:20,519
 
 001-2.gat,103,26,0	script	Rebecca	118,{
-	set @npcName$, "Rebecca the Inn Keeper";
+	set @npcname$, "Rebecca the Inn Keeper";
 	set @cost, 100;
 	callfunc "Inn";
 	close;
diff --git a/npc/009-2_Hurnscald/richard.txt b/npc/009-2_Hurnscald/richard.txt
index e14b823a..023f1244 100644
--- a/npc/009-2_Hurnscald/richard.txt
+++ b/npc/009-2_Hurnscald/richard.txt
@@ -2,7 +2,7 @@
 
 009-2.gat,20,99,0	script	Richard	161,{
 	callfunc "ClearVariables";
-	set @npcName$, "Richard";
+	set @npcname$, "Richard";
 	callfunc "Banker";
 	close;
 }
diff --git a/npc/009-2_Hurnscald/shops.txt b/npc/009-2_Hurnscald/shops.txt
index df100d36..733fa54f 100644
--- a/npc/009-2_Hurnscald/shops.txt
+++ b/npc/009-2_Hurnscald/shops.txt
@@ -11,7 +11,7 @@
 // Receptionist
 // Offers the player to rest at the inn for 100gp
 009-2.gat,50,48,0	script	Receptionist	108,{
-	set @npcName$, "Receptionist";
+	set @npcname$, "Receptionist";
 	set @cost, 100;
 	callfunc "Inn";
 }
diff --git a/npc/010-2_Dimonds_Cove/dimonds.txt b/npc/010-2_Dimonds_Cove/dimonds.txt
index c79a58e7..c1578d55 100644
--- a/npc/010-2_Dimonds_Cove/dimonds.txt
+++ b/npc/010-2_Dimonds_Cove/dimonds.txt
@@ -541,7 +541,7 @@ leave:
 010-2.gat,65,41,0	shop	General Store	137,586:1000,524:1600,544:10000,632:10000,528:1000,735:-1
 
 010-2.gat,75,68,0	script	Basil	107,{
-	set @npcName$, "[Basil the Inn Keeper]";
+	set @npcname$, "Basil the Inn Keeper";
 	set @cost, 200;
 	callfunc "Inn";
 }
diff --git a/npc/020-2_Nivalis/shops.txt b/npc/020-2_Nivalis/shops.txt
index 7132870c..b470d231 100644
--- a/npc/020-2_Nivalis/shops.txt
+++ b/npc/020-2_Nivalis/shops.txt
@@ -9,10 +9,10 @@
 
 // INN
 020-2.gat,111,23,0	script	Kane	120,{
-	set @npcName$, "Kane the Inn Keeper";
+	set @npcname$, "Kane the Inn Keeper";
 	set @cost, 100;
 
-	mes "[" + @npcName$ + "]";
+	mes "[" + @npcname$ + "]";
 	mes "\"Welcome stranger!\"";
 	mes "\"What? You've already seen an INN like mine?\"";
 	mes "\"That's impossible!\"";
diff --git a/npc/021-1_Tulimshar/north_shops.txt b/npc/021-1_Tulimshar/north_shops.txt
index 83d25145..4fc3c481 100644
--- a/npc/021-1_Tulimshar/north_shops.txt
+++ b/npc/021-1_Tulimshar/north_shops.txt
@@ -28,7 +28,7 @@
 
 // Another banker
 021-1.gat,122,32,0	script	Hydusun	149,{
-	set @npcName$, "Hydusun";
+	set @npcname$, "Hydusun";
 	callfunc "Banker";
 	close;
 }
diff --git a/npc/027-2_Caretakers_House/gy_inn_shops.txt b/npc/027-2_Caretakers_House/gy_inn_shops.txt
index 5b0d2d1f..1936bd59 100755
--- a/npc/027-2_Caretakers_House/gy_inn_shops.txt
+++ b/npc/027-2_Caretakers_House/gy_inn_shops.txt
@@ -15,10 +15,10 @@
 
 // Inn
 027-2.gat,107,39,0	script	Barbara Grey	320,{
-	set @npcName$, "Barbara Grey";
+	set @npcname$, "Barbara Grey";
 	set @cost, 1000;
 
-	mes "[" + @npcName$ + "]";
+	mes "[" + @npcname$ + "]";
 	mes "\"Don't be shy darling.";
 	mes "\"Come on in and have a nice long ... long slumber ...";
 	next;
@@ -28,7 +28,7 @@
 // Bank and Storage
 027-2.gat,88,22,0	script	J.P. Morbid	321,{
 	callfunc "ClearVariables";
-	set @npcName$, "J.P. Morbid";
+	set @npcname$, "J.P. Morbid";
 	callfunc "Banker";
 	close;
 }
diff --git a/npc/functions/banker.txt b/npc/functions/banker.txt
index 2f738478..00f033c9 100644
--- a/npc/functions/banker.txt
+++ b/npc/functions/banker.txt
@@ -4,7 +4,7 @@ function	script	Banker	{
 	if (BankAccount > 0) callsub S_MoveAccount;
 
 L_Start:
-	mes "[" + @npcName$ + "]";
+	mes "[" + @npcname$ + "]";
 	mes "\"Welcome to the bank!";
 	mes "How can I help you?\"";
 	next;
@@ -23,7 +23,7 @@ L_Storage:
 	goto L_Start;
 
 L_Dep:
-	mes "[" + @npcName$ + "]";
+	mes "[" + @npcname$ + "]";
 	mes "\"How much would you like to deposit?\"";
 	next;
 	menu
@@ -44,7 +44,7 @@ L_Dep:
 L_Dep_Input:
 	input @Amount;
 	if (@Amount >= 0) goto L_Dep_Continue;
-	mes "[" + @npcName$ + "]";
+	mes "[" + @npcname$ + "]";
 	mes "\"I need a positive amount. What would you like to do?\"";
 	menu
 		"Go back", L_Start,
@@ -104,7 +104,7 @@ L_Dep_Continue:
 	goto L_Balance;
 	
 L_With:
-	mes "[" + @npcName$ + "]";
+	mes "[" + @npcname$ + "]";
 	mes "\"How much would you like to withdraw?\"";
 	menu
 		"Other", L_With_Input,
@@ -124,7 +124,7 @@ L_With:
 L_With_Input:
 	input @Amount;
 	if (@Amount >= 0) goto L_With_Continue;
-	mes "[" + @npcName$ + "]";
+	mes "[" + @npcname$ + "]";
 	mes "\"I need a positive amount. What would you like to do?\"";
 	menu
 		"Go back", L_Start,
@@ -184,18 +184,18 @@ L_With_Continue:
 	goto L_Balance;
 	
 L_Balance:
-	mes "[" + @npcName$ + "]";
+	mes "[" + @npcname$ + "]";
 	mes "\"Your current bank balance is:";
 	mes #BankAccount + " GP\"";
 	goto L_Start;
 	
 L_Nev:
-	mes "[" + @npcName$ + "]";
+	mes "[" + @npcname$ + "]";
 	mes "\"Goodbye then.\"";
 	return;
 	
 L_NoMoney:
-	mes "[" + @npcName$ + "]";
+	mes "[" + @npcname$ + "]";
 	mes "\"Oh dear, it seems that you don't have enough money.\"";
 	goto L_Start;
 	
diff --git a/npc/functions/inn.txt b/npc/functions/inn.txt
index 00366cb2..810dbd1d 100644
--- a/npc/functions/inn.txt
+++ b/npc/functions/inn.txt
@@ -1,7 +1,7 @@
 // INN
 
 function	script	Inn	{
-	mes "[" + @npcName$ + "]";
+	mes "[" + @npcname$ + "]";
 	mes "\"Would you like to rest? It's only " + @cost + " gp.\"";
 	next;
 	
@@ -13,17 +13,17 @@ function	script	Inn	{
 	set zeny, zeny - @cost;
 	heal 10000, 10000;
 
-	mes "[" + @npcName$ + "]";
+	mes "[" + @npcname$ + "]";
 	mes "\"Sleep well!\"";
 	close;
 	
 L_No:
-	mes "[" + @npcName$ + "]";
+	mes "[" + @npcname$ + "]";
 	mes "\"See you.\"";
 	close;
 	
 L_NoMoney:
-	mes "[" + @npcName$ + "]";
+	mes "[" + @npcname$ + "]";
 	mes "\"You don't have enough money to stay here.\"";
 	close;
 }