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

Corrected pet bonuses not applying (#4292)

Browse Source 
* Fixes #4283.
* Corrected pet bonuses not applying on intimacy changes.
* Removed pet_equip_min_friendly battle config as bonuses are determined on intimacy in the bonus script.
Thanks to @teededung!
This commit is contained in:
Aleos
2019-08-14 08:56:48 -04:00
committed by GitHub
parent 9b11301fa2
commit aa63c855c0
5 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/map/pet.cpp
View File

@@ -600,17 +600,13 @@ int pet_hungry_val(struct pet_data *pd)
*/
void pet_set_intimate(struct pet_data *pd, int value)
{
int intimate;
struct map_session_data *sd;
nullpo_retv(pd);
intimate = pd->pet.intimate;
sd = pd->master;
pd->pet.intimate = min(value, PET_INTIMATE_MAX);
if( sd && ((intimate >= battle_config.pet_equip_min_friendly && pd->pet.intimate < battle_config.pet_equip_min_friendly) || (intimate < battle_config.pet_equip_min_friendly && pd->pet.intimate >= battle_config.pet_equip_min_friendly)) )
struct map_session_data *sd = pd->master;
if (sd)
status_calc_pc(sd,SCO_NONE);
}