Full npc folder reorganization. (I hope I didn't break anything D:)

-Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders.
-NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences.
-For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates.
-All pre-renewal files has been reverted back to their pre-renewal behavior.

TODO:
-Correct pre-re quest rewards.
-Check for pre-re/re differences in mapflags.

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

1 files changed, 116 insertions, 151 deletions

diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt
index 0b7cafdd4..278b1937b 100644
--- a/npc/re/merchants/renters.txt
+++ b/npc/re/merchants/renters.txt
@@ -1,215 +1,180 @@
 //===== rAthena Script ======================================= 
 //= Renters
 //===== By: ================================================== 
-//= kobra_k88, mod by Lupus
+//= rAthena Dev Team
 //===== Current Version: ===================================== 
 //= 2.1
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= Knight and Crusader Peco Peco Breeders, Falcon Breeder scripts
+//= Renewal-specific breeder NPCs.
 //===== Additional Comments: ================================= 
-//= Fully working
-//= Added another Falcon Master into the Hunters Guild [Lupus]
-//= 1.2: replaced checkoption(x) with checkriding,checkfalcon [Lupus]
-//= 1.3: Added support Adv Classes + Baby Class [Lupus]
-//= 1.4: Added different prices for normal, advanced and baby classes
-//= but you could set them to the same [Lupus]
-//= 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]
-//= 1.8 Added 3rd Job creature NPCs (Dragon/Gryphon) [L0ne_W0lf]
-//= 1.9 Enabled Gryphon Renter NPC and added Mado Gear NPC. [Masao]
-//= 2.0 Fixed problems with third classes and new mounts. [Euphy]
 //= 2.1 Moved some renters to a separate renewal file. [Daegaladh]
 //============================================================ 
 
-// PecoPeco Breeder (for Knights)-------------------------------------------
-prontera,55,350,5	script	Peco Peco Breeder#knt	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 && Class < Job_Rune_Knight) {
-		mes "Welcome.";
-		mes "Honorable Knight,";
-		mes "would you like to rent";
-		mes "a Peco Peco? The rental";
-		mes "fee is "+.@price+" zeny.";
+// Dragon Breeder on the Rune Knight job change map, couldn't find NPC on iRO.
+job3_rune01,88,62,5	script	Dragon Breeder	105,{
+	mes "[Dragon Breeder]";
+	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
+		mes "Welcome. Would you like to rent a Dragon?";
 		next;
-		switch(select("Rent Peco Peco:Cancel")) {
+		switch(select("Yes:No")) {
 		case 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("KN_RIDING") == 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.";
+			//if (!getskilllv("RK_DRAGONTRAINING")) {
+			if (!getskilllv("KN_RIDING")) {
+				mes "[Dragon Breeder]";
+				mes "Please learn how to ride a Dragon first.";
 				close;
 			}
-			else if(checkriding()) {
-				mes "[Peco Peco Breeder]";
-				mes "You're already";
-				mes "mounted on a";
-				mes "Peco Peco.";
+			else if (checkriding()) {
+				mes "[Dragon Breeder]";
+				mes "You already have a Dragon.";
 				close;
 			}
 			else if(ismounting()) {
-				mes "[Peco Peco Breeder]";
+				mes "[Dragon Breeder]";
 				mes "Please remove your cash mount.";
 				close;
 			}
-			set zeny,zeny-.@price;
-			setriding;
+			setdragon;
 			close;
 		case 2:
-			mes "[Peco Peco Breeder]";
-			mes "I see.";
-			mes "Well then,";
-			mes "have a good day.";
+			mes "[Dragon Breeder]";
+			mes "I see. Then have a great day.";
 			close;
 		}
-	} else {
-		mes "I'm sorry, but these";
-		mes "Peco Pecos are only";
-		mes "available for Knights";
-		mes "and Lord Knights.";
-		close;
 	}
+	mes "What are you doing here?";
+	mes "Only Rune Knights can rent a Dragon.";
+	close;
 }
 
-// Grand PecoPeco Breeder (for Crusaders)-------------------------------------------
-prontera,232,318,3	script	Peco Peco Breeder#cru	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
-
-	mes "[PecoPeco Breeder]";
-	if (BaseJob == Job_Crusader && Class < Job_Rune_Knight) {
-		if(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.";
+// Dragon/Gryphon Master
+prontera,130,213,5	script	Riding Creature Master	105,{
+	mes "[Riding Creature Master]";
+	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
+		mes "Welcome. Would you like to rent a Dragon?";
 		next;
-		switch(select("Rent a PecoPeco:Quit")) {
+		switch(select("Yes:No")) {
 		case 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...";
+			//if (!getskilllv("RK_DRAGONTRAINING")) {
+			if (!getskilllv("KN_RIDING")) {
+				mes "[Riding Creature Master]";
+				mes "Please learn how to ride a Dragon first.";
 				close;
 			}
-			else if(getskilllv("KN_RIDING") == 0) {
-				mes "[Peco Peco Breeder]";
-				mes "You must first learn";
-				mes "to ride a PecoPeco before";
-				mes "I can rent one to you.";
+			else if (checkriding()) {
+				mes "[Riding Creature Master]";
+				mes "You already have a Dragon.";
 				close;
 			}
-			else if(checkriding()) {
-				mes "[Peco Peco Breeder]";
-				mes "You are already";
-				mes "mounted on a Peco Peco.";
+			else if(ismounting()) {
+				mes "[Riding Creature Master]";
+				mes "Please remove your cash mount.";
+				close;
+			}
+			setdragon;
+			close;
+		case 2:
+			mes "[Riding Creature Master]";
+			mes "I see. Then have a great day.";
+			close;
+		}
+	}
+	if (Class == Job_Royal_Guard || Class == Job_Royal_Guard_T || Class == Job_Baby_Guard) {
+		mes "Welcome. Would you like to rent a Gryphon?";
+		next;
+		switch(select("Yes:No")) {
+		case 1:
+			if(!getskilllv("KN_RIDING")) {
+				mes "[Riding Creature Master]";
+				mes "Please learn how to ride a Gryphon first.";
+				close;
+			}
+			else if (checkriding()) {
+				mes "[Riding Creature Master]";
+				mes "You already have a Gryphon.";
 				close;
 			}
 			else if(ismounting()) {
-				mes "[Peco Peco Breeder]";
+				mes "[Riding Creature Master]";
 				mes "Please remove your cash mount.";
 				close;
 			}
-			set zeny,zeny-.@price;
 			setriding;
 			close;
 		case 2:
-			mes "[PecoPeco Breeder]";
-			mes "See you around.";
+			mes "[Riding Creature Master]";
+			mes "I see. Then have a great day.";
 			close;
 		}
-	} else {
-		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;
 	}
+	mes "I'm here to provide Rune Knights and Royal Guards with riding creatures.";
+	close;
 }
 
-// Falcon Master--------------------------------------------------------------
-hu_in01,381,304,5	script	Falcon Breeder#hnt	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
+// Peco removing NPC
+prontera,125,208,5	script	Peco Peco Remover	105,{
+	mes "[Soldier]";
+	mes "If you're unable to dismount from a Peco Peco";
+	mes "for some unknown reason,";
+	mes "please feel free to use my services.";
+	if (checkriding()) {
+		next;
+		mes "[Soldier]";
+		mes "You're riding a Peco Peco.";
+		mes "Would you like to dismount?";
+		next;
+		switch(select("Yes:No")) {
+		case 1:
+			setriding 0;
+			mes "[Soldier]";
+			mes "Say, how does it feel to";
+			mes "step on the ground on your own";
+			mes "feet again?";
+			close;
+		case 2:
+			mes "[Soldier]";
+			mes "I see. Please feel free to ask me";
+			mes "if you change your mind.";
+			close;
+		}
+	}
+	close;
+}
 
-	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~";
+// Magic Gear Renter
+prontera,163,178,4	script	Magic Gear Master	105,{
+	mes "[Magic Gear Master]";
+	if (Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) {
+		mes "Welcome. Would you like to rent a Magic Gear?";
 		next;
-		switch(select("Rent Falcon:Cancel")) {
+		switch(select("Yes:No")) {
 		case 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~";
+			if (!getskilllv("NC_MADOLICENCE")) {
+				mes "[Magic Gear Master]";
+				mes "Please learn how to use a Magic Gear first.";
 				close;
 			}
-			else if(getskilllv("HT_FALCON") == 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.";
+			else if (checkmadogear()) {
+				mes "[Magic Gear Master]";
+				mes "You already have a Magic Gear.";
 				close;
 			}
-			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?";
+			else if(ismounting()) {
+				mes "[Magic Gear Master]";
+				mes "Please remove your cash mount.";
 				close;
 			}
-			set zeny,zeny-.@price;
-			setfalcon;
+			setmadogear;
 			close;
 		case 2:
-			mes "[Falcon Breeder]";
-			mes "W-wait, where're";
-			mes "you goin'? These";
-			mes "Falcons are top notch,";
-			mes "I guarantee it! C'mon, yo~";
+			mes "[Magic Gear Master]";
+			mes "I see. Then have a great day.";
 			close;
 		}
-	} else {
-		mes "Young fool!";
-		mes "Falcons can only";
-		mes "be used by Hunters";
-		mes "and Snipers, capish?";
-		mes "...Heh heh, jealous?";
-		close;
 	}
+	mes "How may I help you?";
+	mes "Magic Gears are only available for Mechanics.";
+	close;
 }
\ No newline at end of file