Skip to content

Commit

Permalink
update folder names
Browse files Browse the repository at this point in the history
  • Loading branch information
Regisle committed Sep 10, 2024
1 parent 03f9bed commit 4f9d478
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions fix_ascendancy_positions.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,12 @@ def main(root: pathlib.Path) -> None:
logging.info(f"Found and processed file '{file}'.")
fix_ascendancy_positions(os.path.join(fileLocation, "ruthless.json"), True)
for file2 in fileLocation.glob("**/*-3.png"):
dirPath = pathlib.Path("src/TreeData/assets/" + os.path.basename(file2).removesuffix(".png"))
dirPath = pathlib.Path("src/TreeData/Assets/" + os.path.basename(file2).removesuffix(".png"))
if not dirPath.is_dir():
dirPath.mkdir()
file2.rename(os.path.join(dirPath, versionNumber + ".png"))
for file2 in fileLocation.glob("**/*-3.jpg"):
dirPath = pathlib.Path("src/TreeData/assets/" + os.path.basename(file2).removesuffix(".jpg"))
dirPath = pathlib.Path("src/TreeData/Assets/" + os.path.basename(file2).removesuffix(".jpg"))
if not dirPath.is_dir():
dirPath.mkdir()
file2.rename(os.path.join(dirPath, versionNumber + ".jpg"))
Expand Down
24 changes: 12 additions & 12 deletions src/Classes/PassiveTree.lua
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
local versionNum = treeVersions[treeVersion].num

ConPrintf("Loading passive tree data for version '%s'...", treeVersions[treeVersion].display)
for k, v in pairs(assert(loadstring(getFile("data/"..treeVersion, (treeVersion:match("ruthless") and treeVersion:gsub("_ruthless", "/ruthless")) or (treeVersion.."/data"))))()) do
for k, v in pairs(assert(loadstring(getFile("Data/"..treeVersion, (treeVersion:match("ruthless") and treeVersion:gsub("_ruthless", "/ruthless")) or (treeVersion.."/data"))))()) do
self[k] = v
end

