Skip to content

Commit

Permalink
Added last textures and updated to 1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheAIBot
TheAIBot committed Feb 23, 2016
1 parent f6261fe commit 79a369d
Show file tree
Hide file tree
Showing 7 changed files with 326 additions and 223 deletions.
9 changes: 0 additions & 9 deletions WaiTex_0.9.0/info.json
View file

This file was deleted.

175 changes: 0 additions & 175 deletions WaiTex_0.9.0/prototypes/Override-Functions.lua
View file

This file was deleted.

5 changes: 3 additions & 2 deletions WaiTex_0.9.0/AllowedTextureChanges.lua → WaiTex_1.0.0/AllowedTextureChanges.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ TexturePermissions =
["branch-particle"] = {["enabled"] = true, ["AllowedIn1GB"] = false}, --1GB
["big-electric-pole"] = {["enabled"] = true, ["AllowedIn1GB"] = true},
["big-biter"] = {["enabled"] = true, ["AllowedIn1GB"] = false}, --1GB --NEWNEW
["biter-spawner"] = {["enabled"] = true, ["AllowedIn1GB"] = false}, --1GB
["biter-spawner"] = {["enabled"] = true, ["AllowedIn1GB"] = false}, --1GB --UPDATED
["boiler"] = {["enabled"] = false,["AllowedIn1GB"] = true}, --WIP
["burner-inserter"] = {["enabled"] = true, ["AllowedIn1GB"] = true},
["burner-mining-drill"] = {["enabled"] = true, ["AllowedIn1GB"] = true},
Expand Down Expand Up @@ -93,7 +93,8 @@ TexturePermissions =
["smart-inserter"] = {["enabled"] = true, ["AllowedIn1GB"] = true},
["solar-panel"] = {["enabled"] = true, ["AllowedIn1GB"] = true},
["sparks"] = {["enabled"] = true, ["AllowedIn1GB"] = false}, --1GB
["spitter-spawner"] = {["enabled"] = true, ["AllowedIn1GB"] = false}, --1GB
["spitter-spawner"] = {["enabled"] = true, ["AllowedIn1GB"] = false}, --1GB --UPDATED
["spitter"] = {["enabled"] = true, ["AllowedIn1GB"] = false}, --1GB --NEWNEW
["steam-engine"] = {["enabled"] = true, ["AllowedIn1GB"] = false}, --1GB
["steel-chest"] = {["enabled"] = true, ["AllowedIn1GB"] = true},
["steel-furnace"] = {["enabled"] = true, ["AllowedIn1GB"] = true},
Expand Down
0 WaiTex_0.9.0/data-final-fixes.lua → WaiTex_1.0.0/data-final-fixes.lua
View file
File renamed without changes.
9 changes: 9 additions & 0 deletions WaiTex_1.0.0/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name":"WaiTex",
"author":"keyboardhack",
"version":"1.0.0",
"title":"WaiTex",
"homepage":"http://www.factorioforums.com/forum/viewtopic.php?f=144&t=13142",
"description":"HD textures for all vanilla items",
"dependencies": ["base >= 0.12.11"]
}
100 changes: 63 additions & 37 deletions WaiTex_0.9.0/prototypes/Base-Override.lua → WaiTex_1.0.0/prototypes/Base-Override.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ local ChangeTextureConfiguration =
if #t > 2 then
local part1 = CreateFilePaths("__WaiTex__/graphics/entity/biter/biter-run-1/biter-run-1-", ".png", 128)
local part2 = CreateFilePaths("__WaiTex__/graphics/entity/biter/biter-run-2/biter-run-2-", ".png", 128)
local combined = StripMerge(part1, part2, 16, 8, 8)
local combined = StripMerge({part1, part2}, 16, {8, 8})

