diff --git a/changelog.txt b/changelog.txt index 1a8956d..fa3bc0f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,18 @@ --------------------------------------------------------------------------------------------------- +Version: 0.2.13 +Date: 2023-12-28 + Changes: + - Some recipes moved in crafting menus, they were defaulting to appearing at the top: + - In vanilla: recipes for certain intermediates created in foundries moved after + "raw-material" recipes (such as most plates, etc), and before "intermediate-product" + recipes (eg circuits). There's not a perfect place for this right now, but this seems to be + thematically a decent place to put it. + - In Space Exploration (SE): Similar to above, but after gears, sticks, etc + - In vanilla and SE: recipes for foundry entities moved after furnace entities but before + assemblers. This seems to be the right location, thematically. + Localization: + - ja locale updates thanks to Sakuro +--------------------------------------------------------------------------------------------------- Version: 0.2.12 Date: 2023-04-18 Features: diff --git a/data-util.lua b/data-util.lua index 6b923b4..6f24821 100644 --- a/data-util.lua +++ b/data-util.lua @@ -131,6 +131,13 @@ function util.k2matter(params) params.k2matter.minimum_conversion_quantity = 10 end if not data.raw.technology[params.k2matter.unlocked_by_technology] then + local icon = "" + if params.k2baseicon then + icon = util.k2assets().."/technologies/matter-"..params.k2baseicon..".png" + else + icon = util.k2assets().."/technologies/backgrounds/matter.png" + end + data:extend( { { @@ -139,7 +146,7 @@ function util.k2matter(params) icons = { { - icon = util.k2assets().."/technologies/matter-"..params.k2baseicon..".png", + icon = icon, icon_size = 256, }, params.icon, @@ -148,14 +155,25 @@ function util.k2matter(params) unit = { count = 350, - ingredients = + ingredients = mods["space-exploration"] and + { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"se-astronomic-science-pack-4", 1}, + {"se-energy-science-pack-4", 1}, + {"se-material-science-pack-4", 1}, + {"se-deep-space-science-pack-2", 1}, + {"se-kr-matter-science-pack-2", 1}, + } or { {"production-science-pack", 1}, {"utility-science-pack", 1}, {"matter-tech-card", 1} }, time = 45, - } + }, + localised_name = {"technology-name.k2-conversion", {"item-name."..params.k2matter.item_name}}, }, }) end diff --git a/info.json b/info.json index 20d7033..306d5c8 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzfoundry", - "version": "0.2.12", + "version": "0.2.13", "factorio_version": "1.1", "title": "Foundry", "author": "Brevven", diff --git a/prototypes/categories.lua b/prototypes/categories.lua index 16c53e5..1bea4d5 100644 --- a/prototypes/categories.lua +++ b/prototypes/categories.lua @@ -2,8 +2,9 @@ local util = require("data-util") data:extend({ { type = "recipe-category", name = "founding"}, - { type = "item-subgroup", name = "founding-machines", group = "production"}, - { type = "item-subgroup", name = "foundry-intermediate", group = "intermediate-products"}, + { type = "item-subgroup", name = "founding-machines", group = "production", order = "d-f"}, + { type = "item-subgroup", name = "foundry-intermediate", group = "intermediate-products", + order = util.se6() and "a-b-z" or "c-z"}, }) if util.me.basic_founding() then