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

Cleans up Thief's Double Attack item bonuses (#7070)

Browse Source 
* Items that grant TF_DOUBLE now no longer require bDoubleRate.
* Adds pc_checkskill_flag() to return a skill's flag value.
Thanks to @eppc0330 and @secretdataz!
This commit is contained in:
Aleos
2022-06-28 12:01:57 -04:00
committed by GitHub
parent 17d6381901
commit 394dab1237
9 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/map/pc.cpp
View File

@@ -4959,15 +4959,13 @@ bool pc_skill(struct map_session_data* sd, uint16 skill_id, int level, enum e_ad
case ADDSKILL_TEMP: //Item bonus skill.
if (sd->status.skill[idx].id != 0) {
if (sd->status.skill[idx].lv >= level)
return true;
if (sd->status.skill[idx].flag == SKILL_FLAG_PERMANENT) //Non-granted skill, store it's level.
sd->status.skill[idx].flag = SKILL_FLAG_REPLACED_LV_0 + sd->status.skill[idx].lv;
} else {
sd->status.skill[idx].id = skill_id;
sd->status.skill[idx].flag = SKILL_FLAG_TEMPORARY;
}
sd->status.skill[idx].lv = level;
sd->status.skill[idx].lv = max(sd->status.skill[idx].lv, level);
break;
case ADDSKILL_TEMP_ADDLEVEL: //Add skill bonus on top of what you had.
@@ -6694,6 +6692,31 @@ uint8 pc_checkskill(struct map_session_data *sd, uint16 skill_id)
return (sd->status.skill[idx].id == skill_id) ? sd->status.skill[idx].lv : 0;
}
/**
* Returns the flag of the given skill (when learned).
* @param sd: Player data
* @param skill_id: Skill to lookup
* @return Skill flag type
*/
e_skill_flag pc_checkskill_flag(map_session_data &sd, uint16 skill_id) {
uint16 idx;
#ifdef RENEWAL
if ((idx = skill_get_index(skill_id)) == 0) {
#else
if ((idx = skill_db.get_index(skill_id, skill_id >= RK_ENCHANTBLADE, __FUNCTION__, __FILE__, __LINE__)) == 0) {
if (skill_id >= RK_ENCHANTBLADE) {
// Silently fail for now -> future update planned
return SKILL_FLAG_NONE;
}
#endif
ShowError("pc_checkskill_flag: Invalid skill id %d (char_id=%d).\n", skill_id, sd.status.char_id);
return SKILL_FLAG_NONE;
}
return (sd.status.skill[idx].id == skill_id && sd.status.skill[idx].lv > 0) ? static_cast<e_skill_flag>(sd.status.skill[idx].flag) : SKILL_FLAG_NONE;
}
/**
* Returns the amount of skill points invested in a Summoner's Power of Sea/Land/Life
* @param sd: Player data