diff --git a/data-final-fixes.lua b/data-final-fixes.lua new file mode 100644 index 0000000..916b2ee --- /dev/null +++ b/data-final-fixes.lua @@ -0,0 +1,23 @@ +require("tin-recipe-final-stacking") +require("tin-recipe-modules") +-- require("tin-recipe-final-5d") +require("tin-recipe-final-rrr") + +local util = require("data-util"); +util.replace_some_ingredient("se-glass-vulcanite", "sand", 1, "tin-plate", 1) +util.add_product("se-glass-vulcanite", {type="item", name="tin-plate", amount=1, probability=0.8}) +util.set_main_product("se-glass-vulcanite", "glass") + +-- core mining balancing +util.add_to_product("se-core-fragment-omni", "tin-ore", -4) + + +-- Electronic circuits need final fixes +util.multiply_recipe("electronic-circuit-stone", 2) +util.replace_some_ingredient("electronic-circuit-stone", "copper-cable", 1, "solder", 1) + +util.multiply_recipe("electronic-circuit", 2) +util.replace_some_ingredient("electronic-circuit", "copper-cable", 1, "solder", 1) + +-- Must be last +util.create_list() diff --git a/data-updates.lua b/data-updates.lua index 95423a7..5211ab7 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -1,5 +1,5 @@ -require("gas-boiler/data-updates") -require("tin-recipe-updates") +-- require("gas-boiler/data-updates") +-- require("tin-recipe-updates") -- require("tin-matter") -- require("omni") require("map-gen-preset-updates") diff --git a/data-util.lua b/data-util.lua new file mode 100644 index 0000000..37f09b8 --- /dev/null +++ b/data-util.lua @@ -0,0 +1,753 @@ +-- WARNING WARNING WARNING +-- This file will be overwritten in mod zipfiles, edit bzlib/data-util.lua +-- WARNING WARNING WARNING + +local me = require("me") +local util = {} + +util.me = me +util.get_setting = util.me.get_setting + +util.titanium_plate = "" +util.titanium_processing = "" + +if mods["FactorioExtended-Plus-Core"] then + util.titanium_plate = "titanium-alloy" +else + util.titanium_plate = "titanium-plate" +end + +if mods["pyrawores"] then + util.titanium_processing = "titanium-mk01" +else + util.titanium_processing = "titanium-processing" +end + +function util.fe_plus(sub) + if mods["FactorioExtended-Plus-"..sub] then + return true + end +end + +function util.get_stack_size(default) + if mods["Krastorio2"] then + size = tonumber(krastorio.general.getSafeSettingValue("kr-stack-size")) + return size or default + end + return default +end + +function util.k2assets() + if mods["Krastorio2Assets"] then + return "__Krastorio2Assets__" + end + return "__Krastorio2__/graphics" +end + +-- check if a table contains a sought value +function util.contains(table, sought) + for i, value in pairs(table) do + if value == sought then + return true + end + end + return false +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 + 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 + +-- remove recipe unlock effect from a given technology +function util.remove_recipe_effect(technology_name, recipe_name) + local technology = data.raw.technology[technology_name] + local index = -1 + if technology then + for i, effect in pairs(technology.effects) do + if effect.type == "unlock-recipe" and effect.recipe == recipe_name then + index = i + break + end + end + if index > -1 then + table.remove(technology.effects, index) + 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 + if data.raw.recipe[recipe_name].normal then data.raw.recipe[recipe_name].normal.enabled = enabled end + if data.raw.recipe[recipe_name].expensive then data.raw.recipe[recipe_name].expensive.enabled = enabled end + if not data.raw.recipe[recipe_name].normal then data.raw.recipe[recipe_name].enabled = enabled end + end +end + +-- Add a given quantity of ingredient to a given recipe +function util.add_or_add_to_ingredient(recipe_name, ingredient, quantity) + if me.bypass[recipe_name] then return end + if data.raw.recipe[recipe_name] and data.raw.item[ingredient] then + me.add_modified(recipe_name) + add_or_add_to_ingredient(data.raw.recipe[recipe_name], ingredient, quantity) + add_or_add_to_ingredient(data.raw.recipe[recipe_name].normal, ingredient, quantity) + add_or_add_to_ingredient(data.raw.recipe[recipe_name].expensive, 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) + if me.bypass[recipe_name] then return end + local is_fluid = not not data.raw.fluid[ingredient] + if data.raw.recipe[recipe_name] and (data.raw.item[ingredient] or is_fluid) then + me.add_modified(recipe_name) + add_ingredient(data.raw.recipe[recipe_name], ingredient, quantity, is_fluid) + add_ingredient(data.raw.recipe[recipe_name].normal, ingredient, quantity, is_fluid) + add_ingredient(data.raw.recipe[recipe_name].expensive, 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[1] == ingredient or 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, {ingredient, quantity}) + end + end +end + +-- Add a given ingredient prototype to a given recipe +function util.add_ingredient_raw(recipe_name, ingredient) + if me.bypass[recipe_name] then return end + if data.raw.recipe[recipe_name] and (data.raw.item[ingredient.name] or data.raw.item[ingredient[1]]) then + me.add_modified(recipe_name) + add_ingredient_raw(data.raw.recipe[recipe_name], ingredient) + add_ingredient_raw(data.raw.recipe[recipe_name].normal, ingredient) + add_ingredient_raw(data.raw.recipe[recipe_name].expensive, 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[1] and (existing[1] == ingredient[1] or existing[1] == ingredient.name)) or + (existing.name and (existing.name == ingredient[1] or 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 me.bypass[recipe_name] then return end + if data.raw.recipe[recipe_name] and data.raw.item[ingredient] then + me.add_modified(recipe_name) + set_ingredient(data.raw.recipe[recipe_name], ingredient, quantity) + set_ingredient(data.raw.recipe[recipe_name].normal, ingredient, quantity) + set_ingredient(data.raw.recipe[recipe_name].expensive, 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[1] == ingredient then + existing[2] = quantity + return + elseif 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[1]] or data.raw.item[product.name]) then + add_product(data.raw.recipe[recipe_name], product) + add_product(data.raw.recipe[recipe_name].normal, product) + add_product(data.raw.recipe[recipe_name].expensive, product) + end +end + +function add_product(recipe, product) + if recipe ~= nil then + if not recipe.normal then + if recipe.results == nil then + recipe.results = {{recipe.result, recipe.result_count and recipe.result_count or 1}} + end + recipe.result = nil + recipe.result_count = nil + table.insert(recipe.results, product) + end + end +end + +-- Replace one ingredient with another in a recipe +function util.replace_ingredient(recipe_name, old, new, amount) + if me.bypass[recipe_name] then return end + if data.raw.recipe[recipe_name] and (data.raw.item[new] or data.raw.fluid[new]) then + me.add_modified(recipe_name) + replace_ingredient(data.raw.recipe[recipe_name], old, new, amount) + replace_ingredient(data.raw.recipe[recipe_name].normal, old, new, amount) + replace_ingredient(data.raw.recipe[recipe_name].expensive, old, new, amount) + end +end + +function replace_ingredient(recipe, old, new, amount) + if recipe ~= nil and recipe.ingredients ~= nil then + for i, existing in pairs(recipe.ingredients) do + if existing[1] == new or existing.name == new then + return + end + end + for i, ingredient in pairs(recipe.ingredients) do + if ingredient.name == old then + ingredient.name = new + if amount then ingredient.amount = amount end + end + if ingredient[1] == old then + ingredient[1] = new + if amount then ingredient[2] = amount end + end + end + end +end + +-- Remove an ingredient from a recipe +function util.remove_ingredient(recipe_name, old) + if me.bypass[recipe_name] then return end + if data.raw.recipe[recipe_name] then + me.add_modified(recipe_name) + remove_ingredient(data.raw.recipe[recipe_name], old) + remove_ingredient(data.raw.recipe[recipe_name].normal, old) + remove_ingredient(data.raw.recipe[recipe_name].expensive, 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 or ingredient[1] == 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) + if me.bypass[recipe_name] then return end + local is_fluid = not not data.raw.fluid[new] + if data.raw.recipe[recipe_name] and (data.raw.item[new] or is_fluid) then + me.add_modified(recipe_name) + replace_some_ingredient(data.raw.recipe[recipe_name], old, old_amount, new, new_amount, is_fluid) + replace_some_ingredient(data.raw.recipe[recipe_name].normal, old, old_amount, new, new_amount, is_fluid) + replace_some_ingredient(data.raw.recipe[recipe_name].expensive, 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[1] == new or 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 + if ingredient[1] == old then + ingredient[2] = math.max(1, ingredient[2] - old_amount) + end + end + add_ingredient(recipe, new, new_amount, is_fluid) + end +end + +-- multiply the cost, energy, and results of a recipe by a multiple +function util.multiply_recipe(recipe_name, multiple) + me.add_modified(recipe_name) + if data.raw.recipe[recipe_name] then + if me.bypass[recipe_name] then return end + multiply_recipe(data.raw.recipe[recipe_name], multiple) + multiply_recipe(data.raw.recipe[recipe_name].normal, multiple) + multiply_recipe(data.raw.recipe[recipe_name].expensive, 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) or + has_ingredient(data.raw.recipe[recipe_name].normal, 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) + me.add_modified(recipe_name) + if data.raw.recipe[recipe_name] then + if me.bypass[recipe_name] then return end + remove_product(data.raw.recipe[recipe_name], old) + remove_product(data.raw.recipe[recipe_name].normal, old) + remove_product(data.raw.recipe[recipe_name].expensive, 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) + set_main_product(data.raw.recipe[recipe_name].normal, product) + set_main_product(data.raw.recipe[recipe_name].expensive, 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) + replace_product(data.raw.recipe[recipe_name].normal, old, new) + replace_product(data.raw.recipe[recipe_name].expensive, 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 + +-- Multiply energy required +function util.multiply_time(recipe_name, factor) + me.add_modified(recipe_name) + if data.raw.recipe[recipe_name] then + if me.bypass[recipe_name] then return end + multiply_time(data.raw.recipe[recipe_name], factor) + multiply_time(data.raw.recipe[recipe_name].normal, factor) + multiply_time(data.raw.recipe[recipe_name].expensive, 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) + me.add_modified(recipe_name) + if data.raw.recipe[recipe_name] then + if me.bypass[recipe_name] then return end + add_time(data.raw.recipe[recipe_name], amount) + add_time(data.raw.recipe[recipe_name].normal, amount) + add_time(data.raw.recipe[recipe_name].expensive, 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 me.bypass[recipe_name] then return end + if data.raw.recipe[recipe_name] and data.raw["recipe-category"][category] then + me.add_modified(recipe_name) + data.raw.recipe[recipe_name].category = category + end +end + +-- Set recipe subgroup +function util.set_subgroup(recipe_name, subgroup) + if me.bypass[recipe_name] then return end + if data.raw.recipe[recipe_name] then + me.add_modified(recipe_name) + data.raw.recipe[recipe_name].subgroup = subgroup + end +end + +-- Set item subgroup +function util.set_item_subgroup(item, subgroup) + if me.bypass[item] then return end + if data.raw.item[item] and data.raw["item-subgroup"][subgroup] then + data.raw.item[item].subgroup = subgroup + end +end + +-- Set recipe icons +function util.set_icons(recipe_name, icons) + if me.bypass[recipe_name] then return end + if data.raw.recipe[recipe_name] then + me.add_modified(recipe_name) + 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 + +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) + add_to_ingredient(data.raw.recipe[recipe].normal, ingredient, amount) + add_to_ingredient(data.raw.recipe[recipe].expensive, 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, product, amount) + if data.raw.recipe[recipe] then + add_to_product(data.raw.recipe[recipe], product, amount) + add_to_product(data.raw.recipe[recipe].normal, product, amount) + add_to_product(data.raw.recipe[recipe].expensive, 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 + + +local function insert(nodes, node, value) + table.insert(node, value) -- store as parameter + if 21 == #node then + node = {""} + table.insert(nodes, node) + end + return node +end + +local function encode(data) + local node = {""} + local root = {node} + local n = string.len(data) + for i = 1,n,200 do + local value = string.sub(data, i, i+199) + node = insert(root, node, value) + end + while #root > 20 do + local nodes,node = {},{""} + for _, value in ipairs(root) do + node = insert(nodes, node, value) + end + root = nodes + end + if #root == 1 then root = root[1] else + table.insert(root, 1, "") -- no locale template + end + return #root < 3 and (root[2] or "") or root +end + +function decode(data) + if type(data) == "string" then return data end + local str = {} + for i = 2, #data do + str[i-1] = decode(data[i]) + end + return table.concat(str, "") +end + +function util.create_list() + if #me.list>0 then + if not data.raw.item[me.name.."-list"] then + data:extend({{ + type="item", + name=me.name.."-list", + localised_description = "", + enabled=false, + icon = "__core__/graphics/empty.png", + icon_size = 1, + stack_size = 1, + flags = {"hidden", "hide-from-bonus-gui"} + }}) + end + + local have = {} + local list = {} + for i, recipe in pairs(me.list) do + if not have[recipe] then + have[recipe] = true + table.insert(list, recipe) + end + end + + if #list>0 then + data.raw.item[me.name.."-list"].localised_description = + encode(decode(data.raw.item[me.name.."-list"].localised_description).."\n"..table.concat(list, "\n")) + end + end +end + +return util diff --git a/data.lua b/data.lua index afade13..85a01e3 100644 --- a/data.lua +++ b/data.lua @@ -1,5 +1,6 @@ require("gas") -require("gas-boiler/data") +require("gas-extractor") +-- require("gas-boiler/data") local util = require("data-util"); diff --git a/gas-extractor.lua b/gas-extractor.lua new file mode 100644 index 0000000..1b3930f --- /dev/null +++ b/gas-extractor.lua @@ -0,0 +1,204 @@ +local util = require("data-util"); +local futil = require("util") + + +data:extend({ + { + type = "item", + name = "gas-extractor", + icon = "__base__/graphics/icons/pumpjack.png", + icon_size = 64, icon_mipmaps = 4, + subgroup = "extraction-machine", + order = "b[fluids]-b[pumpjack]", + place_result = "gas-extractor", + stack_size = 20, + }, + { + type = "mining-drill", + name = "gas-extractor", + icon = "__base__/graphics/icons/pumpjack.png", + icon_size = 64, icon_mipmaps = 4, + flags = {"placeable-neutral", "player-creation"}, + minable = {mining_time = 0.5, result = "pumpjack"}, + resource_categories = {"gas"}, + max_health = 200, + corpse = "pumpjack-remnants", + dying_explosion = "pumpjack-explosion", + collision_box = {{ -1.2, -1.2}, {1.2, 1.2}}, + selection_box = {{ -1.5, -1.5}, {1.5, 1.5}}, + -- damaged_trigger_effect = hit_effects.entity(), + drawing_box = {{-1.6, -2.5}, {1.5, 1.6}}, + energy_source = + { + type = "electric", + emissions_per_minute = 10, + usage_priority = "secondary-input" + }, + output_fluid_box = + { + base_area = 10, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + { + positions = { {1, -2}, {2, -1}, {-1, 2}, {-2, 1} } + } + } + }, + energy_usage = "90kW", + mining_speed = 1, + resource_searching_radius = 0.49, + vector_to_place_result = {0, 0}, + module_specification = + { + module_slots = 2 + }, + radius_visualisation_picture = + { + filename = "__base__/graphics/entity/pumpjack/pumpjack-radius-visualization.png", + width = 12, + height = 12 + }, + monitor_visualization_tint = {r=78, g=173, b=255}, + base_render_layer = "lower-object-above-shadow", + base_picture = + { + sheets = + { + { + filename = "__base__/graphics/entity/pumpjack/pumpjack-base.png", + priority = "extra-high", + width = 131, + height = 137, + shift = futil.by_pixel(-2.5, -4.5), + hr_version = + { + filename = "__base__/graphics/entity/pumpjack/hr-pumpjack-base.png", + priority = "extra-high", + width = 261, + height = 273, + shift = futil.by_pixel(-2.25, -4.75), + scale = 0.5 + } + }, + { + filename = "__base__/graphics/entity/pumpjack/pumpjack-base-shadow.png", + priority = "extra-high", + width = 110, + height = 111, + draw_as_shadow = true, + shift = futil.by_pixel(6, 0.5), + hr_version = + { + filename = "__base__/graphics/entity/pumpjack/hr-pumpjack-base-shadow.png", + width = 220, + height = 220, + scale = 0.5, + draw_as_shadow = true, + shift = futil.by_pixel(6, 0.5) + } + } + } + }, + animations = { + layers = { + { + filename = "__bzgas__/graphics/entity/gas-extractor.png", + priority = "extra-high", + width = 176, + height = 400, + scale = 0.5, + shift = futil.by_pixel(0, -60), + -- scale = 0.5, + -- hr_version = + -- { + -- filename = "__bzgas__/graphics/entity/gas-extractor.png", + -- priority = "extra-high", + -- width = 176, + -- height = 400, + -- -- shift = futil.by_pixel(-2.25, -4.75), + -- scale = 0.5, + -- } + }, + }, + }, + -- animations = + -- { + -- north = + -- { + -- layers = + -- { + -- { + -- priority = "high", + -- filename = "__base__/graphics/entity/pumpjack/pumpjack-horsehead.png", + -- line_length = 8, + -- width = 104, + -- height = 102, + -- frame_count = 40, + -- shift = futil.by_pixel(-4, -24), + -- animation_speed = 0.5, + -- hr_version = + -- { + -- priority = "high", + -- filename = "__base__/graphics/entity/pumpjack/hr-pumpjack-horsehead.png", + -- animation_speed = 0.5, + -- scale = 0.5, + -- line_length = 8, + -- width = 206, + -- height = 202, + -- frame_count = 40, + -- shift = futil.by_pixel(-4, -24) + -- } + -- }, + -- { + -- priority = "high", + -- filename = "__base__/graphics/entity/pumpjack/pumpjack-horsehead-shadow.png", + -- animation_speed = 0.5, + -- draw_as_shadow = true, + -- line_length = 8, + -- width = 155, + -- height = 41, + -- frame_count = 40, + -- shift = futil.by_pixel(17.5, 14.5), + -- hr_version = + -- { + -- priority = "high", + -- filename = "__base__/graphics/entity/pumpjack/hr-pumpjack-horsehead-shadow.png", + -- animation_speed = 0.5, + -- draw_as_shadow = true, + -- line_length = 8, + -- width = 309, + -- height = 82, + -- frame_count = 40, + -- scale = 0.5, + -- shift = futil.by_pixel(17.75, 14.5) + -- } + -- } + -- } + -- } + -- }, + vehicle_impact_sound = data.raw["mining-drill"]["pumpjack"].vehicle_impact_sound, + open_sound = data.raw["mining-drill"]["pumpjack"].open_sound, + close_sound = data.raw["mining-drill"]["pumpjack"].close_sound, + working_sound = + { + sound = + { + { + filename = "__base__/sound/pumpjack.ogg", + volume = 0.7 + }, + }, + max_sounds_per_type = 3, + audible_distance_modifier = 0.6, + fade_in_ticks = 4, + fade_out_ticks = 10 + }, + fast_replaceable_group = "pumpjack", + + -- circuit_wire_connection_points = circuit_connector_definitions["pumpjack"].points, + -- circuit_connector_sprites = circuit_connector_definitions["pumpjack"].sprites, + -- circuit_wire_max_distance = default_circuit_wire_max_distance + } +}) diff --git a/gas.lua b/gas.lua index 4468053..0d1bf56 100644 --- a/gas.lua +++ b/gas.lua @@ -2,7 +2,9 @@ local resource_autoplace = require('resource-autoplace'); local noise = require('noise'); local util = require("data-util"); +local futil = require("util") +data:extend({ {type = "resource-category", name="gas"} }) data:extend({ { type = "autoplace-control", @@ -21,7 +23,7 @@ data:extend({ icon = "__base__/graphics/icons/crude-oil-resource.png", icon_size = 64, icon_mipmaps = 4, flags = {"placeable-neutral"}, - category = "basic-fluid", + category = "gas", subgroup = "raw-resource", order="a-b-a", infinite = true, @@ -46,7 +48,7 @@ data:extend({ } } }, - walking_sound = sounds.oil, + -- walking_sound = sounds.oil, collision_box = {{-1.4, -1.4}, {1.4, 1.4}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, autoplace = resource_autoplace.resource_autoplace_settings @@ -73,7 +75,7 @@ data:extend({ height = 60, frame_count = 4, variation_count = 1, - shift = util.by_pixel(0, -2), + shift = futil.by_pixel(0, -2), hr_version = { filename = "__base__/graphics/entity/crude-oil/hr-crude-oil.png", @@ -82,7 +84,7 @@ data:extend({ height = 120, frame_count = 4, variation_count = 1, - shift = util.by_pixel(0, -2), + shift = futil.by_pixel(0, -2), scale = 0.5 } } diff --git a/graphics/entity/gas-extractor.png b/graphics/entity/gas-extractor.png new file mode 100644 index 0000000..1dc8a8e Binary files /dev/null and b/graphics/entity/gas-extractor.png differ diff --git a/graphics/entity/gas-extractor.xcf b/graphics/entity/gas-extractor.xcf new file mode 100644 index 0000000..7df418f Binary files /dev/null and b/graphics/entity/gas-extractor.xcf differ