Reorganized citycleaners.txt, they now contain all city spawns, also they use official X.3 spawns.

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

4 files changed, 36 insertions, 29 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 57b66b7ba..3145dcccf 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -36,6 +36,7 @@ Date		Added
 10/20

 	* Official kRO 10.1 spawns for Morroc Field [Playtester]

 	- Prontera Field

+	- Cities (reorganized citycleaners)

 	* Added official Free Ticket for the Cart Service to the Novice Training Grounds [Lupus]

 	- Fixed endless Novice Potion + Adv Suite exploit

 	- Removed 2 oudated Novice Grounds scrips (they confused many people)

diff --git a/npc/mobs/citycleaners.txt b/npc/mobs/citycleaners.txt
index a5bbfea16..2d70908f6 100644
--- a/npc/mobs/citycleaners.txt
+++ b/npc/mobs/citycleaners.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================

 //= massdriller

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

-//= 0.1b

+//= 1.0

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

 //= Any Athena Version

 //===== Description: =========================================

@@ -11,24 +11,40 @@
 //= occured in iRO and kRO. Enable this if you want. 

 //= 0.1a Added a few more towns to spawn Wild rose [MasterOfMuppets]

 //= 0.1b And even more from Poki#3 [Komurka]

+//= 1.0 Removed unofficial city cleaners [Playtester]

+//= 1.0 Added other city spawns [Playtester]

 //============================================================

 

-prontera.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

-geffen.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

-izlude.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

-payon.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

-alberta.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

-morocc.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

-comodo.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

-yuno.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

-aldebaran.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

-umbala.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

-amatsu.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

-gonryun.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

-louyang.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

-ayothaya.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

-einbroch.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

+prontera.gat,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0

+morocc.gat,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0

+alberta.gat,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0

+aldebaran.gat,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0

+geffen.gat,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0

+payon.gat,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0

+comodo.gat,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0

+izlude.gat,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0

+yuno.gat,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0

+umbala.gat,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0

+amatsu.gat,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0

+gonryun.gat,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0

+

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

+// einbech - Einbech, The Mining Village

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

+einbech.gat,0,0,0,0	monster	Tarou	1175,5,1800000,1500000,0

 einbech.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

-lighthalzen.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0

-xmas.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0 

-hugel.gat,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0 
\ No newline at end of file
+

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

+// payon_in02 - Inside Payon

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

+payon_in02.gat,23,68,5,5	monster	Thief Bug	1051,7,1200000,600000,0

+

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

+// sec_in02 - Inside Valhalla

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

+sec_in02.gat,139,80,20,10	monster	Poring	1002,5,0,0,0

+sec_in02.gat,138,54,20,20	monster	Marin	1242,5,0,0,0

+sec_in02.gat,161,46,15,15	monster	Poporing	1031,5,0,0,0

+sec_in02.gat,114,47,10,10	monster	Drops	1113,5,0,0,0

+sec_in02.gat,114,47,10,10	monster	Bigfoot	1060,10,0,0,0

+sec_in02.gat,139,80,30,30	monster	Flora	1118,10,0,0,0

diff --git a/npc/mobs/fields/einbroch.txt b/npc/mobs/fields/einbroch.txt
index a8b68e5b7..9ec25ceff 100644
--- a/npc/mobs/fields/einbroch.txt
+++ b/npc/mobs/fields/einbroch.txt
@@ -21,11 +21,6 @@
 //============================================================

 

 //==================================================

-// einbech - Einbech, The Mining Village

-//==================================================

-einbech.gat,0,0,0,0	monster	Tarou	1175,5,1800000,1500000,0

-

-//==================================================

 // ein_fild01 - Einbroch Field

 //==================================================

 ein_fild01.gat,0,0,0,0	monster	Punk	1199,50,0,0,0

diff --git a/npc/mobs/fields/payon.txt b/npc/mobs/fields/payon.txt
index a332ba4ab..edcae2095 100644
--- a/npc/mobs/fields/payon.txt
+++ b/npc/mobs/fields/payon.txt
@@ -11,11 +11,6 @@
 //============================================================

 

 //==================================================

-// payon_in02 - Inside Payon

-//==================================================

-payon_in02.gat,23,68,5,5	monster	Thief Bug	1051,7,1200000,600000,0

-

-//==================================================

 // pay_fild01 - Payon Forest

 //==================================================

 pay_fild01.gat,0,0,0,0	monster	Willow	1010,50,0,0,0