Skip to content

Commit 237ffc2

Browse files
Blitz54Blitz54
committed
Some skills and fixes/revert
1 parent 5bde94a commit 237ffc2

7 files changed

Lines changed: 315 additions & 16 deletions

File tree

‎src/Classes/MinionSearchListControl.lua‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ function MinionSearchListClass:sortSourceList()
111111
if sortOption.field == "life" then
112112
valueA = minionA.life * (1 - (minionA.energyShield or 0))
113113
valueB = minionB.life * (1 - (minionB.energyShield or 0))
114-
end
115-
if sortOption.field == "totalHitPoints" then
114+
elseif sortOption.field == "totalHitPoints" then
116115
valueA = minionA.life
117116
valueB = minionB.life
118117
elseif sortOption.field == "energyShield" then

‎src/Data/Skills/spectre.lua‎

Lines changed: 258 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,117 @@
66
--
77
local skills, mod, flag, skill = ...
88

9+
skills["AzmeriFabricationDespair"] = {
10+
name = "Despair",
11+
hidden = true,
12+
description = "Curse all targets in an area after a short delay, lowering their Chaos Resistance.",
13+
skillTypes = { [SkillType.Spell] = true, [SkillType.Area] = true, [SkillType.Duration] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.Triggerable] = true, [SkillType.Cascadable] = true, [SkillType.Chaos] = true, [SkillType.AppliesCurse] = true, [SkillType.CanRapidFire] = true, [SkillType.AreaSpell] = true, [SkillType.UsableWhileMoving] = true, },
14+
castTime = 1,
15+
qualityStats = {
16+
},
17+
levels = {
18+
[1] = { levelRequirement = 0, },
19+
},
20+
statSets = {
21+
[1] = {
22+
label = "Despair",
23+
statDescriptionScope = "despair",
24+
baseFlags = {
25+
spell = true,
26+
curse = true,
27+
area = true,
28+
duration = true,
29+
},
30+
constantStats = {
31+
{ "base_chaos_damage_resistance_%", -30 },
32+
{ "active_skill_area_of_effect_radius_+%_final", 100 },
33+
},
34+
stats = {
35+
"base_deal_no_damage",
36+
"curse_apply_as_aura",
37+
"infinite_skill_effect_duration",
38+
},
39+
levels = {
40+
[1] = { actorLevel = 1, },
41+
},
42+
},
43+
}
44+
}
45+
skills["AzmeriFabricationEnfeeble"] = {
46+
name = "Enfeeble",
47+
hidden = true,
48+
description = "Curse all targets in an area after a short delay, making them deal less damage.",
49+
skillTypes = { [SkillType.Spell] = true, [SkillType.Area] = true, [SkillType.Duration] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.Triggerable] = true, [SkillType.Cascadable] = true, [SkillType.AppliesCurse] = true, [SkillType.CanRapidFire] = true, [SkillType.AreaSpell] = true, [SkillType.UsableWhileMoving] = true, },
50+
castTime = 1,
51+
qualityStats = {
52+
},
53+
levels = {
54+
[1] = { levelRequirement = 0, },
55+
},
56+
statSets = {
57+
[1] = {
58+
label = "Enfeeble",
59+
statDescriptionScope = "enfeeble",
60+
baseFlags = {
61+
spell = true,
62+
curse = true,
63+
area = true,
64+
duration = true,
65+
},
66+
constantStats = {
67+
{ "accuracy_rating_+%", -60 },
68+
{ "base_skill_buff_damage_+%_final_to_apply", -60 },
69+
{ "base_skill_buff_damage_+%_final_vs_unique_to_apply", -23 },
70+
{ "active_skill_area_of_effect_radius_+%_final", 100 },
71+
},
72+
stats = {
73+
"base_deal_no_damage",
74+
"curse_apply_as_aura",
75+
"infinite_skill_effect_duration",
76+
},
77+
levels = {
78+
[1] = { actorLevel = 1, },
79+
},
80+
},
81+
}
82+
}
83+
skills["AzmeriFabricationTemporalChains"] = {
84+
name = "Temporal Chains",
85+
hidden = true,
86+
description = "Curse all enemies in an area, Slowing them and making other effects on them expire more slowly.",
87+
skillTypes = { [SkillType.Spell] = true, [SkillType.Area] = true, [SkillType.Duration] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.Triggerable] = true, [SkillType.Cascadable] = true, [SkillType.AppliesCurse] = true, [SkillType.CanRapidFire] = true, [SkillType.AreaSpell] = true, [SkillType.UsableWhileMoving] = true, },
88+
castTime = 1,
89+
qualityStats = {
90+
},
91+
levels = {
92+
[1] = { levelRequirement = 0, },
93+
},
94+
statSets = {
95+
[1] = {
96+
label = "Temporal Chains",
97+
statDescriptionScope = "temporal_chains",
98+
baseFlags = {
99+
spell = true,
100+
curse = true,
101+
area = true,
102+
duration = true,
103+
},
104+
constantStats = {
105+
{ "base_skill_debuff_action_speed_+%_final_to_inflict", -30 },
106+
{ "base_temporal_chains_other_buff_time_passed_+%_to_apply", -38 },
107+
{ "active_skill_area_of_effect_radius_+%_final", 100 },
108+
},
109+
stats = {
110+
"base_deal_no_damage",
111+
"curse_apply_as_aura",
112+
"infinite_skill_effect_duration",
113+
},
114+
levels = {
115+
[1] = { actorLevel = 1, },
116+
},
117+
},
118+
}
119+
}
9120
skills["AzmeriPictBowRainOfSpores"] = {
10121
name = "Toxic Rain",
11122
hidden = true,
@@ -196,6 +307,39 @@ skills["DTTHellscapeStabbySkyStab"] = {
196307
},
197308
}
198309
}
310+
skills["DTTMantisRatLeap"] = {
311+
name = "Leap",
312+
hidden = true,
313+
skillTypes = { [SkillType.Spell] = true, [SkillType.Movement] = true, },
314+
castTime = 1,
315+
qualityStats = {
316+
},
317+
levels = {
318+
[1] = { storedUses = 1, levelRequirement = 0, cooldown = 7, },
319+
},
320+
statSets = {
321+
[1] = {
322+
label = "Leap",
323+
incrementalEffectiveness = 0.054999999701977,
324+
statDescriptionScope = "skill_stat_descriptions",
325+
baseFlags = {
326+
triggerable = true,
327+
attack = true,
328+
},
329+
constantStats = {
330+
{ "walk_emerge_extra_distance", -7 },
331+
{ "leap_slam_minimum_distance", 40 },
332+
{ "spell_maximum_action_distance_+%", -32 },
333+
},
334+
stats = {
335+
"action_attack_or_cast_time_uses_animation_length",
336+
},
337+
levels = {
338+
[1] = { actorLevel = 1, },
339+
},
340+
},
341+
}
342+
}
199343
skills["EDSShellMonsterFlamethrower"] = {
200344
name = "Flamethrower",
201345
hidden = true,
@@ -371,6 +515,37 @@ skills["GAHellscapePaleEliteSkyStab"] = {
371515
},
372516
}
373517
}
518+
skills["GAMantisRatDualStrike"] = {
519+
name = "Dual Strike",
520+
hidden = true,
521+
skillTypes = { [SkillType.Triggerable] = true, [SkillType.Attack] = true, },
522+
castTime = 1,
523+
qualityStats = {
524+
},
525+
levels = {
526+
[1] = { baseMultiplier = 1.05, levelRequirement = 0, },
527+
},
528+
statSets = {
529+
[1] = {
530+
label = "Dual Strike",
531+
incrementalEffectiveness = 0.054999999701977,
532+
statDescriptionScope = "skill_stat_descriptions",
533+
baseFlags = {
534+
triggerable = true,
535+
attack = true,
536+
},
537+
constantStats = {
538+
{ "active_skill_base_physical_damage_%_to_convert_to_lightning", 50 },
539+
},
540+
stats = {
541+
"is_area_damage",
542+
},
543+
levels = {
544+
[1] = { actorLevel = 1, },
545+
},
546+
},
547+
}
548+
}
374549
skills["GAMediumBeetleChargedSunder"] = {
375550
name = "Charged Sunder",
376551
hidden = true,
@@ -972,6 +1147,51 @@ skills["MPSAzmeriPictStaffProj2"] = {
9721147
},
9731148
}
9741149
}
1150+
skills["MPSBreachEliteFallenLunarisMonsterChaosSpark"] = {
1151+
name = "Chaos Spark",
1152+
hidden = true,
1153+
skillTypes = { [SkillType.Spell] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Triggerable] = true, [SkillType.Damage] = true, },
1154+
castTime = 1,
1155+
qualityStats = {
1156+
},
1157+
levels = {
1158+
[1] = { critChance = 5, storedUses = 1, levelRequirement = 0, cooldown = 10, },
1159+
},
1160+
statSets = {
1161+
[1] = {
1162+
label = "Chaos Spark",
1163+
baseEffectiveness = 3.25,
1164+
incrementalEffectiveness = 0.10000000149012,
1165+
damageIncrementalEffectiveness = 0.017500000074506,
1166+
statDescriptionScope = "skill_stat_descriptions",
1167+
baseFlags = {
1168+
spell = true,
1169+
projectile = true,
1170+
triggerable = true,
1171+
hit = true,
1172+
},
1173+
constantStats = {
1174+
{ "monster_projectile_variation", 1360 },
1175+
{ "number_of_additional_projectiles", 5 },
1176+
{ "projectile_spread_radius", 12 },
1177+
},
1178+
stats = {
1179+
"spell_minimum_base_chaos_damage",
1180+
"spell_maximum_base_chaos_damage",
1181+
"base_is_projectile",
1182+
"projectile_uses_contact_position",
1183+
"maintain_projectile_direction_when_using_contact_position",
1184+
"action_attack_or_cast_time_uses_animation_length",
1185+
"projectile_ballistic_angle_from_reference_event",
1186+
"ballistic_projectiles_always_bounce",
1187+
"distribute_projectiles_over_contact_points",
1188+
},
1189+
levels = {
1190+
[1] = { 0.80000001192093, 1.2000000476837, statInterpolation = { 3, 3, }, actorLevel = 1, },
1191+
},
1192+
},
1193+
}
1194+
}
9751195
skills["MPSVaalBloodPriestProj"] = {
9761196
name = "Blood Projectile",
9771197
hidden = true,
@@ -1014,6 +1234,44 @@ skills["MPSVaalBloodPriestProj"] = {
10141234
},
10151235
}
10161236
}
1237+
skills["MPWAzmeriPitifulFabricationSkullThrow"] = {
1238+
name = "Skull Throw",
1239+
hidden = true,
1240+
skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Damage] = true, [SkillType.Triggerable] = true, },
1241+
castTime = 1,
1242+
qualityStats = {
1243+
},
1244+
levels = {
1245+
[1] = { baseMultiplier = 1.15, levelRequirement = 0, },
1246+
},
1247+
statSets = {
1248+
[1] = {
1249+
label = "Skull Throw",
1250+
statDescriptionScope = "skill_stat_descriptions",
1251+
baseFlags = {
1252+
attack = true,
1253+
projectile = true,
1254+
triggerable = true,
1255+
},
1256+
constantStats = {
1257+
{ "monster_projectile_variation", 161 },
1258+
{ "spell_maximum_action_distance_+%", -40 },
1259+
},
1260+
stats = {
1261+
"base_is_projectile",
1262+
"projectile_uses_contact_position",
1263+
"use_scaled_contact_offset",
1264+
"action_attack_or_cast_time_uses_animation_length",
1265+
"maintain_projectile_direction_when_using_contact_position",
1266+
"check_for_targets_between_initiator_and_projectile_source",
1267+
"projectile_ballistic_angle_from_reference_event",
1268+
},
1269+
levels = {
1270+
[1] = { actorLevel = 1, },
1271+
},
1272+
},
1273+
}
1274+
}
10171275
skills["MPWCleansedMonstrosityRailgun"] = {
10181276
name = "Railgun",
10191277
hidden = true,

‎src/Data/Spectres.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5789,9 +5789,9 @@ minions["Metadata/Monsters/PitifulFabrications/PitifulFabrication01"] = {
57895789
},
57905790
}
57915791

