- Merged /branches/renewal/conf (partial)

- Merged /branches/renewal/db (only mob_db.txt and mob_skill_db.txt)
- Merged /branches/renewal/npc (full)

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

1 files changed, 46 insertions, 74 deletions

diff --git a/npc/mobs/fields/geffen.txt b/npc/mobs/fields/geffen.txt
index e08ad551a..bfd057452 100644
--- a/npc/mobs/fields/geffen.txt
+++ b/npc/mobs/fields/geffen.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
@@ -11,15 +11,15 @@
 //= 1.3 Official kRO 10.1 spawns + future changes [Playtester]
 //= 1.4 More accurate spawns [Playtester]
 //= 1.5 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.6 Updated to renewal spawns. [L0ne_W0lf]
 //============================================================
 
 //==================================================
 // gef_fild00 - Geffen Field
 //==================================================
-gef_fild00,0,0,0,0	monster	Poring	1002,50,0,0,0
-gef_fild00,0,0,0,0	monster	Fabre	1007,50,0,0,0
-gef_fild00,0,0,0,0	monster	Pupa	1008,20,0,0,0
-gef_fild00,0,0,0,0	monster	Poporing	1031,10,0,0,0
+gef_fild00,0,0,0,0	monster	Chonchon	1011,140,5000,0,0
+gef_fild00,0,0,0,0	monster	Poring	1002,30,5000,0,0
+gef_fild00,0,0,0,0	monster	Fabre	1007,30,5000,0,0
 gef_fild00,95,128,0,0	monster	Blue Plant	1079,1,900000,450000,1
 gef_fild00,124,321,0,0	monster	Blue Plant	1079,1,900000,450000,1
 gef_fild00,54,212,5,5	monster	Green Plant	1080,3,360000,180000,1
@@ -28,20 +28,18 @@ gef_fild00,54,186,5,5	monster	Green Plant	1080,3,360000,180000,1
 //==================================================
 // gef_fild01 - Geffen Field
 //==================================================
-gef_fild01,0,0,0,0	monster	Roda Frog	1012,50,0,0,0
-gef_fild01,0,0,0,0	monster	Poporing	1031,20,0,0,0
+gef_fild01,0,0,0,0	monster	Roda Frog	1012,80,5000,0,0
+gef_fild01,0,0,0,0	monster	Ambernite	1094,20,5000,0,0
 gef_fild01,0,0,0,0	monster	Toad	1089,1,3600000,1800000,1
 gef_fild01,215,225,10,10	monster	Green Plant	1080,5,360000,180000,1
 
 //==================================================
 // gef_fild02 - Geffen Field
 //==================================================
-gef_fild02,0,0,0,0	monster	Yoyo	1057,10,0,0,0
-gef_fild02,0,0,0,0	monster	Orc Warrior	1023,60,0,0,0
-gef_fild02,0,0,0,0	monster	Coco	1104,10,0,0,0
-gef_fild02,0,0,0,0	monster	Smokie	1056,10,0,0,0
-gef_fild02,0,0,0,0	monster	Choco	1214,1,0,0,0
-gef_fild02,0,0,0,0	boss_monster	Orc Hero	1087,1,86400000,600000,1
+gef_fild02,0,0,0,0	monster	Coco	1104,140,5000,0,0
+gef_fild02,0,0,0,0	monster	Poporing	1031,20,5000,0,0
+gef_fild02,0,0,0,0	monster	Horn	1128,20,5000,0,0
+gef_fild02,0,0,0,0	monster	Elder Willow	1033,20,5000,0,0
 gef_fild02,227,316,6,6	monster	Green Plant	1080,8,360000,180000,1
 gef_fild02,87,48,6,6	monster	Red Mushroom	1085,5,360000,180000,1
 gef_fild02,215,209,2,1	monster	Blue Plant	1079,2,360000,180000,1
@@ -52,10 +50,10 @@ gef_fild02,164,194,1,1	monster	Shining Plant	1083,1,1800000,900000,1
 //==================================================
 // gef_fild03 - Geffen Field
 //==================================================
