Tonori Canyon.

3 files changed, 61 insertions, 37 deletions

diff --git a/npc/004-2/_mobs.txt b/npc/004-2/_mobs.txt
index 150fa1a89..0723d3111 100644
--- a/npc/004-2/_mobs.txt
+++ b/npc/004-2/_mobs.txt
@@ -1,12 +1,17 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-2: Desert Mountains mobs
-004-2,36,40,15,21	monster	Maggot	1030,8,35000,150000
-004-2,73,77,13,4	monster	Maggot	1030,7,35000,150000
-004-2,100,55,14,14	monster	Maggot	1030,7,35000,150000
-004-2,108,39,17,4	monster	Scorpion	1071,3,35000,150000
-004-2,51,40,10,22	monster	Scorpion	1071,6,35000,150000
-004-2,102,55,4,4	monster	Mister Prickel	1436,1,35000,35000
-004-2,108,97,4,4	monster	Snake	1122,2,35000,150000
-004-2,77,51,9,4	monster	Old Snake	1199,1,35000,75000
-004-2,67,63,14,11	monster	Scorpion	1071,6,35000,80000
-004-2,82,50,27,29	monster	Desert Log Head	1127,5,35000,50000
+004-2,0,0,0,0	monster	Maggot	1030,100,35000,150000
+004-2,118,37,17,15	monster	Scorpion	1071,14,35000,150000
+004-2,61,43,10,22	monster	Scorpion	1071,6,35000,150000
+004-2,111,58,4,4	monster	Mister Prickel	1436,1,35000,35000
+004-2,118,100,4,4	monster	Snake	1122,3,35000,150000
+004-2,87,54,9,4	monster	Snake	1199,1,35000,150000
+004-2,77,66,14,11	monster	Scorpion	1071,8,35000,150000
+004-2,94,56,42,32	monster	Desert Log Head	1127,30,35000,150000
+004-2,56,98,1,1	monster	Duck	1029,1,35000,150000
+004-2,71,100,28,10	monster	Red Scorpion	1072,10,35000,150000
+004-2,146,28,3,2	monster	Yellow Slime	1091,1,35000,150000
+004-2,143,47,6,18	monster	Scorpion	1071,9,35000,150000
+004-2,140,57,9,8	monster	Snake	1122,2,35000,150000
+004-2,142,96,3,5	monster	Mountain Snake	1123,1,35000,300000
+004-2,131,75,17,9	monster	Snake	1122,4,35000,150000
diff --git a/npc/004-2/_warps.txt b/npc/004-2/_warps.txt
index 3fc6454e3..b368afbdb 100644
--- a/npc/004-2/_warps.txt
+++ b/npc/004-2/_warps.txt
@@ -1,7 +1,43 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-2: Desert Mountains warps
-004-2,20,48,0	warp	#004-2_20_48	0,2,004-1,119,95
-004-2,100,89,0	warp	#004-2_100_89	0,0,004-2-1,78,72
-004-2,116,34,0	warp	#004-2_116_34	0,0,004-2-1,51,27
-004-2,98,34,0	warp	#004-2_98_34	0,0,010-1-1,142,119
-004-2,72,69,0	warp	#004-2_72_69	1,0,010-2,97,123
+004-2,117,54,0	warp	#004-2_117_54	0,0,004-2-1,38,42
+004-2,116,27,0	warp	#004-2_116_27	0,0,004-2-1,87,22
+004-2,30,51,0	warp	#004-2_30_51	0,2,004-1,125,95
+004-2,121,27,0	warp	#004-2_121_27	0,0,004-2-2,36,77
+004-2,94,80,0	warp	#004-2_94_80	0,0,004-2-3,87,95
+004-2,147,60,0	warp	#004-2_147_60	0,0,004-2-3,123,77
+004-2,132,56,0	warp	#004-2_132_56	0,0,004-2-4,121,79
+004-2,144,25,0	warp	#004-2_144_25	0,0,010-4-2,87,41
+004-2,144,52,0	warp	#004-2_144_52	0,0,004-2-3,135,114
+004-2,90,61,0	warp	#004-2_90_61	0,0,004-2-3,58,126
+004-2,113,120,0	warp	#004-2_113_120	0,0,004-3-2,83,63
+004-2,86,116,0	warp	#004-2_86_116	0,0,004-3-2,59,54
+004-2,60,126,0	warp	#004-2_60_126	0,0,004-3-1,68,32
+004-2,53,103,0	warp	#004-2_53_103	0,0,004-3-1,70,24
+004-2,53,88,0	warp	#004-2_53_88	0,0,004-3,53,41
+004-2,63,88,0	warp	#004-2_63_88	0,0,004-3,63,41
+004-2,81,93,0	warp	#004-2_81_93	0,0,004-3-2,44,37
+004-2,73,89,0	warp	#004-2_73_89	0,0,010-2-8,37,21
+004-2,68,124,0	warp	#004-2_68_124	0,0,010-2-8,32,62
+004-2,51,111,0	warp	#004-2_51_111	0,0,004-2-12,52,34
+004-2,48,59,0	warp	#004-2_48_59	0,0,007-1-1,56,35
+004-2,110,92,0	warp	#004-2_110_92	0,0,004-2-6,34,22
+004-2,119,107,0	warp	#004-2_119_107	0,0,004-3-2,95,51
+004-2,145,103,0	warp	#004-2_145_103	0,0,004-2-6,84,43
+004-2,122,66,0	warp	#004-2_122_66	0,0,004-2-3,102,115
+004-2,85,30,0	warp	#004-2_85_30	0,0,004-2-3,97,47
+004-2,74,20,0	warp	#004-2_74_20	0,0,004-2-3,69,61
+004-2,108,37,0	warp	#004-2_108_37	0,0,004-2-3,108,67
+004-2,126,37,0	warp	#004-2_126_37	0,0,004-2-3,135,65
+004-2,118,49,0	warp	#004-2_118_49	0,0,004-2-3,114,43
+004-2,107,47,0	warp	#004-2_107_47	0,0,004-2-3,87,43
+004-2,128,49,0	warp	#004-2_128_49	0,0,004-2-3,124,48
+004-2,142,77,0	warp	#004-2_142_77	0,0,004-2-1,87,69
+004-2,146,85,0	warp	#004-2_146_85	0,0,004-2-5,53,47
+004-2,141,113,0	warp	#004-2_141_113	0,0,004-2-8,39,74
+004-2,81,71,0	warp	#004-2_81_71	0,0,004-2-1,33,63
+004-2,85,49,0	warp	#004-2_85_49	0,0,007-1-2,50,53
+004-2,92,33,0	warp	#004-2_92_33	0,0,007-1-2,56,27
+004-2,139,31,0	warp	#004-2_139_31	0,0,004-2-4,135,70
+004-2,45,98,0	warp	#004-2_45_98	0,0,004-3-6,45,58
+004-2,104,93,0	warp	#004-2_104_93	0,0,004-3-2,74,41
diff --git a/npc/004-2/bug.txt b/npc/004-2/bug.txt
index a7d0a16e9..4c100bf87 100644
--- a/npc/004-2/bug.txt
+++ b/npc/004-2/bug.txt
@@ -4,9 +4,11 @@
 // Description:
 //    Error Handler
 
