Skip to content

Commit 0a584a7

Browse files
LocalIdentityLocalIdentityWires77
authored
Fix gems not showing the correct stats on some parts (#661)
* Fix gems not showing the correct stats on some parts We can no longer use the unresolved values for skills with multiple levels as some skills grab the base value from the first set and add it to the second/third and this doesn't work correctly with the previous method This also removes a bunch of duplicate stats that appeared on some skills I made it so that skills with only 1 level keep the previous method of only using the statInterpolation formula as otherwise it would break minion skills that work this way There is still an issue where running the export script multiple times without restarting the exporter will duplicate the constant stat entries but I was running out of time to fix it The only actual issue with a gem now is the ShieldCharge gem which has too many statInterpolation entries. It doesn't cause any issues in the program but would be nice to fix as it may cause an issue in the future on another gem * Spelling mistake * Fix stat sets (#695) * Updated skills.lua to not duplicate stats * AdditionalStats are being set as resolved values now * Default empty stat sets --------- Co-authored-by: LocalIdentity <localidentity2@gmail.com> Co-authored-by: Wires77 <Wires77@users.noreply.github.com>
1 parent 1274c2d commit 0a584a7

File tree

8 files changed

+4339
-4303
lines changed

8 files changed

+4339
-4303
lines changed

src/Data/Skills/act_dex.lua

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

src/Data/Skills/act_int.lua

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

src/Data/Skills/act_str.lua

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

src/Data/Skills/minion.lua

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -192,19 +192,14 @@ skills["GasShotSkeletonSniperMinion"] = {
192192
duration = true,
193193
},
194194
constantStats = {
195-
{ "base_skill_effect_duration", 8000 },
196-
{ "active_skill_ground_effect_area_of_effect_+%_final_per_second", 40 },
197-
{ "active_skill_ground_effect_area_of_effect_+%_final_per_second_max", 200 },
198195
{ "active_skill_base_area_of_effect_radius", 14 },
199196
{ "active_skill_base_secondary_area_of_effect_radius", 20 },
200197
{ "command_minion_marker_additional_time_ms", 300 },
198+
{ "base_skill_effect_duration", 8000 },
199+
{ "active_skill_ground_effect_area_of_effect_+%_final_per_second", 40 },
200+
{ "active_skill_ground_effect_area_of_effect_+%_final_per_second_max", 200 },
201201
},
202202
stats = {
203-
"is_area_damage",
204-
"display_statset_no_hit_damage",
205-
"display_statset_hide_usage_stats",
206-
"display_fake_attack_hit_poison",
207-
"display_skill_poisons_without_hit",
208203
"is_commandable_skill",
209204
"base_is_projectile",
210205
"is_area_damage",
@@ -213,6 +208,10 @@ skills["GasShotSkeletonSniperMinion"] = {
213208
"skill_cannot_be_electrocuted",
214209
"skill_cannot_be_knocked_back",
215210
"skill_cannot_be_stunned",
211+
"display_statset_no_hit_damage",
212+
"display_statset_hide_usage_stats",
213+
"display_fake_attack_hit_poison",
214+
"display_skill_poisons_without_hit",
216215
},
217216
levels = {
218217
[1] = { baseMultiplier = 2.2, actorLevel = 1, },
@@ -227,10 +226,10 @@ skills["GasShotSkeletonSniperMinion"] = {
227226
area = true,
228227
},
229228
constantStats = {
230-
{ "active_skill_base_physical_damage_%_to_convert_to_fire", 100 },
231229
{ "active_skill_base_area_of_effect_radius", 14 },
232230
{ "active_skill_base_secondary_area_of_effect_radius", 20 },
233231
{ "command_minion_marker_additional_time_ms", 300 },
232+
{ "active_skill_base_physical_damage_%_to_convert_to_fire", 100 },
234233
},
235234
stats = {
236235
"is_commandable_skill",
@@ -292,14 +291,14 @@ skills["BoneshatterBruteMinion"] = {
292291
area = true,
293292
},
294293
constantStats = {
295-
{ "active_skill_base_area_of_effect_radius", 20 },
296-
{ "active_skill_damage_+%_final", 300 },
297294
{ "melee_range_+", 2 },
298295
{ "melee_conditional_step_distance", 3 },
296+
{ "active_skill_base_area_of_effect_radius", 20 },
297+
{ "active_skill_damage_+%_final", 300 },
299298
},
300299
stats = {
301-
"is_area_damage",
302300
"crushing_blow",
301+
"is_area_damage",
303302
},
304303
levels = {
305304
[1] = { actorLevel = 1, },
@@ -438,24 +437,24 @@ skills["FrostBoltSkeletonMageMinion"] = {
438437
hit = true,
439438
},
440439
constantStats = {
441-
{ "active_skill_base_area_of_effect_radius", 8 },
442440
{ "monster_projectile_variation", 1064 },
443441
{ "base_chance_to_freeze_%", 100 },
444442
{ "active_skill_hit_damage_freeze_multiplier_+%_final", 100 },
445443
{ "projectile_maximum_duration_override_ms", 180 },
444+
{ "active_skill_base_area_of_effect_radius", 8 },
446445
},
447446
stats = {
448-
"is_area_damage",
449-
"display_statset_hide_usage_stats",
450447
"spell_minimum_base_cold_damage",
451448
"spell_maximum_base_cold_damage",
452449
"base_is_projectile",
453450
"projectile_uses_contact_position",
454451
"check_for_targets_between_initiator_and_projectile_source",
455452
"maintain_projectile_direction_when_using_contact_position",
453+
"is_area_damage",
454+
"display_statset_hide_usage_stats",
456455
},
457456
levels = {
458-
[1] = { actorLevel = 1, },
457+
[1] = { 0.80000001192093, 1.2000000476837, statInterpolation = { 3, 3, }, actorLevel = 1, },
459458
},
460459
},
461460
}
@@ -615,10 +614,10 @@ skills["FireBombSkeletonMinion"] = {
615614
baseFlags = {
616615
},
617616
constantStats = {
618-
{ "base_secondary_skill_effect_duration", 0 },
619617
{ "base_skill_effect_duration", 2000 },
620618
{ "active_skill_base_physical_damage_%_to_convert_to_fire", 70 },
621619
{ "active_skill_base_area_of_effect_radius", 16 },
620+
{ "base_secondary_skill_effect_duration", 0 },
622621
},
623622
stats = {
624623
"base_fire_damage_to_deal_per_minute",
@@ -713,46 +712,46 @@ skills["DestructiveLinkSkeletonBombadierMinion"] = {
713712
"skill_cannot_be_stunned",
714713
},
715714
levels = {
716-
[1] = { 0.80000001192093, 1.2000000476837, 27, statInterpolation = { 3, 3, 1, }, actorLevel = 1, },
717-
[2] = { 0.80000001192093, 1.2000000476837, 49, statInterpolation = { 3, 3, 1, }, actorLevel = 3, },
718-
[3] = { 0.80000001192093, 1.2000000476837, 73, statInterpolation = { 3, 3, 1, }, actorLevel = 5, },
719-
[4] = { 0.80000001192093, 1.2000000476837, 100, statInterpolation = { 3, 3, 1, }, actorLevel = 7, },
720-
[5] = { 0.80000001192093, 1.2000000476837, 130, statInterpolation = { 3, 3, 1, }, actorLevel = 9, },
721-
[6] = { 0.80000001192093, 1.2000000476837, 164, statInterpolation = { 3, 3, 1, }, actorLevel = 11, },
722-
[7] = { 0.80000001192093, 1.2000000476837, 201, statInterpolation = { 3, 3, 1, }, actorLevel = 13, },
723-
[8] = { 0.80000001192093, 1.2000000476837, 243, statInterpolation = { 3, 3, 1, }, actorLevel = 15, },
724-
[9] = { 0.80000001192093, 1.2000000476837, 289, statInterpolation = { 3, 3, 1, }, actorLevel = 17, },
725-
[10] = { 0.80000001192093, 1.2000000476837, 340, statInterpolation = { 3, 3, 1, }, actorLevel = 19, },
726-
[11] = { 0.80000001192093, 1.2000000476837, 396, statInterpolation = { 3, 3, 1, }, actorLevel = 21, },
727-
[12] = { 0.80000001192093, 1.2000000476837, 459, statInterpolation = { 3, 3, 1, }, actorLevel = 23, },
728-
[13] = { 0.80000001192093, 1.2000000476837, 528, statInterpolation = { 3, 3, 1, }, actorLevel = 25, },
729-
[14] = { 0.80000001192093, 1.2000000476837, 603, statInterpolation = { 3, 3, 1, }, actorLevel = 27, },
730-
[15] = { 0.80000001192093, 1.2000000476837, 688, statInterpolation = { 3, 3, 1, }, actorLevel = 29, },
731-
[16] = { 0.80000001192093, 1.2000000476837, 780, statInterpolation = { 3, 3, 1, }, actorLevel = 31, },
732-
[17] = { 0.80000001192093, 1.2000000476837, 883, statInterpolation = { 3, 3, 1, }, actorLevel = 33, },
733-
[18] = { 0.80000001192093, 1.2000000476837, 994, statInterpolation = { 3, 3, 1, }, actorLevel = 35, },
734-
[19] = { 0.80000001192093, 1.2000000476837, 1118, statInterpolation = { 3, 3, 1, }, actorLevel = 37, },
735-
[20] = { 0.80000001192093, 1.2000000476837, 1253, statInterpolation = { 3, 3, 1, }, actorLevel = 39, },
736-
[21] = { 0.80000001192093, 1.2000000476837, 1403, statInterpolation = { 3, 3, 1, }, actorLevel = 41, },
737-
[22] = { 0.80000001192093, 1.2000000476837, 1566, statInterpolation = { 3, 3, 1, }, actorLevel = 43, },
738-
[23] = { 0.80000001192093, 1.2000000476837, 1744, statInterpolation = { 3, 3, 1, }, actorLevel = 45, },
739-
[24] = { 0.80000001192093, 1.2000000476837, 1940, statInterpolation = { 3, 3, 1, }, actorLevel = 47, },
740-
[25] = { 0.80000001192093, 1.2000000476837, 2156, statInterpolation = { 3, 3, 1, }, actorLevel = 49, },
741-
[26] = { 0.80000001192093, 1.2000000476837, 2391, statInterpolation = { 3, 3, 1, }, actorLevel = 51, },
742-
[27] = { 0.80000001192093, 1.2000000476837, 2649, statInterpolation = { 3, 3, 1, }, actorLevel = 53, },
743-
[28] = { 0.80000001192093, 1.2000000476837, 2932, statInterpolation = { 3, 3, 1, }, actorLevel = 55, },
744-
[29] = { 0.80000001192093, 1.2000000476837, 3241, statInterpolation = { 3, 3, 1, }, actorLevel = 57, },
745-
[30] = { 0.80000001192093, 1.2000000476837, 3578, statInterpolation = { 3, 3, 1, }, actorLevel = 59, },
746-
[31] = { 0.80000001192093, 1.2000000476837, 3948, statInterpolation = { 3, 3, 1, }, actorLevel = 61, },
747-
[32] = { 0.80000001192093, 1.2000000476837, 4352, statInterpolation = { 3, 3, 1, }, actorLevel = 63, },
748-
[33] = { 0.80000001192093, 1.2000000476837, 4793, statInterpolation = { 3, 3, 1, }, actorLevel = 65, },
749-
[34] = { 0.80000001192093, 1.2000000476837, 5275, statInterpolation = { 3, 3, 1, }, actorLevel = 67, },
750-
[35] = { 0.80000001192093, 1.2000000476837, 5801, statInterpolation = { 3, 3, 1, }, actorLevel = 69, },
751-
[36] = { 0.80000001192093, 1.2000000476837, 6375, statInterpolation = { 3, 3, 1, }, actorLevel = 71, },
752-
[37] = { 0.80000001192093, 1.2000000476837, 7003, statInterpolation = { 3, 3, 1, }, actorLevel = 73, },
753-
[38] = { 0.80000001192093, 1.2000000476837, 7688, statInterpolation = { 3, 3, 1, }, actorLevel = 75, },
754-
[39] = { 0.80000001192093, 1.2000000476837, 8434, statInterpolation = { 3, 3, 1, }, actorLevel = 77, },
755-
[40] = { 0.80000001192093, 1.2000000476837, 9249, statInterpolation = { 3, 3, 1, }, actorLevel = 79, },
715+
[1] = { 7, 11, 27, statInterpolation = { 1, 1, 1, }, actorLevel = 1, },
716+
[2] = { 9, 14, 49, statInterpolation = { 1, 1, 1, }, actorLevel = 3, },
717+
[3] = { 12, 18, 73, statInterpolation = { 1, 1, 1, }, actorLevel = 5, },
718+
[4] = { 15, 22, 100, statInterpolation = { 1, 1, 1, }, actorLevel = 7, },
719+
[5] = { 18, 28, 130, statInterpolation = { 1, 1, 1, }, actorLevel = 9, },
720+
[6] = { 22, 34, 164, statInterpolation = { 1, 1, 1, }, actorLevel = 11, },
721+
[7] = { 27, 41, 201, statInterpolation = { 1, 1, 1, }, actorLevel = 13, },
722+
[8] = { 33, 50, 243, statInterpolation = { 1, 1, 1, }, actorLevel = 15, },
723+
[9] = { 40, 60, 289, statInterpolation = { 1, 1, 1, }, actorLevel = 17, },
724+
[10] = { 48, 73, 340, statInterpolation = { 1, 1, 1, }, actorLevel = 19, },
725+
[11] = { 58, 87, 396, statInterpolation = { 1, 1, 1, }, actorLevel = 21, },
726+
[12] = { 69, 104, 459, statInterpolation = { 1, 1, 1, }, actorLevel = 23, },
727+
[13] = { 83, 124, 528, statInterpolation = { 1, 1, 1, }, actorLevel = 25, },
728+
[14] = { 98, 148, 603, statInterpolation = { 1, 1, 1, }, actorLevel = 27, },
729+
[15] = { 117, 175, 688, statInterpolation = { 1, 1, 1, }, actorLevel = 29, },
730+
[16] = { 138, 207, 780, statInterpolation = { 1, 1, 1, }, actorLevel = 31, },
731+
[17] = { 163, 245, 883, statInterpolation = { 1, 1, 1, }, actorLevel = 33, },
732+
[18] = { 193, 289, 994, statInterpolation = { 1, 1, 1, }, actorLevel = 35, },
733+
[19] = { 227, 341, 1118, statInterpolation = { 1, 1, 1, }, actorLevel = 37, },
734+
[20] = { 267, 401, 1253, statInterpolation = { 1, 1, 1, }, actorLevel = 39, },
735+
[21] = { 314, 471, 1403, statInterpolation = { 1, 1, 1, }, actorLevel = 41, },
736+
[22] = { 368, 553, 1566, statInterpolation = { 1, 1, 1, }, actorLevel = 43, },
737+
[23] = { 432, 648, 1744, statInterpolation = { 1, 1, 1, }, actorLevel = 45, },
738+
[24] = { 506, 758, 1940, statInterpolation = { 1, 1, 1, }, actorLevel = 47, },
739+
[25] = { 591, 887, 2156, statInterpolation = { 1, 1, 1, }, actorLevel = 49, },
740+
[26] = { 691, 1036, 2391, statInterpolation = { 1, 1, 1, }, actorLevel = 51, },
741+
[27] = { 806, 1210, 2649, statInterpolation = { 1, 1, 1, }, actorLevel = 53, },
742+
[28] = { 941, 1411, 2932, statInterpolation = { 1, 1, 1, }, actorLevel = 55, },
743+
[29] = { 1096, 1644, 3241, statInterpolation = { 1, 1, 1, }, actorLevel = 57, },
744+
[30] = { 1276, 1915, 3578, statInterpolation = { 1, 1, 1, }, actorLevel = 59, },
745+
[31] = { 1485, 2228, 3948, statInterpolation = { 1, 1, 1, }, actorLevel = 61, },
746+
[32] = { 1727, 2591, 4352, statInterpolation = { 1, 1, 1, }, actorLevel = 63, },
747+
[33] = { 2007, 3011, 4793, statInterpolation = { 1, 1, 1, }, actorLevel = 65, },
748+
[34] = { 2331, 3497, 5275, statInterpolation = { 1, 1, 1, }, actorLevel = 67, },
749+
[35] = { 2706, 4058, 5801, statInterpolation = { 1, 1, 1, }, actorLevel = 69, },
750+
[36] = { 3139, 4708, 6375, statInterpolation = { 1, 1, 1, }, actorLevel = 71, },
751+
[37] = { 3639, 5458, 7003, statInterpolation = { 1, 1, 1, }, actorLevel = 73, },
752+
[38] = { 4217, 6325, 7688, statInterpolation = { 1, 1, 1, }, actorLevel = 75, },
753+
[39] = { 4884, 7326, 8434, statInterpolation = { 1, 1, 1, }, actorLevel = 77, },
754+
[40] = { 5654, 8481, 9249, statInterpolation = { 1, 1, 1, }, actorLevel = 79, },
756755
},
757756
},
758757
}

0 commit comments

Comments
 (0)