-gef_fild03,0,0,0,0	monster	Orc Warrior	1023,60,0,0,0
-gef_fild03,0,0,0,0	monster	High Orc	1213,1,0,0,0
-gef_fild03,0,0,0,0	monster	Savage	1166,40,0,0,0
-gef_fild03,0,0,0,0	monster	Poporing	1031,20,0,0,0
+gef_fild03,0,0,0,0	monster	Orc Lady	1273,130,5000,0,0
+gef_fild03,0,0,0,0	monster	Orc Warrior	1023,60,5000,0,0
+gef_fild03,0,0,0,0	monster	Orc Baby	1686,20,5000,0,0
+gef_fild03,0,0,0,0	boss_monster	Orc Hero	1087,1,3600000,600000,1
 gef_fild03,45,350,3,3	monster	Green Plant	1080,1,180000,90000,1
 gef_fild03,66,300,3,3	monster	Green Plant	1080,1,180000,90000,1
 gef_fild03,80,252,3,3	monster	Green Plant	1080,1,180000,90000,1
@@ -81,21 +79,21 @@ gef_fild03,44,133,3,3	monster	Green Plant	1080,1,180000,90000,1
 //==================================================
 // gef_fild04 - Geffen Field
 //==================================================
-gef_fild04,0,0,0,0	monster	Poring	1002,30,0,0,0
-gef_fild04,0,0,0,0	monster	Chonchon	1011,30,0,0,0
-gef_fild04,0,0,0,0	monster	Pupa	1008,60,0,0,0
-gef_fild04,0,0,0,0	monster	Fabre	1007,20,0,0,0
-gef_fild04,0,0,0,0	monster	Roda Frog	1012,20,0,0,0
+gef_fild04,0,0,0,0	monster	Mandragora	1020,125,5000,0,0
+gef_fild04,0,0,0,0	monster	Lunatic	1063,25,5000,0,0
+gef_fild04,0,0,0,0	monster	Fabre	1007,25,5000,0,0
+gef_fild04,0,0,0,0	monster	Chonchon	1011,25,5000,0,0
 gef_fild04,224,82,5,2	monster	Green Plant	1080,3,360000,180000,1
 gef_fild04,152,82,5,2	monster	Green Plant	1080,3,360000,180000,1
 
 //==================================================
 // gef_fild05 - Geffen Field
 //==================================================
-gef_fild05,0,0,0,0	monster	Poring	1002,30,0,0,0
-gef_fild05,0,0,0,0	monster	Kobold Archer	1282,10,0,0,0
-gef_fild05,0,0,0,0	monster	Wild Rose	1261,50,0,0,0
-gef_fild05,0,0,0,0	monster	Dustiness	1114,30,0,0,0
+gef_fild05,0,0,0,0	monster	Creamy	1018,140,5000,0,0
+gef_fild05,0,0,0,0	monster	Stainer	1174,20,5000,0,0
+gef_fild05,0,0,0,0	monster	Smokie	1056,20,5000,0,0
+gef_fild05,0,0,0,0	monster	Thief Bug Egg	1048,10,5000,0,0
+gef_fild05,0,0,0,0	monster	Thief Bug	1051,10,5000,0,0
 gef_fild05,235,322,0,0	monster	Red Plant	1078,1,180000,90000,1
 gef_fild05,238,326,0,0	monster	Red Plant	1078,1,180000,90000,1
 gef_fild05,170,337,0,0	monster	Red Plant	1078,1,180000,90000,1
@@ -115,21 +113,18 @@ gef_fild05,130,293,0,0	monster	Red Plant	1078,1,180000,90000,1
 //==================================================
 // gef_fild06 - Geffen Field
 //==================================================
-gef_fild06,0,0,0,0	monster	Kobold	1133,20,0,0,0
-gef_fild06,0,0,0,0	monster	Kobold	1134,10,0,0,0
-gef_fild06,0,0,0,0	monster	Kobold	1135,10,0,0,0
-gef_fild06,0,0,0,0	monster	Petite	1156,50,0,0,0
-gef_fild06,0,0,0,0	monster	Poporing	1031,10,0,0,0
-gef_fild06,0,0,0,0	monster	Mantis	1139,20,0,0,0
+gef_fild06,0,0,0,0	monster	Petite	1155,130,5000,0,0
+gef_fild06,0,0,0,0	monster	Mantis	1139,30,5000,0,0
+gef_fild06,0,0,0,0	monster	Side Winder	1037,30,5000,0,0
 gef_fild06,0,0,0,0	monster	Shining Plant	1083,4,1800000,900000,1
 
 //==================================================
 // gef_fild07 - Geffen Field
 //==================================================
