Skip to content

Commit

Permalink
Fix: Multistrike damage calculation with skills which have bow and me…
Browse files Browse the repository at this point in the history
…lee Tag (PathOfBuildingCommunity#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>
  • Loading branch information
3 people committed Aug 13, 2022
1 parent 5d94436 commit c1903af
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 8 deletions.
12 changes: 8 additions & 4 deletions src/Data/Skills/sup_str.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3207,15 +3207,17 @@ skills["SupportMultistrike"] = {
statDescriptionScope = "gem_stat_descriptions",
statMap = {
["multistrike_damage_+%_final_on_first_repeat"] = {
mod("Damage", "MORE", nil),
mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack,ModFlag.Unarmed)),
},
["multistrike_damage_+%_final_on_second_repeat"] = {
},
["support_multiple_attack_damage_+%_final"] = {
mod("Damage", "MORE", nil, ModFlag.Attack),
},
["support_multiple_attacks_melee_attack_speed_+%_final"] = {
mod("Speed", "MORE", nil, ModFlag.Attack),
mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Unarmed)),
},
["multistrike_area_of_effect_+%_per_repeat"] = {
mod("AreaOfEffect", "INC", nil)
Expand Down Expand Up @@ -3305,14 +3307,16 @@ skills["SupportMultistrikePlus"] = {
["multistrike_damage_+%_final_on_second_repeat"] = {
},
["multistrike_damage_+%_final_on_third_repeat"] = {
mod("Damage", "MORE", nil),
mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Unarmed)),
div = 2,
},
["support_multiple_attack_damage_+%_final"] = {
mod("Damage", "MORE", nil, ModFlag.Attack),
},
["support_multiple_attacks_melee_attack_speed_+%_final"] = {
mod("Speed", "MORE", nil, ModFlag.Attack),
mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Unarmed)),
},
},
qualityStats = {
Expand Down
12 changes: 8 additions & 4 deletions src/Export/Skills/sup_str.txt
Original file line number Diff line number Diff line change
Expand Up @@ -368,15 +368,17 @@ local skills, mod, flag, skill = ...
#skill SupportMultistrike
statMap = {
["multistrike_damage_+%_final_on_first_repeat"] = {
mod("Damage", "MORE", nil),
mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack,ModFlag.Unarmed)),
},
["multistrike_damage_+%_final_on_second_repeat"] = {
},
["support_multiple_attack_damage_+%_final"] = {
mod("Damage", "MORE", nil, ModFlag.Attack),
},
["support_multiple_attacks_melee_attack_speed_+%_final"] = {
mod("Speed", "MORE", nil, ModFlag.Attack),
mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Unarmed)),
},
["multistrike_area_of_effect_+%_per_repeat"] = {
mod("AreaOfEffect", "INC", nil)
Expand All @@ -392,14 +394,16 @@ local skills, mod, flag, skill = ...
["multistrike_damage_+%_final_on_second_repeat"] = {
},
["multistrike_damage_+%_final_on_third_repeat"] = {
mod("Damage", "MORE", nil),
mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack,ModFlag.Unarmed)),
div = 2,
},
["support_multiple_attack_damage_+%_final"] = {
mod("Damage", "MORE", nil, ModFlag.Attack),
},
["support_multiple_attacks_melee_attack_speed_+%_final"] = {
mod("Speed", "MORE", nil, ModFlag.Attack),
mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Unarmed)),
},
},
#mods
Expand Down

0 comments on commit c1903af

Please sign in to comment.