summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/Changelog.txt1
-rw-r--r--db/mob_db.txt52
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/warps/cities/rachel.txt10
-rw-r--r--npc/warps/fields/rachel_fild.txt2
5 files changed, 33 insertions, 35 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 29abf88c1..fb0327d8b 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -20,6 +20,7 @@
========================
10/01
+ * Adjusted drop rates thanks to info from Tharis [Playtester]
* Updated view ids of some headgears [Playtester]
- beware of crashes when your client is too old
09/29
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 1b8cb22ac..74b589caf 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -91,12 +91,12 @@
1085,RED_MUSHROOM,Red Mushroom,Red Mushroom,1,15,0,0,0,1,1,2,100,99,1,1,1,1,1,1,7,12,0,3,22,64,2000,1,1,1,0,0,0,0,0,0,0,0,970,50,972,50,630,20,949,2000,990,1000,921,5500,921,5500,7033,5500,0,0,0,0
1086,GOLDEN_BUG,Golden Thief Bug,Golden Thief Bug,64,126000,0,14300,7150,1,870,1145,60,45,1,75,35,45,85,150,10,12,2,4,43,171,100,768,768,480,7150,10000,2610,2000,701,1000,0,0,969,1000,1524,150,2246,250,10016,500,714,300,985,2000,984,1500,0,0,0,0,4128,1
1087,ORK_HERO,Orc Hero,Orc Hero,77,295700,0,58630,32890,1,2257,2542,40,45,1,91,99,70,105,90,10,10,2,7,42,1205,150,1678,780,648,29315,10000,725,2000,607,1500,999,5000,968,9700,10018,500,1366,150,2106,250,1124,1000,985,4559,984,3589,0,0,0,0,4143,1
-1088,VOCAL,Vocal,Vocal,18,3016,0,110,88,1,71,82,10,30,1,28,26,30,53,40,10,10,1,4,22,1205,200,1080,648,480,0,0,0,0,0,0,0,0,2247,50,940,8000,721,1000,752,1500,912,5335,645,700,1917,10,2420,10,0,0,4211,1
-1089,TOAD,Toad,Toad,10,5065,0,100,50,1,26,32,0,0,1,5,10,10,10,25,10,10,1,5,21,1205,200,1236,336,432,0,0,0,0,0,0,0,0,2244,50,518,2000,729,1000,746,1500,970,100,971,100,0,0,5125,10,0,0,4306,1
-1090,MASTERING,Mastering,Mastering,2,2415,0,30,10,1,18,24,0,10,1,2,2,0,17,60,10,10,1,3,21,1205,300,1072,672,480,0,0,0,0,0,0,0,0,2257,200,619,50,722,1000,512,18,512,8000,512,8000,531,4000,2116,10,0,0,4197,1
+1088,VOCAL,Vocal,Vocal,18,3016,0,110,88,1,71,82,10,30,1,28,26,30,53,40,10,10,1,4,22,1205,200,1080,648,480,0,0,0,0,0,0,0,0,2247,50,940,8000,721,1000,752,1500,912,5335,645,700,1917,10,2420,50,0,0,4211,1
+1089,TOAD,Toad,Toad,10,5065,0,100,50,1,26,32,0,0,1,5,10,10,10,25,10,10,1,5,21,1205,200,1236,336,432,0,0,0,0,0,0,0,0,2244,50,518,2000,729,1000,746,1500,970,100,971,100,0,0,5125,50,0,0,4306,1
+1090,MASTERING,Mastering,Mastering,2,2415,0,30,10,1,18,24,0,10,1,2,2,0,17,60,10,10,1,3,21,1205,300,1072,672,480,0,0,0,0,0,0,0,0,2257,200,619,50,722,1000,512,18,512,8000,512,8000,531,4000,2116,50,0,0,4197,1
1091,DRAGON_FLY,Dragon Fly,Dragon Fly,8,2400,0,88,44,1,22,27,40,0,1,20,8,15,17,5,10,10,0,4,24,1205,100,1076,576,480,0,0,0,0,0,0,0,0,2245,200,501,8000,719,1500,742,2000,2607,3000,625,50,533,3000,0,0,0,0,4179,1
-1092,VAGABOND_WOLF,Vagabond Wolf,Vagabond Wolf,24,12240,0,247,176,1,135,159,10,0,1,45,48,20,50,65,10,10,1,2,22,1205,150,1048,648,432,0,0,0,0,0,0,0,0,2248,200,920,8000,728,1500,1148,100,517,8000,725,10,626,50,2521,10,0,0,4183,1
-1093,ECLIPSE,Eclipse,Eclipse,6,1800,0,60,55,1,20,26,0,40,1,36,6,0,11,80,10,10,0,2,60,1205,200,1456,456,336,0,0,0,0,0,0,0,0,2250,200,507,8000,727,1200,746,1500,706,30,622,50,534,5000,2355,10,0,0,4266,1
+1092,VAGABOND_WOLF,Vagabond Wolf,Vagabond Wolf,24,12240,0,247,176,1,135,159,10,0,1,45,48,20,50,65,10,10,1,2,22,1205,150,1048,648,432,0,0,0,0,0,0,0,0,2248,200,920,8000,728,1500,1148,100,517,8000,725,10,626,50,2521,50,0,0,4183,1
+1093,ECLIPSE,Eclipse,Eclipse,6,1800,0,60,55,1,20,26,0,40,1,36,6,0,11,80,10,10,0,2,60,1205,200,1456,456,336,0,0,0,0,0,0,0,0,2250,200,507,8000,727,1200,746,1500,706,30,622,50,534,5000,2355,50,0,0,4266,1
1094,AMBERNITE,Ambernite,Ambernite,13,495,0,57,38,1,39,46,30,0,1,13,13,5,18,5,10,12,2,4,21,145,400,2048,648,648,0,0,0,0,0,0,0,0,991,35,946,5500,910,1200,935,3000,943,2,757,14,1002,150,0,0,0,0,4032,1
1095,ANDRE,Andre,Andre,17,688,0,109,71,1,60,71,10,0,1,17,24,20,26,20,10,12,0,4,22,139,300,1288,288,384,0,0,0,0,0,0,0,0,955,5500,910,1000,938,500,993,40,1001,4,1002,350,757,28,0,0,0,0,4043,1
1096,ANGELING,Angeling,Angeling,20,55000,0,163,144,1,120,195,0,70,1,50,20,75,68,200,10,10,1,8,86,1205,200,1072,672,672,0,0,0,0,0,0,0,0,2254,100,2324,60,610,500,2282,1,504,1000,512,28,714,40,0,0,0,0,4054,1
@@ -157,7 +157,7 @@
1151,MYST,Myst,Myst,38,3745,0,1391,688,1,365,445,0,40,1,38,18,1,53,10,10,12,2,0,25,1173,200,1576,576,384,0,0,0,0,0,0,0,0,5005,2,1019,800,10005,10,756,65,757,97,605,20,514,35,0,0,0,0,4108,1
1152,ORC_SKELETON,Orc Skeleton,Orc Skeleton,28,2278,0,315,194,1,190,236,10,10,1,14,18,1,30,15,10,12,1,1,29,2181,200,2420,720,648,0,0,0,0,0,0,0,0,922,5500,932,3500,757,80,2299,2,1358,10,511,50,0,0,0,0,0,0,4085,1
1153,ORC_ZOMBIE,Orc Zombie,Orc Zombie,24,1568,0,196,120,1,151,184,5,10,1,12,24,1,24,5,10,12,1,1,29,2181,400,2852,1152,840,0,0,0,0,0,0,0,0,1043,5500,938,3000,714,1,0,0,0,0,0,0,0,0,0,0,0,0,4071,1
-1154,PASANA,Pasana,Pasana,61,8289,0,4087,2135,1,513,682,29,35,1,73,50,61,69,43,10,12,1,7,43,149,165,976,576,288,0,0,0,0,0,0,0,0,7110,4365,7121,2500,757,20,1105,500,1217,150,0,0,0,0,2522,2,0,0,4099,1
+1154,PASANA,Pasana,Pasana,61,8289,0,4087,2135,1,513,682,29,35,1,73,50,61,69,43,10,12,1,7,43,149,165,976,576,288,0,0,0,0,0,0,0,0,7110,4365,7121,2500,757,20,1105,500,1217,150,0,0,0,0,2522,20,0,0,4099,1
1155,PETIT,Petite,Petite,44,6881,0,1677,1034,1,360,427,30,30,1,44,62,69,79,60,10,12,1,9,22,149,200,1624,620,384,0,0,0,0,0,0,0,0,1035,5335,1037,300,756,140,509,1000,1510,150,912,1500,606,15,0,0,0,0,4118,1
1156,PETIT_,Petite,Petite,45,5747,0,1758,1075,1,300,355,20,45,1,113,45,69,73,80,10,12,1,9,24,149,150,1420,1080,528,0,0,0,0,0,0,0,0,1036,5335,1037,300,985,61,509,1000,602,500,912,1500,606,15,13006,1,0,0,4120,1
1157,PHARAOH,Pharaoh,Pharaoh,93,445997,0,114990,41899,1,2267,3015,67,70,1,93,100,104,89,112,10,12,2,7,67,1205,125,2000,1000,500,57495,10000,607,5500,526,5000,732,5000,7113,5820,7114,2500,1136,100,2327,150,5002,500,1552,300,1231,80,0,0,0,0,4148,1
@@ -762,11 +762,11 @@
// Kiel Dungeon monsters (done, but drop rates guessed)
1733,KIEL,Kiel,Kiel,90,523000,0,36500,23405,1,1682,3311,28,32,1,112,76,89,156,102,10,12,1,0,47,165,150,584,576,480,0,0,0,0,0,0,0,0,7513,2500,512,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1734,KIEL_,Kiel D-01,Kiel D-01,90,1523000,0,2356200,512602,1,3280,6560,28,32,1,130,140,160,199,180,10,12,1,0,47,1461,150,584,576,480,1178100,10000,617,1000,7513,500,0,0,7513,2500,2319,50,1618,50,1242,50,2621,25,0,0,0,0,2650,25,2651,25,4403,1
-1735,ALICEL,Alicel,Alicel,75,37520,0,8890,5420,1,1800,2770,30,30,1,58,50,51,92,40,10,12,1,0,67,133,150,584,576,480,0,0,0,0,0,0,0,0,7512,200,7507,200,999,250,7317,2500,1812,2,985,20,2504,3,2517,1,0,0,4401,1
-1736,ALIOT,Aliot,Aliot,75,48290,0,13020,4006,1,950,2470,35,15,1,32,87,12,68,19,10,12,1,0,67,133,150,584,576,480,0,0,0,0,0,0,0,0,7512,200,7507,200,999,250,7317,2500,1408,15,985,20,512,5,2516,1,0,0,4402,1
+1734,KIEL_,Kiel D-01,Kiel D-01,90,1523000,0,2356200,512602,1,3280,6560,28,32,1,130,140,160,199,180,10,12,1,0,47,1461,150,584,576,480,1178100,10000,617,1000,7513,500,0,0,7513,2500,2319,50,1618,50,1242,50,2621,10,0,0,0,0,2650,25,2651,25,4403,1
+1735,ALICEL,Alicel,Alicel,75,37520,0,8890,5420,1,1800,2770,30,30,1,58,50,51,92,40,10,12,1,0,67,133,150,584,576,480,0,0,0,0,0,0,0,0,7512,200,7507,200,999,250,7317,2500,1812,2,985,50,2504,3,2517,1,0,0,4401,1
+1736,ALIOT,Aliot,Aliot,75,48290,0,13020,4006,1,950,2470,35,15,1,32,87,12,68,19,10,12,1,0,67,133,150,584,576,480,0,0,0,0,0,0,0,0,7512,200,7507,200,999,250,7317,2500,1408,15,985,50,512,5,2516,1,0,0,4402,1
1737,ALIZA,Aliza,Aliza,69,19000,0,6583,3400,1,750,1100,8,5,1,72,52,35,110,140,10,12,1,7,60,145,150,584,576,480,0,0,0,0,0,0,0,0,637,40,2407,3,2626,1,7047,2500,12128,10,661,5,2233,3,2518,1,0,0,4400,1
-1738,CONSTANT,Constant,Constant,55,10000,0,3230,116,1,460,580,12,12,1,28,26,47,66,14,10,12,0,0,67,133,150,584,576,480,0,0,0,0,0,0,0,0,7512,100,7507,100,7325,2000,999,125,757,50,512,5,0,0,0,0,0,0,0,0
+1738,CONSTANT,Constant,Constant,55,10000,0,3230,116,1,460,580,12,12,1,28,26,47,66,14,10,12,0,0,67,133,150,584,576,480,0,0,0,0,0,0,0,0,7512,100,7507,100,7325,2000,999,125,757,100,512,5,0,0,0,0,0,0,0,0
1739,G_ALICEL,Alicel,Alicel,75,37520,0,0,0,1,1800,2770,30,30,1,58,50,51,92,40,10,12,1,0,67,133,150,584,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1740,G_ALIOT,Aliot,Aliot,75,48290,0,0,0,1,950,2470,35,15,1,32,87,12,68,19,10,12,1,0,67,133,150,584,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1741,G_COOKIE_XMAS,Christmas Cookie,Christmas Cookie,28,2090,0,0,0,1,140,170,0,50,1,24,30,53,45,100,10,12,0,7,46,145,400,1248,1248,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -782,10 +782,10 @@
// Odin monsters (done, but drop rates guessed)
1751,RANDGRIS,Valkyrie Randgris,Valkyrie Randgris,99,3567200,0,2854900,3114520,1,5560,8980,25,42,1,120,80,120,220,210,10,12,2,8,86,165,150,584,576,480,1427450,10000,603,1000,617,500,617,250,7510,2500,2357,500,2524,500,2421,500,2115,500,2229,100,7024,100,2353,100,0,0,4407,1
-1752,SKOGUL,Skogul,Skogul,70,87544,0,27620,10,1,1110,1930,20,15,1,69,70,50,112,52,10,12,1,6,67,133,150,584,576,480,0,0,0,0,0,0,0,0,7511,500,7054,3500,716,100,739,15,2609,30,757,100,0,0,0,0,0,0,4404,1
-1753,FRUS,Frus,Frus,69,83422,0,20620,10,1,1110,1780,20,15,1,69,60,50,123,52,10,12,1,6,67,133,150,584,576,480,0,0,0,0,0,0,0,0,7511,500,7054,3500,716,100,2622,1,2308,10,757,100,0,0,0,0,0,0,4405,1
-1754,SKEGGIOLD,Skeggiold,Skeggiold,81,295200,0,91100,10,1,1400,2020,12,32,1,100,50,72,106,50,10,12,0,8,66,165,250,792,780,480,0,0,0,0,0,0,0,0,7511,1000,2254,2,7063,1250,608,25,983,3,2353,5,2322,10,2504,10,0,0,4406,1
-1755,SKEGGIOLD_,Skeggiold,Skeggiold,83,315200,0,99200,10,1,1600,2050,15,32,1,120,60,85,119,80,10,12,0,8,66,165,250,792,780,480,0,0,0,0,0,0,0,0,7511,1000,2254,2,7063,1250,608,25,978,3,2353,5,2322,10,2504,10,0,0,4406,1
+1752,SKOGUL,Skogul,Skogul,70,87544,0,27620,10,1,1110,1930,20,15,1,69,70,50,112,52,10,12,1,6,67,133,150,584,576,480,0,0,0,0,0,0,0,0,7511,500,7054,3500,716,500,739,15,2609,30,757,200,0,0,0,0,0,0,4404,1
+1753,FRUS,Frus,Frus,69,83422,0,20620,10,1,1110,1780,20,15,1,69,60,50,123,52,10,12,1,6,67,133,150,584,576,480,0,0,0,0,0,0,0,0,7511,500,7054,3500,716,500,2622,1,2308,10,757,200,0,0,0,0,0,0,4405,1
+1754,SKEGGIOLD,Skeggiold,Skeggiold,81,295200,0,91100,10,1,1400,2020,12,32,1,100,50,72,106,50,10,12,0,8,66,165,250,792,780,480,0,0,0,0,0,0,0,0,7511,1000,2254,5,7063,2500,608,100,983,10,2353,10,2322,20,2504,10,0,0,4406,1
+1755,SKEGGIOLD_,Skeggiold,Skeggiold,83,315200,0,99200,10,1,1600,2050,15,32,1,120,60,85,119,80,10,12,0,8,66,165,250,792,780,480,0,0,0,0,0,0,0,0,7511,1000,2254,5,7063,2500,608,100,978,10,2353,10,2322,20,2504,10,0,0,4406,1
1756,G_HYDRO,Hydro,Hydrolancer,89,308230,0,0,0,1,2554,3910,52,62,1,96,110,86,94,32,10,12,2,9,47,165,150,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1757,G_ACIDUS,Acidus,Acidus,80,51112,0,0,0,1,1289,2109,39,69,1,71,55,135,103,69,10,12,2,9,46,133,155,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1758,G_FERUS,Ferus,Ferus,70,29218,0,0,0,1,1056,1496,34,45,1,80,100,110,70,70,10,12,2,9,43,133,120,480,472,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -795,29 +795,29 @@
1762,G_FRUS,Frus,Frus,69,83422,0,0,0,1,1110,1780,20,15,1,69,60,50,123,52,10,12,1,6,67,133,150,584,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1763,G_SKEGGIOLD,Skeggiold,Skeggiold,81,295200,0,0,0,1,1400,2020,12,32,1,100,50,72,106,50,10,12,0,8,66,165,250,792,780,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1764,G_SKEGGIOLD_,Skeggiold,Skeggiold,83,315200,0,0,0,1,1600,2050,15,32,1,120,60,85,119,80,10,12,0,8,66,165,250,792,780,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1765,G_RANDGRIS,Valkyrie,Valkyrie,99,1567200,0,10000,10000,1,5560,8980,25,42,1,120,80,120,220,210,10,12,2,8,86,165,150,584,576,480,0,0,0,0,0,0,0,0,7510,500,617,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1765,G_RANDGRIS,Valkyrie,Valkyrie,99,1567200,0,10000,10000,1,5560,8980,25,42,1,120,80,120,220,210,10,12,2,8,86,165,150,584,576,480,0,0,0,0,0,0,0,0,7510,2500,617,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1766,EM_ANGELING,Angeling,Angeling,20,55000,0,163,144,1,120,195,0,70,1,50,20,75,68,200,10,10,1,8,86,1205,200,1072,672,672,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1767,EM_DEVILING,Deviling,Deviling,31,64500,0,211,412,1,135,270,5,70,1,50,20,75,77,200,10,12,1,6,87,1205,200,1072,1056,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
// Rachel / Ice Dungeon monsters (Poring Stats)
-1768,GLOOMUNDERNIGHT,Gloom Under Night,Gloom Under Night,89,2298000,0,962175,276445,1,5880,9516,10,20,1,89,89,127,134,89,10,12,2,0,68,165,150,584,576,480,461087,10000,617,1000,603,1000,0,0,7566,2500,7023,10,7024,10,617,100,0,0,0,0,0,0,0,0,0,0,0,0
+1768,GLOOMUNDERNIGHT,Gloom Under Night,Gloom Under Night,89,2298000,0,962175,276445,1,5880,9516,10,20,1,89,89,127,134,89,10,12,2,0,68,165,150,584,576,480,461087,10000,617,1000,603,1000,0,0,7566,2500,7023,100,7024,100,617,100,0,0,0,0,0,0,0,0,0,0,0,0
1769,AGAV,Agav,Agav,73,29620,0,9780,6622,1,103,1109,15,35,1,73,27,145,110,73,10,12,1,7,80,133,150,584,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1770,ECHIO,Echio,Echio,69,34900,0,13560,4300,1,750,1800,33,11,1,69,55,61,104,69,10,12,1,7,80,133,150,584,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1771,VANBERK,Vanberk,Vanberk,59,9988,0,4203,901,1,230,660,24,6,1,59,39,48,89,59,10,12,1,7,80,133,150,584,576,480,0,0,0,0,0,0,0,0,7563,100,7568,100,5172,1,2406,1,526,10,512,10,0,0,0,0,0,0,0,0
-1772,ISILLA,Isilla,Isilla,62,8297,0,3001,3001,1,89,733,11,19,1,62,12,103,93,62,10,12,1,7,80,133,150,584,576,480,0,0,0,0,0,0,0,0,7563,100,7568,100,2422,1,2610,10,2601,1,512,10,0,0,0,0,0,0,0,0
-1773,HODREMLIN,Hodremlin,Hodremlin,61,12180,0,6782,2022,7,845,1678,29,25,1,62,82,96,93,30,10,12,1,6,67,149,140,432,540,432,0,0,0,0,0,0,0,0,7563,100,1061,500,2422,1,7565,500,7340,500,0,0,0,0,0,0,0,0,0,0
-1774,SEEKER,Seeker,Seeker,65,10090,0,5671,4278,9,723,852,17,30,1,93,34,160,128,64,10,12,0,0,64,149,190,336,840,360,0,0,0,0,0,0,0,0,7563,100,1061,500,985,10,526,10,587,100,12183,10,0,0,0,0,0,0,0,0
-1775,SNOWIER,Snowier,Snowier,60,19230,0,5882,2966,1,770,1347,22,12,1,60,78,51,90,60,10,12,2,0,41,133,200,672,672,480,0,0,0,0,0,0,0,0,7066,500,7561,100,509,200,510,100,757,50,991,25,0,0,0,0,0,0,0,0
-1776,SIROMA,Siroma,Siroma,42,6800,0,2230,1005,1,220,440,12,8,1,42,24,37,70,42,10,12,0,0,61,131,400,672,672,480,0,0,0,0,0,0,0,0,7066,500,7561,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1777,ICE_TITAN,Ice Titan,Ice Titan,60,38200,0,13872,7928,1,1090,1570,71,15,1,60,101,54,90,60,10,12,2,0,61,133,200,872,672,480,0,0,0,0,0,0,0,0,7066,500,7561,100,984,20,985,20,757,50,991,25,995,10,0,0,0,0,0,0
-1778,GAZETI,Gazeti,Gazeti,55,12300,0,5758,2075,9,512,612,65,25,1,55,62,50,120,55,10,12,1,6,21,133,200,672,672,480,0,0,0,0,0,0,0,0,7066,500,7561,100,985,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1779,KTULLANUX,Ktullanux,Ktullanux,98,4417000,0,2720050,1120020,1,1680,10360,40,42,1,126,82,125,177,112,10,12,2,2,81,165,150,584,576,480,1360025,10000,607,1000,617,1000,0,0,2509,30,2111,30,607,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1771,VANBERK,Vanberk,Vanberk,59,9988,0,4203,901,1,230,660,24,6,1,59,39,48,89,59,10,12,1,7,80,133,150,584,576,480,0,0,0,0,0,0,0,0,7563,250,7568,1500,5172,5,2406,1,526,50,512,5,0,0,0,0,0,0,0,0
+1772,ISILLA,Isilla,Isilla,62,8297,0,3001,3001,1,89,733,11,19,1,62,12,103,93,62,10,12,1,7,80,133,150,584,576,480,0,0,0,0,0,0,0,0,7563,250,7568,1500,2422,1,2610,50,2601,1,512,5,0,0,0,0,0,0,0,0
+1773,HODREMLIN,Hodremlin,Hodremlin,61,12180,0,6782,2022,7,845,1678,29,25,1,62,82,96,93,30,10,12,1,6,67,149,140,432,540,432,0,0,0,0,0,0,0,0,7563,250,1061,1000,2422,1,7565,1000,7340,1500,0,0,0,0,0,0,0,0,0,0
+1774,SEEKER,Seeker,Seeker,65,10090,0,5671,4278,9,723,852,17,30,1,93,34,160,128,64,10,12,0,0,64,149,190,336,840,360,0,0,0,0,0,0,0,0,7563,250,1061,1000,985,10,526,50,587,100,12183,20,0,0,0,0,0,0,0,0
+1775,SNOWIER,Snowier,Snowier,60,19230,0,5882,2966,1,770,1347,22,12,1,60,78,51,90,60,10,12,2,0,41,133,200,672,672,480,0,0,0,0,0,0,0,0,7066,500,7561,1000,509,400,510,200,757,100,991,50,0,0,0,0,0,0,0,0
+1776,SIROMA,Siroma,Siroma,42,6800,0,2230,1005,1,220,440,12,8,1,42,24,37,70,42,10,12,0,0,61,131,400,672,672,480,0,0,0,0,0,0,0,0,7066,500,7561,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1777,ICE_TITAN,Ice Titan,Ice Titan,60,38200,0,13872,7928,1,1090,1570,71,15,1,60,101,54,90,60,10,12,2,0,61,133,200,872,672,480,0,0,0,0,0,0,0,0,7066,500,7561,1000,984,50,985,50,757,200,991,50,995,20,0,0,0,0,0,0
+1778,GAZETI,Gazeti,Gazeti,55,12300,0,5758,2075,9,512,612,65,25,1,55,62,50,120,55,10,12,1,6,21,133,200,672,672,480,0,0,0,0,0,0,0,0,7066,500,7561,1000,985,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1779,KTULLANUX,Ktullanux,Ktullanux,98,4417000,0,2720050,1120020,1,1680,10360,40,42,1,126,82,125,177,112,10,12,2,2,81,165,150,584,576,480,1360025,10000,607,1000,617,1000,0,0,2509,50,2111,50,607,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1780,MUSCIPULAR,Muscipular,Muscipular,57,4332,0,1706,1706,3,521,726,12,12,1,57,39,44,70,57,10,12,1,3,22,132,400,584,576,480,0,0,0,0,0,0,0,0,905,250,1033,1000,7565,1500,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1781,DROSERA,Drosera,Drosera,46,7221,0,2612,1022,7,389,589,10,13,1,50,27,30,90,46,10,12,1,3,22,132,400,672,672,480,0,0,0,0,0,0,0,0,905,500,938,500,7565,1500,1032,1000,1033,1000,0,0,0,0,0,0,0,0,0,0
1782,ROWEEN,Roween,Roween,31,5716,0,1669,1266,1,298,377,0,7,1,40,50,42,70,31,10,12,1,2,24,133,200,872,672,480,0,0,0,0,0,0,0,0,7564,1500,919,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1783,GALION,Galion,Galion,44,32240,0,10020,1612,1,400,700,25,25,1,90,62,54,90,44,10,12,0,2,64,165,160,872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1784,STAPO,Stapo,Stapo,23,666,0,322,221,1,135,370,90,5,1,10,15,19,40,30,10,12,0,0,42,131,400,872,672,480,0,0,0,0,0,0,0,0,7126,250,7312,1000,909,1000,512,250,0,0,0,0,0,0,0,0,0,0,0,0
-1785,ATROS,Atros,Atros,82,1008420,0,295550,118895,1,2526,3646,25,25,1,90,59,77,120,82,10,12,2,2,67,165,160,872,672,480,147775,10000,617,1000,607,1000,0,0,7563,2500,5123,15,607,100,617,100,2621,5,0,0,0,0,0,0,0,0,0,0
+1785,ATROS,Atros,Atros,82,1008420,0,295550,118895,1,2526,3646,25,25,1,90,59,77,120,82,10,12,2,2,67,165,160,872,672,480,147775,10000,617,1000,607,1000,0,0,7563,2500,5123,25,607,100,617,100,2621,10,0,0,0,0,0,0,0,0,0,0
1786,G_AGAV,Agav,Agav,73,29620,0,0,0,1,103,1109,15,35,1,73,27,145,110,73,10,12,1,7,80,133,150,584,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1787,G_ECHIO,Echio,Echio,69,34900,0,0,0,1,750,1800,33,11,1,69,55,61,104,69,10,12,1,7,80,133,150,584,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1788,G_ICE_TITAN,Ice Titan,Ice Titan,60,38200,0,0,0,1,1090,1570,71,15,1,60,101,54,90,60,10,12,2,0,61,133,200,872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index a17d5d901..cf8ad0152 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -29,7 +29,8 @@ Playtester
Date Added
======
-
+10/01
+ * Removed some duplicate Rachel warps [Playtester]
09/28
* $ephiroth converted custom event: Grand Circlet Quest + Excalibur [Lupus]
* Added official Kiel Dungeon entrance [Playtester]
diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt
index dcce1e2a2..36852166c 100644
--- a/npc/warps/cities/rachel.txt
+++ b/npc/warps/cities/rachel.txt
@@ -44,8 +44,7 @@ rachel.gat,108,200,0 warp rachel25 1,1,ra_in01.gat,213,83
ra_in01.gat,192,152,0 warp rachel26 1,1,rachel.gat,90,193
rachel.gat,90,189,0 warp rachel27 1,1,ra_in01.gat,192,148
rachel.gat,25,125,0 warp rachel28 1,1,ra_fild11.gat,353,226
-ra_fild12.gat,36,225,0 warp rachel29 1,1,rachel.gat,270,125
-//
+rachel.gat,273,125,0 warp rachel29 1,1,ra_fild12.gat,41,225
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
//~~~~~~~~~~~~~~~~~~~ Custom warps starts here ~~~~~~~~~~~~~~~~~~~
@@ -120,8 +119,5 @@ ra_in01.gat,220,379,0 warp ra_in013a 2,2,ra_in01.gat,289,372
ra_in01.gat,313,374,0 warp ra_in014 2,2,ra_in01.gat,358,373
ra_in01.gat,354,373,0 warp ra_in014a 2,2,ra_in01.gat,308,374
-//Rachel City
-//Some additional warps that were missing
-rachel.gat,149,249,0 warp rachel001 1,1,ra_temple.gat,119,28
-rachel.gat,273,125,0 warp rachel009 1,1,ra_fild12.gat,41,225
-rachel.gat,25,125,0 warp rachel010 1,1,ra_fild11.gat,357,225 \ No newline at end of file
+//Entrance to the Temple
+rachel.gat,149,249,0 warp rachel001 1,1,ra_temple.gat,119,28 \ No newline at end of file
diff --git a/npc/warps/fields/rachel_fild.txt b/npc/warps/fields/rachel_fild.txt
index d37e52078..2e2b2c696 100644
--- a/npc/warps/fields/rachel_fild.txt
+++ b/npc/warps/fields/rachel_fild.txt
@@ -16,7 +16,7 @@ ra_fild05.gat,349,274,0 warp ra013 1,1,ra_fild06.gat,23,280
ra_fild06.gat,19,280,0 warp ra014 1,1,ra_fild05.gat,345,274
ra_fild06.gat,296,21,0 warp ra015 1,1,lhz_fild01.gat,295,381
lhz_fild01.gat,295,383,0 warp ra016 1,1,ra_fild06.gat,296,23
-ra_fild12.gat,37,225,0 warp ra017 1,1,rachel.gat,268,125
+ra_fild12.gat,36,225,0 warp ra017 1,1,rachel.gat,268,125
ra_fild08.gat,168,28,0 warp ra018 1,1,ra_fild12.gat,155,370
ra_fild12.gat,155,375,0 warp ra019 1,1,ra_fild08.gat,168,32
ra_fild12.gat,279,26,0 warp ra020 1,1,ra_fild13.gat,296,343