5792-
minions["Metadata/Monsters/PitifulFabrications/PitifulFabrication02"] = {
5792+
minions["Metadata/Monsters/PitifulFabrications/Canopy/PitifulFabrication02"] = {
57935793
name = "Ribrattle",
5794-
monsterTags = { "skeleton", "Unarmed_onhit_audio", "undead", "very_slow_movement", },
5794+
monsterTags = { "bones", "skeleton", "Unarmed_onhit_audio", "undead", "very_slow_movement", },
57955795
extraFlags = {
57965796
recommendedSpectre = true,
57975797
},
@@ -5815,9 +5815,9 @@ minions["Metadata/Monsters/PitifulFabrications/PitifulFabrication02"] = {
58155815
"The Ziggurat Refuge",
58165816
},
58175817
skillList = {
5818-
"PitifulFabricationBuff",
5819-
"TBPitifulFabricationBuff",
5820-
"PitifulFabricationBuffTriggered",
5818+
"AzmeriFabricationDespair",
5819+
"AzmeriFabricationTemporalChains",
5820+
"AzmeriFabricationEnfeeble",
58215821
},
58225822
modList = {
58235823
},

‎src/Export/Minions/Spectres.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ local minions, mod, flag = ...
574574
#spectre Metadata/Monsters/PitifulFabrications/PitifulFabrication01
575575
#emit
576576

577-
#spectre Metadata/Monsters/PitifulFabrications/PitifulFabrication02
577+
#spectre Metadata/Monsters/PitifulFabrications/Canopy/PitifulFabrication02
578578
#flags recommendedSpectre
579579
#emit
580580

0 commit comments

Comments
 (0)