From 922086f5baf9a1df3fac405a4a20f7573b630597 Mon Sep 17 00:00:00 2001
From: Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 21 Oct 2006 11:38:59 +0000
Subject: * Further spawn updates for: - Yuno Field - Magma Dungeon - Amatsu
 Field - Amatsu Dungeon

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9036 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/Changelog.txt              |  5 +++++
 npc/mobs/dungeons/amatdun.txt  | 24 +++++++++++----------
 npc/mobs/dungeons/magmadun.txt | 26 ++++++++++++++--------
 npc/mobs/fields/amatsu.txt     | 49 +++++++++++++++++++++++-------------------
 npc/mobs/fields/yuno.txt       | 37 +++++++++++++++----------------
 5 files changed, 81 insertions(+), 60 deletions(-)

(limited to 'npc')

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 3145dcccf..17cdb0fe1 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -33,6 +33,11 @@ KarLaeda
 
 Date		Added
 ======
+10/21
+	* Further spawn updates for Yuno Field [Playtester]
+	- Magma Dungeon
+	- Amatsu Field
+	- Amatsu Dungeon
 10/20
 	* Official kRO 10.1 spawns for Morroc Field [Playtester]
 	- Prontera Field
diff --git a/npc/mobs/dungeons/amatdun.txt b/npc/mobs/dungeons/amatdun.txt
index 1ec841b08..9a5e49db6 100644
--- a/npc/mobs/dungeons/amatdun.txt
+++ b/npc/mobs/dungeons/amatdun.txt
@@ -3,11 +3,11 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
-//=
+//= 1.1 Official kRO 10.1 spawns [Playtester]
 //============================================================
 
 //==================================================
@@ -15,25 +15,27 @@
 //==================================================
 ama_dun01.gat,0,0,0,0	monster	Miyabi Doll	1404,65,0,0,0
 ama_dun01.gat,0,0,0,0	monster	Firelock Soldier	1403,45,0,0,0
-ama_dun01.gat,0,0,0,0	monster	Shinobi	1401,2,0,0,0
+ama_dun01.gat,0,0,0,0	monster	Shinobi	1401,2,180000,90000,0
 
 //==================================================
 // ama_dun02 - Battle Field in the Underground Forest
 //==================================================
-ama_dun02.gat,0,0,0,0	monster	Poison Toad	1402,35,0,0,0
-ama_dun02.gat,0,0,0,0	monster	Horong	1129,10,0,0,0
-ama_dun02.gat,0,0,0,0	monster	Miyabi Doll	1404,5,0,0,0
+ama_dun02.gat,0,0,0,0	monster	Poison Toad	1402,35,180000,90000,0
 ama_dun02.gat,0,0,0,0	monster	Firelock Soldier	1403,20,60000,30000,0
+ama_dun02.gat,0,0,0,0	monster	Miyabi Doll	1404,5,120000,60000,0
 ama_dun02.gat,0,0,0,0	monster	Shinobi	1401,2,180000,90000,0
+ama_dun02.gat,0,0,0,0	monster	Horong	1129,10,0,0,0
 ama_dun02.gat,0,0,0,0	monster	The Paper	1375,1,180000,90000,0
 
 //==================================================
 // ama_dun03 - Amatsu Underground Shrine
 //==================================================
-ama_dun03.gat,0,0,0,0	monster	Shinobi	1401,55,0,0,0
-ama_dun03.gat,0,0,0,0	monster	Tengu	1405,55,0,0,0
+ama_dun03.gat,0,0,0,0	monster	Shinobi	1401,35,600000,300000,0
 ama_dun03.gat,0,0,0,0	monster	Firelock Soldier	1403,25,0,0,0
-ama_dun03.gat,0,0,0,0	monster	The Paper	1375,20,0,0,0
-ama_dun03.gat,0,0,0,0	monster	Mimic	1191,5,0,0,0
 ama_dun03.gat,0,0,0,0	monster	Miyabi Doll	1404,1,0,0,0
