diff --git a/changelog.txt b/changelog.txt index a049ef5..6cb9e8f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,11 @@ --------------------------------------------------------------------------------------------------- +Version: 0.10.0 +Date: 2021-03-08 + Changes: + - New graphics by snouz (ore, icons, technology) + - New mod icon + - Added mipmaps to icons +--------------------------------------------------------------------------------------------------- Version: 0.9.14 Date: 2021-01-25 Changes: diff --git a/graphics/entity/ores/hr-titanium-ore.png b/graphics/entity/ores/hr-titanium-ore.png index e2a7481..720cca4 100644 Binary files a/graphics/entity/ores/hr-titanium-ore.png and b/graphics/entity/ores/hr-titanium-ore.png differ diff --git a/graphics/entity/ores/titanium-ore-particle-4.png b/graphics/entity/ores/titanium-ore-particle-4.png deleted file mode 100644 index 8af0525..0000000 Binary files a/graphics/entity/ores/titanium-ore-particle-4.png and /dev/null differ diff --git a/graphics/entity/ores/titanium-ore.png b/graphics/entity/ores/titanium-ore.png index 2c23647..39dc72f 100644 Binary files a/graphics/entity/ores/titanium-ore.png and b/graphics/entity/ores/titanium-ore.png differ diff --git a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-1.png b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-1.png index 55bd024..e241086 100644 Binary files a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-1.png and b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-1.png differ diff --git a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-2.png b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-2.png index 769bb73..7099218 100644 Binary files a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-2.png and b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-2.png differ diff --git a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-3.png b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-3.png index 95b8b01..cf15c66 100644 Binary files a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-3.png and b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-3.png differ diff --git a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-4.png b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-4.png index a14a83c..307d7cd 100644 Binary files a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-4.png and b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-4.png differ diff --git a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-4.png b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-4.png index 48315a2..02cca1a 100644 Binary files a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-4.png and b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-4.png differ diff --git a/graphics/entity/titanium-ore-particle/titanium-ore-particle-1.png b/graphics/entity/titanium-ore-particle/titanium-ore-particle-1.png index 38de1b7..1b76c18 100644 Binary files a/graphics/entity/titanium-ore-particle/titanium-ore-particle-1.png and b/graphics/entity/titanium-ore-particle/titanium-ore-particle-1.png differ diff --git a/graphics/entity/titanium-ore-particle/titanium-ore-particle-2.png b/graphics/entity/titanium-ore-particle/titanium-ore-particle-2.png index 24de07c..0bf7c6b 100644 Binary files a/graphics/entity/titanium-ore-particle/titanium-ore-particle-2.png and b/graphics/entity/titanium-ore-particle/titanium-ore-particle-2.png differ diff --git a/graphics/entity/titanium-ore-particle/titanium-ore-particle-3.png b/graphics/entity/titanium-ore-particle/titanium-ore-particle-3.png index c66eaed..35c156a 100644 Binary files a/graphics/entity/titanium-ore-particle/titanium-ore-particle-3.png and b/graphics/entity/titanium-ore-particle/titanium-ore-particle-3.png differ diff --git a/graphics/entity/titanium-ore-particle/titanium-ore-particle-4.png b/graphics/entity/titanium-ore-particle/titanium-ore-particle-4.png index 1695d15..9f5115c 100644 Binary files a/graphics/entity/titanium-ore-particle/titanium-ore-particle-4.png and b/graphics/entity/titanium-ore-particle/titanium-ore-particle-4.png differ diff --git a/graphics/icons/enriched-titanium-2.png b/graphics/icons/enriched-titanium-2.png index e13da84..e5e0296 100644 Binary files a/graphics/icons/enriched-titanium-2.png and b/graphics/icons/enriched-titanium-2.png differ diff --git a/graphics/icons/enriched-titanium-3.png b/graphics/icons/enriched-titanium-3.png index d795a56..97fec18 100644 Binary files a/graphics/icons/enriched-titanium-3.png and b/graphics/icons/enriched-titanium-3.png differ diff --git a/graphics/icons/enriched-titanium-4.png b/graphics/icons/enriched-titanium-4.png index 3c03a27..8543c5a 100644 Binary files a/graphics/icons/enriched-titanium-4.png and b/graphics/icons/enriched-titanium-4.png differ diff --git a/graphics/icons/enriched-titanium-stacked.png b/graphics/icons/enriched-titanium-stacked.png deleted file mode 100644 index ca0f26f..0000000 Binary files a/graphics/icons/enriched-titanium-stacked.png and /dev/null differ diff --git a/graphics/icons/enriched-titanium.png b/graphics/icons/enriched-titanium.png index a7879d0..6bd0ef7 100644 Binary files a/graphics/icons/enriched-titanium.png and b/graphics/icons/enriched-titanium.png differ diff --git a/graphics/icons/stacked/enriched-titanium-stacked.png b/graphics/icons/stacked/enriched-titanium-stacked.png new file mode 100644 index 0000000..3f2a571 Binary files /dev/null and b/graphics/icons/stacked/enriched-titanium-stacked.png differ diff --git a/graphics/icons/stacked/titanium-ore-stacked.png b/graphics/icons/stacked/titanium-ore-stacked.png new file mode 100644 index 0000000..1660947 Binary files /dev/null and b/graphics/icons/stacked/titanium-ore-stacked.png differ diff --git a/graphics/icons/stacked/titanium-plate-stacked.png b/graphics/icons/stacked/titanium-plate-stacked.png new file mode 100644 index 0000000..b754626 Binary files /dev/null and b/graphics/icons/stacked/titanium-plate-stacked.png differ diff --git a/graphics/icons/titanium-ore-2.png b/graphics/icons/titanium-ore-2.png index a5fcdf9..f693c20 100644 Binary files a/graphics/icons/titanium-ore-2.png and b/graphics/icons/titanium-ore-2.png differ diff --git a/graphics/icons/titanium-ore-3.png b/graphics/icons/titanium-ore-3.png index b4a2354..64e7a6a 100644 Binary files a/graphics/icons/titanium-ore-3.png and b/graphics/icons/titanium-ore-3.png differ diff --git a/graphics/icons/titanium-ore-4.png b/graphics/icons/titanium-ore-4.png index c5bd522..8a8146b 100644 Binary files a/graphics/icons/titanium-ore-4.png and b/graphics/icons/titanium-ore-4.png differ diff --git a/graphics/icons/titanium-ore-n.png b/graphics/icons/titanium-ore-n.png deleted file mode 100644 index b7779a6..0000000 Binary files a/graphics/icons/titanium-ore-n.png and /dev/null differ diff --git a/graphics/icons/titanium-ore-stacked.png b/graphics/icons/titanium-ore-stacked.png deleted file mode 100644 index 94b771f..0000000 Binary files a/graphics/icons/titanium-ore-stacked.png and /dev/null differ diff --git a/graphics/icons/titanium-ore.png b/graphics/icons/titanium-ore.png index 99cfc86..df75ccd 100644 Binary files a/graphics/icons/titanium-ore.png and b/graphics/icons/titanium-ore.png differ diff --git a/graphics/icons/titanium-plate-stacked.png b/graphics/icons/titanium-plate-stacked.png deleted file mode 100644 index 9bac361..0000000 Binary files a/graphics/icons/titanium-plate-stacked.png and /dev/null differ diff --git a/graphics/icons/titanium-plate.png b/graphics/icons/titanium-plate.png index 6866165..4962c58 100644 Binary files a/graphics/icons/titanium-plate.png and b/graphics/icons/titanium-plate.png differ diff --git a/graphics/icons/titanium-powder.png b/graphics/icons/titanium-powder.png index 7340f60..79a8e3d 100644 Binary files a/graphics/icons/titanium-powder.png and b/graphics/icons/titanium-powder.png differ diff --git a/graphics/icons/titanium-processing.png b/graphics/icons/titanium-processing.png deleted file mode 100644 index f37ae04..0000000 Binary files a/graphics/icons/titanium-processing.png and /dev/null differ diff --git a/graphics/icons/enriched-titanium-stacked.xcf b/graphics/old-files/enriched-titanium-stacked.xcf similarity index 100% rename from graphics/icons/enriched-titanium-stacked.xcf rename to graphics/old-files/enriched-titanium-stacked.xcf diff --git a/graphics/icons/enriched-titanium.xcf b/graphics/old-files/enriched-titanium.xcf similarity index 100% rename from graphics/icons/enriched-titanium.xcf rename to graphics/old-files/enriched-titanium.xcf diff --git a/graphics/icons/hr-titanium-ore.png b/graphics/old-files/hr-titanium-ore.png similarity index 100% rename from graphics/icons/hr-titanium-ore.png rename to graphics/old-files/hr-titanium-ore.png diff --git a/graphics/entity/ores/hr-titanium-ore.xcf b/graphics/old-files/hr-titanium-ore.xcf similarity index 100% rename from graphics/entity/ores/hr-titanium-ore.xcf rename to graphics/old-files/hr-titanium-ore.xcf diff --git a/graphics/entity/ores/titanium-ore.xcf b/graphics/old-files/titanium-ore (2).xcf similarity index 100% rename from graphics/entity/ores/titanium-ore.xcf rename to graphics/old-files/titanium-ore (2).xcf diff --git a/graphics/icons/titanium-ore - Copy.png b/graphics/old-files/titanium-ore - Copy.png similarity index 100% rename from graphics/icons/titanium-ore - Copy.png rename to graphics/old-files/titanium-ore - Copy.png diff --git a/graphics/old-files/titanium-ore-n.png b/graphics/old-files/titanium-ore-n.png new file mode 100644 index 0000000..5ea2221 Binary files /dev/null and b/graphics/old-files/titanium-ore-n.png differ diff --git a/graphics/icons/titanium-ore-stacked.xcf b/graphics/old-files/titanium-ore-stacked.xcf similarity index 100% rename from graphics/icons/titanium-ore-stacked.xcf rename to graphics/old-files/titanium-ore-stacked.xcf diff --git a/graphics/icons/titanium-ore.xcf b/graphics/old-files/titanium-ore.xcf similarity index 100% rename from graphics/icons/titanium-ore.xcf rename to graphics/old-files/titanium-ore.xcf diff --git a/graphics/icons/titanium-plate-3.xcf b/graphics/old-files/titanium-plate-3.xcf similarity index 100% rename from graphics/icons/titanium-plate-3.xcf rename to graphics/old-files/titanium-plate-3.xcf diff --git a/graphics/icons/titanium-plate-old.png b/graphics/old-files/titanium-plate-old.png similarity index 100% rename from graphics/icons/titanium-plate-old.png rename to graphics/old-files/titanium-plate-old.png diff --git a/graphics/icons/titanium-plate-stacked.xcf b/graphics/old-files/titanium-plate-stacked.xcf similarity index 100% rename from graphics/icons/titanium-plate-stacked.xcf rename to graphics/old-files/titanium-plate-stacked.xcf diff --git a/graphics/icons/titanium-plate.xcf b/graphics/old-files/titanium-plate.xcf similarity index 100% rename from graphics/icons/titanium-plate.xcf rename to graphics/old-files/titanium-plate.xcf diff --git a/graphics/icons/titanium-powder.xcf b/graphics/old-files/titanium-powder.xcf similarity index 100% rename from graphics/icons/titanium-powder.xcf rename to graphics/old-files/titanium-powder.xcf diff --git a/titanium-processing.xcf b/graphics/old-files/titanium-processing (2).xcf similarity index 100% rename from titanium-processing.xcf rename to graphics/old-files/titanium-processing (2).xcf diff --git a/graphics/icons/titanium-processing.xcf b/graphics/old-files/titanium-processing.xcf similarity index 100% rename from graphics/icons/titanium-processing.xcf rename to graphics/old-files/titanium-processing.xcf diff --git a/titanium-thumbnail.xcf b/graphics/old-files/titanium-thumbnail.xcf similarity index 100% rename from titanium-thumbnail.xcf rename to graphics/old-files/titanium-thumbnail.xcf diff --git a/graphics/technology/titanium-processing.png b/graphics/technology/titanium-processing.png new file mode 100644 index 0000000..ea4861b Binary files /dev/null and b/graphics/technology/titanium-processing.png differ diff --git a/info.json b/info.json index 057db8a..c3faf96 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bztitanium", - "version": "0.9.14", + "version": "0.10.0", "factorio_version": "1.1", "title": "Titanium", "author": "Brevven", diff --git a/thumbnail.png b/thumbnail.png index 367f72b..5a1378f 100644 Binary files a/thumbnail.png and b/thumbnail.png differ diff --git a/titanium-enriched.lua b/titanium-enriched.lua index 8a5437b..b916716 100644 --- a/titanium-enriched.lua +++ b/titanium-enriched.lua @@ -7,7 +7,7 @@ data:extend( { type = "item", name = "enriched-titanium", - icon_size = 64, + icon_size = 64, icon_mipmaps = 3, icon = "__bztitanium__/graphics/icons/enriched-titanium.png", pictures = { {filename="__bztitanium__/graphics/icons/enriched-titanium.png", size=64, scale=0.25}, @@ -23,7 +23,7 @@ data:extend( type = "recipe", name = "enriched-titanium", icon = "__bztitanium__/graphics/icons/enriched-titanium.png", - icon_size = 64, + icon_size = 64, icon_mipmaps = 3, category = "chemistry", energy_required = 3, enabled = false, @@ -56,8 +56,8 @@ data:extend( name = "enriched-titanium-plate", icons = { - { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64 }, - { icon = "__bztitanium__/graphics/icons/enriched-titanium.png", icon_size = 64, scale=0.25, shift= {-8, -8}}, + { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3, }, + { icon = "__bztitanium__/graphics/icons/enriched-titanium.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, }, category = "smelting", energy_required = 16, @@ -85,7 +85,7 @@ data:extend( }, { icon = "__bztitanium__/graphics/icons/enriched-titanium.png", - icon_size = 64, + icon_size = 64, icon_mipmaps = 3, scale = 2, shift = {48, 48} } diff --git a/titanium-matter.lua b/titanium-matter.lua index f7dd8e4..c586aba 100644 --- a/titanium-matter.lua +++ b/titanium-matter.lua @@ -15,7 +15,7 @@ data:extend( }, { icon = "__bztitanium__/graphics/icons/titanium-ore.png", - icon_size = 64, + icon_size = 64, icon_mipmaps = 3, scale = 1.5, } }, diff --git a/titanium-ore.lua b/titanium-ore.lua index fe08404..858af11 100644 --- a/titanium-ore.lua +++ b/titanium-ore.lua @@ -20,7 +20,7 @@ data:extend({ }, { type = "resource", - icon_size = 64, + icon_size = 64, icon_mipmaps = 3, name = "titanium-ore", icon = "__bztitanium__/graphics/icons/titanium-ore.png", flags = {"placeable-neutral"}, @@ -71,7 +71,7 @@ data:extend({ { type = "item", name = "titanium-ore", - icon_size = 64, + icon_size = 64, icon_mipmaps = 3, icon = "__bztitanium__/graphics/icons/titanium-ore.png", pictures = { {filename="__bztitanium__/graphics/icons/titanium-ore.png", size=64, scale=0.25}, diff --git a/titanium-recipe-final-5d.lua b/titanium-recipe-final-5d.lua index 7a8baf1..0cbec43 100644 --- a/titanium-recipe-final-5d.lua +++ b/titanium-recipe-final-5d.lua @@ -15,7 +15,7 @@ if mods["5dim_core"] then subgroup = "plates-industrial-ore", order = "ad[titanium-plate]", icon = "__bztitanium__/graphics/icons/titanium-plate.png", - icon_size = 64, + icon_size = 64, icon_mipmaps = 3, enabled = false, energy_required = 140, ingredients = {{"titanium-ore", 425}}, @@ -33,18 +33,17 @@ if mods["5dim_core"] then { type = "item", name = "titanium-dust", - icon_size = 32, subgroup = "plates-dust", order = "d[titanium-plate]", icon = "__bztitanium__/graphics/icons/titanium-powder.png", - icon_size = 64, + icon_size = 64, icon_mipmaps = 3, stack_size = 200 }, { type = "recipe", name = "titanium-plate-dust", icon = "__bztitanium__/graphics/icons/titanium-plate.png", - icon_size = 64, + icon_size = 64, icon_mipmaps = 3, subgroup = "plates-plates2", order = "d[titanium-plate]", category = "smelting", @@ -75,7 +74,7 @@ if mods["5dim_core"] then subgroup = "plates-industrial-dust", order = "ad[titanium-plate]", icon = "__bztitanium__/graphics/icons/titanium-plate.png", - icon_size = 64, + icon_size = 64, icon_mipmaps = 3, enabled = false, energy_required = 140, ingredients = {{"titanium-dust", 425}}, diff --git a/titanium-recipe-final-modmash.lua b/titanium-recipe-final-modmash.lua index f281b9e..99009ad 100644 --- a/titanium-recipe-final-modmash.lua +++ b/titanium-recipe-final-modmash.lua @@ -6,13 +6,13 @@ if mods["modmashsplinter"] then data.raw.recipe["alien-enrichment-process-to-titanium-ore"].icons = { { icon = "__modmashsplinterresources__/graphics/icons/alien-ooze.png", icon_size = 64}, - { icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 64, scale=0.25, shift= {8, 8}}, + { icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {8, 8}}, } if mods["modmashsplinterenrichment"] then data.raw.recipe["ore-enrichment-process-titanium-ore"].icons = { { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64}, - { icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 64, scale=0.25, shift= {8, 8}}, + { icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {8, 8}}, } end end diff --git a/titanium-recipe-final-stacking.lua b/titanium-recipe-final-stacking.lua index 8630192..03afdfc 100644 --- a/titanium-recipe-final-stacking.lua +++ b/titanium-recipe-final-stacking.lua @@ -1,9 +1,9 @@ -- Deadlock stacking recipes if deadlock then - deadlock.add_stack("titanium-ore", "__bztitanium__/graphics/icons/titanium-ore-stacked.png", "deadlock-stacking-2", 64) - deadlock.add_stack("titanium-plate", "__bztitanium__/graphics/icons/titanium-plate-stacked.png" , "deadlock-stacking-2", 64) + deadlock.add_stack("titanium-ore", "__bztitanium__/graphics/icons/stacked/titanium-ore-stacked.png", "deadlock-stacking-2", 64) + deadlock.add_stack("titanium-plate", "__bztitanium__/graphics/icons/stacked/titanium-plate-stacked.png" , "deadlock-stacking-2", 64) if mods["Krastorio2"] then - deadlock.add_stack("enriched-titanium", "__bztitanium__/graphics/icons/enriched-titanium-stacked.png" , "deadlock-stacking-2", 64) + deadlock.add_stack("enriched-titanium", "__bztitanium__/graphics/icons/stacked/enriched-titanium-stacked.png" , "deadlock-stacking-2", 64) end end diff --git a/titanium-recipe-se.lua b/titanium-recipe-se.lua index b4dfeb3..9a5510a 100644 --- a/titanium-recipe-se.lua +++ b/titanium-recipe-se.lua @@ -24,7 +24,7 @@ if mods["space-exploration"] then }, icons = { - { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64 }, + { icon = "__bztitanium__/graphics/icons/titanium-plate.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}}, }, @@ -55,7 +55,7 @@ if mods["space-exploration"] then }, icons = { - { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64 }, + { icon = "__bztitanium__/graphics/icons/titanium-plate.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/titanium-recipe.lua b/titanium-recipe.lua index a119114..2cfc959 100644 --- a/titanium-recipe.lua +++ b/titanium-recipe.lua @@ -28,8 +28,8 @@ data:extend( order = "d[titanium-plate]", icons = (mods["Krastorio2"] and { - { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64 }, - { icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 64, scale=0.25, shift= {-8, -8}}, + { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3,}, + { icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, } or nil), normal = (mods["Krastorio2"] and { @@ -56,7 +56,7 @@ data:extend( type = "item", name = util.titanium_plate, icon = "__bztitanium__/graphics/icons/titanium-plate.png", - icon_size = 64, + icon_size = 64, icon_mipmaps = 3, subgroup = "raw-material", order = "b[titanium-plate]", stack_size = (mods["Krastorio2"] and util.get_k2_stack_size() or 100) @@ -64,8 +64,8 @@ data:extend( { type = "technology", name = "titanium-processing", - icon_size = 128, - icon = "__bztitanium__/graphics/icons/titanium-processing.png", + icon_size = 256, icon_mipmaps = 4, + icon = "__bztitanium__/graphics/technology/titanium-processing.png", effects = { {