Update to last rAthena npc.

Fix some typos
change sc_bleeding to -> sc_blooding
Updated RE EXP for quests_brasilis.txt

1 files changed, 90 insertions, 49 deletions

diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt
index 76cc418cf..ad9e30279 100644
--- a/npc/re/cities/malangdo.txt
+++ b/npc/re/cities/malangdo.txt
@@ -1,20 +1,22 @@
 //===== Hercules Script ======================================
 //= Malangdo Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
+//= [Official Conversion]
 //= Malangdo Town Script
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. [Euphy]
 //= 1.1 Added entrance scripts.
-//= 1.2 Added Official coordinates for Odgnalam [Streusel]
+//= 1.2 Moved "Odgnalam" coordinates.
+//= 1.3 Fixed dialogues.
+//= 1.4 Dialogue edits, source iRO.
+//= 1.5 Added Izlude duplicates.
 //============================================================
 
-// Entrance :: malangdo_go
+// Malangdo Transportation :: malangdo_go
 //============================================================
 -	script	Dolangmal	-1,{
 	if (checkquest(5091) == -1) {
@@ -155,34 +157,33 @@ 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
 
-
-izlude,182,218,4	script	Odgnalam#iz	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]";
-	mes "Meow? Uh?";
+	mes "Meow? Huh?";
 	next;
 	if (ep13_yong1 == 0) {
 		set .@price,1000;
-		set .@s1$,"Huh!! You are such an annoying person. Let me send you to the heaven of the cat, ^A2314BMalangdo^000000 with ^0000FF1000 Zeny^000000.";
+		set .@s1$,"Huh! You are so annoying. Let me send you to ^A2314BMalangdo^000000 for ^0000FF1000 Zeny^000000.";
 		set .@s2$,"Money? Where is the money? You can't go anywhere without the money. Shame on you.";
 	} else if (ep13_yong1 < 60) {
 		set .@price,999;
-		set .@s1$,"You have a little relationship with fleet of cat. I'll give you special discount price ^0000FF999 Zeny^000000 to the heaven of the cat, ^A2314BMalangdo^000000, because you have relationship with fleet.";
+		set .@s1$,"You have a little relationship with fleet of cat. I'll give you special discount price ^0000FF999 Zeny^000000 to ^A2314BMalangdo^000000, because you have relationship with fleet.";
 		set .@s2$,"Where is the money? You don't have a sense of honor.";
 	} else if (ep13_yong1 > 59 && ep13_yong1 < 80) {
 		set .@price,500;
-		set .@s1$,"You gave several help to our cat's fleet so let me give you special that with 50% discount price ^0000FF500 Zeny^000000. I'll send you to the heaven of the cat, ^A2314BMalangdo^000000.";
+		set .@s1$,"You gave several help to our cat's fleet so let me give you special that with 50% discount price ^0000FF500 Zeny^000000. I'll send you to ^A2314BMalangdo^000000.";
 		set .@s2$,"You don't have any money for paying 50% discount price? I can't believe it.";
 	} else {
 		mes "[Odgnalam]";
 		mes "You are a hero of cat's fleet. Your activity is the legend between us.";
 		next;
 		mes "[Odgnalam]";
-		mes "As you are a hero of the cat fleet let me send you to ^A2314BMeow Meow Island^000000 for free.";
+		mes "As you are a hero of the cat fleet let me send you to ^A2314BMalangdo^000000 for free.";
 		next;
-		if(select("Send me to Meow Meow Island!:Do not go.") == 1) {
+		if(select("Send me to Malangdo!:Do not go.") == 1) {
 			mes "[Odgnalam]";
 			mes "Have a comfortable trip... Alright let's go~";
 			warp "malangdo",217,85;
@@ -192,7 +193,7 @@ izlude,182,218,4	script	Odgnalam#iz	554,{
 	mes "[Odgnalam]";
 	mes .@s1$;
 	next;
-	if(select("Send me to Meow Meow Island!:Do not go.") == 2) close;
+	if(select("Send me to Malangdo!:Do not go.") == 2) close;
 	if (Zeny < .@price) {
 		mes "[Odgnalam]";
 		mes "Money? Where is the money? You can't go anywhere without the money. Shame on you.";
@@ -204,7 +205,12 @@ izlude,182,218,4	script	Odgnalam#iz	554,{
 	warp "malangdo",217,85;
 	close;
 }
-alberta,200,151,4	duplicate(Odgnalam#iz)	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]";
@@ -258,7 +264,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;
@@ -276,18 +282,19 @@ malangdo,219,86,4	script	Kong#malang	545,{
 	close;
 }
 
-// Town NPCs :: malang_tre
+// Generic Malangdo NPCs :: malang_tre
 //============================================================
 malangdo,147,117,3	script	Innkeeper#malang	554,{
 	mes "You see a lazy cat standing on a chair.";
 	mes "You guess that this is the Innkeeper.";
 	next;
-	switch(select("Umm... can I rest here?:Psst... can I save here?:Leave.")) {
+	switch(select("Umm... Can I rest here?:Psst... Can I save here?:Leave.")) {
 	case 1:
 		mes "[Innkeeper]";
-		mes "You can use the hammock as you want, but give me ^FF00005 Malangdo Canned Specialties^000000. Then you can relax.";
+		mes "Eh?";
+		mes "Uh, sure you can use this hammock if you give me ^FF00005 Malangdo Cans^000000.";
 		next;
-		switch(select("Give the cans.:No need.")) {
+		switch(select("Here you go.:Never mind.")) {
 		case 1:
 			if (countitem(12636) > 4) {
 				delitem 12636,5; //Malang_Sp_Can
@@ -301,11 +308,11 @@ malangdo,147,117,3	script	Innkeeper#malang	554,{
 				close;
 			}
 			mes "[Innkeeper]";
-			mes "It looks like a lack of cans.";
+			mes "This ain't no charity.";
 			close;
 		case 2:
 			mes "[Innkeeper]";
-			mes "You are stronger than your appearance.";
+			mes "Let me know if you want to relax.";
 			close;
 		}
 	case 2:
@@ -315,27 +322,28 @@ malangdo,147,117,3	script	Innkeeper#malang	554,{
 		close;
 	case 3:
 		mes "[Innkeeper]";
-		mes "A busy moment makes you hurry and laziness makes you lazy.";
+		mes "Sometimes you just have to relax.";
 		next;
-		mes "- Wonder if there is work time. -";
+		mes "- Wow, this is the laziest cat ever. -";
 		close;
 	}
 	close;
 }
 
-malangdo,151,120,3	script	Wandering Minstrel#mal	479,{
-	mes "[Wandering Minstrel]";
+malangdo,151,120,3	script	Minstrel#mal	479,{
+	mes "[Minstrel]";
 	mes "Boy, that lazy cat makes me want to just nap all day long.";
 	next;
-	mes "[Wandering Minstrel]";
-	mes "He makes life look so simple";
+	mes "[Minstrel]";
+	mes "He makes life look so simple.";
 	close;
 }
 
-malangdo,149,120,5	script	Wandering Wanderer#mal	485,5,1,{
-	mes "[Wandering Wanderer]";
-	mes "Cats living in here is so energetic.";
-	mes "And it makes me dance~";
+malangdo,149,120,5	script	Wanderer#mal	485,5,1,{
+	mes "[Wanderer]";
+	mes "The cats living in here are so energetic.";
+	mes "Is it weird that they make me want to dance all day?";
+	mes "La di dah di dah~!";
 	close;
 OnTouch:
 	switch(rand(5)) {
@@ -362,31 +370,64 @@ OnTouch:
 malangdo,216,168,3	script	Cat Trainer#mal1	558,0,8,{
 	emotion e_awsm;
 	mes "[Cat Trainer]";
-	mes "Phh there is a tail and butt both soft and tender!";
-	mes "Can't stand, this is heaven~~!!";
+	mes "Ooo~ their soft puffy tails and soft fur~";
+	mes "I can't stand it, this is heaven~~!!";
 	next;
 	emotion e_gg;
 	mes "[Cat Trainer]";
-	mes "My hidden card, ^FF0000<Silvervine Fruit>^000000, can make all cats in Malangdo my slaves~ haha!";
+	mes "My hidden card, ^FF0000Silvervine Fruit^000000, can make all cats in Malangdo my slaves~ haha!";
 	next;
-	select("^FF0000<Silvervine Fruit>^000000?");
+	select("^FF0000Silvervine Fruit^000000?");
 	mes "[Cat Trainer]";
-	mes "Silvervine Fruit is a rare item!";
+	mes "It is such a rare item!";
 	mes "I can barely get it.";
-	mes "But every cat loves it with no complaints.";
+	mes "But these cudly cats can't resist it~";
 	next;
-	select("Where can I get ^FF0000<Silvervine Fruit>^000000?");
+	select("Where can I get ^FF0000Silvervine Fruit^000000?");
 	mes "[Cat Trainer]";
-	mes "How would I know if I could barely find it?";
-	mes "This can't be taken even with ^3131FFall the zeny in this world^000000!";
+	mes "Why would I tell you when I can barely get it?";
+	mes "I wouldn't even tell you for all the zeny in the world~!";
 	next;
 	emotion e_gg;
 	mes "[Cat Trainer]";
-	mes "The cats in Malangdo are mine...! As it should be, haha~";
-	mes "^FF0000<Silvervine Fruit>^000000! I can be a king in Malangdo~ ohhhh!!!";
+	mes "All the Malangdo cats are mine~!";
+	mes "Muahahahaha~";
+	mes "With enough ^FF0000Silvervine Fruit^000000 I can be a queen in Malangdo~ ohhhh!!!";
 	close;
 OnTouch:
 	emotion e_flash;
 	end;
 }
-malangdo,164,203,3	duplicate(Cat Trainer#mal1)	Cat Trainer#mal2	853,5,8
+
+malangdo,164,203,3	script	Cat Trainer#mal2	853,{
+	emotion e_awsm;
+	mes "[Cat Trainer]";
+	mes "Ooo~ their soft puffy tails and soft fur~";
+	mes "I can't stand it, this is heaven~~!!";
+	next;
+	emotion e_gg;
+	mes "[Cat Trainer]";
+	mes "This is my little secret called";
+	mes "^FF0000Silvervine Fruit^000000. I can use";
+	mes "it to make the Malangdo cats my";
+	mes "slaves~ muahahahaha~!";
+	next;
+	select("^FF0000Silvervine Fruit^000000?");
+	mes "[Cat Trainer]";
+	mes "Hmm, I guess it's no wonder you don't know.";
+	mes "These Malangdo cats can't resist it.";
+	mes "But it's too rare of an item to get so you shouldn't bother trying to find it.";
+	next;
+	select("Where can I get ^FF0000Silvervine Fruit^000000?");
+	mes "[Cat Trainer]";
+	mes "Actually, it's simple. You just...";
+	next;
+	mes "[Cat Trainer]";
+	mes "Hey, you almost made me tell my secret.";
+	next;
+	emotion e_gg;
+	mes "[Cat Trainer]";
+	mes "One day these cats will be mine.";
+	mes "I can be a king in Malangdo~ ohhh~!";
+	close;
+}