Quellcode durchsuchen

* Script updates:
- Added warpers and duplicates for Izlude (izlude_[a-d]) and Prontera Field 8 (prt_fild08[a-d]) maps.
- Updated Eden Group warpers and added new duplicates.
- Changed "Kelitula Academy" to "Cryptura Academy".
- Added a missing OnMyMobDead label in Buwaya Cave instance. (bugreport:7929)
- Added version information to Airport script headers.

* Mob spawn organization:
- Split "City Cleaners" into Pre-Renewal and Renewal directories.
- Restored Thief Bug (Pre-Renewal) vs. Thief Bug Egg (Renewal) spawns.
- Created "Town" spawn files, holding all city spawns not in "City Cleaners" files.
- Added Prontera Training Dummies and Alberta Ship Mouses.
- Moved Jawaii spawns from "fields/" into "towns.txt".
- Moved Brasilis spawns from its own directory into "towns.txt".

Signed-off-by: Euphy <euphy@rathena.org>

Euphy vor 11 Jahren
Ursprung
Commit
11860e2e1f
49 geänderte Dateien mit 597 neuen und 215 gelöschten Zeilen
  1. 7 5
      db/re/mob_db.txt
  2. 3 1
      npc/airports/airships.txt
  3. 3 1
      npc/airports/einbroch.txt
  4. 3 1
      npc/airports/hugel.txt
  5. 3 1
      npc/airports/izlude.txt
  6. 3 1
      npc/airports/lighthalzen.txt
  7. 3 1
      npc/airports/rachel.txt
  8. 3 1
      npc/airports/yuno.txt
  9. 4 3
      npc/kafras/kafras.txt
  10. 4 15
      npc/mobs/citycleaners.txt
  11. 11 6
      npc/mobs/towns.txt
  12. 3 1
      npc/pre-re/airports/izlude.txt
  13. 1 1
      npc/pre-re/kafras/kafras.txt
  14. 20 0
      npc/pre-re/mobs/citycleaners.txt
  15. 1 1
      npc/pre-re/quests/quests_lighthalzen.txt
  16. 2 1
      npc/pre-re/scripts_monsters.conf
  17. 39 31
      npc/quests/quests_13_1.txt
  18. 9 6
      npc/quests/quests_13_2.txt
  19. 8 2
      npc/re/airports/izlude.txt
  20. 78 2
      npc/re/cities/izlude.txt
  21. 6 1
      npc/re/cities/jawaii.txt
  22. 11 6
      npc/re/cities/malangdo.txt
  23. 30 16
      npc/re/guides/guides_izlude.txt
  24. 2 0
      npc/re/instances/BuwayaCave.txt
  25. 7 2
      npc/re/kafras/kafras.txt
  26. 20 15
      npc/re/merchants/3rd_trader.txt
  27. 6 1
      npc/re/merchants/ammo_boxes.txt
  28. 6 1
      npc/re/merchants/ammo_dealer.txt
  29. 15 2
      npc/re/merchants/shops.txt
  30. 31 0
      npc/re/mobs/citycleaners.txt
  31. 0 29
      npc/re/mobs/fields/jawaii.txt
  32. 18 1
      npc/re/mobs/fields/prontera.txt
  33. 36 0
      npc/re/mobs/towns.txt
  34. 0 16
      npc/re/mobs/towns/brasilis.txt
  35. 21 0
      npc/re/other/mail.txt
  36. 10 0
      npc/re/other/mercenary_rent.txt
  37. 6 1
      npc/re/other/resetskill.txt
  38. 39 18
      npc/re/quests/eden/eden_common.txt
  39. 6 1
      npc/re/quests/mrsmile.txt
  40. 6 1
      npc/re/quests/quests_13_1.txt
  41. 7 2
      npc/re/quests/quests_dicastes.txt
  42. 6 1
      npc/re/quests/quests_izlude.txt
  43. 7 2
      npc/re/quests/quests_lighthalzen.txt
  44. 1 0
      npc/re/scripts_athena.conf
  45. 3 4
      npc/re/scripts_monsters.conf
  46. 57 8
      npc/re/warps/cities/izlude.txt
  47. 24 1
      npc/re/warps/fields/prontera_fild.txt
  48. 1 0
      npc/scripts_monsters.conf
  49. 7 5
      sql-files/mob_db_re.sql

+ 7 - 5
db/re/mob_db.txt

@@ -1559,12 +1559,14 @@
 //2405,WEAK_SKELETON
 //2406,WEAK_SKEL_SOLDIER
 //2407,SAILOR_SKELETON
-//2408,DUMMY_10
-//2409,DUMMY_50
-//2410,DUMMY_100
-//2411,DUMMY_150
+
+2408,DUMMY_10,Dummy,Dummy,10,99999999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,1,0,20,0x0,200,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,0,0
+2409,DUMMY_50,Dummy,Dummy,50,99999999,1,0,0,0,0,0,50,50,0,0,0,0,0,0,0,200,1,0,20,0x0,200,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,0,0
+2410,DUMMY_100,Dummy,Dummy,100,99999999,1,0,0,0,0,0,90,90,0,0,0,0,0,0,0,200,1,0,20,0x0,200,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,0,0
+2411,DUMMY_150,Dummy,Dummy,150,99999999,1,0,0,0,0,0,120,120,0,0,0,0,0,0,0,200,1,0,20,0x0,200,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,0,0
 //2412,E_VALKIWI
-//2413,DUMMY_10_FIRE
+2413,DUMMY_10_FIRE,Dummy,Dummy,10,99999999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,1,0,23,0x0,200,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,0,0
+
 //2414,RUNAWAY_BOOK
 //2415,L_SEYREN
 //2416,L_EREMES

+ 3 - 1
npc/airports/airships.txt

@@ -2,12 +2,14 @@
 //= The Airship System Script
 //===== By: ================================================== 
 //= rAthena Dev Team
+//===== Current Version: =====================================
+//= 1.0
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= The Airship System used in the official servers.
 //===== Additional Comments: ================================= 
-//= Official NPCs.
+//= 1.0 First version.
 //============================================================ 
 
 //============================================================ 

+ 3 - 1
npc/airports/einbroch.txt

@@ -2,12 +2,14 @@
 //= Einbroch Airport Staff
 //===== By: ================================================== 
 //= L0ne_W0lf, Muad_Dib
+//===== Current Version: =====================================
+//= 1.0
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= Einbroch Airport Staff
 //===== Additional Comments: ================================= 
-//= Official NPCs.
+//= 1.0 First version.
 //============================================================ 
 
 airport,143,43,5	script	Airport Staff#airport1a::airport1	90,{

+ 3 - 1
npc/airports/hugel.txt

@@ -2,12 +2,14 @@
 //= Hugel Airport NPCs
 //===== By: ================================================== 
 //= rAthena Dev Team
+//===== Current Version: =====================================
+//= 1.0
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= Hugel Airport NPCs
 //===== Additional Comments: ================================= 
-//= Official NPCs.
+//= 1.0 First version.
 //============================================================ 
 
 hugel,178,142,0	script	toairplane#hugel	45,1,1,{

+ 3 - 1
npc/airports/izlude.txt

@@ -2,12 +2,14 @@
 //= Izlude Airport NPCs
 //===== By: ================================================== 
 //= rAthena Dev Team
+//===== Current Version: =====================================
+//= 1.0
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= Izlude Airport NPCs
 //===== Additional Comments: ================================= 
