* Follow-up r16427, cleaned new quest script and slightly edited hommutate documentation

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

2 files changed, 38 insertions, 129 deletions

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index d50ee5184..0e7675642 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -5318,14 +5318,15 @@ the homunculus must have above 91000 intimacy with it's owner.
 
 *hommutate {<ID>};
 
-This Command will evolve the current player's Homunculus into the new Homunculus S.
-If it doesn't work, the /swt emotion is shown.
+This command will try to evolve the current player's homunculus into the
+new Homunculus S. If it doesn't work, the /swt emotion is shown.
 
-To change a Homunculus into the new Homunculus S,
-the invoking Player must have an evolved Homunculus and it must be at least Level 99.
+To mutate a homunculus, the invoking player must have an evolved
+homunculus and it must be at least level 99.
 
-If the optional parameter <ID> is set, the invoking Players Homunculus will change into the given ID's Homunculus S,
-otherwise the Homunculus will change into an randomly chosen Homunculus S Class.
+If the optional parameter <ID> is set, the invoking player's homunculus will
+change into the given homunculus ID. Otherwise, a random Homunculus S
+will be chosen.
 
 ---------------------------------------
 
diff --git a/npc/re/quests/homu_s.txt b/npc/re/quests/homu_s.txt
index dda0ad7ee..b2faaa23e 100644
--- a/npc/re/quests/homu_s.txt
+++ b/npc/re/quests/homu_s.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= Masao

 //===== Current Version: ===================================== 

-//= 1.0

+//= 1.1

 //===== Compatible With: ===================================== 

 //= rAthena SVN

 //===== Description: ========================================= 

@@ -12,6 +12,7 @@
 //===== Additional Comments: ================================= 

 //= 1.0 First Version. The actual changing dialog is currently

 //=     customized. [Masao]

+//= 1.1 Cleaning. [Euphy]

 //============================================================ 

 

 job3_gen01,12,44,4	script	Viorel#job3_gen01	542,{

@@ -45,149 +46,53 @@ job3_gen01,12,44,4	script	Viorel#job3_gen01	542,{
 	}

 	mes "[Viorel]";

 	mes "Hello "+strcharinfo(0)+",";

-	mes "what can I do for an fellow Alchemist like you?";

