From bcf7a77e17b98997dfde8a54bbb2d279236e966b Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Sat, 25 Oct 2014 02:28:09 +0200
Subject: Marked command jump_zero as deprecated.

- Added prefixed version for internal use.
- Note: The command will be completely removed after about a month.
  Custom, third party scripts will require updates, in case they were
  using this command. Please see the jump_zero documentation.

Signed-off-by: Haru <haru@dotalux.com>
---
 doc/script_commands.txt | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'doc')

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 651ce05e2..4edb596b6 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -974,14 +974,14 @@ Within executable script code, some lines can be labels:
 <label name>:
 
 Labels are points of reference in your script, which can be used to route 
-execution with 'goto', 'menu' and 'jump_zero' commands, invoked with 
-'doevent' and 'donpcevent' commands and are otherwise essential. A label's 
-name may not be longer than 22 characters. (23rd is the ':'.) There is 
-some confusion in the source about whether it's 22, 23 or 24 all over the 
-place, so keeping labels under 22 characters could be wise. It may only 
-contain alphanumeric characters and underscore. In addition to labels you 
-name yourself, there are also some special labels which the script engine 
-will start execution from if a special event happens:
+execution with 'goto' and 'menu' commands, invoked with 'doevent', 'donpcevent'
+and 'callsub' commands and are otherwise essential. A label's name may not be
+longer than 22 characters. (23rd is the ':'.) There is some confusion in the
+source about whether it's 22, 23 or 24 all over the place, so keeping labels
+under 22 characters could be wise. It may only contain alphanumeric characters
+and underscore. In addition to labels you name yourself, there are also some
+special labels which the script engine will start execution from if a special
+event happens:
 
 OnClock<hour><minute>:
 OnMinute<minute>:
