Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed issue with [AT]mount, it wasn't displaying the expected message…
…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
Showing
2 changed files
with
30 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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); | ||
|
@@ -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.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
panikon
Author
Member
|
||
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); | ||
|
@@ -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; | ||
} | ||
|
||
/*========================================== | ||
|
Is this a typo?