Skip to content

Commit c1903af

Browse files
SinuredSinuredLocalIdentity
authored
Fix: Multistrike damage calculation with skills which have bow and melee Tag (#4740)
* wording of blood of karui fixed * undo messy work * damage and atk increase only applies to melee weapons and unarmed * added less attack damage modifier to also apply to bows * adding ModFlag.Attack Condition with bit.bor * Add lines to export files Co-authored-by: Sinured <githubmm@use.startmail.com> Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent 5d94436 commit c1903af

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

src/Data/Skills/sup_str.lua

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3207,15 +3207,17 @@ skills["SupportMultistrike"] = {
32073207
statDescriptionScope = "gem_stat_descriptions",
32083208
statMap = {
32093209
["multistrike_damage_+%_final_on_first_repeat"] = {
3210-
mod("Damage", "MORE", nil),
3210+
mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
3211+
mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack,ModFlag.Unarmed)),
32113212
},
32123213
["multistrike_damage_+%_final_on_second_repeat"] = {
32133214
},
32143215
["support_multiple_attack_damage_+%_final"] = {
32153216
mod("Damage", "MORE", nil, ModFlag.Attack),
32163217
},
32173218
["support_multiple_attacks_melee_attack_speed_+%_final"] = {
3218-
mod("Speed", "MORE", nil, ModFlag.Attack),
3219+
mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
3220+
mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Unarmed)),
32193221
},
32203222
["multistrike_area_of_effect_+%_per_repeat"] = {
32213223
mod("AreaOfEffect", "INC", nil)
@@ -3305,14 +3307,16 @@ skills["SupportMultistrikePlus"] = {
33053307
["multistrike_damage_+%_final_on_second_repeat"] = {
33063308
},
33073309
["multistrike_damage_+%_final_on_third_repeat"] = {
3308-
mod("Damage", "MORE", nil),
3310+
mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
3311+
mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Unarmed)),
33093312
div = 2,
33103313
},
33113314
["support_multiple_attack_damage_+%_final"] = {
33123315
mod("Damage", "MORE", nil, ModFlag.Attack),
33133316
},
33143317
["support_multiple_attacks_melee_attack_speed_+%_final"] = {
3315-
mod("Speed", "MORE", nil, ModFlag.Attack),
3318+
mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
3319+
mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Unarmed)),
33163320
},
33173321
},
33183322
qualityStats = {

src/Export/Skills/sup_str.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -368,15 +368,17 @@ local skills, mod, flag, skill = ...
368368
#skill SupportMultistrike
369369
statMap = {
370370
["multistrike_damage_+%_final_on_first_repeat"] = {
371-
mod("Damage", "MORE", nil),
371+
mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
372+
mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack,ModFlag.Unarmed)),
372373
},
373374
["multistrike_damage_+%_final_on_second_repeat"] = {
374375
},
375376
["support_multiple_attack_damage_+%_final"] = {
376377
mod("Damage", "MORE", nil, ModFlag.Attack),
377378
},
378379
["support_multiple_attacks_melee_attack_speed_+%_final"] = {
379-
mod("Speed", "MORE", nil, ModFlag.Attack),
380+
mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
381+
mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Unarmed)),
380382
},
381383
["multistrike_area_of_effect_+%_per_repeat"] = {
382384
mod("AreaOfEffect", "INC", nil)
@@ -392,14 +394,16 @@ local skills, mod, flag, skill = ...
392394
["multistrike_damage_+%_final_on_second_repeat"] = {
393395
},
394396
["multistrike_damage_+%_final_on_third_repeat"] = {
395-
mod("Damage", "MORE", nil),
397+
mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
398+
mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack,ModFlag.Unarmed)),
396399
div = 2,
397400
},
398401
["support_multiple_attack_damage_+%_final"] = {
399402
mod("Damage", "MORE", nil, ModFlag.Attack),
400403
},
401404
["support_multiple_attacks_melee_attack_speed_+%_final"] = {
402-
mod("Speed", "MORE", nil, ModFlag.Attack),
405+
mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
406+
mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Unarmed)),
403407
},
404408
},
405409
#mods

0 commit comments

Comments
 (0)