5 files changed, 21 insertions, 21 deletions
diff --git a/npc/021-1_Tulimshar/_import.txt b/npc/021-1_Tulimshar/_import.txt
index e6939894..c64daf4b 100644
--- a/npc/021-1_Tulimshar/_import.txt
+++ b/npc/021-1_Tulimshar/_import.txt
@@ -5,7 +5,7 @@ npc: npc/021-1_Tulimshar/bakery.txt
 npc: npc/021-1_Tulimshar/eurni.txt
 npc: npc/021-1_Tulimshar/gate_guards.txt
 npc: npc/021-1_Tulimshar/inac.txt
-npc: npc/021-1_Tulimshar/magic_school.txt
 npc: npc/021-1_Tulimshar/north_shops.txt
 npc: npc/021-1_Tulimshar/royal_guards.txt
+npc: npc/021-1_Tulimshar/weellos.txt
 npc: npc/021-1_Tulimshar/workers.txt
diff --git a/npc/021-1_Tulimshar/_mobs.txt b/npc/021-1_Tulimshar/_mobs.txt
index 4a7227f6..b9f4b10d 100644
--- a/npc/021-1_Tulimshar/_mobs.txt
+++ b/npc/021-1_Tulimshar/_mobs.txt
@@ -4,7 +4,6 @@
 021-1.gat,90,65,3,2	monster	Maggot	1002,2,0,0,Mob021-1::On1002
 021-1.gat,95,124,3,2	monster	Maggot	1002,2,0,0,Mob021-1::On1002
 021-1.gat,103,53,6,2	monster	Maggot	1002,5,0,0,Mob021-1::On1002
-021-1.gat,44,54,6,8	monster	Maggot	1002,7,0,0,Mob021-1::On1002
 021-1.gat,98,24,2,2	monster	Sea Slime	1033,1,150000,100000,Mob021-1::On1033
 
 
diff --git a/npc/021-1_Tulimshar/_warps.txt b/npc/021-1_Tulimshar/_warps.txt
index ccd01723..160955ec 100644
--- a/npc/021-1_Tulimshar/_warps.txt
+++ b/npc/021-1_Tulimshar/_warps.txt
@@ -5,3 +5,8 @@
 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
+021-1.gat,103,100	warp	toBakery	-1,-1,021-2.gat,91,27
+021-1.gat,103,96	warp	toBakery	-1,-1,021-2.gat,122,23
+021-1.gat,49,63	warp	toMagicSchool	3,-1,024-1.gat,86,72
+021-1.gat,53,99	warp	toTaylor	-1,-1,021-2.gat,25,66
+021-1.gat,52,95	warp	toTaylor	-1,-1,021-2.gat,23,98
diff --git a/npc/021-1_Tulimshar/magic_school.txt b/npc/021-1_Tulimshar/magic_school.txt
deleted file mode 100644
index 1bbf0734..00000000
--- a/npc/021-1_Tulimshar/magic_school.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-// Tulimshar's magic academy
-
-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/weellos.txt b/npc/021-1_Tulimshar/weellos.txt
new file mode 100644
index 00000000..06bb8f17
--- /dev/null
+++ b/npc/021-1_Tulimshar/weellos.txt
@@ -0,0 +1,15 @@
+// A historian
+
+021-1.gat,130,125,0	script	Weellos	103,{
+	if isin("021-1.gat", 130, 120, 140, 125) goto L_In;
+
+        mes "[Weellos]";
+	mes "\"This is a very historic building. One of the oldest in the area.\"";
+	close;
+
+// If the player is inside the fence with Weellos
+L_In:
+        mes "[Weellos]";
+	mes "\"What did you think of the historic building?\"";
+	close;
+}