From 3be853cff81fbdc590fc5538b60951f0179945f8 Mon Sep 17 00:00:00 2001 From: Haru Date: Wed, 22 Oct 2014 01:49:22 +0200 Subject: 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 --- npc/re/jobs/3-1/archbishop.txt | 2 +- npc/re/jobs/3-1/guillotine_cross.txt | 2 +- npc/re/jobs/3-1/mechanic.txt | 2 +- npc/re/jobs/3-1/ranger.txt | 2 +- npc/re/jobs/3-1/rune_knight.txt | 2 +- npc/re/jobs/3-1/warlock.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'npc/re/jobs/3-1') diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index 26782eb94..2daf9d7b5 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -1188,7 +1188,7 @@ OnTouch: mes "- and come for the challenge again. -"; close; } - if (ismounting()) { + if (hascashmount()) { mes "You are on a riding pet,"; mes "so you cannot change your job."; mes "Please unequip your riding pet and try again!"; diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index df51c3496..7bafa8562 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -3624,7 +3624,7 @@ job3_guil01,148,53,3 script Bercasell#3rdgc16 4_M_GUILLOTINE,{ switch(select("Yes, change my job.:I need to rethink it.")) { case 1: mes "[Bercasell]"; - if (ismounting()) { + if (hascashmount()) { mes "I cannot perform the job change."; mes "Please remove your mount and try again."; close; diff --git a/npc/re/jobs/3-1/mechanic.txt b/npc/re/jobs/3-1/mechanic.txt index e34fccc72..73e74983c 100644 --- a/npc/re/jobs/3-1/mechanic.txt +++ b/npc/re/jobs/3-1/mechanic.txt @@ -30,7 +30,7 @@ yuno,129,156,3 script Chainheart 4_M_DOCTOR,{ close; } else if (job__mechanic == 11) { if (BaseJob == Job_Blacksmith && BaseLevel > 98 && JobLevel > 49 && SkillPoint == 0) { - if (ismounting()) { + if (hascashmount()) { mes "You are on a riding pet,"; mes "so you cannot change your job."; mes "Please unequip your riding pet and try again!"; diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt index 0b52df91f..d8a10820f 100644 --- a/npc/re/jobs/3-1/ranger.txt +++ b/npc/re/jobs/3-1/ranger.txt @@ -1692,7 +1692,7 @@ job3_rang01,90,43,3 script Ranger Master#jr_29 4_M_REIDIN_KURS,{ close; } mes "[Ranger Master, Neveragain]"; - if (ismounting()) { + if (hascashmount()) { mes "You are on a riding pet,"; mes "so you cannot change your job."; mes "Please unequip your riding pet and try again!"; diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt index ffb395e07..ad8e4b8da 100644 --- a/npc/re/jobs/3-1/rune_knight.txt +++ b/npc/re/jobs/3-1/rune_knight.txt @@ -518,7 +518,7 @@ job3_rune01,80,60,3 script Rune Knight Captain 4_M_KNIGHT_SILVER,2,2,{ mes "It seems not enough?"; close; } - if (ismounting()) { + if (hascashmount()) { mes "[Captain Tigris]"; mes "Please unequip your mount and come back again."; close; diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt index 671340a03..973dc915f 100644 --- a/npc/re/jobs/3-1/warlock.txt +++ b/npc/re/jobs/3-1/warlock.txt @@ -672,7 +672,7 @@ spl_in02,80,108,5 script Guild Master#Warlock 4_F_FAIRY1,{ mes "Unless you like your current job, you should use all your skill points."; close; } - if (ismounting()) { + if (hascashmount()) { mes "You are on a riding pet,"; mes "so you cannot change your job."; mes "Please unequip your riding pet and try again!"; -- cgit v1.2.3-70-g09d2