Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjusts the MAPID check

Browse Source 
Thanks to @Lemongrass3110!
This commit is contained in:
aleos 2022-06-28 10:51:21 -04:00
parent 549b300395
commit 93ac6ed461
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/clif.cpp
View File

@ -22451,7 +22451,7 @@ bool clif_parse_stylist_buy_sub( struct map_session_data* sd, _look look, int16
std::shared_ptr<s_stylist_costs> costs;
if( ( sd->class_ & MAPID_BASEMASK ) == MAPID_SUMMONER || ( sd->class_ & MAPID_BASEMASK ) == MAPID_SPIRIT_HANDLER ){
if( ( sd->class_ & MAPID_SUMMONER ) == MAPID_SUMMONER ){
costs = entry->doram;
}else{
costs = entry->human;

8
src/map/pc.cpp
View File

@ -2427,7 +2427,7 @@ void pc_clean_skilltree(struct map_session_data *sd)
uint64 pc_calc_skilltree_normalize_job_sub( struct map_session_data *sd ){
int skill_point = pc_calc_skillpoint( sd );
if( sd->class_ & MAPID_SUMMONER || sd->class_ & MAPID_SPIRIT_HANDLER ){
if( sd->class_ & MAPID_SUMMONER ){
// Summoner's skill points for base skills.
std::shared_ptr<s_job_info> summoner_job = job_db.find( JOB_SUMMONER );
@ -2435,8 +2435,6 @@ uint64 pc_calc_skilltree_normalize_job_sub( struct map_session_data *sd ){
if( skill_point < summoner_skills ){
return MAPID_SUMMONER;
} else {
return MAPID_SPIRIT_HANDLER;
}
skill_point -= summoner_skills;
@ -13496,7 +13494,7 @@ void JobDatabase::loadingFinished() {
}
// Summoner / Spirit Handler
if( ( class_ & MAPID_BASEMASK ) == MAPID_SUMMONER || ( class_ & MAPID_BASEMASK ) == MAPID_SPIRIT_HANDLER ){
if( ( class_ & MAPID_SUMMONER ) == MAPID_SUMMONER ){
max = battle_config.max_summoner_parameter;
break;
}
@ -14464,7 +14462,7 @@ short pc_maxaspd(struct map_session_data *sd) {
return (( sd->class_&JOBL_THIRD) ? battle_config.max_third_aspd : (
((sd->class_&MAPID_UPPERMASK) == MAPID_KAGEROUOBORO || (sd->class_&MAPID_UPPERMASK) == MAPID_REBELLION) ? battle_config.max_extended_aspd : (
((sd->class_&MAPID_BASEMASK) == MAPID_SUMMONER || (sd->class_&MAPID_BASEMASK) == MAPID_SPIRIT_HANDLER)) ? battle_config.max_summoner_aspd :
(sd->class_&MAPID_SUMMONER) == MAPID_SUMMONER) ? battle_config.max_summoner_aspd :
battle_config.max_aspd ));
}

6
src/map/status.cpp
View File

@ -3555,7 +3555,7 @@ int status_calc_pc_sub(struct map_session_data* sd, uint8 opt)
// Give them all modes except these (useful for clones)
base_status->mode = static_cast<e_mode>(MD_MASK&~(MD_STATUSIMMUNE|MD_IGNOREMELEE|MD_IGNOREMAGIC|MD_IGNORERANGED|MD_IGNOREMISC|MD_DETECTOR|MD_ANGRY|MD_TARGETWEAK));
base_status->size = (sd->class_&JOBL_BABY) ? SZ_SMALL : (((sd->class_&MAPID_BASEMASK) == MAPID_SUMMONER || (sd->class_&MAPID_BASEMASK) == MAPID_SPIRIT_HANDLER) ? battle_config.summoner_size : SZ_MEDIUM);
base_status->size = (sd->class_&JOBL_BABY) ? SZ_SMALL : ((sd->class_&MAPID_SUMMONER) == MAPID_SUMMONER ? battle_config.summoner_size : SZ_MEDIUM);
if (battle_config.character_size && pc_isriding(sd)) { // [Lupus]
if (sd->class_&JOBL_BABY) {
if (battle_config.character_size&SZ_BIG)
@ -3566,7 +3566,7 @@ int status_calc_pc_sub(struct map_session_data* sd, uint8 opt)
}
base_status->aspd_rate = 1000;
base_status->ele_lv = 1;
base_status->race = ((sd->class_&MAPID_BASEMASK) == MAPID_SUMMONER || (sd->class_&MAPID_BASEMASK) == MAPID_SPIRIT_HANDLER) ? battle_config.summoner_race : RC_PLAYER_HUMAN;
base_status->race = ((sd->class_&MAPID_SUMMONER) == MAPID_SUMMONER) ? battle_config.summoner_race : RC_PLAYER_HUMAN;
base_status->class_ = CLASS_NORMAL;
sd->autospell.clear();
@ -11963,7 +11963,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
case SC_ARCLOUSEDASH:
val2 = 15 + 5 * val1; // AGI
val3 = 25; // Move speed increase
if (sd && ((sd->class_&MAPID_BASEMASK) == MAPID_SUMMONER || (sd->class_&MAPID_BASEMASK) == MAPID_SPIRIT_HANDLER))
if (sd && (sd->class_&MAPID_SUMMONER) == MAPID_SUMMONER)
val4 = 10; // Ranged ATK increase
break;
case SC_SHRIMP: