Skip to content

Commit bc95efd

Browse files
PaliakLocalIdentity
andauthored
Fix minion skill type issues causing mod compatiblity issues (#8719)
* Export stats on gems that cannot be added to minions Uses the column in Stats.dat to mark stats on gems that cannot be granted to minions. * FIX: minions using minion skill to determine support gem compatibility * FIX: limit application of mods from gems to mods using exported flag * FIX: ensure duration exists in wave of conviction preDamageFunc * FIX: ensure triggeredByDamageTaken hsa value when generating CWDT config --------- Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent 2faf27a commit bc95efd

15 files changed

Lines changed: 2351 additions & 32 deletions

File tree

src/Data/Skills/act_dex.lua

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

src/Data/Skills/act_int.lua

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

src/Data/Skills/act_str.lua

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

src/Data/Skills/glove.lua

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ skills["EnchantmentOfBladesOnHit"] = {
3434
"spell_uncastable_if_triggerable",
3535
"damage_cannot_be_reflected",
3636
},
37+
notMinionStat = {
38+
"spell_minimum_base_physical_damage",
39+
"spell_maximum_base_physical_damage",
40+
},
3741
levels = {
3842
[1] = { 1, 1.6000000238419, critChance = 7, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 5, levelRequirement = 32, statInterpolation = { 3, 3, }, },
3943
},
@@ -66,6 +70,10 @@ skills["EnchantmentOfBladesOnHit2"] = {
6670
"spell_uncastable_if_triggerable",
6771
"damage_cannot_be_reflected",
6872
},
73+
notMinionStat = {
74+
"spell_minimum_base_physical_damage",
75+
"spell_maximum_base_physical_damage",
76+
},
6977
levels = {
7078
[1] = { 1.5, 2.2999999523163, critChance = 7, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 5, levelRequirement = 53, statInterpolation = { 3, 3, }, },
7179
},
@@ -98,6 +106,10 @@ skills["EnchantmentOfBladesOnHit3"] = {
98106
"spell_uncastable_if_triggerable",
99107
"damage_cannot_be_reflected",
100108
},
109+
notMinionStat = {
110+
"spell_minimum_base_physical_damage",
111+
"spell_maximum_base_physical_damage",
112+
},
101113
levels = {
102114
[1] = { 2, 3, critChance = 7, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 5, levelRequirement = 66, statInterpolation = { 3, 3, }, },
103115
},
@@ -130,6 +142,10 @@ skills["EnchantmentOfBladesOnHit4"] = {
130142
"spell_uncastable_if_triggerable",
131143
"damage_cannot_be_reflected",
132144
},
145+
notMinionStat = {
146+
"spell_minimum_base_physical_damage",
147+
"spell_maximum_base_physical_damage",
148+
},
133149
levels = {
134150
[1] = { 2.4000000953674, 3.7999999523163, critChance = 7, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 5, levelRequirement = 75, statInterpolation = { 3, 3, }, },
135151
},
@@ -160,6 +176,10 @@ skills["EnchantmentOfFlamesOnHit"] = {
160176
"spell_uncastable_if_triggerable",
161177
"damage_cannot_be_reflected",
162178
},
179+
notMinionStat = {
180+
"spell_minimum_base_fire_damage",
181+
"spell_maximum_base_fire_damage",
182+
},
163183
levels = {
164184
[1] = { 1.2000000476837, 1.7999999523163, critChance = 5, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 5, levelRequirement = 32, statInterpolation = { 3, 3, }, },
165185
},
@@ -190,6 +210,10 @@ skills["EnchantmentOfFlamesOnHit2"] = {
190210
"spell_uncastable_if_triggerable",
191211
"damage_cannot_be_reflected",
192212
},
213+
notMinionStat = {
214+
"spell_minimum_base_fire_damage",
215+
"spell_maximum_base_fire_damage",
216+
},
193217
levels = {
194218
[1] = { 1.7000000476837, 2.5, critChance = 5, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 5, levelRequirement = 53, statInterpolation = { 3, 3, }, },
195219
},
@@ -220,6 +244,10 @@ skills["EnchantmentOfFlamesOnHit3"] = {
220244
"spell_uncastable_if_triggerable",
221245
"damage_cannot_be_reflected",
222246
},
247+
notMinionStat = {
248+
"spell_minimum_base_fire_damage",
249+
"spell_maximum_base_fire_damage",
250+
},
223251
levels = {
224252
[1] = { 2.2000000476837, 3.2000000476837, critChance = 5, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 5, levelRequirement = 66, statInterpolation = { 3, 3, }, },
225253
},
@@ -250,6 +278,10 @@ skills["EnchantmentOfFlamesOnHit4"] = {
250278
"spell_uncastable_if_triggerable",
251279
"damage_cannot_be_reflected",
252280
},
281+
notMinionStat = {
282+
"spell_minimum_base_fire_damage",
283+
"spell_maximum_base_fire_damage",
284+
},
253285
levels = {
254286
[1] = { 2.5999999046326, 4, critChance = 5, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 5, levelRequirement = 75, statInterpolation = { 3, 3, }, },
255287
},
@@ -382,6 +414,10 @@ skills["EnchantmentOfFrostOnKill"] = {
382414
"spell_uncastable_if_triggerable",
383415
"damage_cannot_be_reflected",
384416
},
417+
notMinionStat = {
418+
"spell_minimum_base_cold_damage",
419+
"spell_maximum_base_cold_damage",
420+
},
385421
levels = {
386422
[1] = { 1, 1.6000000238419, critChance = 5, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 5, levelRequirement = 32, statInterpolation = { 3, 3, }, },
387423
},
@@ -414,6 +450,10 @@ skills["EnchantmentOfFrostOnKill2"] = {
414450
"spell_uncastable_if_triggerable",
415451
"damage_cannot_be_reflected",
416452
},
453+
notMinionStat = {
454+
"spell_minimum_base_cold_damage",
455+
"spell_maximum_base_cold_damage",
456+
},
417457
levels = {
418458
[1] = { 1.5, 2.2999999523163, critChance = 5, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 5, levelRequirement = 53, statInterpolation = { 3, 3, }, },
419459
},
@@ -446,6 +486,10 @@ skills["EnchantmentOfFrostOnKill3"] = {
446486
"spell_uncastable_if_triggerable",
447487
"damage_cannot_be_reflected",
448488
},
489+
notMinionStat = {
490+
"spell_minimum_base_cold_damage",
491+
"spell_maximum_base_cold_damage",
492+
},
449493
levels = {
450494
[1] = { 2, 3, critChance = 5, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 5, levelRequirement = 66, statInterpolation = { 3, 3, }, },
451495
},
@@ -478,6 +522,10 @@ skills["EnchantmentOfFrostOnKill4"] = {
478522
"spell_uncastable_if_triggerable",
479523
"damage_cannot_be_reflected",
480524
},
525+
notMinionStat = {
526+
"spell_minimum_base_cold_damage",
527+
"spell_maximum_base_cold_damage",
528+
},
481529
levels = {
482530
[1] = { 2.4000000953674, 3.7999999523163, critChance = 5, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 5, levelRequirement = 75, statInterpolation = { 3, 3, }, },
483531
},
@@ -708,6 +756,10 @@ skills["EnchantmentOfInfernoOnKill"] = {
708756
"is_area_damage",
709757
"damage_cannot_be_reflected",
710758
},
759+
notMinionStat = {
760+
"spell_minimum_base_fire_damage",
761+
"spell_maximum_base_fire_damage",
762+
},
711763
levels = {
712764
[1] = { 1, 1.6000000238419, critChance = 5, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 10, levelRequirement = 32, statInterpolation = { 3, 3, }, },
713765
},
@@ -742,6 +794,10 @@ skills["EnchantmentOfInfernoOnKill2"] = {
742794
"is_area_damage",
743795
"damage_cannot_be_reflected",
744796
},
797+
notMinionStat = {
798+
"spell_minimum_base_fire_damage",
799+
"spell_maximum_base_fire_damage",
800+
},
745801
levels = {
746802
[1] = { 1.5, 2.2999999523163, critChance = 5, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 10, levelRequirement = 53, statInterpolation = { 3, 3, }, },
747803
},
@@ -776,6 +832,10 @@ skills["EnchantmentOfInfernoOnKill3"] = {
776832
"is_area_damage",
777833
"damage_cannot_be_reflected",
778834
},
835+
notMinionStat = {
836+
"spell_minimum_base_fire_damage",
837+
"spell_maximum_base_fire_damage",
838+
},
779839
levels = {
780840
[1] = { 2, 3, critChance = 5, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 10, levelRequirement = 66, statInterpolation = { 3, 3, }, },
781841
},
@@ -810,6 +870,10 @@ skills["EnchantmentOfInfernoOnKill4"] = {
810870
"is_area_damage",
811871
"damage_cannot_be_reflected",
812872
},
873+
notMinionStat = {
874+
"spell_minimum_base_fire_damage",
875+
"spell_maximum_base_fire_damage",
876+
},
813877
levels = {
814878
[1] = { 2.4000000953674, 3.7999999523163, critChance = 5, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 10, levelRequirement = 75, statInterpolation = { 3, 3, }, },
815879
},
@@ -1493,6 +1557,10 @@ skills["EnchantmentOfTempestOnHit"] = {
14931557
"is_area_damage",
14941558
"damage_cannot_be_reflected",
14951559
},
1560+
notMinionStat = {
1561+
"spell_minimum_base_lightning_damage",
1562+
"spell_maximum_base_lightning_damage",
1563+
},
14961564
levels = {
14971565
[1] = { 1, 1.6000000238419, critChance = 7, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 10, levelRequirement = 32, statInterpolation = { 3, 3, }, },
14981566
},
@@ -1524,6 +1592,10 @@ skills["EnchantmentOfTempestOnHit2"] = {
15241592
"is_area_damage",
15251593
"damage_cannot_be_reflected",
15261594
},
1595+
notMinionStat = {
1596+
"spell_minimum_base_lightning_damage",
1597+
"spell_maximum_base_lightning_damage",
1598+
},
15271599
levels = {
15281600
[1] = { 1.5, 2.2999999523163, critChance = 7, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 10, levelRequirement = 53, statInterpolation = { 3, 3, }, },
15291601
},
@@ -1555,6 +1627,10 @@ skills["EnchantmentOfTempestOnHit3"] = {
15551627
"is_area_damage",
15561628
"damage_cannot_be_reflected",
15571629
},
1630+
notMinionStat = {
1631+
"spell_minimum_base_lightning_damage",
1632+
"spell_maximum_base_lightning_damage",
1633+
},
15581634
levels = {
15591635
[1] = { 2, 3, critChance = 7, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 10, levelRequirement = 66, statInterpolation = { 3, 3, }, },
15601636
},
@@ -1586,6 +1662,10 @@ skills["EnchantmentOfTempestOnHit4"] = {
15861662
"is_area_damage",
15871663
"damage_cannot_be_reflected",
15881664
},
1665+
notMinionStat = {
1666+
"spell_minimum_base_lightning_damage",
1667+
"spell_maximum_base_lightning_damage",
1668+
},
15891669
levels = {
15901670
[1] = { 2.4000000953674, 3.7999999523163, critChance = 7, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 10, levelRequirement = 75, statInterpolation = { 3, 3, }, },
15911671
},
@@ -1752,6 +1832,10 @@ skills["EnchantmentOfThunderOnKill"] = {
17521832
"is_area_damage",
17531833
"damage_cannot_be_reflected",
17541834
},
1835+
notMinionStat = {
1836+
"spell_minimum_base_lightning_damage",
1837+
"spell_maximum_base_lightning_damage",
1838+
},
17551839
levels = {
17561840
[1] = { 1, 1.6000000238419, critChance = 7, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 5, levelRequirement = 32, statInterpolation = { 3, 3, }, },
17571841
},
@@ -1782,6 +1866,10 @@ skills["EnchantmentOfThunderOnKill2"] = {
17821866
"is_area_damage",
17831867
"damage_cannot_be_reflected",
17841868
},
1869+
notMinionStat = {
1870+
"spell_minimum_base_lightning_damage",
1871+
"spell_maximum_base_lightning_damage",
1872+
},
17851873
levels = {
17861874
[1] = { 1.5, 2.2999999523163, critChance = 7, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 5, levelRequirement = 53, statInterpolation = { 3, 3, }, },
17871875
},
@@ -1812,6 +1900,10 @@ skills["EnchantmentOfThunderOnKill3"] = {
18121900
"is_area_damage",
18131901
"damage_cannot_be_reflected",
18141902
},
1903+
notMinionStat = {
1904+
"spell_minimum_base_lightning_damage",
1905+
"spell_maximum_base_lightning_damage",
1906+
},
18151907
levels = {
18161908
[1] = { 2, 3, critChance = 7, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 5, levelRequirement = 66, statInterpolation = { 3, 3, }, },
18171909
},
@@ -1842,6 +1934,10 @@ skills["EnchantmentOfThunderOnKill4"] = {
18421934
"is_area_damage",
18431935
"damage_cannot_be_reflected",
18441936
},
1937+
notMinionStat = {
1938+
"spell_minimum_base_lightning_damage",
1939+
"spell_maximum_base_lightning_damage",
1940+
},
18451941
levels = {
18461942
[1] = { 2.4000000953674, 3.7999999523163, critChance = 7, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 5, levelRequirement = 75, statInterpolation = { 3, 3, }, },
18471943
},
@@ -2037,6 +2133,10 @@ skills["EnchantmentOfWinterWhenHit"] = {
20372133
"base_is_projectile",
20382134
"damage_cannot_be_reflected",
20392135
},
2136+
notMinionStat = {
2137+
"spell_minimum_base_cold_damage",
2138+
"spell_maximum_base_cold_damage",
2139+
},
20402140
levels = {
20412141
[1] = { 1, 1.6000000238419, critChance = 5, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 10, levelRequirement = 32, statInterpolation = { 3, 3, }, },
20422142
},
@@ -2068,6 +2168,10 @@ skills["EnchantmentOfWinterWhenHit2"] = {
20682168
"base_is_projectile",
20692169
"damage_cannot_be_reflected",
20702170
},
2171+
notMinionStat = {
2172+
"spell_minimum_base_cold_damage",
2173+
"spell_maximum_base_cold_damage",
2174+
},
20712175
levels = {
20722176
[1] = { 1.5, 2.2999999523163, critChance = 5, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 10, levelRequirement = 53, statInterpolation = { 3, 3, }, },
20732177
},
@@ -2099,6 +2203,10 @@ skills["EnchantmentOfWinterWhenHit3"] = {
20992203
"base_is_projectile",
21002204
"damage_cannot_be_reflected",
21012205
},
2206+
notMinionStat = {
2207+
"spell_minimum_base_cold_damage",
2208+
"spell_maximum_base_cold_damage",
2209+
},
21022210
levels = {
21032211
[1] = { 2, 3, critChance = 5, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 10, levelRequirement = 66, statInterpolation = { 3, 3, }, },
21042212
},
@@ -2130,6 +2238,10 @@ skills["EnchantmentOfWinterWhenHit4"] = {
21302238
"base_is_projectile",
21312239
"damage_cannot_be_reflected",
21322240
},
2241+
notMinionStat = {
2242+
"spell_minimum_base_cold_damage",
2243+
"spell_maximum_base_cold_damage",
2244+
},
21332245
levels = {
21342246
[1] = { 2.4000000953674, 3.7999999523163, critChance = 5, PvPDamageMultiplier = -80, storedUses = 1, cooldown = 10, levelRequirement = 75, statInterpolation = { 3, 3, }, },
21352247
},

0 commit comments

Comments
 (0)