diff --git a/changelog.txt b/changelog.txt index f89894f..c151090 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,11 @@ --------------------------------------------------------------------------------------------------- +Version: 0.5.0 +Date: 2021-03-08 + Changes: + - New visuals by snouz (icons, technologies) + - New mod icon + - Added icon mipmaps +--------------------------------------------------------------------------------------------------- Version: 0.4.1 Date: 2021-02-28 Features: diff --git a/deadlock-stacking.lua b/deadlock-stacking.lua index 4ede300..194792e 100644 --- a/deadlock-stacking.lua +++ b/deadlock-stacking.lua @@ -2,14 +2,14 @@ local util = require("__bzsilicon__.util"); if deadlock then - deadlock.add_stack("silica", "__bzsilicon__/graphics/icons/silica-stacked.png" , "deadlock-stacking-1", 64) - deadlock.add_stack("optical-fiber", "__bzsilicon__/graphics/icons/optical-fiber-stacked.png" , "deadlock-stacking-2", 32) + deadlock.add_stack("silica", "__bzsilicon__/graphics/icons/stacked/silica-stacked.png" , "deadlock-stacking-1", 64) + deadlock.add_stack("optical-fiber", "__bzsilicon__/graphics/icons/stacked/optical-fiber-stacked.png" , "deadlock-stacking-2", 64) if not mods["Krastorio2"] then - deadlock.add_stack("silicon", "__bzsilicon__/graphics/icons/silicon-stacked.png" , "deadlock-stacking-2", 64) + deadlock.add_stack("silicon", "__bzsilicon__/graphics/icons/stacked/silicon-stacked.png" , "deadlock-stacking-2", 64) end if util.more_intermediates() then - deadlock.add_stack("silicon-wafer", "__bzsilicon__/graphics/icons/silicon-wafer-stacked.png" , "deadlock-stacking-2", 64) - deadlock.add_stack("solar-cell", "__bzsilicon__/graphics/icons/solar-cell-stacked.png" , "deadlock-stacking-2", 64) + deadlock.add_stack("silicon-wafer", "__bzsilicon__/graphics/icons/stacked/silicon-wafer-stacked.png" , "deadlock-stacking-2", 64) + deadlock.add_stack("solar-cell", "__bzsilicon__/graphics/icons/stacked/solar-cell-stacked.png" , "deadlock-stacking-2", 64) end end diff --git a/graphics/icons/optical-fiber-stacked.png b/graphics/icons/optical-fiber-stacked.png deleted file mode 100644 index 15667d4..0000000 Binary files a/graphics/icons/optical-fiber-stacked.png and /dev/null differ diff --git a/graphics/icons/optical-fiber.png b/graphics/icons/optical-fiber.png index 26845a0..d6bfba0 100644 Binary files a/graphics/icons/optical-fiber.png and b/graphics/icons/optical-fiber.png differ diff --git a/graphics/icons/silica-processing.png b/graphics/icons/silica-processing.png deleted file mode 100644 index a64b022..0000000 Binary files a/graphics/icons/silica-processing.png and /dev/null differ diff --git a/graphics/icons/silica-stacked.png b/graphics/icons/silica-stacked.png deleted file mode 100644 index 3b66ed5..0000000 Binary files a/graphics/icons/silica-stacked.png and /dev/null differ diff --git a/graphics/icons/silica.png b/graphics/icons/silica.png index f6f9a57..130a5b7 100644 Binary files a/graphics/icons/silica.png and b/graphics/icons/silica.png differ diff --git a/graphics/icons/silicon-processing.png b/graphics/icons/silicon-processing.png deleted file mode 100644 index 0735121..0000000 Binary files a/graphics/icons/silicon-processing.png and /dev/null differ diff --git a/graphics/icons/silicon-stacked.png b/graphics/icons/silicon-stacked.png deleted file mode 100644 index 7bc932a..0000000 Binary files a/graphics/icons/silicon-stacked.png and /dev/null differ diff --git a/graphics/icons/silicon-wafer-stacked.png b/graphics/icons/silicon-wafer-stacked.png deleted file mode 100644 index 046c3e8..0000000 Binary files a/graphics/icons/silicon-wafer-stacked.png and /dev/null differ diff --git a/graphics/icons/silicon-wafer.png b/graphics/icons/silicon-wafer.png index 65bcc8c..d0df3c8 100644 Binary files a/graphics/icons/silicon-wafer.png and b/graphics/icons/silicon-wafer.png differ diff --git a/graphics/icons/silicon.png b/graphics/icons/silicon.png index 92c5496..2dd8211 100644 Binary files a/graphics/icons/silicon.png and b/graphics/icons/silicon.png differ diff --git a/graphics/icons/solar-cell-stacked.png b/graphics/icons/solar-cell-stacked.png deleted file mode 100644 index cd40d80..0000000 Binary files a/graphics/icons/solar-cell-stacked.png and /dev/null differ diff --git a/graphics/icons/solar-cell.png b/graphics/icons/solar-cell.png index 29cc8ff..ab19958 100644 Binary files a/graphics/icons/solar-cell.png and b/graphics/icons/solar-cell.png differ diff --git a/graphics/icons/stacked/optical-fiber-stacked.png b/graphics/icons/stacked/optical-fiber-stacked.png new file mode 100644 index 0000000..ddd3d6d Binary files /dev/null and b/graphics/icons/stacked/optical-fiber-stacked.png differ diff --git a/graphics/icons/stacked/silica-stacked.png b/graphics/icons/stacked/silica-stacked.png new file mode 100644 index 0000000..80549ce Binary files /dev/null and b/graphics/icons/stacked/silica-stacked.png differ diff --git a/graphics/icons/stacked/silicon-stacked.png b/graphics/icons/stacked/silicon-stacked.png new file mode 100644 index 0000000..c1b1077 Binary files /dev/null and b/graphics/icons/stacked/silicon-stacked.png differ diff --git a/graphics/icons/stacked/silicon-wafer-stacked.png b/graphics/icons/stacked/silicon-wafer-stacked.png new file mode 100644 index 0000000..847f2e2 Binary files /dev/null and b/graphics/icons/stacked/silicon-wafer-stacked.png differ diff --git a/graphics/icons/stacked/solar-cell-stacked.png b/graphics/icons/stacked/solar-cell-stacked.png new file mode 100644 index 0000000..2390dfb Binary files /dev/null and b/graphics/icons/stacked/solar-cell-stacked.png differ diff --git a/graphics/icons/thumbnail.png b/graphics/icons/thumbnail.png deleted file mode 100644 index 7fa98cb..0000000 Binary files a/graphics/icons/thumbnail.png and /dev/null differ diff --git a/graphics/technology/optical-fiber-tech.png b/graphics/technology/optical-fiber-tech.png new file mode 100644 index 0000000..4faead8 Binary files /dev/null and b/graphics/technology/optical-fiber-tech.png differ diff --git a/graphics/technology/silica-processing.png b/graphics/technology/silica-processing.png new file mode 100644 index 0000000..f464553 Binary files /dev/null and b/graphics/technology/silica-processing.png differ diff --git a/graphics/technology/silicon-processing.png b/graphics/technology/silicon-processing.png new file mode 100644 index 0000000..cfeafb9 Binary files /dev/null and b/graphics/technology/silicon-processing.png differ diff --git a/info.json b/info.json index 30eb09b..d8fbc80 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzsilicon", - "version": "0.4.1", + "version": "0.5.0", "factorio_version": "1.1", "title": "Silica & Silicon", "author": "Brevven", diff --git a/locale/en/silicon.cfg b/locale/en/silicon.cfg index 0090387..65d96ab 100644 --- a/locale/en/silicon.cfg +++ b/locale/en/silicon.cfg @@ -14,7 +14,7 @@ optical-fiber=Optical Fiber [item-description] silica=Can be used directly or processed further. -silicon=Needed for various electrical and electronic applications +silicon=Needed for various electrical and electronic applications. silicon-wafer=Use silicon in circuits. solar-cell=Use the photovoltaic effect to harness solar energy. optical-fiber=Cable used for fiber optics, including circuit network. @@ -41,5 +41,4 @@ optical-fiber=__ITEM__optical-fiber__ bzsilicon-more-intermediates=Enable more intermediate recipes such as silicon wafers. [mod-setting-description] -bzsilicon-more-intermediates= More complex production chains. Optional in vanilla, Krastorio 2, etc. [color=red]Required for Bio Industries.[/color] - +bzsilicon-more-intermediates=More complex production chains. Optional in vanilla, Krastorio 2, etc. [color=red]Required for Bio Industries.[/color] \ No newline at end of file diff --git a/prototypes/optical-fiber.lua b/prototypes/optical-fiber.lua index ece5a0b..be0f082 100644 --- a/prototypes/optical-fiber.lua +++ b/prototypes/optical-fiber.lua @@ -6,7 +6,7 @@ data:extend( type = "item", name = "optical-fiber", icon = "__bzsilicon__/graphics/icons/optical-fiber.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 3, subgroup = "intermediate-product", order = "a[optical-fiber]", stack_size = util.get_stack_size(200) @@ -33,11 +33,8 @@ data:extend( { type = "technology", name = "fiber-optics", - icons = - { - { icon = "__base__/graphics/technology/optics.png", icon_size = 256 }, - { icon = "__bzsilicon__/graphics/icons/optical-fiber.png", icon_size = 32, scale=3, shift={32,-48} }, - }, + icon = "__bzsilicon__/graphics/technology/optical-fiber-tech.png", + icon_size = 256, icon_mipmaps = 4, effects = { { diff --git a/prototypes/silica-recipe.lua b/prototypes/silica-recipe.lua index d0d0a6f..6670b51 100644 --- a/prototypes/silica-recipe.lua +++ b/prototypes/silica-recipe.lua @@ -37,7 +37,7 @@ data:extend( type = "item", name = "silica", icon = "__bzsilicon__/graphics/icons/silica.png", - icon_size = 64, + icon_size = 64, icon_mipmaps = 3, subgroup = "raw-material", order = "b[silica]", stack_size = util.get_stack_size(100) @@ -45,8 +45,8 @@ data:extend( mods["Krastorio2"] and { type = "technology", name = "silica-processing", - icon_size = 128, - icon = "__bzsilicon__/graphics/icons/silica-processing.png", + icon_size = 256, icon_mipmaps = 4, + icon = "__bzsilicon__/graphics/technology/silica-processing.png", effects = { { @@ -72,8 +72,8 @@ data:extend( } or { type = "technology", name = "silica-processing", - icon_size = 128, - icon = "__bzsilicon__/graphics/icons/silica-processing.png", + icon_size = 256, icon_mipmaps = 4, + icon = "__bzsilicon__/graphics/technology/silica-processing.png", effects = { { diff --git a/prototypes/silicon-recipe.lua b/prototypes/silicon-recipe.lua index 60287a0..d79a7c9 100644 --- a/prototypes/silicon-recipe.lua +++ b/prototypes/silicon-recipe.lua @@ -45,7 +45,7 @@ data:extend( type = "item", name = "silicon", icon = "__bzsilicon__/graphics/icons/silicon.png", - icon_size = 64, + icon_size = 64, icon_mipmaps = 3, subgroup = "raw-material", order = "b[silicon]", stack_size = util.get_stack_size(100) @@ -54,8 +54,8 @@ data:extend( { type = "technology", name = "silicon-processing", - icon_size = 128, - icon = "__bzsilicon__/graphics/icons/silicon-processing.png", + icon_size = 256, icon_mipmaps = 4, + icon = "__bzsilicon__/graphics/technology/silicon-processing.png", effects = { { @@ -89,7 +89,7 @@ data:extend({ type = "item", name = "silicon-wafer", icon = "__bzsilicon__/graphics/icons/silicon-wafer.png", - icon_size = "64", + icon_size = 64, icon_mipmaps = 3, subgroup = "intermediate-product", stack_size = util.get_stack_size(100), order = "s[silicon]-silicon-wafer", @@ -115,7 +115,7 @@ data:extend({ type = "item", name = "solar-cell", icon = "__bzsilicon__/graphics/icons/solar-cell.png", - icon_size = "128", + icon_size = 64, icon_mipmaps = 3, subgroup = "intermediate-product", stack_size = util.get_stack_size(100), order = "s[silicon]-solar-cell", diff --git a/recipes/silicon-vulcanite.lua b/recipes/silicon-vulcanite.lua index ebfe49b..bd7fc3f 100644 --- a/recipes/silicon-vulcanite.lua +++ b/recipes/silicon-vulcanite.lua @@ -31,7 +31,7 @@ if mods["space-exploration"] then }, icons = { - { icon = "__bzsilicon__/graphics/icons/silicon.png", icon_size = 64 }, + { icon = "__bzsilicon__/graphics/icons/silicon.png", icon_size = 64, icon_mipmaps = 3 }, { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}}, }, }, diff --git a/thumbnail.png b/thumbnail.png index ea81622..3c4f0eb 100644 Binary files a/thumbnail.png and b/thumbnail.png differ