* Updated Knight Peco, Crusader Peco, and Falcon breeders to Aegis 10.3 standards.

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

2 files changed, 159 insertions, 147 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 83cdc75a0..de5922c46 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2007/06/01
+	* Rev. 10666 Updated Knight Peco, Crusader Peco, and Falcon breeders to Aegis 10.3 standards. [L0ne_W0lf]
 	* Rev. 10664 Removed Ktullanux spawn, since the quest is implemented now. [L0ne_W0lf]
 	* Rev. 10663 Rachel update. Official (to iRO) quests and town NPCs. [L0ne_W0lf]
 	- Added a few missing warps as well to both town and dungeon warps for Rachel.
diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt
index a4c62fd59..43b7a4387 100644
--- a/npc/merchants/renters.txt
+++ b/npc/merchants/renters.txt
@@ -3,11 +3,11 @@
 //===== By: ================================================== 
 //= kobra_k88, mod by Lupus
 //===== Current Version: ===================================== 
-//= 1.6a
+//= 1.7
 //===== Compatible With: ===================================== 
-//= eAthena 7.15 +
+//= eAthena SVN
 //===== Description: ========================================= 
-//= PecoPeco Breeder, Grand PecoPeco Breeder, Falcon tamer scripts
+//= Knight and Crusader Peco Peco Breeders, Falcon Breeder scripts
 //===== Additional Comments: ================================= 
 //= Fully working
 //= Added another Falcon Master into the Hunters Guild [Lupus]
@@ -18,165 +18,176 @@
 //= 1.5: Fixed spelling mistakes [Nexon]
 //= 1.5a: Small fix (Falcon Taming -> Falcon Mastery) [Komurka]
 //= 1.6: Moved the Falcon Master to Hugel [Poki#3]
+//= 1.7 Updated to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================ 
 
 // PecoPeco Breeder (for Knights)-------------------------------------------
