summaryrefslogtreecommitdiff
path: root/npc/custom
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-10-22 01:49:22 +0200
committerHaru <haru@dotalux.com>2014-10-24 00:59:21 +0200
commit3be853cff81fbdc590fc5538b60951f0179945f8 (patch)
tree9beef2a35af9e9d13d02779a55e6939535c47b4d /npc/custom
parent138352558b04de199139d5f8124d6e3c24df8008 (diff)
downloadhercules-3be853cff81fbdc590fc5538b60951f0179945f8.tar.gz
hercules-3be853cff81fbdc590fc5538b60951f0179945f8.tar.bz2
hercules-3be853cff81fbdc590fc5538b60951f0179945f8.tar.xz
hercules-3be853cff81fbdc590fc5538b60951f0179945f8.zip
Renamed ismounting, setmounting, @mount2
To avoid ambiguity: - The script command ismounting is now hascashmount - The script command setmounting is now setcashmount - The at-command @mount2 is now @cashmount Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/custom')
-rw-r--r--npc/custom/breeder.txt2
-rw-r--r--npc/custom/jobmaster.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt
index 0222f5b3a..af4a740b4 100644
--- a/npc/custom/breeder.txt
+++ b/npc/custom/breeder.txt
@@ -11,7 +11,7 @@
//============================================================
prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{
- if (ismounting()) {
+ if (hascashmount()) {
message strcharinfo(0),"You must first remove your mount.";
end;
}
diff --git a/npc/custom/jobmaster.txt b/npc/custom/jobmaster.txt
index 88a1897da..e476ce2df 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() || ismounting()) {
- mes "Please remove your "+((checkfalcon())?"falcon":"")+((checkcart())?"cart":"")+((checkriding())?"Peco":"")+((ismounting())?"mount":"")
+ if (checkfalcon() || checkcart() || checkriding() || hascashmount()) {
+ mes "Please remove your "+((checkfalcon())?"falcon":"")+((checkcart())?"cart":"")+((checkriding())?"Peco":"")+((hascashmount())?"mount":"")
+" before proceeding.";
close;
}