summaryrefslogtreecommitdiff
path: root/npc/custom/breeder.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/custom/breeder.txt')
-rw-r--r--npc/custom/breeder.txt19
1 files changed, 12 insertions, 7 deletions
diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt
index af4a740b4..252511355 100644
--- a/npc/custom/breeder.txt
+++ b/npc/custom/breeder.txt
@@ -11,6 +11,8 @@
//============================================================
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;
@@ -24,10 +26,13 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{
}
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;
}
@@ -38,9 +43,9 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{
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 (checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) {
+ setmount(MOUNT_MADO);
+ } else {
message strcharinfo(0),"You do not meet requirements to rent.";
end;
}