From 8dc049aa8bab4111f2dc3e9d52b84c4ed6f9902d Mon Sep 17 00:00:00 2001 From: Akkarinage Date: Sat, 19 May 2018 16:36:59 +0100 Subject: [PATCH] Removed City Cleaners from RE monster spawn files (#3082) * Fixes #2978. * Moved Wild Rose to PRE-RE spawn files. Signed-off-by: Akkarinage --- npc/mobs/citycleaners.txt | 40 -------------------------------- npc/pre-re/mobs/citycleaners.txt | 23 ++++++++++++++++++ npc/re/mobs/citycleaners.txt | 31 ------------------------- npc/re/scripts_monsters.conf | 1 - npc/scripts_monsters.conf | 1 - 5 files changed, 23 insertions(+), 73 deletions(-) delete mode 100644 npc/mobs/citycleaners.txt delete mode 100644 npc/re/mobs/citycleaners.txt diff --git a/npc/mobs/citycleaners.txt b/npc/mobs/citycleaners.txt deleted file mode 100644 index 96531577f5..0000000000 --- a/npc/mobs/citycleaners.txt +++ /dev/null @@ -1,40 +0,0 @@ -//===== rAthena Script ======================================= -//= City Cleaners Monster Spawn Script -//===== By: ================================================== -//= massdriller -//===== Current Version: ===================================== -//= 1.2 -//===== Compatible With: ===================================== -//= rAthena Project -//===== Description: ========================================= -//= Spawns monsters to clean up cities. -//===== Additional Comments: ================================= -//= 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.1 Added other city spawns [Playtester] -//= 1.2 Split spawns into Pre-RE/RE and Town files. [Euphy] -//============================================================ - -//================================================== -// Wild Rose City Spawns -//================================================== -prontera,0,0 monster Wild Rose 1261,1,7200000,3600000 -morocc,0,0 monster Wild Rose 1261,1,7200000,3600000 -alberta,0,0 monster Wild Rose 1261,1,7200000,3600000 -aldebaran,0,0 monster Wild Rose 1261,1,7200000,3600000 -geffen,0,0 monster Wild Rose 1261,1,7200000,3600000 -payon,0,0 monster Wild Rose 1261,1,7200000,3600000 -comodo,0,0 monster Wild Rose 1261,1,7200000,3600000 -izlude,0,0 monster Wild Rose 1261,1,7200000,3600000 -yuno,0,0 monster Wild Rose 1261,1,7200000,3600000 -einbroch,0,0 monster Wild Rose 1261,1,7200000,3600000 -lighthalzen,0,0 monster Wild Rose 1261,1,7200000,3600000 -hugel,0,0 monster Wild Rose 1261,1,7200000,3600000 -umbala,0,0 monster Wild Rose 1261,1,7200000,3600000 -amatsu,0,0 monster Wild Rose 1261,1,7200000,3600000 -gonryun,0,0 monster Wild Rose 1261,1,7200000,3600000 -louyang,0,0 monster Wild Rose 1261,1,7200000,3600000 -ayothaya,0,0 monster Wild Rose 1261,1,7200000,3600000 -moscovia,0,0 monster Wild Rose 1261,1,7200000,3600000 -einbech,0,0 monster Wild Rose 1261,1,3600000,3000000 diff --git a/npc/pre-re/mobs/citycleaners.txt b/npc/pre-re/mobs/citycleaners.txt index 55d900a787..c4a8ea7a4b 100644 --- a/npc/pre-re/mobs/citycleaners.txt +++ b/npc/pre-re/mobs/citycleaners.txt @@ -18,3 +18,26 @@ payon_in02,23,68,5,5 monster Thief Bug 1051,7,1200000,600000 jawaii_in,73,117,4,4 monster Thief Bug 1051,1,5400000,3000000 jawaii_in,83,117,5,5 monster Thief Bug 1051,1,4800000,2400000 + +//================================================== +// Wild Rose City Spawns +//================================================== +prontera,0,0 monster Wild Rose 1261,1,7200000,3600000 +morocc,0,0 monster Wild Rose 1261,1,7200000,3600000 +alberta,0,0 monster Wild Rose 1261,1,7200000,3600000 +aldebaran,0,0 monster Wild Rose 1261,1,7200000,3600000 +geffen,0,0 monster Wild Rose 1261,1,7200000,3600000 +payon,0,0 monster Wild Rose 1261,1,7200000,3600000 +comodo,0,0 monster Wild Rose 1261,1,7200000,3600000 +izlude,0,0 monster Wild Rose 1261,1,7200000,3600000 +yuno,0,0 monster Wild Rose 1261,1,7200000,3600000 +einbroch,0,0 monster Wild Rose 1261,1,7200000,3600000 +lighthalzen,0,0 monster Wild Rose 1261,1,7200000,3600000 +hugel,0,0 monster Wild Rose 1261,1,7200000,3600000 +umbala,0,0 monster Wild Rose 1261,1,7200000,3600000 +amatsu,0,0 monster Wild Rose 1261,1,7200000,3600000 +gonryun,0,0 monster Wild Rose 1261,1,7200000,3600000 +louyang,0,0 monster Wild Rose 1261,1,7200000,3600000 +ayothaya,0,0 monster Wild Rose 1261,1,7200000,3600000 +moscovia,0,0 monster Wild Rose 1261,1,7200000,3600000 +einbech,0,0 monster Wild Rose 1261,1,3600000,3000000 diff --git a/npc/re/mobs/citycleaners.txt b/npc/re/mobs/citycleaners.txt deleted file mode 100644 index b60a2aae47..0000000000 --- a/npc/re/mobs/citycleaners.txt +++ /dev/null @@ -1,31 +0,0 @@ -//===== rAthena Script ======================================= -//= City Cleaners Monster Spawn Script -//===== By: ================================================== -//= Euphy -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= rAthena Project -//===== Description: ========================================= -//= Spawns monsters to clean up cities. -//===== Additional Comments: ================================= -//= 1.0 First version, Renewal spawns. -//============================================================ - -//================================================== -// Wild Rose City Spawns -//================================================== -brasilis,0,0 monster Wild Rose 1261,1,7200000,3600000 -dewata,0,0 monster Wild Rose 1261,1,7200000,3600000 -malaya,0,0 monster Wild Rose 1261,1,7200000,3600000 -izlude_a,0,0 monster Wild Rose 1261,1,7200000,3600000 -izlude_b,0,0 monster Wild Rose 1261,1,7200000,3600000 -izlude_c,0,0 monster Wild Rose 1261,1,7200000,3600000 -izlude_d,0,0 monster Wild Rose 1261,1,7200000,3600000 - -//================================================== -// Thief Bug Egg City Spawns -//================================================== -payon_in02,23,68,5,5 monster Thief Bug Egg 1048,7,1200000,600000 -jawaii_in,73,117,4,4 monster Thief Bug Egg 1048,1,5400000,3000000 -jawaii_in,83,117,5,5 monster Thief Bug Egg 1048,1,4800000,2400000 diff --git a/npc/re/scripts_monsters.conf b/npc/re/scripts_monsters.conf index 7a4375bc91..8b3fdbaa3c 100644 --- a/npc/re/scripts_monsters.conf +++ b/npc/re/scripts_monsters.conf @@ -4,7 +4,6 @@ //npc: npc/re/mobs/academy.txt npc: npc/re/mobs/championmobs.txt -npc: npc/re/mobs/citycleaners.txt npc: npc/re/mobs/int_land.txt npc: npc/re/mobs/towns.txt npc: npc/re/mobs/verus.txt diff --git a/npc/scripts_monsters.conf b/npc/scripts_monsters.conf index cf3dd4065d..71483599cd 100644 --- a/npc/scripts_monsters.conf +++ b/npc/scripts_monsters.conf @@ -2,7 +2,6 @@ // - Monster Scripts - // -------------------------------------------------------------- -npc: npc/mobs/citycleaners.txt npc: npc/mobs/jail.txt npc: npc/mobs/pvp.txt npc: npc/mobs/towns.txt