- First try to commit something into this whole new Mess Ind created ^^

* Added the Izlude Town Map Update some of you may already know from me from the download section. Moving all NPC's and Warps around to match the new Izlude Town Map.

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

15 files changed, 227 insertions, 207 deletions

diff --git a/npc/re/airports/izlude.txt b/npc/re/airports/izlude.txt
index c740c1c67..e77a19644 100644
--- a/npc/re/airports/izlude.txt
+++ b/npc/re/airports/izlude.txt
@@ -8,9 +8,10 @@
 //= Izlude Airport NPCs
 //===== Additional Comments: ================================= 
 //= Official NPCs.
+//= Updated to match the new Izlude Map. [Masao]
 //============================================================ 
 
-izlude,206,55,3	script	Airship Staff#izlude	90,{
+izlude,204,75,3	script	Airship Staff#izlude	90,{
 	mes "[Airship Staff]";
 	mes "Welcome! Would you like";
 	mes "to board the Airship that";
diff --git a/npc/re/cities/izlude.txt b/npc/re/cities/izlude.txt
index bff881900..cadfea063 100644
--- a/npc/re/cities/izlude.txt
+++ b/npc/re/cities/izlude.txt
@@ -1,39 +1,19 @@
 //===== rAthena Script ======================================= 
-//= Izlude Town
+//= Izlude Town Renewal
 //===== By: ================================================== 
-//= kobra_k88
-//= L0ne_W0lf
+//= Masao
 //===== Current Version: ===================================== 
-//= 1.8a
+//= 1.0
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Izlude town NPCs
+//= Izlude Town Renewal NPC's
 //===== Additional Comments: ================================= 
-//= Fully working
-//= 1.1 fixed 2 zeny bugs/checks [Lupus]
-//= 1.2 Fixed a lot of typos [Nexon]
-//= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
-//= 1.4 Added a Jawaii related npc. 1.4a Fixed a small bug to
-//=	the Jawaii warper, thanks to reddozen and Silent [MasterOfMuppets]
-//= 1.5 Replaced iz_move_alberta with MISC_QUEST & 16 [Lupus]
-//= 1.6 Removed Duplicates [Silent]
-//= 1.7 Split quest to quests/quests_izlude.txt [Evera]
-//= 1.71 Optimized. Also thanks to CAHTEXHuK [Lupus]
-//= 1.72 Small bugfix [Paradox924X]
-//= 1.8 Rescripted to Aegis 10.3 standard. [L0ne_W0lf]
-//=	Removed Honeymoon Helper, as she is a Jawaii NPC.
-//=	Moved Signs to the msg_boards file.
-//= 1.8a Made Red/Cebalis as a single NPC + duplicate [Lupus]
-//= 1.9 Fixed a small problem with Dega. (Ne default case) [L0ne_W0lf]
-//=	Re-added NPC dialog for Cebalis. The dialog differs
-//=	(even if slightly,) after the five or so lines.
+//= 1.0 First Version. Still missing many new NPC's and
+//= their dialogues. [Masao]
 //============================================================
 