-ama_dun03.gat,0,0,0,0	monster	Incantation Samurai	1492,1,5400000,2700000,0
+ama_dun03.gat,0,0,0,0	monster	Tengu	1405,40,600000,300000,0
+ama_dun03.gat,0,0,0,0	monster	Mimic	1191,5,0,0,0
+ama_dun03.gat,0,0,0,0	monster	The Paper	1375,20,600000,300000,0
+ama_dun03.gat,0,0,0,0	monster	Samurai Specter	1492,1,5460000,3600000,0
+ama_dun03.gat,0,0,0,0	monster	Shinobi	1401,20,5450000,3600000,0
+ama_dun03.gat,0,0,0,0	monster	Tengu	1405,15,5440000,3600000,0
diff --git a/npc/mobs/dungeons/magmadun.txt b/npc/mobs/dungeons/magmadun.txt
index 5d14cc4f0..832ebdb6d 100644
--- a/npc/mobs/dungeons/magmadun.txt
+++ b/npc/mobs/dungeons/magmadun.txt
@@ -8,23 +8,31 @@
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 fixed 2,3,4 tabs instead of 1... and wrong mob names [Lupus]
+//= 1.2 Official jRO 10.3 spawns [Playtester]
 //============================================================
 
 //==================================================
 // mag_dun01 - Nogg Road F1
 //==================================================
-mag_dun01.gat,0,0,0,0	monster	Explosion	1383,30,0,0,0
-mag_dun01.gat,0,0,0,0	monster	Kaho	1072,20,0,0,0
 mag_dun01.gat,0,0,0,0	monster	Blazer	1367,20,0,0,0
+mag_dun01.gat,0,0,0,0	monster	Lava Golem	1366,20,600000,300000,0
+mag_dun01.gat,0,0,0,0	monster	Kaho	1072,20,0,0,0
+mag_dun01.gat,0,0,0,0	monster	Explosion	1383,30,0,0,0
 mag_dun01.gat,0,0,0,0	monster	Grizzly	1381,10,0,0,0
-mag_dun01.gat,0,0,0,0	monster	Lava Golem	1366,20,600000,30000,0
 
 //==================================================
 // mag_dun02 - Nogg Road F2
 //==================================================
-mag_dun02.gat,0,0,0,0	monster	Nightmare Terror	1379,28,600000,30000,0
-mag_dun02.gat,0,0,0,0	monster	Blazer	1367,20,600000,30000,0
-mag_dun02.gat,0,0,0,0	monster	Diabolic	1382,20,600000,30000,0
-mag_dun02.gat,0,0,0,0	monster	Deleter	1384,10,600000,30000,0
-mag_dun02.gat,0,0,0,0	monster	Deleter	1385,10,600000,30000,0
-mag_dun02.gat,0,0,0,0	monster	Gig	1387,10,600000,30000,0
+mag_dun02.gat,70,190,20,20	monster	Blazer	1367,5,300000,150000,0
+mag_dun02.gat,200,120,40,40	monster	Blazer	1367,15,300000,150000,0
+mag_dun02.gat,70,87,50,50	monster	Nightmare Terror	1379,10,300000,150000,0
+mag_dun02.gat,210,156,15,15	monster	Nightmare Terror	1379,3,60000,30000,0
+mag_dun02.gat,135,153,15,15	monster	Nightmare Terror	1379,3,60000,30000,0
+mag_dun02.gat,0,0,0,0	monster	Nightmare Terror	1379,12,60000,30000,0
+mag_dun02.gat,120,202,20,20	monster	Deleter	1384,5,60000,30000,0
+mag_dun02.gat,185,185,50,50	monster	Deleter	1385,10,300000,150000,0
+mag_dun02.gat,200,77,30,30	monster	Deleter	1384,5,300000,150000,0
+mag_dun02.gat,0,0,0,0	monster	Gig	1387,10,0,0,0
+mag_dun02.gat,200,77,30,30	monster	Diabolic	1382,10,300000,150000,0
+mag_dun02.gat,135,68,15,15	monster	Diabolic	1382,5,300000,30000,0
+mag_dun02.gat,0,0,0,0	monster	Diabolic	1382,5,60000,30000,0
diff --git a/npc/mobs/fields/amatsu.txt b/npc/mobs/fields/amatsu.txt
index 5d2a9894a..e33217f86 100644
--- a/npc/mobs/fields/amatsu.txt
+++ b/npc/mobs/fields/amatsu.txt
@@ -3,39 +3,44 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 replaced Hydra -> G_Hydra (to fix drops exploit) [Lupus]
+//= 1.2 Official kRO 10.1 spawns [Playtester]
 //============================================================
 
 //==================================================
 // ama_fild01 - Amatsu Field
 //==================================================
