fix fe+ & 5dim's

This commit is contained in:
Brevven 2022-02-16 21:29:54 -08:00
parent 89a07a8a70
commit 8ab69a27f2
7 changed files with 19 additions and 14 deletions

View file

@ -1,4 +1,9 @@
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
Version: 1.0.6
Date: 2022-02-16
Fixes:
- Fix for FE+ and 5dim's used together.
---------------------------------------------------------------------------------------------------
Version: 1.0.5 Version: 1.0.5
Date: 2022-02-11 Date: 2022-02-11
Fixes: Fixes:

View file

@ -558,7 +558,7 @@ function util.add_crafting_category(entity_type, entity, category)
if data.raw[entity_type][entity] then if data.raw[entity_type][entity] then
for i, existing in pairs(data.raw[entity_type][entity].crafting_categories) do for i, existing in pairs(data.raw[entity_type][entity].crafting_categories) do
if existing == category then if existing == category then
log(entity.." not adding "..new.." -- duplicate") log(entity.." not adding "..category.." -- duplicate")
return return
end end
end end

View file

@ -1,6 +1,6 @@
{ {
"name": "bztitanium", "name": "bztitanium",
"version": "1.0.5", "version": "1.0.6",
"factorio_version": "1.1", "factorio_version": "1.1",
"title": "Titanium", "title": "Titanium",
"author": "Brevven", "author": "Brevven",

View file

@ -8,16 +8,16 @@ if simpleCompress then
end end
if simpleCompress.plates then if simpleCompress.plates then
simpleCompress.currentSubgroup = "intermediate-product" simpleCompress.currentSubgroup = "intermediate-product"
if data.raw.item["titanium-plate"] then if data.raw.item[util.me.titanium_plate] then
SimpleCompress_AddTintedItem("titanium-plate", "plates4-titanium", "plate3", {r=0.85, g=0.85, b=0.70}) SimpleCompress_AddTintedItem(util.me.titanium_plate, "plates4-titanium", "plate3", {r=0.85, g=0.85, b=0.70})
SimpleCompress_UnlockPlateTechAndRecipe("titanium-plate") SimpleCompress_UnlockPlateTechAndRecipe(util.me.titanium_plate)
end end
local titaniumRecipe = data.raw.recipe["decompress-titanium-plate"] local titaniumRecipe = data.raw.recipe["decompress-titanium-plate"]
titaniumRecipe.order = "d[titanium-plate]" titaniumRecipe.order = "d[titanium-plate]"
end end
if simpleCompress.smelting then if simpleCompress.smelting then
if data.raw.item["titanium-plate"] and data.raw.item["titanium-plate"] then if data.raw.item[ util.me.titanium_plate] and data.raw.item[util.me.titanium_plate] then
SimpleCompress_AddSmeltingRecipe("titanium-ore", "titanium-plate") SimpleCompress_AddSmeltingRecipe("titanium-ore",util.me.titanium_plate)
SimpleCompress_UnlockOreSmeltingTech("titanium-ore") SimpleCompress_UnlockOreSmeltingTech("titanium-ore")
local titaniumRecipe = data.raw.recipe["smelt-compressed-titanium-ore"] local titaniumRecipe = data.raw.recipe["smelt-compressed-titanium-ore"]
titaniumRecipe.ingredients = {{"compressed-titanium-ore", 5}} titaniumRecipe.ingredients = {{"compressed-titanium-ore", 5}}

View file

@ -69,7 +69,7 @@ data:extend(
{ {
{"enriched-titanium", 10} {"enriched-titanium", 10}
}, },
result = "titanium-plate", result = util.me.titanium_plate,
result_count = 5, result_count = 5,
order = "b[titanium-plate]-b[enriched-titanium-plate]" order = "b[titanium-plate]-b[enriched-titanium-plate]"
}, },

View file

@ -49,7 +49,7 @@ matter.createMatterRecipe(titanium_ore_matter)
local titanium_plate_matter = local titanium_plate_matter =
{ {
item_name = "titanium-plate", item_name = util.me.titanium_plate,
minimum_conversion_quantity = 10, minimum_conversion_quantity = 10,
matter_value = 14, matter_value = 14,
energy_required = 2, energy_required = 2,

View file

@ -2,8 +2,8 @@ local util = require("__bztitanium__.data-util");
if mods["5dim_core"] then if mods["5dim_core"] then
data.raw.item["titanium-plate"].subgroup = "plates-plates" data.raw.item[util.me.titanium_plate].subgroup = "plates-plates"
data.raw.recipe["titanium-plate"].subgroup = "plates-plates" data.raw.recipe[util.me.titanium_plate].subgroup = "plates-plates"
data.raw.item["titanium-ore"].subgroup = "plates-ore" data.raw.item["titanium-ore"].subgroup = "plates-ore"
if mods["5dim_resources"] then if mods["5dim_resources"] then
@ -95,7 +95,7 @@ if mods["5dim_core"] then
if mods["5dim_automation"] then if mods["5dim_automation"] then
for i, name in ipairs( for i, name in ipairs(
{"5d-assembling-machine-07","5d-assembling-machine-08","5d-lab-06","5d-lab-07"}) do {"5d-assembling-machine-07","5d-assembling-machine-08","5d-lab-06","5d-lab-07"}) do
util.replace_ingredient(name, "steel-plate", "titanium-plate") util.replace_ingredient(name, "steel-plate", util.me.titanium_plate)
end end
end end
@ -113,12 +113,12 @@ if mods["5dim_core"] then
"5d-steam-turbine-09", "5d-steam-turbine-09",
"5d-steam-turbine-10" "5d-steam-turbine-10"
}) do }) do
util.add_ingredient(name, "titanium-plate", 20) util.add_ingredient(name, util.me.titanium_plate, 20)
end end
end end
if mods["5dim_battlefield"] then if mods["5dim_battlefield"] then
util.replace_ingredient(name, "steel-plate", "titanium-plate") util.replace_ingredient(name, "steel-plate", util.me.titanium_plate)
end end
end end