Skip to content

Commit e40cab5

Browse files
MusholicMusholic
authored
Merge pull request #80 from Musholic/extract_skills_from_uniques
2 parents 7da08f9 + a6b5098 commit e40cab5

25 files changed

+3054
-1884
lines changed

‎spec/System/TestBuilds_spec.lua‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ local function fetchBuilds(path, buildList)
22
buildList = buildList or {}
33
for file in lfs.dir(path) do
44
if file ~= "." and file ~= ".." then
5-
local f = path..'/'..file
6-
local attr = lfs.attributes (f)
5+
local f = path .. '/' .. file
6+
local attr = lfs.attributes(f)
77
assert(type(attr) == "table")
88
if attr.mode == "directory" then
99
fetchBuilds(f, buildList)
@@ -37,3 +37,12 @@ expose("test all builds #builds", function()
3737
end
3838
end
3939
end)
40+
41+
describe("test offline build import", function()
42+
it("should load a build from an offline save file", function()
43+
local saveFile = io.open("../spec/offline_save.json", "r")
44+
local saveFileContent = saveFile:read("*a")
45+
saveFile:close()
46+
loadBuildFromJSON(saveFileContent)
47+
end)
48+
end)

‎spec/System/TestModParse_spec.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ describe("TestModParse", function()
134134
build.configTab.input.customMods = "+40% Increased fire damage. This effect is doubled if you have 300 or more maximum mana."
135135
build.configTab:BuildModList()
136136
runCallback("OnFrame")
137-
build.skillsTab:SelSkill(1, "fi9")
137+
build.skillsTab:SelSkill(1, "Fireball")
138138
runCallback("OnFrame")
139139

140140
assert.are.equals(53, build.calcsTab.calcsOutput.Mana)

‎spec/System/TestSkills_spec.lua‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe("TestSkills #skills", function()
1414
build.itemsTab:AddDisplayItem()
1515

1616
-- Use melee skill Lunge
17-
build.skillsTab:SelSkill(1, "lu25ng")
17+
build.skillsTab:SelSkill(1, "Lunge")
1818
runCallback("OnFrame")
1919

2020
local castSpeed = 1 / build.calcsTab.mainEnv.player.mainSkill.activeEffect.grantedEffect.stats.cooldown
@@ -33,7 +33,7 @@ describe("TestSkills #skills", function()
3333
build.itemsTab:AddDisplayItem()
3434

3535
-- Use fire skill Fireball with 25 base fire damage
36-
build.skillsTab:SelSkill(1, "fi9")
36+
build.skillsTab:SelSkill(1, "Fireball")
3737

3838
runCallback("OnFrame")
3939

@@ -51,7 +51,7 @@ describe("TestSkills #skills", function()
5151
build.itemsTab:AddDisplayItem()
5252

5353
-- Use skill Wandering Spirits
54-
build.skillsTab:SelSkill(1, "ws54hm")
54+
build.skillsTab:SelSkill(1, "WanderingSpirits")
5555

5656
runCallback("OnFrame")
5757

@@ -67,7 +67,7 @@ describe("TestSkills #skills", function()
6767
build.itemsTab:AddDisplayItem()
6868

6969
-- Use melee skill Rive
70-
build.skillsTab:SelSkill(1, "sndr1")
70+
build.skillsTab:SelSkill(1, "Rive1")
7171
runCallback("OnFrame")
7272

7373
local castSpeed = 1 / build.calcsTab.mainEnv.player.mainSkill.activeEffect.grantedEffect.castTime
@@ -86,8 +86,8 @@ expose("test all skills #allSkills", function()
8686
local className = class.name
8787
local skillList = build.spec.curClass.skills
8888
for _, skill in ipairs(skillList) do
89-
it(skill.label .. " for class ".. className .. " #" .. skill.treeId, function()
90-
build.skillsTab:SelSkill(1, skill.treeId)
89+
it(skill.label .. " for class ".. className .. " #" .. skill.name, function()
90+
build.skillsTab:SelSkill(1, skill.name)
9191
runCallback("OnFrame")
9292
end)
9393
end

‎spec/TestBuilds/1.2/minions.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -938,12 +938,12 @@ Implicits: 1
938938
<Party ShowAdvanceTools="false" append="false" destination="All"></Party>
939939
<Skills activeSkillSet="1" defaultGemLevel="normalMaximum" defaultGemQuality="nil" showAltQualityGems="false" showSupportGemTypes="ALL" sortGemsByDPS="true" sortGemsByDPSField="CombinedDPS">
940940
<SkillSet id="1">
941-
<Skill enabled="true" includeInFullDPS="false" index="1" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="sw42ih" slot="Skill 1"></Skill>
942-
<Skill enabled="true" includeInFullDPS="false" index="2" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="bg36nl" slot="Skill 2"></Skill>
943-
<Skill enabled="true" includeInFullDPS="true" index="3" mainActiveSkill="1" mainActiveSkillCalcs="1" skillId="is40" slot="Skill 3"></Skill>
944-
<Skill enabled="true" includeInFullDPS="false" index="4" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="ds4d3" slot="Skill 4"></Skill>
945-
<Skill enabled="true" includeInFullDPS="false" index="5" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="ad0ry" slot="Skill 5"></Skill>
946-
<Skill enabled="true" includeInFullDPS="false" index="6" label="Poison (from Aura Of Decay)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Poison" source="SkillId:ad0ry"></Skill>
941+
<Skill enabled="true" includeInFullDPS="false" index="1" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="SummonWraith" slot="Skill 1"></Skill>
942+
<Skill enabled="true" includeInFullDPS="false" index="2" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="SummonBoneGolem" slot="Skill 2"></Skill>
943+
<Skill enabled="true" includeInFullDPS="true" index="3" mainActiveSkill="1" mainActiveSkillCalcs="1" skillId="InfernalShade" slot="Skill 3"></Skill>
944+
<Skill enabled="true" includeInFullDPS="false" index="4" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="DreadShade" slot="Skill 4"></Skill>
945+
<Skill enabled="true" includeInFullDPS="false" index="5" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="AuraOfDecay" slot="Skill 5"></Skill>
946+
<Skill enabled="true" includeInFullDPS="false" index="6" label="Poison (from Aura Of Decay)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Poison" source="SkillId:AuraOfDecay"></Skill>
947947
</SkillSet>
948948
</Skills>
949949
<Tree activeSpec="1">

‎spec/TestBuilds/1.2/tornado_dot.xml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -944,13 +944,16 @@ Implicits: 1
944944
<Party ShowAdvanceTools="false" append="false" destination="All"></Party>
945945
<Skills activeSkillSet="1" defaultGemLevel="normalMaximum" defaultGemQuality="nil" showAltQualityGems="false" showSupportGemTypes="ALL" sortGemsByDPS="true" sortGemsByDPSField="CombinedDPS">
946946
<SkillSet id="1">
947-
<Skill enabled="true" includeInFullDPS="false" index="1" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="ga2st" slot="Skill 1"></Skill>
948-
<Skill enabled="true" includeInFullDPS="false" index="2" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="wb8fo" slot="Skill 2"></Skill>
949-
<Skill enabled="true" includeInFullDPS="true" index="3" mainActiveSkill="1" mainActiveSkillCalcs="1" skillId="to50" slot="Skill 3"></Skill>
950-
<Skill enabled="true" includeInFullDPS="false" index="4" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="wc57" slot="Skill 4"></Skill>
951-
<Skill enabled="true" includeInFullDPS="false" index="5" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="sw43" slot="Skill 5"></Skill>
952-
<Skill enabled="true" includeInFullDPS="false" index="6" label="Shred Armor (from Gathering Storm)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_ArmourShred" source="SkillId:ga2st"></Skill>
953-
<Skill enabled="true" includeInFullDPS="false" index="7" label="Shred Armor (from Swipe)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_ArmourShred" source="SkillId:sw43"></Skill>
947+
<Skill enabled="true" includeInFullDPS="false" index="1" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="GatheringStormMelee" slot="Skill 1"></Skill>
948+
<Skill enabled="true" includeInFullDPS="false" index="2" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="WerebearForm" slot="Skill 2"></Skill>
949+
<Skill enabled="true" includeInFullDPS="true" index="3" mainActiveSkill="1" mainActiveSkillCalcs="1" skillId="Tornado" slot="Skill 3"></Skill>
950+
<Skill enabled="true" includeInFullDPS="false" index="4" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Warcry" slot="Skill 4"></Skill>
951+
<Skill enabled="true" includeInFullDPS="false" index="5" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Swipe" slot="Skill 5"></Skill>
952+
<Skill enabled="true" includeInFullDPS="false" index="6" label="Shred Armor (from Gathering Storm)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_ArmourShred" source="SkillId:GatheringStormMelee"></Skill>
953+
<Skill enabled="true" includeInFullDPS="false" index="7" label="Storm Bolt (from Gathering Storm)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="PrimalLightning" source="SkillId:GatheringStormMelee"></Skill>
954+
<Skill enabled="true" includeInFullDPS="false" index="8" label="Shred Armor (from Swipe)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_ArmourShred" source="SkillId:Swipe"></Skill>
955+
<Skill enabled="true" includeInFullDPS="false" index="9" label="Shred Armor (from Storm Bolt)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_ArmourShred" source="SkillId:PrimalLightning"></Skill>
956+
<Skill enabled="true" includeInFullDPS="false" index="10" label="Storm Bolt (from Storm Bolt)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="PrimalLightning" source="SkillId:PrimalLightning"></Skill>
954957
</SkillSet>
955958
</Skills>
956959
<Tree activeSpec="1">

‎spec/TestBuilds/1.2/warpath_channel.xml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
<PlayerStat stat="EffectiveMovementSpeedMod" value="1.56"></PlayerStat>
6464
<PlayerStat stat="FullDPS" value="8730.4420627375"></PlayerStat>
6565
<FullDPSSkill skillPart="" source="" stat="Smite" value="7846.0256559886"></FullDPSSkill>
66-
<FullDPSSkill skillPart="" source="sm87r4" stat="Ignite" value="826.61037795706"></FullDPSSkill>
67-
<FullDPSSkill skillPart="" source="sm87r4" stat="Electrify" value="57.806028791839"></FullDPSSkill>
66+
<FullDPSSkill skillPart="" source="Smite" stat="Ignite" value="826.61037795706"></FullDPSSkill>
67+
<FullDPSSkill skillPart="" source="Smite" stat="Electrify" value="57.806028791839"></FullDPSSkill>
6868
</Build>
6969
<Calcs>
7070
<Input name="misc_buffMode" string="EFFECTIVE"></Input>
@@ -832,29 +832,29 @@ Implicits: 1
832832
<Party ShowAdvanceTools="false" append="false" destination="All"></Party>
833833
<Skills activeSkillSet="1" defaultGemLevel="normalMaximum" defaultGemQuality="nil" showAltQualityGems="false" showSupportGemTypes="ALL" sortGemsByDPS="true" sortGemsByDPSField="CombinedDPS">
834834
<SkillSet id="1">
835-
<Skill enabled="true" includeInFullDPS="true" index="1" mainActiveSkill="1" mainActiveSkillCalcs="1" skillId="sm87r4" slot="Skill 1"></Skill>
836-
<Skill enabled="true" includeInFullDPS="false" index="2" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="va53st" slot="Skill 2"></Skill>
837-
<Skill enabled="true" includeInFullDPS="false" index="3" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="ah443" slot="Skill 3"></Skill>
838-
<Skill enabled="true" includeInFullDPS="false" index="4" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="si4lgl" slot="Skill 4"></Skill>
839-
<Skill enabled="true" includeInFullDPS="false" index="5" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="javeli" slot="Skill 5"></Skill>
840-
<Skill enabled="true" includeInFullDPS="true" index="6" label="Shred Armor (from Smite)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_ArmourShred" source="SkillId:sm87r4"></Skill>
841-
<Skill enabled="true" includeInFullDPS="true" index="7" label="Blind (from Smite)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Blind" source="SkillId:sm87r4"></Skill>
842-
<Skill enabled="true" includeInFullDPS="true" index="8" label="Electrify (from Smite)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Electrify" source="SkillId:sm87r4"></Skill>
843-
<Skill enabled="true" includeInFullDPS="true" index="9" label="Ignite (from Smite)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Ignite" source="SkillId:sm87r4"></Skill>
844-
<Skill enabled="true" includeInFullDPS="true" index="10" label="Shock (from Smite)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Shock" source="SkillId:sm87r4"></Skill>
845-
<Skill enabled="true" includeInFullDPS="false" index="11" label="Shred Armor (from Warpath)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_ArmourShred" source="SkillId:va53st"></Skill>
846-
<Skill enabled="true" includeInFullDPS="false" index="12" label="Bleed (from Warpath)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Bleed" source="SkillId:va53st"></Skill>
847-
<Skill enabled="true" includeInFullDPS="false" index="13" label="Blind (from Warpath)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Blind" source="SkillId:va53st"></Skill>
848-
<Skill enabled="true" includeInFullDPS="false" index="14" label="Electrify (from Warpath)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Electrify" source="SkillId:va53st"></Skill>
849-
<Skill enabled="true" includeInFullDPS="false" index="15" label="Shock (from Warpath)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Shock" source="SkillId:va53st"></Skill>
850-
<Skill enabled="true" includeInFullDPS="false" index="16" label="Shred Armor (from Javelin)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_ArmourShred" source="SkillId:javeli"></Skill>
851-
<Skill enabled="true" includeInFullDPS="false" index="17" label="Bleed (from Javelin)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Bleed" source="SkillId:javeli"></Skill>
852-
<Skill enabled="true" includeInFullDPS="false" index="18" label="Blind (from Javelin)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Blind" source="SkillId:javeli"></Skill>
853-
<Skill enabled="true" includeInFullDPS="false" index="19" label="Electrify (from Javelin)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Electrify" source="SkillId:javeli"></Skill>
854-
<Skill enabled="true" includeInFullDPS="false" index="20" label="Frailty (from Javelin)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Frailty" source="SkillId:javeli"></Skill>
855-
<Skill enabled="true" includeInFullDPS="false" index="21" label="Ignite (from Javelin)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Ignite" source="SkillId:javeli"></Skill>
856-
<Skill enabled="true" includeInFullDPS="false" index="22" label="Shock (from Javelin)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Shock" source="SkillId:javeli"></Skill>
857-
<Skill enabled="true" includeInFullDPS="false" index="23" label="Slow (from Javelin)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Slow" source="SkillId:javeli"></Skill>
835+
<Skill enabled="true" includeInFullDPS="true" index="1" mainActiveSkill="1" mainActiveSkillCalcs="1" skillId="Smite" slot="Skill 1"></Skill>
836+
<Skill enabled="true" includeInFullDPS="false" index="2" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Warpath" slot="Skill 2"></Skill>
837+
<Skill enabled="true" includeInFullDPS="false" index="3" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="HolyAura" slot="Skill 3"></Skill>
838+
<Skill enabled="true" includeInFullDPS="false" index="4" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="SigilsOfHope" slot="Skill 4"></Skill>
839+
<Skill enabled="true" includeInFullDPS="false" index="5" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Javelin" slot="Skill 5"></Skill>
840+
<Skill enabled="true" includeInFullDPS="true" index="6" label="Shred Armor (from Smite)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_ArmourShred" source="SkillId:Smite"></Skill>
841+
<Skill enabled="true" includeInFullDPS="true" index="7" label="Blind (from Smite)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Blind" source="SkillId:Smite"></Skill>
842+
<Skill enabled="true" includeInFullDPS="true" index="8" label="Electrify (from Smite)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Electrify" source="SkillId:Smite"></Skill>
843+
<Skill enabled="true" includeInFullDPS="true" index="9" label="Ignite (from Smite)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Ignite" source="SkillId:Smite"></Skill>
844+
<Skill enabled="true" includeInFullDPS="true" index="10" label="Shock (from Smite)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Shock" source="SkillId:Smite"></Skill>
845+
<Skill enabled="true" includeInFullDPS="false" index="11" label="Shred Armor (from Warpath)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_ArmourShred" source="SkillId:Warpath"></Skill>
846+
<Skill enabled="true" includeInFullDPS="false" index="12" label="Bleed (from Warpath)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Bleed" source="SkillId:Warpath"></Skill>
847+
<Skill enabled="true" includeInFullDPS="false" index="13" label="Blind (from Warpath)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Blind" source="SkillId:Warpath"></Skill>
848+
<Skill enabled="true" includeInFullDPS="false" index="14" label="Electrify (from Warpath)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Electrify" source="SkillId:Warpath"></Skill>
849+
<Skill enabled="true" includeInFullDPS="false" index="15" label="Shock (from Warpath)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Shock" source="SkillId:Warpath"></Skill>
850+
<Skill enabled="true" includeInFullDPS="false" index="16" label="Shred Armor (from Javelin)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_ArmourShred" source="SkillId:Javelin"></Skill>
851+
<Skill enabled="true" includeInFullDPS="false" index="17" label="Bleed (from Javelin)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Bleed" source="SkillId:Javelin"></Skill>
852+
<Skill enabled="true" includeInFullDPS="false" index="18" label="Blind (from Javelin)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Blind" source="SkillId:Javelin"></Skill>
853+
<Skill enabled="true" includeInFullDPS="false" index="19" label="Electrify (from Javelin)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Electrify" source="SkillId:Javelin"></Skill>
854+
<Skill enabled="true" includeInFullDPS="false" index="20" label="Frailty (from Javelin)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Frailty" source="SkillId:Javelin"></Skill>
855+
<Skill enabled="true" includeInFullDPS="false" index="21" label="Ignite (from Javelin)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Ignite" source="SkillId:Javelin"></Skill>
856+
<Skill enabled="true" includeInFullDPS="false" index="22" label="Shock (from Javelin)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Shock" source="SkillId:Javelin"></Skill>
857+
<Skill enabled="true" includeInFullDPS="false" index="23" label="Slow (from Javelin)" mainActiveSkill="1" mainActiveSkillCalcs="nil" skillId="Ailment_Slow" source="SkillId:Javelin"></Skill>
858858
</SkillSet>
859859
</Skills>
860860
<Tree activeSpec="1">

0 commit comments

Comments
 (0)