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

Corrects Finger Offensive and Tiger Cannon (#6996)

Browse Source 
* Fixes #6524.
* Finger Offensive will now have 5 hits across all levels.
* Fixes the HP bonus damage formula of Tiger Cannon.
Thanks to @Akaineko-astasi!
This commit is contained in:
Aleos 2022-06-01 11:33:03 -04:00 committed by GitHub
parent 18050028e3
commit c01c673313
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
db/re/skill_db.yml
View File

@ -7597,17 +7597,7 @@ Body:
TargetTrap: true
Range: 9
Hit: Multi_Hit
HitCount:
- Level: 1
Count: 1
- Level: 2
Count: 2
- Level: 3
Count: 3
- Level: 4
Count: 4
- Level: 5
Count: 5
HitCount: 5
Element: Weapon
CopyFlags:
Skill:

9
src/map/battle.cpp
View File

@ -3397,10 +3397,7 @@ static void battle_calc_attack_masteries(struct Damage* wd, struct block_list *s
ATK_ADD(wd->masteryAtk, wd->masteryAtk2, 4);
if (skill_id != CR_SHIELDBOOMERANG)
ATK_ADD2(wd->masteryAtk, wd->masteryAtk2, ((wd->div_ < 1) ? 1 : wd->div_) * sd->right_weapon.star, ((wd->div_ < 1) ? 1 : wd->div_) * sd->left_weapon.star);
if (skill_id == MO_FINGEROFFENSIVE) {
ATK_ADD(wd->masteryAtk, wd->masteryAtk2, ((wd->div_ < 1) ? 1 : wd->div_) * sd->spiritball_old * 3);
} else
ATK_ADD(wd->masteryAtk, wd->masteryAtk2, ((wd->div_ < 1) ? 1 : wd->div_) * sd->spiritball * 3);
ATK_ADD(wd->masteryAtk, wd->masteryAtk2, ((wd->div_ < 1) ? 1 : wd->div_) * sd->spiritball * 3);
#endif
if (skill_id == NJ_SYURIKEN && (skill = pc_checkskill(sd,NJ_TOBIDOUGU)) > 0) { // !TODO: Confirm new mastery formula
@ -4708,7 +4705,7 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list *
break;
case SR_TIGERCANNON:
{
unsigned int hp = sstatus->max_hp * (12 + (skill_lv * 2)) / 100,
unsigned int hp = sstatus->max_hp * (10 + (skill_lv * 2)) / 100,
sp = sstatus->max_sp * (5 + skill_lv) / 100;
if (wd->miscflag&8)
@ -6162,8 +6159,10 @@ static struct Damage initialize_weapon_data(struct block_list *src, struct block
if (sd) {
if (battle_config.finger_offensive_type)
wd.div_ = 1;
#ifndef RENEWAL
else if ((sd->spiritball + sd->spiritball_old) < wd.div_)
wd.div_ = sd->spiritball + sd->spiritball_old;
#endif
}
break;