diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-01-25 20:06:13 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-01-25 20:06:13 +0000 |
| commit | 0d9785742ca4554d633c226c2db8fa7a2d255082 (patch) | |
| tree | 2b689304aa2df09f623816315be6538bc64e5258 /src/map/status.c | |
| parent | 922f62e89a8b3dae0f7e407fae044299988b9ece (diff) | |
| download | hercules-0d9785742ca4554d633c226c2db8fa7a2d255082.tar.gz hercules-0d9785742ca4554d633c226c2db8fa7a2d255082.tar.bz2 hercules-0d9785742ca4554d633c226c2db8fa7a2d255082.tar.xz hercules-0d9785742ca4554d633c226c2db8fa7a2d255082.zip | |
- Implemented new Pet Bonus System. Enjoy!! :D
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13491 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/status.c b/src/map/status.c index 67f4a7c85..f7da7d505 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1967,16 +1967,16 @@ int status_calc_pc(struct map_session_data* sd,int first) } } - if(sd->pd && battle_config.pet_status_support) - { // Pet - struct pet_data *pd=sd->pd; - if(pd && pd->pet.intimate > 0 && - (!battle_config.pet_equip_required || pd->pet.equip > 0) && - pd->state.skillbonus == 1 && pd->bonus) //Skotlex: Readjusted for pets + if( sd->pd ) + { // Pet Bonus + struct pet_data *pd = sd->pd; + if( pd && pd->petDB && pd->petDB->equip_script && pd->pet.intimate >= battle_config.pet_equip_min_friendly ) + run_script(pd->petDB->equip_script,0,sd->bl.id,0); + if( pd && pd->pet.intimate > 0 && (!battle_config.pet_equip_required || pd->pet.equip > 0) && pd->state.skillbonus == 1 && pd->bonus ) pc_bonus(sd,pd->bonus->type, pd->bonus->val); } - //param_bonus now holds card bonuses. + //param_bonus now holds card bonuses. if(status->rhw.range < 1) status->rhw.range = 1; if(status->lhw.range < 1) status->lhw.range = 1; if(status->rhw.range < status->lhw.range) |