@@ -2058,6 +2058,14 @@ else if (<condition 2>) {
 
 *jump_zero (<condition>),<label>;
 
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+    @ /!\ This command is deprecated @
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
+This command is deprecated and it should not be used in new scripts, as it is
+scheduled to be removed at any time on or after November 27th, 2014. Please
+consider using 'if', 'switch', 'for', 'while', as appropriate.
+
 This command works like an 'if'+'goto' combination in one go. (See 'if'). 
 If the condition is false (equal to zero) this command will immediately 
 jump to the specified label like in 'goto'.
-- 
cgit v1.2.3-70-g09d2


From 8bb00782225e2f04f61863832a6c27d512b551b5 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Sat, 25 Oct 2014 01:56:47 +0200
Subject: Marked the petheal command as deprecated

- The command should be replaced by petskillsupport in any custom
  scripts.
- Updated the custom SOHEE pet skill script to use petskillsupport with
  level 10 AL_HEAL.

Signed-off-by: Haru <haru@dotalux.com>
---
 db/pet_db.txt           |  2 +-
 doc/script_commands.txt | 13 ++++++++++---
 src/map/script.c        |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/db/pet_db.txt b/db/pet_db.txt
index 24e5e4cfd..5a3431b25 100644
--- a/db/pet_db.txt
+++ b/db/pet_db.txt
@@ -77,7 +77,7 @@
 1023,ORK_WARRIOR,Orc Warrior,635,9017,10009,537,80,60,20,100,250,20,500,150,1,0,600,200,300,{ petskillattack2 "NPC_PIERCINGATT",100,1,0,10; },{ bonus bAtk,10; bonus bDef,-3; }
 1026,MUNAK,Munak,636,9018,10008,537,80,60,20,100,250,20,500,150,0,0,300,750,300,{ petskillattack2 "NPC_DARKNESSATTACK",444,1,0,10; },{ bonus bInt,1; bonus bDef,1; }
 1110,DOKEBI,Dokebi,637,9019,10005,537,80,60,20,100,250,20,500,150,0,0,300,300,800,{ petskillattack "BS_HAMMERFALL",1,0,10; },{ bonus bMatkRate,1; bonus bAtkRate,-1; }
-1170,SOHEE,Sohee,638,9020,10016,537,80,60,10,100,250,20,500,150,0,0,100,1000,200,{ petheal 400,60,33,100; },{ bonus bStr,1; bonus bDex,1; }
+1170,SOHEE,Sohee,638,9020,10016,537,80,60,10,100,250,20,500,150,0,0,100,1000,200,{ petskillsupport AL_HEAL,10,60,33,100; },{ bonus bStr,1; bonus bDex,1; }
 1029,ISIS,Isis,639,9021,10006,537,80,60,10,100,250,20,500,150,0,0,650,450,150,{ petskillsupport "PR_MAGNIFICAT",2,60,50,50; },{ bonus bMatkRate,-1; bonus bAtkRate,1; }
 1155,PETIT,Petite,640,9022,10011,537,80,60,20,100,250,20,500,150,0,0,800,400,100,{ petskillattack2 "WZ_HEAVENDRIVE",500,1,0,10; },{ bonus bDef,-2; bonus bMdef,-2; bonus bAspdRate,1; }
 1109,DEVIRUCHI,Deviruchi,641,9023,10004,711,80,60,10,100,250,20,500,150,0,0,800,200,100,{ petskillbonus bAgiDexStr,6,20,40; },{ bonus bMatkRate,1; bonus bAtkRate,1; bonus bMaxHPrate,-3; bonus bMaxSPrate,-3; }
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 4edb596b6..596c8b61c 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -7971,17 +7971,24 @@ reached or when pet performance is activated.
 
 *petskillsupport <skill id>,<skill level>,<delay>,<percent hp>,<percent sp>;
 *petskillsupport "<skill name>",<skill level>,<delay>,<percent hp>,<percent sp>;
-*petheal <level>,<delay>,<percent hp>,<percent sp>;
 
 This will make the pet use a specified support skill on the owner whenever 
 the HP and SP are below the given percent values, with a specified delay 
 time between activations. The skill numbers are as per 
 'db/(pre-)re/skill_db.txt'.
-'petheal' works the same as 'petskillsupport' but has the skill ID 
-hard-coded to 28 (Heal). This command is deprecated.
 It's not quite certain who's stats will be used for the skills cast, the 
 character's or the pets. Probably, Skotlex can answer that question.
 
+*petheal <level>,<delay>,<percent hp>,<percent sp>;
+
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+    @ /!\ This command is deprecated @
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
+The petheal command is deprecated and it should not be used in new scripts, as
+it is scheduled to be removed after November 27th, 2014. Please consider using
+petskillsupport by specifying the AL_HEAL skill id instead.
+
 *petskillattack <skill id>,<skill level>,<rate>,<bonusrate>;
 *petskillattack "<skill name>",<skill level>,<rate>,<bonusrate>;
 *petskillattack2 <skill id>,<damage>,<number of attacks>,<rate>,<bonusrate>;
diff --git a/src/map/script.c b/src/map/script.c
index 056d56169..2c4defc25 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -19239,7 +19239,7 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(petskillbonus,"iiii"), // [Valaris]
 		BUILDIN_DEF(petrecovery,"ii"), // [Valaris]
 		BUILDIN_DEF(petloot,"i"), // [Valaris]
-		BUILDIN_DEF(petheal,"iiii"), // [Valaris]
+		BUILDIN_DEF_DEPRECATED(petheal,"iiii"), // Deprecated 2014-10-27 [Haru]
 		BUILDIN_DEF(petskillattack,"viii"), // [Skotlex]
 		BUILDIN_DEF(petskillattack2,"viiii"), // [Valaris]
 		BUILDIN_DEF(petskillsupport,"viiii"), // [Skotlex]
-- 
cgit v1.2.3-70-g09d2


From 3ad4a9d5061bf662d107dd69444555d6a15dbd17 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Tue, 21 Oct 2014 21:04:13 +0200
Subject: Marked command 'checkquest' as deprecated

Use questprogress instead.
- Note: The command will be completely removed after about a month.
  Custom, third party scripts will require updates, in case they were
  using this command.  It is recommended to use questprogress instead.
  Please see the checkquest documentation for more information.

Signed-off-by: Haru <haru@dotalux.com>
---
 doc/script_commands.txt | 8 +++++++-
 src/map/script.c        | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 596c8b61c..7e00e50dc 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -8437,7 +8437,13 @@ Add quest of the <ID2> to the the quest log, and the state is "active".
 
 *checkquest(<ID>{,PLAYTIME|HUNTING})
 
-DEPRECATED - use questprogress instead.
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+    @ /!\ This command is deprecated @
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
+This command is deprecated and it should not be used in new scripts, as it
+is scheduled to be removed on or after November 28th, 2014. Please consider
+using questprogress() instead. Or, in special cases, questactive().
 
 If no additional argument supplied, return the state of the quest: 
 	-1 = Quest not started (not in quest log)
diff --git a/src/map/script.c b/src/map/script.c
index 2c4defc25..26117530a 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -19479,7 +19479,7 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(setquest, "i"),
 		BUILDIN_DEF(erasequest, "i?"),
 		BUILDIN_DEF(completequest, "i?"),
-		BUILDIN_DEF(checkquest, "i?"),
+		BUILDIN_DEF_DEPRECATED(checkquest, "i?"), // Deprecated 2014-10-28 [Haru]
 		BUILDIN_DEF(questprogress, "i?"),
 		BUILDIN_DEF(questactive, "i"),
 		BUILDIN_DEF(changequest, "ii"),
-- 
cgit v1.2.3-70-g09d2


From b3aef69807e315f71109ee00755087303b5336df Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Wed, 22 Oct 2014 04:43:41 +0200
Subject: Deprecated checkmadogear and setmadogear commands

Replaced their use in scripts with checkmount and setmount,
respectively.

Signed-off-by: Haru <haru@dotalux.com>
---
 db/re/item_db.conf           |  6 +++---
 doc/script_commands.txt      |  8 +++++++-
 npc/custom/breeder.txt       | 19 ++++++++++++-------
 npc/other/turbo_track.txt    |  8 ++++----
 npc/re/merchants/renters.txt |  6 +++---
 src/map/script.c             |  4 ++--
 6 files changed, 31 insertions(+), 20 deletions(-)

(limited to 'doc')

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 42cd378f1..0f6d51c72 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -80155,7 +80155,7 @@ item_db: (
 	Job: 0x00000400
 	Upper: 63
 	BuyingStore: true
-	Script: <" if(checkmadogear()) itemheal rand(200,300),0; ">
+	Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(200,300),0; ">
 },
 {
 	Id: 12393
@@ -80167,7 +80167,7 @@ item_db: (
 	Job: 0x00000400
 	Upper: 63
 	BuyingStore: true
-	Script: <" if(checkmadogear()) itemheal rand(300,400),0; ">
+	Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(300,400),0; ">
 },
 {
 	Id: 12394
@@ -80179,7 +80179,7 @@ item_db: (
 	Job: 0x00000400
 	Upper: 63
 	BuyingStore: true
-	Script: <" if(checkmadogear()) itemheal rand(400,500),0; ">
+	Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(400,500),0; ">
 },
 {
 	Id: 12395
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 7e00e50dc..7c4a90003 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -3921,7 +3921,13 @@ riding a dragon and 0 if they aren't.
 *setmadogear {<flag>};
 *checkmadogear()
 
-[ DEPRECATED - Please use setmount / checkmount]
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+    @ /!\ This command is deprecated @
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
+This command is deprecated and it should not be used in new scripts, as it
+is scheduled to be removed on or after November 30th, 2014. Please consider
+using setmount and checkmount() instead.
 
 If <flag> is 0 this command will remove the mount from the character.
 Otherwise it gives the invoking character a Mado (if they are a Mechanic).
diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt
index af4a740b4..252511355 100644
--- a/npc/custom/breeder.txt
+++ b/npc/custom/breeder.txt
@@ -11,6 +11,8 @@
 //============================================================
 
 prontera,124,201,1	script	Universal Rental NPC	4_F_JOB_BLACKSMITH,{
+	/* TODO: This can be optimized with just setmount(), as it can
+		 auto-detect the proper mount for the class/skills. */
 	if (hascashmount()) {
 		message strcharinfo(0),"You must first remove your mount.";
 		end;
@@ -24,10 +26,13 @@ prontera,124,201,1	script	Universal Rental NPC	4_F_JOB_BLACKSMITH,{
 		}
 		else getitem 6124,1;
 	}
-	else if ((eaclass()&EAJ_THIRDMASK) == EAJ_MECHANIC && !checkcart() && getskilllv("MC_PUSHCART")) {
-		if (!checkmadogear() && getskilllv("NC_MADOLICENCE")) {
-			if(select(" ~ Cart: ~ Mado")==1) setcart;
-			else setmadogear;
+	else if ((eaclass()&EAJ_THIRDMASK) == EAJ_MECHANIC && !checkcart() && getskilllv(MC_PUSHCART)) {
+		if (!checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) {
+			if (select(" ~ Cart: ~ Mado") == 1) {
+				setcart;
+			} else {
+				setmount(MOUNT_MADO);
+			}
 			specialeffect2 EF_TEIHIT3;
 			close;
 		}
@@ -38,9 +43,9 @@ prontera,124,201,1	script	Universal Rental NPC	4_F_JOB_BLACKSMITH,{
 	else if (!checkriding() && getskilllv("KN_RIDING")) {
 		if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) setdragon;
 		else setriding;
-	}
-	else if (!checkmadogear() && getskilllv("NC_MADOLICENCE")) setmadogear;
-	else {
+	} else if (checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) {
+		setmount(MOUNT_MADO);
+	} else {
 		message strcharinfo(0),"You do not meet requirements to rent.";
 		end;
 	}
diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt
index 5cc10d624..28451f9bb 100644
--- a/npc/other/turbo_track.txt
+++ b/npc/other/turbo_track.txt
@@ -4648,7 +4648,7 @@ OnTouch:
 			setoption Option_Wugrider,0;
 			warp "turbo_room",100,65;
 		}
-	} else if ((Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) && checkmadogear()) {
+	} else if ((Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) && checkmount() == MOUNT_MADO) {
 		if (MaxWeight-Weight < 20000) {
 			mes "[Helper]";
 			mes "Magic Gears are prohibited";
@@ -4660,7 +4660,7 @@ OnTouch:
 			warp "alde_gld",183,199;
 			end;
 		} else {
-			setmadogear 0;
+			setmount(MOUNT_NONE);
 			warp "turbo_room",100,65;
 		}
 	} else
@@ -4730,7 +4730,7 @@ alde_gld,186,199,3	script	Turbo Track Guide#Entran	4_F_RACING,{
 		set .@mount$,"Magic Gear";
 		set .@skill,2255;
 		set .@skill$,"Magic Gear License";
-		set .@riding, checkmadogear();
+		set .@riding, checkmount() == MOUNT_MADO ? true : false; // FIXME
 		set .@i,3;
 	} else {
 		mes "Thank you for";
@@ -4783,7 +4783,7 @@ alde_gld,186,199,3	script	Turbo Track Guide#Entran	4_F_RACING,{
 				switch(.@i) {
 					case 1: setriding; break;
 					case 2: setdragon; break;
-					case 3: setmadogear; break;
+					case 3: setmount(MOUNT_MADO); break;
 				}
 				mes .@n$;
 				mes "Thank you for";
diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt
index 781467e20..e245968f0 100644
--- a/npc/re/merchants/renters.txt
+++ b/npc/re/merchants/renters.txt
@@ -165,13 +165,13 @@ prontera,125,208,5	script	Peco Peco Remover	8W_SOLDIER,{
 			mes "There you go!";
 			close;
 		case 2:
-			if (checkmadogear()) {
+			if (checkmount() == MOUNT_MADO) {
 				mes "[Magic Gear Master]";
 				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;
@@ -180,7 +180,7 @@ prontera,125,208,5	script	Peco Peco Remover	8W_SOLDIER,{
 				mes "Please remove your cash mount.";
 				close;
 			}
-			setmadogear;
+			setmount(MOUNT_MADO);
 			mes "[Magic Gear Master]";
 			mes "Have fun, and please come again!";
 			close;
diff --git a/src/map/script.c b/src/map/script.c
index 1885c3c2c..11fef0f07 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -19074,8 +19074,8 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(setmount,"?"),
 		BUILDIN_DEF(checkmount,""),
 		BUILDIN_DEF(checkwug,""),
-		BUILDIN_DEF(checkmadogear,""),
-		BUILDIN_DEF(setmadogear,"?"),
+		BUILDIN_DEF_DEPRECATED(checkmadogear,""), // Deprecated 2014-10-30 [Haru]
+		BUILDIN_DEF_DEPRECATED(setmadogear,"?"),  // Deprecated 2014-10-30 [Haru]
 		BUILDIN_DEF2(savepoint,"save","sii"),
 		BUILDIN_DEF(savepoint,"sii"),
 		BUILDIN_DEF(gettimetick,"i"),
-- 
cgit v1.2.3-70-g09d2


From a852bdd4c04fd3e6c08e950a320f0e78d61b3673 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Wed, 22 Oct 2014 04:54:29 +0200
Subject: Deprecated checkdragon and setdragon commands

Replaced their use in scripts with checkmount and setmount,
respectively.

Signed-off-by: Haru <haru@dotalux.com>
---
 doc/script_commands.txt      |  8 +++++++-
 npc/custom/breeder.txt       |  3 ++-
 npc/other/turbo_track.txt    |  6 +++---
 npc/re/merchants/renters.txt | 12 ++++++------
 src/map/script.c             |  4 ++--
 5 files changed, 20 insertions(+), 13 deletions(-)

(limited to 'doc')

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 7c4a90003..c4d313561 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -3898,7 +3898,13 @@ riding a bird and 0 if they aren't.
 *setdragon {<color>};
 *checkdragon()
 
-[ DEPRECATED - Please use setmount / checkmount]
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+    @ /!\ This command is deprecated @
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
+This command is deprecated and it should not be used in new scripts, as it
+is scheduled to be removed on or after November 30th, 2014. Please consider
+using setmount and checkmount() instead.
 
 The 'setdragon' function toggles mounting a dragon for the invoking 
 character. It will return 1 if successful, 0 otherwise.
diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt
index 252511355..cb43091d3 100644
--- a/npc/custom/breeder.txt
+++ b/npc/custom/breeder.txt
@@ -41,7 +41,8 @@ prontera,124,201,1	script	Universal Rental NPC	4_F_JOB_BLACKSMITH,{
 	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) setdragon;
+		if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT)
+			setmount(MOUNT_DRAGON);
 		else setriding;
 	} else if (checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) {
 		setmount(MOUNT_MADO);
diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt
index 28451f9bb..ded537086 100644
--- a/npc/other/turbo_track.txt
+++ b/npc/other/turbo_track.txt
@@ -4629,7 +4629,7 @@ OnTouch:
 				getitem 7310,1; //Free_Peco_Ticket
 			} else {
 				if (BaseJob == Job_Knight)
-					setdragon 0;
+					setmount(MOUNT_NONE);
 				else
 					setriding 0;
 			}
@@ -4716,7 +4716,7 @@ alde_gld,186,199,3	script	Turbo Track Guide#Entran	4_F_RACING,{
 				set .@mount$,"Dragon";
 				set .@skill,63;
 				set .@skill$,"Dragon Training";
-				set .@riding, checkdragon();
+				set .@riding, checkmount() == MOUNT_DRAGON ? true : false; // FIXME
 				set .@i,2;
 			} else {
 				set .@mount$,"Gryphon";
@@ -4782,7 +4782,7 @@ alde_gld,186,199,3	script	Turbo Track Guide#Entran	4_F_RACING,{
 				}
 				switch(.@i) {
 					case 1: setriding; break;
-					case 2: setdragon; break;
+					case 2: setmount(MOUNT_DRAGON); break;
 					case 3: setmount(MOUNT_MADO); break;
 				}
 				mes .@n$;
diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt
index e245968f0..c128e1a3d 100644
--- a/npc/re/merchants/renters.txt
+++ b/npc/re/merchants/renters.txt
@@ -21,8 +21,8 @@ job3_rune01,88,62,5	script	Dragon Breeder	8W_SOLDIER,{
 		next;
 		switch(select("Yes:No")) {
 		case 1:
-			//if (!getskilllv("RK_DRAGONTRAINING")) {
-			if (!getskilllv("KN_RIDING")) {
+			//if (!getskilllv(RK_DRAGONTRAINING)) {
+			if (!getskilllv(KN_RIDING)) {
 				mes "[Dragon Breeder]";
 				mes "Please learn how to ride a Dragon first.";
 				close;
@@ -36,7 +36,7 @@ job3_rune01,88,62,5	script	Dragon Breeder	8W_SOLDIER,{
 				mes "Please remove your cash mount.";
 				close;
 			}
-			setdragon;
+			setmount(MOUNT_DRAGON);
 			close;
 		case 2:
 			mes "[Dragon Breeder]";
@@ -58,8 +58,8 @@ prontera,130,213,5	script	Riding Creature Master	8W_SOLDIER,{
 		next;
 		switch(select("Yes:No")) {
 		case 1:
-			//if (!getskilllv("RK_DRAGONTRAINING")) {
-			if (!getskilllv("KN_RIDING")) {
+			//if (!getskilllv(RK_DRAGONTRAINING)) {
+			if (!getskilllv(KN_RIDING)) {
 				mes "[Riding Creature Master]";
 				mes "Please learn how to ride a Dragon first.";
 				close;
@@ -73,7 +73,7 @@ prontera,130,213,5	script	Riding Creature Master	8W_SOLDIER,{
 				mes "Please remove your cash mount.";
 				close;
 			}
-			setdragon;
+			setmount(MOUNT_DRAGON);
 			close;
 		case 2:
 			mes "[Riding Creature Master]";
diff --git a/src/map/script.c b/src/map/script.c
index 11fef0f07..547bb1671 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -19396,8 +19396,8 @@ void script_parse_builtin(void) {
 		 * 3rd-related
 		 **/
 		BUILDIN_DEF(makerune,"i"),
-		BUILDIN_DEF(checkdragon,""),//[Ind]
-		BUILDIN_DEF(setdragon,"?"),//[Ind]
+		BUILDIN_DEF_DEPRECATED(checkdragon,""), // Deprecated 2014-10-30 [Haru]
+		BUILDIN_DEF_DEPRECATED(setdragon,"?"), // Deprecated 2014-10-30 [Haru]
 		BUILDIN_DEF(hascashmount,""),//[Ind]
 		BUILDIN_DEF(setcashmount,""),//[Ind]
 		BUILDIN_DEF(checkre,"i"),
-- 
cgit v1.2.3-70-g09d2


From c6f102ef8f7a08903617e70135fca5ccfe11b75a Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Wed, 22 Oct 2014 05:20:14 +0200
Subject: Deprecated checkriding and setriding commands

Replaced their use in scripts with checkmount and setmount,
respectively.

Signed-off-by: Haru <haru@dotalux.com>
---
 doc/script_commands.txt            |  8 ++++-
 npc/custom/breeder.txt             | 33 +++++++++---------
 npc/custom/etc/penal_servitude.txt |  4 +--
 npc/custom/jobmaster.txt           |  4 +--
 npc/events/event_skill_reset.txt   |  6 ++--
 npc/events/halloween_2008.txt      |  2 +-
 npc/jobs/valkyrie.txt              |  2 +-
 npc/merchants/renters.txt          | 12 +++----
 npc/other/CashShop_Functions.txt   |  4 +--
 npc/other/turbo_track.txt          | 71 ++++++++++++++------------------------
 npc/quests/quests_moscovia.txt     |  4 +--
 npc/re/jobs/3-1/rune_knight.txt    |  2 +-
 npc/re/jobs/3-2/royal_guard.txt    |  4 +--
 npc/re/merchants/renters.txt       | 20 +++++------
 src/map/script.c                   |  4 +--
 15 files changed, 81 insertions(+), 99 deletions(-)

(limited to 'doc')

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index c4d313561..9d2317942 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -3879,7 +3879,13 @@ regardless of color.
 *setriding {<flag>};
 *checkriding()
 
-[ DEPRECATED - Please use setmount / checkmount]
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+    @ /!\ This command is deprecated @
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
+This command is deprecated and it should not be used in new scripts, as it
+is scheduled to be removed on or after November 30th, 2014. Please consider
+using setmount and checkmount() instead.
 
 If <flag> is 0 this command will remove the mount from the character.
 Otherwise it gives the invoking character a PecoPeco (if they are a Knight 
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;
 	}
diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt
index 15d781bff..ab8805736 100644
--- a/npc/events/event_skill_reset.txt
+++ b/npc/events/event_skill_reset.txt
@@ -30,7 +30,7 @@ yuno,138,187,4	script	Hypnotist Teacher	4_F_TELEPORTER,{
 		mes "Please come again soon!";
 		close;
 	}
-	if(Weight || checkfalcon() || checkcart() || checkriding()) {
+	if(Weight || checkfalcon() || checkcart() || checkmount()) {
 		mes "Would you like to reset skills?";
 		mes "I'm sorry, but...";
 		next;
@@ -43,8 +43,8 @@ yuno,138,187,4	script	Hypnotist Teacher	4_F_TELEPORTER,{
 			mes "Please, drop your cart and we'll continue.";
 		else if(checkfalcon())
 			mes "Please, free your Falcon and we'll continue.";
-		else if(checkriding())
-			mes "Please, free your PecoPeco and we'll continue.";
+		else if(checkmount())
+			mes "Please, free your mount and we'll continue.";
 		next;
 		mes @npcname$;
 		mes "Come back soon!";
diff --git a/npc/events/halloween_2008.txt b/npc/events/halloween_2008.txt
index aa2780716..9b80eb798 100644
--- a/npc/events/halloween_2008.txt
+++ b/npc/events/halloween_2008.txt
@@ -134,7 +134,7 @@ S_Participate:
 	Hallow08Kill = 1;
 	@Hallow08Warp = rand(1,3);
 	percentheal -98,0;
-	setriding 0;
+	setmount(MOUNT_NONE);
 	setcart 0;
 	warp "evt_zombie",155,246;
 	end;
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index ad6d5f795..651fd2b65 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -64,7 +64,7 @@ valkyrie,48,86,4	script	Valkyrie#	4_F_VALKYRIE,{
 		mes "begin an entirely new life.";
 		mes "Honor to the warriors!";
 		next;
-		if (Weight > 0 || Zeny > 0 || checkcart() != 0 || checkfalcon() != 0 || checkriding() != 0) {
+		if (Weight > 0 || Zeny > 0 || checkcart() || checkfalcon() || checkmount()) {
 			mes "[Valkyrie]";
 			mes "There are a few things you must";
 			mes "do before we start. You must";
diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt
index cac757f85..255db3e62 100644
--- a/npc/merchants/renters.txt
+++ b/npc/merchants/renters.txt
@@ -48,7 +48,7 @@ prontera,55,350,5	script	Peco Peco Breeder#knt	8W_SOLDIER,{
 				mes "bankrupt?";
 				close;
 			}
-			else if(getskilllv("KN_RIDING") == 0) {
+			else if(getskilllv(KN_RIDING) == 0) {
 				mes "[Peco Peco Breeder]";
 				mes "I'm sorry, but you're";
 				mes "not eligible for this";
@@ -56,7 +56,7 @@ prontera,55,350,5	script	Peco Peco Breeder#knt	8W_SOLDIER,{
 				mes "the Peco Peco Ride skill first.";
 				close;
 			}
-			else if(checkriding()) {
+			else if(checkmount()) {
 				mes "[Peco Peco Breeder]";
 				mes "You're already";
 				mes "mounted on a";
@@ -68,7 +68,7 @@ prontera,55,350,5	script	Peco Peco Breeder#knt	8W_SOLDIER,{
 				close;
 			}
 			Zeny -= .@price;
-			setriding;
+			setmount(MOUNT_PECO);
 			close;
 		case 2:
 			mes "[Peco Peco Breeder]";
@@ -112,14 +112,14 @@ prontera,232,318,3	script	Peco Peco Breeder#cru	8W_SOLDIER,{
 				mes "bring "+.@price+" zeny...";
 				close;
 			}
-			else if(getskilllv("KN_RIDING") == 0) {
+			else if(getskilllv(KN_RIDING) == 0) {
 				mes "[Peco Peco Breeder]";
 				mes "You must first learn";
 				mes "to ride a PecoPeco before";
 				mes "I can rent one to you.";
 				close;
 			}
-			else if(checkriding()) {
+			else if(checkmount()) {
 				mes "[Peco Peco Breeder]";
 				mes "You are already";
 				mes "mounted on a Peco Peco.";
@@ -130,7 +130,7 @@ prontera,232,318,3	script	Peco Peco Breeder#cru	8W_SOLDIER,{
 				close;
 			}
 			Zeny -= .@price;
-			setriding;
+			setmount(MOUNT_NONE);
 			close;
 		case 2:
 			mes "[PecoPeco Breeder]";
diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt
index 1a2627d02..39bfa3c97 100644
--- a/npc/other/CashShop_Functions.txt
+++ b/npc/other/CashShop_Functions.txt
@@ -59,10 +59,10 @@ function	script	F_CashPartyCall	{
 // - Reset players skills. Weight must be 0, options must be off.
 // - No arguments.
 function	script	F_CashReset	{
-	if (Class != Job_Novice && Weight == 0 && !checkriding() && !checkfalcon() && !checkcart() && !hascashmount()) {
+	if (Class != Job_Novice && Weight == 0 && !checkmount() && !checkfalcon() && !checkcart() && !hascashmount()) {
 		resetskill;
 		sc_end SC_ALL;
-		if (countitem(12213)) delitem 12213,1;
+		if (countitem(Neuralizer)) delitem Neuralizer,1;
 	}
 	return;
 }
diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt
index ded537086..bb38039a4 100644
--- a/npc/other/turbo_track.txt
+++ b/npc/other/turbo_track.txt
@@ -4600,10 +4600,10 @@ OnTouch:
 		mes "things using the Kafra Service.^000000";
 		close;
 	}
-	if ((BaseJob == Job_Knight || BaseJob == Job_Crusader) && checkriding()) {
+	if ((BaseJob == Job_Knight || BaseJob == Job_Crusader) && checkmount()) {
 		if (MaxWeight-Weight < 20000) {
 			if (!(eaclass()&EAJL_THIRD)) {
-				set .@mount$,(BaseJob == Job_Knight)?"Peco Peco":"Grand Peco";
+				.@mount$ = (BaseJob == Job_Knight) ? "Peco Peco" : "Grand Peco";
 				mes "[Helper]";
 				mes .@mount$+"s are prohibited";
 				mes "in the Turbo Track Arena.";
@@ -4612,7 +4612,7 @@ OnTouch:
 				mes "a Free Ticket for Peco Ride";
 				mes "for retrieving your "+.@mount$+".";
 			} else {
-				set .@mount$,(BaseJob == Job_Knight)?"Dragon":"Gryphon";
+				.@mount$ = (BaseJob == Job_Knight) ? "Dragon" : "Gryphon";
 				mes "[Helper]";
 				mes .@mount$+"s are prohibited";
 				mes "in the Turbo Track Arena.";
@@ -4625,14 +4625,9 @@ OnTouch:
 			end;
 		} else {
 			if (!(eaclass()&EAJL_THIRD)) {
-				setriding 0;
-				getitem 7310,1; //Free_Peco_Ticket
-			} else {
-				if (BaseJob == Job_Knight)
-					setmount(MOUNT_NONE);
-				else
-					setriding 0;
+				getitem Free_Peco_Ticket, 1;
 			}
+			setmount(MOUNT_NONE);
 			warp "turbo_room",100,65;
 		}
 	} else if ((Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) && checkoption(Option_Wugrider)) {
@@ -4648,7 +4643,7 @@ OnTouch:
 			setoption Option_Wugrider,0;
 			warp "turbo_room",100,65;
 		}
-	} else if ((Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) && checkmount() == MOUNT_MADO) {
+	} else if ((Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) && checkmount()) {
 		if (MaxWeight-Weight < 20000) {
 			mes "[Helper]";
 			mes "Magic Gears are prohibited";
@@ -4689,7 +4684,7 @@ alde_gld,186,199,3	script	Turbo Track Guide#Entran	4_F_RACING,{
 }
 
 -	script	::MountManager_turbo	-1,{
-	set .@n$, "["+strnpcinfo(1)+"]";
+	.@n$ = "["+strnpcinfo(1)+"]";
 	mes .@n$;
 	if (hascashmount()) {
 		mes "Please get off of that creature you're riding on.";
@@ -4699,39 +4694,27 @@ alde_gld,186,199,3	script	Turbo Track Guide#Entran	4_F_RACING,{
 	if (BaseJob == Job_Knight || BaseJob == Job_Crusader) {
 		if (!(eaclass()&EAJL_THIRD)) {
 			if (BaseJob == Job_Knight) {
-				set .@zeny,2500;
-				set .@zeny$,"2,500";
-				set .@mount$,"Peco Peco";
+				.@zeny = 2500;
+				.@zeny$ = "2,500";
+				.@mount$ = "Peco Peco";
 			} else {
-				set .@zeny,3500;
-				set .@zeny$,"3,500";
-				set .@mount$,"Grand Peco";
+				.@zeny = 3500;
+				.@zeny$ = "3,500";
+				.@mount$ = "Grand Peco";
 			}
-			set .@skill,63;
-			set .@skill$,"Peco Peco Ride";
-			set .@riding, checkriding();
-			set .@i,1;
 		} else {
 			if (BaseJob == Job_Knight) {
-				set .@mount$,"Dragon";
-				set .@skill,63;
-				set .@skill$,"Dragon Training";
-				set .@riding, checkmount() == MOUNT_DRAGON ? true : false; // FIXME
-				set .@i,2;
+				.@mount$ = "Dragon";
 			} else {
-				set .@mount$,"Gryphon";
-				set .@skill,63;
-				set .@skill$,"Peco Peco Ride";
-				set .@riding, checkriding();
-				set .@i,1;
+				.@mount$ = "Gryphon";
 			}
 		}
+		.@skill = KN_RIDING;
+		.@skill$ = "Peco Peco Ride";
 	} else if (Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) {
-		set .@mount$,"Magic Gear";
-		set .@skill,2255;
-		set .@skill$,"Magic Gear License";
-		set .@riding, checkmount() == MOUNT_MADO ? true : false; // FIXME
-		set .@i,3;
+		.@mount$ = "Magic Gear";
+		.@skill = NC_MADOLICENCE;
+		.@skill$ = "Magic Gear License";
 	} else {
 		mes "Thank you for";
 		mes "visiting Al De Baran's";
@@ -4757,7 +4740,7 @@ alde_gld,186,199,3	script	Turbo Track Guide#Entran	4_F_RACING,{
 			mes "the "+.@skill$+" skill first.";
 			close;
 		} else {
-			if (.@riding) {
+			if (checkmount()) {
 				mes .@n$;
 				mes "You're already";
 				mes "mounted on a";
@@ -4766,7 +4749,7 @@ alde_gld,186,199,3	script	Turbo Track Guide#Entran	4_F_RACING,{
 				close;
 			} else {
 				if (.@zeny) {
-					if (countitem(7310) < 1 && Zeny < .@zeny) {
+					if (countitem(Free_Peco_Ticket) < 1 && Zeny < .@zeny) {
 						mes .@n$;
 						mes "I'm sorry, but you";
 						mes "don't have a Free Ticket";
@@ -4774,17 +4757,13 @@ alde_gld,186,199,3	script	Turbo Track Guide#Entran	4_F_RACING,{
 						mes "to use the Peco rental service.";
 						close;
 					} else {
-						if (countitem(7310) > 0)
-							delitem 7310,1; //Free_Peco_Ticket
+						if (countitem(Free_Peco_Ticket) > 0)
+							delitem Free_Peco_Ticket, 1;
 						else
 							Zeny -= .@zeny;
 					}
 				}
-				switch(.@i) {
-					case 1: setriding; break;
-					case 2: setmount(MOUNT_DRAGON); break;
-					case 3: setmount(MOUNT_MADO); break;
-				}
+				setmount;
 				mes .@n$;
 				mes "Thank you for";
 				mes "your patronage~";
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index 685010f1a..9303eda67 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -6716,7 +6716,7 @@ mosk_dun01,169,162,0	script	Mysterious Stone#rus02	HIDDEN_NPC,{
 				warp "mosk_dun01",190,47;
 				end;
 			case 2:
-				if (!checkriding()) {
+				if (checkmount() != MOUNT_PECO) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...What about the left...?";
 					next;
@@ -6744,7 +6744,7 @@ mosk_dun01,169,162,0	script	Mysterious Stone#rus02	HIDDEN_NPC,{
 				mes "- an unknown force and tries -";
 				mes "- to run away!! -";
 				sc_start SC_CURSE,60000,0;
-				setriding 0;
+				setmount(MOUNT_NONE);
 				close2;
 				warp "mosk_dun01",190,47;
 				end;
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;
diff --git a/src/map/script.c b/src/map/script.c
index 547bb1671..05321561e 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -19069,8 +19069,8 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(checkcart,""),
 		BUILDIN_DEF(setfalcon,"?"),
 		BUILDIN_DEF(checkfalcon,""),
-		BUILDIN_DEF(setriding,"?"),
-		BUILDIN_DEF(checkriding,""),
+		BUILDIN_DEF_DEPRECATED(setriding,"?"), // Deprecated 2014-10-30 [Haru]
+		BUILDIN_DEF_DEPRECATED(checkriding,""), // Deprecated 2014-10-30 [Haru]
 		BUILDIN_DEF(setmount,"?"),
 		BUILDIN_DEF(checkmount,""),
 		BUILDIN_DEF(checkwug,""),
-- 
cgit v1.2.3-70-g09d2


From 6b20c5b6988c889df35b890d93c338f8b87fa430 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Sun, 2 Nov 2014 01:30:33 +0100
Subject: Added min() and max() script commands

- Special thanks to Streusel, Xgear

Signed-off-by: Haru <haru@dotalux.com>
---
 doc/script_commands.txt | 12 ++++++++++++
 npc/dev/test.txt        |  4 ++++
 src/map/script.c        | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)

(limited to 'doc')

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 9d2317942..4e28b5b71 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -7586,6 +7586,18 @@ Example:
 
 ---------------------------------------
 
+*min(<number>{,<number>...<number>})
+*max(<number>{,<number>...<number>})
+
+Returns the smallest (or biggest) from the set of given numbers.
+
+Example:
+	.@minimum = min(1, -6, -2, 8, 2); // .@minimum will be equal to -6
+	.@maximum = max(0, 5, 10, 4); // .@maximum will be equal to 10
+	.@level = min(BaseLevel, 70); // .@level will be the character's base level, capped to 70
+
+---------------------------------------
+
 *md5("<string>")
 
 Returns the md5 checksum of a number or string.
diff --git a/npc/dev/test.txt b/npc/dev/test.txt
index f9e4fc410..7b498e922 100644
--- a/npc/dev/test.txt
+++ b/npc/dev/test.txt
@@ -565,6 +565,10 @@ function	script	HerculesSelfTestHelper	{
 	callsub(OnCheck, "array shrink", .@x[1], 0);
 	callsub(OnCheck, "array shrink and getarraysize", getarraysize(.@x), 0);
 
+	// min and max
+	callsub(OnCheck, "min()", min(5, -10, 8, 3, -2, 1000), -10);
+	callsub(OnCheck, "max()", max(5, -10, 8, 3, -2, 1000), 1000);
+
 
 	// Constants
 	callsub(OnCheck, "'true' constant", true, 1);
diff --git a/src/map/script.c b/src/map/script.c
index 1516a0234..006f275eb 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -14835,6 +14835,36 @@ BUILDIN(distance)
 
 // <--- [zBuffer] List of mathematics commands
 
+BUILDIN(min)
+{
+	int i, min;
+
+	min = script_getnum(st, 2);
+	for (i = 3; script_hasdata(st, i); i++) {
+		int next = script_getnum(st, i);
+		if (next < min)
+			min = next;
+	}
+	script_pushint(st, min);
+
+	return true;
+}
+
+BUILDIN(max)
+{
+	int i, max;
+
+	max = script_getnum(st, 2);
+	for (i = 3; script_hasdata(st, i); i++) {
+		int next = script_getnum(st, i);
+		if (next > max)
+			max = next;
+	}
+	script_pushint(st, max);
+
+	return true;
+}
+
 BUILDIN(md5)
 {
 	const char *tmpstr;
@@ -19283,6 +19313,8 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(pow,"ii"),
 		BUILDIN_DEF(distance,"iiii"),
 		// <--- [zBuffer] List of mathematics commands
+		BUILDIN_DEF(min, "i*"),
+		BUILDIN_DEF(max, "i*"),
 		BUILDIN_DEF(md5,"s"),
 		// [zBuffer] List of dynamic var commands --->
 		BUILDIN_DEF(getd,"s"),
-- 
cgit v1.2.3-70-g09d2


From e914ab9088250b64c81953aa4e35435aabb26055 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Sun, 2 Nov 2014 02:46:55 +0100
Subject: Marked command 'save' as deprecated.

- Note: The command will be completely removed after about a month.
  Custom, third party scripts will require updates, in case they were
  using this command. Please see the 'save' documentation.

Signed-off-by: Haru <haru@dotalux.com>
---
 doc/script_commands.txt | 11 ++++++++++-
 src/map/script.c        |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 4e28b5b71..1c34a09b5 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -4275,7 +4275,6 @@ character is not married, or if there's no invoking character (no RID).
 ---------------------------------------
 
 *savepoint "<map name>",<x>,<y>;
-*save "<map name>",<x>,<y>;
 
 This command saves where the invoking character will return to upon 
 'return to save point', if dead or in some other cases. The two versions 
@@ -4285,6 +4284,16 @@ character respawn where no teleportation is otherwise possible.
 
 	savepoint "place",350,75;
 
+*save "<map name>",<x>,<y>;
+
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+    @ /!\ This command is deprecated @
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
+This command is deprecated and it should not be used in new scripts, as it
+is scheduled to be removed on or after December 2nd, 2014. Please consider
+using savepoint() instead.
+
 ---------------------------------------
 
 *heal <hp>,<sp>;
diff --git a/src/map/script.c b/src/map/script.c
index 006f275eb..35fa6a0a8 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -19114,7 +19114,7 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(checkwug,""),
 		BUILDIN_DEF_DEPRECATED(checkmadogear,""), // Deprecated 2014-10-30 [Haru]
 		BUILDIN_DEF_DEPRECATED(setmadogear,"?"),  // Deprecated 2014-10-30 [Haru]
-		BUILDIN_DEF2(savepoint,"save","sii"),
+		BUILDIN_DEF2_DEPRECATED(savepoint,"save","sii"), // Deprecated 2014-11-02 [Haru]
 		BUILDIN_DEF(savepoint,"sii"),
 		BUILDIN_DEF(gettimetick,"i"),
 		BUILDIN_DEF(gettime,"i"),
-- 
cgit v1.2.3-70-g09d2


From d22e937e62b3443b74051ecc47ccc3137f9ff5f5 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Sun, 2 Nov 2014 03:09:35 +0100
Subject: Marked command 'cmdothernpc' as deprecated.

- Note: The command will be completely removed after about a month.
  Custom, third party scripts will require updates, in case they were
  using this command. Please see the 'cmdothernpc' documentation.

Signed-off-by: Haru <haru@dotalux.com>
---
 doc/script_commands.txt | 8 ++++++++
 src/map/script.c        | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 1c34a09b5..589db2bf5 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -6276,6 +6276,14 @@ A debug message also shows on the console when no events are triggered.
 
 *cmdothernpc "<npc name>","<command>";
 
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+    @ /!\ This command is deprecated @
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
+This command is deprecated and it should not be used in new scripts, as it
+is scheduled to be removed on or after December 2nd, 2014. Please consider
+using donpcevent() instead.
+
 This is simply "donpcevent <npc name>::OnCommand<command>".
 It is an approximation of official server script language's 'cmdothernpc'.
 
diff --git a/src/map/script.c b/src/map/script.c
index 35fa6a0a8..6da43b87d 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -19132,7 +19132,7 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(clone,"siisi????"),
 		BUILDIN_DEF(doevent,"s"),
 		BUILDIN_DEF(donpcevent,"s"),
-		BUILDIN_DEF(cmdothernpc,"ss"),
+		BUILDIN_DEF_DEPRECATED(cmdothernpc,"ss"), // Deprecated 2014-11-02 [Haru]
 		BUILDIN_DEF(addtimer,"is"),
 		BUILDIN_DEF(deltimer,"s"),
 		BUILDIN_DEF(addtimercount,"si"),
-- 
cgit v1.2.3-70-g09d2


From 134a4bae206a9c14f7da86095b5555b91ace3035 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Sun, 2 Nov 2014 03:11:59 +0100
Subject: Marked commands 'enablearena' and 'disablearena' as deprecated.

- Note: The commands will be completely removed after about a month.
  Custom, third party scripts will require updates, in case they were
  using these commands. Please see the commands documentation.

Signed-off-by: Haru <haru@dotalux.com>
---
 doc/script_commands.txt | 13 +++++++++++--
 src/map/script.c        |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 589db2bf5..ec8274716 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -6759,8 +6759,6 @@ It's not clear what happens to a waiting room if the NPC is disabled with
 
 *enablewaitingroomevent {"<NPC object name>"};
 *disablewaitingroomevent {"<NPC object name>"};
-*enablearena;
-*disablearena;
 
 This will enable and disable triggering the waiting room event (see 
 'waitingroom') respectively. Optionally giving an NPC object name will do 
@@ -6774,6 +6772,17 @@ Normally, whenever a waiting room was created to make sure that only one
 character is, for example, trying to pass a job quest trial, and no other 
 characters are present in the room to mess up the script.
 
+*enablearena;
+*disablearena;
+
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+    @ /!\ This command is deprecated @
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
+This command is deprecated and it should not be used in new scripts, as it
+is scheduled to be removed on or after December 2nd, 2014. Please consider
+using enablewaitingroomevent and disablewaitingroomevent instead.
+
 The 'enablearena'/'disablearena' commands are just aliases with no 
 parameter. These are supposedly left here for compatibility with official 
 server scripts, but no Hercules script uses these at the moment.
diff --git a/src/map/script.c b/src/map/script.c
index 6da43b87d..5e368e0ad 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -19176,8 +19176,8 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF2(waitingroomkickall,"kickwaitingroomall","?"),
 		BUILDIN_DEF(enablewaitingroomevent,"?"),
 		BUILDIN_DEF(disablewaitingroomevent,"?"),
-		BUILDIN_DEF2(enablewaitingroomevent,"enablearena",""),   // Added by RoVeRT
-		BUILDIN_DEF2(disablewaitingroomevent,"disablearena",""), // Added by RoVeRT
+		BUILDIN_DEF2_DEPRECATED(enablewaitingroomevent,"enablearena",""),   // Deprecated 2014-11-02 [Haru]
+		BUILDIN_DEF2_DEPRECATED(disablewaitingroomevent,"disablearena",""), // Deprecated 2014-11-02 [Haru]
 		BUILDIN_DEF(getwaitingroomstate,"i?"),
 		BUILDIN_DEF(warpwaitingpc,"sii?"),
 		BUILDIN_DEF(attachrid,"i"),
-- 
cgit v1.2.3-70-g09d2