1 files changed, 28 insertions, 21 deletions

diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt
index af4a740b4..40d94d99d 100644
--- a/npc/custom/breeder.txt
+++ b/npc/custom/breeder.txt
@@ -11,36 +11,43 @@
 //============================================================
 
 prontera,124,201,1	script	Universal Rental NPC	4_F_JOB_BLACKSMITH,{
+	/* TODO: This can be optimized with just setmount(), as it can
+		 auto-detect the proper mount for the class/skills. */
 	if (hascashmount()) {
 		message strcharinfo(0),"You must first remove your mount.";
 		end;
-	}
-	else if ((eaclass()&EAJ_THIRDMASK) == EAJ_RANGER && !countitem(6124)) {
-		if (!checkfalcon() && getskilllv("HT_FALCON") && !checkoption(Option_Wug) && !checkoption(Option_Wugrider)) {
-			if(select(" ~ Falcon: ~ Warg")==1) setfalcon;
-			else getitem 6124,1;
+	} else if ((eaclass()&EAJ_THIRDMASK) == EAJ_RANGER && !countitem(Wolf's_Flute)) {
+		if (!checkfalcon() && getskilllv(HT_FALCON) && !checkwug()) {
+			if (select(" ~ Falcon: ~ Warg") == 1)
+				setfalcon;
+			else
+				getitem Wolf's_Flute, 1;
 			specialeffect2 EF_TEIHIT3;
 			close;
+		} else {
+			getitem Wolf's_Flute,1;
 		}
-		else getitem 6124,1;
-	}
-	else if ((eaclass()&EAJ_THIRDMASK) == EAJ_MECHANIC && !checkcart() && getskilllv("MC_PUSHCART")) {
-		if (!checkmadogear() && getskilllv("NC_MADOLICENCE")) {
-			if(select(" ~ Cart: ~ Mado")==1) setcart;
-			else setmadogear;
+	} else if ((eaclass()&EAJ_THIRDMASK) == EAJ_MECHANIC && !checkcart() && getskilllv(MC_PUSHCART)) {
+		if (!checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) {
+			if (select(" ~ Cart: ~ Mado") == 1) {
+				setcart;
+			} else {
+				setmount(MOUNT_MADO);
+			}
 			specialeffect2 EF_TEIHIT3;
 			close;
+		} else {
+			setcart;
 		}
-		else setcart;
-	}
-	else if (!checkcart() && getskilllv("MC_PUSHCART")) setcart;
-	else if (!checkfalcon() && getskilllv("HT_FALCON") && !checkoption(Option_Wug) && !checkoption(Option_Wugrider)) setfalcon;
-	else if (!checkriding() && getskilllv("KN_RIDING")) {
-		if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) setdragon;
-		else setriding;
-	}
-	else if (!checkmadogear() && getskilllv("NC_MADOLICENCE")) setmadogear;
-	else {
+	} else if (!checkcart() && getskilllv(MC_PUSHCART)) {
+		setcart;
+	} else if (!checkfalcon() && getskilllv(HT_FALCON) && !checkwug()) {
+		setfalcon;
+	} else if (checkmount() == MOUNT_PECO && getskilllv(KN_RIDING)) {
+		setmount; // Peco or Dragon
+	} else if (checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) {
+		setmount(MOUNT_MADO);
+	} else {
 		message strcharinfo(0),"You do not meet requirements to rent.";
 		end;
 	}