-//= Official NPCs.
+//= 1.0 First version.
 //============================================================ 
 
 -	script	::Airship_Staff_izlude	-1,{

+ 3 - 1
npc/airports/lighthalzen.txt

@@ -2,12 +2,14 @@
 //= Lighthalzen Airport Staff
 //===== By: ================================================== 
 //= L0ne_W0lf, Muad_Dib
+//===== Current Version: =====================================
+//= 1.0
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= Lighthalzen Airport Staff
 //===== Additional Comments: ================================= 
-//= Official NPCs.
+//= 1.0 First version.
 //============================================================ 
 
 lhz_airport,143,43,5	script	Airport Staff#lhz_air1a::lhz_airport1	90,{

+ 3 - 1
npc/airports/rachel.txt

@@ -2,12 +2,14 @@
 //= Rachel Airport NPCs
 //===== By: ================================================== 
 //= rAthena Dev Team
+//===== Current Version: =====================================
+//= 1.0
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= Rachel Airport NPCs
 //===== Additional Comments: ================================= 
-//= Official NPCs.
+//= 1.0 First version.
 //============================================================ 
 
 ra_fild12,295,208,0	script	toairplane#rachel	45,1,1,{

+ 3 - 1
npc/airports/yuno.txt

@@ -2,12 +2,14 @@
 //= Yuno Airport Staff
 //===== By: ================================================== 
 //= L0ne_W0lf, Muad_Dib
+//===== Current Version: =====================================
+//= 1.0
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= Yuno Airport Staff
 //===== Additional Comments: ================================= 
-//= Official NPCs.
+//= 1.0 First version.
 //============================================================ 
 
 y_airport,143,43,5	script	Airport Staff#y_air1a::y_airport1	90,{

+ 4 - 3
npc/kafras/kafras.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Joseph
 //===== Current Version: ===================================== 
-//= 1.1a
+//= 1.1b
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: =========================================
@@ -21,6 +21,7 @@
 //= 1.0 Merged and cleaned up Kafras. [Joseph]
 //= 1.1 Added Izlude RE coordinates. [Euphy]
 //= 1.1a Fixed Pre-RE Call and some leftovers. [Lemongrass]
+//= 1.1b Enabled saving in Izlude duplicates (RE). [Euphy]
 //============================================================ 
 
 // Aldebaran
@@ -403,7 +404,7 @@ cmd_fild07,136,134,4	script	Kafra Employee::kaf_cmd_fild07	721,{
 
 // Izlude
 //============================================================
--	script	kaf_izlude	-1,{
+-	script	::kaf_izlude	-1,{
 	cutin "kafra_01",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -414,7 +415,7 @@ cmd_fild07,136,134,4	script	Kafra Employee::kaf_cmd_fild07	721,{
 	mes "How may I assist you?";
 	callfunc "F_Kafra",5,0,1,40,820;
 	if (checkre(0))
-		savepoint "izlude",129,97;
+		savepoint strnpcinfo(4),129,97;
 	else
 		savepoint "izlude",94,103;
 	callfunc "F_KafEnd",0,1,"in the city of Izlude";

+ 4 - 15
npc/mobs/citycleaners.txt

@@ -1,19 +1,19 @@
 //===== rAthena Script =======================================
-//= City Monster Spawn Script
+//= City Cleaners Monster Spawn Script
 //===== By: ==================================================
 //= massdriller
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
-//= Spawns monsters to clean up city. Apparently spawning
-//= occured in iRO and kRO. Enable this if you want. 
+//= 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]
 //============================================================
 
 //==================================================
@@ -37,15 +37,4 @@ gonryun,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
 louyang,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
 ayothaya,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
 moscovia,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
-brasilis,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
-
-//==================================================
-// einbech - Einbech, the Mining Village
-//==================================================
 einbech,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0
-einbech,0,0,0,0	monster	Tarou	1175,5,1800000,1500000,0
-
-//==================================================
-// payon_in02 - Inside Payon
-//==================================================
-payon_in02,23,68,5,5	monster	Thief Bug Egg	1048,7,1200000,600000,0

+ 11 - 6
npc/pre-re/mobs/fields/jawaii.txt → npc/mobs/towns.txt

@@ -1,15 +1,22 @@
 //===== rAthena Script =======================================
-//= Jawaii the honeymoon Island Monster Spawn Script
+//= Town Monster Spawn Script
 //===== By: ==================================================
-//= MasterOfMuppets (1.0)
+//= Euphy
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= rAthena SVN
+//===== Description: =========================================
+//= Spawns monsters in towns.
 //===== Additional Comments: =================================
-//= 1.0 First version [MasterOfMuppets]
+//= 1.0 First version.
 //============================================================
 
+//==================================================
+// einbech - Einbech, the Mining Village
+//==================================================
+einbech,0,0,0,0	monster	Tarou	1175,5,1800000,1500000,0
+
 //==================================================
 // jawaii - Jawaii, the Honeymoon Island
 //==================================================
@@ -25,5 +32,3 @@ jawaii,276,163,20,30	monster	Shellfish	1074,2,4200000,2400000,0
 jawaii_in,128,121,1,4	monster	Red Mushroom	1085,1,3000000,1200000,0
 jawaii_in,124,76,1,1	monster	Black Mushroom	1084,1,3600000,1200000,0
 jawaii_in,72,74,5,1	monster	Black Mushroom	1084,2,3000000,1200000,0
-jawaii_in,73,117,4,4	monster	Thief Bug	1051,1,5400000,3000000,0
-jawaii_in,83,117,5,5	monster	Thief Bug	1051,1,4800000,2400000,0

+ 3 - 1
npc/pre-re/airports/izlude.txt

@@ -2,12 +2,14 @@
 //= Izlude Airport NPCs
 //===== By: ================================================== 
 //= rAthena Dev Team
+//===== Current Version: =====================================
+//= 1.0
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= Izlude Airport NPCs
 //===== Additional Comments: ================================= 
-//= Official NPCs.
+//= 1.0 First version.
 //============================================================ 
 
 izlude,206,55,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude	90

+ 1 - 1
npc/pre-re/kafras/kafras.txt

@@ -21,4 +21,4 @@
 
 // Izlude
 //============================================================
-izlude,134,87,3	duplicate(kaf_izlude)	Kafra Employee	117
+izlude,134,87,3	duplicate(kaf_izlude)	Kafra Employee#iz	117

+ 20 - 0
npc/pre-re/mobs/citycleaners.txt

@@ -0,0 +1,20 @@
+//===== rAthena Script =======================================
+//= City Cleaners Monster Spawn Script
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Spawns monsters to clean up cities.
+//===== Additional Comments: =================================
+//= 1.0 First version, Pre-Renewal spawns.
+//============================================================
+
+//==================================================
+// Thief Bug City Spawns
+//==================================================
+payon_in02,23,68,5,5	monster	Thief Bug	1051,7,1200000,600000,0
+jawaii_in,73,117,4,4	monster	Thief Bug	1051,1,5400000,3000000,0
+jawaii_in,83,117,5,5	monster	Thief Bug	1051,1,4800000,2400000,0

+ 1 - 1
npc/pre-re/quests/quests_lighthalzen.txt

@@ -12,4 +12,4 @@
 //= 1.0 First version.
 //============================================================ 
 
-izlude,186,57,5	duplicate(Scamp)	Scamp#2	853
+izlude,186,57,5	duplicate(Scamp)	Scamp#iz	853

+ 2 - 1
npc/pre-re/scripts_monsters.conf

@@ -2,6 +2,8 @@
 // -                  Pre-Renewal Monster Scripts               -
 // --------------------------------------------------------------
 
+npc: npc/pre-re/mobs/citycleaners.txt
+
 // -------------------------- Dungeons --------------------------
 npc: npc/pre-re/mobs/dungeons/abbey.txt
 npc: npc/pre-re/mobs/dungeons/abyss.txt
@@ -52,7 +54,6 @@ npc: npc/pre-re/mobs/fields/einbroch.txt
 npc: npc/pre-re/mobs/fields/geffen.txt
 npc: npc/pre-re/mobs/fields/gonryun.txt
 npc: npc/pre-re/mobs/fields/hugel.txt
-npc: npc/pre-re/mobs/fields/jawaii.txt
 npc: npc/pre-re/mobs/fields/lighthalzen.txt
 npc: npc/pre-re/mobs/fields/louyang.txt
 npc: npc/pre-re/mobs/fields/lutie.txt

+ 39 - 31
npc/quests/quests_13_1.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 3.3
+//= 3.3a
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -21,34 +21,11 @@
 //= Report from the New World
 //= Persuing Rayan Moore
 //===== Additional Comments: ================================= 
-//= 1.0 First Version. [L0ne_W0lf]
-//= 1.1 I missed an end in one of the lhz guards. [L0ne_W0lf]
-//= 1.2 Fixed missing ends, wrong label and some typos [Gepard]
-//= 1.3 Added the two remaining 13.1 quests. [L0ne_W0lf]
-//=     Cat Hand Agents no longer ignore you with 300+ points.
-//= 1.4 Changed killmonsterall -> killmonster. (bugreport:4131)
-//= 1.5 Removed a 'close;' which should have been 'close2'. (bugreport:4276)
-//= 1.6 Fixed check in cat hand agent.
-//= 1.7 Moved the close in Cat Hand Service Warps. (bugreport:4079) [L0ne_W0lf]
-//= 1.8 Added 13.2 Additions to Report from the New World NPCs
-//= 1.9 Upped success rates for Report from the New World drops.
-//= 2.0 Added Mid Camp Warper, translated from the Official [Slim]
-//= 2.1 Fixed some typos [tr0n]
-//= 2.2 A little optimization (-25kb). [Euphy]
-//= 2.3 Updated to match the new Izlude Map. [Masao]
-//= 2.4 More optimization (-32kb). [Euphy]
-//= 2.5 Yet more optimization (-22kb). [Euphy]
-//= 2.5a Minor fixes. [Euphy]
-//= 2.6 Disabled "Ash Vacuum Warper" as it's no longer in iRO. [Euphy]
-//= 2.6a Added 'npcskill' command. [Euphy]
-//= 2.7 Updated EXP rewards.
-//= 2.7a Added 'consumeitem' command. [Euphy]
-//= 2.8 Some optimization, and moved an Izlude NPC. [Euphy]
-//= 2.9 Fixed an invalid event label. [Joseph]
 //= 3.0 Fixed a missing variable check. [Joseph]
 //= 3.1 Updated RE/Pre-RE EXP. [Euphy]
 //= 3.2 Updated ep13_start and dialog to match official script. [Joseph]
 //= 3.3 Updated to match the latest official script. [Euphy]
+//= 3.3a Added Izlude RE coordinates. [Euphy]
 //============================================================ 
 
 // Onward to the New World
@@ -7972,13 +7949,14 @@ function Catwarp {
 	if (Zeny < getarg(0)) {
 		mes "[Cat Hand Agent]";
 		mes "Don't play with money.";
-		close; }
+		close;
+	}
 	close2;
 	set Zeny, Zeny-getarg(0);
 	switch(getarg(1)) {
 		case 1: warp "alberta",117,56; end;
 		case 2: warp "prontera",116,72; end;
-		case 3: warp "izlude",91,105; end;
+		case 3: if (checkre(0)) warp "izlude",128,98; else warp "izlude",91,105; end;
 		case 4: warp "geffen",120,39; end;
 		case 5: warp "payon",161,58; end;
 		case 6: warp "morocc",156,46; end;
@@ -8462,11 +8440,13 @@ mid_camp,88,100,55	script	Cat Hand Mining Agent	876,{
 		else getitem 6048,1; //Unidentified_Mineral
 		initnpctimer;
 		disablenpc strnpcinfo(0);
-		end; }
+		end;
+	}
 	else {
 		mes "This rock contains unidentified minerals.";
 		mes "It's not possible to mine more than the limit.";
-		close; }
+		close;
+	}
 	end;
 
 OnTimer120000:
@@ -8474,7 +8454,6 @@ OnTimer120000:
 	stopnpctimer;
 	end;
 }
-
 man_fild01,180,170,0	duplicate(manukrock)	Mysterious Rock#1	844
 man_fild01,147,157,0	duplicate(manukrock)	Mysterious Rock#2	844
 man_fild01,114,174,0	duplicate(manukrock)	Mysterious Rock#3	844
@@ -14013,4 +13992,33 @@ prontera,161,192,5	script	Ash Vacuum Warper	707,{
 	}
 	end;
 }
-*/
+*/
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.0 First Version. [L0ne_W0lf]
+//= 1.1 I missed an end in one of the lhz guards. [L0ne_W0lf]
+//= 1.2 Fixed missing ends, wrong label and some typos [Gepard]
+//= 1.3 Added the two remaining 13.1 quests. [L0ne_W0lf]
+//=     Cat Hand Agents no longer ignore you with 300+ points.
+//= 1.4 Changed killmonsterall -> killmonster. (bugreport:4131)
+//= 1.5 Removed a 'close;' which should have been 'close2'. (bugreport:4276)
+//= 1.6 Fixed check in cat hand agent.
+//= 1.7 Moved the close in Cat Hand Service Warps. (bugreport:4079) [L0ne_W0lf]
+//= 1.8 Added 13.2 Additions to Report from the New World NPCs
+//= 1.9 Upped success rates for Report from the New World drops.
+//= 2.0 Added Mid Camp Warper, translated from the Official [Slim]
+//= 2.1 Fixed some typos [tr0n]
+//= 2.2 A little optimization (-25kb). [Euphy]
+//= 2.3 Updated to match the new Izlude Map. [Masao]
+//= 2.4 More optimization (-32kb). [Euphy]
+//= 2.5 Yet more optimization (-22kb). [Euphy]
+//= 2.5a Minor fixes. [Euphy]
+//= 2.6 Disabled "Ash Vacuum Warper" as it's no longer in iRO. [Euphy]
+//= 2.6a Added 'npcskill' command. [Euphy]
+//= 2.7 Updated EXP rewards.
+//= 2.7a Added 'consumeitem' command. [Euphy]
+//= 2.8 Some optimization, and moved an Izlude NPC. [Euphy]
+//= 2.9 Fixed an invalid event label. [Joseph]
+//============================================================

+ 9 - 6
npc/quests/quests_13_2.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 2.7
+//= 2.7a
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -47,6 +47,7 @@
 //= 2.6 Fixed incorrect use of 'close'. [Joseph]
 //= 2.6a Disabled GM NPC. [Euphy]
 //= 2.7 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.7a Added Izlude RE coordinates. [Euphy]
 //============================================================ 
 
 // Cat Hand Addition.
@@ -392,13 +393,14 @@ function Catwarp {
 	if (Zeny < getarg(0)) {
 		mes "[Cat Hand Agent]";
 		mes "Don't play with money.";
-		close; }
+		close;
+	}
 	close2;
 	set Zeny, Zeny-getarg(0);
 	switch(getarg(1)) {
 		case 1: warp "alberta",117,56; end;
 		case 2: warp "prontera",116,72; end;
-		case 3: warp "izlude",91,105; end;
+		case 3: if (checkre(0)) warp "izlude",128,98; else warp "izlude",91,105; end;
 		case 4: warp "geffen",120,39; end;
 		case 5: warp "payon",161,58; end;
 		case 6: warp "morocc",156,46; end;
@@ -412,7 +414,6 @@ function Catwarp {
 	}
 }
 }
-
 man_fild02,132,47,4	duplicate(Cat Hand Agent#spl)	Cat Hand Agent#man	421
 
 -	script	Mysterious Rock#30::manukrock2	-1,{
@@ -429,11 +430,13 @@ man_fild02,132,47,4	duplicate(Cat Hand Agent#spl)	Cat Hand Agent#man	421
 		else getitem 6048,1; //Unidentified_Mineral
 		initnpctimer;
 		disablenpc strnpcinfo(0);
-		end; }
+		end;
+	}
 	else {
 		mes "This rock contains unidentified minerals.";
 		mes "It's not possible to mine more than the limit.";
-		close; }
+		close;
+	}
 	end;
 
 OnTimer120000:

+ 8 - 2
npc/re/airports/izlude.txt

@@ -2,13 +2,19 @@
 //= Izlude Airport NPCs
 //===== By: ================================================== 
 //= rAthena Dev Team
+//===== Current Version: =====================================
+//= 1.1
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= Izlude Airport NPCs
 //===== Additional Comments: ================================= 
-//= Official NPCs.
-//= Updated to match the new Izlude Map. [Masao]
+//= 1.0 Updated to match the new Izlude Map. [Masao]
+//= 1.1 Added Izlude duplicates. [Euphy]
 //============================================================ 
 
 izlude,202,75,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude	90
+izlude_a,202,75,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude_a	90
+izlude_b,202,75,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude_b	90
+izlude_c,202,75,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude_c	90
+izlude_d,202,75,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude_d	90

+ 78 - 2
npc/re/cities/izlude.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Masao
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -11,20 +11,96 @@
 //===== Additional Comments: ================================= 
 //= 1.0 First Version. Still missing many new NPCs and their dialogues. [Masao]
 //= 1.1 Updated to match the official script. [Euphy]
+//= 1.2 Added Channel Warper and Izlude duplicates. [Euphy]
 //============================================================
 
+// Izlude
+//============================================================
 izlude,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude	100
+izlude_a,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_a	100
+izlude_b,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_b	100
+izlude_c,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_c	100
+izlude_d,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_d	100
+
 izlude,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude	90
+izlude_a,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_a	90
+izlude_b,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_b	90
+izlude_c,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_c	90
+izlude_d,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_d	90
+
 izlude,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude	91
+izlude_a,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_a	91
+izlude_b,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_b	91
+izlude_c,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_c	91
+izlude_d,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_d	91
+
 izlude,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude	124
+izlude_a,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_a	124
+izlude_b,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_b	124
+izlude_c,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_c	124
+izlude_d,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_d	124
+
 izlude,85,103,4	duplicate(Dega_izlude)	Dega#izlude	84
+izlude_a,85,103,4	duplicate(Dega_izlude)	Dega#izlude_a	84
+izlude_b,85,103,4	duplicate(Dega_izlude)	Dega#izlude_b	84
+izlude_c,85,103,4	duplicate(Dega_izlude)	Dega#izlude_c	84
+izlude_d,85,103,4	duplicate(Dega_izlude)	Dega#izlude_d	84
+
 izlude,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude	97
+izlude_a,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_a	97
+izlude_b,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_b	97
+izlude_c,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_c	97
+izlude_d,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_d	97
+
 izlude,57,159,2	duplicate(Red_izlude)	Red#izlude	85
+izlude_a,57,159,2	duplicate(Red_izlude)	Red#izlude_a	85
+izlude_b,57,159,2	duplicate(Red_izlude)	Red#izlude_b	85
+izlude_c,57,159,2	duplicate(Red_izlude)	Red#izlude_c	85
+izlude_d,57,159,2	duplicate(Red_izlude)	Red#izlude_d	85
+
 izlude,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude	98
+izlude_a,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_a	98
+izlude_b,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_b	98
+izlude_c,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_c	98
+izlude_d,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_d	98
+
 izlude,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude	105
+izlude_a,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_a	105
+izlude_b,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_b	105
+izlude_c,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_c	105
+izlude_d,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_d	105
 
-prt_fild08,350,219,4	script	Guard#izlude	105,{
+-	script	::Guard_izlude	-1,{
 	mes "[Izlude Guard]";
 	mes "Welcome to Izlude.";
 	close;
 }
+prt_fild08,350,219,4	duplicate(Guard_izlude)	Guard#izlude	105
+prt_fild08a,350,219,4	duplicate(Guard_izlude)	Guard#izlude_a	105
+prt_fild08b,350,219,4	duplicate(Guard_izlude)	Guard#izlude_b	105
+prt_fild08c,350,219,4	duplicate(Guard_izlude)	Guard#izlude_c	105
+prt_fild08d,350,219,4	duplicate(Guard_izlude)	Guard#izlude_d	105
+
+// Channel Warper
+//============================================================
+function	script	F_IzludeChannel	{
+	mes "[Izlude Copy Warper]";
+	mes "Izlude is a verly lively place is it not?";
+	mes "I am here to help make Izlude feel more smooth!";
+	mes "I can send you to another copy of Izlude.";
+	mes "Do you want to go to another copy?";
+	next;
+	set .@i, select(getarg(0)+":Never mind");
+	if (.@i < 6) {
+		setarray .@maps$[1],"izlude","izlude_a","izlude_b","izlude_c","izlude_d";
+		savepoint .@maps$[.@i],128,98;
+		warp .@maps$[.@i],128,98;
+		end;
+	}
+	close;
+}
+izlude,122,105,5	script	Izlude Copy Warper	64,{ callfunc "F_IzludeChannel",":Go to copy 2:Go to copy 3:Go to copy 4:Go to copy 5"; }
+izlude_a,122,105,5	script	Izlude Copy Warper#_a	64,{ callfunc "F_IzludeChannel","Go to copy 1::Go to copy 3:Go to copy 4:Go to copy 5"; }
+izlude_b,122,105,5	script	Izlude Copy Warper#_b	64,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2::Go to copy 4:Go to copy 5"; }
+izlude_c,122,105,5	script	Izlude Copy Warper#_c	64,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2:Go to copy 3::Go to copy 5"; }
+izlude_d,122,105,5	script	Izlude Copy Warper#_d	64,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2:Go to copy 3:Go to copy 4:"; }

+ 6 - 1
npc/re/cities/jawaii.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Daegaladh, Masao
 //===== Current Version: =====================================
-//= 1.0
+//= 1.2
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -11,6 +11,11 @@
 //===== Additional Comments: =================================
 //= 1.0 First Version. Renewal coordinates by Masao.
 //= 1.1 Moved "Honeymoon Helper" NPC.
+//= 1.2 Added Izlude duplicates. [Euphy]
 //============================================================
 
 izlude,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Izlude	71
+izlude_a,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Iz_a	71
+izlude_b,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Iz_b	71
+izlude_c,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Iz_c	71
+izlude_d,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Iz_d	71

+ 11 - 6
npc/re/cities/malangdo.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Muad_Dib
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -15,6 +15,7 @@
 //= 1.2 Moved "Odgnalam" coordinates.
 //= 1.3 Fixed dialogues.
 //= 1.4 Dialogue edits, source iRO.
+//= 1.5 Added Izlude duplicates.
 //============================================================
 
 // Malangdo Transportation :: malangdo_go
@@ -158,9 +159,8 @@ rachel,121,126,4	duplicate(Dolangmal)	Dolangmal#7	553
 lighthalzen,254,83,5	duplicate(Dolangmal)	Dolangmal#8	553
 mora,57,150,4	duplicate(Dolangmal)	Dolangmal#9	553
 
-//Pre-RE: izlude (182,192)
-izlude,182,218,4	script	Odgnalam#Izlude	554,{
-	mes "This cat is sleeping in the warm "+strnpcinfo(2)+" sun.";
+-	script	::Odgnalam	-1,{
+	mes "This cat is sleeping in the warm "+((strnpcinfo(2) == "albe")?"Alberta":"Izlude")+" sun.";
 	next;
 	if(select("Let him sleep:Talk to him") == 1) close;
 	mes "[Odgnalam]";
@@ -207,7 +207,12 @@ izlude,182,218,4	script	Odgnalam#Izlude	554,{
 	warp "malangdo",217,85;
 	close;
 }