AddStripes(t[#t - 2], 1, 1, combined)
end
Expand All @@ -223,9 +223,9 @@ local ChangeTextureConfiguration =
local part2 = CreateFilePaths("__WaiTex__/graphics/entity/biter/biter-attack-2/biter-attack-2-", ".png", 40)
local part3 = CreateFilePaths("__WaiTex__/graphics/entity/biter/biter-attack-3/biter-attack-3-", ".png", 48)
local part4 = CreateFilePaths("__WaiTex__/graphics/entity/biter/biter-attack-4/biter-attack-4-", ".png", 40)
local combined1 = StripMerge(part1, part2, 8, 6, 5)
local combined2 = StripMerge(part3, part4, 8, 6, 5)
local combined = MergeTables(combined1, combined2)
local combined1 = StripMerge({part1, part2}, 8, {6, 5})
local combined2 = StripMerge({part3, part4}, 8, {6, 5})
local combined = MergeTables({combined1, combined2})

AddStripes(t[#t - 2], 1, 1, combined)
end
Expand All @@ -242,9 +242,9 @@ local ChangeTextureConfiguration =
local part2 = CreateFilePaths("__WaiTex__/graphics/entity/biter/biter-die-2/biter-die-2-", ".png", 64)
local part3 = CreateFilePaths("__WaiTex__/graphics/entity/biter/biter-die-3/biter-die-3-", ".png", 72)
local part4 = CreateFilePaths("__WaiTex__/graphics/entity/biter/biter-die-4/biter-die-4-", ".png", 64)
local combined1 = StripMerge(part1, part2, 8, 9, 8)
local combined2 = StripMerge(part3, part4, 8, 9, 8)
local combined = MergeTables(combined1, combined2)
local combined1 = StripMerge({part1, part2}, 8, {9, 8})
local combined2 = StripMerge({part3, part4}, 8, {9, 8})
local combined = MergeTables({combined1, combined2})

AddStripes(t[#t - 2], 1, 1, combined)
end
Expand Down Expand Up @@ -877,40 +877,66 @@ local ChangeTextureConfiguration =

--[[biter-spawner and spitter-spawner]]--
["__base__/graphics/entity/spawner/spawner-idle.png"] = function(t)
if (#t > 2 and #t[#t - 3] == 4 and t[#t - 3][2].layers ~= nil and t[#t - 3][2].layers[1] ~= nil and
t[#t - 3][3].layers ~= nil and t[#t - 3][3].layers[1] ~= nil and
t[#t - 3][4].layers ~= nil and t[#t - 3][4].layers[1] ~= nil) then
AddStripes(t[#t], 4, 1,
{
"__WaiTex__/graphics/entity/spawner/spawner-idle/spawner-idle-1.png",
"__WaiTex__/graphics/entity/spawner/spawner-idle/spawner-idle-2.png",
})
ChangeSettings(t[#t], {{"line_length", nil}, {"y", nil}})
TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/spawner/spawner-idle/spawner-idle-", ".png")
end,
["__base__/graphics/entity/spawner/spawner-idle-mask.png"] = function(t)
TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/spawner/spawner-idle-mask/spawner-idle-mask-", ".png")
end,
["__base__/graphics/entity/spawner/spawner-die-01.png"] = function(t)
if #t > 2 then
TextureToSpritesConverter(t[#t - 2], "__WaiTex__/graphics/entity/spawner/spawner-die-0&/spawner-die-0&-")
end
end,
["__base__/graphics/entity/spawner/spawner-die-mask-01.png"] = function(t)
if #t > 2 then
TextureToSpritesConverter(t[#t - 2], "__WaiTex__/graphics/entity/spawner/spawner-die-mask-0&/spawner-die-mask-0&-")
end
end,

AddStripes(t[#t - 3][2].layers[1], 4, 1,
{
"__WaiTex__/graphics/entity/spawner/spawner-idle/spawner-idle-3.png",
"__WaiTex__/graphics/entity/spawner/spawner-idle/spawner-idle-4.png",
})
ChangeSettings(t[#t - 3][2].layers[1], {{"line_length", nil}, {"y", nil}})

AddStripes(t[#t - 3][3].layers[1], 4, 1,
{
"__WaiTex__/graphics/entity/spawner/spawner-idle/spawner-idle-5.png",
"__WaiTex__/graphics/entity/spawner/spawner-idle/spawner-idle-6.png",
})
ChangeSettings(t[#t - 3][3].layers[1], {{"line_length", nil}, {"y", nil}})

AddStripes(t[#t - 3][4].layers[1], 4, 1,
{
"__WaiTex__/graphics/entity/spawner/spawner-idle/spawner-idle-7.png",
"__WaiTex__/graphics/entity/spawner/spawner-idle/spawner-idle-8.png",
})
ChangeSettings(t[#t - 3][4].layers[1], {{"line_length", nil}, {"y", nil}})





--[[spitter]]--
["__base__/graphics/entity/spitter/spitter-attack-1.png"] = function(t)
if #t > 2 then
TextureToSpritesConverter(t[#t - 2], "__WaiTex__/graphics/entity/spitter/spitter-attack-&/spitter-attack-&-")
end
end,
["__base__/graphics/entity/spitter/spitter-attack-mask-1.png"] = function(t)
if #t > 2 then
TextureToSpritesConverter(t[#t - 2], "__WaiTex__/graphics/entity/spitter/spitter-attack-mask-&/spitter-attack-mask-&-")
end
end,
["__base__/graphics/entity/spitter/spitter-run-1.png"] = function(t)
if #t > 2 then
TextureToSpritesConverter(t[#t - 2], "__WaiTex__/graphics/entity/spitter/spitter-run-&/spitter-run-&-")
end
end,
["__base__/graphics/entity/spitter/spitter-run-mask.png"] = function(t)
TextureToSpritesConverter(t[#t], "__WaiTex__/graphics/entity/spitter/spitter-run-mask/spitter-run-mask-")
end,
["__base__/graphics/entity/spitter/spitter-die-1.png"] = function(t)
if #t > 2 then
TextureToSpritesConverter(t[#t - 2], "__WaiTex__/graphics/entity/spitter/spitter-die-&/spitter-die-&-")
end
end,
["__base__/graphics/entity/spitter/spitter-die-mask-1.png"] = function(t)
if #t > 2 then
TextureToSpritesConverter(t[#t - 2], "__WaiTex__/graphics/entity/spitter/spitter-die-mask-&/spitter-die-mask-&-")
end
end,








--[[steam-engine]]--
["__base__/graphics/entity/steam-engine/steam-engine-horizontal.png"] = function(t)
AddStripes(t[#t], 4, 2, CreateFilePaths("__WaiTex__/graphics/entity/steam-engine/steam-engine-horizontal-", ".png", 4))
Expand Down Expand Up @@ -1042,7 +1068,7 @@ local ChangeTextureConfiguration =
if #t > 2 then
local part1 = CreateFilePaths("__WaiTex__/graphics/entity/worm/worm-preparing-01/worm-preparing-01-", ".png", 14)
local part2 = CreateFilePaths("__WaiTex__/graphics/entity/worm/worm-preparing-02/worm-preparing-02-", ".png", 12)
local combined = MergeTables(part1, part2)
local combined = MergeTables({part1, part2})

AddStripes(t[#t - 2], 1, 1, combined)
end
Expand All @@ -1060,7 +1086,7 @@ local ChangeTextureConfiguration =
if #t > 2 then
local part1 = CreateFilePaths("__WaiTex__/graphics/entity/worm/worm-attack-01/worm-attack-01-", ".png", 64)
local part2 = CreateFilePaths("__WaiTex__/graphics/entity/worm/worm-attack-02/worm-attack-02-", ".png", 64)
local combined = MergeTables(part1, part2)
local combined = MergeTables({part1, part2})

AddStripes(t[#t - 2], 1, 1, combined)
end
Expand All @@ -1069,7 +1095,7 @@ local ChangeTextureConfiguration =
if #t > 2 then
local part1 = CreateFilePaths("__WaiTex__/graphics/entity/worm/worm-attack-mask-01/worm-attack-mask-01-", ".png", 64)
local part2 = CreateFilePaths("__WaiTex__/graphics/entity/worm/worm-attack-mask-02/worm-attack-mask-02-", ".png", 64)
local combined = MergeTables(part1, part2)
local combined = MergeTables({part1, part2})

AddStripes(t[#t - 2], 1, 1, combined)
end
Expand Down
Loading

0 comments on commit 79a369d

Please sign in to comment.