-004-2,54,63,0	script	Sign#ErrorHandler0041	NPC_SWORDS_SIGN,{
-    mesc l("WARNING: Desert Canyon locked down due major bugs"), 1;
-    mesc l("Please use the alternative route provided by the Alliance High Council"), 1;
+004-2,64,63,0	script	Sign#HalinRoute	NPC_SWORDS_SIGN,{
+    mesc "← "+l("Tulimshar");
+    mesc "→ "+l("Canyon - Safe Route");
+    mesc "↓ "+l("Canyon - Dangerous Route");
+    close;
     close;
 
 OnInit:
@@ -15,22 +17,3 @@ OnInit:
     end;
 }
 
-
-004-2,84,77,0	script	Sign#ErrorHandler0042	NPC_SWORDS_SIGN,{
-    mesc l("WARNING: This path has been locked down due to major bugs"), 1;
-    mesc l("You may be trapped forever inside the desert maze beyond help"), 1;
-    mesc l("shall you decide to disregard this warning."), 1;
-    mes "";
-    mesc l("Do not attempt to use the normal route without a %s with you.", getitemlink(TimeFlask)), 1;
-    next;
-    mesc l("Use the normal route?");
-    if (askyesno() == ASK_YES)
-        warp "004-2-1", 26, 87;
-    closeclientdialog;
-    close;
-
-OnInit:
-    .sex = G_OTHER;
-    .distance = 2;
-    end;
-}