-alberta,200,151,4	duplicate(Odgnalam#Izlude)	Odgnalam#Alberta	554
+alberta,200,151,4	duplicate(Odgnalam)	Odgnalam#albe	554
+izlude,182,218,4	duplicate(Odgnalam)	Odgnalam#iz	554	// Old coordinates: (182,192)
+izlude_a,182,218,4	duplicate(Odgnalam)	Odgnalam#iz_a	554
+izlude_b,182,218,4	duplicate(Odgnalam)	Odgnalam#iz_b	554
+izlude_c,182,218,4	duplicate(Odgnalam)	Odgnalam#iz_c	554
+izlude_d,182,218,4	duplicate(Odgnalam)	Odgnalam#iz_d	554
 
 malangdo,219,86,4	script	Kong#malang	545,{
 	mes "[Kong]";
@@ -261,7 +266,7 @@ malangdo,219,86,4	script	Kong#malang	545,{
 	if (ep13_yong1 > 80) {
 		mes "Have a comfortable trip.";
 		if (.@i == 1)
-			warp "izlude",195,212;
+			warp "izlude",195,212; // Old coordinates: (194,180)
 		else
 			warp "alberta",192,150;
 		close;

+ 30 - 16
npc/re/guides/guides_izlude.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -15,9 +15,10 @@
 //= 1.2 Added Renewal Izlude viewpoint coordinates.
 //= 1.3 Navigation system update. [Euphy]
 //=     Optimized.
+//= 1.4 Added Izlude duplicates. [Euphy]
 //============================================================ 
 
-izlude,129,175,4	script	Guide#01izlude::GuideIzlude	105,{
+-	script	::GuideIzlude	-1,{
 	cutin "prt_soldier",2;
 	mes "[Izlude Guide]";
 	mes "Welcome to ^8B4513Izlude^000000,";
@@ -25,22 +26,23 @@ izlude,129,175,4	script	Guide#01izlude::GuideIzlude	105,{
 	mes "Do you need help navigating the town?";
 	F_Navi("[Izlude Guide]");
 	next;
+	set .@map$, strnpcinfo(4);
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 			set .@loop,1;
 			while (.@loop) {
-				switch(select("[ Kelitula Academy ]:[ Marina ]:[ International Airship ]:[ Arena ]:[ Kit Shop ]:[ Swordsman Guild ]:[ Enchant Association ]:[ Forge ]:Previous Menu")) {
+				switch(select("[ Cryptura Academy ]:[ Marina ]:[ International Airship ]:[ Arena ]:[ Kit Shop ]:[ Swordsman Guild ]:[ Enchant Association ]:[ Forge ]:Previous Menu")) {
 				case 1:
 					mes "[Izlude Guide]";
-					mes "Novice adventurers should go to "+F_Navi("Kelitula Academy","iz_ac01,100,39")+" to receive more information and training!";
+					mes "Novice adventurers should go to "+F_Navi("Cryptura Academy","iz_ac01,100,39")+" to receive more information and training!";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,128,260,0,0xD2691E;
 					next;
 					break;
 				case 2:
 					mes "[Izlude Guide]";
-					mes "You can use the "+F_Navi("Marina","izlude_a,197,205","^B9062F");
+					mes "You can use the "+F_Navi("Marina",.@map$+",197,205","^B9062F");
 					mes "to go to ^8B4513Alberta^000000 or ^8B4513Byalan Island^000000.";
 					mes "Beware of ^8B4513Izlude Dungeon^000000";
 					mes "on Byalan Island since it is";
@@ -51,7 +53,7 @@ izlude,129,175,4	script	Guide#01izlude::GuideIzlude	105,{
 					break;
 				case 3:
 					mes "[Izlude Guide]";
-					mes "The "+F_Navi("International Airship","izlude,202,75","^0000FF");
+					mes "The "+F_Navi("International Airship",.@map$+",202,75","^0000FF");
 					mes "goes to ^8B4513Juno^000000 and ^8B4513Rachel^000000.";
 					mes "Let me mark its location";
 					mes "on your mini-map.";
@@ -61,7 +63,7 @@ izlude,129,175,4	script	Guide#01izlude::GuideIzlude	105,{
 					break;
 				case 4:
 					mes "[Izlude Guide]";
-					mes "The "+F_Navi("Arena","izlude,213,161","^FF5400");
+					mes "The "+F_Navi("Arena",.@map$+",213,161","^FF5400");
 					mes "is a perfect place to";
 					mes "test your combat capabilities.";
 					mes "Let me mark its location";
@@ -71,13 +73,13 @@ izlude,129,175,4	script	Guide#01izlude::GuideIzlude	105,{
 					next;
 					break;
 				case 5:
-					callsub L_Mark, F_Navi("Kit Shop","izlude,110,182","^006400");
+					callsub L_Mark, F_Navi("Kit Shop",.@map$+",110,182","^006400");
 					viewpoint 1,108,179,4,0xAAFF00;
 					next;
 					break;
 				case 6:
 					mes "[Izlude Guide]";
-					mes "The "+F_Navi("Swordsman Guild","izlude,51,172")+" is where you can ^800080change your job to Swordsman.^000000";
+					mes "The "+F_Navi("Swordsman Guild",.@map$+",51,172")+" is where you can ^800080change your job to Swordsman.^000000";
 					mes "Let me mark its location";
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
@@ -85,12 +87,12 @@ izlude,129,175,4	script	Guide#01izlude::GuideIzlude	105,{
 					next;
 					break;
 				case 7:
-					callsub L_Mark, F_Navi("Enchant Association","izlude,97,125","^B9062F");
+					callsub L_Mark, F_Navi("Enchant Association",.@map$+",97,125","^B9062F");
 					viewpoint 1,97,125,6,0xDA70D6;
 					next;
 					break;
 				case 8:
-					callsub L_Mark, F_Navi("Forge","izlude,153,126");
+					callsub L_Mark, F_Navi("Forge",.@map$+",153,126");
 					viewpoint 1,153,126,7,0xAAFF00;
 					next;
 					break;
@@ -106,7 +108,7 @@ izlude,129,175,4	script	Guide#01izlude::GuideIzlude	105,{
 				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Hypnotist ]:[ Newlywed Helper ]:[ Mercenary Guildsman ]:[ Pet Groomer ]:Previous Menu")) {
 				case 1:
 					mes "[Izlude Guide]";
-					mes "The "+F_Navi("Eden Teleport Officer","izlude,131,148","^0000FF");
+					mes "The "+F_Navi("Eden Teleport Officer",.@map$+",131,148","^0000FF");
 					mes "is currently staying inside";
 					mes "the Swordsman Guild building.";
 					mes "Let me mark his location on your mini-map.";
@@ -115,12 +117,12 @@ izlude,129,175,4	script	Guide#01izlude::GuideIzlude	105,{
 					next;
 					break;
 				case 2:
-					callsub L_Mark, F_Navi("Kafra Employee","izlude,128,148","^FF5400"),1;
+					callsub L_Mark, F_Navi("Kafra Employee",.@map$+",128,148","^FF5400"),1;
 					viewpoint 1,128,148,9,0xFF5400;
 					next;
 					break;
 				case 3:
-					callsub L_Mark, F_Navi("Hypnotist","izlude,127,175"),1;
+					callsub L_Mark, F_Navi("Hypnotist",.@map$+",127,175"),1;
 					viewpoint 1,127,175,10,0x006400;
 					next;
 					break;
@@ -129,13 +131,13 @@ izlude,129,175,4	script	Guide#01izlude::GuideIzlude	105,{
 					mes "If you'd like to go on a honeymoon to";
 					mes "^8B4513Jawaii^000000, the paradise of newlyweds,";
 					mes "please speak to the ";
-					mes F_Navi("Newlywed Helper","izlude,180,224","^B9062F")+".";
+					mes F_Navi("Newlywed Helper",.@map$+",180,224","^B9062F")+".";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,180,224,11,0xFF0000;
 					next;
 					break;
 				case 5:
-					callsub L_Mark, F_Navi("Mercenary Guildsman","izlude,47,170","^0000FF");
+					callsub L_Mark, F_Navi("Mercenary Guildsman",.@map$+",47,170","^0000FF");
 					viewpoint 1,47,170,12,0xDA70D6;
 					next;
 					break;
@@ -191,5 +193,17 @@ L_Mark:
 	mes "Would you like to check any other locations?";
 	return;
 }
+
+izlude,129,175,4	duplicate(GuideIzlude)	Guide#01izlude	105
+izlude_a,129,175,4	duplicate(GuideIzlude)	Guide#01izlude_a	105
+izlude_b,129,175,4	duplicate(GuideIzlude)	Guide#01izlude_b	105
+izlude_c,129,175,4	duplicate(GuideIzlude)	Guide#01izlude_c	105
+izlude_d,129,175,4	duplicate(GuideIzlude)	Guide#01izlude_d	105
+
 izlude,133,113,4	duplicate(GuideIzlude)	Guide#02izlude	105
+izlude_a,133,113,4	duplicate(GuideIzlude)	Guide#02izlude_a	105
+izlude_b,133,113,4	duplicate(GuideIzlude)	Guide#02izlude_b	105
+izlude_c,133,113,4	duplicate(GuideIzlude)	Guide#02izlude_c	105
+izlude_d,133,113,4	duplicate(GuideIzlude)	Guide#02izlude_d	105
+
 //izlude,120,206,4	duplicate(GuideIzlude)	Guide#03izlude	105

+ 2 - 0
npc/re/instances/BuwayaCave.txt

@@ -419,6 +419,8 @@ OnDisable:
 	killmonster instance_mapname("1@ma_c"),instance_npcname("#exit_mob")+"::OnMyMobDead";
 	disablenpc instance_npcname("#exit_mob");
 	end;
+OnMyMobDead:
+	end;
 }
 
 1@ma_c,28,57,0	script	#cave_out	45,2,2,{

+ 7 - 2
npc/re/kafras/kafras.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Joseph
 //===== Current Version: ===================================== 
-//= 1.3a
+//= 1.4
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: =========================================
@@ -23,6 +23,7 @@
 //= 1.2 Added Port Malaya Kafras. [Euphy]
 //= 1.3 Added Eden Group Kafra. [Euphy]
 //= 1.3a Moved Rune Knight Kafra from job file. [Euphy]
+//= 1.4 Added Izlude duplicates. [Euphy]
 //============================================================ 
 
 // Brasilis
@@ -56,7 +57,11 @@ moc_para01,10,185,4	script	Kafra Employee::kaf_eden	721,{
 
 // Izlude
 //============================================================
-izlude,128,148,6	duplicate(kaf_izlude)	Kafra Employee	117
+izlude,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz	117
+izlude_a,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz_a	117
+izlude_b,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz_b	117
+izlude_c,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz_c	117
+izlude_d,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz_d	117
 
 // Port Malaya
 //============================================================

+ 20 - 15
npc/re/merchants/3rd_trader.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Masao, Mercurial
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -16,6 +16,7 @@
 //= 1.2 Optimized and standardized. [Euphy]
 //= 1.3 Added Malangdo/Mora Points NPC. [Euphy]
 //= 1.4 Updated to match the official scripts. [Euphy]
+//= 1.5 Added Izlude duplicates. [Euphy]
 //============================================================ 
 
 // Poison Herb Merchants (Guillotine Cross)
@@ -261,17 +262,21 @@ job3_guil01,91,93,3	script	Rare Herb Collector	49,{
 	close;
 }
 gef_tower,105,172,5	duplicate(pss)	Point Merchant#Sorcerer	700
-prt_in,131,66,0	duplicate(pss)	Point Seller#Prontera	700
-alberta,105,52,7	duplicate(pss)	Point Seller#Alberta	700
-aldebaran,133,114,5	duplicate(pss)	Point Seller#Aldebaran	700
-comodo,193,159,5	duplicate(pss)	Point Seller#Comodo	700
-geffen,129,49,5	duplicate(pss)	Point Seller#Geffen	700
-izlude,138,163,5	duplicate(pss)	Point Seller#Izlude	700	//Pre-RE: izlude (135,121)
-malangdo,214,163,5	duplicate(pss)	Point Seller#Malangdo	700
-mora,115,118,3	duplicate(pss)	Point Seller#Mora	700
-ra_in01,256,273,3	duplicate(pss)	Point Seller#Rachel	700
-veins,202,128,5	duplicate(pss)	Point Seller#Veins	700
-dicastes01,207,200,5	duplicate(pss)	Point Seller#Dicastes	700
-manuk,261,206,3	duplicate(pss)	Point Seller#Manuk	700
-splendide,207,160,5	duplicate(pss)	Point Seller#Splendide	700
-mid_camp,224,237,3	duplicate(pss)	Point Seller#Midgard	700
+prt_in,131,66,0	duplicate(pss)	Point Merchant#Prontera	700
+alberta,105,52,7	duplicate(pss)	Point Merchant#Alberta	700
+aldebaran,133,114,5	duplicate(pss)	Point Merchant#Aldebaran	700
+comodo,193,159,5	duplicate(pss)	Point Merchant#Comodo	700
+geffen,129,49,5	duplicate(pss)	Point Merchant#Geffen	700
+izlude,138,163,5	duplicate(pss)	Point Merchant#Izlude	700	// Old coordinates: izlude (135,121)
+izlude_a,138,163,5	duplicate(pss)	Point Merchant#Izlude_a	700
+izlude_b,138,163,5	duplicate(pss)	Point Merchant#Izlude_b	700
+izlude_c,138,163,5	duplicate(pss)	Point Merchant#Izlude_c	700
+izlude_d,138,163,5	duplicate(pss)	Point Merchant#Izlude_d	700
+malangdo,214,163,5	duplicate(pss)	Point Merchant#Malangdo	700
+mora,115,118,3	duplicate(pss)	Point Merchant#Mora	700
+ra_in01,256,273,3	duplicate(pss)	Point Merchant#Rachel	700
+veins,202,128,5	duplicate(pss)	Point Merchant#Veins	700
+dicastes01,207,200,5	duplicate(pss)	Point Merchant#Dicastes	700
+manuk,261,206,3	duplicate(pss)	Point Merchant#Manuk	700
+splendide,207,160,5	duplicate(pss)	Point Merchant#Splendide	700
+mid_camp,224,237,3	duplicate(pss)	Point Merchant#Midgard	700

+ 6 - 1
npc/re/merchants/ammo_boxes.txt

@@ -3,14 +3,19 @@
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
 //= Turns bullets into magazines/packs.
 //===== Additional Comments: =================================
 //= 1.0 First version, Renewal duplicates.
+//= 1.1 Added Izlude duplicates. [Euphy]
 //============================================================
 
 que_ng,187,149,3	duplicate(mdk)	Magazine Dealer Kenny#ng	83
 izlude,74,104,3	duplicate(mdk)	Magazine Dealer Kenny#iz	83
+izlude_a,74,104,3	duplicate(mdk)	Magazine Dealer Kenny#a	83
+izlude_b,74,104,3	duplicate(mdk)	Magazine Dealer Kenny#b	83
+izlude_c,74,104,3	duplicate(mdk)	Magazine Dealer Kenny#c	83
+izlude_d,74,104,3	duplicate(mdk)	Magazine Dealer Kenny#d	83

+ 6 - 1
npc/re/merchants/ammo_dealer.txt

@@ -3,14 +3,19 @@
 //===== By ===================================================
 //= Euphy
 //===== Version ==============================================
-//= 1.0
+//= 1.1
 //===== Compatible With ======================================
 //= rAthena SVN
 //===== Description ==========================================
 //= Bullet trader.
 //===== Comments =============================================
 //= 1.0 First version, Renewal duplicates.
+//= 1.1 Added Izlude duplicates. [Euphy]
 //============================================================
 
 que_ng,187,156,3	duplicate(bdt)	Bullet Dealer Tony#ng	86
 izlude,77,104,3	duplicate(bdt)	Bullet Dealer Tony#iz	86	//Official: (74,106) -> in the water
+izlude_a,77,104,3	duplicate(bdt)	Bullet Dealer Tony#a	86
+izlude_b,77,104,3	duplicate(bdt)	Bullet Dealer Tony#b	86
+izlude_c,77,104,3	duplicate(bdt)	Bullet Dealer Tony#c	86
+izlude_d,77,104,3	duplicate(bdt)	Bullet Dealer Tony#d	86

+ 15 - 2
npc/re/merchants/shops.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= rAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.5
+//= 1.7
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -16,6 +16,7 @@
 //= 1.4 Moved Izlude merchants. [Streusel]
 //= 1.5 Added Dewata merchants. [Lemongrass]
 //= 1.6 Added Mora and Port Malaya merchants.
+//= 1.7 Added Izlude duplicates. [Euphy]
 //============================================================ 
 
 //=======================================================
@@ -46,9 +47,21 @@ dicastes01,207,200,6	shop	Points Merchant#dic	66,6360:-1,6361:-1,6362:-1,6363:-1
 //=======================================================
 // Izlude
 //=======================================================
-izlude,160,186,0	shop	Butcher#iz	54,517:-1
 izlude,124,165,4	shop	Fruit Gardener#iz	53,512:-1,513:-1,515:-1,516:-1
+izlude_a,124,165,4	duplicate(Fruit Gardener#iz)	Fruit Gardener#iz_a	53
+izlude_b,124,165,4	duplicate(Fruit Gardener#iz)	Fruit Gardener#iz_b	53
+izlude_c,124,165,4	duplicate(Fruit Gardener#iz)	Fruit Gardener#iz_c	53
+izlude_d,124,165,4	duplicate(Fruit Gardener#iz)	Fruit Gardener#iz_d	53
+izlude,160,186,0	shop	Butcher#iz	54,517:-1
+izlude_a,160,186,0	duplicate(Butcher#iz)	Butcher#iz_a	54
+izlude_b,160,186,0	duplicate(Butcher#iz)	Butcher#iz_b	54
+izlude_c,160,186,0	duplicate(Butcher#iz)	Butcher#iz_c	54
+izlude_d,160,186,0	duplicate(Butcher#iz)	Butcher#iz_d	54
 izlude,128,158,7	shop	Vendor from Milk Ranch#i	90,519:-1
+izlude_a,128,158,7	duplicate(Vendor from Milk Ranch#i)	Vendor from Milk Ranch#a	90
+izlude_b,128,158,7	duplicate(Vendor from Milk Ranch#i)	Vendor from Milk Ranch#b	90
+izlude_c,128,158,7	duplicate(Vendor from Milk Ranch#i)	Vendor from Milk Ranch#c	90
+izlude_d,128,158,7	duplicate(Vendor from Milk Ranch#i)	Vendor from Milk Ranch#d	90
 izlude_in,72,98,4	shop	Pet Groomer#iz	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
 izlude_in,57,110,0	shop	Tool Dealer#iz	47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
 izlude_in,72,110,3	shop	Trading Merchant#iz	900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1

+ 31 - 0
npc/re/mobs/citycleaners.txt

@@ -0,0 +1,31 @@
+//===== rAthena Script =======================================
+//= City Cleaners Monster Spawn Script
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Spawns monsters to clean up cities.
+//===== Additional Comments: =================================
+//= 1.0 First version, Renewal spawns.
+//============================================================
+
+//==================================================
+// Wild Rose City Spawns
+//==================================================
+brasilis,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+dewata,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+malaya,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+izlude_a,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+izlude_b,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+izlude_c,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+izlude_d,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+
+//==================================================
+// Thief Bug Egg City Spawns
+//==================================================
+payon_in02,23,68,5,5	monster	Thief Bug Egg	1048,7,1200000,600000,0
+jawaii_in,73,117,4,4	monster	Thief Bug Egg	1048,1,5400000,3000000,0
+jawaii_in,83,117,5,5	monster	Thief Bug Egg	1048,1,4800000,2400000,0

+ 0 - 29
npc/re/mobs/fields/jawaii.txt

@@ -1,29 +0,0 @@
-//===== rAthena Script =======================================
-//= Jawaii the honeymoon Island Monster Spawn Script
-//===== By: ==================================================
-//= MasterOfMuppets (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Additional Comments: =================================
-//= 1.0 First version [MasterOfMuppets]
-//============================================================
-
-//==================================================
-// jawaii - Jawaii, the Honeymoon Island
-//==================================================
-jawaii,207,290,10,10	monster	Phen	1158,3,3600000,1800000,0
-jawaii,221,220,30,30	monster	Aster	1266,2,3600000,2400000,0
-jawaii,276,163,20,20	monster	Aster	1266,1,7200000,3600000,0
-jawaii,221,220,30,30	monster	Shellfish	1074,1,4800000,3000000,0
-jawaii,276,163,20,30	monster	Shellfish	1074,2,4200000,2400000,0
-
-//==================================================
-// jawaii_in - Inside Jawaii
-//==================================================
-jawaii_in,128,121,1,4	monster	Red Mushroom	1085,1,3000000,1200000,0
-jawaii_in,124,76,1,1	monster	Black Mushroom	1084,1,3600000,1200000,0
-jawaii_in,72,74,5,1	monster	Black Mushroom	1084,2,3000000,1200000,0
-jawaii_in,73,117,4,4	monster	Thief Bug Egg	1048,1,5400000,3000000,0
-jawaii_in,83,117,5,5	monster	Thief Bug Egg	1048,1,4800000,2400000,0

+ 18 - 1
npc/re/mobs/fields/prontera.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
@@ -11,6 +11,7 @@
 //= 1.3 Official kRO 10.1 spawns [Playtester]
 //= 1.4 More accurate spawns [Playtester]
 //= 1.5 Updated to Renewal spawns.
+//= 1.6 Added Prontera Field 8 duplicates. [Euphy]
 //============================================================
 
 //==================================================
@@ -94,6 +95,22 @@ prt_fild08,0,0,0,0	monster	Poring	1002,140,5000,0,0
 prt_fild08,0,0,0,0	monster	Lunatic	1063,40,5000,0,0
 prt_fild08,0,0,0,0	monster	Fabre	1007,40,5000,0,0
 
+//==================================================
+// prt_fild08 - Duplicates 
+//==================================================
+prt_fild08a,0,0,0,0	monster	Poring	1002,140,5000,0,0
+prt_fild08b,0,0,0,0	monster	Poring	1002,140,5000,0,0
+prt_fild08c,0,0,0,0	monster	Poring	1002,140,5000,0,0
+prt_fild08d,0,0,0,0	monster	Poring	1002,140,5000,0,0
+prt_fild08a,0,0,0,0	monster	Lunatic	1063,40,5000,0,0
+prt_fild08b,0,0,0,0	monster	Lunatic	1063,40,5000,0,0
+prt_fild08c,0,0,0,0	monster	Lunatic	1063,40,5000,0,0
+prt_fild08d,0,0,0,0	monster	Lunatic	1063,40,5000,0,0
+prt_fild08a,0,0,0,0	monster	Fabre	1007,40,5000,0,0
+prt_fild08b,0,0,0,0	monster	Fabre	1007,40,5000,0,0
+prt_fild08c,0,0,0,0	monster	Fabre	1007,40,5000,0,0
+prt_fild08d,0,0,0,0	monster	Fabre	1007,40,5000,0,0
+
 //==================================================
 // prt_fild09 - Prontera Field 
 //==================================================

+ 36 - 0
npc/re/mobs/towns.txt

@@ -0,0 +1,36 @@
+//===== rAthena Script =======================================
+//= Town Monster Spawn Script
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Spawns monsters in towns.
+//===== Additional Comments: =================================
+//= 1.0 First version, Renewal spawns.
+//============================================================
+
+//==================================================
+// Brasilis, Strange Hydras
+//==================================================
+brasilis,283,88,6,6	monster	Strange Hydra	2081,5,5000,0,0
+brasilis,284,104,6,6	monster	Strange Hydra	2081,4,5000,0,0
+brasilis,215,80,6,6	monster	Strange Hydra	2081,4,5000,0,0
+brasilis,96,50,8,8	monster	Strange Hydra	2081,5,5000,0,0
+
+//==================================================
+// Alberta Ship, Swapping the Deck
+//==================================================
+alb_ship,0,0,0,0	monster	Strange Mouse	2057,25,0,0,0
+
+//==================================================
+// Prontera, Training Dummy Area
+//==================================================
+prontera,251,77,0,0	monster	Dummy Lv50	2409,1,5000,0,0
+prontera,259,77,0,0	monster	Dummy Lv50	2409,1,5000,0,0
+prontera,251,66,0,0	monster	Dummy Lv100	2410,1,5000,0,0
+prontera,259,66,0,0	monster	Dummy Lv100	2410,1,5000,0,0
+prontera,251,55,0,0	monster	Dummy Lv150	2411,1,5000,0,0
+prontera,259,55,0,0	monster	Dummy Lv150	2411,1,5000,0,0

+ 0 - 16
npc/re/mobs/towns/brasilis.txt

@@ -1,16 +0,0 @@
-//===== rAthena Script =======================================
-//= Brasilis Quest Monsters
-//===== By: ==================================================
-//= L0ne_W0lf
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= 1.0 First version
-//============================================================
-
-brasilis,283,88,6,6	monster	Strange Hydra	2081,5,5000,0,0
-brasilis,284,104,6,6	monster	Strange Hydra	2081,4,5000,0,0
-brasilis,215,80,6,6	monster	Strange Hydra	2081,4,5000,0,0
-brasilis,96,50,8,8	monster	Strange Hydra	2081,5,5000,0,0

+ 21 - 0
npc/re/other/mail.txt

@@ -0,0 +1,21 @@
+//===== rAthena Script =======================================
+//= Mail Boxes
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= [Official Conversion]
+//= Pickup and write mail from/to players in game.
+//===== Additional Comments: =================================
+//= 1.0 First version, Renewal duplicates.
+//============================================================
+
+// Izlude
+//============================================================
+izlude_a,136,94,0	duplicate(MailBox)	Mailbox#iz_a	888
+izlude_b,136,94,0	duplicate(MailBox)	Mailbox#iz_b	888
+izlude_c,136,94,0	duplicate(MailBox)	Mailbox#iz_c	888
+izlude_d,136,94,0	duplicate(MailBox)	Mailbox#iz_d	888

+ 10 - 0
npc/re/other/mercenary_rent.txt

@@ -11,7 +11,17 @@
 //= along with related mercenary items.
 //===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
+//= 1.1 Added Izlude duplicates. [Euphy]
 //============================================================
 
 izlude,47,170,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Sword	734
+izlude_a,47,170,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Swo_a	734
+izlude_b,47,170,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Swo_b	734
+izlude_c,47,170,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Swo_c	734
+izlude_d,47,170,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Swo_d	734
+
 izlude,55,170,4	duplicate(MercMerchant)	Mercenary Merchant#Sword	892
+izlude_a,55,170,4	duplicate(MercMerchant)	Mercenary Merchant#Swo_a	892
+izlude_b,55,170,4	duplicate(MercMerchant)	Mercenary Merchant#Swo_b	892
+izlude_c,55,170,4	duplicate(MercMerchant)	Mercenary Merchant#Swo_c	892
+izlude_d,55,170,4	duplicate(MercMerchant)	Mercenary Merchant#Swo_d	892

+ 6 - 1
npc/re/other/resetskill.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -12,6 +12,7 @@
 //= base level 50 and normal first class.
 //===== Additional Comments: =================================
 //= 1.0 First version, Renewal script.
+//= 1.1 Added Izlude duplicates. [Euphy]
 //============================================================
 
 izlude,127,175,3	script	Hypnotist#novice	124,{
@@ -142,3 +143,7 @@ izlude,127,175,3	script	Hypnotist#novice	124,{
 		close;
 	}
 }
+izlude_a,127,175,3	duplicate(Hypnotist#novice)	Hypnotist#novice_a	124
+izlude_b,127,175,3	duplicate(Hypnotist#novice)	Hypnotist#novice_b	124
+izlude_c,127,175,3	duplicate(Hypnotist#novice)	Hypnotist#novice_c	124
+izlude_d,127,175,3	duplicate(Hypnotist#novice)	Hypnotist#novice_d	124

+ 39 - 18
npc/re/quests/eden/eden_common.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -18,6 +18,7 @@
 //= 1.5 Added some missing Eden Group Teleport Officers. [Masao]
 //= 1.6 Added Izlude RE coordinates. [Euphy]
 //= 1.7 Added Malaya teleporter. [Euphy]
+//= 1.8 Updated to match the latest official script. [Euphy]
 //============================================================
 
 moc_para01,27,35,5	script	Secretary Lime Evenor	952,{
@@ -218,7 +219,7 @@ moc_ruins,68,164,3	duplicate(eto)	Eden Teleport Officer#2	729
 geffen,132,66,3	duplicate(eto)	Eden Teleport Officer#3	729
 alberta,124,67,3	duplicate(eto)	Eden Teleport Officer#4	729
 aldebaran,133,119,5	duplicate(eto)	Eden Teleport Officer#5	729
-izlude,131,148,4	duplicate(eto)	Eden Teleport Officer#6	729
+izlude_in,68,162,1	duplicate(eto)	Eden Teleport Officer#6	729
 prt_church,103,78,3	duplicate(eto)	Eden Teleport Officer#7	729
 geffen_in,160,104,5	duplicate(eto)	Eden Teleport Officer#8	729
 moc_prydb1,53,126,3	duplicate(eto)	Eden Teleport Officer#9	729
@@ -229,14 +230,26 @@ que_ng,33,73,3	duplicate(eto)	Eden Teleport Officer#13	729
 que_ng,144,161,5	duplicate(eto)	Eden Teleport Officer#14	729
 yuno,144,189,5	duplicate(eto)	Eden Teleport Officer#15	729
 rachel,125,144,3	duplicate(eto)	Eden Teleport Officer#16	729
-morocc,161,97,6	duplicate(eto)	Eden Teleport Officer#17	729
-comodo,202,151,4	duplicate(eto)	Eden Teleport Officer#18	729
-umbala,96,160,3	duplicate(eto)	Eden Teleport Officer#19	729
-veins,220,109,4	duplicate(eto)	Eden Teleport Officer#20	729
+comodo,202,151,4	duplicate(eto)	Eden Teleport Officer#17	729
+hugel,93,153,4	duplicate(eto)	Eden Teleport Officer#18	729
+veins,220,109,4	duplicate(eto)	Eden Teleport Officer#19	729
+einbroch,250,211,4	duplicate(eto)	Eden Teleport Officer#20	729
 lighthalzen,164,86,4	duplicate(eto)	Eden Teleport Officer#21	729
-einbroch,250,211,4	duplicate(eto)	Eden Teleport Officer#22	729
-hugel,93,153,4	duplicate(eto)	Eden Teleport Officer#23	729
-malaya,238,206,6	duplicate(eto)	Eden Teleport Officer#24	729
+amatsu,100,145,5	duplicate(eto)	Eden Teleport Officer#22	729
+ayothaya,221,191,3	duplicate(eto)	Eden Teleport Officer#23	729
+louyang,224,107,3	duplicate(eto)	Eden Teleport Officer#24	729
+gonryun,162,122,5	duplicate(eto)	Eden Teleport Officer#25	729
+moscovia,209,197,5	duplicate(eto)	Eden Teleport Officer#26	729
+brasilis,191,224,3	duplicate(eto)	Eden Teleport Officer#27	729
+dewata,192,193,5	duplicate(eto)	Eden Teleport Officer#28	729
+morocc,161,97,5	duplicate(eto)	Eden Teleport Officer#29	729
+izlude,131,148,4	duplicate(eto)	Eden Teleport Officer#30	729
+izlude_a,131,148,4	duplicate(eto)	Eden Teleport Officer#30::eto_iz_a	729
+izlude_b,131,148,4	duplicate(eto)	Eden Teleport Officer#30::eto_iz_b	729
+izlude_c,131,148,4	duplicate(eto)	Eden Teleport Officer#30::eto_iz_c	729
+izlude_d,131,148,4	duplicate(eto)	Eden Teleport Officer#30::eto_iz_d	729
+umbala,105,158,3	duplicate(eto)	Eden Teleport Officer#31	729
+malaya,238,206,6	duplicate(eto)	Eden Teleport Officer#32	729
 
 moc_para01,30,10,0	script	#eden_out	45,1,1,{
 OnTouch:
@@ -246,7 +259,7 @@ OnTouch:
 		case 3: warp "geffen",120,39; end;
 		case 4: warp "alberta",117,56; end;
 		case 5: warp "aldebaran",168,112; end;
-		case 6: if (checkre(0)) warp "izlude",134,118; else warp "izlude",127,142; end;
+		case 6: warp "izlude_in",73,165; end;
 		case 7: warp "prt_church",99,78; end;
 		case 8: warp "geffen_in",162,99; end;
 		case 9: warp "moc_prydb1",51,118; end;
@@ -257,14 +270,22 @@ OnTouch:
 		case 14: warp "que_ng",144,166; end;
 		case 15: warp "yuno",158,125; end;
 		case 16: warp "rachel",115,125; end;
-		case 17: warp "morocc",156,93; end;
-		case 18: warp "comodo",209,143; end;
-		case 19: warp "umbala",99,155; end;
-		case 20: warp "veins",216,123; end;
-		case 21: warp "lighthalzen",158,92; end;
-		case 22: warp "einbroch",245,210; end;
-		case 23: warp "hugel",95,145; end;
-		case 24: warp "malaya",234,199; end;
+		case 17: warp "comodo",192,145; end;
+		case 18: warp "hugel",88,148; end;
+		case 19: warp "veins",216,104; end;
+		case 20: warp "einbroch",246,204; end;
+		case 21: warp "lighthalzen",159,95; end;
+		case 22: warp "amatsu",110,150; end;
+		case 23: warp "ayothaya",217,178; end;
+		case 24: warp "louyang",217,103; end;
+		case 25: warp "gonryun",155,120; end;
+		case 26: warp "moscovia",218,198; end;
+		case 27: warp "brasilis",190,220; end;
+		case 28: warp "dewata",192,182; end;
+		case 29: warp "morocc",161,97; end;
+		case 30: warp "izlude",134,118; end;	// Old coordinates: (127,142)
+		case 31: warp "umbala",94,154; end;
+		case 32: warp "malaya",234,199; end;
 		default: warp "prontera",116,72; end;
 	}
 	end;

+ 6 - 1
npc/re/quests/mrsmile.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Daegaladh, Masao
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,11 @@
 //= Trade Clover, Fluff and Jellopy for a Mr. Smile mask.
 //===== Additional Comments: ================================= 
 //= 1.0 Updated to match the new Izlude Map. [Masao]
+//= 1.1 Added Izlude duplicates. [Euphy]
 //============================================================ 
 
 izlude,125,175,4	duplicate(SmileHelper)	Smile Assistance#iz	92
+izlude_a,125,175,4	duplicate(SmileHelper)	Smile Assistance#iz_a	92
+izlude_b,125,175,4	duplicate(SmileHelper)	Smile Assistance#iz_b	92
+izlude_c,125,175,4	duplicate(SmileHelper)	Smile Assistance#iz_c	92
+izlude_d,125,175,4	duplicate(SmileHelper)	Smile Assistance#iz_d	92

+ 6 - 1
npc/re/quests/quests_13_1.txt

@@ -3,13 +3,18 @@
 //===== By: ================================================== 
 //= Euphy
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= Contains duplicate NPCs from main script.
 //===== Additional Comments: ================================= 
 //= 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy]
+//= 1.1 Added Izlude duplicates. [Euphy]
 //============================================================ 
 
 izlude,102,171,6	duplicate(PromotionalStaff_izlude)	Promotional Staff#iz	100
+izlude_a,102,171,6	duplicate(PromotionalStaff_izlude)	Promotional Staff#iz_a	100
+izlude_b,102,171,6	duplicate(PromotionalStaff_izlude)	Promotional Staff#iz_b	100
+izlude_c,102,171,6	duplicate(PromotionalStaff_izlude)	Promotional Staff#iz_c	100
+izlude_d,102,171,6	duplicate(PromotionalStaff_izlude)	Promotional Staff#iz_d	100

+ 7 - 2
npc/re/quests/quests_dicastes.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Gennosuke Kouga, Muad_Dib
 //===== Current Version: =====================================
-//= 2.1
+//= 2.2
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -31,6 +31,7 @@
 //= 1.9a Minor fix. [Joseph]
 //= 2.0 Fixed variables. [Joseph]
 //= 2.1 Added reset option to "Kareka". [Euphy]
+//= 2.2 Added Izlude duplicates. [Euphy]
 //============================================================
 
 // Entrance
@@ -1117,7 +1118,11 @@ pay_fild02,105,113,0	script	Pointed Scales	844,{ unknown_d(12170,906); }
 pay_fild01,152,171,0	script	Resin	844,{ unknown_d(12171,907); }
 gef_fild01,104,111,0	script	Spawn	844,{ unknown_d(12172,908); }
 prt_fild08,299,332,0	script	Jellopy	844,{ unknown_d(12173,909); }
-izlude,136,160,0	script	Fish Tails	844,{ unknown_d(12174,1023); }	// Pre-RE: izlude (132,136)
+izlude,136,160,0	script	Fish Tails	844,{ unknown_d(12174,1023); }	// Old coordinates: (132,136)
+izlude_a,136,160,0	script	Fish Tails#a	844,{ unknown_d(12174,1023); }
+izlude_b,136,160,0	script	Fish Tails#b	844,{ unknown_d(12174,1023); }
+izlude_c,136,160,0	script	Fish Tails#c	844,{ unknown_d(12174,1023); }
+izlude_d,136,160,0	script	Fish Tails#d	844,{ unknown_d(12174,1023); }
 prt_fild05,303,169,0	script	Worm Peelings	844,{ unknown_d(12175,955); }
 iz_dun03,155,165,0	script	Gills	844,{ unknown_d(12176,956); }
 mjo_dun01,222,226,0	script	Tooth of Bat	844,{ unknown_d(12177,913); }

+ 6 - 1
npc/re/quests/quests_izlude.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Daegaladh, Masao
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,11 @@
 //= - Edgar's Offer
 //===== Additional Comments: ================================= 
 //= 1.0 Updated to match the new Izlude Map. [Masao]
+//= 1.1 Added Izlude duplicates. [Euphy]
 //============================================================
 
 izlude,179,219,2	duplicate(Edgar_izlude)	Edgar#izlude	49
+izlude_a,179,219,2	duplicate(Edgar_izlude)	Edgar#izlude_a	49
+izlude_b,179,219,2	duplicate(Edgar_izlude)	Edgar#izlude_b	49
+izlude_c,179,219,2	duplicate(Edgar_izlude)	Edgar#izlude_c	49
+izlude_d,179,219,2	duplicate(Edgar_izlude)	Edgar#izlude_d	49

+ 7 - 2
npc/re/quests/quests_lighthalzen.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Ziu, Heris (translation)
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -11,11 +11,16 @@
 //===== Additional Comments: ================================= 
 //= 1.0 Updated to match the new Izlude Map. [Masao]
 //= 1.1 Added Somatology Laboratory F4 quest. [Euphy]
+//= 1.2 Added Izlude duplicates. [Euphy]
 //============================================================ 
 
 // Renewal split [Daegaladh]
 //============================================================
-izlude,172,73,6	duplicate(Scamp)	Scamp#2	853
+izlude,172,73,6	duplicate(Scamp)	Scamp#iz	853
+izlude_a,172,73,6	duplicate(Scamp)	Scamp#iz_a	853
+izlude_b,172,73,6	duplicate(Scamp)	Scamp#iz_b	853
+izlude_c,172,73,6	duplicate(Scamp)	Scamp#iz_c	853
+izlude_d,172,73,6	duplicate(Scamp)	Scamp#iz_d	853
 
 // Somatology Laboratory F4
 //============================================================

+ 1 - 0
npc/re/scripts_athena.conf

@@ -82,6 +82,7 @@ npc: npc/re/merchants/shops.txt
 //npc: npc/re/merchants/ticket_refiner.txt
 
 // --------------------------- Others ---------------------------
+npc: npc/re/other/mail.txt
 npc: npc/re/other/mercenary_rent.txt
 npc: npc/re/other/resetskill.txt
 

+ 3 - 4
npc/re/scripts_monsters.conf

@@ -2,6 +2,9 @@
 // -                   Renewal Monster Scripts                  -
 // --------------------------------------------------------------
 
+npc: npc/re/mobs/citycleaners.txt
+npc: npc/re/mobs/towns.txt
+
 // -------------------------- Dungeons --------------------------
 npc: npc/re/mobs/dungeons/abbey.txt
 npc: npc/re/mobs/dungeons/abyss.txt
@@ -60,7 +63,6 @@ npc: npc/re/mobs/fields/einbroch.txt
 npc: npc/re/mobs/fields/geffen.txt
 npc: npc/re/mobs/fields/gonryun.txt
 npc: npc/re/mobs/fields/hugel.txt
-npc: npc/re/mobs/fields/jawaii.txt
 npc: npc/re/mobs/fields/lighthalzen.txt
 npc: npc/re/mobs/fields/louyang.txt
 npc: npc/re/mobs/fields/lutie.txt
@@ -77,6 +79,3 @@ npc: npc/re/mobs/fields/splendide.txt
 npc: npc/re/mobs/fields/umbala.txt
 npc: npc/re/mobs/fields/veins.txt
 npc: npc/re/mobs/fields/yuno.txt
-
-// --------------------------- Towns ----------------------------
-npc: npc/re/mobs/towns/brasilis.txt

+ 57 - 8
npc/re/warps/cities/izlude.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0), Nana (1.1)
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -14,6 +14,7 @@
 //= 1.5 Updated to match the new Izlude Map. [Masao]
 //= 1.6 Added new warps. [Streusel]
 //= 1.7 Updated to match the official scripts. [Euphy]
+//= 1.8 Added Izlude & Prontera Field 8 duplicates. [Euphy]
 //============================================================
 
 //= Izlude City ==============================================
@@ -33,11 +34,59 @@ izlude_in,172,158,0	warp	iz07-1	3,2,izlude_in,172,136
 izlude_in,172,116,0	warp	iz06-1	3,2,izlude_in,172,94
 izlude_in,171,97,0	warp	iz06	3,2,izlude_in,172,119
 
+//= Izlude & Prontera Field 8 Duplicates =====================
+prt_fild08a,371,212,0	warp	prtf005_a	3,3,izlude_a,24,98
+prt_fild08b,371,212,0	warp	prtf005_b	3,3,izlude_b,24,98
+prt_fild08c,371,212,0	warp	prtf005_c	3,3,izlude_c,24,98
+prt_fild08d,371,212,0	warp	prtf005_d	3,3,izlude_d,24,98
+izlude_a,20,98,0	warp	iz001_a	3,3,prt_fild08a,367,212
+izlude_b,20,98,0	warp	iz001_b	3,3,prt_fild08b,367,212
+izlude_c,20,98,0	warp	iz001_c	3,3,prt_fild08c,367,212
+izlude_d,20,98,0	warp	iz001_d	3,3,prt_fild08d,367,212
+izlude_a,110,182,0	warp	iz01_a	2,2,izlude_in,65,87
+izlude_b,110,182,0	warp	iz01_b	2,2,izlude_in,65,87
+izlude_c,110,182,0	warp	iz01_c	2,2,izlude_in,65,87
+izlude_d,110,182,0	warp	iz01_d	2,2,izlude_in,65,87
+izlude_a,52,172,0	warp	iz04_a	2,2,izlude_in,74,161
+izlude_b,52,172,0	warp	iz04_b	2,2,izlude_in,74,161
+izlude_c,52,172,0	warp	iz04_c	2,2,izlude_in,74,161
+izlude_d,52,172,0	warp	iz04_d	2,2,izlude_in,74,161
+
 //= Izlude Academy ===========================================
-izlude,130,257,0	warp	iz_ac01-1	2,2,iz_ac01,99,29
-izlude,125,257,0	warp	iz_ac01-2	2,2,iz_ac01,99,29
-iz_ac01,100,24,0	warp	iz_ac01	2,2,izlude,127,253
-iz_ac01,122,25,0	warp	iz_ac02	2,2,iz_ac02,104,27
-iz_ac01,78,25,0	warp	iz_ac03	2,2,iz_ac02,104,27
-iz_ac02,113,27,0	warp	iz_ac04	2,2,iz_ac01,122,28
-iz_ac02,94,27,0	warp	iz_ac05	2,2,iz_ac01,78,28
+izlude,125,257,0	warp	#to_ac01	2,2,iz_ac01,99,29
+izlude,130,257,0	warp	#to_ac02	2,2,iz_ac01,99,29
+iz_ac01,100,24,0	warp	#to_ac01-1	2,2,izlude,127,253
+iz_ac01,78,25,0	warp	#to_ac2f01	2,2,iz_ac02,104,27
+iz_ac01,122,25,0	warp	#to_ac2f02	2,2,iz_ac02,104,27
+iz_ac02,94,27,0	warp	#to_ac1f01	2,2,iz_ac01,78,28
+iz_ac02,113,27,0	warp	#to_ac1f02	2,2,iz_ac01,122,28
+
+//= Izlude Academy Duplicates ================================
+izlude_a,125,257,0	warp	#to_ac01_a	2,2,iz_ac01_a,99,29
+izlude_b,125,257,0	warp	#to_bc01_b	2,2,iz_ac01_b,99,29
+izlude_c,125,257,0	warp	#to_cc01_c	2,2,iz_ac01_c,99,29
+izlude_d,125,257,0	warp	#to_dc01_d	2,2,iz_ac01_d,99,29
+izlude_a,130,257,0	warp	#to_ac02_a	2,2,iz_ac01_a,99,29
+izlude_b,130,257,0	warp	#to_bc02_b	2,2,iz_ac01_b,99,29
+izlude_c,130,257,0	warp	#to_cc02_c	2,2,iz_ac01_c,99,29
+izlude_d,130,257,0	warp	#to_dc02_d	2,2,iz_ac01_d,99,29
+iz_ac01_a,100,24,0	warp	#to_ac01-1_a	2,2,izlude_a,127,253
+iz_ac01_b,100,24,0	warp	#to_bc01-1_b	2,2,izlude_b,127,253
+iz_ac01_c,100,24,0	warp	#to_cc01-1_c	2,2,izlude_c,127,253
+iz_ac01_d,100,24,0	warp	#to_dc01-1_d	2,2,izlude_d,127,253
+iz_ac01_a,78,25,0	warp	#to_ac2f01_a	2,2,iz_ac02_a,104,27
+iz_ac01_b,78,25,0	warp	#to_bc2f01_b	2,2,iz_ac02_b,104,27
+iz_ac01_c,78,25,0	warp	#to_cc2f01_c	2,2,iz_ac02_c,104,27
+iz_ac01_d,78,25,0	warp	#to_dc2f01_d	2,2,iz_ac02_d,104,27
+iz_ac01_a,122,25,0	warp	#to_ac2f02_a	2,2,iz_ac02_a,104,27
+iz_ac01_b,122,25,0	warp	#to_bc2f02_b	2,2,iz_ac02_b,104,27
+iz_ac01_c,122,25,0	warp	#to_cc2f02_c	2,2,iz_ac02_c,104,27
+iz_ac01_d,122,25,0	warp	#to_dc2f02_d	2,2,iz_ac02_d,104,27
+iz_ac02_a,94,27,0	warp	#to_ac1f01_a	2,2,iz_ac01_a,78,28
+iz_ac02_b,94,27,0	warp	#to_bc1f01_b	2,2,iz_ac01_b,78,28
+iz_ac02_c,94,27,0	warp	#to_cc1f01_c	2,2,iz_ac01_c,78,28
+iz_ac02_d,94,27,0	warp	#to_dc1f01_d	2,2,iz_ac01_d,78,28
+iz_ac02_a,113,27,0	warp	#to_ac1f02_a	2,2,iz_ac01_a,122,28
+iz_ac02_b,113,27,0	warp	#to_bc1f02_b	2,2,iz_ac01_b,122,28
+iz_ac02_c,113,27,0	warp	#to_cc1f02_c	2,2,iz_ac01_c,122,28
+iz_ac02_d,113,27,0	warp	#to_dc1f02_d	2,2,iz_ac01_d,122,28

+ 24 - 1
npc/re/warps/fields/prontera_fild.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -14,6 +14,7 @@
 //= 1.3 Updated to match the new Izlude Map. [Masao]
 //= 1.3a Moved Izlude warp to other file. [Euphy]
 //= 1.4 Commented moc_fild20 warps replaced with new NPCs. [Euphy]
+//= 1.5 Added Prontera Field 8 duplicates. [Euphy]
 //============================================================
 
 //= Prontera Fields ==========================================
@@ -89,6 +90,28 @@ prt_fild11,302,301,0	warp	prtf022	5,2,gef_fild03,312,19
 prt_fild11,361,184,0	warp	prtf20-1	2,5,prt_fild10,23,196
 prt_fild11,362,111,0	warp	prtf19-1	2,6,prt_fild10,23,122
 
+//= Prontera Field 8 Duplicates ==============================
+prt_fild08a,16,187,0	warp	prtf15-1_a	3,17,prt_fild07,380,186
+prt_fild08b,16,187,0	warp	prtf15-1_b	3,17,prt_fild07,380,186
+prt_fild08c,16,187,0	warp	prtf15-1_c	3,17,prt_fild07,380,186
+prt_fild08d,16,187,0	warp	prtf15-1_d	3,17,prt_fild07,380,186
+prt_fild08a,16,239,0	warp	prtf14-1_a	3,15,prt_fild07,379,239
+prt_fild08b,16,239,0	warp	prtf14-1_b	3,15,prt_fild07,379,239
+prt_fild08c,16,239,0	warp	prtf14-1_c	3,15,prt_fild07,379,239
+prt_fild08d,16,239,0	warp	prtf14-1_d	3,15,prt_fild07,379,239
+prt_fild08a,170,378,0	warp	prtf004_a	3,2,prontera,156,26
+prt_fild08b,170,378,0	warp	prtf004_b	3,2,prontera,156,26
+prt_fild08c,170,378,0	warp	prtf004_c	3,2,prontera,156,26
+prt_fild08d,170,378,0	warp	prtf004_d	3,2,prontera,156,26
+prt_fild08a,233,16,0	warp	prtf023_a	12,1,moc_fild01,238,378
+prt_fild08b,233,16,0	warp	prtf023_b	12,1,moc_fild01,238,378
+prt_fild08c,233,16,0	warp	prtf023_c	12,1,moc_fild01,238,378
+prt_fild08d,233,16,0	warp	prtf023_d	12,1,moc_fild01,238,378
+prt_fild08a,55,21,0	warp	prtf024_a	4,2,moc_fild01,56,380
+prt_fild08b,55,21,0	warp	prtf024_b	4,2,moc_fild01,56,380
+prt_fild08c,55,21,0	warp	prtf024_c	4,2,moc_fild01,56,380
+prt_fild08d,55,21,0	warp	prtf024_d	4,2,moc_fild01,56,380
+
 //= St. Capitolina Abbey =====================================
 monk_in,128,46,0	warp	monk03	1,3,monk_in,161,38
 monk_in,128,84,0	warp	monk04	1,3,monk_in,161,90

+ 1 - 0
npc/scripts_monsters.conf

@@ -5,3 +5,4 @@
 npc: npc/mobs/citycleaners.txt
 npc: npc/mobs/jail.txt
 npc: npc/mobs/pvp.txt
+npc: npc/mobs/towns.txt

+ 7 - 5
sql-files/mob_db_re.sql

@@ -1625,12 +1625,14 @@ REPLACE INTO `mob_db` VALUES (2380,'XMAS_SMOKEY_GIFT','Smokey Gift','Smokey Gift
 #2405,WEAK_SKELETON
 #2406,WEAK_SKEL_SOLDIER
 #2407,SAILOR_SKELETON
-#2408,DUMMY_10
-#2409,DUMMY_50
-#2410,DUMMY_100
-#2411,DUMMY_150
+
+REPLACE INTO `mob_db` VALUES (2408,'DUMMY_10','Dummy','Dummy',10,99999999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,1,0,20,0x0,200,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,0,0);
+REPLACE INTO `mob_db` VALUES (2409,'DUMMY_50','Dummy','Dummy',50,99999999,1,0,0,0,0,0,50,50,0,0,0,0,0,0,0,200,1,0,20,0x0,200,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,0,0);
+REPLACE INTO `mob_db` VALUES (2410,'DUMMY_100','Dummy','Dummy',100,99999999,1,0,0,0,0,0,90,90,0,0,0,0,0,0,0,200,1,0,20,0x0,200,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,0,0);
+REPLACE INTO `mob_db` VALUES (2411,'DUMMY_150','Dummy','Dummy',150,99999999,1,0,0,0,0,0,120,120,0,0,0,0,0,0,0,200,1,0,20,0x0,200,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,0,0);
 #2412,E_VALKIWI
-#2413,DUMMY_10_FIRE
+REPLACE INTO `mob_db` VALUES (2413,'DUMMY_10_FIRE','Dummy','Dummy',10,99999999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,1,0,23,0x0,200,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,0,0);
+
 #2414,RUNAWAY_BOOK
 #2415,L_SEYREN
 #2416,L_EREMES