-ama_fild01.gat,0,0,0,0	monster	Kapha	1406,20,60000,30000,0
-ama_fild01.gat,174,306,20,20	monster	Kapha	1406,10,300000,150000,0
+ama_fild01.gat,0,0,0,0	monster	Karakasa	1400,50,0,0,0
 ama_fild01.gat,174,207,20,20	monster	Kapha	1406,5,1200000,600000,0
 ama_fild01.gat,241,310,10,10	monster	Kapha	1406,5,600000,300000,0
 ama_fild01.gat,114,230,10,10	monster	Kapha	1406,5,600000,300000,0
 ama_fild01.gat,174,253,10,10	monster	Kapha	1406,5,600000,300000,0
-ama_fild01.gat,0,0,0,0	monster	Karakasa	1400,50,0,0,0
-ama_fild01.gat,0,0,0,0	monster	Poporing	1031,15,0,0,0
-ama_fild01.gat,0,0,0,0	monster	Bigfoot	1060,15,0,0,0
-ama_fild01.gat,0,0,0,0	monster	Miyabi Doll	1404,2,0,0,0
-ama_fild01.gat,0,0,0,0	monster	Poison Toad	1402,1,0,0,0
-ama_fild01.gat,0,0,0,0	monster	Hydra	1579,5,0,0,0
 ama_fild01.gat,177,315,0,0	monster	Hydra	1068,1,60000,30000,0
