Skip to content

Commit

Permalink
Merge remote-tracking branch 'pundm/master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ppoelzl committed Mar 3, 2021
2 parents 56c52b7 + 1799831 commit c3fb301
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions Data/Skills/act_str.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1138,6 +1138,7 @@ skills["ChainStrike"] = {
baseFlags = {
attack = true,
melee = true,
area = true,
},
baseMods = {
skill("radius", 24),
Expand Down
2 changes: 1 addition & 1 deletion Export/Skills/act_str.txt
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ local skills, mod, flag, skill = ...
#mods

#skill ChainStrike
#flags attack melee
#flags attack melee area
statMap = {
["chain_strike_gain_x_rage_if_attack_hits"] = {
flag("Condition:CanGainRage", { type = "GlobalEffect", effectType = "Buff" }),
Expand Down

0 comments on commit c3fb301

Please sign in to comment.