Skip to content
This repository was archived by the owner on Oct 21, 2025. It is now read-only.

Commit 9159ef0

Browse files
LocalIdentityLocalIdentity
authored
Merge pull request #22 from Peechey/feature/export-other-skills
Fix damage scaling with Mace Strike, Bow Shot, Concoction, and other skills
2 parents b761e3f + 0533b1e commit 9159ef0

File tree

2 files changed

+67
-18
lines changed

2 files changed

+67
-18
lines changed

‎src/Data/Skills/other.lua‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,9 @@ skills["BleedingConcoctionPlayer"] = {
186186
damageIncrementalEffectiveness = 0.0065000001341105,
187187
statDescriptionScope = "throw_flask_bleed",
188188
baseFlags = {
189+
attack = true,
190+
area = true,
191+
projectile = true,
189192
},
190193
constantStats = {
191194
{ "additional_base_critical_strike_chance", 500 },
@@ -314,6 +317,8 @@ skills["MeleeBowPlayer"] = {
314317
incrementalEffectiveness = 0.054999999701977,
315318
statDescriptionScope = "skill_stat_descriptions",
316319
baseFlags = {
320+
attack = true,
321+
projectile = true,
317322
},
318323
constantStats = {
319324
{ "movement_speed_+%_final_while_performing_action", -70 },
@@ -734,6 +739,8 @@ skills["ElementalExpressionTriggeredPlayer"] = {
734739
damageIncrementalEffectiveness = 0.0065000001341105,
735740
statDescriptionScope = "skill_stat_descriptions",
736741
baseFlags = {
742+
spell = true,
743+
area = true,
737744
},
738745
constantStats = {
739746
{ "active_skill_base_area_of_effect_radius", 36 },
@@ -795,6 +802,8 @@ skills["ElementalExpressionTriggeredPlayer"] = {
795802
damageIncrementalEffectiveness = 0.0065000001341105,
796803
statDescriptionScope = "skill_stat_descriptions",
797804
baseFlags = {
805+
spell = true,
806+
projectile = true,
798807
},
799808
constantStats = {
800809
{ "base_number_of_projectiles", 3 },
@@ -859,6 +868,8 @@ skills["ElementalExpressionTriggeredPlayer"] = {
859868
damageIncrementalEffectiveness = 0.0065000001341105,
860869
statDescriptionScope = "skill_stat_descriptions",
861870
baseFlags = {
871+
spell = true,
872+
chaining = true,
862873
},
863874
constantStats = {
864875
{ "number_of_chains", 7 },
@@ -975,6 +986,8 @@ skills["ElementalStormPlayer"] = {
975986
damageIncrementalEffectiveness = 0.0065000001341105,
976987
statDescriptionScope = "tornado_triggered",
977988
baseFlags = {
989+
area = true,
990+
duration = true,
978991
},
979992
constantStats = {
980993
{ "tornado_base_damage_interval_ms", 250 },
@@ -1041,6 +1054,9 @@ skills["ElementalStormPlayer"] = {
10411054
damageIncrementalEffectiveness = 0.0065000001341105,
10421055
statDescriptionScope = "tornado_triggered",
10431056
baseFlags = {
1057+
spell = true,
1058+
area = true,
1059+
duration = true,
10441060
},
10451061
constantStats = {
10461062
{ "tornado_base_damage_interval_ms", 250 },
@@ -1109,6 +1125,9 @@ skills["ElementalStormPlayer"] = {
11091125
damageIncrementalEffectiveness = 0.0065000001341105,
11101126
statDescriptionScope = "tornado_triggered",
11111127
baseFlags = {
1128+
spell = true,
1129+
area = true,
1130+
duration = true,
11121131
},
11131132
constantStats = {
11141133
{ "tornado_base_damage_interval_ms", 250 },
@@ -1177,6 +1196,9 @@ skills["ElementalStormPlayer"] = {
11771196
damageIncrementalEffectiveness = 0.0065000001341105,
11781197
statDescriptionScope = "tornado_triggered",
11791198
baseFlags = {
1199+
spell = true,
1200+
area = true,
1201+
duration = true,
11801202
},
11811203
constantStats = {
11821204
{ "tornado_base_damage_interval_ms", 250 },
@@ -1299,6 +1321,7 @@ skills["EncaseInJadePlayer"] = {
12991321
incrementalEffectiveness = 0.054999999701977,
13001322
statDescriptionScope = "encase_in_jade",
13011323
baseFlags = {
1324+
duration = true,
13021325
},
13031326
constantStats = {
13041327
{ "base_skill_effect_duration", 4000 },
@@ -1413,6 +1436,10 @@ skills["ExplosiveConcoctionPlayer"] = {
14131436
damageIncrementalEffectiveness = 0.0065000001341105,
14141437
statDescriptionScope = "throw_flask_fire",
14151438
baseFlags = {
1439+
attack = true,
1440+
area = true,
1441+
projectile = true,
1442+
duration = true,
14161443
},
14171444
constantStats = {
14181445
{ "additional_base_critical_strike_chance", 500 },
@@ -1541,6 +1568,10 @@ skills["FulminatingConcoctionPlayer"] = {
15411568
damageIncrementalEffectiveness = 0.0065000001341105,
15421569
statDescriptionScope = "throw_flask_lightning",
15431570
baseFlags = {
1571+
attack = true,
1572+
area = true,
1573+
projectile = true,
1574+
duration = true,
15441575
},
15451576
constantStats = {
15461577
{ "additional_base_critical_strike_chance", 800 },
@@ -1898,6 +1929,9 @@ skills["Melee1HMacePlayer"] = {
18981929
incrementalEffectiveness = 0.054999999701977,
18991930
statDescriptionScope = "skill_stat_descriptions",
19001931
baseFlags = {
1932+
attack = true,
1933+
area = true,
1934+
melee = true,
19011935
},
19021936
constantStats = {
19031937
{ "melee_conditional_step_distance", 10 },
@@ -2011,6 +2045,9 @@ skills["Melee2HMacePlayer"] = {
20112045
incrementalEffectiveness = 0.054999999701977,
20122046
statDescriptionScope = "skill_stat_descriptions",
20132047
baseFlags = {
2048+
attack = true,
2049+
area = true,
2050+
melee = true,
20142051
},
20152052
constantStats = {
20162053
{ "melee_conditional_step_distance", 10 },
@@ -2125,6 +2162,9 @@ skills["MeleeMaceMacePlayer"] = {
21252162
incrementalEffectiveness = 0.054999999701977,
21262163
statDescriptionScope = "skill_stat_descriptions",
21272164
baseFlags = {
2165+
attack = true,
2166+
area = true,
2167+
melee = true,
21282168
},
21292169
constantStats = {
21302170
{ "melee_conditional_step_distance", 10 },
@@ -2355,6 +2395,9 @@ skills["PoisonousConcoctionPlayer"] = {
23552395
damageIncrementalEffectiveness = 0.0065000001341105,
23562396
statDescriptionScope = "throw_flask_poison",
23572397
baseFlags = {
2398+
attack = true,
2399+
area = true,
2400+
projectile = true,
23582401
},
23592402
constantStats = {
23602403
{ "additional_base_critical_strike_chance", 500 },
@@ -2752,6 +2795,10 @@ skills["ShatteringConcoctionPlayer"] = {
27522795
damageIncrementalEffectiveness = 0.0065000001341105,
27532796
statDescriptionScope = "throw_flask_cold",
27542797
baseFlags = {
2798+
attack = true,
2799+
area = true,
2800+
projectile = true,
2801+
duration = true,
27552802
},
27562803
constantStats = {
27572804
{ "additional_base_critical_strike_chance", 1100 },
@@ -3226,6 +3273,8 @@ skills["TimeFreezePlayer"] = {
32263273
incrementalEffectiveness = 0.054999999701977,
32273274
statDescriptionScope = "time_stop",
32283275
baseFlags = {
3276+
area = true,
3277+
duration = true,
32293278
},
32303279
constantStats = {
32313280
{ "base_skill_effect_duration", 3000 },

‎src/Export/Skills/other.txt‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ local skills, mod, flag, skill = ...
1818
#skill BleedingConcoctionPlayer
1919
#startSets
2020
#set BleedingConcoctionPlayer
21-
#flags
21+
#flags attack area projectile
2222
#mods
2323
#skillEnd
2424

2525
#from item
2626
#skill MeleeBowPlayer
2727
#startSets
2828
#set MeleeBowPlayer
29-
#flags
29+
#flags attack projectile
3030
#mods
3131
#skillEnd
3232

@@ -53,54 +53,54 @@ local skills, mod, flag, skill = ...
5353
#flags
5454
#mods
5555
#set ElementalExpressionFirePlayer
56-
#flags
56+
#flags spell area
5757
#mods
5858
#set ElementalExpressionColdPlayer
59-
#flags
59+
#flags spell projectile
6060
#mods
6161
#set ElementalExpressionLightningPlayer
62-
#flags
62+
#flags spell chaining
6363
#mods
6464
#skillEnd
6565

6666
#from tree
6767
#skill ElementalStormPlayer
6868
#startSets
6969
#set ElementalStormPlayer
70-
#flags
70+
#flags area duration
7171
#mods
7272
#set ElementalStormFirePlayer
73-
#flags
73+
#flags spell area duration
7474
#mods
7575
#set ElementalStormLightningPlayer
76-
#flags
76+
#flags spell area duration
7777
#mods
7878
#set ElementalStormColdPlayer
79-
#flags
79+
#flags spell area duration
8080
#mods
8181
#skillEnd
8282

8383
#from tree
8484
#skill EncaseInJadePlayer
8585
#startSets
8686
#set EncaseInJadePlayer
87-
#flags
87+
#flags duration
8888
#mods
8989
#skillEnd
9090

9191
#from tree
9292
#skill ExplosiveConcoctionPlayer
9393
#startSets
9494
#set ExplosiveConcoctionPlayer
95-
#flags
95+
#flags attack area projectile duration
9696
#mods
9797
#skillEnd
9898

9999
#from tree
100100
#skill FulminatingConcoctionPlayer
101101
#startSets
102102
#set FulminatingConcoctionPlayer
103-
#flags
103+
#flags attack area projectile duration
104104
#mods
105105
#skillEnd
106106

@@ -124,23 +124,23 @@ local skills, mod, flag, skill = ...
124124
#skill Melee1HMacePlayer
125125
#startSets
126126
#set Melee1HMacePlayer
127-
#flags
127+
#flags attack area melee
128128
#mods
129129
#skillEnd
130130

131131
#from item
132132
#skill Melee2HMacePlayer
133133
#startSets
134134
#set Melee2HMacePlayer
135-
#flags
135+
#flags attack area melee
136136
#mods
137137
#skillEnd
138138

139139
#from item
140140
#skill MeleeMaceMacePlayer
141141
#startSets
142142
#set MeleeMaceMacePlayer
143-
#flags
143+
#flags attack area melee
144144
#mods
145145
#skillEnd
146146

@@ -156,7 +156,7 @@ local skills, mod, flag, skill = ...
156156
#skill PoisonousConcoctionPlayer
157157
#startSets
158158
#set PoisonousConcoctionPlayer
159-
#flags
159+
#flags attack area projectile
160160
#mods
161161
#skillEnd
162162

@@ -188,7 +188,7 @@ local skills, mod, flag, skill = ...
188188
#skill ShatteringConcoctionPlayer
189189
#startSets
190190
#set ShatteringConcoctionPlayer
191-
#flags
191+
#flags attack area projectile duration
192192
#mods
193193
#skillEnd
194194

@@ -221,7 +221,7 @@ local skills, mod, flag, skill = ...
221221
#skill TimeFreezePlayer
222222
#startSets
223223
#set TimeFreezePlayer
224-
#flags
224+
#flags area duration
225225
#mods
226226
#skillEnd
227227

0 commit comments

Comments
 (0)