-ama_fild01.gat,175,315,0,0	monster	Hydra	1579,1,63000,31500,0
-ama_fild01.gat,173,315,0,0	monster	Hydra	1579,1,66000,33000,0
-ama_fild01.gat,171,315,0,0	monster	Hydra	1579,1,69000,34500,0
-ama_fild01.gat,169,315,0,0	monster	Hydra	1579,1,72000,39000,0
-ama_fild01.gat,177,314,0,0	monster	Hydra	1579,1,66000,33000,0
-ama_fild01.gat,175,314,0,0	monster	Hydra	1579,1,72000,39000,0
-ama_fild01.gat,173,314,0,0	monster	Hydra	1579,1,60000,30000,0
-ama_fild01.gat,171,314,0,0	monster	Hydra	1579,1,69000,34500,0
-ama_fild01.gat,169,314,0,0	monster	Hydra	1579,1,63000,31500,0
-ama_fild01.gat,171,313,0,0	monster	Hydra	1579,1,66000,33000,0
-ama_fild01.gat,173,313,0,0	monster	Hydra	1579,1,60000,30000,0
-ama_fild01.gat,175,313,0,0	monster	Hydra	1579,1,66000,33000,0
-ama_fild01.gat,173,310,0,0	monster	Hydra	1579,1,60000,30000,0
+ama_fild01.gat,175,315,0,0	monster	Hydra	1068,1,63000,31500,0
+ama_fild01.gat,173,315,0,0	monster	Hydra	1068,1,66000,33000,0
+ama_fild01.gat,171,315,0,0	monster	Hydra	1068,1,69000,34500,0
+ama_fild01.gat,169,315,0,0	monster	Hydra	1068,1,72000,39000,0
+ama_fild01.gat,177,314,0,0	monster	Hydra	1068,1,66000,33000,0
+ama_fild01.gat,175,314,0,0	monster	Hydra	1068,1,72000,39000,0
+ama_fild01.gat,173,314,0,0	monster	Hydra	1068,1,60000,30000,0
+ama_fild01.gat,171,314,0,0	monster	Hydra	1068,1,69000,34500,0
+ama_fild01.gat,169,314,0,0	monster	Hydra	1068,1,63000,31500,0
+ama_fild01.gat,171,313,0,0	monster	Hydra	1068,1,66000,33000,0
+ama_fild01.gat,173,313,0,0	monster	Hydra	1068,1,60000,30000,0
+ama_fild01.gat,175,313,0,0	monster	Hydra	1068,1,66000,33000,0
+ama_fild01.gat,175,312,0,0	monster	Hydra	1068,1,63000,31500,0
+ama_fild01.gat,173,312,0,0	monster	Hydra	1068,1,60000,30000,0
+ama_fild01.gat,171,312,0,0	monster	Hydra	1068,1,63000,31500,0
+ama_fild01.gat,174,311,0,0	monster	Hydra	1068,1,63000,31500,0
+ama_fild01.gat,172,311,0,0	monster	Hydra	1068,1,69000,36000,0
+ama_fild01.gat,173,310,0,0	monster	Hydra	1068,1,60000,30000,0
+ama_fild01.gat,0,0,0,0	monster	Kapha	1406,20,60000,30000,0
+ama_fild01.gat,174,306,20,20	monster	Kapha	1406,10,300000,150000,0
+ama_fild01.gat,0,0,0,0	monster	Miyabi Doll	1404,2,180000,90000,0
+ama_fild01.gat,0,0,0,0	monster	Poison Toad	1402,1,180000,90000,0
+ama_fild01.gat,0,0,0,0	monster	Poporing	1031,15,0,0,0
+ama_fild01.gat,0,0,0,0	monster	Bigfoot	1060,15,60000,30000,0
diff --git a/npc/mobs/fields/yuno.txt b/npc/mobs/fields/yuno.txt
index ba1c6b886..2fa832605 100644
--- a/npc/mobs/fields/yuno.txt
+++ b/npc/mobs/fields/yuno.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
@@ -18,23 +18,24 @@
 //=	Thanks to Playtester and Emperium.org
 //= 1.6 Fixed Yuno Field 10. Mob amount sugested by Playtester [Poki#3]
 //= 1.7 Updated by using Tharis' Homun AI, by Tharis [Vicious]
+//= 1.8 Added kRO 10.1 spawns where they fit [Playtester]
 //============================================================
 
 //==================================================
 // yuno_fild01 - Border Posts
 //==================================================
 yuno_fild01.gat,0,0,0,0	monster	Dustiness	1114,50,0,0,0
-yuno_fild01.gat,0,0,0,0	monster	Poporing	1031,20,0,0,0
 yuno_fild01.gat,0,0,0,0	monster	Poring	1002,20,0,0,0
+yuno_fild01.gat,0,0,0,0	monster	Poporing	1031,20,0,0,0
 yuno_fild01.gat,190,329,80,20	monster	Grand Peco	1369,3,50000,25000,0
-yuno_fild01.gat,0,0,0,0	monster	Yellow Plant	1081,15,1800000,900000,1
-yuno_fild01.gat,66,267,10,10	monster	Yellow Plant	1081,2,1800000,900000,1
-yuno_fild01.gat,238,326,40,40	monster	Yellow Plant	1081,6,1800000,900000,1
-yuno_fild01.gat,0,0,0,0	monster	Green Plant	1080,20,1800000,900000,1
 yuno_fild01.gat,0,0,0,0	monster	Red Plant	1078,15,1800000,900000,1
+yuno_fild01.gat,70,370,10,10	monster	Blue Plant	1079,2,1800000,900000,1
 yuno_fild01.gat,70,370,10,10	monster	Shining Plant	1083,1,1800000,900000,1