-gef_fild07,0,0,0,0	monster	Poring	1002,20,0,0,0
-gef_fild07,0,0,0,0	monster	Chonchon	1011,30,0,0,0
-gef_fild07,0,0,0,0	monster	Pupa	1008,10,0,0,0
-gef_fild07,0,0,0,0	monster	Fabre	1007,60,0,0,0
+gef_fild07,0,0,0,0	monster	Pupa	1008,130,5000,0,0
+gef_fild07,0,0,0,0	monster	Poring	1002,20,5000,0,0
+gef_fild07,0,0,0,0	monster	Fabre	1007,20,5000,0,0
+gef_fild07,0,0,0,0	monster	Chonchon	1011,20,5000,0,0
 gef_fild07,122,221,0,0	monster	Green Plant	1080,3,360000,180000,1
 gef_fild07,185,247,0,0	monster	Shining Plant	1083,1,1800000,900000,1
 gef_fild07,269,289,0,0	monster	Blue Plant	1079,1,900000,450000,1
@@ -138,12 +133,9 @@ gef_fild07,269,289,3,3	monster	Green Plant	1080,3,360000,180000,1
 //==================================================
 // gef_fild08 - Geffen Field
 //==================================================
-gef_fild08,0,0,0,0	monster	Kobold	1133,20,0,0,0
-gef_fild08,0,0,0,0	monster	Kobold	1134,40,0,0,0
-gef_fild08,0,0,0,0	monster	Kobold	1135,20,0,0,0
-gef_fild08,0,0,0,0	monster	Golem	1040,40,0,0,0
-gef_fild08,0,0,0,0	monster	Steel Chonchon	1042,20,0,0,0
-gef_fild08,0,0,0,0	monster	Poison Spore	1077,20,0,0,0
+gef_fild08,0,0,0,0	monster	Petite	1156,130,5000,0,0
+gef_fild08,0,0,0,0	monster	Mantis	1139,30,5000,0,0
+gef_fild08,0,0,0,0	monster	Flora	1118,30,5000,0,0
 gef_fild08,65,341,0,0	monster	Blue Plant	1079,1,900000,450000,1
 gef_fild08,111,319,0,0	monster	Blue Plant	1079,1,900000,450000,1
 gef_fild08,59,91,0,0	monster	Blue Plant	1079,1,900000,450000,1
@@ -156,9 +148,8 @@ gef_fild08,162,247,0,0	monster	Blue Plant	1079,1,900000,450000,1
 //==================================================
 // gef_fild09 - Geffen Field
 //==================================================
-gef_fild09,0,0,0,0	monster	Ambernite	1094,60,0,0,0
-gef_fild09,0,0,0,0	monster	Poporing	1031,10,0,0,0
-gef_fild09,0,0,0,0	monster	Poison Spore	1077,10,0,0,0
+gef_fild09,0,0,0,0	monster	Ambernite	1094,80,5000,0,0
+gef_fild09,0,0,0,0	monster	Roda Frog	1012,20,5000,0,0
 gef_fild09,51,43,0,0	monster	Red Mushroom	1085,1,180000,90000,1
 gef_fild09,125,53,0,0	monster	Red Mushroom	1085,1,180000,90000,1
 gef_fild09,148,74,0,0	monster	Red Mushroom	1085,1,180000,90000,1
@@ -174,11 +165,10 @@ gef_fild09,277,201,5,5	monster	Blue Plant	1079,3,900000,450000,1
 //==================================================
 // gef_fild10 - Geffen Field
 //==================================================
+gef_fild10,0,0,0,0	monster	Orc Warrior	1023,130,5000,0,0
+gef_fild10,0,0,0,0	monster	Orc Lady	1273,40,5000,0,0
+gef_fild10,0,0,0,0	monster	Orc Baby	1686,20,5000,0,0
 gef_fild10,0,0,0,0	boss_monster	Orc Lord	1190,1,7200000,600000,0
