diff --git a/WaiTex_1.0.0/AllowedTextureChanges.lua b/WaiTex_1.0.1/AllowedTextureChanges.lua similarity index 91% rename from WaiTex_1.0.0/AllowedTextureChanges.lua rename to WaiTex_1.0.1/AllowedTextureChanges.lua index 736573e..54a4cd4 100644 --- a/WaiTex_1.0.0/AllowedTextureChanges.lua +++ b/WaiTex_1.0.1/AllowedTextureChanges.lua @@ -24,7 +24,7 @@ TexturePermissions = ["burner-mining-drill"] = {["enabled"] = true, ["requiredGB"] = 1}, ["car"] = {["enabled"] = true, ["requiredGB"] = 2}, --1GB ["cargo-wagon"] = {["enabled"] = true, ["requiredGB"] = 2}, --1GB - ["chemical-plant"] = {["enabled"] = true, ["requiredGB"] = 1}, + ["chemical-plant"] = {["enabled"] = true, ["requiredGB"] = 1}, --UPDATED ["coal"] = {["enabled"] = true, ["requiredGB"] = 1}, ["coal-particle"] = {["enabled"] = false,["requiredGB"] = 3}, --1GB ["copper-ore-particle"] = {["enabled"] = false,["requiredGB"] = 3}, --1GB @@ -40,19 +40,19 @@ TexturePermissions = ["diesel-locomotive"] = {["enabled"] = true, ["requiredGB"] = 2}, --1GB ["electric-furnace"] = {["enabled"] = true, ["requiredGB"] = 1}, ["express-splitter"] = {["enabled"] = true, ["requiredGB"] = 1}, - ["express-transport-belt"] = {["enabled"] = true, ["requiredGB"] = 1}, --NEWNEW + ["express-transport-belt"] = {["enabled"] = true, ["requiredGB"] = 1}, ["express-transport-belt-to-ground"] = {["enabled"] = true, ["requiredGB"] = 1}, ["explosion"] = {["enabled"] = true, ["requiredGB"] = 2}, --1GB ["explosion-gunshot"] = {["enabled"] = true, ["requiredGB"] = 2}, --1GB ["explosion-hit"] = {["enabled"] = true, ["requiredGB"] = 2}, --1GB ["explosive-rocket"] = {["enabled"] = true, ["requiredGB"] = 2}, --1GB - ["fast-inserter"] = {["enabled"] = true, ["requiredGB"] = 1}, + ["fast-inserter"] = {["enabled"] = true, ["requiredGB"] = 1}, --FIXED ["fast-splitter"] = {["enabled"] = true, ["requiredGB"] = 1}, - ["fast-transport-belt"] = {["enabled"] = true, ["requiredGB"] = 1}, --NEWNEW + ["fast-transport-belt"] = {["enabled"] = true, ["requiredGB"] = 1}, ["fast-transport-belt-to-ground"] = {["enabled"] = true, ["requiredGB"] = 1}, ["flame-thrower-explosion"] = {["enabled"] = true, ["requiredGB"] = 3}, ["gate"] = {["enabled"] = true, ["requiredGB"] = 1}, - ["gun-turret"] = {["enabled"] = true, ["requiredGB"] = 1}, --NEWNEW + ["gun-turret"] = {["enabled"] = true, ["requiredGB"] = 1}, ["iron-chest"] = {["enabled"] = true, ["requiredGB"] = 1}, ["iron-ore"] = {["enabled"] = true, ["requiredGB"] = 1}, ["lab"] = {["enabled"] = true, ["requiredGB"] = 1}, @@ -68,7 +68,7 @@ TexturePermissions = ["medium-electric-pole"] = {["enabled"] = true, ["requiredGB"] = 1}, ["medium-explosion"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB ["offshore-pump"] = {["enabled"] = true, ["requiredGB"] = 1}, - ["oil-refinery"] = {["enabled"] = true, ["requiredGB"] = 1}, + ["oil-refinery"] = {["enabled"] = true, ["requiredGB"] = 1}, --UPDATED ["pipe"] = {["enabled"] = true, ["requiredGB"] = 1}, ["pipe-covers"] = {["enabled"] = true, ["requiredGB"] = 1}, ["pipe-to-ground"] = {["enabled"] = true, ["requiredGB"] = 1}, @@ -76,19 +76,19 @@ TexturePermissions = ["radar"] = {["enabled"] = true, ["requiredGB"] = 1}, ["rail-chain-signal"] = {["enabled"] = true, ["requiredGB"] = 1}, ["remnants"] = {["enabled"] = true, ["requiredGB"] = 3}, - ["player"] = {["enabled"] = true, ["requiredGB"] = 2}, --cropcache.dat --1GB + ["player"] = {["enabled"] = true, ["requiredGB"] = 2}, --cropcache.dat --1GB --UPDATED ["rail-signal"] = {["enabled"] = true, ["requiredGB"] = 1}, ["roboport"] = {["enabled"] = true, ["requiredGB"] = 1}, ["rocket-silo"] = {["enabled"] = true, ["requiredGB"] = 2}, --1GB ["rocket-silo-rocket"] = {["enabled"] = true, ["requiredGB"] = 2}, --1GB ["small-electric-pole"] = {["enabled"] = true, ["requiredGB"] = 1}, ["small-lamp"] = {["enabled"] = true, ["requiredGB"] = 1}, - ["small-pump"] = {["enabled"] = true, ["requiredGB"] = 1}, + ["small-pump"] = {["enabled"] = true, ["requiredGB"] = 1}, --UPDATED ["scorchmark"] = {["enabled"] = true, ["requiredGB"] = 2}, --1GB ["slowdown-sticker"] = {["enabled"] = true, ["requiredGB"] = 3}, ["ship-wreck"] = {["enabled"] = true, ["requiredGB"] = 2}, --1GB ["smart-chest"] = {["enabled"] = true, ["requiredGB"] = 1}, - ["smart-inserter"] = {["enabled"] = true, ["requiredGB"] = 1}, + ["smart-inserter"] = {["enabled"] = true, ["requiredGB"] = 1}, --FIXED ["solar-panel"] = {["enabled"] = true, ["requiredGB"] = 1}, ["sparks"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB ["steam-engine"] = {["enabled"] = true, ["requiredGB"] = 2}, --1GB @@ -97,57 +97,53 @@ TexturePermissions = ["stone"] = {["enabled"] = true, ["requiredGB"] = 1}, ["stone-particle"] = {["enabled"] = true, ["requiredGB"] = 3}, ["stone-furnace"] = {["enabled"] = true, ["requiredGB"] = 1}, - ["stone-wall"] = {["enabled"] = true, ["requiredGB"] = 1}, - ["storage-tank"] = {["enabled"] = true, ["requiredGB"] = 1}, + ["stone-wall"] = {["enabled"] = true, ["requiredGB"] = 1}, --UPDATED + ["storage-tank"] = {["enabled"] = true, ["requiredGB"] = 1}, --UPDATED ["straight-rail"] = {["enabled"] = true, ["requiredGB"] = 1}, --WIP ["substation"] = {["enabled"] = true, ["requiredGB"] = 1}, ["tank"] = {["enabled"] = true, ["requiredGB"] = 2}, --1GB ["train-stop"] = {["enabled"] = true, ["requiredGB"] = 1}, - ["tree"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW + ["tree"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB ["water-splash"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB ["wooden-chest"] = {["enabled"] = true, ["requiredGB"] = 1}, --biters - ["small-biter"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW - ["medium-biter"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW - ["big-biter"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW - ["behemoth-biter"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW + ["small-biter"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["medium-biter"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["big-biter"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["behemoth-biter"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --corpses - ["small-biter-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW - ["medium-biter-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW - ["big-biter-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW - ["behemoth-biter-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW + ["small-biter-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["medium-biter-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["big-biter-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["behemoth-biter-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --spitters - ["small-spitter"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW - ["medium-spitter"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW - ["big-spitter"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW - ["behemoth-spitter"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW + ["small-spitter"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["medium-spitter"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["big-spitter"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["behemoth-spitter"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --corpses - ["small-spitter-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW - ["medium-spitter-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW - ["big-spitter-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW - ["behemoth-spitter-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW + ["small-spitter-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["medium-spitter-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["big-spitter-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["behemoth-spitter-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --worm - ["small-worm-turret"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW - ["medium-worm-turret"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW - ["big-worm-turret"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW + ["small-worm-turret"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["medium-worm-turret"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["big-worm-turret"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --corpse - ["small-worm-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW - ["medium-worm-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW - ["big-worm-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --NEWNEW + ["small-worm-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["medium-worm-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["big-worm-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --spawners - ["biter-spawner"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --UPDATED - ["spitter-spawner"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --UPDATED + ["biter-spawner"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["spitter-spawner"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --corpse - ["biter-spawner-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --UPDATED - ["spitter-spawner-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB --UPDATED + ["biter-spawner-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB + ["spitter-spawner-corpse"] = {["enabled"] = true, ["requiredGB"] = 3}, --1GB - -- Added better mod support - -- Added basic transport belt - -- Added fast transport belt - -- added express transport belt - -- Changed to the new steel furnace + -- Fixed tree bug } \ No newline at end of file diff --git a/WaiTex_1.0.0/data-final-fixes.lua b/WaiTex_1.0.1/data-final-fixes.lua similarity index 100% rename from WaiTex_1.0.0/data-final-fixes.lua rename to WaiTex_1.0.1/data-final-fixes.lua diff --git a/WaiTex_1.0.0/info.json b/WaiTex_1.0.1/info.json similarity index 92% rename from WaiTex_1.0.0/info.json rename to WaiTex_1.0.1/info.json index b9f5687..948c781 100644 --- a/WaiTex_1.0.0/info.json +++ b/WaiTex_1.0.1/info.json @@ -1,7 +1,7 @@ { "name":"WaiTex", "author":"keyboardhack", - "version":"1.0.0", + "version":"1.0.1", "title":"WaiTex", "homepage":"http://www.factorioforums.com/forum/viewtopic.php?f=144&t=13142", "description":"HD textures for all vanilla items", diff --git a/WaiTex_1.0.0/prototypes/Base-Override.lua b/WaiTex_1.0.1/prototypes/Base-Override.lua similarity index 89% rename from WaiTex_1.0.0/prototypes/Base-Override.lua rename to WaiTex_1.0.1/prototypes/Base-Override.lua index 6456e7b..511b004 100644 --- a/WaiTex_1.0.0/prototypes/Base-Override.lua +++ b/WaiTex_1.0.1/prototypes/Base-Override.lua @@ -291,6 +291,22 @@ local ChangeTextureConfiguration = ChangeAnimation(t[#t - 2].stripes[3], 4, 10) end end, + --["__base__/graphics/entity/car/car-1.png"] = function(t) + -- if #t > 2 then + -- print("sdfsfdsf") + -- TextureToSpritesConverter(t[#t - 2], "__WaiTex__/graphics/entity/car/car-&/car-&-") + -- end + --end, + --["__base__/graphics/entity/car/car-mask-1.png"] = function(t) + -- if #t > 2 then + -- TextureToSpritesConverter(t[#t - 2], "__WaiTex__/graphics/entity/car/car-mask-&/car-mask-&-") + -- t[#t] = nil + -- t[#t] = nil + -- --serpent.block(t[#t - 2]) + -- --t[#t - 2] = nil + -- --t[#t - 3] = nil + -- end + --end, ["__base__/graphics/entity/car/car-turret.png"] = function(t) OverrideSprite(t[#t]) end, @@ -305,7 +321,7 @@ local ChangeTextureConfiguration = end, - --[[cargo-wagon]]-- + --[[chemical-plant]]-- ["__base__/graphics/entity/chemical-plant/chemical-plant.png"] = function(t) OverrideSprite(t[#t]) end, @@ -722,50 +738,116 @@ local ChangeTextureConfiguration = --[[player]]-- - --[[level 1]]-- ["__base__/graphics/entity/player/player-basic-idle.png"] = function(t) - AddStripes(t[#t], 1, 1, CreateFilePaths("__WaiTex__/graphics/entity/player/player-basic-idle/player-basic-idle-", ".png", 176)) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-basic-idle/player-basic-idle-", ".png") + end, + ["__base__/graphics/entity/player/player-basic-idle-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-basic-idle-color/player-basic-idle-color-", ".png") end, ["__base__/graphics/entity/player/player-basic-idle-gun.png"] = function(t) - AddStripes(t[#t], 1, 1, CreateFilePaths("__WaiTex__/graphics/entity/player/player-basic-idle-gun/player-basic-idle-gun-", ".png", 176)) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-basic-idle-gun/player-basic-idle-gun-", ".png") + end, + ["__base__/graphics/entity/player/player-basic-idle-gun-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-basic-idle-gun-color/player-basic-idle-gun-color-", ".png") end, ["__base__/graphics/entity/player/player-basic-mine.png"] = function(t) - OverrideSprite(t[#t], nil, "__WaiTex__/graphics/entity/player/player-basic-mine.png") + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-basic-mine/player-basic-mine-", ".png") + end, + ["__base__/graphics/entity/player/player-basic-mine-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-basic-mine-color/player-basic-mine-color-", ".png") end, ["__base__/graphics/entity/player/player-basic-mine-tool.png"] = function(t) - AddStripes(t[#t], nil, nil, (function() - result = {} - for i = 1, 16 do - result[#result + 1] = {"__WaiTex__/graphics/entity/player/player-basic-mine-tool/player-basic-mine-tool-"..tostring(i).."-1.png", 7, 1} - result[#result + 1] = {"__WaiTex__/graphics/entity/player/player-basic-mine-tool/player-basic-mine-tool-"..tostring(i).."-2.png", 6, 1} - end - return result - end)()) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-basic-mine-tool/player-basic-mine-tool-", ".png") end, - ["__base__/graphics/entity/player/player-basic-run-gun.png"] = function(t) - AddStripes(t[#t], 11, 1, CreateFilePaths("__WaiTex__/graphics/entity/player/player-basic-run-gun/player-basic-run-gun-", ".png", 36)) + ["__base__/graphics/entity/player/player-basic-mine-tool-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-basic-mine-tool-color/player-basic-mine-tool-color-", ".png") + end, + ["__base__/graphics/entity/player/player-basic-run-gun.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-basic-run-gun/player-basic-run-gun-", ".png") + end, + ["__base__/graphics/entity/player/player-basic-run-gun-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-basic-run-gun-color/player-basic-run-gun-color-", ".png") end, ["__base__/graphics/entity/player/player-basic-run.png"] = function(t) - AddStripes(t[#t], 11, 1, CreateFilePaths("__WaiTex__/graphics/entity/player/player-basic-run/player-basic-run-", ".png", 16)) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-basic-run/player-basic-run-", ".png") + end, + ["__base__/graphics/entity/player/player-basic-run-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-basic-run-color/player-basic-run-color-", ".png") + end, + + ["__base__/graphics/entity/player/player-armor1-idle.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor1-idle/player-armor1-idle-", ".png") + end, + ["__base__/graphics/entity/player/player-armor1-idle-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor1-idle-color/player-armor1-idle-color-", ".png") + end, + ["__base__/graphics/entity/player/player-armor1-idle-gun.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor1-idle-gun/player-armor1-idle-gun-", ".png") + end, + ["__base__/graphics/entity/player/player-armor1-idle-gun-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor1-idle-gun-color/player-armor1-idle-gun-color-", ".png") + end, + ["__base__/graphics/entity/player/player-armor1-mine.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor1-mine/player-armor1-mine-", ".png") + end, + ["__base__/graphics/entity/player/player-armor1-mine-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor1-mine-color/player-armor1-mine-color-", ".png") end, - --[[level 2]]-- - ["__base__/graphics/entity/player/player-armor1-idle.png"] = function(t) OverrideSprite(t[#t]) end, - ["__base__/graphics/entity/player/player-armor1-idle-gun.png"] = function(t) OverrideSprite(t[#t]) end, - ["__base__/graphics/entity/player/player-armor1-mine.png"] = function(t) OverrideSprite(t[#t]) end, ["__base__/graphics/entity/player/player-armor1-mine-tool.png"] = function(t) - AddStripes(t[#t], 13, 1, CreateFilePaths("__WaiTex__/graphics/entity/player/player-armor1-mine-tool/player-armor1-mine-tool-", ".png", 16)) - end, - ["__base__/graphics/entity/player/player-armor1-run-gun.png"] = function(t) OverrideSprite(t[#t]) end, - ["__base__/graphics/entity/player/player-armor1-run.png"] = function(t) OverrideSprite(t[#t]) end, - --[[level 3]]-- - ["__base__/graphics/entity/player/player-armor2-idle.png"] = function(t) OverrideSprite(t[#t]) end, - ["__base__/graphics/entity/player/player-armor2-idle-gun.png"] = function(t) OverrideSprite(t[#t]) end, - ["__base__/graphics/entity/player/player-armor2-mine.png"] = function(t) OverrideSprite(t[#t]) end, + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor1-mine-tool/player-armor1-mine-tool-", ".png") + end, + ["__base__/graphics/entity/player/player-armor1-mine-tool-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor1-mine-tool-color/player-armor1-mine-tool-color-", ".png") + end, + ["__base__/graphics/entity/player/player-armor1-run-gun.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor1-run-gun/player-armor1-run-gun-", ".png") + end, + ["__base__/graphics/entity/player/player-armor1-run-gun-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor1-run-gun-color/player-armor1-run-gun-color-", ".png") + end, + ["__base__/graphics/entity/player/player-armor1-run.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor1-run/player-armor1-run-", ".png") + end, + ["__base__/graphics/entity/player/player-armor1-run-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor1-run-color/player-armor1-run-color-", ".png") + end, + + ["__base__/graphics/entity/player/player-armor2-idle.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor2-idle/player-armor2-idle-", ".png") + end, + ["__base__/graphics/entity/player/player-armor2-idle-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor2-idle-color/player-armor2-idle-color-", ".png") + end, + ["__base__/graphics/entity/player/player-armor2-idle-gun.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor2-idle-gun/player-armor2-idle-gun-", ".png") + end, + ["__base__/graphics/entity/player/player-armor2-idle-gun-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor2-idle-gun-color/player-armor2-idle-gun-color-", ".png") + end, + ["__base__/graphics/entity/player/player-armor2-mine.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor2-mine/player-armor2-mine-", ".png") + end, + ["__base__/graphics/entity/player/player-armor2-mine-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor2-mine-color/player-armor2-mine-color-", ".png") + end, ["__base__/graphics/entity/player/player-armor2-mine-tool.png"] = function(t) - AddStripes(t[#t], 13, 1, CreateFilePaths("__WaiTex__/graphics/entity/player/player-armor2-mine-tool/player-armor2-mine-tool-", ".png", 16)) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor2-mine-tool/player-armor2-mine-tool-", ".png") + end, + ["__base__/graphics/entity/player/player-armor2-mine-tool-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor2-mine-tool-color/player-armor2-mine-tool-color-", ".png") + end, + ["__base__/graphics/entity/player/player-armor2-run-gun.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor2-run-gun/player-armor2-run-gun-", ".png") + end, + ["__base__/graphics/entity/player/player-armor2-run-gun-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor2-run-gun-color/player-armor2-run-gun-color-", ".png") + end, + ["__base__/graphics/entity/player/player-armor2-run.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor2-run/player-armor2-run-", ".png") + end, + ["__base__/graphics/entity/player/player-armor2-run-color.png"] = function(t) + TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/player/player-armor2-run-color/player-armor2-run-color-", ".png") end, - ["__base__/graphics/entity/player/player-armor2-run-gun.png"] = function(t) OverrideSprite(t[#t]) end, - ["__base__/graphics/entity/player/player-armor2-run.png"] = function(t) OverrideSprite(t[#t]) end, --[[rail-signal]]-- @@ -850,27 +932,16 @@ local ChangeTextureConfiguration = --[[smart-inserter]]-- - --["__base__/graphics/entity/smart-inserter/smart-inserter-hand-base.png"] = function(t) OverrideSprite(t[#t], 1) end, - --["__base__/graphics/entity/smart-inserter/smart-inserter-hand-closed.png"] = function(t) OverrideSprite(t[#t], 1) end, - --["__base__/graphics/entity/smart-inserter/smart-inserter-hand-open.png"] = function(t) OverrideSprite(t[#t], 1) end, - ["__base__/graphics/entity/smart-inserter/smart-inserter-hand-base.png"] = function(t) OverrideSprite(t[#t]) end, - ["__base__/graphics/entity/smart-inserter/smart-inserter-hand-closed.png"] = function(t) - t[#t].priority = "extra-high-no-scale" - OverrideSprite(t[#t]) - end, - ["__base__/graphics/entity/smart-inserter/smart-inserter-hand-open.png"] = function(t) - t[#t].priority = "extra-high-no-scale" - OverrideSprite(t[#t]) - end, - ["__base__/graphics/entity/smart-inserter/smart-inserter-platform.png"] = function(t) - t[#t].priority = "extra-high-no-scale" - OverrideSprite(t[#t]) - end, + ["__base__/graphics/entity/smart-inserter/smart-inserter-hand-base.png"] = function(t) OverrideSprite(t[#t], 1) end, + ["__base__/graphics/entity/smart-inserter/smart-inserter-hand-closed.png"] = function(t) OverrideSprite(t[#t], 1) end, + ["__base__/graphics/entity/smart-inserter/smart-inserter-hand-open.png"] = function(t) OverrideSprite(t[#t], 1) end, + ["__base__/graphics/entity/smart-inserter/smart-inserter-platform.png"] = function(t) OverrideSprite(t[#t]) end, --[[solar-panel]]-- ["__base__/graphics/entity/solar-panel/solar-panel.png"] = function(t) OverrideSprite(t[#t]) end, + --[[sparks]]-- ["__base__/graphics/entity/sparks/sparks-01.png"] = function(t) OverrideSprite(t[#t]) end, ["__base__/graphics/entity/sparks/sparks-02.png"] = function(t) OverrideSprite(t[#t]) end, @@ -1141,10 +1212,10 @@ function RecursiveOverrideBaseTextures(t) return true end elseif type(v) == "table" then - t[#t + 1] = v + local index = #t + 1 + t[index] = v RecursiveOverrideBaseTextures(t) - --require("util") - t[#t] = nil + t[index] = nil end end end @@ -1221,16 +1292,18 @@ if AllowChange("tree") then for k,trees in pairs(data.raw["tree"]) do if trees.variations then for k1, treeVariations in pairs(trees.variations) do - OverrideSprite(treeVariations.leaves) local filename = treeVariations.trunk.filename - filename = string.gsub(filename, ".png", "") -- not good to have it here... oh well - filename = string.gsub(filename, "__base__", "__WaiTex__") - - AddStripes(treeVariations.trunk, nil, nil, - { - {filename.."-1.png", 3, 1}, - {filename.."-2.png", 2, 1} - }) + if IsBase(filename) then + OverrideSprite(treeVariations.leaves) + filename = string.gsub(filename, ".png", "") -- not good to have it here... oh well + filename = string.gsub(filename, "__base__", "__WaiTex__") + + AddStripes(treeVariations.trunk, nil, nil, + { + {filename.."-1.png", 3, 1}, + {filename.."-2.png", 2, 1} + }) + end end end end diff --git a/WaiTex_1.0.0/prototypes/Override-Functions.lua b/WaiTex_1.0.1/prototypes/Override-Functions.lua similarity index 81% rename from WaiTex_1.0.0/prototypes/Override-Functions.lua rename to WaiTex_1.0.1/prototypes/Override-Functions.lua index a69a879..542d87b 100644 --- a/WaiTex_1.0.0/prototypes/Override-Functions.lua +++ b/WaiTex_1.0.1/prototypes/Override-Functions.lua @@ -171,19 +171,52 @@ function ChangeIcon(t) t.icon = string.gsub(t.icon, "__base__", "__WaiTex__") end +--i should really document how to function works as i +--will probably use it a lot in the future, but i am +--am too lazy to do it and the code is totally self explanatory! function TextureToSpritesConverter(t, pathTemplate) if t.stripes ~= nil and t.frame_count ~= nil and t.direction_count ~= nil then - if CanConvertToSpriteStripe(t) then + if PatternMatchColumnAdditions(t) then local numberOfStripMerges = GetStripeMerges(t) local stripeSpritePaths = GetStripeSpritePaths(t, pathTemplate) local stripMergedTogether = GetMergedStrips(t, numberOfStripMerges, stripeSpritePaths) local orderedStripePaths = MergeTables(stripMergedTogether) --print(serpent.block(orderedStripePaths)) AddStripes(t, 1, 1, orderedStripePaths) + else + local paths = {} + print("Herp a derp") + --print(#t.stripes) + --for u = 1, #t.stripes do + -- print(t.stripes[u].filename) + --end + local index = 1 + --this code doesn't take line_length and such into consideration when deciding how many images to take + local spriteCount = 0 + local width = 0 + for i = 1, #t.stripes do + spriteCount = spriteCount + t.stripes[i].height_in_frames * t.stripes[i].width_in_frames + width = width + t.stripes[i].width_in_frames + end + for row = 1, t.stripes[1].height_in_frames do + for stripeNumber = 1, #t.stripes do + for col = 1, t.stripes[1].width_in_frames do + if index <= spriteCount then + local stripesPath = string.gsub(pathTemplate, "&", tostring(stripeNumber)) + paths[#paths + 1] = CreateFilePaths(stripesPath, ".png", 1, (row - 1) * width + col)[1] + index = index + 1 + end + end + end + end + for k, v in ipairs(paths) do + print(v) + end + AddStripes(t, 1, 1, paths) end elseif t.filename ~= nil and t.frame_count ~= nil then local width = (t.line_length or t.frame_count) - local height = (t.direction_count or 1) + local height = (t.direction_count or 1) * (t.frame_count / (t.line_length or t.frame_count)) local startSpriteNumber = width * (((t.y or 0) / t.height)) + 1 local numberOfSprites = width * height AddStripes(t, 1, 1, CreateFilePaths(pathTemplate, ".png", numberOfSprites, startSpriteNumber)) @@ -192,20 +225,26 @@ function TextureToSpritesConverter(t, pathTemplate) end end -function GetMergedStrips(t, numberOfStripMerges, stripeSpritePaths) +function PatternMatchColumnAdditions(t) local frameHeight = t.stripes[1].height_in_frames - local stripMergedTogether = {} - local stripMergeTablesLength = #t.stripes / numberOfStripMerges - for i = 0, numberOfStripMerges - 1 do - local tablesToStripMerge = {} - local tableLengths = {} - for x = 1 + stripMergeTablesLength * i, stripMergeTablesLength + stripMergeTablesLength * i do - tablesToStripMerge[#tablesToStripMerge + 1] = stripeSpritePaths[x] - tableLengths[#tableLengths + 1] = t.stripes[x].width_in_frames + for i = 2, #t.stripes do + if frameHeight ~= t.stripes[i].height_in_frames then + print("false") + return false + end + end + print("true") + return true +end + +function GetStripeMerges(t) + local sum = 0 + for i = 1,#t.stripes do + sum = sum + (t.line_length or t.stripes[i].width_in_frames) + if sum == t.frame_count then + return #t.stripes / i end - stripMergedTogether[i + 1] = StripMerge(tablesToStripMerge, frameHeight, tableLengths) end - return stripMergedTogether end function GetStripeSpritePaths(t, pathTemplate) @@ -223,24 +262,20 @@ function GetStripeSpritePaths(t, pathTemplate) return stripeSpritePaths end -function GetStripeMerges(t) - local sum = 0 - for i = 1,#t.stripes do - sum = sum + (t.line_length or t.stripes[i].width_in_frames) - if sum == t.frame_count then - return #t.stripes / i - end - end -end - -function CanConvertToSpriteStripe(t) +function GetMergedStrips(t, numberOfStripMerges, stripeSpritePaths) local frameHeight = t.stripes[1].height_in_frames - for i = 2, #t.stripes do - if frameHeight ~= t.stripes[i].height_in_frames then - return false + local stripMergedTogether = {} + local stripMergeTablesLength = #t.stripes / numberOfStripMerges + for i = 0, numberOfStripMerges - 1 do + local tablesToStripMerge = {} + local tableLengths = {} + for x = 1 + stripMergeTablesLength * i, stripMergeTablesLength + stripMergeTablesLength * i do + tablesToStripMerge[#tablesToStripMerge + 1] = stripeSpritePaths[x] + tableLengths[#tableLengths + 1] = t.stripes[x].width_in_frames end + stripMergedTogether[i + 1] = StripMerge(tablesToStripMerge, frameHeight, tableLengths) end - return true + return stripMergedTogether end