diff --git a/changelog.txt b/changelog.txt index 277764d..bdb5689 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.6.0 +Date: 2022-07-01 + Changes: + - Compatible with Space Exploration 0.6 +--------------------------------------------------------------------------------------------------- Version: 0.5.8 Date: 2022-02-22 Changes: diff --git a/data-final-fixes.lua b/data-final-fixes.lua index e7cf08c..cca2faf 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -15,10 +15,6 @@ for i, entity in pairs(data.raw.furnace) do end if mods["space-exploration"] then - -- Organization - data.raw.item["tungsten-plate"].subgroup = "plates" - data.raw.recipe["tungsten-plate"].subgroup = "plates" - -- core mining balancing util.add_to_product("se-core-fragment-omni", "tungsten-ore", -3) end diff --git a/graphics/icons/molten-tungsten.png b/graphics/icons/molten-tungsten.png new file mode 100644 index 0000000..c98b1e7 Binary files /dev/null and b/graphics/icons/molten-tungsten.png differ diff --git a/graphics/icons/molten-tungsten.xcf b/graphics/icons/molten-tungsten.xcf new file mode 100644 index 0000000..16469a6 Binary files /dev/null and b/graphics/icons/molten-tungsten.xcf differ diff --git a/graphics/icons/tungsten-ingot.png b/graphics/icons/tungsten-ingot.png new file mode 100644 index 0000000..3be6927 Binary files /dev/null and b/graphics/icons/tungsten-ingot.png differ diff --git a/graphics/icons/tungsten-ingot.xcf b/graphics/icons/tungsten-ingot.xcf new file mode 100644 index 0000000..ad1f78f Binary files /dev/null and b/graphics/icons/tungsten-ingot.xcf differ diff --git a/info.json b/info.json index 6c7d247..394b3bf 100644 --- a/info.json +++ b/info.json @@ -1,5 +1,5 @@ { "name": "bztungsten", - "version": "0.5.8", + "version": "0.6.0", "factorio_version": "1.1", "title": "Tungsten", "author": "Brevven", diff --git a/locale/en/tungsten.cfg b/locale/en/tungsten.cfg index e289b9c..e3c81aa 100644 --- a/locale/en/tungsten.cfg +++ b/locale/en/tungsten.cfg @@ -14,6 +14,7 @@ tungsten-ore=[item=tungsten-ore] Wolframite tungsten-ore=Wolframite tungsten-dust=Tungsten dust tungsten-plate=Tungsten plate +tungsten-ingot=Tungsten ingot tungsten-carbide=Tungsten carbide rocket-engine-nozzle=Rocket engine nozzle enriched-tungsten=Enriched tungsten @@ -26,6 +27,9 @@ tungsten-ore=Can be smelted into tungsten plates enriched-tungsten=Can be efficiently smelted into tungsten plates advanced-carbon-furnace=For making tungsten carbide quickly and efficiently. Burns a lot of fuel. +[fluid-name] +molten-tungsten=Molten tungsten + [technology-name] tungsten-processing=Tungsten processing bz-tungsten-processing=Basic tungsten processing diff --git a/tungsten-recipe-final-stacking.lua b/tungsten-recipe-final-stacking.lua index e73c128..a64684b 100644 --- a/tungsten-recipe-final-stacking.lua +++ b/tungsten-recipe-final-stacking.lua @@ -10,6 +10,9 @@ if deadlock then if mods["Krastorio2"] then deadlock.add_stack("enriched-tungsten", "__bztungsten__/graphics/icons/stacked/enriched-tungsten-stacked.png" , "deadlock-stacking-2", 64) end + if data.raw.item["tungsten-ingot"] then + deadlock.add_stack("tungsten-ingot", nil, "deadlock-stacking-2", nil) + end end -- Deadlock crating recipes @@ -21,5 +24,8 @@ if deadlock_crating then if mods["Krastorio2"] then deadlock_crating.add_crate("enriched-tungsten", "deadlock-crating-2") end + if data.raw.item["tungsten-ingot"] then + deadlock_crating.add_crate("tungsten-ingot", "deadlock-crating-2") + end end diff --git a/tungsten-recipe-se.lua b/tungsten-recipe-se.lua index fdcf687..984e06b 100644 --- a/tungsten-recipe-se.lua +++ b/tungsten-recipe-se.lua @@ -1,5 +1,5 @@ -- Additional recipes if Space Exploration mod is enabled -local util = require("__bztungsten__.data-util"); +local util = require("data-util"); if mods["space-exploration"] then se_delivery_cannon_recipes["tungsten-ore"] = {name= "tungsten-ore"} @@ -22,6 +22,123 @@ if mods["space-exploration"] then } }) +if string.sub(mods["space-exploration"], 1, 3) == "0.6" then + data:extend({ + { + type = "item-subgroup", + name = "tungsten", + group = "resources", + order = "a-h-z-a", + } + }) + data.raw.item["tungsten-plate"].subgroup = "tungsten" + data.raw.item["tungsten-carbide"].subgroup = "tungsten" + data:extend({ + { + type = "item", + name = "tungsten-ingot", + icons = {{icon = "__bztungsten__/graphics/icons/tungsten-ingot.png", icon_size = 128}}, + order = "b-b", + stack_size = 50, + subgroup = "tungsten", + }, + { + type = "fluid", + name = "molten-tungsten", + default_temperature = 3422, + max_temperature = 3422, + base_color = {r=191, g=219, b=233}, + flow_color = {r=191, g=219, b=233}, + icons = {{icon = "__bztungsten__/graphics/icons/molten-tungsten.png", icon_size = 128}}, + order = "a[molten]-a", + pressure_to_speed_ratio = 0.4, + flow_to_energy_ratio = 0.59, + auto_barrel = false, + subgroup = "fluid", + }, + { + type = "recipe", + category = "smelting", + name = "molten-tungsten", + subgroup = "tungsten", + results = { + {type = "fluid", name = "molten-tungsten", amount = mods.Krastorio2 and 750 or 900}, + }, + energy_required = 60, + ingredients = { + {name = mods.Krastorio2 and "enriched-tungsten" or "tungsten-ore", amount = 24}, + {type = "fluid", name = "se-pyroflux", amount = 10}, + }, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + order = "a-a" + }, + { + type = "recipe", + name = "tungsten-ingot", + category = "casting", + results = {{"tungsten-ingot", 1}}, + energy_required = 18, + ingredients = { + {type = "fluid", name = "molten-tungsten", amount = 375}, + }, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + }, + { + type = "recipe", + name = "tungsten-carbide-casting", + category = "casting", + icons = { + {icon = "__bztungsten__/graphics/icons/tungsten-carbide.png", icon_size = 128}, + {icon = "__bztungsten__/graphics/icons/molten-tungsten.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, + }, + results = {{"tungsten-carbide", 4}}, + energy_required = 40, + ingredients = { + data.raw.item["coke"] and {"coke", 8} or {"coal", 16}, + {type = "fluid", name = "molten-tungsten", amount = 375}, + }, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + }, + { + type = "recipe", + category = "crafting", + name = "tungsten-ingot-to-plate", + icons = { + {icon = "__bztungsten__/graphics/icons/tungsten-plate.png", icon_size = 128}, + {icon = "__bztungsten__/graphics/icons/tungsten-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, + }, + results = { + {name = "tungsten-plate", amount = 10}, + }, + energy_required = 5, + ingredients = { + {name = "tungsten-ingot", amount = 1} + }, + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + order = "a-c-b" + }, + }) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "molten-tungsten"}) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "tungsten-ingot"}) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "tungsten-ingot-to-plate"}) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "tungsten-carbide-casting"}) + util.add_prerequisite(data.raw.technology["se-processing-vulcanite"], util.me.tungsten_processing) + if mods["Krastorio2"] then + data.raw.recipe["enriched-tungsten-plate"].order= "d[tungsten-plate]" + se_delivery_cannon_recipes["enriched-tungsten"] = {name= "enriched-tungsten"} + end + +else + data.raw.item["tungsten-plate"].subgroup = "plates" + data.raw.item["tungsten-carbide"].subgroup = "plates" if mods["Krastorio2"] then data:extend({ { @@ -79,6 +196,8 @@ if mods["space-exploration"] then util.add_effect("se-processing-vulcanite", {type = "unlock-recipe", recipe= "tungsten-smelting-vulcanite"}) end end +end + if mods["aai-industry"] and not mods["Krastorio2"] and not mods.bzfoundry then data:extend({ {