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, 22 insertions, 29 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