summaryrefslogtreecommitdiff
path: root/npc/re
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re')
-rw-r--r--npc/re/jobs/3-1/rune_knight.txt2
-rw-r--r--npc/re/jobs/3-2/royal_guard.txt4
-rw-r--r--npc/re/merchants/renters.txt20
3 files changed, 11 insertions, 15 deletions
diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index 7c38c7c25..ceb38a0eb 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -504,7 +504,7 @@ job3_rune01,80,60,3 script Rune Knight Captain 4_M_KNIGHT_SILVER,2,2,{
next;
switch(select("Every preparation is done.:I need more time to think.")) {
case 1:
- if (SkillPoint != 0 || checkriding()) {
+ if (SkillPoint != 0 || checkmount() == MOUNT_PECO) {
mes "[Captain Tigris]";
mes "Weren't you listening?";
next;
diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt
index bf569118d..c8c0346eb 100644
--- a/npc/re/jobs/3-2/royal_guard.txt
+++ b/npc/re/jobs/3-2/royal_guard.txt
@@ -32,7 +32,7 @@ prt_castle,48,161,3 script Middle-aged Gentleman#rg 1_M_LIBRARYMASTER,{
mes "Oh you are so young. Keep working hard.";
close;
}
- if (checkriding() || checkcart() || checkfalcon()) {
+ if (checkmount() || checkcart() || checkfalcon()) {
mes "[Middle-aged Gentleman]";
mes "You are dragging something. If you're riding something you better dismount it before proceeding.";
close;
@@ -340,7 +340,7 @@ glast_01,240,366,5 script Memory of King Schmidtz CLEAR_NPC,{
mes "- and please try again. -";
close;
}
- if (hascashmount() || checkriding()) {
+ if (hascashmount() || checkmount()) {
mes " Please unequip your riding pet and try again!";
close;
}
diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt
index c128e1a3d..4bb929ac4 100644
--- a/npc/re/merchants/renters.txt
+++ b/npc/re/merchants/renters.txt
@@ -26,8 +26,7 @@ job3_rune01,88,62,5 script Dragon Breeder 8W_SOLDIER,{
mes "[Dragon Breeder]";
mes "Please learn how to ride a Dragon first.";
close;
- }
- else if (checkriding()) {
+ } else if (checkmount()) {
mes "[Dragon Breeder]";
mes "You already have a Dragon.";
close;
@@ -63,8 +62,7 @@ prontera,130,213,5 script Riding Creature Master 8W_SOLDIER,{
mes "[Riding Creature Master]";
mes "Please learn how to ride a Dragon first.";
close;
- }
- else if (checkriding()) {
+ } else if (checkmount()) {
mes "[Riding Creature Master]";
mes "You already have a Dragon.";
close;
@@ -86,12 +84,11 @@ prontera,130,213,5 script Riding Creature Master 8W_SOLDIER,{
next;
switch(select("Yes:No")) {
case 1:
- if(!getskilllv("KN_RIDING")) {
+ if(!getskilllv(KN_RIDING)) {
mes "[Riding Creature Master]";
mes "Please learn how to ride a Gryphon first.";
close;
- }
- else if (checkriding()) {
+ } else if (checkmount()) {
mes "[Riding Creature Master]";
mes "You already have a Gryphon.";
close;
@@ -100,7 +97,7 @@ prontera,130,213,5 script Riding Creature Master 8W_SOLDIER,{
mes "Please remove your cash mount.";
close;
}
- setriding;
+ setmount(MOUNT_PECO);
close;
case 2:
mes "[Riding Creature Master]";
@@ -119,7 +116,7 @@ prontera,125,208,5 script Peco Peco Remover 8W_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()) {
+ if (checkmount() == MOUNT_PECO) {
next;
mes "[Soldier]";
mes "You're riding a Peco Peco.";
@@ -127,7 +124,7 @@ prontera,125,208,5 script Peco Peco Remover 8W_SOLDIER,{
next;
switch(select("Yes:No")) {
case 1:
- setriding 0;
+ setmount(MOUNT_NONE);
mes "[Soldier]";
mes "Say, how does it feel to";
mes "step on the ground on your own";
@@ -170,8 +167,7 @@ prontera,125,208,5 script Peco Peco Remover 8W_SOLDIER,{
mes "I'm sorry, but you're already";
mes "riding a Magic Gear.";
close;
- }
- else if (!getskilllv(NC_MADOLICENCE)) {
+ } else if (!getskilllv(NC_MADOLICENCE)) {
mes "[Magic Gear Master]";
mes "Please learn the skill to get the Magic Gear License first.";
close;