Skip to content

Commit fa2d00a

Browse files
author
LocalIdentity
committed
Fix skills tags
The curse skill tag was removed in 3.12 so all the skill tags shifted a place. Also, some skills had the same allocated number
1 parent 52d8e29 commit fa2d00a

File tree

13 files changed

+857
-859
lines changed

13 files changed

+857
-859
lines changed

‎Data/3_0/Skills/act_dex.lua

Lines changed: 94 additions & 94 deletions
Large diffs are not rendered by default.

‎Data/3_0/Skills/act_int.lua

Lines changed: 129 additions & 129 deletions
Large diffs are not rendered by default.

‎Data/3_0/Skills/act_str.lua

Lines changed: 69 additions & 69 deletions
Large diffs are not rendered by default.

‎Data/3_0/Skills/glove.lua

Lines changed: 64 additions & 64 deletions
Large diffs are not rendered by default.

‎Data/3_0/Skills/minion.lua

Lines changed: 32 additions & 32 deletions
Large diffs are not rendered by default.

‎Data/3_0/Skills/other.lua

Lines changed: 89 additions & 92 deletions
Large diffs are not rendered by default.

‎Data/3_0/Skills/spectre.lua

Lines changed: 130 additions & 130 deletions
Large diffs are not rendered by default.

‎Data/3_0/Skills/sup_dex.lua

Lines changed: 58 additions & 58 deletions
Large diffs are not rendered by default.

‎Data/3_0/Skills/sup_int.lua

Lines changed: 72 additions & 72 deletions
Large diffs are not rendered by default.

