Skip to content

Commit 02a8ed3

Browse files
Wires77Wires77
committed
Fix skill copy/paste and test failures
1 parent e7bcbcb commit 02a8ed3

8 files changed

Lines changed: 108 additions & 108 deletions

‎spec/System/TestAilments_spec.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ describe("TestAilments", function()
99

1010
it("maximum shock value", function()
1111
-- Shock Nova
12-
build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nShock Nova 4/0 Default 1\n")
12+
build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nShock Nova 4/0 1\n")
1313
runCallback("OnFrame")
1414
assert.are.equals(round(50 + 10), build.calcsTab.mainOutput.MaximumShock)
1515

@@ -23,7 +23,7 @@ describe("TestAilments", function()
2323
it("bleed is buffed by bleed chance", function()
2424
build.itemsTab:CreateDisplayItemFromRaw("New Item\nKarui Chopper")
2525
build.itemsTab:AddDisplayItem()
26-
build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nHeavy Strike 1/0 Default 1\n")
26+
build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nHeavy Strike 1/0 1\n")
2727
build.configTab.input.customMods = "\z
2828
attacks have 10% chance to cause bleeding\n\z
2929
"

‎spec/System/TestDefence_spec.lua‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ describe("TestDefence", function()
132132
build.configTab.input.enemyIsBoss = "None"
133133
-- Petrified blood
134134
build.skillsTab:PasteSocketGroup("\z
135-
Petrified Blood 20/0 Default 1\n\z
136-
Arrogance 21/0 Default 1\n\z
135+
Petrified Blood 20/0 1\n\z
136+
Arrogance 21/0 1\n\z
137137
") -- 50% petrified effect, when exactly half of the life is reserved, should make the life pool be equivalent to no petrified effect and full life.
138138
build.skillsTab:ProcessSocketGroup(build.skillsTab.socketGroupList[1])
139139
build.configTab.input.customMods = "\z
@@ -155,8 +155,8 @@ describe("TestDefence", function()
155155
build.skillsTab.socketGroupList = {}
156156

157157
build.skillsTab:PasteSocketGroup("\z
158-
Petrified Blood 20/0 Default 1\n\z
159-
Arrogance 21/0 Default 1\n\z
158+
Petrified Blood 20/0 1\n\z
159+
Arrogance 21/0 1\n\z
160160
")
161161
build.skillsTab:ProcessSocketGroup(build.skillsTab.socketGroupList[1])
162162
build.configTab.input.customMods = "\z
@@ -180,7 +180,7 @@ describe("TestDefence", function()
180180
build.skillsTab.socketGroupList = {}
181181

182182
build.skillsTab:PasteSocketGroup("\z
183-
Petrified Blood 20/0 Default 1\n\z
183+
Petrified Blood 20/0 1\n\z
184184
") -- 80% petrified effect, starting from full life, should make the life pool be equivalent to 0.5 * life (unprotected upper half) and then 5 * 0.5 * life (protected lower half), making it 3* bigger in total
185185
build.skillsTab:ProcessSocketGroup(build.skillsTab.socketGroupList[1])
186186
build.configTab.input.customMods = "\z
@@ -238,8 +238,8 @@ describe("TestDefence", function()
238238

239239
-- Progenesis + petrified blood
240240
build.skillsTab:PasteSocketGroup("\z
241-
Petrified Blood 20/0 Default 1\n\z
242-
Arrogance 21/0 Default 1\n\z
241+
Petrified Blood 20/0 1\n\z
242+
Arrogance 21/0 1\n\z
243243
")
244244
build.skillsTab:ProcessSocketGroup(build.skillsTab.socketGroupList[1])
245245
build.configTab.input.customMods = "\z
@@ -263,7 +263,7 @@ describe("TestDefence", function()
263263
build.skillsTab.socketGroupList = {}
264264

265265
build.skillsTab:PasteSocketGroup("\z
266-
Petrified Blood 20/0 Default 1\n\z
266+
Petrified Blood 20/0 1\n\z
267267
")
268268
build.skillsTab:ProcessSocketGroup(build.skillsTab.socketGroupList[1])
269269
build.configTab.input.customMods = "\z
@@ -286,7 +286,7 @@ describe("TestDefence", function()
286286
build.skillsTab.socketGroupList = {}
287287

288288
build.skillsTab:PasteSocketGroup("\z
289-
Petrified Blood 20/0 Default 1\n\z
289+
Petrified Blood 20/0 1\n\z
290290
")
291291
build.skillsTab:ProcessSocketGroup(build.skillsTab.socketGroupList[1])
292292
build.configTab.input.customMods = "\z
@@ -315,7 +315,7 @@ describe("TestDefence", function()
315315
assert.are.equals(20, poolsRemaining.LifeBelowHalfLossLostOverTime)
316316

317317
build.skillsTab:PasteSocketGroup("\z
318-
Petrified Blood 20/0 Default 1\n\z
318+
Petrified Blood 20/0 1\n\z
319319
")
320320
build.skillsTab:ProcessSocketGroup(build.skillsTab.socketGroupList[1])
321321
build.configTab.input.customMods = "\z

‎spec/System/TestImpale_spec.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ describe("TestAttacks", function()
286286

287287
it("impale dual wield simultaneous attack", function()
288288
newBuild()
289-
build.skillsTab:PasteSocketGroup("Cleave 20/0 Default 1\n")
289+
build.skillsTab:PasteSocketGroup("Cleave 20/0 1\n")
290290
-- exactly 100
291291
build.itemsTab:CreateDisplayItemFromRaw("New Item\nVaal Blade\nQuality: 0\nAdds 54 to 14 physical damage\n50% chance to Impale Enemies on Hit with Attacks")
292292
build.itemsTab:AddDisplayItem()

‎spec/System/TestImportReimport_spec.lua‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ describe("TestImportReimport", function()
7878
local function assertReimportPreservesSkillSubstate(slotName, itemTypeLine, inventoryId, gemName, fieldName, fieldValue)
7979
build.skillsTab:PasteSocketGroup(string.format([[
8080
Slot: %s
81-
%s 20/0 Default 1
81+
%s 20/0 1
8282
]], slotName, gemName))
8383
runCallback("OnFrame")
8484

@@ -101,9 +101,9 @@ Slot: %s
101101
it("preserves full DPS state and manually disabled gems when reimporting items and skills", function()
102102
build.skillsTab:PasteSocketGroup([[
103103
Slot: Helmet
104-
Cleave 1/0 Default 1
105-
Heavy Strike 1/0 Default 1
106-
Added Fire Damage 1/0 Default DISABLED 1
104+
Cleave 1/0 1
105+
Heavy Strike 1/0 1
106+
Added Fire Damage 1/0 DISABLED 1
107107
]])
108108
runCallback("OnFrame")
109109

@@ -134,9 +134,9 @@ Added Fire Damage 1/0 Default DISABLED 1
134134
it("preserves full DPS state and disabled gems when reimporting with deleted equipment", function()
135135
build.skillsTab:PasteSocketGroup([[
136136
Slot: Helmet
137-
Cleave 1/0 Default 1
138-
Heavy Strike 1/0 Default 1
139-
Added Fire Damage 1/0 Default DISABLED 1
137+
Cleave 1/0 1
138+
Heavy Strike 1/0 1
139+
Added Fire Damage 1/0 DISABLED 1
140140
]])
141141
runCallback("OnFrame")
142142

@@ -162,15 +162,15 @@ Added Fire Damage 1/0 Default DISABLED 1
162162
it("preserves two socket groups when reimporting items and skills", function()
163163
build.skillsTab:PasteSocketGroup([[
164164
Slot: Helmet
165-
Cleave 1/0 Default 1
166-
Heavy Strike 1/0 Default 1
167-
Added Fire Damage 1/0 Default DISABLED 1
165+
Cleave 1/0 1
166+
Heavy Strike 1/0 1
167+
Added Fire Damage 1/0 DISABLED 1
168168
]])
169169
runCallback("OnFrame")
170170

171171
build.skillsTab:PasteSocketGroup([[
172172
Slot: Gloves
173-
Blight 20/0 Default 1
173+
Blight 20/0 1
174174
]])
175175
runCallback("OnFrame")
176176

‎spec/System/TestItemMods_spec.lua‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe("TetsItemMods", function()
88
end)
99

1010
it("Dialla's socket mods", function()
11-
build.skillsTab:PasteSocketGroup("Slot: Body Armour\nArc 20/0 Default 1\nArc 20/0 Default 1\n")
11+
build.skillsTab:PasteSocketGroup("Slot: Body Armour\nArc 20/0 1\nArc 20/0 1\n")
1212
runCallback("OnFrame")
1313

1414
build.itemsTab:CreateDisplayItemFromRaw([[Dialla's Malefaction
@@ -61,7 +61,7 @@ describe("TetsItemMods", function()
6161

6262
local lightningResBefore = build.calcsTab.mainOutput.LightningResist
6363

64-
build.skillsTab:PasteSocketGroup("Slot: Ring 1\nWrath 20/0 Default 1\n")
64+
build.skillsTab:PasteSocketGroup("Slot: Ring 1\nWrath 20/0 1\n")
6565
runCallback("OnFrame")
6666

6767
assert.are_not.equals(lightningResBefore, build.calcsTab.mainOutput.LightningResist)
@@ -96,7 +96,7 @@ describe("TetsItemMods", function()
9696
build.itemsTab:AddDisplayItem()
9797
runCallback("OnFrame")
9898

99-
build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nSmite 20/0 Default 1\n")
99+
build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nSmite 20/0 1\n")
100100
runCallback("OnFrame")
101101

102102
assert.is_true(build.calcsTab.mainEnv.keystonesAdded["Vaal Pact"])
@@ -124,7 +124,7 @@ describe("TetsItemMods", function()
124124
build.itemsTab:AddDisplayItem()
125125
runCallback("OnFrame")
126126

127-
build.skillsTab:PasteSocketGroup("Smite 20/0 Default 1\nNightblade 20/0 Default 1\n")
127+
build.skillsTab:PasteSocketGroup("Smite 20/0 1\nNightblade 20/0 1\n")
128128
runCallback("OnFrame")
129129
local nonElusiveCritMult = build.calcsTab.mainOutput.CritMultiplier
130130

@@ -160,7 +160,7 @@ describe("TetsItemMods", function()
160160
build.configTab:BuildModList()
161161
runCallback("OnFrame")
162162

163-
build.skillsTab:PasteSocketGroup("Cyclone 20/0 Default 1\nClose Combat 20/0 Default 1\n")
163+
build.skillsTab:PasteSocketGroup("Cyclone 20/0 1\nClose Combat 20/0 1\n")
164164
runCallback("OnFrame")
165165

166166
local farDPS = build.calcsTab.mainOutput.TotalDPS
@@ -200,7 +200,7 @@ describe("TetsItemMods", function()
200200

201201
it("Kalandra's Touch influence copy", function()
202202

203-
build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nSmite 20/0 Default 1\n")
203+
build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nSmite 20/0 1\n")
204204
runCallback("OnFrame")
205205

206206
local dmg = build.calcsTab.mainOutput.AverageDamage
@@ -527,7 +527,7 @@ describe("TetsItemMods", function()
527527
{range:1}(15-20)% increased Cold Damage per 1% Missing Cold Resistance, up to a maximum of 300%
528528
{range:1}(15-20)% increased Fire Damage per 1% Missing Fire Resistance, up to a maximum of 300%]])
529529
build.itemsTab:AddDisplayItem()
530-
build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nFireball 20/0 Default 1\n")
530+
build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nFireball 20/0 1\n")
531531
runCallback("OnFrame")
532532

533533
assert.are_not.equals(340, build.calcsTab.mainEnv.modDB:Sum("INC", "FireDamage"))
@@ -547,15 +547,15 @@ describe("TetsItemMods", function()
547547
Armour: 32
548548
]])
549549
build.itemsTab:AddDisplayItem()
550-
build.skillsTab:PasteSocketGroup("Arc 20/0 Default 1")
550+
build.skillsTab:PasteSocketGroup("Arc 20/0 1")
551551

552552
assert.are_not.equals(40, build.calcsTab.mainEnv.modDB:Sum("INC", { flags = ModFlag.Cast }, "Speed"))
553553
assert.are_not.equals(64, build.calcsTab.mainOutput.Armour)
554554
runCallback("OnFrame")
555555
end)
556556

557557
it("Heralds apply exposure with Heraldry", function()
558-
build.skillsTab:PasteSocketGroup("Arc 20/0 Default 1\nHerald of Thunder 20/0 Default 1\n")
558+
build.skillsTab:PasteSocketGroup("Arc 20/0 1\nHerald of Thunder 20/0 1\n")
559559
runCallback("OnFrame")
560560

561561
assert.are.equals(0.5, build.calcsTab.calcsOutput.LightningEffMult)
@@ -572,7 +572,7 @@ describe("TetsItemMods", function()
572572
end)
573573

574574
it("Enemy self curse effect", function()
575-
build.skillsTab:PasteSocketGroup("Arc 20/0 Default 1\nConductivity 14/0 Default 1\n")
575+
build.skillsTab:PasteSocketGroup("Arc 20/0 1\nConductivity 14/0 1\n")
576576
runCallback("OnFrame")
577577

578578
assert.are.equals(0.8, build.calcsTab.calcsOutput.LightningEffMult)
@@ -587,7 +587,7 @@ describe("TetsItemMods", function()
587587
end)
588588

589589
it("Max charges with conditional mod", function() -- see #9442
590-
build.skillsTab:PasteSocketGroup("Grace 20/20 Default 1\n")
590+
build.skillsTab:PasteSocketGroup("Grace 20/20 1\n")
591591
runCallback("OnFrame")
592592

593593
local baseFrenzyChargesMax = build.calcsTab.calcsOutput.FrenzyChargesMax

‎spec/System/TestSkills_spec.lua‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ describe("TestAttacks", function()
1313
runCallback("OnFrame")
1414
assert.are.equals(205, build.calcsTab.mainEnv.minion.modDB:Sum("BASE", build.calcsTab.mainEnv.minion.mainSkill.skillCfg, "ChaosMin"))
1515

16-
build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nAwakened Generosity 4/0 Default 1\n")
16+
build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nAwakened Generosity 4/0 1\n")
1717
runCallback("OnFrame")
1818
assert.are.equals(round(205 * 1.43), build.calcsTab.mainEnv.minion.modDB:Sum("BASE", build.calcsTab.mainEnv.minion.mainSkill.skillCfg, "ChaosMin"))
1919

20-
build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nAwakened Generosity 5/0 Default 1\n")
20+
build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nAwakened Generosity 5/0 1\n")
2121
runCallback("OnFrame")
2222
-- No Envy level increase, so base should still be 205
2323
assert.are.equals(round(205 * 1.44), build.calcsTab.mainEnv.minion.modDB:Sum("BASE", build.calcsTab.mainEnv.minion.mainSkill.skillCfg, "ChaosMin"))
@@ -43,10 +43,10 @@ describe("TestAttacks", function()
4343
build.itemsTab:AddDisplayItem()
4444
runCallback("OnFrame")
4545

46-
build.skillsTab:PasteSocketGroup("Mirage Archer 20/0 Default 1\nRain of Arrows 20/0 Default 1\nManaforged Arrows 20/0 Default 1\n")
46+
build.skillsTab:PasteSocketGroup("Mirage Archer 20/0 1\nRain of Arrows 20/0 1\nManaforged Arrows 20/0 1\n")
4747
runCallback("OnFrame")
4848

49-
build.skillsTab:PasteSocketGroup("Toxic Rain 20/0 Default 1\n")
49+
build.skillsTab:PasteSocketGroup("Toxic Rain 20/0 1\n")
5050
runCallback("OnFrame")
5151

5252
assert.True(build.calcsTab.mainOutput.MirageDPS ~= nil)
@@ -71,14 +71,14 @@ describe("TestAttacks", function()
7171
build.itemsTab:AddDisplayItem()
7272
runCallback("OnFrame")
7373

74-
build.skillsTab:PasteSocketGroup("Power Siphon 20/0 Default 1\nSacred Wisps 20/0 Default 1\n")
74+
build.skillsTab:PasteSocketGroup("Power Siphon 20/0 1\nSacred Wisps 20/0 1\n")
7575
runCallback("OnFrame")
7676

7777
assert.True(build.calcsTab.mainOutput.MirageDPS ~= nil)
7878
end)
7979

8080
it("Test Scorching ray applying exposure at max stages", function()
81-
build.skillsTab:PasteSocketGroup("Scorching Ray 20/0 Default 1\n")
81+
build.skillsTab:PasteSocketGroup("Scorching Ray 20/0 1\n")
8282
runCallback("OnFrame")
8383

8484
local mainSocketGroup = build.skillsTab.socketGroupList[build.mainSocketGroup]
@@ -101,7 +101,7 @@ describe("TestAttacks", function()
101101
end)
102102

103103
it("Test Adrenaline affecting blight max stage count", function()
104-
build.skillsTab:PasteSocketGroup("Blight 20/0 Default 1\n")
104+
build.skillsTab:PasteSocketGroup("Blight 20/0 1\n")
105105
runCallback("OnFrame")
106106

107107
local mainSocketGroup = build.skillsTab.socketGroupList[build.mainSocketGroup]

0 commit comments

Comments
 (0)