summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-06-12 00:26:47 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-06-12 00:26:47 +0000
commitdb828ecdad0c7e2276c6b2db790875a2d4a785d5 (patch)
tree6c26405ade330f6cdcf649a6073ea68083596f5a /npc
parentb1334e2e32b405ed43569f5482ff7b3d9988d1b8 (diff)
downloadhercules-db828ecdad0c7e2276c6b2db790875a2d4a785d5.tar.gz
hercules-db828ecdad0c7e2276c6b2db790875a2d4a785d5.tar.bz2
hercules-db828ecdad0c7e2276c6b2db790875a2d4a785d5.tar.xz
hercules-db828ecdad0c7e2276c6b2db790875a2d4a785d5.zip
Corrected improperly converted spawns, and instance timers for sealed shine and Orc Dungeon.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14846 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/instances/OrcsMemory.txt2
-rw-r--r--npc/instances/SealedShrine.txt2
-rw-r--r--npc/mobs/dungeons/abbey.txt8
-rw-r--r--npc/mobs/dungeons/c_tower.txt4
-rw-r--r--npc/mobs/dungeons/dic_dun.txt18
-rw-r--r--npc/mobs/dungeons/prt_maze.txt2
-rw-r--r--npc/mobs/dungeons/prt_sew.txt16
-rw-r--r--npc/mobs/dungeons/tha_t.txt12
-rw-r--r--npc/mobs/dungeons/thor_v.txt34
-rw-r--r--npc/mobs/dungeons/xmas_dun.txt8
-rw-r--r--npc/mobs/fields/geffen.txt6
-rw-r--r--npc/mobs/fields/lutie.txt4
-rw-r--r--npc/mobs/fields/mjolnir.txt2
-rw-r--r--npc/mobs/fields/payon.txt6
-rw-r--r--npc/mobs/fields/prontera.txt8
-rw-r--r--npc/mobs/fields/splendide.txt6
17 files changed, 71 insertions, 69 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 2ce46d2ba..5777a8cf1 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
======
+2011/06/11
+ * Rev. 14845 Corrected improperly converted spawns, and instance timers for sealed shine and Orc Dungeon. [L0ne_W0lf]
2011/05/23
* Rev. 14833 Fixed a possible exploit in guild castle investment. (bugreport:4929, topic:272783) [Brian]
2011/04/08
diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt
index a4034557c..811968379 100644
--- a/npc/instances/OrcsMemory.txt
+++ b/npc/instances/OrcsMemory.txt
@@ -74,7 +74,7 @@ gef_fild10,242,202,0 script Dimensional Gorge Piece 406,{
close;
}
instance_attach(.@instance);
- instance_set_timeout 14400,300,.@instance;
+ instance_set_timeout 7200,300,.@instance;
instance_init(.@instance);
// First Floor
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index 813b1d1e9..044ff8423 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -122,7 +122,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
}
instance_attach(.@instance);
- instance_set_timeout 14400,300,.@instance;
+ instance_set_timeout 7200,300,.@instance;
instance_init(.@instance);
// First Floor
diff --git a/npc/mobs/dungeons/abbey.txt b/npc/mobs/dungeons/abbey.txt
index b9214b5a7..f76a591d9 100644
--- a/npc/mobs/dungeons/abbey.txt
+++ b/npc/mobs/dungeons/abbey.txt
@@ -16,7 +16,7 @@
// nameless_n - Nameless Island
//==================================================
nameless_n,0,0,0,0 monster Ghoul 1036,40,5000,0,0
-nameless_n,0,0,0,0 monster Hell Poodle 1866,17,5000,0,0
+nameless_n,0,0,0,0 monster Hellhound 1866,17,5000,0,0
nameless_n,0,0,0,0 monster Banshee 1867,16,5000,0,0
nameless_n,0,0,0,0 monster Ragged Zombie 1865,12,5000,0,0
nameless_n,0,0,0,0 monster Zombie Slaughter 1864,12,5000,0,0
@@ -29,7 +29,7 @@ abbey01,0,0,0,0 monster Banshee 1867,93,5000,0,0
abbey01,0,0,0,0 monster Ghoul 1036,56,5000,0,0
abbey01,0,0,0,0 monster Ragged Zombie 1865,33,5000,0,0
abbey01,0,0,0,0 monster Zombie Slaughter 1864,30,5000,0,0
-abbey01,0,0,0,0 monster Hell Poodle 1866,25,5000,0,0
+abbey01,0,0,0,0 monster Hellhound 1866,25,5000,0,0
abbey01,0,0,0,0 monster Flame Skull 1869,21,5000,0,0
//==================================================
@@ -39,7 +39,7 @@ abbey02,0,0,0,0 monster Zombie Slaughter 1864,210,5000,0,0
abbey02,0,0,0,0 monster Ragged Zombie 1865,70,5000,0,0
abbey02,0,0,0,0 monster Flame Skull 1869,21,5000,0,0
abbey02,0,0,0,0 monster Necromancer 1870,7,5000,0,0
-abbey02,236,78,21,18 boss_monster Fallen Bishop Hibram 1871,1,7200000,600000,1
+abbey02,236,78,21,18 boss_monster Fallen Bishop 1871,1,7200000,600000,1
//==================================================
// abbey03 - Cursed Monastery
@@ -47,4 +47,4 @@ abbey02,236,78,21,18 boss_monster Fallen Bishop Hibram 1871,1,7200000,600000,1
abbey03,0,0,0,0 monster Necromancer 1870,60,5000,0,0
abbey03,0,0,0,0 monster Banshee 1867,30,5000,0,0
abbey03,0,0,0,0 monster Flame Skull 1869,25,5000,0,0
-abbey03,0,0,0,0 boss_monster Hell Fly 1872,1,43200000,600000,1 \ No newline at end of file
+abbey03,0,0,0,0 boss_monster Beelzebub 1873,1,43200000,600000,1
diff --git a/npc/mobs/dungeons/c_tower.txt b/npc/mobs/dungeons/c_tower.txt
index b494ead8a..90a1e982a 100644
--- a/npc/mobs/dungeons/c_tower.txt
+++ b/npc/mobs/dungeons/c_tower.txt
@@ -25,7 +25,7 @@ c_tower2,0,0,0,0 monster Clock 1269,40,5000,0,0
c_tower2,0,0,0,0 monster Punk 1199,40,5000,0,0
c_tower2,0,0,0,0 monster Rideword 1195,12,5000,0,0
c_tower2,0,0,0,0 monster Mimic 1191,3,5000,0,0
-c_tower2,0,0,0,0 monster Elder Willow 1033,2,5000,0,0
+c_tower2,0,0,0,0 monster Elder 1377,2,5000,0,0
c_tower2,0,0,0,0 monster Clock Tower Manager 1270,1,5000,0,0
//==================================================
@@ -46,4 +46,4 @@ c_tower4,0,0,0,0 monster Rideword 1195,15,5000,0,0
c_tower4,0,0,0,0 monster Mimic 1191,12,5000,0,0
c_tower4,0,0,0,0 monster Whisper 1179,5,5000,0,0
c_tower4,0,0,0,0 monster Clock Tower Manager 1270,3,5000,0,0
-c_tower4,0,0,0,0 monster Elder Willow 1033,2,5000,0,0 \ No newline at end of file
+c_tower4,0,0,0,0 monster Elder 1377,2,5000,0,0
diff --git a/npc/mobs/dungeons/dic_dun.txt b/npc/mobs/dungeons/dic_dun.txt
index 371947a07..570601013 100644
--- a/npc/mobs/dungeons/dic_dun.txt
+++ b/npc/mobs/dungeons/dic_dun.txt
@@ -15,16 +15,16 @@
//==================================================
// dic_dun01 - Underground Passage Kamidal Tunnel
//==================================================
-dic_dun01,0,0,0,0 monster Scaraba 2083,50,5000,0,0
-dic_dun01,0,0,0,0 monster Scaraba 2084,45,5000,0,0
-dic_dun01,0,0,0,0 monster Scaraba Egg 2088,15,5000,0,0
-dic_dun01,0,0,0,0 monster Scaraba Egg 2089,15,5000,0,0
+dic_dun01,0,0,0,0 monster One-Horned Scarab 2083,50,5000,0,0
+dic_dun01,0,0,0,0 monster Two-Horned Scarab 2084,45,5000,0,0
+dic_dun01,0,0,0,0 monster Scarab Egg 2088,15,5000,0,0
+dic_dun01,0,0,0,0 monster Scarab Egg 2089,15,5000,0,0
//==================================================
// dic_dun02 - Underground Nest Scarab Hole
//==================================================
-dic_dun02,0,0,0,0 monster Antler Scaraba 2085,50,5000,0,0
-dic_dun02,0,0,0,0 monster Rake Scaraba 2086,45,5000,0,0
-dic_dun02,0,0,0,0 monster Antler Scaraba Egg 2090,15,5000,0,0
-dic_dun02,0,0,0,0 monster Rake Scaraba Egg 2091,15,5000,0,0
-dic_dun02,0,0,0,0 boss_monster Queen Scaraba 2087,1,7200000,0,0 \ No newline at end of file
+dic_dun02,0,0,0,0 monster Antler Scarab 2085,50,5000,0,0
+dic_dun02,0,0,0,0 monster Rake Scarab 2086,45,5000,0,0
+dic_dun02,0,0,0,0 monster Antler Scarab Egg 2090,15,5000,0,0
+dic_dun02,0,0,0,0 monster Rake Scarab Egg 2091,15,5000,0,0
+dic_dun02,0,0,0,0 boss_monster Scarab Queen 2087,1,7200000,0,0
diff --git a/npc/mobs/dungeons/prt_maze.txt b/npc/mobs/dungeons/prt_maze.txt
index ac9448ce8..c172e6e0d 100644
--- a/npc/mobs/dungeons/prt_maze.txt
+++ b/npc/mobs/dungeons/prt_maze.txt
@@ -20,7 +20,7 @@ prt_maze01,179,180,21,21 monster Coco 1104,5,120000,40000,1
prt_maze01,139,140,21,21 monster Stainer 1174,5,120000,40000,1
prt_maze01,139,180,21,21 monster Caramel 1103,5,120000,40000,1
prt_maze01,99,180,21,21 monster Dustiness 1114,5,120000,40000,1
-prt_maze01,59,100,21,21 monster Hornet 1004,5,120000,40000,1
+prt_maze01,59,100,21,21 monster Horn 1128,5,120000,40000,1
prt_maze01,99,100,21,21 monster Chonchon 1011,5,120000,40000,1
prt_maze01,59,180,21,21 monster Martin 1145,5,120000,40000,1
prt_maze01,19,60,21,21 monster Wolf 1013,5,120000,40000,1
diff --git a/npc/mobs/dungeons/prt_sew.txt b/npc/mobs/dungeons/prt_sew.txt
index 9f99a4e14..78511bd7c 100644
--- a/npc/mobs/dungeons/prt_sew.txt
+++ b/npc/mobs/dungeons/prt_sew.txt
@@ -14,28 +14,28 @@
//==================================================
// prt_sewb1 - Prontera Culvert
//==================================================
+prt_sewb1,0,0,0,0 monster Thief Bug 1051,30,5000,0,0
prt_sewb1,0,0,0,0 monster Thief Bug Egg 1048,80,5000,0,0
-prt_sewb1,0,0,0,0 monster Thief Bug Egg 1048,30,5000,0,0
prt_sewb1,0,0,0,0 monster Tarou 1175,10,5000,0,0
prt_sewb1,0,0,0,0 monster Familiar 1005,10,5000,0,0
//==================================================
// prt_sewb2 - Prontera Culvert
//==================================================
-prt_sewb2,0,0,0,0 monster Thief Bug Egg 1048,70,5000,0,0
+prt_sewb2,0,0,0,0 monster Thief Bug 1051,70,5000,0,0
prt_sewb2,0,0,0,0 monster Tarou 1175,60,5000,0,0
prt_sewb2,0,0,0,0 monster Plankton 1161,30,5000,0,0
prt_sewb2,0,0,0,0 monster Thief Bug Egg 1048,20,5000,0,0
prt_sewb2,0,0,0,0 monster Spore 1014,20,5000,0,0
-prt_sewb2,0,0,0,0 monster Thief Bug Egg 1048,10,5000,0,0
+prt_sewb2,0,0,0,0 monster Thief Bug Female 1053,10,5000,0,0
prt_sewb2,0,0,0,0 monster Familiar 1005,10,5000,0,0
//==================================================
// prt_sewb3 - Prontera Culvert
//==================================================
-prt_sewb3,0,0,0,0 monster Thief Bug Egg 1048,65,5000,0,0
+prt_sewb3,0,0,0,0 monster Thief Bug Female 1053,65,5000,0,0
prt_sewb3,0,0,0,0 monster Thief Bug Male 1054,65,5000,0,0
-prt_sewb3,0,0,0,0 monster Thief Bug Egg 1048,20,5000,0,0
+prt_sewb3,0,0,0,0 monster Thief Bug 1051,20,5000,0,0
prt_sewb3,0,0,0,0 monster Familiar 1005,20,5000,0,0
prt_sewb3,0,0,0,0 monster Tarou 1175,15,5000,0,0
prt_sewb3,0,0,0,0 monster Poison Spore 1077,15,5000,0,0
@@ -45,9 +45,9 @@ prt_sewb3,0,0,0,0 monster Thief Bug Egg 1048,10,5000,0,0
// prt_sewb4 - Prontera Culvert
//==================================================
prt_sewb4,0,0,0,0 monster Thief Bug Male 1054,70,5000,0,0
-prt_sewb4,0,0,0,0 monster Thief Bug Egg 1048,20,5000,0,0
-prt_sewb4,0,0,0,0 monster Thief Bug Egg 1048,20,5000,0,0
+prt_sewb4,0,0,0,0 monster Thief Bug 1051,20,5000,0,0
+prt_sewb4,0,0,0,0 monster Thief Bug Female 1053,20,5000,0,0
prt_sewb4,0,0,0,0 monster Drainliar 1111,20,5000,0,0
prt_sewb4,0,0,0,0 monster Thief Bug Egg 1048,10,5000,0,0
prt_sewb4,0,0,0,0 monster Cramp 1209,5,5000,0,0
-prt_sewb4,0,0,0,0 boss_monster Golden Thief Bug 1086,1,3600000,600000,1 \ No newline at end of file
+prt_sewb4,0,0,0,0 boss_monster Golden Thief Bug 1086,1,3600000,600000,1
diff --git a/npc/mobs/dungeons/tha_t.txt b/npc/mobs/dungeons/tha_t.txt
index 6fe6a562d..5a25add53 100644
--- a/npc/mobs/dungeons/tha_t.txt
+++ b/npc/mobs/dungeons/tha_t.txt
@@ -30,7 +30,7 @@ tha_t02,0,0,0,0 monster Mimic 1191,30,5000,0,0
tha_t02,0,0,0,0 monster Plasma 1697,20,5000,0,0
tha_t02,0,0,0,0 monster Death Word 1698,10,5000,0,0
tha_t02,0,0,0,0 monster Rideword 1195,10,5000,0,0
-tha_t02,0,0,0,0 monster Elder Willow 1033,10,5000,0,0
+tha_t02,0,0,0,0 monster Elder 1377,10,5000,0,0
tha_t02,0,0,0,0 monster Alice 1275,10,5000,0,0
tha_t02,0,0,0,0 monster Baroness of Retribution 1702,4,5000,0,0
@@ -42,7 +42,7 @@ tha_t03,0,0,0,0 monster Rideword 1195,30,5000,0,0
tha_t03,0,0,0,0 monster Plasma 1696,20,5000,0,0
tha_t03,0,0,0,0 monster Mimic 1191,10,5000,0,0
tha_t03,0,0,0,0 monster Ancient Mimic 1699,10,5000,0,0
-tha_t03,0,0,0,0 monster Elder Willow 1033,10,5000,0,0
+tha_t03,0,0,0,0 monster Elder 1377,10,5000,0,0
tha_t03,0,0,0,0 monster Mistress of Shelter 1701,4,5000,0,0
//==================================================
@@ -52,7 +52,7 @@ tha_t04,0,0,0,0 monster Death Word 1698,20,5000,0,0
tha_t04,0,0,0,0 monster Rideword 1195,20,5000,0,0
tha_t04,0,0,0,0 monster Mimic 1191,20,5000,0,0
tha_t04,0,0,0,0 monster Ancient Mimic 1699,20,5000,0,0
-tha_t04,0,0,0,0 monster Elder Willow 1033,20,5000,0,0
+tha_t04,0,0,0,0 monster Elder 1377,20,5000,0,0
tha_t04,0,0,0,0 monster Plasma 1694,20,5000,0,0
tha_t04,0,0,0,0 monster Owl Duke 1320,10,5000,0,0
tha_t04,0,0,0,0 monster Owl Baron 1295,10,5000,0,0
@@ -65,7 +65,7 @@ tha_t05,0,0,0,0 monster Owl Duke 1320,80,5000,0,0
tha_t05,0,0,0,0 monster Death Word 1698,40,5000,0,0
tha_t05,0,0,0,0 monster Ancient Mimic 1699,40,5000,0,0
tha_t05,0,0,0,0 monster Owl Baron 1295,20,5000,0,0
-tha_t05,0,0,0,0 monster Elder Willow 1033,20,5000,0,0
+tha_t05,0,0,0,0 monster Elder 1377,20,5000,0,0
tha_t05,0,0,0,0 monster Plasma 1696,10,5000,0,0
tha_t05,0,0,0,0 monster Plasma 1695,10,5000,0,0
tha_t05,0,0,0,0 monster Plasma 1697,10,5000,0,0
@@ -79,7 +79,7 @@ tha_t06,0,0,0,0 monster Death Word 1698,40,5000,0,0
tha_t06,0,0,0,0 monster Owl Duke 1320,40,5000,0,0
tha_t06,0,0,0,0 monster Owl Baron 1295,40,5000,0,0
tha_t06,0,0,0,0 monster Ancient Mimic 1699,40,5000,0,0
-tha_t06,0,0,0,0 monster Elder Willow 1033,20,5000,0,0
+tha_t06,0,0,0,0 monster Elder 1377,20,5000,0,0
tha_t06,0,0,0,0 monster Plasma 1696,10,5000,0,0
tha_t06,0,0,0,0 monster Plasma 1695,10,5000,0,0
tha_t06,0,0,0,0 monster Plasma 1697,10,5000,0,0
@@ -149,4 +149,4 @@ tha_t12,0,0,0,0 monster Baroness of Retribution 1702,5,5000,0,0
tha_t12,0,0,0,0 monster Mistress of Shelter 1701,5,5000,0,0
tha_t12,0,0,0,0 monster Lady Solace 1703,5,5000,0,0
tha_t12,0,0,0,0 monster Plasma 1693,5,5000,0,0
-tha_t12,0,0,0,0 monster Odium of Thanatos 1709,4,5000,0,0 \ No newline at end of file
+tha_t12,0,0,0,0 monster Odium of Thanatos 1709,4,5000,0,0
diff --git a/npc/mobs/dungeons/thor_v.txt b/npc/mobs/dungeons/thor_v.txt
index 2b28e4506..82ea23a64 100644
--- a/npc/mobs/dungeons/thor_v.txt
+++ b/npc/mobs/dungeons/thor_v.txt
@@ -20,36 +20,36 @@
// thor_v01 - Thor Volcano Dungeon
//==================================================
thor_v01,0,0,0,0 monster Kasa 1833,45,5000,0,0
-thor_v01,0,0,0,0 monster Fire Imp 1837,25,5000,0,0
+thor_v01,0,0,0,0 monster Imp 1837,25,5000,0,0
thor_v01,0,0,0,0 monster Magmaring 1836,10,5000,0,0
thor_v01,0,0,0,0 monster Salamander 1831,7,5000,0,0
-thor_v01,0,0,0,0 monster Bow Master 1830,5,5000,0,0
-thor_v01,0,0,0,0 monster Sword Master 1829,5,5000,0,0
-thor_v01,0,0,0,0 monster Bow Master 1830,5,420000,0,0
-thor_v01,0,0,0,0 monster Sword Master 1829,5,420000,0,0
-thor_v01,0,0,0,0 monster Byorgue 1839,1,5000,0,0
+thor_v01,0,0,0,0 monster Bow Guardian 1830,5,5000,0,0
+thor_v01,0,0,0,0 monster Sword Guardian 1829,5,5000,0,0
+thor_v01,0,0,0,0 monster Bow Guardian 1830,5,420000,0,0
+thor_v01,0,0,0,0 monster Sword Guardian 1829,5,420000,0,0
+thor_v01,0,0,0,0 monster Byrogue 1839,1,5000,0,0
//==================================================
// thor_v02 - Thor Volcano Dungeon
//==================================================
thor_v02,0,0,0,0 monster Knocker 1838,55,5000,0,0
thor_v02,0,0,0,0 monster Magmaring 1836,10,5000,0,0
-thor_v02,0,0,0,0 monster Fire Imp 1837,10,5000,0,0
+thor_v02,0,0,0,0 monster Imp 1837,10,5000,0,0
thor_v02,0,0,0,0 monster Kaho 1072,10,5000,0,0
thor_v02,0,0,0,0 monster Salamander 1831,1,5000,0,0
-thor_v02,0,0,0,0 monster Bow Master 1830,1,7200000,0,0
-thor_v02,0,0,0,0 monster Sword Master 1829,1,7200000,0,0
+thor_v02,0,0,0,0 monster Bow Guardian 1830,1,7200000,0,0
+thor_v02,0,0,0,0 monster Sword Guardian 1829,1,7200000,0,0
//==================================================
// thor_v03 - Thor Volcano Dungeon
//==================================================
thor_v03,0,0,0,0 monster Salamander 1831,60,5000,0,0
thor_v03,0,0,0,0 monster Kasa 1833,40,5000,0,0
-thor_v03,0,0,0,0 monster Bow Master 1830,10,5000,0,0
-thor_v03,0,0,0,0 monster Sword Master 1829,10,5000,0,0
-thor_v03,0,0,0,0 monster Byorgue 1839,5,5000,0,0
-thor_v03,0,0,0,0 monster Sword Master 1829,5,5000,0,0
-thor_v03,0,0,0,0 monster Bow Master 1830,5,5000,0,0
-thor_v03,0,0,0,0 monster Bow Master 1830,5,1800000,0,0
-thor_v03,0,0,0,0 monster Sword Master 1829,5,1800000,0,0
-thor_v03,0,0,0,0 boss_monster Ifrit 1832,1,39600000,600000,0 \ No newline at end of file
+thor_v03,0,0,0,0 monster Bow Guardian 1830,10,5000,0,0
+thor_v03,0,0,0,0 monster Sword Guardian 1829,10,5000,0,0
+thor_v03,0,0,0,0 monster Byrogue 1839,5,5000,0,0
+thor_v03,0,0,0,0 monster Sword Guardian 1829,5,5000,0,0
+thor_v03,0,0,0,0 monster Bow Guardian 1830,5,5000,0,0
+thor_v03,0,0,0,0 monster Bow Guardian 1830,5,1800000,0,0
+thor_v03,0,0,0,0 monster Sword Guardian 1829,5,1800000,0,0
+thor_v03,0,0,0,0 boss_monster Ifrit 1832,1,39600000,600000,0
diff --git a/npc/mobs/dungeons/xmas_dun.txt b/npc/mobs/dungeons/xmas_dun.txt
index 0a2806bd9..a0b5df902 100644
--- a/npc/mobs/dungeons/xmas_dun.txt
+++ b/npc/mobs/dungeons/xmas_dun.txt
@@ -16,9 +16,9 @@
//==================================================
// xmas_dun01 - Toy Factory Warehouse
//==================================================
+xmas_dun01,0,0,0,0 monster Cookie 1265,40,5000,0,0
xmas_dun01,0,0,0,0 monster Christmas Cookie 1246,40,5000,0,0
-xmas_dun01,0,0,0,0 monster Christmas Cookie 1246,40,5000,0,0
-xmas_dun01,0,0,0,0 monster Marina 1141,20,5000,0,0
+xmas_dun01,0,0,0,0 monster Marin 1242,20,5000,0,0
xmas_dun01,0,0,0,0 monster Poporing 1031,20,5000,0,0
xmas_dun01,0,0,0,0 monster Drops 1113,10,5000,0,0
xmas_dun01,0,0,0,0 monster Poring 1002,10,5000,0,0
@@ -32,6 +32,6 @@ xmas_dun01,0,0,0,0 monster Angeling 1096,1,3600000,1800000,0
//==================================================
xmas_dun02,0,0,0,0 monster Myst Case 1249,50,5000,0,0
xmas_dun02,0,0,0,0 monster Cruiser 1248,35,5000,0,0
+xmas_dun02,0,0,0,0 monster Cookie 1265,20,5000,0,0
xmas_dun02,0,0,0,0 monster Christmas Cookie 1246,20,5000,0,0
-xmas_dun02,0,0,0,0 monster Christmas Cookie 1246,20,5000,0,0
-xmas_dun02,0,0,0,0 boss_monster Stormy Knight 1251,1,3600000,600000,0 \ No newline at end of file
+xmas_dun02,0,0,0,0 boss_monster Stormy Knight 1251,1,3600000,600000,0
diff --git a/npc/mobs/fields/geffen.txt b/npc/mobs/fields/geffen.txt
index cff6c2931..bfd057452 100644
--- a/npc/mobs/fields/geffen.txt
+++ b/npc/mobs/fields/geffen.txt
@@ -38,7 +38,7 @@ gef_fild01,215,225,10,10 monster Green Plant 1080,5,360000,180000,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 Hornet 1004,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
@@ -93,7 +93,7 @@ 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 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
@@ -199,4 +199,4 @@ gef_fild11,283,100,4,1 monster Black Mushroom 1084,3,360000,180000,1
//==================================================
// gef_fild14 - Disabled on Renewal
-//================================================== \ No newline at end of file
+//==================================================
diff --git a/npc/mobs/fields/lutie.txt b/npc/mobs/fields/lutie.txt
index 91c508a9b..2ca535d67 100644
--- a/npc/mobs/fields/lutie.txt
+++ b/npc/mobs/fields/lutie.txt
@@ -16,7 +16,7 @@
//==================================================
// xmas_fild01 - Lutie Field
//==================================================
-xmas_fild01,0,0,0,0 monster Marina 1141,35,5000,0,0
+xmas_fild01,0,0,0,0 monster Marin 1242,35,5000,0,0
xmas_fild01,0,0,0,0 monster Sasquatch 1243,5,5000,0,0
xmas_fild01,0,0,0,0 monster Garm Baby 1515,1,5000,0,0
-xmas_fild01,0,0,0,0 boss_monster Garm 1252,1,7200000,600000,1 \ No newline at end of file
+xmas_fild01,0,0,0,0 boss_monster Garm 1252,1,7200000,600000,1
diff --git a/npc/mobs/fields/mjolnir.txt b/npc/mobs/fields/mjolnir.txt
index 5babaf0ce..ee5ab7ffb 100644
--- a/npc/mobs/fields/mjolnir.txt
+++ b/npc/mobs/fields/mjolnir.txt
@@ -27,7 +27,7 @@ mjolnir_01,311,271,25,25 monster Blue Plant 1079,5,360000,180000,1
//==================================================
// mjolnir_02 - Mt.Mjolnir
//==================================================
-mjolnir_02,0,0,0,0 monster Hornet 1004,140,5000,0,0
+mjolnir_02,0,0,0,0 monster Horn 1128,140,5000,0,0
mjolnir_02,0,0,0,0 monster Poporing 1031,20,5000,0,0
mjolnir_02,0,0,0,0 monster Elder Willow 1033,20,5000,0,0
mjolnir_02,0,0,0,0 monster Yoyo 1057,20,5000,0,0
diff --git a/npc/mobs/fields/payon.txt b/npc/mobs/fields/payon.txt
index cc6a4b9ba..9d989897d 100644
--- a/npc/mobs/fields/payon.txt
+++ b/npc/mobs/fields/payon.txt
@@ -60,7 +60,7 @@ pay_fild03,372,64,15,15 monster Green Plant 1080,4,180000,90000,1
// pay_fild04 - Sograt Desert
//==================================================
pay_fild04,0,0,0,0 monster Poporing 1031,130,5000,0,0
-pay_fild04,0,0,0,0 monster Marina 1141,30,5000,0,0
+pay_fild04,0,0,0,0 monster Marin 1242,30,5000,0,0
pay_fild04,0,0,0,0 monster Drops 1113,20,5000,0,0
pay_fild04,0,0,0,0 monster Poring 1002,15,5000,0,0
pay_fild04,0,0,0,0 monster Angeling 1096,1,3600000,1800000,1
@@ -106,7 +106,7 @@ pay_fild08,143,156,40,40 monster Shining Plant 1083,1,3600000,1800000,1
// pay_fild09 - Payon Forest
//==================================================
pay_fild09,0,0,0,0 monster Elder Willow 1033,140,5000,0,0
-pay_fild09,0,0,0,0 monster Hornet 1004,30,5000,0,0
+pay_fild09,0,0,0,0 monster Horn 1128,30,5000,0,0
pay_fild09,0,0,0,0 monster Coco 1104,30,5000,0,0
pay_fild09,198,217,30,30 monster Green Plant 1080,10,360000,180000,0
pay_fild09,198,217,30,30 monster Shining Plant 1083,1,1800000,900000,1
@@ -127,4 +127,4 @@ pay_fild10,66,332,10,10 monster Blue Plant 1079,1,360000,180000,1
//==================================================
// pay_fild11 - Disabled on Renewal
-//================================================== \ No newline at end of file
+//==================================================
diff --git a/npc/mobs/fields/prontera.txt b/npc/mobs/fields/prontera.txt
index dac0c99dc..a6dc9f144 100644
--- a/npc/mobs/fields/prontera.txt
+++ b/npc/mobs/fields/prontera.txt
@@ -46,7 +46,7 @@ prt_fild02,0,0,0,0 monster Shining Plant 1083,2,1800000,900000,1
//==================================================
prt_fild03,0,0,0,0 monster Yoyo 1057,100,5000,0,0
prt_fild03,0,0,0,0 monster Poporing 1031,30,5000,0,0
-prt_fild03,0,0,0,0 monster Hornet 1004,30,5000,0,0
+prt_fild03,0,0,0,0 monster Horn 1128,30,5000,0,0
prt_fild03,0,0,0,0 monster Choco 1214,1,5000,0,0
prt_fild03,296,58,15,15 monster Green Plant 1080,5,180000,90000,1
prt_fild03,296,58,15,15 monster Blue Plant 1079,2,900000,450000,1
@@ -67,7 +67,7 @@ prt_fild04,350,114,10,10 monster Green Plant 1080,5,900000,450000,1
//==================================================
prt_fild05,0,0,0,0 monster Hornet 1004,140,5000,0,0
prt_fild05,0,0,0,0 monster Thief Bug Egg 1048,30,5000,0,0
-prt_fild05,0,0,0,0 monster Thief Bug Egg 1048,30,5000,0,0
+prt_fild05,0,0,0,0 monster Thief Bug 1051,30,5000,0,0
prt_fild05,208,37,10,10 monster Green Plant 1080,6,900000,450000,1
prt_fild05,208,37,10,10 monster Blue Plant 1079,1,900000,450000,1
@@ -106,7 +106,7 @@ prt_fild09,237,115,5,5 monster Yellow Plant 1081,3,360000,180000,1
//==================================================
prt_fild10,0,0,0,0 monster Elder Willow 1033,140,5000,0,0
prt_fild10,0,0,0,0 monster Poporing 1031,20,5000,0,0
-prt_fild10,0,0,0,0 monster Hornet 1004,20,5000,0,0
+prt_fild10,0,0,0,0 monster Horn 1128,20,5000,0,0
prt_fild10,0,0,0,0 monster Coco 1104,20,5000,0,0
prt_fild10,99,114,20,5 monster Red Mushroom 1085,15,360000,180000,1
prt_fild10,155,179,10,10 monster Shining Plant 1083,1,1800000,900000,1
@@ -123,4 +123,4 @@ prt_fild11,0,0,0,0 monster Goblin 1125,10,5000,0,0
prt_fild11,0,0,0,0 monster Goblin 1123,10,5000,0,0
prt_fild11,0,0,0,0 monster Goblin 1122,10,5000,0,0
prt_fild11,0,0,0,0 monster Panzer Goblin 1308,1,1800000,1200000,0
-prt_fild11,0,0,0,0 monster Red Mushroom 1085,10,180000,90000,1 \ No newline at end of file
+prt_fild11,0,0,0,0 monster Red Mushroom 1085,10,180000,90000,1
diff --git a/npc/mobs/fields/splendide.txt b/npc/mobs/fields/splendide.txt
index faa66a48e..20f3dab12 100644
--- a/npc/mobs/fields/splendide.txt
+++ b/npc/mobs/fields/splendide.txt
@@ -22,8 +22,8 @@ spl_fild01,0,0,0,0 monster Cornus 1992,25,5000,0,0
// spl_fild02 - Splendide Field
//==================================================
spl_fild02,0,0,0,0 monster Pinguicula 1995,75,5000,0,0
-spl_fild02,0,0,0,0 monster Bradium Golem 2049,20,5000,0,0
-spl_fild02,0,0,0,0 monster Naga 2047,20,5000,0,0
+spl_fild02,0,0,0,0 monster Bradium Golem 2024,20,5000,0,0
+spl_fild02,0,0,0,0 monster Naga 1993,20,5000,0,0
spl_fild02,0,0,0,0 monster Luciola Vespa 1994,15,5000,0,0
//==================================================
@@ -32,4 +32,4 @@ spl_fild02,0,0,0,0 monster Luciola Vespa 1994,15,5000,0,0
spl_fild03,0,0,0,0 monster Luciola Vespa 1994,35,5000,0,0
spl_fild03,0,0,0,0 monster Cornus 1992,25,5000,0,0
spl_fild03,0,0,0,0 monster Naga 1993,20,5000,0,0
-spl_fild03,0,0,0,0 monster Tendrilion 1991,1,3600000,0,0 \ No newline at end of file
+spl_fild03,0,0,0,0 monster Tendrilion 1991,1,3600000,0,0