diff options
Diffstat (limited to 'npc/custom')
| -rw-r--r-- | npc/custom/breeder.txt | 33 | ||||
| -rw-r--r-- | npc/custom/etc/penal_servitude.txt | 4 | ||||
| -rw-r--r-- | npc/custom/jobmaster.txt | 4 |
3 files changed, 21 insertions, 20 deletions
diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt index cb43091d3..40d94d99d 100644 --- a/npc/custom/breeder.txt +++ b/npc/custom/breeder.txt @@ -16,17 +16,18 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ 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)) { + } else if ((eaclass()&EAJ_THIRDMASK) == EAJ_MECHANIC && !checkcart() && getskilllv(MC_PUSHCART)) { if (!checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) { if (select(" ~ Cart: ~ Mado") == 1) { setcart; @@ -35,15 +36,15 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ } 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) - setmount(MOUNT_DRAGON); - else setriding; + } 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 { diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt index e78833b66..b83bf3f83 100644 --- a/npc/custom/etc/penal_servitude.txt +++ b/npc/custom/etc/penal_servitude.txt @@ -84,9 +84,9 @@ M_Q1: menu "OK, I'll work off!",-, "I love this prison!",M_NO_THANKS; mes "[Saddeus]"; - if(checkcart() || checkfalcon() || checkriding()){ + if(checkcart() || checkfalcon() || checkmount()){ emotion e_hmm; - mes "I'm sorry, you should release your Cart, PecoPeco or Falcon!"; + mes "I'm sorry, you should release your Cart, Mount or Falcon!"; close; } mes "Talk to our overseer, Oliver."; diff --git a/npc/custom/jobmaster.txt b/npc/custom/jobmaster.txt index e476ce2df..ca102ed76 100644 --- a/npc/custom/jobmaster.txt +++ b/npc/custom/jobmaster.txt @@ -24,8 +24,8 @@ prontera,153,193,6 script Job Master 2_F_MAGICMASTER,{ mes "No more jobs are available."; close; } - if (checkfalcon() || checkcart() || checkriding() || hascashmount()) { - mes "Please remove your "+((checkfalcon())?"falcon":"")+((checkcart())?"cart":"")+((checkriding())?"Peco":"")+((hascashmount())?"mount":"") + if (checkfalcon() || checkcart() || checkmount() || hascashmount()) { + mes "Please remove your "+((checkfalcon())?"falcon":"")+((checkcart())?"cart":"")+((checkmount() || hascashmount())?"mount":"") +" before proceeding."; close; } |