Skip to content

Commit

Permalink
Fixed issue with [AT]mount, it wasn't displaying the expected message…
Browse files Browse the repository at this point in the history
…s, all errors would simply display "You can not mount a Peco Peco with your current job.", now it's displaying a different message for each possible error
  • Loading branch information
panikon committed Jul 9, 2014
1 parent 660d7eb commit ec51176
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 17 deletions.
5 changes: 3 additions & 2 deletions conf/messages.conf
Expand Up @@ -210,9 +210,10 @@
208: '%s' skill and stat points have been reset.
//209-211 FREE
212: Cannot mount while in disguise.
213: You can not mount a Peco Peco with your current job.
213: You need %s to mount!
214: You have released your Peco Peco.
//215-218 FREE
215: Your class can't mount!
//216-218 FREE
219: %d day
220: %d days
221: %d hour
Expand Down
42 changes: 27 additions & 15 deletions src/map/atcommand.c
Expand Up @@ -3917,7 +3917,12 @@ ACMD(mount_peco)
return false;
}

if( (sd->class_&MAPID_THIRDMASK) == MAPID_RUNE_KNIGHT && pc->checkskill(sd,RK_DRAGONTRAINING) > 0 ) {
if( (sd->class_&MAPID_THIRDMASK) == MAPID_RUNE_KNIGHT ) {
if( !pc->checkskill(sd,RK_DRAGONTRAINING) ) {
sprintf(atcmd_output, msg_txt(213), skill->get_desc(RK_DRAGONTRAINING)); // You need %s to mount!
clif->message(fd, atcmd_output);
return false;
}
if( !(sd->sc.option&OPTION_DRAGON1) ) {
clif->message(sd->fd,msg_txt(1119)); // You have mounted your Dragon.
pc->setoption(sd, sd->sc.option|OPTION_DRAGON1);
Expand All @@ -3927,7 +3932,12 @@ ACMD(mount_peco)
}
return true;
}
if( (sd->class_&MAPID_THIRDMASK) == MAPID_RANGER && pc->checkskill(sd,RA_WUGRIDER) > 0 ) {
if( (sd->class_&MAPID_THIRDMASK) == MAPID_RANGER ) {
if( !pc->checkskill(sd,RA_WUGRIDER) > 0 ) {

This comment has been minimized.

Copy link
@Angelmelody

Angelmelody Jul 9, 2014

Contributor

Is this a typo?

This comment has been minimized.

Copy link
@panikon

panikon Jul 10, 2014

Author Member

It was, but it didn't affect the behaviour of the snippet, just pushed a correction 9dd6ee6

sprintf(atcmd_output, msg_txt(213), skill->get_desc(RA_WUGRIDER)); // You need %s to mount!
clif->message(fd, atcmd_output);
return false;
}
if( !pc_isridingwug(sd) ) {
clif->message(sd->fd,msg_txt(1121)); // You have mounted your Warg.
pc->setoption(sd, sd->sc.option|OPTION_WUGRIDER);
Expand All @@ -3947,21 +3957,23 @@ ACMD(mount_peco)
}
return true;
}
if (!pc_isriding(sd)) { // if actually no peco

if (!pc->checkskill(sd, KN_RIDING)) {
clif->message(fd, msg_txt(213)); // You can not mount a Peco Peco with your current job.
return false;
if( sd->class_&MAPID_SWORDMAN && sd->class_&JOBL_2 ) {
if( !pc_isriding(sd) ) { // if actually no peco
if (!pc->checkskill(sd, KN_RIDING)) {
sprintf(atcmd_output, msg_txt(213), skill->get_desc(KN_RIDING)); // You need %s to mount!
clif->message(fd, atcmd_output);
return false;
}
pc->setoption(sd, sd->sc.option | OPTION_RIDING);
clif->message(fd, msg_txt(102)); // You have mounted a Peco Peco.
} else {//Dismount
pc->setoption(sd, sd->sc.option & ~OPTION_RIDING);
clif->message(fd, msg_txt(214)); // You have released your Peco Peco.
}

pc->setoption(sd, sd->sc.option | OPTION_RIDING);
clif->message(fd, msg_txt(102)); // You have mounted a Peco Peco.
} else {//Dismount
pc->setoption(sd, sd->sc.option & ~OPTION_RIDING);
clif->message(fd, msg_txt(214)); // You have released your Peco Peco.
return true;
}

return true;
clif->message(fd, msg_txt(215)); // Your class can't mount!
return false;
}

/*==========================================
Expand Down

0 comments on commit ec51176

Please sign in to comment.