-prontera,61,338,3	script	PecoPeco Breeder	86,{
-	if(Upper==0) set @price,2500; //Normal Peco - default price
-	if(Upper==1) set @price,4000; //Armored Peco
-	if(Upper==2) set @price,2000; //Baby Peco
-
-	mes "[PecoPeco Breeder]";
-	if(BaseJob == Job_Knight || BaseJob == Job_Knight2 ) goto L_Start;
-	if(Upper==0)mes "I'm a PecoPeco breeder and I rent out PecoPecos for ^4444FF Knights ^000000 to ride on.";
-	if(Upper==1)mes "I'm a PecoPeco breeder and I rent out Armored PecoPecos for ^4444FF Lord Knights ^000000 to ride on.";
-	if(Upper==2)mes "I'm a PecoPeco breeder and I rent out Baby PecoPecos for ^4444FF Baby Knights ^000000 to ride on.";
-	close;
-
-L_Start:
-	if(Upper==0)mes "Good day.  Would you like to ride a PecoPeco?";
-	if(Upper==1)mes "Good day.  Would you like to ride an Armored PecoPeco?";
-	if(Upper==2)mes "Good day.  Would you like to ride a Baby PecoPeco?";
-	next;
-	mes "[PecoPeco Breeder]";
-	mes "You can rent one PecoPeco for "+@price+" Zeny, provided that you have the PecoPeco Riding skill.";
-	next;
-	menu "Lend me a trusty steed!... err... bird!",M_0,"Hmm...It's a bit too expensive.",M_1;
-
-	M_0:
-		if(getskilllv(63) == 0) goto sL_NeedSkill;
-		if(Zeny < @price) goto sL_Zeny;
-		if(checkriding() != 0) goto sL_GotPeco;
-		set Zeny, Zeny - @price;
-		setriding;
-		mes "Thank you and good day.";
-		emotion 15;
-		close;
-
-		sL_NeedSkill:
-			mes "[PecoPeco Breeder]";
-			mes  "As I mentioned earlier, you need the ^3333FFRiding^000000 skill in order to rent a PecoPeco.";
-			close;
-		sL_Zeny:
-			mes "[PecoPeco Breeder]";
-			mes "As I said before it will be "+@price+"z. Come back when you have enough zeny.";
-			close;
-		sL_GotPeco:
-			mes "[PecoPeco Breeder]";
-			mes "Umm... aren't you already riding a PecoPeco??....";
-			emotion 20;
-			close;
-	M_1:
-		mes "[PecoPeco Breeder]";
-		mes "Alright.  Good day to you.";
+prontera,55,350,5	script	Peco Peco Breeder	105,{
+	if(Upper==0) set .@price,2500; //Normal Peco - default price
+	if(Upper==1) set .@price,2500; //Armored Peco
+	if(Upper==2) set .@price,2500; //Baby Peco
+
+	mes "[Peco Peco Breeder]";
+	if (BaseJob == Job_Knight) {
+		mes "Welcome.";
+		mes "Honorable Knight,";
+		mes "would you like to rent";
+		mes "a Peco Peco? The rental";
+		mes "fee is "+.@price+" zeny.";
+		next;
+		if (select("Rent Peco Peco:Cancel") == 1) {
+			if (zeny < .@price) {
+				mes "[Peco Peco Breeder]";
+				mes "You do not";
+				mes "have enough zeny.";
+				mes "Are you...";
+				mes "bankrupt?";
+				close;
+			}
+			else if(getskilllv(63) == 0) {
+				mes "[Peco Peco Breeder]";
+				mes "I'm sorry, but you're";
+				mes "not eligible for this";
+				mes "service. Please go learn";
+				mes "the Peco Peco Ride skill first.";
+				close;
+			}
+			else if(checkriding()) {
+				mes "[Peco Peco Breeder]";
+				mes "You're already";
+				mes "mounted on a";
+				mes "Peco Peco.";
+				close;
+			}
+			set zeny,zeny-.@price;
+			setriding;
+		}
+
+		mes "[Peco Peco Breeder]";
+		mes "I see.";
+		mes "Well then,";
+		mes "have a good day.";
 		close;
-
+	}
+	mes "I'm sorry, but these";
+	mes "Peco Pecos are only";
+	mes "available for Knights";
+	mes "and Lord Knights.";
+	close;
 }
 
 // Grand PecoPeco Breeder (for Crusaders)-------------------------------------------
-prontera,238,312,5	script	Grand PecoPeco Breeder	86,{
-	if(Upper==0) set @price,3000; //Normal Peco - default price
-	if(Upper==1) set @price,5000; //Armored Peco
-	if(Upper==2) set @price,2500; //Baby Peco
-
-	mes "[Grand PecoPeco Breeder]";
-	if(BaseJob == Job_Crusader || BaseJob == Job_Crusader2 ) goto L_Start;
-	if(Upper==0)mes "I'm a Grand PecoPeco breeder and I rent out Grand PecoPecos for ^4444FF Crusaders^000000 to ride on.";
-	if(Upper==1)mes "I'm a Grand PecoPeco breeder and I rent out Armored Grand PecoPecos for ^4444FF Paladins^000000 to ride on.";
-	if(Upper==2)mes "I'm a Grand PecoPeco breeder and I rent out Baby Grand PecoPecos for ^4444FF Baby Crusaders^000000 to ride on.";
-	close;
+prontera,232,318,3	script	Peco Peco Breeder	105,{
+	if(Upper==0) set @price,3500; //Normal Peco - default price
+	if(Upper==1) set @price,3500; //Armored Peco
+	if(Upper==2) set @price,3500; //Baby Peco
 
-L_Start:
-	if(Upper==0)mes "Good day.  Would you like to ride a Grand PecoPeco?";
-	if(Upper==1)mes "Good day.  Would you like to ride an Armored Grand PecoPeco?";
-	if(Upper==2)mes "Good day.  Would you like to ride a Baby Grand PecoPeco?";
-	next;
-	mes "[Grand PecoPeco Breeder]";
-	mes "You can rent one Grand PecoPeco for "+@price+" Zeny, provided that you have the PecoPeco Riding skill.";
-	next;
-	menu "Lend me a trusty steed!... err... bird!",M_0,"Hmm...It's a bit too expensive.",M_1;
-
-	M_0:
-		if(getskilllv(63) == 0) goto sL_NeedSkill;
-		if(Zeny < @price) goto sL_Zeny;
-		if(checkriding() != 0) goto sL_GotPeco;
-		set Zeny, Zeny - @price;
-		setriding;
-		mes "Thank you and good day.";
-		emotion 15;
-		close;
+	mes "[PecoPeco Breeder]";
+	if (BaseClass == Job_Crusader) {
+		if (Class == Job_Crusader && Upper == 0 || Upper == 1) mes "Welcome, Crusader.";
+		else 
+mes "Welcome, Paladin.";
+		mes "We have a special";
+		mes "Peco Peco prepared";
+		mes "for you. To rent one";
+		mes "will cost "+.@price+" zeny.";
+		next;
+		if (select("Rent a PecoPeco:Quit") ==1) {
+			if (zeny < .@Price) {
+				mes "[Peco Peco Breeder]";
+				mes "You do not";
+				mes "have enough zeny.";
+				mes "If you would like";
+				mes "a Peco Peco please";
+				mes "bring "+.@price+" zeny...";
+				close;
+			}
 
-		sL_NeedSkill:
-			mes "[Grand PecoPeco Breeder]";
-			mes  "As I mentioned earlier, you need the ^3333FFRiding^000000 skill in order to rent a Grand PecoPeco.";
-			close;
-		sL_Zeny:
-			mes "[Grand PecoPeco Breeder]";
-			mes "As I said before it will be "+@price+"z. Come back when you have enough zeny.";
-			close;
-		sL_GotPeco:
-			mes "[Grand PecoPeco Breeder]";
-			mes "Umm... aren't you already riding a Grand PecoPeco??....";
-			emotion 20;
-			close;
-	M_1:
-		mes "[Grand PecoPeco Breeder]";
-		mes "Alright.  Good day to you.";
+			else if(getskilllv(63) == 0) {
+				mes "[Peco Peco Breeder]";
+				mes "You must first learn";
+				mes "to ride a PecoPeco before";
+				mes "I can rent one to you.";
+				close;
+			}
+			else if(checkriding()) {
+				mes "[Peco Peco Breeder]";
+				mes "You are already";
+				mes "mounted on a Peco Peco.";
+				close;
+			}
+			set zeny,zeny-.@price;
+			setriding;
+		}
+		mes "[PecoPeco Breeder]";
+		mes "See you around.";
 		close;
-
+	}
+	mes "What can I do for you?";
+	mes "Please be aware that";
+	mes "this Peco Peco rental";
+	mes "service is strictly for";
+	mes "Crusaders and Paladins.";
+	close;
 }
 
 // Falcon Master--------------------------------------------------------------
-hu_in01,375,318,5	script	Falcon Master	59,{
-	if(Upper==0) set @price,800; //Normal Falcon - default price
-	if(Upper==1) set @price,1000; //Scarf Falcon
-	if(Upper==2) set @price,600; //Baby Falcon
-
-	mes "[Falcon Master]";
-	mes "Hellooooo, I am the Falcon Master.";
-	next;
-	menu "Speak with him",M_0, "Politely back away",M_End;
-
-	M_0:
-		mes "[Falcon Master]";
-		if(Upper==0)mes "I can train a Falcon for you, but you need "+@price+"z and be a Hunter with mastered ^5555FF'Falcon Mastery'^000000 skill.";
-		if(Upper==1)mes "I can train a Scarf Falcon for you, but you need "+@price+"z and be a Sniper with mastered ^5555FF'Falcon Mastery'^000000 skill.";
-		if(Upper==2)mes "I can train a Baby Falcon for you, but you need "+@price+"z and be a Baby Hunter with mastered ^5555FF'Falcon Mastery'^000000 skill.";
+hu_in01,381,304,5	script	Falcon Breeder	105,{
+	if(Upper==0) set @price,2500; //Normal Falcon - default price
+	if(Upper==1) set @price,2500; //Scarf Falcon
+	if(Upper==2) set @price,2500; //Baby Falcon
+
+	mes "[Falcon Breeder]";
+	if (BaseJob == Job_Hunter) {
+		mes "Do you need a Falcon?";
+		mes "You can rent your own";
+		mes "trusty bird of prey for a";
+		mes "fee of just "+.@price+" zeny~";
 		next;
-		menu "Ok",sM_0, "No thanks",M_End;
-
-		sM_0:
-			if(BaseJob != Job_Hunter) goto sL_NotHunter;
-			if(checkfalcon() != 0) goto sL_GotFalc;
-			if(Zeny < @price) goto sL_Zeny;
-			if(getskilllv(127)==0) goto sL_NoSkill;
-			set Zeny, Zeny - @price;
-			mes "[Falcon Master]";
-			mes "It looks like you meet all the requirements to handle a Falcon.  Here you are";
-			setfalcon;
-			next;
-			mes "[Falcon Master]";
-			mes "Please take very good care of it.  It will prove to be a valuable companion.";
-			close;
-			
-			sL_NotHunter:
-				mes "[Falcon Master]";
-				mes "As I said, Falcons can only be given to Hunters.  Falcons are very picky about who they travel with you know.";
+		if (select("Rent Falcon:Cancel") == 1) {
+			if (zeny < .@price) {
+				mes "[Falcon Breeder]";
+				mes "What is this?";
+				mes "You don't have";
+				mes "enough zeny?!";
+				mes "You better start";
+				mes "hunting money";
+				mes "instead of monsters~";
 				close;
-			sL_GotFalc:
-				mes "[Falcon Master]";
-				mes "You can only have 1 Falcon at a time.";
+			}
+			else if(getskilllv(127) == 0) {
+				mes "[Falcon Breeder]";
+				mes "Gosh~";
+				mes "Go learn how to";
+				mes "manage a Falcon";
+				mes "first! I can't rent one";
+				mes "to you if you can't";
+				mes "handle it, you know.";
 				close;
-			sL_NoSkill:
-				mes "[Falcon Master]";
-				mes "I'm sorry but you do not have the Falcon Mastery skill.  Please come back when you have learned it.";
+			}
+			else if(checkfalcon()) {
+				mes "[Falcon Breeder]";
+				mes "Um...";
+				mes "You already have";
+				mes "a Falcon. It's right";
+				mes "there, can't you see it?";
 				close;
-			sL_Zeny:
-				mes "[Falcon Master]";
-				mes "As I said before it will be "+@price+"z. Come back when you aquire enough zeny.";
-				close;
-	M_End:
-		mes "[Falcon Master]";
-		mes "Have a nice day.";
+			}
+			set zeny,zeny-.@Price;
+			setfalcon;
+			close;
+		}
+		mes "[Falcon Breeder]";
+		mes "W-wait, where're";
+		mes "you goin'? These";
+		mes "Falcons are top notch,";
+		mes "I guarantee it! C'mon, yo~";
 		close;
-}
+	}
+	mes "Young fool!";
+	mes "Falcons can only";
+	mes "be used by Hunters";
+	mes "and Snipers, capish?";
+	mes "...Heh heh, jealous?";
+	close;
+}
\ No newline at end of file