diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..bbf3e21 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,3 @@ +[*] +indent_style = space +indent_size = 2 \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..85e49ae --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.idea +*.zip \ No newline at end of file diff --git a/Cobalt2/LICENSE.md b/Cobalt2/LICENSE.md new file mode 100644 index 0000000..ee22ee9 --- /dev/null +++ b/Cobalt2/LICENSE.md @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2023 Timeken + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Cobalt2/README.md b/Cobalt2/README.md new file mode 100644 index 0000000..7db4260 --- /dev/null +++ b/Cobalt2/README.md @@ -0,0 +1,16 @@ +# MetalsForYou + +## Version History +See changelog.txt + +## Created by + + +## Thanks to + +### Compatibility + + +### Localization + + diff --git a/Cobalt2/changelog.txt b/Cobalt2/changelog.txt new file mode 100644 index 0000000..4b67468 --- /dev/null +++ b/Cobalt2/changelog.txt @@ -0,0 +1,50 @@ +--------------------------------------------------------------------------------------------------- +Version: 0.5.1 +Date: 2024-08-09 + Features: + - Added productivity to co-cr-aeroframe-pole. +--------------------------------------------------------------------------------------------------- +Version: 0.5.0 +Date: 2024-07-16 + Features: + - Added co-cr-aeroframe-pole recipe for SE. + - Added cobalt electromagnet to SE electromagnetic field data. + - Added high power cobalt magnet to SE quantum phenomenon data. + - Added cobalt ingot to SE energy science pack 2. +--------------------------------------------------------------------------------------------------- +Version: 0.4.0 +Date: 2024-07-04 + Features: + - Added cobalt data storage for SE. + - Fixed progression when using K2 but not SE +--------------------------------------------------------------------------------------------------- +Version: 0.3.1 +Date: 2024-01-21 + Features: + - Removed old unused files. +--------------------------------------------------------------------------------------------------- +Version: 0.3.0 +Date: 2024-01-13 + Features: + - Added cobaltite ore to SE core fragment. + - Added cobalt electromagnet. +--------------------------------------------------------------------------------------------------- +Version: 0.2.2 +Date: 2024-01-08 + Features: + - Fixed cobalt refining tech local. +--------------------------------------------------------------------------------------------------- +Version: 0.2.1 +Date: 2024-01-06 + Features: + - Fixed high power cobalt magnet unlock when not playing SE. +--------------------------------------------------------------------------------------------------- +Version: 0.2.0 +Date: 2024-01-02 + Features: + - Added Co-Cr alloy (if Chromium is installed) +--------------------------------------------------------------------------------------------------- +Version: 0.1.0 +Date: 2023-12-24 + Features: + - Alpha release. \ No newline at end of file diff --git a/Cobalt2/data-final-fixes.lua b/Cobalt2/data-final-fixes.lua new file mode 100644 index 0000000..b95c07f --- /dev/null +++ b/Cobalt2/data-final-fixes.lua @@ -0,0 +1 @@ +local util = require("recipe-final-fix") \ No newline at end of file diff --git a/Cobalt2/data-updates.lua b/Cobalt2/data-updates.lua new file mode 100644 index 0000000..f919e52 --- /dev/null +++ b/Cobalt2/data-updates.lua @@ -0,0 +1,2 @@ +require("recipe-modify") +require("prototypes.cobalt-matter") \ No newline at end of file diff --git a/Cobalt2/data-util.lua b/Cobalt2/data-util.lua new file mode 100644 index 0000000..4b2d096 --- /dev/null +++ b/Cobalt2/data-util.lua @@ -0,0 +1,930 @@ +local util = {} + +-- se landfill +-- params: ore, icon_size +function util.se_landfill(params) + if mods["space-exploration"] then + if not params.icon_size then params.icon_size = 64 end + local lname="landfill-"..params.ore + data:extend({ + { + type = "recipe", + icons = { + { icon = "__base__/graphics/icons/landfill.png", icon_size = 64, icon_mipmaps = 3 }, + { icon = "__Chromium2__/graphics/icons/"..params.ore..".png", icon_size = params.icon_size, scale = 0.33*64/params.icon_size}, + }, + energy_required = 1, + enabled=false, + name = lname, + category = "hard-recycling", + order = "z-b-"..params.ore, + subgroup = "terrain", + results = {{type="item", name="landfill", amount=1}}, + ingredients = {{type="item", name=params.ore, amount=50}}, + } + }) + util.add_unlock("se-recycling-facility", lname) + end +end + +-- se matter +-- params: ore, energy_required, quant_out, quant_in, icon_size, stream_out +function util.se_matter(params) + if not params.quant_in then params.quant_in = params.quant_out end + if not params.icon_size then params.icon_size = 64 end + local fname = "matter-fusion-"..params.ore + local sedata = mods["Krastorio2"] and "se-kr-matter-synthesis-data" or "se-fusion-test-data" + local sejunk = mods["Krastorio2"] and "se-broken-data" or "se-junk-data" + data:extend({ + { + type = "recipe", + name = fname, + localised_name = {"recipe-name.se-matter-fusion-to", {"item-name."..params.ore}}, + category = "space-materialisation", + subgroup = "materialisation", + order = "a-b-z", + icons = { + {icon = "__space-exploration-graphics__/graphics/blank.png", + icon_size = 64, scale = 0.5}, + {icon = "__space-exploration-graphics__/graphics/icons/fluid/particle-stream.png", + icon_size = 64, scale = 0.33, shift = {8,-8}}, + {icon = "__Chromium2__/graphics/icons/"..params.ore..".png", + icon_size = params.icon_size, scale = 0.33 * 64/params.icon_size, shift={-8, 8}}, + {icon = "__space-exploration-graphics__/graphics/icons/transition-arrow.png", + icon_size = 64, scale = 0.5}, + }, + energy_required = params.energy_required, + enabled = false, + ingredients = { + {type = "item", name = sedata, amount=1}, + {type="fluid", name="se-particle-stream", amount=50}, + {type="fluid", name="se-space-coolant-supercooled", amount=25}, + }, + results = { + {type = "item", name = params.ore, amount = params.quant_out}, + {type="item", name="se-contaminated-scrap", amount=1}, + {type="item", name=sedata, amount=1, probability=.99}, + {type="item", name=sejunk, amount=1, probability=.01}, + {type="fluid", name="se-space-coolant-hot", amount=25, ignored_by_productivity = 25, ignored_by_stats = 25}, + } + } + }) + util.add_unlock("se-space-matter-fusion", fname) + + if mods["Krastorio2"] then + local lname = params.ore.."-to-particle-stream" + data:extend({ + enabled = false, + { + type = "recipe", + name = lname, + localised_name = {"recipe-name.se-kr-matter-liberation", {"item-name."..params.ore}}, + category = "space-materialisation", + subgroup = "advanced-particle-stream", + order = "a-b-z", + icons = { + {icon = "__space-exploration-graphics__/graphics/blank.png", + icon_size = 64, scale = 0.5}, + {icon = "__space-exploration-graphics__/graphics/icons/fluid/particle-stream.png", + icon_size = 64, scale = 0.33, shift = {-8,8}}, + {icon = "__Chromium2__/graphics/icons/"..params.ore..".png", + icon_size = params.icon_size, scale = 0.33 * 64/params.icon_size, shift={8, -8}}, + {icon = "__space-exploration-graphics__/graphics/icons/transition-arrow.png", + icon_size = 64, scale = 0.5}, + }, + energy_required = 30, + enabled = false, + ingredients = { + {type="item", name="se-kr-matter-liberation-data", amount=1}, + {type="item", name=params.ore, amount=params.quant_in}, + {type="fluid", name="se-particle-stream", amount=50}, + }, + results = { + {type="item", name="se-kr-matter-liberation-data", amount=1, probability=.99}, + {type="item", name=sejunk, amount=1, probability=.01}, + {type="fluid", name="se-particle-stream", amount=params.stream_out, ignored_by_productivity = 50, ignored_by_stats = 50}, + } + } + }) + if not data.raw.technology["bz-advanced-stream-production"] then + data:extend({ + { + type = "technology", + name ="bz-advanced-stream-production", + localised_name = {"", {"technology-name.se-kr-advanced-stream-production"}, " 2"}, + icon = "__space-exploration-graphics__/graphics/technology/material-fabricator.png", + icon_size = 128, + effects = {}, + unit = { + count = 100, + time = 15, + ingredients = { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"se-rocket-science-pack", 1}, + {"space-science-pack", 1}, + {"production-science-pack", 1}, + {"utility-science-pack", 1}, + {"se-astronomic-science-pack-4", 1}, + {"se-energy-science-pack-4", 1}, + {"se-material-science-pack-4", 1}, + {"matter-tech-card", 1}, + {"se-deep-space-science-pack-1", 1}, + } + }, + prerequisites = {"se-kr-advanced-stream-production"}, + }, + }) + end + util.add_unlock("bz-advanced-stream-production", lname) + end +end + +-- Get the normal prototype for a recipe -- either .normal or the recipe itself +function util.get_normal(recipe_name) + if data.raw.recipe[recipe_name] then + recipe = data.raw.recipe[recipe_name] + if recipe.ingredients then + return recipe + end + end +end + +-- Set/override a technology's prerequisites +function util.set_prerequisite(technology_name, prerequisites) + local technology = data.raw.technology[technology_name] + if technology then + technology.prerequisites = {} + for i, prerequisite in pairs(prerequisites) do + if data.raw.technology[prerequisite] then + table.insert(technology.prerequisites, prerequisite) + end + end + end +end + +-- Add a prerequisite to a given technology +function util.add_prerequisite(technology_name, prerequisite) + local technology = data.raw.technology[technology_name] + if technology and data.raw.technology[prerequisite] then + if technology.prerequisites then + for i, pre in pairs(technology.prerequisites) do + if pre == prerequisite then return end + end + table.insert(technology.prerequisites, prerequisite) + else + technology.prerequisites = {prerequisite} + end + end +end + +-- Remove a prerequisite from a given technology +function util.remove_prerequisite(technology_name, prerequisite) + local technology = data.raw.technology[technology_name] + local index = -1 + if technology then + for i, prereq in pairs(technology.prerequisites) do + if prereq == prerequisite then + index = i + break + end + end + if index > -1 then + table.remove(technology.prerequisites, index) + end + end +end + + +-- Add an effect to a given technology +function util.add_effect(technology_name, effect) + local technology = data.raw.technology[technology_name] + if technology then + if not technology.effects then technology.effects = {} end + if effect and effect.type == "unlock-recipe" then + if not data.raw.recipe[effect.recipe] then + return + end + table.insert(technology.effects, effect) + end + end +end + +-- Add an effect to a given technology to unlock recipe +function util.add_unlock(technology_name, recipe) + util.add_effect(technology_name, {type="unlock-recipe", recipe=recipe}) +end + +-- remove recipe unlock effect from a given technology, multiple times if necessary +function util.remove_recipe_effect(technology_name, recipe_name) + local technology = data.raw.technology[technology_name] + local index = -1 + local cnt = 0 + if technology and technology.effects then + for i, effect in pairs(technology.effects) do + if effect.type == "unlock-recipe" and effect.recipe == recipe_name then + index = i + cnt = cnt + 1 + end + end + if index > -1 then + table.remove(technology.effects, index) + if cnt > 1 then -- not over yet, do it again + util.remove_recipe_effect(technology_name, recipe_name) + end + end + end +end + +-- Set technology ingredients +function util.set_tech_recipe(technology_name, ingredients) + local technology = data.raw.technology[technology_name] + if technology then + technology.unit.ingredients = ingredients + end +end + +function util.set_enabled(recipe_name, enabled) + if data.raw.recipe[recipe_name] then + data.raw.recipe[recipe_name].enabled = enabled + end +end + +function util.set_hidden(recipe_name) + if data.raw.recipe[recipe_name] then + data.raw.recipe[recipe_name].hidden = true + end +end + +-- Add a given quantity of ingredient to a given recipe +function util.add_or_add_to_ingredient(recipe_name, ingredient, quantity) + if data.raw.recipe[recipe_name] and data.raw.item[ingredient] then + add_or_add_to_ingredient(data.raw.recipe[recipe_name], ingredient, quantity) + end +end + +function add_or_add_to_ingredient(recipe, ingredient, quantity) + if recipe ~= nil and recipe.ingredients ~= nil then + for i, existing in pairs(recipe.ingredients) do + if existing[1] == ingredient or existing.name == ingredient then + add_to_ingredient(recipe, ingredient, quantity) + return + end + end + table.insert(recipe.ingredients, {ingredient, quantity}) + end +end + +-- Add a given quantity of ingredient to a given recipe +function util.add_ingredient(recipe_name, ingredient, quantity) + local is_fluid = not not data.raw.fluid[ingredient] + if data.raw.recipe[recipe_name] and (data.raw.item[ingredient] or is_fluid) then + add_ingredient(data.raw.recipe[recipe_name], ingredient, quantity, is_fluid) + end +end + +function add_ingredient(recipe, ingredient, quantity, is_fluid) + if recipe ~= nil and recipe.ingredients ~= nil then + for i, existing in pairs(recipe.ingredients) do + if existing.name == ingredient then + return + end + end + if is_fluid then + table.insert(recipe.ingredients, {type="fluid", name=ingredient, amount=quantity}) + else + table.insert(recipe.ingredients, {type = "item", name = ingredient, amount = quantity}) + end + end +end + +-- Add a given ingredient prototype to a given recipe +function util.add_ingredient_raw(recipe_name, ingredient) + if data.raw.recipe[recipe_name] and (data.raw.item[ingredient.name] or data.raw.item[ingredient[1]]) then + add_ingredient_raw(data.raw.recipe[recipe_name], ingredient) + end +end + +function add_ingredient_raw(recipe, ingredient) + if recipe ~= nil and recipe.ingredients ~= nil then + for i, existing in pairs(recipe.ingredients) do + if (existing.name and existing.name == ingredient.name) then + return + end + end + table.insert(recipe.ingredients, ingredient) + end +end + +-- Set an ingredient to a given quantity +function util.set_ingredient(recipe_name, ingredient, quantity) + if data.raw.recipe[recipe_name] and data.raw.item[ingredient] then + set_ingredient(data.raw.recipe[recipe_name], ingredient, quantity) + end +end + +function set_ingredient(recipe, ingredient, quantity) + if recipe ~= nil and recipe.ingredients ~= nil then + for i, existing in pairs(recipe.ingredients) do + if existing.name == ingredient then + existing.amount = quantity + existing.amount_min = nil + existing.amount_max = nil + return + end + end + table.insert(recipe.ingredients, {ingredient, quantity}) + end +end +-- Add a given quantity of product to a given recipe. +-- Only works for recipes with multiple products +function util.add_product(recipe_name, product) + if data.raw.recipe[recipe_name] and + (data.raw.item[product.name] or data.raw.fluid[product.name]) then + add_product(data.raw.recipe[recipe_name], product) + end +end + +function add_product(recipe, product) + if recipe ~= nil then + if recipe.results == nil then + recipe.results = {} + end + table.insert(recipe.results, product) + end +end + +-- Get the amount of the ingredient, will check base/normal not expensive +function util.get_ingredient_amount(recipe_name, ingredient_name) + local recipe = data.raw.recipe[recipe_name] + if recipe then + if recipe.ingredients then + for i, ingredient in pairs(recipe.ingredients) do + if ingredient.name == ingredient_name then return ingredient.amount end + end + end + return 1 + end + return 0 +end + +-- Get the amount of the result, will check base/normal not expensive +function util.get_amount(recipe_name, product) + if not product then product = recipe_name end + local recipe = data.raw.recipe[recipe_name] + if recipe then + if recipe.results then + for i, result in pairs(recipe.results) do + if result.name == product then return result.amount end + end + end + return 1 + end + return 0 +end + +-- Replace one ingredient with another in a recipe +-- Use amount to set an amount. If that amount is a multiplier instead of an exact amount, set multiply true. +function util.replace_ingredient(recipe_name, old, new, amount, multiply) + if data.raw.recipe[recipe_name] and (data.raw.item[new] or data.raw.fluid[new]) then + replace_ingredient(data.raw.recipe[recipe_name], old, new, amount or 1, multiply) + end +end + +function replace_ingredient(recipe, old, new, amount, multiply) + if recipe ~= nil and recipe.ingredients ~= nil then + for i, existing in pairs(recipe.ingredients) do + if existing.name == new then + return + end + end + for i, ingredient in pairs(recipe.ingredients) do + if ingredient.name == old then + ingredient.name = new + if multiply then + ingredient.amount = amount * ingredient.amount + else + ingredient.amount = amount + end + end + end + end +end + +-- Remove an ingredient from a recipe +function util.remove_ingredient(recipe_name, old) + if data.raw.recipe[recipe_name] then + remove_ingredient(data.raw.recipe[recipe_name], old) + end +end + +function remove_ingredient(recipe, old) + index = -1 + if recipe ~= nil and recipe.ingredients ~= nil then + for i, ingredient in pairs(recipe.ingredients) do + if ingredient.name == old then + index = i + break + end + end + if index > -1 then + table.remove(recipe.ingredients, index) + end + end +end + +-- Replace an amount of an ingredient in a recipe. Keep at least 1 of old. +function util.replace_some_ingredient(recipe_name, old, old_amount, new, new_amount) + local is_fluid = not not data.raw.fluid[new] + if data.raw.recipe[recipe_name] and (data.raw.item[new] or is_fluid) then + replace_some_ingredient(data.raw.recipe[recipe_name], old, old_amount, new, new_amount, is_fluid) + end +end + +function replace_some_ingredient(recipe, old, old_amount, new, new_amount, is_fluid) + if recipe ~= nil and recipe.ingredients ~= nil then + for i, existing in pairs(recipe.ingredients) do + if existing.name == new then + return + end + end + for i, ingredient in pairs(recipe.ingredients) do + if ingredient.name == old then + ingredient.amount = math.max(1, ingredient.amount - old_amount) + end + end + add_ingredient(recipe, new, new_amount, is_fluid) + end +end + +-- set the amount of a product. +function util.set_product_amount(recipe_name, product, amount) + if data.raw.recipe[recipe_name] then + set_product_amount(data.raw.recipe[recipe_name], product, amount) + end +end + +function set_product_amount(recipe, product, amount) + if recipe then + if recipe.result_count then + recipe.result_count = amount + end + if recipe.results then + for i, result in pairs(recipe.results) do + if result.name == product then + if result.amount then + result.amount = amount + end + if result.amount_min ~= nil then + result.amount_min = nil + result.amount_max = nil + result.amount = amount + end + end + if result[1] == product then + result[2] = amount + end + end + end + if not recipe.results and not recipe.result_count then + -- implicit one item result + recipe.result_count = amount + end + end +end + +-- multiply the cost, energy, and results of a recipe by a multiple +function util.multiply_recipe(recipe_name, multiple) + if data.raw.recipe[recipe_name] then + multiply_recipe(data.raw.recipe[recipe_name], multiple) + end +end + +function multiply_recipe(recipe, multiple) + if recipe then + if recipe.energy_required then + recipe.energy_required = recipe.energy_required * multiple + end + if recipe.result_count then + recipe.result_count = recipe.result_count * multiple + end + if recipe.results then + for i, result in pairs(recipe.results) do + if result.name then + if result.amount then + result.amount = result.amount * multiple + end + if result.amount_min ~= nil then + result.amount_min = result.amount_min * multiple + result.amount_max = result.amount_max * multiple + end + if result.catalyst_amount then + result.catalyst_amount = result.catalyst_amount * multiple + end + end + if result[1] then + result[2] = result[2] * multiple + end + end + end + if not recipe.results and not recipe.result_count then + -- implicit one item result + recipe.result_count = multiple + end + if recipe.ingredients then + for i, ingredient in pairs(recipe.ingredients) do + if ingredient.name then + ingredient.amount = ingredient.amount * multiple + end + if ingredient[1] then + ingredient[2] = ingredient[2] * multiple + end + end + end + end +end + +-- Returns true if a recipe has an ingredient +function util.has_ingredient(recipe_name, ingredient) + return data.raw.recipe[recipe_name] and + has_ingredient(data.raw.recipe[recipe_name], ingredient) +end + +function has_ingredient(recipe, ingredient) + if recipe ~= nil and recipe.ingredients ~= nil then + for i, existing in pairs(recipe.ingredients) do + if existing[1] == ingredient or existing.name == ingredient then + return true + end + end + end + return false +end + +-- Remove a product from a recipe, WILL NOT remove the only product +function util.remove_product(recipe_name, old) + if data.raw.recipe[recipe_name] then + remove_product(data.raw.recipe[recipe_name], old) + end +end + +function remove_product(recipe, old) + index = -1 + if recipe ~= nil and recipe.results ~= nil then + for i, result in pairs(recipe.results) do + if result.name == old or result[1] == old then + index = i + break + end + end + if index > -1 then + table.remove(recipe.results, index) + end + end +end + +function util.set_main_product(recipe_name, product) + if data.raw.recipe[recipe_name] then + set_main_product(data.raw.recipe[recipe_name], product) + end +end + +function set_main_product(recipe, product) + if recipe then + recipe.main_product = product + end +end + +-- Replace one product with another in a recipe +function util.replace_product(recipe_name, old, new) + if data.raw.recipe[recipe_name] then + replace_product(data.raw.recipe[recipe_name], old, new) + end +end + +function replace_product(recipe, old, new) + if recipe then + if recipe.main_product == old then + recipe.main_product = new + end + if recipe.result == old then + recipe.result = new + return + end + if recipe.results then + for i, result in pairs(recipe.results) do + if result.name == old then result.name = new end + if result[1] == old then result[1] = new end + end + end + end +end + +-- Remove an element of type t and name from data.raw +function util.remove_raw(t, name) + if not data.raw[t] then + log(t.." not found in data.raw") + return + end + if data.raw[t][name] then + for i, elem in pairs(data.raw[t]) do + if elem.name == name then + data.raw[t][i] = nil + break + end + end + end +end + +-- Set energy required +function util.set_recipe_time(recipe_name, time) + if data.raw.recipe[recipe_name] then + set_recipe_time(data.raw.recipe[recipe_name], time) + end +end + +function set_recipe_time(recipe, time) + if recipe then + if recipe.energy_required then + recipe.energy_required = time + end + end +end + +-- Multiply energy required +function util.multiply_time(recipe_name, factor) + if data.raw.recipe[recipe_name] then + multiply_time(data.raw.recipe[recipe_name], factor) + end +end + +function multiply_time(recipe, factor) + if recipe then + if recipe.energy_required then + recipe.energy_required = recipe.energy_required * factor + end + end +end + +-- Add to energy required +function util.add_time(recipe_name, amount) + if data.raw.recipe[recipe_name] then + add_time(data.raw.recipe[recipe_name], amount) + end +end + +function add_time(recipe, amount) + if recipe then + if recipe.energy_required then + recipe.energy_required = recipe.energy_required + amount + end + end +end + +-- Set recipe category +function util.set_category(recipe_name, category) + if data.raw.recipe[recipe_name] and data.raw["recipe-category"][category] then + data.raw.recipe[recipe_name].category = category + end +end + +-- Set recipe subgroup +function util.set_subgroup(recipe_name, subgroup) + if data.raw.recipe[recipe_name] then + data.raw.recipe[recipe_name].subgroup = subgroup + end +end + +-- Set item subgroup +function util.set_item_subgroup(item, subgroup) + if data.raw.item[item] and data.raw["item-subgroup"][subgroup] then + data.raw.item[item].subgroup = subgroup + end +end + +function util.add_icon(recipe_name, icon) + if data.raw.recipe[recipe_name] then + if not (data.raw.recipe[recipe_name].icons and #(data.raw.recipe[recipe_name].icons) > 0) then + data.raw.recipe[recipe_name].icons = {{ + icon=data.raw.recipe[recipe_name].icon, + icon_size=data.raw.recipe[recipe_name].icon_size, + icon_mipmaps=data.raw.recipe[recipe_name].icon_mipmaps, + }} + data.raw.recipe[recipe_name].icon = nil + data.raw.recipe[recipe_name].icon_size = nil + end + table.insert(data.raw.recipe[recipe_name].icons, icon) + end +end + +-- Set recipe icons +function util.set_icons(recipe_name, icons) + if data.raw.recipe[recipe_name] then + data.raw.recipe[recipe_name].icons = icons + data.raw.recipe[recipe_name].icon = nil + data.raw.recipe[recipe_name].icon_size = nil + end +end + +-- Set recipe icons +function util.set_item_icons(item_name, icons) + if data.raw.item[item_name] then + data.raw.item[item_name].icons = icons + data.raw.item[item_name].icon = nil + data.raw.item[item_name].icon_size = nil + end +end + +-- Gets an item or fluid icon +function util.get_item_or_fluid_icon(name) + icon = "" + if data.raw.item[name] then + icon = data.raw.item[name].icon + if not icon then icon = data.raw.item[name].icons[1].icon end + elseif data.raw.fluid[name] then + icon = data.raw.fluid[name].icon + if not icon then icon = data.raw.fluid[name].icons[1].icon end + end + return icon +end + +function util.set_to_founding(recipe) + util.set_category(recipe, "founding") + util.set_subgroup(recipe, "foundry-intermediate") +end + +-- Add crafting category to an entity +function util.add_crafting_category(entity_type, entity, category) + if data.raw[entity_type][entity] and data.raw["recipe-category"][category] then + for i, existing in pairs(data.raw[entity_type][entity].crafting_categories) do + if existing == category then + return + end + end + table.insert(data.raw[entity_type][entity].crafting_categories, category) + end +end + +function util.add_to_ingredient(recipe, ingredient, amount) + if data.raw.recipe[recipe] then + add_to_ingredient(data.raw.recipe[recipe], ingredient, amount) + end +end + +function add_to_ingredient(recipe, it, amount) + if recipe ~= nil and recipe.ingredients ~= nil then + for i, ingredient in pairs(recipe.ingredients) do + if ingredient.name == it then + ingredient.amount = ingredient.amount + amount + return + end + if ingredient[1] == it then + ingredient[2] = ingredient[2] + amount + return + end + end + end +end + +function util.add_to_product(recipe_name, product, amount) + if data.raw.recipe[recipe_name] then + add_to_product(data.raw.recipe[recipe_name], product, amount) + end +end + +function add_to_product(recipe, product, amount) + if recipe ~= nil and recipe.results ~= nil then + if recipe.result == product then + recipe.result_count = recipe.result_count + amount + return + end + for i, result in pairs(recipe.results) do + if result.name == product then + result.amount = result.amount + amount + return + end + if result[1] == product then + result[2] = result[2] + amount + return + end + end + end +end + +-- Adds a result to a mineable type +function util.add_minable_result(t, name, result) + if data.raw[t] and data.raw[t][name] and data.raw[t][name].minable then + if data.raw[t][name].minable.result and not data.raw[t][name].minable.results then + data.raw[t][name].minable.results = { + {data.raw[t][name].minable.result ,data.raw[t][name].minable.count}} + data.raw[t][name].minable.result = nil + data.raw[t][name].minable.result_count = nil + end + if data.raw[t][name].minable.results then + table.insert(data.raw[t][name].minable.results, result) + end + end +end + +function util.remove_prior_unlocks(tech, recipe) + if data.raw.technology[tech].prerequisites then + for i, prerequisite in pairs(data.raw.technology[tech].prerequisites) do + remove_prior_unlocks(prerequisite, recipe) + end + end +end + +function remove_prior_unlocks(tech, recipe) + local technology = data.raw.technology[tech] + if technology then + util.remove_recipe_effect(tech, recipe) + if technology.prerequisites then + for i, prerequisite in pairs(technology.prerequisites) do + -- log("BZZZ removing prior unlocks for " .. tech ..", checking " .. prerequisite) -- Handy Debug :| + remove_prior_unlocks(prerequisite, recipe) + end + end + end +end + +function util.replace_ingredients_prior_to(tech, old, new, multiplier) + if not data.raw.technology[tech] then + log("Not replacing ingredient "..old.." with "..new.." because tech "..tech.." was not found") + return + end + util.remove_prior_unlocks(tech, old) + for i, recipe in pairs(data.raw.recipe) do + if (recipe.enabled and recipe.enabled ~= 'false') + and (not recipe.hidden or recipe.hidden == 'true') -- probably don't want to change hidden recipes + and string.sub(recipe.name, 1, 3) ~= 'se-' -- have to exlude SE in general :( + then + -- log("BZZZ due to 'enabled' replacing " .. old .. " with " .. new .." in " .. recipe.name) -- Handy Debug :| + util.replace_ingredient(recipe.name, old, new, multiplier, true) + end + end + if data.raw.technology[tech].prerequisites then + for i, prerequisite in pairs(data.raw.technology[tech].prerequisites) do + replace_ingredients_prior_to(prerequisite, old, new, multiplier) + end + end +end + +function replace_ingredients_prior_to(tech, old, new, multiplier) + local technology = data.raw.technology[tech] + if technology then + if technology.effects then + for i, effect in pairs(technology.effects) do + if effect.type == "unlock-recipe" then + -- log("BZZZ replacing " .. old .. " with " .. new .." in " .. effect.recipe) -- Handy Debug :| + util.replace_ingredient(effect.recipe, old, new, multiplier, true) + end + end + end + if technology.prerequisites then + for i, prerequisite in pairs(technology.prerequisites) do + -- log("BZZZ checking " .. prerequisite) -- Handy Debug :| + replace_ingredients_prior_to(prerequisite, old, new, multiplier) + end + end + end +end + +function util.remove_all_recipe_effects(recipe_name) + for name, _ in pairs(data.raw.technology) do + util.remove_recipe_effect(name, recipe_name) + end +end + +function util.add_unlock_force(technology_name, recipe) + util.set_enabled(recipe, false) + util.remove_all_recipe_effects(recipe) + util.add_unlock(technology_name, recipe) +end + +-- sum the products of a recipe +function util.sum_products(recipe_name) + -- this is going to end up approximate in some cases, integer division is probs fine + if data.raw.recipe[recipe_name] then + local recipe = data.raw.recipe[recipe_name] + if not recipe.results then return recipe.result_count end + local sum = 0 + for i, result in pairs(recipe.results) do + local amt = 0 + if result[2] then amt = result[2] + elseif result.amount then amt = result.amount + elseif result.amount_min then amt = (result.amount_min + result.amount_max)/2 + end + if result.probability then amt = amt * result.probability end + sum = sum + amt + end + return sum + end + return 0 +end + +function util.add_productivity(recipe) + data.raw.recipe[recipe].allow_productivity = true +end + +return util \ No newline at end of file diff --git a/Cobalt2/data.lua b/Cobalt2/data.lua new file mode 100644 index 0000000..c75b4cc --- /dev/null +++ b/Cobalt2/data.lua @@ -0,0 +1,7 @@ +require("prototypes.cobaltite-ore") +require("prototypes.cobalt-recipe") +require("prototypes.technology") + +require("prototypes.cobalt-enriched") -- Enriched Al for Krastorio 2 +require("prototypes.cobalt-recipe-se") -- Space Exploration +require("prototypes.cobalt-248k") -- 248k-Redux \ No newline at end of file diff --git a/Cobalt2/graphics/entity/ores/hr-cobaltite-ore.png b/Cobalt2/graphics/entity/ores/hr-cobaltite-ore.png new file mode 100644 index 0000000..dabfec9 Binary files /dev/null and b/Cobalt2/graphics/entity/ores/hr-cobaltite-ore.png differ diff --git a/Cobalt2/graphics/icons/co-cr-alloy.png b/Cobalt2/graphics/icons/co-cr-alloy.png new file mode 100644 index 0000000..335227d Binary files /dev/null and b/Cobalt2/graphics/icons/co-cr-alloy.png differ diff --git a/Cobalt2/graphics/icons/cobalt-carbide.png b/Cobalt2/graphics/icons/cobalt-carbide.png new file mode 100644 index 0000000..18e8e20 Binary files /dev/null and b/Cobalt2/graphics/icons/cobalt-carbide.png differ diff --git a/Cobalt2/graphics/icons/cobalt-electromagnet.png b/Cobalt2/graphics/icons/cobalt-electromagnet.png new file mode 100644 index 0000000..71e27d6 Binary files /dev/null and b/Cobalt2/graphics/icons/cobalt-electromagnet.png differ diff --git a/Cobalt2/graphics/icons/cobalt-ingot.png b/Cobalt2/graphics/icons/cobalt-ingot.png new file mode 100644 index 0000000..977bb40 Binary files /dev/null and b/Cobalt2/graphics/icons/cobalt-ingot.png differ diff --git a/Cobalt2/graphics/icons/cobalt-plate.png b/Cobalt2/graphics/icons/cobalt-plate.png new file mode 100644 index 0000000..7b7ddfe Binary files /dev/null and b/Cobalt2/graphics/icons/cobalt-plate.png differ diff --git a/Cobalt2/graphics/icons/cobaltite-ore.png b/Cobalt2/graphics/icons/cobaltite-ore.png new file mode 100644 index 0000000..9d035ed Binary files /dev/null and b/Cobalt2/graphics/icons/cobaltite-ore.png differ diff --git a/Cobalt2/graphics/icons/enriched-cobalt.png b/Cobalt2/graphics/icons/enriched-cobalt.png new file mode 100644 index 0000000..bdfd757 Binary files /dev/null and b/Cobalt2/graphics/icons/enriched-cobalt.png differ diff --git a/Cobalt2/graphics/icons/fi-arc-pure-cobalt.png b/Cobalt2/graphics/icons/fi-arc-pure-cobalt.png new file mode 100644 index 0000000..8e96dec Binary files /dev/null and b/Cobalt2/graphics/icons/fi-arc-pure-cobalt.png differ diff --git a/Cobalt2/graphics/icons/fi-materials-pure-cobalt.png b/Cobalt2/graphics/icons/fi-materials-pure-cobalt.png new file mode 100644 index 0000000..0ac2444 Binary files /dev/null and b/Cobalt2/graphics/icons/fi-materials-pure-cobalt.png differ diff --git a/Cobalt2/graphics/icons/high-power-cobalt-magnet.png b/Cobalt2/graphics/icons/high-power-cobalt-magnet.png new file mode 100644 index 0000000..c99dceb Binary files /dev/null and b/Cobalt2/graphics/icons/high-power-cobalt-magnet.png differ diff --git a/Cobalt2/graphics/icons/molten-cobalt.png b/Cobalt2/graphics/icons/molten-cobalt.png new file mode 100644 index 0000000..0ca1e17 Binary files /dev/null and b/Cobalt2/graphics/icons/molten-cobalt.png differ diff --git a/Cobalt2/info.json b/Cobalt2/info.json new file mode 100644 index 0000000..9bb0f02 --- /dev/null +++ b/Cobalt2/info.json @@ -0,0 +1,19 @@ +{ + "name": "Cobalt2", + "version": "2.0.0", + "factorio_version": "2.0", + "title": "Cobalt", + "author": "Timeken, cackling fiend", + "homepage": "https://discord.gg/ufvFUJtVwk", + "dependencies": [ + "base >= 2.0.0", + "? 248k-Redux", + "? bobassembly", + "? bzfoundry", + "? Chromium2", + "? Krastorio2", + "? space-exploration", + "? Tantalite2" + ], + "description": "Cobalt is a mod adding the element Cobalt.\n\nThis mod is inspired by Brevven's BZ mods. \n\n Most if not all art is placeholder." +} \ No newline at end of file diff --git a/Cobalt2/locale/en/Cobalt.cfg b/Cobalt2/locale/en/Cobalt.cfg new file mode 100644 index 0000000..35d2ce3 --- /dev/null +++ b/Cobalt2/locale/en/Cobalt.cfg @@ -0,0 +1,44 @@ +[technology-name] +cobalt-refining=Cobalt refining +cobalt-carbide=Cobalt carbide +cobalt-electromagnet=Cobalt electromagnet +cobalt-substrates=Cobalt substrates + +[technology-description] + +[autoplace-control-names] +cobaltite-ore=[item=cobaltite-ore] Cobaltite ore + +[item-name] +cobaltite-ore=Cobaltite ore +cobalt-plate=Cobalt plate +enriched-cobalt=Enriched cobalt +cobalt-ingot=Cobalt ingot +fi-materials-pure-cobalt=Pure cobalt +high-power-cobalt-magnet=High power cobalt magnet +cobalt-carbide=Cobalt carbide +co-cr-alloy=Co-Cr alloy +cobalt-electromagnet=Cobalt electromagnet + +[fluid-name] +molten-cobalt=Molten cobalt +fi-arc-pure-cobalt=Molten cobalt + +[entity-name] +cobaltite-ore=Cobaltite ore + +[mod-setting-name] + +[mod-setting-description] + +[recipe-name] +dirty-water-filtration-cobalt=Filter dirty water [item=cobaltite-ore] +cobalt-plate=Cobalt plate +cobalt-electrolysis=cobalt electrolysis +fi-purify-cobalt-recipe=Purify cobalt +fi-arc-pure-cobalt-recipe=Molten cobalt +fi-cast-pure-cobalt-recipe=Cast pure cobalt +cobalt-electromagnet=Cobalt electromagnet +cobalt-data-storage-substrate= Rough data storage substrate + +[recipe-description] \ No newline at end of file diff --git a/Cobalt2/prototypes/cobalt-248k.lua b/Cobalt2/prototypes/cobalt-248k.lua new file mode 100644 index 0000000..62fc23c --- /dev/null +++ b/Cobalt2/prototypes/cobalt-248k.lua @@ -0,0 +1,93 @@ +local util = require("data-util") + +if mods["248k-Redux"] then +data:extend({ + { + type = "fluid", + name = "fi-arc-pure-cobalt", + default_temperature = 1900, + max_temperature = 2650, + heat_capacity = "100kJ", + base_color = { r=0.92, g=0.29, b=0.22 }, + flow_color = { r=0.92, g=0.29, b=0.22 }, + pressure_to_speed_ratio = 0.400, + flow_to_energy_ratio = 0, + icon = "__Cobalt2__/graphics/icons/fi-arc-pure-cobalt.png", + icon_size = 64, icon_mipmaps = 4, + order = "a-a" + }, + { + type = "item", + name = "fi-materials-pure-cobalt", + icon = "__Cobalt2__/graphics/icons/fi-materials-pure-cobalt.png", + icon_size = 64, + stack_size = 100, + subgroup = "fi_item_subgroup_a-c", + order = "b-a", + }, + { + type = "recipe", + name = "fi-purify-cobalt-recipe", + enabled = false, + category = "el_purifier_category", + main_product = "el_dirty_water", + ingredients = { + {type="fluid", name="water", amount=50}, + {type="item", name="cobaltite-ore", amount=10} + }, + results = { + {type="fluid", name="el_dirty_water", amount=50}, + {type="item", name="fi-materials-pure-cobalt", amount=5}, + }, + energy_required = 1, + always_show_made_in = true, + icon_size = 64, + icons = (mods["Krastorio2"] and + { + { icon = "__248k-Redux__/ressources/fluids/el_dirty_water.png", icon_size = 64}, + { icon = "__Cobalt2__/graphics/icons/cobaltite-ore.png", icon_size = 64, scale=0.2, shift= {-8, -8}}, + } or { + { icon = "__Cobalt2__/graphics/icons/cobaltite-ore.png", icon_size = 64}, + }), + group = "fi_item_group", + subgroup = "fi_item_subgroup_f", + order = "f-a", + }, + { + type = "recipe", + name = "fi-arc-pure-cobalt-recipe", + enabled = false, + category = "el_arc_furnace_category", + ingredients = { + {type="item", name="fi-materials-pure-cobalt", amount=1}, + }, + results = { + {type="fluid", name="fi-arc-pure-cobalt", amount=200}, + }, + energy_required = 0.2, + order = "a-b", + group = "fi_item_group", + subgroup = "fi_item_subgroup_f", + always_show_made_in = true + }, + { + type = "recipe", + name = "fi-cast-pure-cobalt-recipe", + enabled = false, + category = "el_caster_category", + ingredients = { + {type="fluid", name="fi-arc-pure-cobalt", amount=100}, + }, + results = { + {type="item", name="cobalt-plate", amount=1}, + }, + energy_required = 0.2, + order = "a-b", + always_show_made_in = true, + allow_decomposition = false + } +}) +util.add_unlock("fi_caster_tech","fi-arc-pure-cobalt-recipe") +util.add_unlock("fi_caster_tech","fi-cast-pure-cobalt-recipe") +util.add_unlock("fi_purifier_tech","fi-purify-cobalt-recipe") +end \ No newline at end of file diff --git a/Cobalt2/prototypes/cobalt-enriched.lua b/Cobalt2/prototypes/cobalt-enriched.lua new file mode 100644 index 0000000..a1d5490 --- /dev/null +++ b/Cobalt2/prototypes/cobalt-enriched.lua @@ -0,0 +1,115 @@ +local util = require("data-util") + +if mods["Krastorio2"] then +data:extend( +{ + { + type = "item", + name = "enriched-cobalt", + icon_size = 64, + icon = "__Cobalt2__/graphics/icons/enriched-cobalt.png", + group ="raw-material", + subgroup = "cobalt", + order = "a", + stack_size = 100 + }, + { + type = "recipe", + name = "enriched-cobalt", + main_product="enriched-cobalt", + icon = "__Cobalt2__/graphics/icons/enriched-cobalt.png", + icon_size = 64, + category = "chemistry", + energy_required = 3, + enabled = false, + always_show_made_in = true, + always_show_products = true, + group ="raw-material", + subgroup = "cobalt", + ingredients = + { + {type = "fluid", name = "sulfuric-acid", amount = 3}, + {type = "fluid", name = "water", amount = 25, ignored_by_productivity = 25, ignored_by_stats = 25}, + {type = "item", name = "cobaltite-ore", amount = 9} + }, + results = + { + {type = "item", name = "enriched-cobalt", amount = 6}, + {type = "fluid", name = "kr-dirty-water", amount = 25, ignored_by_productivity = 25, ignored_by_stats = 25} + }, + crafting_machine_tint = + { + primary = {r = 0.721, g = 0.525, b = 0.043, a = 0.000}, + secondary = {r = 0.200, g = 0.680, b = 0.300, a = 0.357}, + tertiary = {r = 0.690, g = 0.768, b = 0.870, a = 0.000}, + quaternary = {r = 0.0, g = 0.980, b = 0.603, a = 0.900} + }, + order = "e03[enriched-cobalt]" + }, + { + type = "recipe", + name = "enriched-cobalt-plate", + icons = + { + { icon = "__Cobalt2__/graphics/icons/cobalt-plate.png", icon_size = 64 }, + { icon = "__Cobalt2__/graphics/icons/enriched-cobalt.png", icon_size = 64, scale=0.125, shift= {-8, -8}}, + }, + category = "smelting", + energy_required = 16, + enabled = false, + always_show_made_in = true, + always_show_products = true, + ingredients = { {type="item", name="enriched-cobalt", amount=5} }, + results = { {type="item", name="cobalt-plate", amount=5} }, + order = "a", + }, + { + type = "recipe", + name = "dirty-water-filtration-cobalt", + category = "kr-fluid-filtration", + icons = + { + { + icon = data.raw.fluid["kr-dirty-water"].icon, + icon_size = data.raw.fluid["kr-dirty-water"].icon_size + }, + { + icon = data.raw.item["cobaltite-ore"].icon, + icon_size = data.raw.item["cobaltite-ore"].icon_size, + scale = 0.20 * (data.raw.fluid["kr-dirty-water"].icon_size/data.raw.item["cobaltite-ore"].icon_size), + shift = {0, 4} + } + }, + icon_size = data.raw.fluid["kr-dirty-water"].icon_size, + energy_required = 2, + enabled = false, + allow_as_intermediate = false, + always_show_made_in = true, + always_show_products = true, + ingredients = + { + {type = "fluid", name = "kr-dirty-water", amount = 100, ignored_by_productivity = 100, ignored_by_stats = 100}, + }, + results = + { + {type = "fluid", name = "water", amount = 90, ignored_by_productivity = 90, ignored_by_stats = 90}, + {type = "item", name = "stone", probability = 0.40, amount = 1}, + {type = "item", name = "cobaltite-ore", probability = 0.10, amount = 1}, + }, + crafting_machine_tint = + { + primary = {r = 0.60, g = 0.20, b = 0, a = 0.6}, + secondary = {r = 1.0, g = 0.843, b = 0.0, a = 0.9} + }, + group ="raw-material", + subgroup = "cobalt", + order = "w013[dirty-water-filtration-Cobalt2]" + } +}) +util.add_effect("kr-enriched-ores", { type = "unlock-recipe", recipe = "enriched-cobalt" }) +util.add_effect("kr-enriched-ores", { type = "unlock-recipe", recipe = "enriched-cobalt-plate" }) +util.add_effect("kr-enriched-ores", { type = "unlock-recipe", recipe = "dirty-water-filtration-cobalt" }) + +util.add_productivity("enriched-cobalt") +util.add_productivity("enriched-cobalt-plate") +end \ No newline at end of file diff --git a/Cobalt2/prototypes/cobalt-matter.lua b/Cobalt2/prototypes/cobalt-matter.lua new file mode 100644 index 0000000..980435a --- /dev/null +++ b/Cobalt2/prototypes/cobalt-matter.lua @@ -0,0 +1,53 @@ +-- Matter recipes for Krastorio2 +if mods["Krastorio2"] then +local matter = require("__Krastorio2__/prototypes/libraries/matter") + +data:extend( +{ + { + type = "technology", + name = "cobalt-matter-processing", + icons = + { + { + icon = "__Krastorio2Assets__/technologies/matter-coal.png", + icon_size = 256, + }, + { + icon = "__Cobalt2__/graphics/icons/cobaltite-ore.png", + icon_size = 64, + scale = 1.4, + } + }, + prerequisites = {"kr-matter-processing"}, + unit = + { + count = 350, + ingredients = + { + {"production-science-pack", 1}, + {"utility-science-pack", 1}, + {"matter-tech-card", 1} + }, + time = 45 + } + }, +}) + +matter.createMatterRecipe({ + material = { type = "item", name = "cobaltite-ore", amount = 10 }, + matter_count = 5, + energy_required = 1, + need_stabilizer = false, + unlocked_by_technology = "cobalt-matter-processing" +}) + +matter.createMatterRecipe({ + material = { type = "item", name = "cobalt-plate", amount = 10 }, + matter_count = 10, + energy_required = 3, + only_deconversion = true, + need_stabilizer = true, + unlocked_by_technology = "cobalt-matter-processing" +}) +end \ No newline at end of file diff --git a/Cobalt2/prototypes/cobalt-recipe-se.lua b/Cobalt2/prototypes/cobalt-recipe-se.lua new file mode 100644 index 0000000..f62062b --- /dev/null +++ b/Cobalt2/prototypes/cobalt-recipe-se.lua @@ -0,0 +1,108 @@ +-- Additional recipes if Space Exploration mod is enabled +local util = require("data-util") + +if mods["space-exploration"] then + se_delivery_cannon_recipes["cobaltite-ore"] = {name= "cobaltite-ore"} + se_delivery_cannon_recipes["cobalt-plate"] = {name= "cobalt-plate"} + util.se_landfill({ore="cobaltite-ore"}) + + util.se_matter({ore="cobaltite-ore", energy_required=1, quant_out=10, stream_out=60}) + data:extend({ + { + type = "item-subgroup", + name = "cobalt", + group = "resources", + order = "a-h-z-a", + } + }) + util.set_item_subgroup("cobalt-plate", "cobalt") + data:extend({ + { + type = "item", + name = "cobalt-ingot", + icons = {{icon = "__Cobalt2__/graphics/icons/cobalt-ingot.png", icon_size = 64}}, + order = "b-b", + stack_size = 50, + subgroup = "cobalt", + }, + { + type = "fluid", + name = "molten-cobalt", + default_temperature = 232, + max_temperature = 232, + base_color = {r=191, g=219, b=233}, + flow_color = {r=191, g=219, b=233}, + icons = {{icon = "__Cobalt2__/graphics/icons/molten-cobalt.png", icon_size = 64}}, + 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-cobalt", + subgroup = "cobalt", + results = { + {type = "fluid", name = "molten-cobalt", amount = mods["Krastorio2"] and 750 or 900}, + }, + energy_required = 45, + ingredients = { + {name = mods["Krastorio2"] and "enriched-cobalt" or "cobaltite-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 = "cobalt-ingot", + category = "casting", + results = {{type="item", name="cobalt-ingot", amount=1}}, + energy_required = 18.75, + ingredients = { + {type = "fluid", name = "molten-cobalt", amount = 250}, + }, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + }, + { + type = "recipe", + category = "crafting", + name = "cobalt-ingot-to-plate", + + icons = { + {icon = "__Cobalt2__/graphics/icons/cobalt-plate.png", icon_size = 64}, + {icon = "__Cobalt2__/graphics/icons/cobalt-ingot.png", icon_size = 32, scale = 0.125, shift = {-8, -8}}, + }, + results = { + {type="item", name = "cobalt-plate", amount = 10}, + }, + energy_required = 3.75, + ingredients = { + {type="item", name = "cobalt-ingot", amount = 1} + }, + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + order = "a-c-b" + }, + }) + util.add_effect("se-pyroflux-smelting", {type = "unlock-recipe", recipe= "molten-cobalt"}) + util.add_effect("se-pyroflux-smelting", {type = "unlock-recipe", recipe= "cobalt-ingot"}) + util.add_effect("se-pyroflux-smelting", {type = "unlock-recipe", recipe= "cobalt-ingot-to-plate"}) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "molten-cobalt"}) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "cobalt-ingot"}) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "cobalt-ingot-to-plate"}) + if mods["Krastorio2"] then + util.set_item_subgroup("enriched-cobalt", "cobalt") + data.raw.recipe["enriched-cobalt-plate"].order= "d[cobalt-plate]" + se_delivery_cannon_recipes["enriched-cobalt"] = {name= "enriched-cobalt"} + end + se_delivery_cannon_recipes["cobalt-ingot"] = {name= "cobalt-ingot"} + +end \ No newline at end of file diff --git a/Cobalt2/prototypes/cobalt-recipe.lua b/Cobalt2/prototypes/cobalt-recipe.lua new file mode 100644 index 0000000..f7f111e --- /dev/null +++ b/Cobalt2/prototypes/cobalt-recipe.lua @@ -0,0 +1,202 @@ +local util = require("data-util") + +data:extend({{ + type = "item-subgroup", + name = "cobalt", + group = "intermediate-products", + order = "c" +} +}) + +local founding_category = "crafting" +if mods["bzfoundry"] then + founding_category = "founding" +end + +local cobalt_carbide_ingredients = {{type="item", name="cobalt-plate", amount=6}} +if data.raw.item["tungsten-carbide"] then + table.insert(cobalt_carbide_ingredients, {type="item", name="tungsten-carbide", amount=2}) +end +if data.raw.item["tantalum-plate"] then + table.insert(cobalt_carbide_ingredients, {type="item", name="tantalum-plate", amount=3}) +end + +local high_power_cobalt_magnet_ingredients = {{type="item", name="cobalt-plate", amount=4}} +if data.raw.item["graphene"] then + table.insert(high_power_cobalt_magnet_ingredients, {type="item", name="graphene", amount=2}) +end +if data.raw.item["kr-rare-metals"] then + table.insert(high_power_cobalt_magnet_ingredients, {type="item", name="kr-rare-metals", amount=2}) +end + +local cobalt_electromagnet_ingredients = {{type="item", name="cobalt-plate", amount=4}} +if data.raw.item["niobium-tin-cable"] then + table.insert(cobalt_electromagnet_ingredients, {type="item", name="niobium-tin-cable", amount=2}) +end +if data.raw.item["indium-solder"] then + table.insert(cobalt_electromagnet_ingredients, {type="item", name="indium-solder", amount=1}) +end + +data:extend({ + { + type = "item", + name = "cobalt-plate", + icon = "__Cobalt2__/graphics/icons/cobalt-plate.png", + icon_size = 64, + subgroup = "cobalt", + order = "b[cobalt-plate]", + stack_size = 100 + }, + { + type = "item", + name = "cobalt-carbide", + icon = "__Cobalt2__/graphics/icons/cobalt-carbide.png", + icon_size = 64, + subgroup = "cobalt", + order = "b[cobalt-carbide]", + stack_size = 100, + }, + { + type = "item", + name = "cobalt-electromagnet", + icon = "__Cobalt2__/graphics/icons/cobalt-electromagnet.png", + icon_size = 128, + subgroup = "intermediate-product", + order = "e[cobalt-electromagnet]", + stack_size = 100, + }, + { + type = "item", + name = "high-power-cobalt-magnet", + icon = "__Cobalt2__/graphics/icons/high-power-cobalt-magnet.png", + icon_size = 64, + subgroup = "intermediate-product", + order = "h[high-power-cobalt-magnet]", + stack_size = 100, + }, + { + type = "recipe", + name = "cobalt-plate", + category = "smelting", + order = "a[cobalt-plate]", + icons = (mods["Krastorio2"] and + { + { icon = "__Cobalt2__/graphics/icons/cobalt-plate.png", icon_size = 64}, + { icon = "__Cobalt2__/graphics/icons/cobaltite-ore.png", icon_size = 64, scale=0.125, shift= {-8, -8}}, + } or { + { icon = "__Cobalt2__/graphics/icons/cobalt-plate.png", icon_size = 64}, + }), + main_product = "cobalt-plate", + enabled = false, + energy_required = 24, + ingredients = {{type="item", name="cobaltite-ore", amount=15}}, + results = {{type="item", name = "cobalt-plate", amount=5}} + }, + { + type = "recipe", + name = "cobalt-carbide", + category = founding_category, + order = "d[cobalt-carbide]", + enabled = false, + energy_required = 4, + ingredients = cobalt_carbide_ingredients, + results = {{type="item", name="cobalt-carbide", amount=2}}, + }, + { + type = "recipe", + name = "high-power-cobalt-magnet", + category = "crafting", + order = "h[high-power-cobalt-magnet]", + enabled = false, + energy_required = 5, + ingredients = high_power_cobalt_magnet_ingredients, + results = {{type="item", name="high-power-cobalt-magnet", amount=1}}, + }, + { + type = "recipe", + name = "cobalt-electromagnet", + category = "crafting", + order = "c[cobalt-electromagnet]", + enabled = false, + energy_required = 4, + ingredients = cobalt_electromagnet_ingredients, + results = {{type="item", name="cobalt-electromagnet", amount=2}}, + } +}) + +if mods["space-exploration"] then + util.add_unlock("se-space-assembling","high-power-cobalt-magnet") +else + util.add_unlock("automation-3","high-power-cobalt-magnet") +end + +if mods["Chromium2"] then + data:extend({ + { + type = "item", + name = "co-cr-alloy", + icon = "__Cobalt2__/graphics/icons/co-cr-alloy.png", + icon_size = 64, + subgroup = "cobalt", + order = "c[cobalt-carbide]", + stack_size = 100, + }, + { + type = "recipe", + name = "co-cr-alloy", + category = founding_category, + order = "c[co-cr-alloy]", + enabled = false, + energy_required = 20, + ingredients = {{type="item", name="cobalt-plate", amount=5}, {type="item", name="chromium-plate", amount=5}}, + results = {{type="item", name="co-cr-alloy", amount=10}}, + } + }) + util.add_productivity("co-cr-alloy") + util.add_unlock("robotics","co-cr-alloy") +end + +if mods["space-exploration"] then + data:extend({ + { + type = "recipe", + name = "cobalt-data-storage-substrate", + icons = { + { icon = "__space-exploration-graphics__/graphics/icons/data-storage-substrate.png", icon_size = 64}, + { icon = "__Cobalt2__/graphics/icons/cobalt-plate.png", icon_size = 64, scale=0.3}, + }, + category = "crafting", + group = "science", + subgroup = "data-generic", + order = "z-01", + enabled = false, + energy_required = 10, + ingredients = {{type="item", name="glass", amount=2},{type="item", name="silicon", amount=2},{type="item", name="cobalt-plate", amount=4}}, + results = {{type="item", name="se-data-storage-substrate", amount=1}, {name="se-scrap", amount=1, probability=0.5}}, + }, + { + type = "recipe", + name = "co-cr-aeroframe-pole", + icons = { + { icon = "__space-exploration-graphics__/graphics/icons/aeroframe-pole.png", icon_size = 64}, + { icon = "__Cobalt2__/graphics/icons/co-cr-alloy.png", icon_size = 64, scale=0.3, shift= {-8, -8}}, + }, + category = "crafting", + group = "intermediate-products", + subgroup = "specialist-assembling", + order = "z-05", + enabled = false, + energy_required = 1, + ingredients = {{type="item", name="se-beryllium-plate", amount=2},{type="item", name="co-cr-alloy", amount=2}}, + results = {{type="item", name="se-aeroframe-pole", amount=2}}, + } + }) + util.add_unlock("se-aeroframe-pole","co-cr-aeroframe-pole") + util.add_productivity("co-cr-aeroframe-pole") +end + + +util.add_productivity("cobalt-plate") +util.add_productivity("cobalt-carbide") +util.add_productivity("high-power-cobalt-magnet") +util.add_productivity("cobalt-electromagnet") \ No newline at end of file diff --git a/Cobalt2/prototypes/cobaltite-ore.lua b/Cobalt2/prototypes/cobaltite-ore.lua new file mode 100644 index 0000000..c89f5e5 --- /dev/null +++ b/Cobalt2/prototypes/cobaltite-ore.lua @@ -0,0 +1,73 @@ +local resource_autoplace = require('resource-autoplace'); +local item_sounds = require('__base__.prototypes.item_sounds') + +data.raw.planet.nauvis.map_gen_settings.autoplace_controls["cobaltite-ore"] = {} +data.raw.planet.nauvis.map_gen_settings.autoplace_settings.entity.settings["cobaltite-ore"] = {} +resource_autoplace.initialize_patch_set("cobaltite-ore", true) + +data:extend({ + { + type = "autoplace-control", + category = "resource", + name = "cobaltite-ore", + richness = true, + order = "b-e" + }, + { + type = "resource", + icon_size = 64, + icon_mipmaps = 3, + name = "cobaltite-ore", + icon = "__Cobalt2__/graphics/icons/cobaltite-ore.png", + flags = { "placeable-neutral" }, + order = "a-b-a", + map_color = { r = 0.20, g = 0.20, b = 1.00 }, + minable = + { + hardness = 1, + mining_particle = "copper-ore-particle", + mining_time = 1, + result = "cobaltite-ore" + }, + collision_box = { { -0.1, -0.1 }, { 0.1, 0.1 } }, + selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } }, + + autoplace = resource_autoplace.resource_autoplace_settings { + name = "cobaltite-ore", + order = "b-z", + base_density = 2, + base_spots_per_km2 = 1, + has_starting_area_placement = true, + regular_rq_factor_multiplier = 1.0, + starting_rq_factor_multiplier = 1.0, + }, + + stage_counts = { 15000, 9500, 5500, 2900, 1300, 400, 150, 80 }, + stages = + { + sheet = + { + filename = "__Cobalt2__/graphics/entity/ores/hr-cobaltite-ore.png", + priority = "extra-high", + size = 128, + frame_count = 8, + variation_count = 8, + scale = 0.5 + } + }, + }, + { + type = "item", + name = "cobaltite-ore", + icon_size = 64, + icon_mipmaps = 3, + icon = "__Cobalt2__/graphics/icons/cobaltite-ore.png", + subgroup = "raw-resource", + order = "t-c-a", + stack_size = 50, + weight = 20 * kg, + inventory_move_sound = item_sounds.resource_inventory_move, + pick_sound = item_sounds.resource_inventory_pickup, + drop_sound = item_sounds.resource_inventory_move + }, +}) diff --git a/Cobalt2/prototypes/technology.lua b/Cobalt2/prototypes/technology.lua new file mode 100644 index 0000000..3c5bd95 --- /dev/null +++ b/Cobalt2/prototypes/technology.lua @@ -0,0 +1,127 @@ +local util = require("data-util") + +local cobaltCarbidePre = {"chemical-science-pack"} +local cobaltCarbideIng = { + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 }, + { "chemical-science-pack", 1 } +} +local cobaltElecPre = {"chemical-science-pack"} +local cobaltElecIng = { + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 }, + { "chemical-science-pack", 1 } +} + +if mods["space-exploration"] then + cobaltCarbidePre = {"space-science-pack"} + cobaltCarbideIng = { + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 }, + { "chemical-science-pack", 1 }, + { "se-rocket-science-pack", 1 }, + { "space-science-pack", 1 } + } + cobaltElecPre = {"space-science-pack"} + cobaltElecIng = { + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 }, + { "chemical-science-pack", 1 }, + { "se-rocket-science-pack", 1 }, + { "space-science-pack", 1 } + } +end + +data:extend({ + { + type = "technology", + name = "cobalt-refining", + icons = {{ icon = "__Cobalt2__/graphics/icons/cobalt-plate.png", icon_size = 64 }}, + prerequisites = {"advanced-material-processing"}, + effects = { + { + type = "unlock-recipe", + recipe = "cobalt-plate", + } + }, + unit = + { + count = 75, + ingredients = + { + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 } + }, + time = 30 + } + }, + { + type = "technology", + name = "cobalt-carbide", + icons = {{ icon = "__Cobalt2__/graphics/icons/cobalt-carbide.png", icon_size = 64 }}, + prerequisites = cobaltCarbidePre, + effects = { + { + type = "unlock-recipe", + recipe = "cobalt-carbide", + } + }, + unit = + { + count = 100, + ingredients = cobaltCarbideIng, + time = 30 + } + }, + { + type = "technology", + name = "cobalt-electromagnet", + icons = {{ icon = "__Cobalt2__/graphics/icons/cobalt-electromagnet.png", icon_size = 128 }}, + prerequisites = cobaltElecPre, + effects = { + { + type = "unlock-recipe", + recipe = "cobalt-electromagnet", + } + }, + unit = + { + count = 100, + ingredients = cobaltElecIng, + time = 30 + } +} +}) +if mods["space-exploration"] then + data:extend({ + { + type = "technology", + name = "cobalt-substrates", + icons = { + { icon = "__space-exploration-graphics__/graphics/technology/data-card.png", icon_size = 141}, + { icon = "__Cobalt2__/graphics/icons/cobalt-plate.png", icon_size = 64, scale=0.5, shift= {-16, -16}}, + }, + prerequisites = {"production-science-pack"}, + effects = { + { + type = "unlock-recipe", + recipe = "cobalt-data-storage-substrate", + } + }, + unit = + { + count = 75, + ingredients = + { + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 }, + { "chemical-science-pack", 1 }, + { "se-rocket-science-pack", 1 }, + { "space-science-pack", 1 }, + { "production-science-pack", 1 } + }, + time = 30 + } +} +}) +end \ No newline at end of file diff --git a/Cobalt2/recipe-final-fix.lua b/Cobalt2/recipe-final-fix.lua new file mode 100644 index 0000000..eb7c5bd --- /dev/null +++ b/Cobalt2/recipe-final-fix.lua @@ -0,0 +1,5 @@ +local util = require("data-util") + +if mods["space-exploration"] then + util.add_product("se-core-fragment-omni", { type = "item", name = "cobaltite-ore", amount = 3 }) +end \ No newline at end of file diff --git a/Cobalt2/recipe-modify.lua b/Cobalt2/recipe-modify.lua new file mode 100644 index 0000000..9f5172a --- /dev/null +++ b/Cobalt2/recipe-modify.lua @@ -0,0 +1,95 @@ +local util = require("data-util") + +-- Main vanilla changes +util.set_main_product("copper-plate", "copper-plate") +if mods["Krastorio2"] then + util.add_product("copper-plate", {type="item", name="cobaltite-ore", amount=1}) +else + util.add_product("copper-plate", {type="item", name="cobaltite-ore", amount=1, probability=0.2}) +end + +-- Mod changes +if mods["Chromium2"] then + util.add_ingredient("advanced-electric-motor", "high-power-cobalt-magnet", 4) + util.remove_ingredient("flying-robot-frame", "titanium-plate") + util.add_ingredient("flying-robot-frame", "co-cr-alloy", 4) +end + +if mods["IfNickel-Updated"] then + util.set_main_product("nickel-plate", "nickel-plate") + + if mods["Krastorio2"] then + util.add_product("nickel-plate", {name="cobaltite-ore", amount=1}) + else + util.add_product("nickel-plate", {name="cobaltite-ore", amount=1, probability=0.2}) + end +end + +if mods["bobassembly"] then + util.remove_ingredient("chemical-plant-3", "tungsten-carbide") + util.add_ingredient("chemical-plant-3", "cobalt-carbide", 2) + + util.add_ingredient("bob-area-mining-drill-3", "cobalt-carbide", 1) + util.add_ingredient("bob-mining-drill-3", "cobalt-carbide", 1) + + util.remove_ingredient("electronics-machine-3", "tungsten-carbide") + util.add_ingredient("electronics-machine-3", "cobalt-carbide", 1) + + util.remove_ingredient("centrifuge-3", "tungsten-carbide") + util.add_ingredient("centrifuge-3", "cobalt-carbide", 100) +end + +if mods["248k-Redux"] then + util.replace_ingredient("el_lithium_battery_recipe", "iron-plate", "cobalt-plate", 4) +end + +if mods["Krastorio2"] then + util.add_ingredient("kr-quarry-drill", "cobalt-carbide", 10) + util.replace_ingredient("kr-nuclear-artillery-shell", "steel-plate", "cobalt-plate", 10) + + util.remove_ingredient("kr-advanced-chemical-plant", "tungsten-carbide") + util.add_ingredient("kr-advanced-chemical-plant", "cobalt-carbide", 20) +end + +if mods["space-exploration"] then + util.add_product(mods["space-exploration"] and "se-scrap-recycling", {name="cobaltite-ore", amount=1, probability=0.05}) + + util.remove_ingredient("se-space-plasma-generator", "nickel-electromagnet") + util.add_ingredient("se-space-plasma-generator", "cobalt-electromagnet", 100) + + util.remove_ingredient("se-space-particle-collider", "nickel-electromagnet") + util.add_ingredient("se-space-particle-collider", "cobalt-electromagnet", 250) + + util.remove_ingredient("se-space-particle-accelerator", "nickel-electromagnet") + util.add_ingredient("se-space-particle-accelerator", "cobalt-electromagnet", 100) + + util.remove_ingredient("se-space-electromagnetics-laboratory", "nickel-electromagnet") + util.add_ingredient("se-space-electromagnetics-laboratory", "cobalt-electromagnet", 100) + + util.remove_ingredient("se-holmium-solenoid", "nickel-electromagnet") + util.add_ingredient("se-holmium-solenoid", "cobalt-electromagnet", 2) + util.set_product_amount("se-holmium-solenoid", "se-holmium-solenoid", 2) + + util.remove_ingredient("se-spaceship-clamp", "nickel-electromagnet") + util.add_ingredient("se-spaceship-clamp", "cobalt-electromagnet", 20) + + util.remove_ingredient("se-space-rail", "nickel-electromagnet") + util.add_ingredient("se-space-rail", "cobalt-electromagnet", 200) + + util.add_ingredient("se-electromagnetic-field-data", "cobalt-electromagnet", 1) + util.set_ingredient("se-electromagnetic-field-data", "se-empty-data", 2) + util.add_product("se-electromagnetic-field-data", {name="cobalt-electromagnet", amount=1, probability=0.25}) + util.set_product_amount("se-electromagnetic-field-data", "se-junk-data", 2) + util.set_product_amount("se-electromagnetic-field-data", "se-electromagnetic-field-data", 2) + + util.add_ingredient("se-quantum-phenomenon-data", "high-power-cobalt-magnet", 1) + util.set_ingredient("se-quantum-phenomenon-data", "se-empty-data", 2) + util.add_product("se-quantum-phenomenon-data", {name="high-power-cobalt-magnet", amount=1, probability=0.50}) + util.set_product_amount("se-quantum-phenomenon-data", "se-junk-data", 2) + util.set_product_amount("se-quantum-phenomenon-data", "se-quantum-phenomenon-data", 2) + + util.set_ingredient("se-energy-science-pack-2","se-holmium-cable", 10) + util.add_ingredient("se-energy-science-pack-2", "cobalt-ingot", 2) + + util.add_prerequisite("se-space-plasma-generator","cobalt-electromagnet") +end \ No newline at end of file diff --git a/Cobalt2/thumbnail.png b/Cobalt2/thumbnail.png new file mode 100644 index 0000000..cc88c92 Binary files /dev/null and b/Cobalt2/thumbnail.png differ diff --git a/README.md b/README.md index 73ffaf5..c00939b 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ -# Cobalt2 +# Cobalt +Updated for Factorio 2.0. + +Original mod: https://mods.factorio.com/mod/Cobalt \ No newline at end of file