Made Red/Cebalis as a single NPC + duplicate

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

2 files changed, 9 insertions, 87 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 7711d13f0..e152e2e5e 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2007/06/14
+	* Izlude: Made Red/Cebalis as a single NPC + duplicate [Lupus]
 	* Red. 10769 Fixed central Kafra position (146,86 -> 146,98) [L0ne_W0lf]
 	* Rev. 10767 Fixed a missing ")" in the new wedding script. [L0ne_W0lf]
 	* Forgot to upload the mail.txt file. 
diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt
index 61bf57731..2a26148c4 100644
--- a/npc/cities/izlude.txt
+++ b/npc/cities/izlude.txt
@@ -4,7 +4,7 @@
 //= kobra_k88
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.8
+//= 1.8a
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -25,6 +25,7 @@
 //= 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]
 //============================================================
 
 // Izlude
@@ -88,9 +89,9 @@ izlude,55,74,2	script	Bonne#izlude	90,{
 }
 
 izlude,135,78,2	script	Charfri#izlude	91,{
+	mes "[Charfri]";
 	switch(rand(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]";
@@ -100,7 +101,6 @@ izlude,135,78,2	script	Charfri#izlude	91,{
 		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:
-		mes "[Charfri]";
 		mes "Though it is very beautiful, Byalan Island has a mysterious dungeon that extends deep under the sea.";
 		next;
 		mes "[Charfri]";
@@ -120,9 +120,9 @@ izlude,135,78,2	script	Charfri#izlude	91,{
 }
 
 izlude,119,121,2	script	Cuskoal#izlude	124,{
+	mes "[Cuskoal]";
 	switch(rand(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]";
@@ -132,7 +132,6 @@ izlude,119,121,2	script	Cuskoal#izlude	124,{
 		mes "So, whaddya say?";
 		close;
 	Default:
-		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]";
@@ -145,9 +144,9 @@ izlude,119,121,2	script	Cuskoal#izlude	124,{
 }
 
 izlude,150,118,2	script	Dega#izlude	84,{
+	mes "[Dega]";
 	switch(rand(4)) {
 	case 1:
-		mes "[Dega]";
 		mes "Mt. Mjornir, located north of Prontera, is a tough";
 		mes "and steep climb.";
 		next;
@@ -158,7 +157,6 @@ 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 +166,6 @@ izlude,150,118,2	script	Dega#izlude	84,{
 		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;
 	case 3:
-		mes "[Dega]";
 		mes "There's a very delightful place where you can find every";
 		mes "type of Poring.";
 		next;
@@ -223,9 +220,9 @@ izlude,150,118,2	script	Dega#izlude	84,{
 }
 
 izlude,150,143,2	script	Kylick#izlude	97,{
+	mes "[Kylick]";
 	switch(rand(2)) {
 	case 1:
-		mes "[Kylick]";
 		mes "Don't you think Binoculars";
 		mes "are really COOL?! You can";
 		mes "see all sorts of places...!";
@@ -243,7 +240,6 @@ izlude,150,143,2	script	Kylick#izlude	97,{
 		mes "after all, right?";
 		close;
 	Default:
-		mes "[Kylick]";
 		mes "I was thinking, even though the people of Izlude live so close to the ocean...";
 		next;
 		mes "[Kylick]";
@@ -255,7 +251,7 @@ izlude,150,143,2	script	Kylick#izlude	97,{
 	}
 }
 
-izlude,56,126,2	script	Red#izlude	85,{
+izlude,56,126,2	script	Red#izlude::RedCebalis	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;
@@ -325,82 +321,7 @@ izlude,56,126,2	script	Red#izlude	85,{
 	close;
 }
 	
-izlude,58,126,2	script	Cebalis#izlude	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;
-	mes "[Cebalis]";
-	mes "What are you talking about!? The ideal Swordman resolutely stands alone, surrounded by countless foes, smashing them all with one awesome attack...";
-	next;
-	mes "[Cebalis]";
-	mes "^EE0000MAGNUM BREAK!^000000";
-	mes "That's right, Magnum Break";
-	mes "is the perfect";
-	mes "Swordman skill.";
-	next;
-	mes "[Cebalis]";
-	mes "Well...";
-	mes "Sometimes the explosion accidentally hits some monsters that are just wandering around.";
-	next;
-	mes "[Cebalis]";
-	mes "Then they all end up coming after you, but that's a risk a true Swordman should be willing to take.";
-	next;
-	mes "[Red]";
-	mes "That's exactly why you're dumb, you idiot! And what was that about the 'ideal Swordman?' You remember the last time you used Magnum Break?!";
-	next;
-	mes "[Red]";
-	mes "You had to run away from all those Porings hit by that stupid skill! You weakling! All those Porings that you hit tried to kill you! ";
-	next;
-	mes "[Cebalis]";
-	mes "Oh shut up. And those were Poporings. As I recall, you were running away too, apparently too busy to use your precious Bash.";
-	next;
-	mes "[Cebalis]";
-	mes "In any case, Magnum Break is THE skill for a Swordman~!! Something simplistic like Bash is just one of those little steps towards Magnum Break.";
-	next;
-	mes "[Red]";
-	mes "Oh man~";
-	mes "Hey, I know you";
-	mes "heard everything.";
-	mes "So what do you think?";
-	next;
-	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) {
-			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;
-			mes "[Red]";
-			mes "Hmm, let me give you a bit of advice. After you achieve level 5 Bash, the amount of SP consumed by the skill increases greatly, so watch out for your SP.";
-			close;
-		}
-		mes "[Red]";
-		mes "Hahahaha!!";
-		mes "See!? Someone who pursues a different job agrees with me~! You really are a great guy! Hahaha!!";
-		next;
-		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,58,126,2	duplicate(RedCebalis)	Cebalis#izlude	98
 
 izlude,124,178,2	script	Soldier#izlude	105,{
 	mes "[Soldier]";