Make sure no script just ends

7 files changed, 19 insertions, 1 deletions

diff --git a/npc/021-1_Tulimshar/_warps.txt b/npc/021-1_Tulimshar/_warps.txt
index ac940f69..ccd01723 100644
--- a/npc/021-1_Tulimshar/_warps.txt
+++ b/npc/021-1_Tulimshar/_warps.txt
@@ -2,3 +2,6 @@
 
 021-1.gat,55,146	warp	toBazaar	3,-1,001-1.gat,44,20
 021-1.gat,136,146	warp	toSouthTulimshar	0,-1,001-1.gat,124,21
+021-1.gat,53,134	warp	toBuilding	-1,-1,021-2.gat,27,29
+021-1.gat,55,134	warp	toBuilding	-1,-1,021-2.gat,33,29
+021-1.gat,57,134	warp	toBuilding	-1,-1,021-2.gat,39,29
diff --git a/npc/021-1_Tulimshar/bakery.txt b/npc/021-1_Tulimshar/bakery.txt
index af0e8d87..aff3cc5e 100644
--- a/npc/021-1_Tulimshar/bakery.txt
+++ b/npc/021-1_Tulimshar/bakery.txt
@@ -7,4 +7,5 @@
 	mes "\"This bakery is the best!\"";
 	mes "";
 	mes "\"Too bad they haven't fully opened yet.\"";
+	close;
 }
diff --git a/npc/021-1_Tulimshar/gate_guards.txt b/npc/021-1_Tulimshar/gate_guards.txt
index fcc55c87..1a090c5f 100644
--- a/npc/021-1_Tulimshar/gate_guards.txt
+++ b/npc/021-1_Tulimshar/gate_guards.txt
@@ -4,32 +4,38 @@
 021-1.gat,70,23,0	script	Guard	104,{
 	mes "[Guard]";
 	mes "\"Lot's of stuff happens in the port district. Those sailors can get quite roudy.\"";
+	close;
 }
 
 021-1.gat,110,23,0	script	Guard	104,{
 	mes "[Guard]";
 	mes "\"I'm not quite sure why I'm here, since that bridge is out.\"";
+	close;
 }
 
 // Guard near the magic school
 021-1.gat,46,65,0	script	Guard	104,{
 	mes "[Guard]";
 	mes "\"I'm just here to provide a presence for the guards at this gate. The mages here can defend themselves without problem.\"";
+	close;
 }
 
 // Guards by the gates to East Tulimshar
 021-1.gat,156,42,0	script	Guard	104,{
 	mes "[Guard]";
 	mes "\"It's still a mess in East Tulimshar. The volcano and earthquake did a lot of damage.\"";
+	close;
 }
 
 021-1.gat,156,95,0	script	Guard	104,{
 	mes "[Guard]";
 	mes "\"It can get quite dangerous east of town. But for now, the passage is closed.\"";
+	close;
 }
 
 // Near the bazaar, outside the government building
 021-1.gat,58,135,0	script	Guard	123,{
 	mes "[Guard]";
 	mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\"";
+	close;
 }
diff --git a/npc/021-1_Tulimshar/inac.txt b/npc/021-1_Tulimshar/inac.txt
index 3160ad9b..15f9eca3 100644
--- a/npc/021-1_Tulimshar/inac.txt
+++ b/npc/021-1_Tulimshar/inac.txt
@@ -9,5 +9,5 @@
 	next;
 	mes "[Inac]";
 	mes "\"They also say monsters have moved into the underground tunnels that bring and distribute water.\"";
-	next;
+	close;
 }
diff --git a/npc/021-1_Tulimshar/magic_school.txt b/npc/021-1_Tulimshar/magic_school.txt
index 54c49d56..1bbf0734 100644
--- a/npc/021-1_Tulimshar/magic_school.txt
+++ b/npc/021-1_Tulimshar/magic_school.txt
@@ -3,14 +3,17 @@
 021-1.gat,45,54,0	script	Tinris	160,{
 	mes "[Tinris]";
 	mes "\"This is a magic school.\"";
+	close;
 }
 
 021-1.gat,46,41,0	script	Tondar	168,{
 	mes "[Tondar]";
 	mes "\"We're not accepting any new students right now.\"";
+	close;
 }
 
 021-1.gat,32,46,0	script	Ched	113,{
 	mes "[Ched]";
 	mes "\"I'm a student here.\"";
+	close;
 }
diff --git a/npc/021-1_Tulimshar/north_shops.txt b/npc/021-1_Tulimshar/north_shops.txt
index 9d409616..cf2dbbe2 100644
--- a/npc/021-1_Tulimshar/north_shops.txt
+++ b/npc/021-1_Tulimshar/north_shops.txt
@@ -12,6 +12,7 @@
 021-1.gat,138,29,0	script	Latoy	106,{
 	mes "[Latoy]";
 	mes "\"There's nothing here you could want or afford.\"";
+	close;
 }
 
 // A barber (later we can make it so certain styles need to come from him, for a price)
@@ -29,10 +30,12 @@
 021-1.gat,122,32,0	script	Hydusun	149,{
 	set @npcName$, "Hydusun";
 	callfunc "Banker";
+	close;
 }
 
 // An officer (for security)
 021-1.gat,130,38,0	script	Officer	150,{
 	mes "[Officer]";
 	mes "I'm here for extra secutiry for this market.";
+	close;
 }
diff --git a/npc/021-1_Tulimshar/royal_guards.txt b/npc/021-1_Tulimshar/royal_guards.txt
index b24b0076..02996184 100644
--- a/npc/021-1_Tulimshar/royal_guards.txt
+++ b/npc/021-1_Tulimshar/royal_guards.txt
@@ -3,9 +3,11 @@
 021-1.gat,141,23,0	script	Guard	126,{
 	mes "[Guard]";
 	mes "\"Stay away.\"";
+	close;
 }
 
 021-1.gat,147,23,0	script	Guard	126,{
 	mes "[Guard]";
 	mes "\"Stay away.\"";
+	close;
 }