+	mes "what can I do for a fellow Alchemist like you?";

 	next;

 	switch(select("I want to evolve my Homunculus:About Homunculus S:Cancel")){

 	case 1:

 		mes "[Viorel]";

 		if(!getskilllv("AM_BIOETHICS")){

-			mes "I'm sorry but you must know the Skill Bioethics! Otherwise I can't let your Homunculus evolve into an Homunculus S.";

+			mes "I'm sorry, but you must know the Skill Bioethics! Otherwise I can't let your Homunculus evolve into a Homunculus S.";

+			close;

+		}

+		if(!gethominfo(1)){

+			mes "You don't even have a Homunculus!";

 			close;

 		}

 		if(gethominfo(1) < 6009){

-			mes "I'm sorry but you must have an evolved Homunculus, otherwise you can't let it evolve to the new Homunculus S.";

+			mes "You must have an evolved Homunculus, or you can't turn it into the new Homunculus S.";

 			close;

 		}

 		if(gethominfo(6) < 99){

-			mes "I'm sorry but to evolve your Homunculus to the next level it must be Level 99!";

+			mes "Your Homunculus must be level 99 to evolve into a Homuculus S!";

 			mes "Come back after you've trained your Homunculus a little bit more.";

 			close;

 		}

 		if(gethominfo(1) == 6048 || gethominfo(1) == 6049 || gethominfo(1) == 6050 || gethominfo(1) == 6051 || gethominfo(1) == 6052){

 			mes "Your Homunculus S looks great!";

-			mes "I hope you wil experience many great adventures with it!";

+			mes "I hope you will experience many great adventures with it!";

 			close;

 		}

 		mes "Great, it seems like you're all ready to get your Homunculus to the next level!";

 		next;

 		mes "[Viorel]";

-		mes "Now if you want to you can either directly change your Homunculus to an new random Homunculus S Form or you can donate a little fee";

-		mes "of 50'000 zeny to the Alchemist Guild and for this you'll be able to change your Homunculus into your desired Homunculus S Class!";

+		mes "Now you can either directly change your Homunculus to a random Homunculus S or you can donate a little fee of 50,000z";

+		mes "to the Alchemist Guild. For this you'll be able to change your Homunculus into your desired Homunculus S Class!";

 		mes "So, what do you think?";

 		next;

-		switch(Select("I want to Donate:I don't want to Donate:Cancel")){

+		switch(Select("I want to donate.:I don't want to donate.:Cancel")){

 		case 1:

 			if(Zeny < 50000){

 				mes "[Viorel]";

-				mes "Haha, nice try my friend! But you don't even have the 50'000 zeny to donate!";

-				mes "Come back if you have the zeny, thanks.";

+				mes "Haha, nice try my friend! But you don't even have the 50,000z to donate!";

+				mes "Come back if you have the Zeny.";

 				close;

 			}

 			mes "[Viorel]";

-			mes "Allright, now please tell me which Homunculus you'd like to have:";

+			mes "Alright, now please tell me which Homunculus you'd like to have:";

 			next;

-			switch(select("Eira:Bayeri:Sera:Dieter:Elanor:Cancel")){

-			case 1:

-				mes "[Viorel]";

-				mes "Ok, it's all set! Now just give me a moment!";

-				next;

-				mes "[Viorel]";

-				mes "Abra...";

-				next;

-				mes "[Viorel]";

-				mes "Kadabra...";

-				next;

-				mes "[Viorel]";

-				mes "Simsala!";

-				mes "...";

-				mes "Oh sorry.. wrong game!";

-				next;

-				mes "[Viorel]";

-				mes "Here you go! Your new Homunculus S!";

-				hommutate 6048;

-				set Zeny,Zeny - 50000;

-				close;

-			case 2:

-				mes "[Viorel]";

-				mes "Ok, it's all set! Now just give me a moment!";

-				next;

-				mes "[Viorel]";

-				mes "Abra...";

-				next;

-				mes "[Viorel]";

-				mes "Kadabra...";

-				next;

-				mes "[Viorel]";

-				mes "Simsala!";

-				mes "...";

-				mes "Oh sorry.. wrong game!";

-				next;

-				mes "[Viorel]";

-				mes "Here you go! Your new Homunculus S!";

-				hommutate 6049;

-				set Zeny,Zeny - 50000;

-				close;

-			case 3:

-				mes "[Viorel]";

-				mes "Ok, it's all set! Now just give me a moment!";

-				next;

-				mes "[Viorel]";

-				mes "Abra...";

-				next;

-				mes "[Viorel]";

-				mes "Kadabra...";

-				next;

-				mes "[Viorel]";

-				mes "Simsala!";

-				mes "...";

-				mes "Oh sorry.. wrong game!";

-				next;

-				mes "[Viorel]";

-				mes "Here you go! Your new Homunculus S!";

-				hommutate 6050;

-				set Zeny,Zeny - 50000;

-				close;

-			case 4:

-				mes "[Viorel]";

-				mes "Ok, it's all set! Now just give me a moment!";

-				next;

-				mes "[Viorel]";

-				mes "Abra...";

-				next;

-				mes "[Viorel]";

-				mes "Kadabra...";

-				next;

-				mes "[Viorel]";

-				mes "Simsala!";

-				mes "...";

-				mes "Oh sorry.. wrong game!";

-				next;

-				mes "[Viorel]";

-				mes "Here you go! Your new Homunculus S!";

-				hommutate 6051;

-				set Zeny,Zeny - 50000;

-				close;

-			case 5:

-				mes "[Viorel]";

-				mes "Ok, it's all set! Now just give me a moment!";

-				next;

-				mes "[Viorel]";

-				mes "Abra...";

-				next;

-				mes "[Viorel]";

-				mes "Kadabra...";

-				next;

-				mes "[Viorel]";

-				mes "Simsala!";

-				mes "...";

-				mes "Oh sorry.. wrong game!";

-				next;

-				mes "[Viorel]";

-				mes "Here you go! Your new Homunculus S!";

-				hommutate 6052;

-				set Zeny,Zeny - 50000;

-				close;

-			case 6:

+			set .@i, select("Eira:Bayeri:Sera:Dieter:Elanor:Cancel");

+			if (.@i == 6) {

 				mes "[Viorel]";

 				mes "So long~!";

 				close;

@@ -205,11 +110,15 @@ job3_gen01,12,44,4	script	Viorel#job3_gen01	542,{
 			mes "[Viorel]";

 			mes "Simsala!";

 			mes "...";

-			mes "Oh sorry.. wrong game!";

+			mes "Oh, sorry... wrong game!";

 			next;

 			mes "[Viorel]";

 			mes "Here you go! Your new Homunculus S!";

-			hommutate;

+			if (.@i) {

+				hommutate 6047+.@i;

+				set Zeny,Zeny - 50000;

+			}

+			else hommutate;

 			close;

 		case 3:

 			mes "[Viorel]";

@@ -218,15 +127,14 @@ job3_gen01,12,44,4	script	Viorel#job3_gen01	542,{
 		}

 	case 2:

 		mes "[Viorel]";

-		mes "The Homunculus S are the new and improved Versions of the current Homunculus you know.";

-		mes "These new Homunculus have been made since the Monsters in our World keep getting stronger and stronger";

-		mes "and our current loyal Homunculus are just not able to keep up with them anymore so they can't";

-		mes "protect their Masters anymore!";

+		mes "The Homunculus S are the new and improved versions of the current Homunculus you know.";

+		mes "These new Homunculus have been made because the monsters in our world keep getting stronger and";

+		mes "stronger, and our current Homunculus are just not able to keep up with them anymore.";

 		next;

 		mes "[Viorel]";

-		mes "But since we're Alchemists and we don't want to abandon our precious Homunculus we found a Way to improve their";

-		mes "skills and strength in order to keep them by our side and joining us once more in battle!";

-		mes "Isn't that great?";

+		mes "But since we're Alchemists and we don't want to abandon our precious Homunculus, we've discovered a way";

+		mes "to improve their skills and strength in order to keep them by our side, and joining us once more";

+		mes "in battle! Isn't that great?";

 		close;

 	case 3:

 		mes "[Viorel]";