‎Data/3_0/Skills/sup_str.lua

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ skills["SupportSpiritStrike"] = {
133133
support = true,
134134
requireSkillTypes = { SkillType.MeleeSingleTarget, },
135135
addSkillTypes = { },
136-
excludeSkillTypes = { SkillType.Type59, SkillType.Triggered, },
136+
excludeSkillTypes = { SkillType.TriggeredGrantedSkill, SkillType.Vaal, },
137137
ignoreMinionTypes = true,
138138
statDescriptionScope = "gem_stat_descriptions",
139139
statMap = {
@@ -208,7 +208,7 @@ skills["SupportAncestralCallPlus"] = {
208208
support = true,
209209
requireSkillTypes = { SkillType.MeleeSingleTarget, },
210210
addSkillTypes = { },
211-
excludeSkillTypes = { SkillType.Type59, SkillType.Triggered, },
211+
excludeSkillTypes = { SkillType.TriggeredGrantedSkill, SkillType.Vaal, },
212212
ignoreMinionTypes = true,
213213
plusVersionOf = "SupportSpiritStrike",
214214
statDescriptionScope = "gem_stat_descriptions",
@@ -655,7 +655,7 @@ skills["SupportCastOnMeleeKill"] = {
655655
support = true,
656656
requireSkillTypes = { SkillType.Melee, },
657657
addSkillTypes = { },
658-
excludeSkillTypes = { SkillType.Triggerable, SkillType.DamageOverTime, SkillType.Totem, SkillType.ManaCostReserved, },
658+
excludeSkillTypes = { SkillType.Trap, SkillType.Mine, SkillType.Totem, SkillType.ManaCostReserved, },
659659
ignoreMinionTypes = true,
660660
statDescriptionScope = "gem_stat_descriptions",
661661
baseMods = {
@@ -722,9 +722,9 @@ skills["SupportCastOnMeleeKillTriggered"] = {
722722
description = "Must support both a melee attack skill and a spell skill to work. The attack skill will trigger a spell when it kills an enemy. Cannot support totems, traps, or mines. Vaal skills, channelling skills, and skills that reserve mana cannot be triggered.",
723723
color = 1,
724724
support = true,
725-
requireSkillTypes = { SkillType.Spell, SkillType.LightningSkill, SkillType.OR, },
726-
addSkillTypes = { SkillType.Mine, SkillType.Type95, },
727-
excludeSkillTypes = { SkillType.Triggerable, SkillType.DamageOverTime, SkillType.Totem, SkillType.ManaCostReserved, SkillType.Type59, },
725+
requireSkillTypes = { SkillType.Spell, SkillType.Triggerable, SkillType.AND, },
726+
addSkillTypes = { SkillType.Triggered, SkillType.Type96, },
727+
excludeSkillTypes = { SkillType.Trap, SkillType.Mine, SkillType.Totem, SkillType.ManaCostReserved, SkillType.TriggeredGrantedSkill, },
728728
ignoreMinionTypes = true,
729729
statDescriptionScope = "gem_stat_descriptions",
730730
statMap = {
@@ -799,9 +799,9 @@ skills["SupportCastOnDamageTaken"] = {
799799
description = "Each supported spell skill will track damage you take, and be triggered when the total damage taken reaches a threshold. Cannot support skills used by totems, traps, or mines. Vaal skills, channelling skills, and skills that reserve mana cannot be triggered.",
800800
color = 1,
801801
support = true,
802-
requireSkillTypes = { SkillType.Spell, SkillType.LightningSkill, SkillType.OR, },
803-
addSkillTypes = { SkillType.Mine, SkillType.Type95, },
804-
excludeSkillTypes = { SkillType.Triggerable, SkillType.DamageOverTime, SkillType.Totem, SkillType.Vaal, SkillType.Type59, },
802+
requireSkillTypes = { SkillType.Spell, SkillType.Triggerable, SkillType.AND, },
803+
addSkillTypes = { SkillType.Triggered, SkillType.Type96, },
804+
excludeSkillTypes = { SkillType.Trap, SkillType.Mine, SkillType.Totem, SkillType.Aura, SkillType.TriggeredGrantedSkill, },
805805
statDescriptionScope = "gem_stat_descriptions",
806806
statMap = {
807807
["cast_on_damage_taken_damage_+%_final"] = {
@@ -881,7 +881,7 @@ skills["SupportChanceToBleed"] = {
881881
support = true,
882882
requireSkillTypes = { SkillType.Attack, },
883883
addSkillTypes = { },
884-
excludeSkillTypes = { SkillType.Maims, },
884+
excludeSkillTypes = { SkillType.CreatesMinion, },
885885
statDescriptionScope = "gem_stat_descriptions",
886886
statMap = {
887887
["support_chance_to_bleed_bleeding_damage_+%_final"] = {
@@ -1100,7 +1100,7 @@ skills["SupportWeaponElementalDamage"] = {
11001100
description = "Supports attack skills.",
11011101
color = 1,
11021102
support = true,
1103-
requireSkillTypes = { SkillType.Attack, SkillType.Type55, },
1103+
requireSkillTypes = { SkillType.Attack, SkillType.Type56, },
11041104
addSkillTypes = { },
11051105
excludeSkillTypes = { },
11061106
statDescriptionScope = "gem_stat_descriptions",
@@ -1173,7 +1173,7 @@ skills["SupportWeaponElementalDamagePlus"] = {
11731173
description = "Supports attack skills.",
11741174
color = 1,
11751175
support = true,
1176-
requireSkillTypes = { SkillType.Attack, SkillType.Type55, },
1176+
requireSkillTypes = { SkillType.Attack, SkillType.Type56, },
11771177
addSkillTypes = { },
11781178
excludeSkillTypes = { },
11791179
plusVersionOf = "SupportWeaponElementalDamage",
@@ -1448,9 +1448,9 @@ skills["AncestralSlamSupport"] = {
14481448
description = "Supports slam skills, providing a powerful boost when they're used, with a delay before they can be boosted again. Cannot support Vaal skills or triggered skills. Cannot modify the skills of minions. Only skills you use yourself can receive the boost.",
14491449
color = 1,
14501450
support = true,
1451-
requireSkillTypes = { SkillType.CantUseFistOfWar, },
1451+
requireSkillTypes = { SkillType.SlamSkill, },
14521452
addSkillTypes = { },
1453-
excludeSkillTypes = { SkillType.Totem, SkillType.Triggerable, SkillType.DamageOverTime, SkillType.Type101, SkillType.Triggered, },
1453+
excludeSkillTypes = { SkillType.Totem, SkillType.Trap, SkillType.Mine, SkillType.Type102, SkillType.Vaal, },
14541454
ignoreMinionTypes = true,
14551455
statDescriptionScope = "gem_stat_descriptions",
14561456
statMap = {
@@ -1538,7 +1538,7 @@ skills["SupportFortify"] = {
15381538
support = true,
15391539
requireSkillTypes = { SkillType.Melee, },
15401540
addSkillTypes = { },
1541-
excludeSkillTypes = { SkillType.Mine, },
1541+
excludeSkillTypes = { SkillType.Triggered, },
15421542
statDescriptionScope = "gem_stat_descriptions",
15431543
statMap = {
15441544
["support_fortify_melee_damage_+%_final"] = {
@@ -1615,9 +1615,9 @@ skills["SupportGenerosity"] = {
16151615
description = "Supports aura skills that affect you and allies, increasing the aura's effect on allies, but preventing it from affecting you at all. Cannot support curse auras, or other auras that only affect enemies. Cannot support skills used by totems.",
16161616
color = 1,
16171617
support = true,
1618-
requireSkillTypes = { SkillType.Vaal, },
1618+
requireSkillTypes = { SkillType.Aura, },
16191619
addSkillTypes = { },
1620-
excludeSkillTypes = { SkillType.Totem, SkillType.ChillingArea, SkillType.Herald, },
1620+
excludeSkillTypes = { SkillType.Totem, SkillType.AppliesCurse, SkillType.AuraDebuff, },
16211621
statDescriptionScope = "gem_stat_descriptions",
16221622
statMap = {
16231623
["aura_cannot_affect_self"] = {
@@ -1692,9 +1692,9 @@ skills["SupportGenerosityPlus"] = {
16921692
description = "Supports aura skills that affect you and allies, increasing the aura's effect on allies, but preventing it from affecting you at all. Cannot support curse auras, or other auras that only affect enemies. Cannot support skills used by totems.",
16931693
color = 1,
16941694
support = true,
1695-
requireSkillTypes = { SkillType.Vaal, },
1695+
requireSkillTypes = { SkillType.Aura, },
16961696
addSkillTypes = { },
1697-
excludeSkillTypes = { SkillType.Totem, SkillType.ChillingArea, SkillType.Herald, },
1697+
excludeSkillTypes = { SkillType.Totem, SkillType.AppliesCurse, SkillType.AuraDebuff, },
16981698
plusVersionOf = "SupportGenerosity",
16991699
statDescriptionScope = "gem_stat_descriptions",
17001700
statMap = {
@@ -1747,7 +1747,7 @@ skills["SupportIncreasedDuration"] = {
17471747
description = "Supports any skill with a duration.",
17481748
color = 1,
17491749
support = true,
1750-
requireSkillTypes = { SkillType.Duration, SkillType.Type54, },
1750+
requireSkillTypes = { SkillType.Duration, SkillType.Type55, },
17511751
addSkillTypes = { },
17521752
excludeSkillTypes = { },
17531753
statDescriptionScope = "gem_stat_descriptions",
@@ -1818,7 +1818,7 @@ skills["SupportIronGrip"] = {
18181818
description = "Supports attack skills that fire projectiles, making the increase to physical melee damage from strength also increase their physical projectile damage.",
18191819
color = 1,
18201820
support = true,
1821-
requireSkillTypes = { SkillType.Type46, SkillType.Type55, },
1821+
requireSkillTypes = { SkillType.ProjectileAttack, SkillType.Type56, },
18221822
addSkillTypes = { },
18231823
excludeSkillTypes = { },
18241824
statDescriptionScope = "gem_stat_descriptions",
@@ -1890,7 +1890,7 @@ skills["SupportIronWill"] = {
18901890
description = "Supports spell skills, making the increase to physical melee damage from strength also increase their spell damage.",
18911891
color = 1,
18921892
support = true,
1893-
requireSkillTypes = { SkillType.Hit, SkillType.Channelled, SkillType.Type65, },
1893+
requireSkillTypes = { SkillType.Hit, SkillType.Type59, SkillType.Type66, },
18941894
addSkillTypes = { },
18951895
excludeSkillTypes = { },
18961896
statDescriptionScope = "gem_stat_descriptions",
@@ -1962,7 +1962,7 @@ skills["SupportItemQuantity"] = {
19621962
description = "Supports any skill that can kill enemies.",
19631963
color = 1,
19641964
support = true,
1965-
requireSkillTypes = { SkillType.Hit, SkillType.Attack, SkillType.MovementSkill, },
1965+
requireSkillTypes = { SkillType.Hit, SkillType.Attack, SkillType.DamageOverTime, },
19661966
addSkillTypes = { },
19671967
excludeSkillTypes = { },
19681968
statDescriptionScope = "gem_stat_descriptions",
@@ -2093,7 +2093,7 @@ skills["SupportReducedDuration"] = {
20932093
description = "Supports any skill that has a duration.",
20942094
color = 1,
20952095
support = true,
2096-
requireSkillTypes = { SkillType.Duration, SkillType.Type54, },
2096+
requireSkillTypes = { SkillType.Duration, SkillType.Type55, },
20972097
addSkillTypes = { },
20982098
excludeSkillTypes = { },
20992099
statDescriptionScope = "gem_stat_descriptions",
@@ -2170,7 +2170,7 @@ skills["SupportLifeGainOnHit"] = {
21702170
description = "Supports attack skills.",
21712171
color = 1,
21722172
support = true,
2173-
requireSkillTypes = { SkillType.Attack, SkillType.Type55, },
2173+
requireSkillTypes = { SkillType.Attack, SkillType.Type56, },
21742174
addSkillTypes = { },
21752175
excludeSkillTypes = { },
21762176
statDescriptionScope = "gem_stat_descriptions",
@@ -2306,7 +2306,7 @@ skills["SupportMaim"] = {
23062306
description = "Supports attack skills, or other skills that can maim enemies.",
23072307
color = 1,
23082308
support = true,
2309-
requireSkillTypes = { SkillType.Attack, SkillType.NOT, },
2309+
requireSkillTypes = { SkillType.Attack, SkillType.Maims, },
23102310
addSkillTypes = { },
23112311
excludeSkillTypes = { },
23122312
statDescriptionScope = "gem_stat_descriptions",
@@ -2637,7 +2637,7 @@ skills["SupportMultistrike"] = {
26372637
support = true,
26382638
requireSkillTypes = { SkillType.AttackCanRepeat, },
26392639
addSkillTypes = { },
2640-
excludeSkillTypes = { SkillType.Triggered, SkillType.StanceSkill, SkillType.Maims, SkillType.AND, SkillType.OR, },
2640+
excludeSkillTypes = { SkillType.Vaal, SkillType.Type101, SkillType.CreatesMinion, SkillType.NOT, SkillType.AND, },
26412641
statDescriptionScope = "gem_stat_descriptions",
26422642
statMap = {
26432643
["multistrike_damage_+%_final_on_first_repeat"] = {
@@ -2725,7 +2725,7 @@ skills["SupportMultistrikePlus"] = {
27252725
support = true,
27262726
requireSkillTypes = { SkillType.AttackCanRepeat, },
27272727
addSkillTypes = { },
2728-
excludeSkillTypes = { SkillType.Triggered, SkillType.StanceSkill, SkillType.Maims, SkillType.AND, SkillType.OR, },
2728+
excludeSkillTypes = { SkillType.Vaal, SkillType.Type101, SkillType.CreatesMinion, SkillType.NOT, SkillType.AND, },
27292729
plusVersionOf = "SupportMultistrike",
27302730
statDescriptionScope = "gem_stat_descriptions",
27312731
statMap = {
@@ -3036,9 +3036,9 @@ skills["SupportRangedAttackTotem"] = {
30363036
description = "Supports any bow or wand attack skill, causing it to summon a ballista totem that uses the skill for you.",
30373037
color = 1,
30383038
support = true,
3039-
requireSkillTypes = { SkillType.Attack, SkillType.SkillCanTotem, SkillType.OR, },
3039+
requireSkillTypes = { SkillType.Attack, SkillType.SkillCanTotem, SkillType.AND, },
30403040
addSkillTypes = { SkillType.SkillCanTrap, SkillType.SkillCanMine, SkillType.Totem, },
3041-
excludeSkillTypes = { SkillType.Type59, },
3041+
excludeSkillTypes = { SkillType.TriggeredGrantedSkill, },
30423042
ignoreMinionTypes = true,
30433043
statDescriptionScope = "gem_stat_descriptions",
30443044
addFlags = {
@@ -3211,7 +3211,7 @@ skills["SupportRuthless"] = {
32113211
support = true,
32123212
requireSkillTypes = { SkillType.Melee, },
32133213
addSkillTypes = { },
3214-
excludeSkillTypes = { SkillType.Type56, SkillType.AuraDebuff, },
3214+
excludeSkillTypes = { SkillType.Channelled, SkillType.Type65, },
32153215
statDescriptionScope = "gem_stat_descriptions",
32163216
statMap = {
32173217
["support_ruthless_big_hit_stun_base_duration_override_ms"] = {
@@ -3297,7 +3297,7 @@ skills["SupportBluntWeapon"] = {
32973297
support = true,
32983298
requireSkillTypes = { SkillType.Melee, },
32993299
addSkillTypes = { },
3300-
excludeSkillTypes = { SkillType.Mine, SkillType.Maims, SkillType.Totem, },
3300+
excludeSkillTypes = { SkillType.Triggered, SkillType.CreatesMinion, SkillType.Totem, },
33013301
ignoreMinionTypes = true,
33023302
statDescriptionScope = "gem_stat_descriptions",
33033303
baseMods = {
@@ -3364,7 +3364,7 @@ skills["SupportBluntWeaponShockwave"] = {
33643364
name = "Shockwave",
33653365
color = 1,
33663366
description = "Deals attack damage in an area.",
3367-
skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Hit] = true, [SkillType.LightningSkill] = true, [SkillType.Mine] = true, [SkillType.Melee] = true, },
3367+
skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Hit] = true, [SkillType.Triggerable] = true, [SkillType.Triggered] = true, [SkillType.Melee] = true, },
33683368
weaponTypes = {
33693369
["Two Handed Mace"] = true,
33703370
["Staff"] = true,
@@ -3445,9 +3445,9 @@ skills["SupportSpellTotem"] = {
34453445
description = "Supports spell skills that are not triggered. Instead of casting that spell, you will summon a totem that casts the spell for you.",
34463446
color = 1,
34473447
support = true,
3448-
requireSkillTypes = { SkillType.Spell, SkillType.SkillCanTotem, SkillType.OR, },
3448+
requireSkillTypes = { SkillType.Spell, SkillType.SkillCanTotem, SkillType.AND, },
34493449
addSkillTypes = { SkillType.SkillCanTrap, SkillType.SkillCanMine, SkillType.Totem, },
3450-
excludeSkillTypes = { SkillType.Type59, },
3450+
excludeSkillTypes = { SkillType.TriggeredGrantedSkill, },
34513451
ignoreMinionTypes = true,
34523452
statDescriptionScope = "gem_stat_descriptions",
34533453
addFlags = {
@@ -3598,7 +3598,7 @@ skills["SupportUrgentOrders"] = {
35983598
description = "Supports warcry skills.",
35993599
color = 1,
36003600
support = true,
3601-
requireSkillTypes = { SkillType.Type73, },
3601+
requireSkillTypes = { SkillType.Warcry, },
36023602
addSkillTypes = { },
36033603
excludeSkillTypes = { },
36043604
statDescriptionScope = "gem_stat_descriptions",

0 commit comments

Comments
 (0)