Updated Umbala npcs, quests, and warps.

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

3 files changed, 60 insertions, 72 deletions

diff --git a/npc/warps/cities/umbala.txt b/npc/warps/cities/umbala.txt
index e166387e2..bc03774a2 100644
--- a/npc/warps/cities/umbala.txt
+++ b/npc/warps/cities/umbala.txt
@@ -10,36 +10,29 @@
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
+//= [Aegis COnversion]
 //= Warp Points for Umbala
 //===== Additional Comments: =================================
-//= No Comment
+//= 1.3 Rescripted to Aegis 10.3 Standards. [L0nE_W0lf]
 //============================================================
 
-//Witch House
-//Entrance via the Skeleton Gate Quest
-//umbala,220,190,0	warp	umba0027	1,1,um_in,32,70
-um_in,28,70,0	warp	umba0028	1,1,umbala,217,187
-
-//Weapons
-umbala,125,157,0	warp	umba0029	1,1,um_in,155,114
-um_in,155,110,0	warp	umba0030	1,1,umbala,126,152
-
-//Fan Shack
-umbala,138,129,0	warp	umba0031	1,1,um_in,99,114
-um_in,99,110,0	warp	umba0032	1,1,umbala,136,127
-
-//Lower Double Shack 
-umbala,95,186,0	warp	umba0033	1,1,um_in,142,42
-um_in,141,39,0	warp	umba0034	1,1,umbala,95,183
-
-//Upper Double Shack 
-umbala,100,202,0	warp	umba0035	1,1,um_in,163,70
-um_in,166,70,0	warp	umba0036	1,1,umbala,102,204
-
-//Small Shack 
-umbala,156,249,0	warp	umba0037	1,1,um_in,99,67
-um_in,99,63,0	warp	umba0038	1,1,umbala,160,247
-
-//Large Shack 
-umbala,108,164,0	warp	umba0039	1,1,um_in,38,112
-um_in,38,110,0	warp	umba0040	1,1,umbala,104,163
+umbala,68,253,0	warp	um_chief1-1	1,1,um_in,38,113
+um_in,38,110,0	warp	um_chief1-2	1,1,umbala,66,250
+umbala,138,129,0	warp	um_tool1-1	1,1,um_in,99,114
+um_in,99,111,0	warp	um_tool1-2	1,1,umbala,136,127
+umbala,125,157,0	warp	um_weapon1-1	1,1,um_in,155,114
+um_in,155,111,0	warp	um_weapon1-2	1,1,umbala,126,154
+umbala,94,186,0	warp	um_houseA1-1	1,1,um_in,141,42
+um_in,141,39,0	warp	um_houseA1-2	1,1,umbala,94,183
+umbala,100,203,0	warp	um_houseA2-1	1,1,um_in,163,69
+um_in,166,69,0	warp	um_houseA2-2	1,1,umbala,102,205
+umbala,107,130,0	warp	um_houseB1-1	1,1,um_in,99,66
+um_in,99,63,0	warp	um_houseB1-2	1,1,umbala,108,127
+umbala,220,189,0	script	um_shaman1-1	45,1,1,{
+OnTouch:
+	if (event_umbala == 7) {
+		warp "um_in",32,71;
+	}
+	end;
+}
+um_in,29,71,0	warp	um_shaman2-1	1,1,umbala,217,186
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
diff --git a/npc/warps/fields/umbala_fild.txt b/npc/warps/fields/umbala_fild.txt
index 95e9f2669..519828dc9 100644
--- a/npc/warps/fields/umbala_fild.txt
+++ b/npc/warps/fields/umbala_fild.txt
@@ -3,33 +3,29 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
+//= [Aegis Conversion]
 //= Warp Points for Umbala Field
 //===== Additional Comments: =================================
-//= No Comment
+//= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
 //============================================================
 
-//Umbala-Umbala Fields Connection
-um_fild04,215,340,0	warp	umba0055	1,1,umbala,130,80
-umbala,129,78,0	warp	umba0001	1,1,um_fild04,215,337
-
-//Umbala-Comodo Connection
-beach_dun2,258,244,0	warp	umba0052	1,1,um_fild01,35,276
-cmd_fild01,179,370,0	warp	umba0041	1,1,um_fild03,239,27
-cmd_fild01,78,367,0	warp	umba0043	1,1,um_fild03,117,51
-um_fild01,30,274,0	warp	umba0051	1,1,beach_dun2,255,244
-um_fild03,119,50,0	warp	umba0044	1,1,cmd_fild01,78,365
-um_fild03,239,25,0	warp	umba0042	1,1,cmd_fild01,179,368
-
-//Umbala Fields
-um_fild01,368,275,0	warp	umba0010	1,1,um_fild02,24,271
-um_fild02,191,374,0	warp	umba0053	1,1,um_fild04,179,13
-um_fild02,21,270,0	warp	umba0009	1,1,um_fild01,365,275
-um_fild02,374,149,0	warp	umba0008	1,1,um_fild03,35,146
-um_fild02,374,326,0	warp	umba0005	1,1,um_fild03,21,334
-um_fild03,18,334,0	warp	umba0006	1,1,um_fild02,371,326
-um_fild03,30,146,0	warp	umba0007	1,1,um_fild02,371,149
-um_fild04,179,10,0	warp	umba0054	1,1,um_fild02,191,372
+cmd_fild01,77,366,0	warp	um_fild1-1	1,1,um_fild03,114,53
+cmd_fild01,178,370,0	warp	um_fild1-2	1,1,um_fild03,243,29
+um_fild01,31,274,0	warp	um_fild1-3	1,1,beach_dun2,254,244
+beach_dun2,258,244,0	warp	um_fild1-4	1,1,um_fild01,35,276
+um_fild01,369,277,0	warp	um_fild1-5	1,1,um_fild02,25,272
+um_fild02,22,272,0	warp	um_fild2-1	1,1,um_fild01,366,277
+um_fild02,188,374,0	warp	um_fild2-2	1,1,um_fild04,182,16
+um_fild02,373,329,0	warp	um_fild2-3	1,1,um_fild03,23,334
+um_fild02,373,148,0	warp	um_fild2-4	1,1,um_fild03,36,145
+um_fild03,19,334,0	warp	um_fild3-1	1,1,um_fild02,370,329
+um_fild03,32,145,0	warp	um_fild3-2	1,1,um_fild02,370,148
+um_fild03,114,50,0	warp	um_fild3-3	1,1,cmd_fild01,74,363
+um_fild03,243,26,0	warp	um_fild3-4	1,1,cmd_fild01,176,367
+um_fild04,182,13,0	warp	um_fild4-1	1,1,um_fild02,190,371
+um_fild04,215,339,0	warp	um_fild4-2	1,1,umbala,130,82
+umbala,130,79,0	warp	um_fild4-3	1,1,um_fild04,215,336