-// Izlude
-//============================================================
-izlude,201,181,2	script	Sailor#izlude	100,{
+izlude,197,205,1	script	Sailor	100,{
 	mes "[Sailor]";
 	mes "Hey everybody!";
 	mes "Attention, attention!";
@@ -41,25 +21,25 @@ izlude,201,181,2	script	Sailor#izlude	100,{
 	mes "on a fascinating Ship!";
 	mes "Hurry, hurry!";
 	next;
-	switch(select("Byalan Island -> 150 Zeny.:Alberta Marina  -> 500 Zeny.:Cancel.")) {
+	switch (select("Byalan Island -> 150 Zeny.:Alberta Marina  -> 500 Zeny.:Cancel.")) {
 	case 1:
-		if (zeny < 150) {
+		if (Zeny < 150) {
 			mes "[Sailor]";
 			mes "150 Zeny!";
 			mes "Only 150 Zeny to ride!";
 			close;
 		}
-		set zeny,zeny-150;
+		set Zeny, Zeny - 150;
 		warp "izlu2dun",107,50;
 		end;
 	case 2:
-		if (zeny < 500) {
+		if (Zeny < 500) {
 			mes "[Sailor]";
 			mes "500 Zeny!";
 			mes "Only 500 Zeny to ride!";
 			close;
 		}
-		set zeny,zeny-500;
+		set Zeny, Zeny - 500;
 		warp "alberta",188,169;
 		end;
 	case 3:
@@ -67,13 +47,25 @@ izlude,201,181,2	script	Sailor#izlude	100,{
 	}
 }
 
-izlude,55,74,2	script	Bonne#izlude	90,{
+izlu2dun,108,27,0	script	Sailor#2	100,{
+	mes "[Sailor]";
+	mes "Wanna";
+	mes "head back?";
+	next;
+	if(select("Yeah, I'm tired to death.:Nope, I love this place!") == 1) {
+		warp "izlude",197,210;
+		end;
+	}
+	close;
+}
+
+izlude,71,92,2	script	Bonne	90,{
 	mes "[Bonne]";
 	mes "Greetings!";
 	mes "Izlude welcomes you.";
 	next;
 	mes "[Bonne]";
-	mes "Izlude is the satellite city of Prontera, capital of the Rune-Midgarts kingdom.";
+	mes "Izlude is the satellite city of Prontera, capital of the Rune-Midgarts Kingdom.";
 	next;
 	mes "[Bonne]";
 	mes "Izlude is key to our kingdom because of the Swordsman Association located here, as well as the fact that Izlude is in charge of protecting the Rune-Midgard coastline.";
@@ -91,10 +83,11 @@ izlude,55,74,2	script	Bonne#izlude	90,{
 	close;
 }
 
-izlude,135,78,2	script	Charfri#izlude	91,{
-	mes "[Charfri]";
-	switch(rand(2)) {
+izlude,172,215,4	script	Charfri	91,{
+
+	switch (rand(1,2)) {
 	case 1:
+		mes "[Charfri]";
 		mes "Some people may think Izlude is just a satellite city of Prontera, and not really that important...";
 		next;
 		mes "[Charfri]";
@@ -102,8 +95,10 @@ izlude,135,78,2	script	Charfri#izlude	91,{
 		next;
 		mes "[Charfri]";
 		mes "You'll have to board on a ship at the port to get to Byalan Island. There are dangerous dungeons on that island, so don't go snooping around just anywhere.";
-		close;
-	Default:
+		close2;
+	break;
+	case 2:
+		mes "[Charfri]";
 		mes "Though it is very beautiful, Byalan Island has a mysterious dungeon that extends deep under the sea.";
 		next;
 		mes "[Charfri]";
@@ -118,14 +113,17 @@ izlude,135,78,2	script	Charfri#izlude	91,{
 		next;
 		mes "[Charfri]";
 		mes "But unfortunately, the monsters are too strong for ordinary people to merely go sight seeing there. Still, just once, I'd like to go down there...";
-		close;
+		close2;
+	break;
 	}
+end;
 }
 
-izlude,119,121,2	script	Cuskoal#izlude	124,{
-	mes "[Cuskoal]";
-	switch(rand(2)) {
+izlude,127,175,4	script	Cuskoal	124,{
+
+	switch (rand(1,2)) {
 	case 1:
+		mes "[Cuskoal]";
 		mes "The Arena here is THE place for capable young people from all over the Rune-Midgarts Kingdom to challenge themselves and test their skills.";
 		next;
 		mes "[Cuskoal]";
@@ -134,7 +132,8 @@ izlude,119,121,2	script	Cuskoal#izlude	124,{
 		mes "[Cuskoal]";
 		mes "So, whaddya say?";
 		close;
-	Default:
+	case 2:
+		mes "[Cuskoal]";
 		mes "The pubs in Prontera are always full of people from local areas and from out-of-town. It can get pretty busy.";
 		next;
 		mes "[Cuskoal]";
@@ -146,10 +145,10 @@ izlude,119,121,2	script	Cuskoal#izlude	124,{
 	}
 }
 
-izlude,150,118,2	script	Dega#izlude	84,{
-	mes "[Dega]";
-	switch(rand(3)) {
+izlude,85,103,4	script	Dega	84,{
+	switch (rand(1,3)) {
 	case 1:
+		mes "[Dega]";
 		mes "Mt. Mjornir, located north of Prontera, is a tough";
 		mes "and steep climb.";
 		next;
@@ -160,6 +159,7 @@ izlude,150,118,2	script	Dega#izlude	84,{
 		mes "If you ever want to visit somewhere past Mt. Mjolnir, then you prepare yourself for the challenge.  Or you could walk around it.";
 		close;
 	case 2:
+		mes "[Dega]";
 		mes "Some monsters in the world have the unique ability to sense mystical energy, and can detect Magic spells before they are cast.";
 		next;
 		mes "[Dega]";
@@ -168,7 +168,8 @@ izlude,150,118,2	script	Dega#izlude	84,{
 		mes "[Dega]";
 		mes "If you try to cast magic near it, it will notice and saunter over to smash you. So you better watch out for Golem.";
 		close;
-	Default:
+	case 3:
+		mes "[Dega]";
 		mes "There's a very delightful place where you can find every";
 		mes "type of Poring.";
 		next;
@@ -187,8 +188,8 @@ izlude,150,118,2	script	Dega#izlude	84,{
 		mes "[Dega]";
 		mes "If you are lucky enough, you might even bump into Angelring, the Poring with Angel wings.";
 		next;
-		while(1) {
-			switch(select("Ghostring?:Angelring?:End Conversation.")) {
+		while (1) {
+			switch (select("Ghostring?:Angelring?:End Conversation.")) {
 			case 1:
 				mes "[Dega]";
 				mes "Ghostring is a grayish Poring that floats around in the air like a ghost. Just like other ghosts, physical attacks can't do any damage to it.";
@@ -215,17 +216,16 @@ izlude,150,118,2	script	Dega#izlude	84,{
 			case 3:
 				mes "[Dega]";
 				mes "Good Luck~";
-				close2;
-				end;
+				close;
 			}
 		}
 	}
 }
 
-izlude,150,143,2	script	Kylick#izlude	97,{
-	mes "[Kylick]";
-	switch(rand(2)) {
+izlude,141,185,4	script	Kylick	97,{
+	switch (rand(1,2)) {
 	case 1:
+		mes "[Kylick]";
 		mes "Don't you think Binoculars";
 		mes "are really COOL?! You can";
 		mes "see all sorts of places...!";
@@ -242,7 +242,8 @@ izlude,150,143,2	script	Kylick#izlude	97,{
 		mes "a pound of cure";
 		mes "after all, right?";
 		close;
-	Default:
+	case 2:
+		mes "[Kylick]";
 		mes "I was thinking, even though the people of Izlude live so close to the ocean...";
 		next;
 		mes "[Kylick]";
@@ -254,7 +255,7 @@ izlude,150,143,2	script	Kylick#izlude	97,{
 	}
 }
 
-izlude,56,126,2	script	Red#izlude::RedCebalis	85,{
+izlude,56,156,2	script	Red	85,{
 	mes "[Red]";
 	mes "The only skill that's needed for a Swordman is ^FF2400Bash^000000! Bash, Bash and ONLY ^FF2400Bash^000000! No need to waste time and effort for smaller skills! Everything else is for cowards and wusses!";
 	next;
@@ -292,8 +293,9 @@ izlude,56,126,2	script	Red#izlude::RedCebalis	85,{
 	mes "[Red]";
 	mes "Which one do you think is better? The critical damage skill, ^FF2400Bash^000000, or the Splash damage skill, ^EE0000Magnum Break^000000?";
 	next;
-	if (select("Bash:Magnum Break") == 1)  {
-		if (BaseClass == Job_Swordman) {
+	switch (select("Bash:Magnum Break")) {
+	case 1:
+		if (Class == Job_Swordman || Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Crusader || Class == Job_Paladin || Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Royal_Guard || Class == Job_Royal_Guard_T) {
 			mes "[Red]";
 			mes "Hahahaha!!! I knew you'd see things my way!! You ARE a great guy!! Undoubtedly, only ^FF2400Bash^000000 suits a Swordman. Please tell that to this BONEHEAD over here~ Hahaha!";
 			next;
@@ -304,27 +306,28 @@ izlude,56,126,2	script	Red#izlude::RedCebalis	85,{
 		mes "[Red]";
 		mes "Hahahaha!! See!? Someone who pursues a different job agrees with me~! You really are a great guy! Hahaha!! Undoubtedly, only ^FF2400Bash^000000 suits a Swordman. Please tell that to this NIMROD over here~ Hahaha!";
 		close;
-	}
-	if (BaseClass == Job_Swordman) {
-		mes "[Cebalis]";
-		mes "Alright!! ^EE0000Magnum Break^000000 is the BEST!! Now you're talking~!! You know the stuff~ HaHaHa!";
-		next;
-		mes "[Cebalis]";
-		mes "You wanna know some useful information? Okay, okay lemme tell ya! Magnum Break has Fire Property.";
-		next;
-		mes "[Cebalis]";
-		mes "So it won't be too effective against monsters with the Water property, but this is THE skill to use against Undead and Earth property monsters!";
-		next;
+	case 2:
+		if (Class == Job_Swordman || Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Crusader || Class == Job_Paladin || Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Royal_Guard || Class == Job_Royal_Guard_T) {
+			mes "[Cebalis]";
+			mes "Alright!! ^EE0000Magnum Break^000000 is the BEST!! Now you're talking~!! You know the stuff~ HaHaHa!";
+			next;
+			mes "[Cebalis]";
+			mes "You wanna know some useful information? Okay, okay lemme tell ya! Magnum Break has Fire Property.";
+			next;
+			mes "[Cebalis]";
+			mes "So it won't be too effective against monsters with the Water property, but this is THE skill to use against Undead and Earth property monsters!";
+			next;
+			mes "[Cebalis]";
+			mes "And most importantly, look around before you use it. Otherwise you'll be in BIG trouble~ ";
+			close;
+		}
 		mes "[Cebalis]";
-		mes "And most importantly, look around before you use it. Otherwise you'll be in BIG trouble~ ";
+		mes "Right?! ^EE0000Magnum Break^000000 is THE BEST!!! You know what you're talking about, eh? I don't know why this jerkface is being sooooo stubborn.";
 		close;
 	}
-	mes "[Cebalis]";
-	mes "Right?! ^EE0000Magnum Break^000000 is THE BEST!!! You know what you're talking about, eh? I don't know why this jerkface is being sooooo stubborn.";
-	close;
 }
-	
-izlude,58,126,2	script	Cebalis#izlude	98,{
+
+izlude,58,156,2	script	Cebalis	98,{
 	mes "[Red]";
 	mes "The only skill that's needed for a Swordman is ^FF2400Bash^000000! Bash, Bash and ONLY ^FF2400Bash^000000! No need to waste time and effort on smaller skills~~ Everything else is for cowards and wusses!";
 	next;
@@ -365,8 +368,9 @@ izlude,58,126,2	script	Cebalis#izlude	98,{
 	mes "[Red]";
 	mes "Which one do you think is better? The critical damage skill, ^FF2400Bash^000000, or the Splash damage skill, ^EE0000Magnum Break^000000?";
 	next;
-	if (select("Bash:Magnum Break") == 1) {
-		if (BaseClass == Job_Swordman) {
+	switch (select("Bash:Magnum Break")) {
+	case 1:
+		if (Class == Job_Swordman || Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Crusader || Class == Job_Paladin || Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Royal_Guard || Class == Job_Royal_Guard_T) {
 			mes "[Red]";
 			mes "Hahahaha!!! I knew you'd see things my way!! You ARE a great guy!! Without a doubt, only ^FF2400Bash^000000 suits a Swordman. Please tell that to FUNBOY over here!! Hahaha.";
 			next;
@@ -381,86 +385,28 @@ izlude,58,126,2	script	Cebalis#izlude	98,{
 		mes "[Red]";
 		mes "Without a doubt, only ^FF2400Bash^000000 suits a Swordman. Please tell that to this MORON over here!! Hahaha~";
 		close;
-	}
-	if (BaseClass == Job_Swordman) {
-		mes "[Cebalis]";
-		mes " Alright!! ^EE0000Magnum Break^000000 is the BEST!! Now you're talking~!! You know your stuff, kid. HaHaHa~!";
-		next;
-		mes "[Cebalis]";
-		mes "You wanna know some useful information? Okay, okay lemme tell ya! The explosion from 'Magnum Break' has the Fire Property.";
-		next;
-		mes "[Cebalis]";
-		mes "So it won't be very effective against Water property monsters, but this is THE skill to use against Undead and Earth property monsters.!";
-		next;
-		mes "[Cebalis]";
-		mes "And most importantly, look around before you use it. Otherwise you'll be in BIG trouble~ ";
-		close;
-	}
-	mes "[Cebalis]";
-	mes "I'm right, aren't I?! ^EE0000Magnum Break^000000 is THE BEST!!! You know what you're talking about, eh? I don't know why this LARDFACE is sooooo stubborn.";
-	close;
-}
-
-izlude,124,178,2	script	Soldier#izlude	105,{
-	mes "[Soldier]";
-	mes "HeHeHeHe..HaHaHaHa ";
-	mes "Huh? Why am I so happy?";
-	mes "You wanna know?";
-	next;
-	if (select("Sure, why?:Not really, I don't care.") == 1) {
-		mes "[Soldier]";
-		mes "Ah~~ There's not much for us to do these days. You see, Merchants buy items dropped by monsters.  But you knew that, right? ";
-		next;
-		if (select("Of course:Eh? Really?") == 1) {
-			mes "[Soldier]";
-			mes "HaHa~ In fact, that was actually part of our job. But there were more and more hunters who came to us in order to get paid and it became too much to handle.";
-			next;
-			mes "[Soldier]";
-			mes "We had to work overtime every day. Ah, it was a nightmare...! Anyway, the government eventually made a wise decision in creating the Registration System.";
-			next;
-			mes "[Soldier]";
-			mes "The Office of Prize Compensation only pays those who have the Registration. Of course, you'd have to be a merchant and stay in the same place all day long.";
+	case 2:
+		if (Class == Job_Swordman || Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Crusader || Class == Job_Paladin || Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Royal_Guard || Class == Job_Royal_Guard_T) {
+			mes "[Cebalis]";
+			mes " Alright!! ^EE0000Magnum Break^000000 is the BEST!! Now you're talking~!! You know your stuff, kid. HaHaHa~!";
 			next;
-			mes "[Soldier]";
-			mes "The Office gives away the registration to any merchant who fulfills those requirements. So nowadays, the hunters sell their goods to the registered merchants.";
+			mes "[Cebalis]";
+			mes "You wanna know some useful information? Okay, okay lemme tell ya! The explosion from 'Magnum Break' has the Fire Property.";
 			next;
-			mes "[Soldier]";
-			mes "So nowadays, the hunters sell their goods to the registered merchants.  Not too many people come to us for that anymore.";
+			mes "[Cebalis]";
+			mes "So it won't be very effective against Water property monsters, but this is THE skill to use against Undead and Earth property monsters.!";
 			next;
-			mes "[Soldier]";
-			mes "I mean we are still busy, but that's nothing compared to how it was before. People who have felt suffering know how to appreciate even the slightest comfort.";
+			mes "[Cebalis]";
+			mes "And most importantly, look around before you use it. Otherwise you'll be in BIG trouble~ ";
 			close;
 		}
-		mes "[Soldier]";
-		mes "What?! What do you mean you didn't know?! Well, you know you can get items by killing monsters. If you bring and sell those to a merchant, you can make some money. ";
-		next;
-		mes "[Soldier]";
-		mes "HaHa, in fact, that used to be part of our job. But there were more and more hunters who come in order to get paid, so it became too much to handle.";
-		next;
-		mes "[Soldier]";
-		mes "We had to work overtime every day. Ah, it was a nightmare...! Anyway, the government eventually made a wise decision in creating the Registration System.";
-		next;
-		mes "[Soldier]";
-		mes "The Office of Prize Compensation only pays those who have the Registration. Of course, you'd have to be a merchant and stay in the same place all day long.";
-		next;
-		mes "[Soldier]";
-		mes "The Office gives away the registration to any merchant who fulfills those requirements. So nowadays, the hunters sell their goods to the registered merchants.";
-		next;
-		mes "[Soldier]";
-		mes "So nowadays, the hunters sell their goods to the registered merchants.  Not too many people come to us for that anymore.";
-		next;
-		mes "[Soldier]";
-		mes "I mean we are still busy, but that's nothing compared to how it was before. People who have felt suffering know how to appreciate even the slightest comfort.";
+		mes "[Cebalis]";
+		mes "I'm right, aren't I?! ^EE0000Magnum Break^000000 is THE BEST!!! You know what you're talking about, eh? I don't know why this LARDFACE is sooooo stubborn.";
 		close;
 	}
-	mes "[Soldier]";
-	mes "Okay Good Bye~~";
-	close;
 }
 
-// Inside Izlude
-//============================================================
-izlude_in,125,164,2	script	Aaron#izlude	65,{
+izlude_in,125,164,2	script	Aaron	65,{
 	mes "[Aaron]";
 	mes "Don't you think Strong VIT and training in a unique breathing method which enables quick HP recovery are the greatest advantages for a Swordman?";
 	next;
@@ -485,7 +431,8 @@ izlude_in,125,164,2	script	Aaron#izlude	65,{
 	mes "Hm...";
 	mes "Are you bored by all this talk? Or do you want me to go on?";
 	next;
-	if (select("Tell me more please.:End conversation.") == 1) {
+	switch (select("Tell me more please.:End conversation.")) {
+	case 1:
 		mes "[Aaron]";
 		mes "Hmm...";
 		mes "In that case, I'll explain about the other attributes to you briefly. In order to attack and evade quickly, you've gotta pay attention to AGI. ";
@@ -493,23 +440,81 @@ izlude_in,125,164,2	script	Aaron#izlude	65,{
 		mes "[Aaron]";
 		mes "In case you want to make more critical hits, it's a good idea to invest in LUK. INT also increases Max SP, which is needed to use various skills... But it's really up to you.";
 		close;
+	case 2:
+		mes "[Aaron]";
+		mes "Okay then,";
+		mes "train hard~~";
+		close;
 	}
-	mes "[Aaron]";
-	mes "Okay then,";
-	mes "train hard~~";
-	close;
 }
 
-// Izlude Dungeon
-//============================================================
-izlu2dun,108,27,0	script	Sailor#2izlude	100,{
-	mes "[Sailor]";
-	mes "Wanna";
-	mes "head back?";
+izlude,165,156,2	script	Soldier	105,{
+	mes "[Soldier]";
+	mes "HeHeHeHe..HaHaHaHa ";
+	mes "Huh? Why am I so happy?";
+	mes "You wanna know?";
 	next;
-	if (select("Yeah, I'm tired to death.:Nope, I love this place!") == 1) {
-		warp "izlude",176,182;
-		end;
+	switch (select("Sure, why?:Not really, I don't care.")) {
+	case 1:
+		mes "[Soldier]";
+		mes "Ah~~ There's not much for us to do these days. You see, Merchants buy items dropped by monsters. But you knew that, right? ";
+		next;
+		switch (select("Of course:Eh? Really?")) {
+		case 1:
+			mes "[Soldier]";
+			mes "HaHa~ In fact, that was actually part of our job. But there were more and more hunters who came to us in order to get paid and it became too much to handle.";
+			next;
+			mes "[Soldier]";
+			mes "We had to work overtime every day. Ah, it was a nightmare...! Anyway, the government eventually made a wise decision in creating the Registration System.";
+			next;
+			mes "[Soldier]";
+			mes "The Office of Prize Compensation only pays those who have the Registration. Of course, you'd have to be a merchant and stay in the same place all day long.";
+			next;
+			mes "[Soldier]";
+			mes "The Office gives away the registration to any merchant who fulfills those requirements. So nowadays, the hunters sell their goods to the registered merchants.";
+			next;
+			mes "[Soldier]";
+			mes "So nowadays, the hunters sell their goods to the registered merchants.  Not too many people come to us for that anymore.";
+			next;
+			mes "[Soldier]";
+			mes "I mean we are still busy, but that's nothing compared to how it was before. People who have felt suffering know how to appreciate even the slightest comfort.";
+			close;
+		case 2:
+			mes "[Soldier]";
+			mes "What?! What do you mean you didn't know?! Well, you know you can get items by killing monsters. If you bring and sell those to a merchant, you can make some money. ";
+			next;
+			mes "[Soldier]";
+			mes "HaHa, in fact, that used to be part of our job. But there were more and more hunters who come in order to get paid, so it became too much to handle.";
+			next;
+			mes "[Soldier]";
+			mes "We had to work overtime every day. Ah, it was a nightmare...! Anyway, the government eventually made a wise decision in creating the Registration System.";
+			next;
+			mes "[Soldier]";
+			mes "The Office of Prize Compensation only pays those who have the Registration. Of course, you'd have to be a merchant and stay in the same place all day long.";
+			next;
+			mes "[Soldier]";
+			mes "The Office gives away the registration to any merchant who fulfills those requirements. So nowadays, the hunters sell their goods to the registered merchants.";
+			next;
+			mes "[Soldier]";
+			mes "So nowadays, the hunters sell their goods to the registered merchants.  Not too many people come to us for that anymore.";
+			next;
+			mes "[Soldier]";
+			mes "I mean we are still busy, but that's nothing compared to how it was before. People who have felt suffering know how to appreciate even the slightest comfort.";
+			close;
+		}
+	case 2:
+		mes "[Soldier]";
+		mes "Okay Good Bye~~";
+		close;
 	}
-	close;
 }
+
+izlude,147,131,6	script	Blacksmith#izl	726,{
+	end;
+}
+
+prt_fild08,350,219,4	script	Guard#izl	105,{
+	mes "[Izlude Guard]";
+	mes "Welcome to Izlude.";
+	close;
+}
\ No newline at end of file
diff --git a/npc/re/cities/jawaii.txt b/npc/re/cities/jawaii.txt
index eb69a77d9..916e5e335 100644
--- a/npc/re/cities/jawaii.txt
+++ b/npc/re/cities/jawaii.txt
@@ -35,6 +35,7 @@
 //= 3.4 Added missing checkweights. [L0ne_W0lf]
 //= 3.5 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 3.6 Fixed bartender so he no longer hangs. [L0ne_W0lf]
+//= 3.7 Updated to match the new Izlude Map. [Masao]
 //============================================================
 
 // Jawaii
@@ -1396,7 +1397,7 @@ prt_in,170,14,0	script	Customer#Bachewcca	89,{
 
 // Izlude
 //============================================================
-izlude,171,185,3	script	Honeymoon Helper#Izlude	71,{
+izlude,102,150,6	script	Honeymoon Helper#Izlude	71,{
 	mes "[Helper]";
 	mes "Newlyweds and";
 	mes "long time couples...";
diff --git a/npc/re/guides/guides_izlude.txt b/npc/re/guides/guides_izlude.txt
index 45fe0cd8a..1758d573e 100644
--- a/npc/re/guides/guides_izlude.txt
+++ b/npc/re/guides/guides_izlude.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= rAthena  SVN
 //===== Description: ========================================= 
@@ -11,9 +11,10 @@
 //= Guides for the city of Izlude
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
+//= 1.1 Updated to match the new Izlude Map. [Masao]
 //============================================================ 
 
-izlude,121,87,6	script	Guide#01izlude::GuideIzlude	105,{
+-	script	Guide#01izlude::GuideIzlude	-1,{
 	cutin "prt_soldier",2;
 	mes "[Izlude Guide]";
 	mes "Welcome to ^8B4513Izlude^000000,";
@@ -183,4 +184,6 @@ izlude,121,87,6	script	Guide#01izlude::GuideIzlude	105,{
 	}
 }
 
-izlude,131,177,4	duplicate(GuideIzlude)	Guide#02izlude	105
+izlude,129,175,4	duplicate(GuideIzlude)	Guide#02izlude	105
+izlude,133,113,4	duplicate(GuideIzlude)	Guide#03izlude	105
+izlude,120,206,4	duplicate(GuideIzlude)	Guide#04izlude	105
diff --git a/npc/re/kafras/kafras_izl.txt b/npc/re/kafras/kafras_izl.txt
index ec42d2359..d15440c19 100644
--- a/npc/re/kafras/kafras_izl.txt
+++ b/npc/re/kafras/kafras_izl.txt
@@ -25,7 +25,7 @@
 //=	Added unique Kafra Welcome message2.
 //=====================================================================
 
-izlude,134,87,3	script	Kafra Employee::kaf_izlude	117,{
+izlude,128,148,6	script	Kafra Employee::kaf_izlude	117,{
 	cutin "kafra_01",2;
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Geffen", "Prontera", "Morroc", "Al De Baran";
@@ -43,7 +43,7 @@ izlude,134,87,3	script	Kafra Employee::kaf_izlude	117,{
 	mes "How may I assist you?";
 	callfunc "F_Kafra",5,0,1,40,820;
 
-	M_Save:
-		savepoint "izlude",94,103;
-		callfunc "F_KafEnd",0,1,"in the city of Izlude";
+M_Save:
+	savepoint "izlude",94,103;
+	callfunc "F_KafEnd",0,1,"in the city of Izlude";
 }
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 00adf71b4..1ef3bc711 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= rAthena Dev Team
 //===== Current Version: ===================================== 
-//= 3.1
+//= 3.2
 //===== Compatible With: ===================================== 
 //= rAthena 1.0+
 //===== Description: ========================================= 
@@ -35,6 +35,7 @@
 //= 2.9 Added missing Cooking Items for Material Seller. [tr0n]
 //= 3.0 Added all new Shops which were available in the latest available official files. [Masao]
 //= 3.1 Moved some merchants to a separate renewal file. [Kenpachi]
+//= 3.2 Updated to match the new Izlude Map. [Masao]
 //============================================================ 
 
 //=======================================================
@@ -144,10 +145,10 @@ hu_in01,94,313,3	shop	Armor Dealer#hu	86,2224:-1,2232:-1,2226:-1,2101:-1,2103:-1
 izlude_in,60,127,4	shop	Weapon Dealer#iz	72,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1101:-1,1104:-1,1107:-1,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1301:-1
 izlude_in,70,127,4	shop	Armor Dealer#iz	62,2103:-1,2105:-1,2403:-1,2405:-1,2503:-1,2505:-1,2226:-1,2228:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2628:-1
 izlude_in,115,61,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,105,99,0	shop	Butcher#iz	54,517:-1
-izlude,94,98,4	shop	Fruit Gardener#iz	53,512:-1,513:-1,515:-1,516:-1
-izlude,105,92,7	shop	Vendor from Milk Ranch#i	90,519:-1
-izlude,164,138,4	shop	Pet Groomer#iz	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+izlude,97,146,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,95,145,6	shop	Vendor from Milk Ranch#i	90,519:-1
+izlude,174,164,4	shop	Pet Groomer#iz	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
 izlude_in,121,64,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
 
 //=======================================================
diff --git a/npc/re/other/mercenary_rent.txt b/npc/re/other/mercenary_rent.txt
index 834321f42..75aaae5a5 100644
--- a/npc/re/other/mercenary_rent.txt
+++ b/npc/re/other/mercenary_rent.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -15,6 +15,7 @@
 //= 1.1 Optimization. [Zephyrus]
 //= 1.2 Removed redundent input. [L0ne_W0lf]
 //= 1.3 Duplicates now spawned from floating NPCs. [L0ne_W0lf]
+//= 1.4 Updated to match the new Izlude Map. [Masao]
 //============================================================ 
 
 prontera,41,337,5	script	Mercenary Manager#Spear	105,{
@@ -228,7 +229,7 @@ prontera,41,337,5	script	Mercenary Manager#Spear	105,{
 	}
 }
 
-izlude,47,139,5	script	Mercenary Manager#Sword	734,{
+izlude,47,169,5	script	Mercenary Manager#Sword	734,{
 	set .@faith_sword, mercenary_get_faith(SWORD_MERC_GUILD);
 	mes "[Mercenary Manager]";
 	mes "Welcome to the";
@@ -703,7 +704,7 @@ pay_arche,99,167,4	script	Mercenary Manager#Bow	732,{
 }
 
 prontera,30,337,4	duplicate(MercMerchant)	Mercenary Merchant#Spear	700
-izlude,56,139,4	duplicate(MercMerchant)	Mercenary Merchant#Sword	892
+izlude,56,169,4	duplicate(MercMerchant)	Mercenary Merchant#Sword	892
 pay_arche,102,167,5	duplicate(MercMerchant)	Mercenary Merchant#Bow	879
 
 // Function for selling items.
diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt
index 327b034c9..13f4bd12a 100644
--- a/npc/re/quests/eden/eden_common.txt
+++ b/npc/re/quests/eden/eden_common.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -14,6 +14,7 @@
 //=     Commented out warps that should not be active.
 //= 1.2 Reduced 300+ copy-paste lines to 1 duplicated NPC. [Brian]
 //= 1.3 Some little optimization here and there. [Masao]
+//= 1.4 Updated to match the new Izlude Map. [Masao]
 //============================================================
 
 moc_para01,27,35,5	script	Secretary Lime Evenor	952,{
@@ -220,7 +221,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_in,68,162,1	duplicate(eto)	Eden Teleport Officer#6	729
+izlude,131,148,4	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
@@ -241,7 +242,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: warp "izlude_in",73,165; end;
+		case 6: warp "izlude",127,142; 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;
diff --git a/npc/re/quests/mrsmile.txt b/npc/re/quests/mrsmile.txt
index faf2402f1..10199d304 100644
--- a/npc/re/quests/mrsmile.txt
+++ b/npc/re/quests/mrsmile.txt
@@ -12,6 +12,7 @@
 //===== Additional Comments: ================================= 
 //= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.4a Fixed a little Typo error in duplicates. (bugreport:749) [Samuray22]
+//= 1.2 Updated to match the new Izlude Map. [Masao]
 //============================================================ 
 
 -	script	Smile Assistance::SmileHelper	92,{
@@ -98,7 +99,7 @@
 alberta,113,53,4	duplicate(SmileHelper)	Smile Assistance#alb	92
 aldebaran,136,135,4	duplicate(SmileHelper)	Smile Assistance#alde	92
 geffen,119,107,4	duplicate(SmileHelper)	Smile Assistance#gef	92
-izlude,129,118,4	duplicate(SmileHelper)	Smile Assistance#iz	92
+izlude,125,175,4	duplicate(SmileHelper)	Smile Assistance#iz	92
 moc_ruins,59,154,3	duplicate(SmileHelper)	Smile Assistance#moc	92
 payon,186,104,5	duplicate(SmileHelper)	Smile Assistance#pay	92
 prontera,157,187,4	duplicate(SmileHelper)	Smile Assistance#prt	92
diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt
index 2d1132cff..ff437065b 100644
--- a/npc/re/quests/quests_dicastes.txt
+++ b/npc/re/quests/quests_dicastes.txt
@@ -16,6 +16,8 @@
 //= 1.1 Standardized and reduced by 7000+ lines. [Euphy]
 //= 1.2 Further optimization. [Euphy]
 //= 1.2a Small bug fix. [Euphy]
+//= 1.3 Temporarly disabled Izlude Fish Tail?#33 NPC because of
+//= the new Izlude Town Map. [Masao]
 //============================================================
 
 // Entrance
@@ -920,8 +922,9 @@ iz_dun03,155,165,0	script	Gill?#33	844,{
 	callfunc "unknown_d",12176,956; }
 prt_fild05,303,169,0	script	Worm Peeling?#33	844,{
 	callfunc "unknown_d",12175,955; }
-izlude,132,136,0	script	Fish Tail?#33	844,{
+/*izlude,132,136,0	script	Fish Tail?#33	844,{
 	callfunc "unknown_d",12174,1023; }
+*/
 pay_fild01,152,171,0	script	Resin?#33	844,{
 	callfunc "unknown_d",12171,907; }
 pay_fild02,105,113,0	script	Pointed Scale?#33	844,{
diff --git a/npc/re/quests/quests_izlude.txt b/npc/re/quests/quests_izlude.txt
index a56c91dfa..0fcfed4b1 100644
--- a/npc/re/quests/quests_izlude.txt
+++ b/npc/re/quests/quests_izlude.txt
@@ -4,7 +4,7 @@
 //= Evera and The rAthena Dev Team
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -14,11 +14,12 @@
 //===== Additional Comments: ================================= 
 //= 1.0 Initial release [Evera]
 //= 1.1 Updated to 10.3 standard. [L0ne_W0lf]
+//= 1.2 Updated to match the new Izlude Map. [Masao]
 //============================================================
 
 // Edgar's Offer
 //============================================================
-izlude,182,186,2	script	Edgar#izlude	49,{
+izlude,179,219,4	script	Edgar#izlude	49,{
 	if (MISC_QUEST & 16) {
 		mes "[Edgar]";
 		mes "So are you heading to Alberta again? Let me give you the same discount and only charge 250 Zeny, just like the last time.";
diff --git a/npc/re/quests/quests_lighthalzen.txt b/npc/re/quests/quests_lighthalzen.txt
index 24182d46f..d98e5f2fd 100644
--- a/npc/re/quests/quests_lighthalzen.txt
+++ b/npc/re/quests/quests_lighthalzen.txt
@@ -4,7 +4,7 @@
 //= Persian, Vicious_Pucca, aoa00, Evera, MasterOfMupppets,
 //= Lupus, Lord Gywall
 //===== Current Version: ===================================== 
-//= 4.7
+//= 4.8
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -77,6 +77,7 @@
 //= 4.6 Added quest log entries for:
 //=     - Cursed Spirit Quest
 //= 4.7 Fixed missing label. (bugreport:4654) [L0ne_W0lf]
+//= 4.8 Updated to match the new Izlude Map. [Masao]
 //============================================================ 
 
 // Gangster Alert [Aegis Conversion]
@@ -11461,7 +11462,7 @@ OnStop:
 	end;
 }
 
-izlude,186,57,5	script	Scamp	853,{
+izlude,171,73,6	script	Scamp	853,{
 
 	if(lhz_rekenber > 21)
 	{
diff --git a/npc/re/warps/cities/izlude.txt b/npc/re/warps/cities/izlude.txt
index f2f1b6aaa..149e61531 100644
--- a/npc/re/warps/cities/izlude.txt
+++ b/npc/re/warps/cities/izlude.txt
@@ -11,24 +11,23 @@
 //===== Additional Comments: =================================
 //= 1.3 Added warps to Izlude Airship [Justin84]
 //= 1.4 Minor correction on airport warps
+//= 1.5 Updated to match the new Izlude Map. [Masao]
 //============================================================
 
 //= Izlude City ==============================================
-izlude,109,151,0	warp	iz01	3,3,izlude_in,65,87
-izlude,148,148,0	warp	iz02	2,2,izlude_in,116,49
-izlude,216,129,0	warp	iz03	3,2,izlude_in,151,127
-izlude,30,78,0	warp	iz001	3,3,prt_fild08,367,212
-izlude,52,140,0	warp	iz04	2,2,izlude_in,74,161
+izlude,109,182,0	warp	iz01	3,3,izlude_in,65,87
+izlude,162,125,0	warp	iz02	2,2,izlude_in,116,49
+izlude,216,162,0	warp	iz03	3,2,izlude_in,151,127
+izlude,21,98,0	warp	iz001	3,3,prt_fild08,367,212
+izlude,52,172,0	warp	iz04	2,2,izlude_in,74,161
 izlude_in,108,169,0	warp	iz05	2,3,izlude_in,84,169
-izlude_in,116,46,0	warp	iz02-1	3,2,izlude,145,145
-izlude_in,148,127,0	warp	iz03-1	2,5,izlude,212,129
+izlude_in,116,46,0	warp	iz02-1	3,2,izlude,157,125
+izlude_in,148,127,0	warp	iz03-1	2,5,izlude,207,162
 izlude_in,171,97,0	warp	iz06	3,2,izlude_in,172,119
 izlude_in,172,116,0	warp	iz06-1	3,2,izlude_in,172,94
 izlude_in,172,139,0	warp	iz07	3,2,izlude_in,172,161
 izlude_in,172,158,0	warp	iz07-1	3,2,izlude_in,172,136
 izlude_in,43,169,0	warp	w219	2,3,izlude_in,64,169
-izlude_in,65,84,0	warp	iz01-1	5,2,izlude,113,147
-izlude_in,74,158,0	warp	iz04-1	3,2,izlude,52,136
+izlude_in,65,84,0	warp	iz01-1	5,2,izlude,113,178
+izlude_in,74,158,0	warp	iz04-1	3,2,izlude,52,166
 izlude_in,87,169,0	warp	iz05-1	2,3,izlude_in,111,169
-izlude,149,39,0	warp	izair1	1,1,izlude,182,56
-izlude,176,56,0	warp	lizair2	1,1,izlude,145,40
diff --git a/npc/re/warps/fields/prontera_fild.txt b/npc/re/warps/fields/prontera_fild.txt
index e3461bb2a..16d3c8238 100644
--- a/npc/re/warps/fields/prontera_fild.txt
+++ b/npc/re/warps/fields/prontera_fild.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -11,6 +11,7 @@
 //===== Additional Comments: =================================
 //= 1.1 updating according to jA [Lupus]
 //= 1.2 Updated warps for episode 12.1 [L0ne_W0lf]
+//= 1.3 Updated to match the new Izlude Map. [Masao]
 //============================================================
 
 //= Prontera Fields ==========================================
@@ -64,7 +65,7 @@ prt_fild08,16,187,0	warp	prtf15-1	3,17,prt_fild07,380,186
 prt_fild08,16,239,0	warp	prtf14-1	3,15,prt_fild07,379,239
 prt_fild08,170,378,0	warp	prtf004	3,2,prontera,156,26
 prt_fild08,233,16,0	warp	prtf023	12,1,moc_fild01,238,378
-prt_fild08,371,212,0	warp	prtf005	3,3,izlude,35,78
+prt_fild08,371,212,0	warp	prtf005	3,3,izlude,26,98
 prt_fild08,55,21,0	warp	prtf024	4,2,moc_fild01,56,380
 prt_fild09,14,124,0	warp	prtf17	2,6,prt_fild10,336,126
 prt_fild09,14,139,0	warp	prtf17-1	2,8,prt_fild10,336,126
diff --git a/npc/re/warps/other/arena.txt b/npc/re/warps/other/arena.txt
index f0bb7e8df..dc5e69408 100644
--- a/npc/re/warps/other/arena.txt
+++ b/npc/re/warps/other/arena.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -11,11 +11,12 @@
 //===== Additional Comments: =================================
 //= 1.0 First version, done by SinSloth. [MasterOfMuppets]
 //= 1.1 updated welcome_arena warp coords (was 128,126) [Lupus]
-//= 1.2 Made some updates due to Izlude Battle Arena release. [SinSloth]
+//= 1.2 Made some updates due to Izlude Battle Arena release. [SinSloth]$
+//= 1.3 Updated to match the new Izlude Map. [Masao]
 //============================================================
 
-izlude,128,226,0	warp	welcome_arena	1,1,arena_room,100,30
-arena_room,99,24,0	warp	bye_arena	2,2,izlude,128,220
+izlude,70,250,0	warp	welcome_arena	1,1,arena_room,100,30
+arena_room,99,24,0	warp	bye_arena	2,2,izlude,75,250
 arena_room,84,103,0	warp	arn_room_11_1	1,1,arena_room,63,130
 arena_room,63,126,0	warp	arn_room_11_2	1,1,arena_room,87,100
 arena_room,76,87,0	warp	arn_room_9_1	1,1,arena_room,46,87