Updated Umbala npcs, quests, and warps.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12403 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 19 insertions, 20 deletions

diff --git a/npc/warps/dungeons/um_dun.txt b/npc/warps/dungeons/um_dun.txt
index e786b7a0e..816f57265 100644
--- a/npc/warps/dungeons/um_dun.txt
+++ b/npc/warps/dungeons/um_dun.txt
@@ -3,31 +3,30 @@
 //===== By: ==================================================
 //= Darkchild (1.0vA); Athena (1.0vB)
 //===== Current Version: =====================================
-//= 1.2 (Akaru)
+//= 1.3 (Akaru)
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
+//= [Aegis Conversion]
 //= Warp Points for Umbala Dungeon (Yggdrasil Cave)
 //===== Additional Comments: =================================
 //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-//= Dungeon Level 1 ==========================================
-umbala,106,286,0	warp	umba0011	1,1,um_dun01,42,31
-um_dun01,150,198,0	warp	umba0013	1,1,um_dun02,48,30
-um_dun01,42,26,0	warp	umba0012	1,1,umbala,111,283
-
-//= Dungeon Level 2 ==========================================
-um_dun02,103,208,0	warp	umba0020	1,1,um_dun02,116,208
-um_dun02,113,208,0	warp	umba0019	1,1,um_dun02,100,208
-um_dun02,169,38,0	warp	umba0025	1,1,um_dun02,180,38
-um_dun02,177,38,0	warp	umba0026	1,1,um_dun02,166,38
-um_dun02,216,77,0	warp	umba0018	1,1,um_dun02,217,88
-um_dun02,216,84,0	warp	umba0017	1,1,um_dun02,214,74
-um_dun02,222,259,0	warp	umba0015	1,1,um_dun02,234,255
-um_dun02,231,255,0	warp	umba0016	1,1,um_dun02,219,260
-um_dun02,25,244,0	warp	umba0022a	1,1,um_dun02,35,251
-um_dun02,33,249,0	warp	umba0021	1,1,um_dun02,23,242
-um_dun02,51,26,0	warp	umba0022b	1,1,um_dun01,153,201 
-um_dun02,60,88,0	warp	umba0023	1,1,um_dun02,66,77
-um_dun02,63,80,0	warp	umba0024	1,1,um_dun02,59,92
+umbala,106,285,0	warp	um_dun1-1	1,1,um_dun01,42,30
+um_dun01,42,27,0	warp	um_dun1-2	1,1,umbala,109,284
+um_dun01,149,198,0	warp	um_dun2-1	1,1,um_dun02,52,22
+um_dun02,55,19,0	warp	um_dun2-2	1,1,um_dun01,152,198
+um_dun02,60,89,0	warp	um_dun3-1	1,1,um_dun02,215,74
+um_dun02,215,77,0	warp	um_dun3-2	1,1,um_dun02,60,92
+um_dun02,64,79,0	warp	um_dun4-1	1,1,um_dun02,219,261
+um_dun02,222,259,0	warp	um_dun4-2	1,1,um_dun02,67,77
+um_dun02,26,244,0	warp	um_dun5-1	1,1,um_dun02,233,253
+um_dun02,231,255,0	warp	um_dun5-2	1,1,um_dun02,25,241
+um_dun02,103,208,0	warp	um_dun6-1	1,1,um_dun02,180,38
+um_dun02,177,38,0	warp	um_dun6-2	1,1,um_dun02,100,208
+um_dun02,32,249,0	warp	um_dun7-1	1,1,um_dun02,117,208
+um_dun02,113,208,0	warp	um_dun7-2	1,1,um_dun02,35,252
+um_dun02,215,85,0	warp	um_dun8-1	1,1,um_dun02,166,38
+um_dun02,169,38,0	warp	um_dun8-2	1,1,um_dun02,215,88