+yuno_fild01.gat,66,267,10,10	monster	Yellow Plant	1081,2,1800000,900000,1
+yuno_fild01.gat,238,326,40,40	monster	Yellow Plant	1081,6,1800000,900000,1
 yuno_fild01.gat,238,326,40,40	monster	Shining Plant	1083,2,1800000,900000,1
-yuno_fild01.gat,70,370,10,10	monster	Blue Plant	1079,2,1800000,900000,1
+yuno_fild01.gat,0,0,0,0	monster	Yellow Plant	1081,15,1800000,900000,1
+yuno_fild01.gat,0,0,0,0	monster	Green Plant	1080,20,1800000,900000,1
 
 //==================================================
 // yuno_fild02 - Kiel Khayr's Cottage
@@ -47,8 +48,8 @@ yuno_fild02.gat,0,0,0,0	monster	Petite	1155,10,0,0,0
 yuno_fild02.gat,200,350,200,50	monster	Deleter	1384,10,0,0,0
 yuno_fild02.gat,0,0,0,0	monster	Wild Rose	1261,5,0,0,0
 yuno_fild02.gat,0,0,0,0	monster	Red Plant	1078,10,1800000,900000,1
-yuno_fild02.gat,0,0,0,0	monster	Green Plant	1080,10,1800000,900000,1
 yuno_fild02.gat,0,0,0,0	monster	Yellow Plant	1081,10,1800000,900000,1
+yuno_fild02.gat,0,0,0,0	monster	Green Plant	1080,10,1800000,900000,1
 
 //==================================================
 // yuno_fild03 - El Mes Plateau
@@ -62,10 +63,10 @@ yuno_fild03.gat,62,131,44,15	monster	Side Winder	1037,1,0,0,0
 yuno_fild03.gat,0,0,0,0	monster	Angeling	1096,1,3600000,1800000,1
 yuno_fild03.gat,0,0,0,0	monster	Deviling	1582,1,3600000,1800000,1
 yuno_fild03.gat,0,0,0,0	monster	Red Plant	1078,15,1800000,900000,1
-yuno_fild03.gat,0,0,0,0	monster	Green Plant	1080,15,1800000,900000,1
 yuno_fild03.gat,0,0,0,0	monster	Yellow Plant	1081,15,1800000,900000,1
-yuno_fild03.gat,358,215,10,10	monster	Blue Plant	1079,4,1800000,900000,1
+yuno_fild03.gat,0,0,0,0	monster	Green Plant	1080,15,1800000,900000,1
 yuno_fild03.gat,358,215,10,10	monster	Shining Plant	1083,1,1800000,900000,1
+yuno_fild03.gat,358,215,10,10	monster	Blue Plant	1079,4,1800000,900000,1
 
 //==================================================
 // yuno_fild04 - El Mes Plateau
@@ -76,20 +77,20 @@ yuno_fild04.gat,0,0,0,0	monster	Condor	1009,20,0,0,0
 yuno_fild04.gat,0,0,0,0	monster	Pupa	1008,10,0,0,0
 yuno_fild04.gat,0,0,0,0	monster	Mastering	1090,1,3600000,1800000,1
 yuno_fild04.gat,0,0,0,0	monster	Red Plant	1078,10,1800000,900000,1
-yuno_fild04.gat,0,0,0,0	monster	Green Plant	1080,10,1800000,900000,1
 yuno_fild04.gat,0,0,0,0	monster	Yellow Plant	1081,10,1800000,900000,1
+yuno_fild04.gat,0,0,0,0	monster	Green Plant	1080,10,1800000,900000,1
 
 //==================================================
 // yuno_fild05 - El Mes Plateau
 //==================================================
-yuno_fild05.gat,0,0,0,0	monster	Rafflesia	1162,80,0,0,0
-yuno_fild05.gat,0,0,0,0	monster	Horn	1128,30,0,0,0
+yuno_fild05.gat,0,0,0,0	monster	Rafflesia	1162,70,0,0,0
 yuno_fild05.gat,0,0,0,0	monster	Dustiness	1114,30,0,0,0
