summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-10-22 04:54:29 +0200
committerHaru <haru@dotalux.com>2014-10-30 01:22:52 +0100
commita852bdd4c04fd3e6c08e950a320f0e78d61b3673 (patch)
treef958404213e2b92d82d5f40e25d04ea15f0863aa
parentb3aef69807e315f71109ee00755087303b5336df (diff)
downloadhercules-a852bdd4c04fd3e6c08e950a320f0e78d61b3673.tar.gz
hercules-a852bdd4c04fd3e6c08e950a320f0e78d61b3673.tar.bz2
hercules-a852bdd4c04fd3e6c08e950a320f0e78d61b3673.tar.xz
hercules-a852bdd4c04fd3e6c08e950a320f0e78d61b3673.zip
Deprecated checkdragon and setdragon commands
Replaced their use in scripts with checkmount and setmount, respectively. Signed-off-by: Haru <haru@dotalux.com>
-rw-r--r--doc/script_commands.txt8
-rw-r--r--npc/custom/breeder.txt3
-rw-r--r--npc/other/turbo_track.txt6
-rw-r--r--npc/re/merchants/renters.txt12
-rw-r--r--src/map/script.c4
5 files changed, 20 insertions, 13 deletions
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"),