summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJedzkie <jedzkie13@rocketmail.com>2015-12-29 18:50:48 +0800
committerHaru <haru@dotalux.com>2016-01-16 20:30:15 +0100
commitc156322ded28c695c17871d98abe071bb73dadd4 (patch)
tree919fcc98cc9b57c943f671c11ccca3c59d8f110a
parente951186d8eafc09de4e88224d5f2a3c9b19d6fae (diff)
downloadhercules-c156322ded28c695c17871d98abe071bb73dadd4.tar.gz
hercules-c156322ded28c695c17871d98abe071bb73dadd4.tar.bz2
hercules-c156322ded28c695c17871d98abe071bb73dadd4.tar.xz
hercules-c156322ded28c695c17871d98abe071bb73dadd4.zip
Removed Hard Coded data for SC_ALL_RIDING.
-rw-r--r--src/map/atcommand.c3
-rw-r--r--src/map/script.c2
-rw-r--r--src/map/status.c4
3 files changed, 6 insertions, 3 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index e223f698c..08119457d 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -8414,6 +8414,7 @@ ACMD(charcommands)
atcommand->commands_sub(sd, fd, COMMAND_CHARCOMMAND);
return true;
}
+
/* for new mounts */
ACMD(cashmount)
{
@@ -8425,7 +8426,7 @@ ACMD(cashmount)
clif->message(sd->fd,msg_fd(fd,1362)); // NOTICE: If you crash with mount your LUA is outdated.
if (!sd->sc.data[SC_ALL_RIDING]) {
clif->message(sd->fd,msg_fd(fd,1363)); // You have mounted.
- sc_start(NULL,&sd->bl,SC_ALL_RIDING,100,0,-1);
+ sc_start(NULL,&sd->bl,SC_ALL_RIDING,100,25,-1);
} else {
clif->message(sd->fd,msg_fd(fd,1364)); // You have released your mount.
status_change_end(&sd->bl, SC_ALL_RIDING, INVALID_TIMER);
diff --git a/src/map/script.c b/src/map/script.c
index 0fd1f0690..5a3d1507f 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -18490,7 +18490,7 @@ BUILDIN(setcashmount)
if (sd->sc.data[SC_ALL_RIDING])
status_change_end(&sd->bl, SC_ALL_RIDING, INVALID_TIMER);
else
- sc_start(NULL,&sd->bl, SC_ALL_RIDING, 100, 0, -1);
+ sc_start(NULL,&sd->bl, SC_ALL_RIDING, 100, 25, -1);
script_pushint(st,1);//in both cases, return 1.
}
return true;
diff --git a/src/map/status.c b/src/map/status.c
index 00050e3ed..879f10efb 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -5542,8 +5542,10 @@ unsigned short status_calc_speed(struct block_list *bl, struct status_change *sc
if(sc->data[SC_FUSION]) {
val = 25;
} else if (sd) {
- if (pc_isridingpeco(sd) || pc_isridingdragon(sd) || sd->sc.data[SC_ALL_RIDING])
+ if (pc_isridingpeco(sd) || pc_isridingdragon(sd))
val = 25;//Same bonus
+ else if (sd->sc.data[SC_ALL_RIDING])
+ val = sd->sc.data[SC_ALL_RIDING]->val1;
else if (pc_isridingwug(sd))
val = 15 + 5 * pc->checkskill(sd, RA_WUGRIDER);
else if (pc_ismadogear(sd)) {