` 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://svn.code.sf.net/p/rathena/svn/trunk@16240 54d463be-8e91-2dee-dedb-b68131a5f0ec

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:

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];