Expand Down Expand Up @@ -185,7 +185,7 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
[6] = "centershadow"
}
if not self.assets then
self.assets = LoadModule("TreeData/assets/data/Assets.lua")
self.assets = LoadModule("TreeData/Assets/data/Assets.lua")
self.assets = self.assets.assets
if self.alternate_ascendancies then
-- backgrounds
Expand Down Expand Up @@ -622,7 +622,7 @@ function PassiveTreeClass:LoadAndBuildSheets()
if not self.skillSprites then
if not self.sprites then
ConPrintf("Loading passive tree sprite data for version '%s'...", treeVersions[treeVersion].display)
for k, v in pairs(assert(loadstring(getFile("assets/data/"..treeVersion, (treeVersion:match("ruthless") and treeVersion:gsub("_ruthless", "/sprites_ruthless")) or (treeVersion.."/sprites"))))()) do
for k, v in pairs(assert(loadstring(getFile("Assets/data/"..treeVersion, (treeVersion:match("ruthless") and treeVersion:gsub("_ruthless", "/sprites_ruthless")) or (treeVersion.."/sprites"))))()) do
self[k] = v
end
end
Expand Down Expand Up @@ -681,14 +681,14 @@ function PassiveTreeClass:LoadAndBuildSheets()
end
else
main.tree.legionSheets = {}
local legionSprites = LoadModule("TreeData/assets/legion/tree-legion.lua")
local legionSprites = LoadModule("TreeData/Assets/legion/tree-legion.lua")
for type, data in pairs(legionSprites) do
local maxZoom = data[#data]
local sheet = spriteSheets[maxZoom.filename]
if not sheet then
sheet = { }
sheet.handle = NewImageHandle()
sheet.handle:Load("TreeData/assets/legion/"..maxZoom.filename)
sheet.handle:Load("TreeData/Assets/legion/"..maxZoom.filename)
sheet.width, sheet.height = sheet.handle:ImageSize()
spriteSheets[maxZoom.filename] = sheet
end
Expand Down Expand Up @@ -773,13 +773,13 @@ function PassiveTreeClass:LoadSheet(imgName, url, data, ...)
end
while index > 1 do
local spriteSheet = imgName:gsub(".jpg", ""):gsub(".png", "").."/"..treeVersionList[index]..(imgName:match(".jpg") and ".jpg" or imgName:match(".png") and ".png")
local imgFile = io.open("TreeData/assets/"..spriteSheet, "r")
local imgFile = io.open("TreeData/Assets/"..spriteSheet, "r")
if imgFile then
imgFile:close()
imgName = spriteSheet
break
elseif treeVersionList[index]:match("ruthless") then
imgFile = io.open("TreeData/assets/"..spriteSheet:gsub("_ruthless",""), "r")
imgFile = io.open("TreeData/Assets/"..spriteSheet:gsub("_ruthless",""), "r")
if imgFile then
imgFile:close()
imgName = spriteSheet:gsub("_ruthless","")
Expand All @@ -789,7 +789,7 @@ function PassiveTreeClass:LoadSheet(imgName, url, data, ...)
ConPrintf("Downloading '%s'...", imgName)
local data = getFileAtURL(url)
if data and not data:match("<!DOCTYPE html>") then
imgFile = io.open("TreeData/assets/non_sprite/"..imgName, "wb")
imgFile = io.open("TreeData/Assets/non_sprite/"..imgName, "wb")
imgFile:write(data)
imgFile:close()
else
Expand All @@ -800,29 +800,29 @@ function PassiveTreeClass:LoadSheet(imgName, url, data, ...)
index = index - 1
end
data.handle = NewImageHandle()
data.handle:Load("TreeData/assets/"..imgName, ...)
data.handle:Load("TreeData/Assets/"..imgName, ...)
data.width, data.height = data.handle:ImageSize()
end

-- Checks if a given image is present and downloads it from the given URL if it isn't there
function PassiveTreeClass:LoadImage(imgName, url, data, ...)
local imgFile = io.open("TreeData/assets/non_sprite/"..imgName, "r")
local imgFile = io.open("TreeData/Assets/non_sprite/"..imgName, "r")
if imgFile then
imgFile:close()
imgName = "" .. imgName
elseif main.allowTreeDownload then -- Enable downloading with Ctrl+Shift+F5 (currently disabled)
ConPrintf("Downloading '%s'...", imgName)
local data = getFileAtURL(url)
if data and not data:match("<!DOCTYPE html>") then
imgFile = io.open("TreeData/assets/non_sprite/"..imgName, "wb")
imgFile = io.open("TreeData/Assets/non_sprite/"..imgName, "wb")
imgFile:write(data)
imgFile:close()
else
ConPrintf("Failed to download: %s", url)
end
end
data.handle = NewImageHandle()
data.handle:Load("TreeData/assets/non_sprite/"..imgName, ...)
data.handle:Load("TreeData/Assets/non_sprite/"..imgName, ...)
data.width, data.height = data.handle:ImageSize()
end

Expand Down
20 changes: 10 additions & 10 deletions src/Classes/PassiveTreeView.lua
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,25 @@ local PassiveTreeViewClass = newClass("PassiveTreeView", function(self)
self.jewelShadedInnerRingFlipped:Load("Assets/ShadedInnerRingFlipped.png", "CLAMP")

self.eternal1 = NewImageHandle()
self.eternal1:Load("TreeData/assets/non_sprite/PassiveSkillScreenEternalEmpireJewelCircle1.png", "CLAMP")
self.eternal1:Load("TreeData/Assets/non_sprite/PassiveSkillScreenEternalEmpireJewelCircle1.png", "CLAMP")
self.eternal2 = NewImageHandle()
self.eternal2:Load("TreeData/assets/non_sprite/PassiveSkillScreenEternalEmpireJewelCircle2.png", "CLAMP")
self.eternal2:Load("TreeData/Assets/non_sprite/PassiveSkillScreenEternalEmpireJewelCircle2.png", "CLAMP")
self.karui1 = NewImageHandle()
self.karui1:Load("TreeData/assets/non_sprite/PassiveSkillScreenKaruiJewelCircle1.png", "CLAMP")
self.karui1:Load("TreeData/Assets/non_sprite/PassiveSkillScreenKaruiJewelCircle1.png", "CLAMP")
self.karui2 = NewImageHandle()
self.karui2:Load("TreeData/assets/non_sprite/PassiveSkillScreenKaruiJewelCircle2.png", "CLAMP")
self.karui2:Load("TreeData/Assets/non_sprite/PassiveSkillScreenKaruiJewelCircle2.png", "CLAMP")
self.maraketh1 = NewImageHandle()
self.maraketh1:Load("TreeData/assets/non_sprite/PassiveSkillScreenMarakethJewelCircle1.png", "CLAMP")
self.maraketh1:Load("TreeData/Assets/non_sprite/PassiveSkillScreenMarakethJewelCircle1.png", "CLAMP")
self.maraketh2 = NewImageHandle()
self.maraketh2:Load("TreeData/assets/non_sprite/PassiveSkillScreenMarakethJewelCircle2.png", "CLAMP")
self.maraketh2:Load("TreeData/Assets/non_sprite/PassiveSkillScreenMarakethJewelCircle2.png", "CLAMP")
self.templar1 = NewImageHandle()
self.templar1:Load("TreeData/assets/non_sprite/PassiveSkillScreenTemplarJewelCircle1.png", "CLAMP")
self.templar1:Load("TreeData/Assets/non_sprite/PassiveSkillScreenTemplarJewelCircle1.png", "CLAMP")
self.templar2 = NewImageHandle()
self.templar2:Load("TreeData/assets/non_sprite/PassiveSkillScreenTemplarJewelCircle2.png", "CLAMP")
self.templar2:Load("TreeData/Assets/non_sprite/PassiveSkillScreenTemplarJewelCircle2.png", "CLAMP")
self.vaal1 = NewImageHandle()
self.vaal1:Load("TreeData/assets/non_sprite/PassiveSkillScreenVaalJewelCircle1.png", "CLAMP")
self.vaal1:Load("TreeData/Assets/non_sprite/PassiveSkillScreenVaalJewelCircle1.png", "CLAMP")
self.vaal2 = NewImageHandle()
self.vaal2:Load("TreeData/assets/non_sprite/PassiveSkillScreenVaalJewelCircle2.png", "CLAMP")
self.vaal2:Load("TreeData/Assets/non_sprite/PassiveSkillScreenVaalJewelCircle2.png", "CLAMP")

self.tooltip = new("Tooltip")

Expand Down
2 changes: 1 addition & 1 deletion src/Classes/Tooltip.lua
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ local recipeNames = {
local recipeImages = { }
for _, recipeName in pairs(recipeNames) do
recipeImages[recipeName] = NewImageHandle()
recipeImages[recipeName]:Load("TreeData/assets/oils/" .. recipeName .. ".png", "CLAMP")
recipeImages[recipeName]:Load("TreeData/Assets/oils/" .. recipeName .. ".png", "CLAMP")
end

local TooltipClass = newClass("Tooltip", function(self)
Expand Down

0 comments on commit 4f9d478

Please sign in to comment.