+yuno_fild05.gat,0,0,0,0	monster	Horn	1128,30,0,0,0
 yuno_fild05.gat,0,0,0,0	monster	Beetle King	1494,10,0,0,0
-yuno_fild05.gat,0,0,0,0	monster	Arc Angeling	1388,1,3600000,1800000,1
+yuno_fild05.gat,0,0,0,0	monster	Arc Angeling	1388,1,3600000,180000,0
 yuno_fild05.gat,0,0,0,0	monster	Red Plant	1078,10,180000,90000,1
 yuno_fild05.gat,0,0,0,0	monster	Green Plant	1080,10,180000,90000,1
-yuno_fild05.gat,0,0,0,0	monster	Yellow Plant	1081,10,180000,90000,1
+yuno_fild05.gat,0,0,0,0	monster	Yellow Plant	1081,10,180000,90000,0
 yuno_fild05.gat,176,202,8,8	monster	Blue Plant	1079,2,180000,90000,1
 yuno_fild05.gat,300,280,5,5	monster	Blue Plant	1079,2,180000,90000,1
 
@@ -117,6 +118,7 @@ yuno_fild07.gat,0,0,0,0	monster	Yellow Plant	1081,10,180000,90000,1
 //==================================================
 // yuno_fild08 - Kiel Khayr's Academy
 //==================================================
+yuno_fild08.gat,0,0,0,0	monster	Wild Rose	1261,5,0,0,0
 yuno_fild08.gat,200,300,290,100	monster	Grand Peco	1369,30,0,0,0
 yuno_fild08.gat,272,205,100,120	monster	Grand Peco	1369,20,0,0,0
 yuno_fild08.gat,230,110,250,90	monster	Grand Peco	1369,30,0,0,0
@@ -126,7 +128,6 @@ yuno_fild08.gat,230,110,250,90	monster	Geographer	1368,12,0,0,0
 yuno_fild08.gat,200,300,290,100	monster	Dustiness	1114,7,0,0,0
 yuno_fild08.gat,272,205,100,120	monster	Dustiness	1114,6,0,0,0
 yuno_fild08.gat,230,110,250,90	monster	Dustiness	1114,7,0,0,0
-yuno_fild08.gat,0,0,0,0	monster	Wild Rose	1261,5,0,0,0
 yuno_fild08.gat,0,0,0,0	monster	Red Plant	1078,10,180000,90000,1
 yuno_fild08.gat,0,0,0,0	monster	Green Plant	1080,10,180000,90000,1
 yuno_fild08.gat,0,0,0,0	monster	Yellow Plant	1081,10,180000,90000,1
@@ -157,10 +158,10 @@ yuno_fild10.gat,0,0,0,0	monster	Hunter Fly	1035,10,0,0,0
 // yuno_fild11 - Yuno Field
 //==================================================
 yuno_fild11.gat,0,0,0,0	monster	Sleeper	1386,10,0,0,0
-yuno_fild11.gat,65,294,70,160	monster	Sleeper	1386,5,0,0,0
-yuno_fild11.gat,225,220,125,135	monster	Sleeper	1386,35,0,0,0
 yuno_fild11.gat,0,0,0,0	monster	Geographer	1368,3,0,0,0
+yuno_fild11.gat,65,294,70,160	monster	Sleeper	1386,5,0,0,0
 yuno_fild11.gat,65,294,70,160	monster	Geographer	1368,2,0,0,0
+yuno_fild11.gat,225,220,125,135	monster	Sleeper	1386,35,0,0,0
 yuno_fild11.gat,225,220,125,135	monster	Geographer	1368,15,0,0,0
 yuno_fild11.gat,0,0,0,0	monster	Red Plant	1078,10,180000,90000,1
 yuno_fild11.gat,0,0,0,0	monster	Green Plant	1080,10,180000,90000,1
-- 
cgit v1.2.3-70-g09d2