diff options
| author | xantara <xantara@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-08 07:26:33 +0000 |
|---|---|---|
| committer | xantara <xantara@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-08 07:26:33 +0000 |
| commit | ac827daf1a15f1b7953776a1a8fb598fb1fd066e (patch) | |
| tree | 27514d67609f6bfd28eaadb8ead2eeef1b27b0c7 | |
| parent | 40dcd5a42ff0b8afbb776be33440876bc891e1c9 (diff) | |
| download | hercules-ac827daf1a15f1b7953776a1a8fb598fb1fd066e.tar.gz hercules-ac827daf1a15f1b7953776a1a8fb598fb1fd066e.tar.bz2 hercules-ac827daf1a15f1b7953776a1a8fb598fb1fd066e.tar.xz hercules-ac827daf1a15f1b7953776a1a8fb598fb1fd066e.zip | |
` Added bugreport:5906 Trap Research's INT bonus
` Fixed bugreport:5950 RK's Crush Strike to include weapon weight in attack formula
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16240 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/battle.c | 2 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 16c744491..35860da0c 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2052,7 +2052,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo { short index = sd->equip_index[EQI_HAND_R]; if( index >= 0 && sd->inventory_data[index] && sd->inventory_data[index]->type == IT_WEAPON ) - skillratio = sstatus->rhw.atk + 100 * sd->inventory_data[index]->wlv * (sd->status.inventory[index].refine + 6); + skillratio = sd->inventory_data[index]->weight + sstatus->rhw.atk + 100 * sd->inventory_data[index]->wlv * (sd->status.inventory[index].refine + 6); } break; case RK_STORMBLAST: diff --git a/src/map/status.c b/src/map/status.c index 5c4f4cdd7..424c397ac 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2676,6 +2676,8 @@ int status_calc_pc_(struct map_session_data* sd, bool first) status->int_ += (skill+1)/2; // +1 INT / 2 lv if((skill=pc_checkskill(sd,AC_OWL))>0) status->dex += skill; + if((skill = pc_checkskill(sd,RA_RESEARCHTRAP))>0) + status->int_ += skill; // Bonuses from cards and equipment as well as base stat, remember to avoid overflows. i = status->str + sd->status.str + sd->param_bonus[0] + sd->param_equip[0]; |