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

Fixed Cart Terminator damage, "when the skill 'misses', a small damaged hit is still guaranteed from Weaponry Research" (bugreport:8112)

Browse Source
This commit is contained in:
Cahyadi Ramadhan Togihon 2013-10-05 20:56:50 +07:00
parent 04f13d8407
commit 18c6bc0d23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/map/battle.c
View File

@ -4443,7 +4443,18 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl
}
else if(wd.div_ < 0) //Since the attack missed...
wd.div_ *= -1;
//WS_CARTTERMINATION never be missed because of flee, deals damage from BS_WEAPONRESEARCH [Cydh]
//NOTE: Idk the official behavior, if this damage can be reflected/adjusted or not
if (sd && skill_id == WS_CARTTERMINATION && wd.dmg_lv == ATK_FLEE && pc_checkskill(sd,BS_WEAPONRESEARCH)) {
wd.dmg_lv = ATK_DEF;
if(target_has_infinite_defense(target, skill_id))
return battle_calc_attack_plant(wd, src, target, skill_id, skill_lv);
wd.damage = pc_checkskill(sd,BS_WEAPONRESEARCH) * 2;
wd.damage2 = 0;
return wd;
}
#ifdef RENEWAL
if(!sd) // monsters only have a single ATK for element, in pre-renewal we also apply element to entire ATK on players [helvetica]
#endif