* Fixed errors with warp portal/mob spawns in Renewal Yggdrasil Dungeon, bugreport:6422

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

5 files changed, 43 insertions, 4 deletions

diff --git a/npc/pre-re/warps/cities/yggdrasil.txt b/npc/pre-re/warps/cities/yggdrasil.txt
index 20f4be4ca..bd4a74996 100644
--- a/npc/pre-re/warps/cities/yggdrasil.txt
+++ b/npc/pre-re/warps/cities/yggdrasil.txt
@@ -3,16 +3,18 @@
 //===== By: ==================================================
 //= PKGINGO (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
 //= Warp Points for Yggdrasil Tree
 //===== Additional Comments: =================================
 //= Extracted from Vidar -> Athena
+//= 1.1 Moved Umbala warp to this file.
 //============================================================
 
 //Umbala Entrance
+umbala,106,285,0	warp	um_dun1-1	1,1,um_dun01,42,30
 um_dun02,125,163,0	warp	nwarp1	1,1,yggdrasil01,40,63
 
 //Niflheim Exit
diff --git a/npc/re/mobs/dungeons/yggdrasil.txt b/npc/re/mobs/dungeons/yggdrasil.txt
new file mode 100644
index 000000000..6955fe221
--- /dev/null
+++ b/npc/re/mobs/dungeons/yggdrasil.txt
@@ -0,0 +1,35 @@
+//===== rAthena Script =======================================

+//= Yggdrasil Tree Monster Spawn Script

+//===== By: ==================================================

+//= Athena (1.0)

+//===== Current Version: =====================================

+//= 1.1

+//===== Compatible With: =====================================

+//= Any Athena Version

+//===== Additional Comments: =================================

+//= 1.0 Splitted from Nifflheim fields [DracoRPG]

+//= 1.1 Official kRO 10.1 spawns [Playtester]

+//============================================================

+

+//==================================================

+// yggdrasil01 - Hvergelmir's Fountain (Trunk of Yggdrasil)

+//==================================================

+yggdrasil01,234,256,10,10	monster	Blue Plant	1079,5,1800000,600000,0

+yggdrasil01,273,234,3,3	monster	Shining Plant	1083,1,1800000,600000,0

+yggdrasil01,143,257,20,10	monster	Shining Plant	1083,5,1200000,600000,0

+yggdrasil01,98,238,20,15	monster	Yellow Plant	1081,5,1200000,600000,0

+yggdrasil01,98,238,20,15	monster	White Plant	1082,5,1200000,600000,0

+yggdrasil01,47,207,20,20	monster	Blue Plant	1079,5,1200000,600000,0

+yggdrasil01,61,258,3,3	monster	Shining Plant	1083,1,1800000,600000,0

+yggdrasil01,132,199,20,5	monster	Blue Plant	1079,5,1200000,600000,0

+yggdrasil01,209,218,2,2	monster	Shining Plant	1083,1,1200000,600000,0

+yggdrasil01,192,186,2,2	monster	Shining Plant	1083,1,1800000,1200000,0

+yggdrasil01,169,176,3,3	monster	Shining Plant	1083,1,1200000,600000,0

+yggdrasil01,169,176,3,3	monster	Green Plant	1080,1,60000,30000,0

+yggdrasil01,94,111,5,2	monster	Shining Plant	1083,1,1200000,600000,0

+yggdrasil01,51,118,10,3	monster	Shining Plant	1083,1,1200000,600000,0

+yggdrasil01,133,54,3,3	monster	Shining Plant	1083,1,1200000,600000,0

+yggdrasil01,257,63,10,10	monster	Shining Plant	1083,3,1800000,1200000,0

+yggdrasil01,0,0,0,0	monster	Shining Plant	1083,10,3600000,2300000,0

+yggdrasil01,0,0,0,0	monster	Green Plant	1080,25,60000,30000,0

+yggdrasil01,0,0,0,0	monster	Red Plant	1078,15,60000,30000,0

diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt
index dc2b07188..ce4f90285 100644
--- a/npc/re/quests/eden/86-90.txt
+++ b/npc/re/quests/eden/86-90.txt
@@ -33,7 +33,7 @@ moc_para01,48,175,3	script	Mission [86 - 90]	857,{
 	if (BaseLevel > 90) {
 		setarray .@Exp[0],76000,82000,82000,72000,76000,72000,117000,82000,120000,72000,72000,72000,86000,80000;
 		setarray .@Mob$[0],"Dragon Tail","Spring Rabbit","Pest","Bathory","Alarm","Baba Yaga","Hyegun","Antique Firelock","Zipper Bear","Earth Petite","Rafflesia","Venomous","Pitman","Yellow Novus";
-		for(set .@i,0; .@i<16; set .@i,.@i+1)
+		for(set .@i,0; .@i<14; set .@i,.@i+1)
 			if (checkquest(4167+.@i,HUNTING) == 2) {
 				mes "You hunted all 30 "+.@Mob$[.@i]+".";
 				mes "Thank you very much.";
diff --git a/npc/re/scripts_monsters.conf b/npc/re/scripts_monsters.conf
index 27ccaa733..25811f8b3 100644
--- a/npc/re/scripts_monsters.conf
+++ b/npc/re/scripts_monsters.conf
@@ -46,6 +46,7 @@ npc: npc/re/mobs/dungeons/thor_v.txt
 npc: npc/re/mobs/dungeons/treasure.txt
 npc: npc/re/mobs/dungeons/tur_dun.txt
 npc: npc/re/mobs/dungeons/xmas_dun.txt
+npc: npc/re/mobs/dungeons/yggdrasil.txt
 
 // --------------------------- Fields ---------------------------
 npc: npc/re/mobs/fields/amatsu.txt
diff --git a/npc/warps/dungeons/um_dun.txt b/npc/warps/dungeons/um_dun.txt
index 4d453432e..80b6bbbae 100644
--- a/npc/warps/dungeons/um_dun.txt
+++ b/npc/warps/dungeons/um_dun.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Darkchild (1.0vA); Athena (1.0vB)
 //===== Current Version: =====================================
-//= 1.3 (Akaru)
+//= 1.4 (Akaru)
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
@@ -12,9 +12,10 @@
 //===== Additional Comments: =================================
 //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.4 Commented out warp from Umbala, should be pre-re only. [Euphy]
 //============================================================
 
-umbala,106,285,0	warp	um_dun1-1	1,1,um_dun01,42,30
+//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