-gef_fild10,0,0,0,0	monster	Orc Warrior	1023,20,0,0,0
-gef_fild10,0,0,0,0	monster	Orc Lady	1273,70,0,0,0
-gef_fild10,0,0,0,0	monster	Poporing	1031,15,0,0,0
-gef_fild10,0,0,0,0	monster	Orc Baby	1686,5,0,0,0
 gef_fild10,46,350,5,5	monster	Blue Plant	1079,3,900000,450000,1
 gef_fild10,287,61,5,5	monster	Blue Plant	1079,3,900000,450000,1
 gef_fild10,300,253,5,5	monster	Green Plant	1080,3,360000,180000,1
@@ -186,15 +176,11 @@ gef_fild10,300,253,5,5	monster	Green Plant	1080,3,360000,180000,1
 //==================================================
 // gef_fild11 - Geffen Field
 //==================================================
+gef_fild11,0,0,0,0	monster	Goblin	1122,50,5000,0,0
+gef_fild11,0,0,0,0	monster	Goblin	1123,50,5000,0,0
+gef_fild11,0,0,0,0	monster	Goblin	1124,50,5000,0,0
+gef_fild11,0,0,0,0	monster	Goblin	1125,50,5000,0,0
 gef_fild11,0,0,0,0	monster	Goblin Leader	1299,1,1800000,1200000,0
-gef_fild11,0,0,0,0	monster	Goblin	1122,30,0,0,0
-gef_fild11,0,0,0,0	monster	Goblin	1123,20,0,0,0
-gef_fild11,0,0,0,0	monster	Goblin	1124,20,0,0,0
-gef_fild11,0,0,0,0	monster	Goblin	1125,20,0,0,0
-gef_fild11,0,0,0,0	monster	Goblin	1126,20,0,0,0
-gef_fild11,0,0,0,0	monster	Goblin Archer	1258,20,0,0,0
-gef_fild11,0,0,0,0	monster	Poporing	1031,15,0,0,0
-gef_fild11,0,0,0,0	monster	Rotar Zairo	1392,10,0,0,0
 gef_fild11,101,277,4,1	monster	Black Mushroom	1084,3,360000,180000,1
 gef_fild11,176,288,1,4	monster	Black Mushroom	1084,3,360000,180000,1
 gef_fild11,253,357,1,4	monster	Black Mushroom	1084,3,360000,180000,1
@@ -204,27 +190,13 @@ gef_fild11,174,240,1,3	monster	Black Mushroom	1084,3,360000,180000,1
 gef_fild11,283,100,4,1	monster	Black Mushroom	1084,3,360000,180000,1
 
 //==================================================
-// gef_fild12 - Kordt Forest
+// gef_fild12 - Disabled on Renewal
 //==================================================
-gef_fild12,0,0,0,0	monster	Kobold	1133,20,0,0,0
-gef_fild12,0,0,0,0	monster	Kobold	1134,30,0,0,0
-gef_fild12,0,0,0,0	monster	Kobold	1135,30,0,0,0
-gef_fild12,0,0,0,0	monster	Kobold Archer	1282,40,0,0,0
-gef_fild12,0,0,0,0	monster	Poporing	1031,20,0,0,0
-gef_fild12,0,0,0,0	monster	Kobold Leader	1296,1,1800000,1200000,0
 
 //==================================================
-// gef_fild13 - Britoniah
+// gef_fild13 - No Spawns on Renewal
 //==================================================
-gef_fild13,0,0,0,0	monster	Poporing	1031,20,0,0,0
-gef_fild13,0,0,0,0	monster	Creamy	1018,40,0,0,0
-gef_fild13,0,0,0,0	monster	Ambernite	1094,30,0,0,0
 
 //==================================================
-// gef_fild14 - West Orc Village
+// gef_fild14 - Disabled on Renewal
 //==================================================
-gef_fild14,0,0,0,0	monster	Orc Lady	1273,20,0,0,0
-gef_fild14,0,0,0,0	boss_monster	Orc Hero	1087,1,3600000,600000,1
-gef_fild14,0,0,0,0	monster	Orc Warrior	1023,10,0,0,0
-gef_fild14,0,0,0,0	monster	Orc Archer	1189,30,0,0,0
-gef_fild14,0,0,0,0	monster	High Orc	1213,70,0,0,0