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>

14 files changed, 17 insertions, 21 deletions

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!";
diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt
index 92b015bf4..e264bfdca 100644
--- a/npc/re/jobs/3-2/genetic.txt
+++ b/npc/re/jobs/3-2/genetic.txt
@@ -546,7 +546,7 @@ job3_gen01,25,58,3	script	Devries#gen	4_LGTSCIENCE,{
 		mes "<We hope that you yield good fruits in the future as well.>";
 		next;
 		mes "[Devries]";
-		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-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt
index 1435b23fd..a189d438d 100644
--- a/npc/re/jobs/3-2/minstrel.txt
+++ b/npc/re/jobs/3-2/minstrel.txt
@@ -1839,7 +1839,7 @@ prt_in,94,172,4	script	Karian#job_min3	4_M_MINSTREL1,{
 			mes "How did you degrade?";
 			close;
 		}
-		if (ismounting()) {
+		if (hascashmount()) {
 			mes "Please unequip your riding pet and try again!";
 			close;
 		}
diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt
index 82632ed36..bf569118d 100644
--- a/npc/re/jobs/3-2/royal_guard.txt
+++ b/npc/re/jobs/3-2/royal_guard.txt
@@ -340,7 +340,7 @@ glast_01,240,366,5	script	Memory of King Schmidtz	CLEAR_NPC,{
 		mes "- and please try again. -";
 		close;
 	}
-	if (ismounting() || checkriding()) {
+	if (hascashmount() || checkriding()) {
 		mes " Please unequip your riding pet and try again!";
 		close;
 	}
diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt
index 230d5b49c..d1c6ce75f 100644
--- a/npc/re/jobs/3-2/shadow_chaser.txt
+++ b/npc/re/jobs/3-2/shadow_chaser.txt
@@ -1358,7 +1358,7 @@ s_atelier,70,66,4	script	Dumk#sc13_lgh	4_M_SHADOWCHASER,{
 		mes "- You can't continue on in this quest because you are overweight. -";
 		close;
 	}
-	if (ismounting()) {
+	if (hascashmount()) {
 		mes "[Dumk]";
 		mes "Who is this guy? Why should he sit in front of me so high?";
 		mes "Although I do not know why you riding on it, but here is in door,";
diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt
index 05c568431..5108dbe49 100644
--- a/npc/re/jobs/3-2/sorcerer.txt
+++ b/npc/re/jobs/3-2/sorcerer.txt
@@ -351,7 +351,7 @@ gef_tower,113,161,5	script	Karacas	4_M_SAGE_A,{
 			mes "You must have the etiquette of your job now before you accept the new job! ";
 			close;
 		}
-		if (ismounting()) {
+		if (hascashmount()) {
 			mes "Good, before we get started...";
 			mes "Please unequip your riding pet~";
 			close;
diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt
index 8bbc45cfe..ce6aa152a 100644
--- a/npc/re/jobs/3-2/sura.txt
+++ b/npc/re/jobs/3-2/sura.txt
@@ -794,7 +794,7 @@ sword_1-1,223,167,2	script	Master#job_shu	4_M_SURA,{
 		mes "[Master]";
 		mes "I hope those days will not come but... I'll willingly be the ghost and kill all enemies.";
 		next;
-		if (ismounting()) {
+		if (hascashmount()) {
 			mes "[Master]";
 			mes "So... please get down from your riding pet!";
 			mes "It is a loss of etiquette on this situation.";
diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt
index 9ce297068..ae8cb109c 100644
--- a/npc/re/jobs/3-2/wanderer.txt
+++ b/npc/re/jobs/3-2/wanderer.txt
@@ -898,7 +898,7 @@ xmas,147,135,5	script	Dancer Kim#xmas	4_F_WANDERER,{
 			mes "- You need to empty your inventory if you want to continue the quest. -";
 			close;
 		}
-		if (ismounting()) {
+		if (hascashmount()) {
 			mes "[Dancer Kim]";
 			mes "Please get off of that creature you're riding on.";
 			mes "Then talk to me again.";
diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt
index 59894c678..781467e20 100644
--- a/npc/re/merchants/renters.txt
+++ b/npc/re/merchants/renters.txt
@@ -31,8 +31,7 @@ job3_rune01,88,62,5	script	Dragon Breeder	8W_SOLDIER,{
 				mes "[Dragon Breeder]";
 				mes "You already have a Dragon.";
 				close;
-			}
-			else if(ismounting()) {
+			} else if(hascashmount()) {
 				mes "[Dragon Breeder]";
 				mes "Please remove your cash mount.";
 				close;
@@ -69,8 +68,7 @@ prontera,130,213,5	script	Riding Creature Master	8W_SOLDIER,{
 				mes "[Riding Creature Master]";
 				mes "You already have a Dragon.";
 				close;
-			}
-			else if(ismounting()) {
+			} else if(hascashmount()) {
 				mes "[Riding Creature Master]";
 				mes "Please remove your cash mount.";
 				close;
@@ -97,8 +95,7 @@ prontera,130,213,5	script	Riding Creature Master	8W_SOLDIER,{
 				mes "[Riding Creature Master]";
 				mes "You already have a Gryphon.";
 				close;
-			}
-			else if(ismounting()) {
+			} else if(hascashmount()) {
 				mes "[Riding Creature Master]";
 				mes "Please remove your cash mount.";
 				close;
@@ -178,8 +175,7 @@ prontera,125,208,5	script	Peco Peco Remover	8W_SOLDIER,{
 				mes "[Magic Gear Master]";
 				mes "Please learn the skill to get the Magic Gear License first.";
 				close;
-			}
-			else if(ismounting()) {
+			} else if(hascashmount()) {
 				mes "[Magic Gear Master]";
 				mes "Please remove your cash mount.";
 				close;