Skip to content

Commit 931e490

Browse files
author
LocalIdentity
committed
Add support for Mortar Cannon
Adds support for a few stats on mortar cannon and ancestral totem too
1 parent c78e6cd commit 931e490

3 files changed

Lines changed: 63 additions & 16 deletions

File tree

src/Data/SkillStatMap.lua

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,9 @@ return {
549549
["totem_skill_attack_speed_+%"] = {
550550
mod("Speed", "INC", nil, ModFlag.Attack, KeywordFlag.Totem)
551551
},
552+
["grenade_skill_cooldown_speed_+%"] = {
553+
mod("CooldownRecovery", "INC", nil),
554+
},
552555
-- AoE
553556
["active_skill_base_area_of_effect_radius"] = {
554557
skill("radius", nil),
@@ -2655,5 +2658,7 @@ return {
26552658
["quality_display_sandstorm_swipe_is_gem"] = {
26562659
-- Display Only
26572660
},
2658-
2661+
["quality_display_base_totem_duration_is_gem"] = {
2662+
-- Display Only
2663+
},
26592664
}

src/Data/Skills/act_str.lua

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -509,9 +509,6 @@ skills["SupportAncestralWarriorTotemPlayer"] = {
509509
name = "SupportAncestralWarriorTotemPlayer",
510510
hidden = true,
511511
support = true,
512-
addFlags = {
513-
totem = true,
514-
},
515512
requireSkillTypes = { SkillType.Attack, },
516513
addSkillTypes = { SkillType.UsedByTotem, },
517514
excludeSkillTypes = { SkillType.Meta, SkillType.Triggered, SkillType.Cooldown, SkillType.Channel, SkillType.Persistent, },
@@ -566,13 +563,24 @@ skills["SupportAncestralWarriorTotemPlayer"] = {
566563
[39] = { levelRequirement = 0, },
567564
[40] = { levelRequirement = 0, },
568565
},
566+
addFlags = {
567+
totem = true,
568+
},
569569
statSets = {
570570
[1] = {
571571
label = "SupportAncestralWarriorTotemPlayer",
572572
incrementalEffectiveness = 0.054999999701977,
573573
statDescriptionScope = "gem_stat_descriptions",
574+
statMap = {
575+
["support_ancestral_warrior_totem_attack_speed_+%_final"] = {
576+
mod("Speed", "MORE", nil, ModFlag.Attack),
577+
},
578+
},
574579
baseFlags = {
575580
},
581+
baseMods = {
582+
mod("ActiveTotemLimit", "BASE", 1),
583+
},
576584
constantStats = {
577585
{ "skill_disabled_unless_cloned", 2 },
578586
{ "support_ancestral_warrior_totem_attack_speed_+%_final", -25 },
@@ -1071,7 +1079,7 @@ skills["AttritionPlayer"] = {
10711079
{mod("Damage", "MORE", nil, 0, KeywordFlag.Hit, { type = "GlobalEffect", effectType = "Buff"}, { type = "Multiplier", var = "EnemyPresenceSeconds", actor = "enemy", limitVar = "AttritionMaxDamage", div = 2, limitTotal = true }, { type = "ActorCondition", actor = "enemy", var = "RareOrUnique" })},
10721080
{mod("CullPercent", "MAX", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff"}, { type = "MultiplierThreshold", var = "EnemyPresenceSeconds", actor = "enemy", thresholdVar = "AttritionCullSeconds"}, { type = "ActorCondition", actor = "enemy", var = "RareOrUnique" }),
10731081
value = 10,}
1074-
},
1082+
},
10751083
},
10761084
baseFlags = {
10771085
},
@@ -3691,6 +3699,10 @@ skills["ExplosiveGrenadePlayer"] = {
36913699
label = "Explosive Grenade",
36923700
incrementalEffectiveness = 0.054999999701977,
36933701
statDescriptionScope = "explosive_grenade",
3702+
statMap = {
3703+
["base_skill_show_average_damage_instead_of_dps"] = {
3704+
},
3705+
},
36943706
baseFlags = {
36953707
attack = true,
36963708
area = true,
@@ -11225,16 +11237,27 @@ skills["SupportMortarCannonPlayer"] = {
1122511237
[39] = { levelRequirement = 0, },
1122611238
[40] = { levelRequirement = 0, },
1122711239
},
11240+
addFlags = {
11241+
totem = true,
11242+
},
1122811243
statSets = {
1122911244
[1] = {
1123011245
label = "SupportMortarCannonPlayer",
1123111246
incrementalEffectiveness = 0.054999999701977,
1123211247
statDescriptionScope = "gem_stat_descriptions",
11233-
addFlags = {
11234-
totem = true,
11248+
statMap = {
11249+
["support_grenade_ballista_damage_+%_final"] = {
11250+
mod("Damage", "MORE", nil),
1123511251
},
11252+
["support_grenade_ballista_attack_speed_+%_final"] = {
11253+
mod("Speed", "MORE", nil, ModFlag.Attack),
11254+
},
11255+
},
1123611256
baseFlags = {
1123711257
},
11258+
baseMods = {
11259+
mod("ActiveTotemLimit", "BASE", 1),
11260+
},
1123811261
constantStats = {
1123911262
{ "skill_disabled_unless_cloned", 2 },
1124011263
{ "support_grenade_ballista_attack_speed_+%_final", -50 },
@@ -13318,7 +13341,7 @@ skills["SiegeBallistaPlayer"] = {
1331813341
}
1331913342
}
1332013343
skills["SiegeBallistaProjectilePlayer"] = {
13321-
name = "",
13344+
name = "Artillery",
1332213345
hidden = true,
1332313346
skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.Barrageable] = true, [SkillType.AttackInPlaceIsDefault] = true, [SkillType.Fire] = true, [SkillType.Area] = true, [SkillType.CannotChain] = true, [SkillType.UsedByTotem] = true, },
1332413347
weaponTypes = {

src/Export/Skills/act_str.txt

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,17 @@ local skills, mod, flag, skill = ...
3030
#skillEnd
3131

3232
#skill SupportAncestralWarriorTotemPlayer
33-
addFlags = {
34-
totem = true,
35-
},
33+
addFlags = {
34+
totem = true,
35+
},
3636
#set SupportAncestralWarriorTotemPlayer
3737
#flags
38+
statMap = {
39+
["support_ancestral_warrior_totem_attack_speed_+%_final"] = {
40+
mod("Speed", "MORE", nil, ModFlag.Attack),
41+
},
42+
},
43+
#baseMod mod("ActiveTotemLimit", "BASE", 1)
3844
#mods
3945
#skillEnd
4046

@@ -70,7 +76,7 @@ statMap = {
7076
{mod("Damage", "MORE", nil, 0, KeywordFlag.Hit, { type = "GlobalEffect", effectType = "Buff"}, { type = "Multiplier", var = "EnemyPresenceSeconds", actor = "enemy", limitVar = "AttritionMaxDamage", div = 2, limitTotal = true }, { type = "ActorCondition", actor = "enemy", var = "RareOrUnique" })},
7177
{mod("CullPercent", "MAX", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff"}, { type = "MultiplierThreshold", var = "EnemyPresenceSeconds", actor = "enemy", thresholdVar = "AttritionCullSeconds"}, { type = "ActorCondition", actor = "enemy", var = "RareOrUnique" }),
7278
value = 10,}
73-
},
79+
},
7480
},
7581
#mods
7682
#skillEnd
@@ -275,6 +281,10 @@ statMap = {
275281
#skill ExplosiveGrenadePlayer
276282
#set ExplosiveGrenadePlayer
277283
#flags attack area projectile
284+
statMap = {
285+
["base_skill_show_average_damage_instead_of_dps"] = {
286+
},
287+
},
278288
#mods
279289
#skillEnd
280290

@@ -634,11 +644,20 @@ statMap = {
634644
#skillEnd
635645

636646
#skill SupportMortarCannonPlayer
647+
addFlags = {
648+
totem = true,
649+
},
637650
#set SupportMortarCannonPlayer
638-
addFlags = {
639-
totem = true,
640-
},
641651
#flags
652+
statMap = {
653+
["support_grenade_ballista_damage_+%_final"] = {
654+
mod("Damage", "MORE", nil),
655+
},
656+
["support_grenade_ballista_attack_speed_+%_final"] = {
657+
mod("Speed", "MORE", nil, ModFlag.Attack),
658+
},
659+
},
660+
#baseMod mod("ActiveTotemLimit", "BASE", 1)
642661
#mods
643662
#skillEnd
644663

@@ -746,7 +765,7 @@ statMap = {
746765
#mods
747766
#skillEnd
748767

749-
#skill SiegeBallistaProjectilePlayer
768+
#skill SiegeBallistaProjectilePlayer Artillery
750769
#set SiegeBallistaProjectilePlayer
751770
#flags attack projectile totem
752771
#mods

0 commit comments

Comments
 (0)