diff --git a/nullius/changelog.txt b/nullius/changelog.txt index c8400a3..a252206 100644 --- a/nullius/changelog.txt +++ b/nullius/changelog.txt @@ -1,4 +1,43 @@ --------------------------------------------------------------------------------------------------- +Version: 2.0.0 +Date: 18.12.2025 + Features: + - Updated to 2.0 + - Added landing pad: Now the results of rocket launches will be collected there + - Re-introduced red and green wires so there is a seamless transition to 2.0 + - Added essential techs + - Added command to flip all valves (i will remove it when i'm convinced it's not needed anymore) + - Added display panels and selector combinator + - Added setting to hide the voiding recipe icon from chimneys and outfalls + - Added circuit connections to most buildings + - Added settings to control the sound of wind turbines + Changes: + - Reworked the inserters: Removed filter inserters, now base inserters have filters except tier 1, their recipes have been adapted + - Removed mirror buildings, use 2.0 flipping instead, removed chirality research + - Added a trigger tech "Salvage lab wreckage" + - Removed regular artillery shortcut and discharge defense shortcut + - Changed required techs for most shortcuts + - Now uses the Valve prototype for valves + - Changed plumbing and pumping checkpoints to reflect lesser need for pumps in 2.0 fluid system + - Made tanks rotatable/flippable + Balancing: + - Increased the pumping speeds of pumps (and max flow rate) + Graphics: + - Added icons for drones ammo categories + - Reworked voiding recipes icons to make them standout more in factoriopedia + - Altered lime recipe icon so that it's distinguishable from the item in the signals gui + - Altered recipe icons for: nuclear fuel cell recycling, hydrochloric acid, hydrogen chloride,seawater filtration, freshwater filtration for signal gui + Info: + - Added description to inserters + - Renamed the extension tech to inserter extension + - Tweaked description texts of landing entities to make them less ambiguous + - Removed mentions of the old pressure system + Modding: + - Removed the dependency on angels, now only depends on the graphics + - Now supports elevated rails + - Support for quick adjustable inserters + - Made factorissimo's factory buildings stackable again so the nullius recipes can be made in an assembler +--------------------------------------------------------------------------------------------------- Version: 1.9.1 Date: 28.01.2024 Features: diff --git a/nullius/changelog_wip.txt b/nullius/changelog_wip.txt new file mode 100644 index 0000000..ec3ab1d --- /dev/null +++ b/nullius/changelog_wip.txt @@ -0,0 +1,45 @@ +changelog in construction +--------------------------------------------------------------------------------------------------- +Version: 2.0.0 +Date: 2025 + Features: + - Updated to 2.0 + - Added landing pad: Now the results of rocket launches will be collected there + - Re-introduced red and green wires so there is a seamless transition to 2.0 + - Added essential techs + - Added command to flip all valves (i will remove it when i'm convinced it's not needed anymore) + - Added display panels and selector combinator + - Added setting to hide the voiding recipe icon from chimneys and outfalls + - Added circuit connections to most buildings + - Added settings to control the sound of wind turbines + Changes: + - Reworked the inserters: Removed filter inserters, now base inserters have filters except tier 1, their recipes have been adapted + - Removed mirror buildings, use 2.0 flipping instead, removed chirality research + - Added a trigger tech "Salvage lab wreckage" + - Removed regular artillery shortcut and discharge defense shortcut + - Changed required techs for most shortcuts + - Now uses the Valve prototype for valves + - Changed plumbing and pumping checkpoints to reflect lesser need for pumps in 2.0 fluid system + - Made tanks rotatable/flippable + Balancing: + - Increased the pumping speeds of pumps (and max flow rate) + Bugfixes: + - + Graphics: + - Added icons for drones ammo categories + - Reworked voiding recipes icons to make them standout more in factoriopedia + - Altered lime recipe icon so that it's distinguishable from the item in the signals gui + - Altered recipe icons for: nuclear fuel cell recycling, hydrochloric acid, hydrogen chloride,seawater filtration, freshwater filtration for signal gui + Info: + - Added description to inserters + - Renamed the extension tech to inserter extension + - Tweaked description texts of landing entities to make them less ambiguous + - Removed mentions of the old pressure system + Modding: + - Removed the dependency on angels, now only depends on the graphics + - Now supports elevated rails + - Support for quick adjustable inserters + - Made factorissimo's factory buildings stackable again so the nullius recipes can be made in an assembler +--------------------------------------------------------------------------------------------------- + +Safefill: added setting to enable mining of waterfill \ No newline at end of file diff --git a/nullius/data-final-fixes.lua b/nullius/data-final-fixes.lua index 1450359..54adcf7 100644 --- a/nullius/data-final-fixes.lua +++ b/nullius/data-final-fixes.lua @@ -3,3 +3,25 @@ require("prototypes.override_final_only") require("prototypes.override_mod_final") require("prototypes.item.module_limitation") require("prototypes.item.box_icons") +require("legacyMirror") + +for _, recipe in pairs(data.raw.recipe) do + if recipe.GCKI_ignore ~= nil then + recipe.GCKI_ignore = nil + end +end + +if settings.startup["nullius-hide-recipe-signals"].value then + for _,recipe in pairs(data.raw.recipe) do + --recipe.hide_from_signal_gui = true + if recipe.hide_from_signal_gui == false then + recipe.hide_from_signal_gui = nil + end + end +else + for _,recipe in pairs(data.raw.recipe) do + if string.sub(recipe.name, 1, 14) == "nullius-boxed-" or string.sub(recipe.name, 1, 14) == "nullius-unbox-" then + recipe.hide_from_signal_gui = false + end + end +end \ No newline at end of file diff --git a/nullius/data.lua b/nullius/data.lua index e8666fd..ec4bffa 100644 --- a/nullius/data.lua +++ b/nullius/data.lua @@ -1,3 +1,6 @@ +require("legacyAngels") +require("legacyValves") + require("prototypes.reskin") require("prototypes.category") require("prototypes.item.fluid") @@ -16,7 +19,8 @@ require("prototypes.item.broken") require("prototypes.item.void") require("prototypes.item.landfill") require("prototypes.item.boxing") -require("prototypes.entity.furnace") + +require("prototypes.entity.furnace") require("prototypes.entity.assembler") require("prototypes.entity.miner") require("prototypes.entity.plumbing") @@ -47,4 +51,3 @@ require("prototypes.inputs") require("prototypes.achievements") data.raw["map-settings"]["map-settings"].pollution.enabled = false -data.raw["map-settings"]["map-settings"].difficulty_settings.research_queue_setting = "always" diff --git a/nullius/graphics/entity/chimney/flare-stack-chimney.png b/nullius/graphics/entity/chimney/flare-stack-chimney.png new file mode 100644 index 0000000..d8339af Binary files /dev/null and b/nullius/graphics/entity/chimney/flare-stack-chimney.png differ diff --git a/nullius/graphics/entity/chimney/flare-stack-flipped old.png b/nullius/graphics/entity/chimney/flare-stack-flipped old.png new file mode 100644 index 0000000..1e53b7d Binary files /dev/null and b/nullius/graphics/entity/chimney/flare-stack-flipped old.png differ diff --git a/nullius/graphics/entity/chimney/flare-stack-flipped-chimney.png b/nullius/graphics/entity/chimney/flare-stack-flipped-chimney.png new file mode 100644 index 0000000..755b2b2 Binary files /dev/null and b/nullius/graphics/entity/chimney/flare-stack-flipped-chimney.png differ diff --git a/nullius/graphics/entity/chimney/flare-stack-flipped.png b/nullius/graphics/entity/chimney/flare-stack-flipped.png new file mode 100644 index 0000000..5c550b3 Binary files /dev/null and b/nullius/graphics/entity/chimney/flare-stack-flipped.png differ diff --git a/nullius/graphics/entity/crash/hr-crash-site-assembling-machine-1-ground.png b/nullius/graphics/entity/crash/crash-site-assembling-machine-1-ground.png similarity index 100% rename from nullius/graphics/entity/crash/hr-crash-site-assembling-machine-1-ground.png rename to nullius/graphics/entity/crash/crash-site-assembling-machine-1-ground.png diff --git a/nullius/graphics/entity/crash/hr-crash-site-assembling-machine-1-repaired-shadow.png b/nullius/graphics/entity/crash/crash-site-assembling-machine-1-repaired-shadow.png similarity index 100% rename from nullius/graphics/entity/crash/hr-crash-site-assembling-machine-1-repaired-shadow.png rename to nullius/graphics/entity/crash/crash-site-assembling-machine-1-repaired-shadow.png diff --git a/nullius/graphics/entity/crash/hr-crash-site-assembling-machine-1-repaired.png b/nullius/graphics/entity/crash/crash-site-assembling-machine-1-repaired.png similarity index 100% rename from nullius/graphics/entity/crash/hr-crash-site-assembling-machine-1-repaired.png rename to nullius/graphics/entity/crash/crash-site-assembling-machine-1-repaired.png diff --git a/nullius/graphics/entity/crash/hr-crash-site-assembling-machine-2-ground.png b/nullius/graphics/entity/crash/crash-site-assembling-machine-2-ground.png similarity index 100% rename from nullius/graphics/entity/crash/hr-crash-site-assembling-machine-2-ground.png rename to nullius/graphics/entity/crash/crash-site-assembling-machine-2-ground.png diff --git a/nullius/graphics/entity/crash/hr-crash-site-assembling-machine-2-repaired-shadow.png b/nullius/graphics/entity/crash/crash-site-assembling-machine-2-repaired-shadow.png similarity index 100% rename from nullius/graphics/entity/crash/hr-crash-site-assembling-machine-2-repaired-shadow.png rename to nullius/graphics/entity/crash/crash-site-assembling-machine-2-repaired-shadow.png diff --git a/nullius/graphics/entity/crash/hr-crash-site-assembling-machine-2-repaired.png b/nullius/graphics/entity/crash/crash-site-assembling-machine-2-repaired.png similarity index 100% rename from nullius/graphics/entity/crash/hr-crash-site-assembling-machine-2-repaired.png rename to nullius/graphics/entity/crash/crash-site-assembling-machine-2-repaired.png diff --git a/nullius/graphics/entity/crash/hr-crash-site-generator-ground.png b/nullius/graphics/entity/crash/crash-site-generator-ground.png similarity index 100% rename from nullius/graphics/entity/crash/hr-crash-site-generator-ground.png rename to nullius/graphics/entity/crash/crash-site-generator-ground.png diff --git a/nullius/graphics/entity/crash/hr-crash-site-generator-shadow.png b/nullius/graphics/entity/crash/crash-site-generator-shadow.png similarity index 100% rename from nullius/graphics/entity/crash/hr-crash-site-generator-shadow.png rename to nullius/graphics/entity/crash/crash-site-generator-shadow.png diff --git a/nullius/graphics/entity/crash/hr-crash-site-generator.png b/nullius/graphics/entity/crash/crash-site-generator.png similarity index 100% rename from nullius/graphics/entity/crash/hr-crash-site-generator.png rename to nullius/graphics/entity/crash/crash-site-generator.png diff --git a/nullius/graphics/entity/crash/hr-crash-site-lab-ground.png b/nullius/graphics/entity/crash/crash-site-lab-ground.png similarity index 100% rename from nullius/graphics/entity/crash/hr-crash-site-lab-ground.png rename to nullius/graphics/entity/crash/crash-site-lab-ground.png diff --git a/nullius/graphics/entity/crash/hr-crash-site-lab-repaired-shadow.png b/nullius/graphics/entity/crash/crash-site-lab-repaired-shadow.png similarity index 100% rename from nullius/graphics/entity/crash/hr-crash-site-lab-repaired-shadow.png rename to nullius/graphics/entity/crash/crash-site-lab-repaired-shadow.png diff --git a/nullius/graphics/entity/crash/hr-crash-site-lab-repaired.png b/nullius/graphics/entity/crash/crash-site-lab-repaired.png similarity index 100% rename from nullius/graphics/entity/crash/hr-crash-site-lab-repaired.png rename to nullius/graphics/entity/crash/crash-site-lab-repaired.png diff --git a/nullius/graphics/entity/poles/hr-pole1.png b/nullius/graphics/entity/poles/pole1.png similarity index 100% rename from nullius/graphics/entity/poles/hr-pole1.png rename to nullius/graphics/entity/poles/pole1.png diff --git a/nullius/graphics/entity/poles/hr-pole2.png b/nullius/graphics/entity/poles/pole2.png similarity index 100% rename from nullius/graphics/entity/poles/hr-pole2.png rename to nullius/graphics/entity/poles/pole2.png diff --git a/nullius/graphics/entity/poles/hr-pole3.png b/nullius/graphics/entity/poles/pole3.png similarity index 100% rename from nullius/graphics/entity/poles/hr-pole3.png rename to nullius/graphics/entity/poles/pole3.png diff --git a/nullius/graphics/entity/wells/hr-pumpjack-decolorized.png b/nullius/graphics/entity/wells/pumpjack-decolorized.png similarity index 100% rename from nullius/graphics/entity/wells/hr-pumpjack-decolorized.png rename to nullius/graphics/entity/wells/pumpjack-decolorized.png diff --git a/nullius/graphics/icons/factorio-logo-gear.png b/nullius/graphics/icons/factorio-logo-gear.png new file mode 100644 index 0000000..ca1a8a6 Binary files /dev/null and b/nullius/graphics/icons/factorio-logo-gear.png differ diff --git a/nullius/graphics/icons/green-wire.png b/nullius/graphics/icons/green-wire.png new file mode 100644 index 0000000..bdee96f Binary files /dev/null and b/nullius/graphics/icons/green-wire.png differ diff --git a/nullius/graphics/icons/red-wire.png b/nullius/graphics/icons/red-wire.png new file mode 100644 index 0000000..ea784cf Binary files /dev/null and b/nullius/graphics/icons/red-wire.png differ diff --git a/nullius/graphics/icons/red_cross.png b/nullius/graphics/icons/red_cross.png new file mode 100644 index 0000000..bb00507 Binary files /dev/null and b/nullius/graphics/icons/red_cross.png differ diff --git a/nullius/graphics/technology/lab-wreckage.png b/nullius/graphics/technology/lab-wreckage.png new file mode 100644 index 0000000..ecb1f8c Binary files /dev/null and b/nullius/graphics/technology/lab-wreckage.png differ diff --git a/nullius/graphics/technology/rail-signals.png b/nullius/graphics/technology/rail-signals.png new file mode 100644 index 0000000..89aabcb Binary files /dev/null and b/nullius/graphics/technology/rail-signals.png differ diff --git a/nullius/graphics/technology/rocket-control-unit.png b/nullius/graphics/technology/rocket-control-unit.png new file mode 100644 index 0000000..ec0cf9f Binary files /dev/null and b/nullius/graphics/technology/rocket-control-unit.png differ diff --git a/nullius/info.json b/nullius/info.json index 9ae80ab..8e3468d 100644 --- a/nullius/info.json +++ b/nullius/info.json @@ -1,29 +1,71 @@ { "name": "nullius", - "version": "1.9.1", - "factorio_version": "1.1", + "version": "2.0.0", + "factorio_version": "2.0", "title": "Nullius", "author": "Anachrony", "description": "In this Factorio prequel, you're an android terraforming planets and seeding them with life. Replaces all recipes and technology. No life means no coal, oil, wood, biters, or free oxygen, requiring varied renewable energy sources. For reliability, you'll focus on abundant elements from the air, sea, or common minerals such as iron ore, bauxite, sandstone, and limestone. Advanced technology enables asteroid mining of rarer elements.", "homepage": "https://discord.gg/tZY2Rkte8Y", "dependencies": [ - "base >= 1.1.99", - "(?) Transport_Drones >= 1.0.16", - "alien-biomes >= 0.6.5", - "angelsrefining >= 0.12.6", - "angelssmelting >= 0.6.20", - "boblogistics >= 1.2.1", - "? RecipeBook >= 2.7.1", + "base >= 2.0.72", + "alien-biomes >= 0.7.4", + "angelsrefininggraphics >= 1.0.0", + "angelssmeltinggraphics >= 1.0.0", + "angelspetrochemgraphics >= 1.0.0", + "boblogistics >= 2.0.2", + "? RecipeBook >= 4.0.2", "? underground-pipe-pack >= 1.1.2", - "(?) cargo-ships >= 0.2.2", - "(?) RenaiTransportation >= 1.0.0", + "? elevated-rails >= 2.0", + "(?) cargo-ships >= 1.0.21", "(?) boblibrary >= 1.1.4", - "(?) IRobot >= 1.1.0", - "(?) jetpack >= 0.3.14", + "(?) IRobot >= 2.0.0", + "(?) jetpack >= 0.4.12", + + "(?) FluidMustFlow >= 1.4.3", + "(?) factorissimo-2-notnotmelon >= 3.9.6", + "(?) safefill >= 2.0.0", + "(?) train-upgrader >= 2.0.0", + "(?) UPSFriendlyNixieTubeDisplay >= 0.2.9", + "(?) aai-loaders >= 0.2.7", + "(?) RenaiTransportation >= 2.2.4", + "(?) Warehousing >= 1.0.3", + "(?) Teleporters >= 2.0.0", + "(?) railway-motor-car >= 0.6.0", + "(?) LogisticTrainNetwork >= 2.3.4", + "(?) LTN_Combinator_Modernized >= 2.2.5", + "(?) aai-signal-transmission >= 0.5.1", + "(?) train-pubsub >= 2.0.7", + "(?) textplates >= 0.7.2", + "(?) botReplacer >= 2.0.0", + "(?) Inventory Sensor >= 2.0.6", + "(?) holographic_signs >= 2.0.8", + "(?) rec-blue-plus >= 1.4.8", + "(?) ch-concentrated-solar >= 0.5.1", + "(?) Mini_Trains >= 2.0.0", + "(?) fcpu >= 0.4.33", + "(?) reskins-bobs >= 2.3.5", + "(?) quick-adjustable-inserters >= 2.0.11", + + "! space-age", + "! quality", "! aai-industry", "! angelsbioprocessing", "! angelsinfiniteores", "! bobores", - "! stack-size-tooltip" + "! stack-size-tooltip", + "! angelssmelting", + + "(?) Transport_Drones >= 1.0.16", + "(?) Companion_Drones >= 1.0.25", + "(?) miniloader >= 1.15.7", + "(?) FuelTrainStop >= 1.1.0", + "(?) crafting_combinator >= 0.16.3", + "(?) Shuttle_Train_Continued >= 1.1.0", + "(?) railloader >= 1.1.6", + "(?) DisplayPlates >= 1.5.1", + "(?) beautiful_bridge_railway >= 1.1.1", + "(?) Induction Charging >= 2.0.0", + "(?) stack-combinator >= 1.6.2", + "(?) GCKI >= 0.16.0" ] } diff --git a/nullius/legacyAngels.lua b/nullius/legacyAngels.lua new file mode 100644 index 0000000..e899e5c --- /dev/null +++ b/nullius/legacyAngels.lua @@ -0,0 +1,885 @@ +angelsLegacy = {} +angelsLegacy.functions = {} +angelsLegacy.data = {} + +--REMOVE RESOURCE +function angelsLegacy.functions.remove_resource(resource) + if data.raw.resource[resource] then + data.raw.resource[resource] = nil + data.raw["autoplace-control"][resource] = nil + end + + local infinite_resource = nil + if data.raw.resource["infinite-" .. resource] then + infinite_resource = "infinite-" .. resource + data.raw.resource["infinite-" .. resource] = nil + data.raw["autoplace-control"]["infinite-" .. resource] = nil + end + + -- Remove from presets + for _, preset in pairs(data.raw["map-gen-presets"]["default"]) do + if + preset + and preset.basic_settings + and preset.basic_settings.autoplace_controls + and preset.basic_settings.autoplace_controls[resource] + then + preset.basic_settings.autoplace_controls[resource] = nil + end + if + infinite_resource + and preset + and preset.basic_settings + and preset.basic_settings.autoplace_controls + and preset.basic_settings.autoplace_controls[infinite_resource] + then + preset.basic_settings.autoplace_controls[infinite_resource] = nil + end + end + + -- Remove from planets + for _, planet in pairs(data.raw.planet) do + if + planet + and planet.map_gen_settings + and planet.map_gen_settings.autoplace_controls + and planet.map_gen_settings.autoplace_controls[resource] + then + planet.map_gen_settings.autoplace_controls[resource] = nil + planet.map_gen_settings.autoplace_settings.entity.settings[resource] = nil + end + if + infinite_resource + and planet + and planet.map_gen_settings + and planet.map_gen_settings.autoplace_controls + and planet.map_gen_settings.autoplace_controls[infinite_resource] + then + planet.map_gen_settings.autoplace_controls[infinite_resource] = nil + planet.map_gen_settings.autoplace_settings.entity.settings[infinite_resource] = nil + end + end +end + +local function clean_table(t) + -- removes nil values from a table so it becomes a table without holes + if type(t) ~= "table" then + return t + end + local clone = {} + for k, v in pairs(t or {}) do + t[k] = nil + table.insert(clone, v) + end + for i, v in ipairs(clone) do + t[i] = v + end + return t +end +angelsLegacy.functions.clean_ingredient_list = clean_table +angelsLegacy.functions.clean_localised_description = clean_table + +------------------------------------------------------------------------------- +-- GET ICON/ICONS FROM FLUID/ITEM --------------------------------------------- +------------------------------------------------------------------------------- +local function get_icons(object_name) + for _, prototype in pairs({ "item", "fluid", "ammo", "capsule" }) do + local object = data.raw[prototype][object_name] + if object then + if object.icons then -- icons has precedence over icon + return object.icons + end + if object.icon then + return { + { + icon = object.icon, + icon_size = object.icon_size or 64, + scale = 32 / (object.icon_size or 64), + }, + } + end + end + end + --something is wrong here but we need to return something + return "__angelsrefininggraphics__/graphics/icons/void.png" +end +angelsLegacy.functions.get_object_icons = get_icons + +local function unify_tint(tint) + -- allows tints to be defined as {255, 255, 255, 255} + -- meaning doesn't need keys rgba (but assumes that order) + -- doesn't need to be in range 0..1, but up to 255 as well + if tint then + local unified_tint = {} + + unified_tint.r = tint.r or tint[1] or 0 + unified_tint.g = tint.g or tint[2] or 0 + unified_tint.b = tint.b or tint[3] or 0 + + if unified_tint.r > 1 or unified_tint.g > 1 or unified_tint.b > 1 then + unified_tint.r = (unified_tint.r <= 255 and unified_tint.r or 255) / 255 + unified_tint.g = (unified_tint.g <= 255 and unified_tint.g or 255) / 255 + unified_tint.b = (unified_tint.b <= 255 and unified_tint.b or 255) / 255 + end + + unified_tint.a = tint.a or tint[4] or 1 + unified_tint.a = unified_tint.a > 1 and unified_tint.a / 255 or unified_tint.a + + return unified_tint + else + return nil + end +end + +------------------------------------------------------------------------------- +-- ICON GENERATION ------------------------------------------------------------ +------------------------------------------------------------------------------- +local icon_tints_table = { + --Sourced from: + --https://sciencenotes.org/molecule-atom-colors-cpk-colors/ + -- Sorted by periodic atomic number + H = { { 255, 255, 255 }, { 243, 243, 243 }, { 242, 242, 242 } }, --Hydrogen + Hd = { { 255, 255, 192 }, { 206, 206, 173 }, { 196, 196, 156 } }, --Deuterium + Li = { { 204, 128, 255 } }, --Lithium + C = { { 044, 044, 044 }, { 064, 064, 064 }, { 090, 090, 090 } }, --Carbon -- but darkened + N = { { 048, 080, 248 }, { 045, 076, 175 }, { 038, 063, 150 } }, --Nitrogen + O = { { 255, 013, 013 }, { 214, 012, 012 }, { 198, 011, 011 } }, --Oxygen + F = { { 144, 224, 080 }, { 181, 208, 000 }, { 181, 208, 000 } }, --Fluorine + Na = { { 171, 092, 242 } }, --Sodium + Mg = { { 138, 255, 000 } }, --Magnesium + Al = { { 191, 166, 166 } }, --Aluminium + Si = { { 240, 200, 160 } }, --Silicon + P = { { 255, 128, 000 } }, --Phosphorus + S = { { 255, 255, 048 }, { 216, 196, 017 }, { 210, 187, 030 } }, --Sulfur + Cl = { { 031, 240, 031 }, { 057, 211, 040 }, { 075, 195, 045 } }, --Chlorine + K = { { 143, 064, 212 } }, --Potassium + Ca = { { 061, 255, 000 } }, --Calcium + Ti = { { 191, 194, 199 } }, --Titanium + Cr = { { 138, 153, 199 } }, --Chrome + Mn = { { 156, 122, 199 } }, --Manganese + Fe = { { 224, 102, 051 } }, --Iron + Co = { { 240, 144, 160 } }, --Cobalt + Ni = { { 080, 208, 080 } }, --Nickel + Cu = { { 200, 128, 051 } }, --Copper + Zn = { { 125, 128, 176 } }, --Zinc + Ag = { { 192, 192, 192 } }, --Silver + Sn = { { 102, 128, 128 } }, --Tin + Cs = { { 087, 023, 143 } }, --Cesium + W = { { 033, 148, 214 } }, --Tungsten (Wolfram) + Os = { { 038, 102, 150 } }, --Osmium + Pt = { { 208, 208, 224 } }, --Platium + Au = { { 255, 209, 035 } }, --Gold + Hg = { { 184, 184, 208 } }, --Mercury + Pb = { { 087, 089, 097 } }, --Lead + Po = { { 171, 092, 000 } }, --Polonium + Th = { { 000, 186, 255 } }, --Thorium + Pa = { { 000, 161, 255 } }, --Protactinium + U = { { 000, 143, 255 } }, --Uranium + Np = { { 000, 128, 255 } }, --Neptunium + Pu = { { 000, 107, 255 } }, --Plutonium + Am = { { 084, 092, 242 } }, --Americium + Cm = { { 120, 092, 227 } }, --Curium + --fake/compicated/custom tints + Tw = { { 243, 135, 000 } }, --Thermal water + Oi = { { 069, 069, 069 }, { 054, 054, 054 }, { 036, 036, 036 } }, --Coal/Oil + Xx = { { 041, 041, 180 } }, --Complex (really strange materials) + Ws = { { 094, 114, 174 }, { 088, 104, 163 }, { 088, 101, 155 } }, --Water/Steam + Sg = { { 255, 105, 180 } }, --Syngas + Ng = { { 105, 135, 090 }, { 096, 122, 082 }, { 088, 113, 075 } }, --Natural Gas + Cb = { { 015, 015, 015 } }, --Other Carbon Solids + Ax = { { 241, 050, 238 } }, --Alien Stuffs + Aw = { { 194, 227, 091 }, { 184, 239, 000 }, { 156, 207, 000 } }, --Alien Feed (gas/water) + Oc = { { 044, 044, 044 }, { 140, 000, 000 }, { 140, 000, 000 } }, -- Carbon (oxides) darker for less contrast +} + +--[[{ unused materials + Ne = {{179, 227, 245}}, Ar = {{128, 209, 227}}, Sc = {{230, 230, 230}}, V = {{166, 166, 171}}, Ga = {{194, 143, 143}}, Ge = {{102, 143, 143}}, As = {{189, 128, 227}}, Se = {{255, 161, 000}}, + Br = {{166, 041, 041}}, Kr = {{092, 184, 209}}, Rb = {{112, 046, 176}}, Sr = {{000, 255, 000}}, Y = {{148, 255, 255}}, Zr = {{148, 224, 224}}, Nb = {{115, 194, 201}}, Mo = {{084, 181, 181}}, + Tc = {{059, 158, 158}}, Ru = {{036, 143, 143}}, Rh = {{010, 125, 140}}, Pd = {{000, 105, 133}}, Cd = {{255, 217, 143}}, In = {{166, 117, 115}}, Sb = {{158, 099, 181}}, Te = {{212, 122, 000}}, + I = {{148, 000, 148}}, Xe = {{066, 158, 176}}, Ba = {{000, 201, 000}}, La = {{112, 212, 255}}, Ce = {{255, 255, 199}}, Pr = {{217, 255, 199}}, Nd = {{199, 255, 199}}, Pm = {{163, 255, 199}}, + Sm = {{143, 255, 199}}, Eu = {{097, 255, 199}}, Gd = {{069, 255, 199}}, Tb = {{048, 255, 199}}, Dy = {{031, 255, 199}}, Ho = {{000, 255, 156}}, Er = {{000, 230, 117}}, Tm = {{000, 212, 082}}, + Yb = {{000, 191, 056}}, Lu = {{000, 171, 036}}, Hf = {{077, 194, 255}}, Ta = {{077, 166, 255}}, Re = {{038, 125, 171}}, Ir = {{023, 084, 135}}, Tl = {{166, 084, 077}}, Bi = {{158, 079, 181}}, + At = {{117, 079, 069}}, Rn = {{066, 130, 150}}, Fr = {{066, 000, 102}}, Ra = {{000, 125, 000}}, Ac = {{112, 171, 250}}, Bk = {{138, 079, 227}}, Cf = {{161, 054, 212}}, Es = {{179, 031, 212}}, + Fm = {{179, 031, 186}}, Md = {{179, 013, 166}}, No = {{189, 013, 135}}, Lr = {{199, 000, 102}}, Rf = {{204, 000, 089}}, Db = {{209, 000, 079}}, Sg = {{217, 000, 069}}, Bh = {{224, 000, 056}}, + Hs = {{230, 000, 046}}, Mt = {{235, 000, 038}}, }]] + +local function get_molecule_codes(molec_formula) + local orig = molec_formula + local string_codes = {} --subtables of tint codes eg. {{form = Ws ,amount = 12},} + while string.len(molec_formula) > 0 do + --take first segment (or throw error) and trim each code off and repeat until empty or error + local trim = 1 --always trim at least 1 per code + if string.find(molec_formula, "^%u%l%d+") == 1 then --Two letter code with number + table.insert(string_codes, { + form = string.sub(molec_formula, 1, 2), + amount = tonumber(string.sub(molec_formula, string.find(molec_formula, "%d+"))), + }) + trim = string.len(tostring(string_codes[#string_codes].amount)) + 1 + elseif string.find(molec_formula, "^%u%l") == 1 then --Two letter code without number + table.insert(string_codes, { form = string.sub(molec_formula, 1, 2), amount = 1 }) --no amount-default 1 + elseif string.find(molec_formula, "^%u%d+") == 1 then --One letter code with number + table.insert(string_codes, { + form = string.sub(molec_formula, 1, 1), + amount = tonumber(string.sub(molec_formula, string.find(molec_formula, "%d+"))), + }) + trim = string.len(tostring(string_codes[#string_codes].amount)) + 1 + elseif string.find(molec_formula, "^%u") == 1 then --One letter code without number + table.insert(string_codes, { form = string.sub(molec_formula, 1, 1), amount = 1 }) --no amount-default 1 + else --none of the above segments + error( + "Cannot determine next string code in '" + .. (molec_formula or "") + .. " of original code " + .. orig + .. "'. Please report this to the Angel's dev team." + ) + end + --trim string correctly + local symbol = string_codes[#string_codes].form + trim = trim + string.len(symbol) + molec_formula = string.sub(molec_formula, trim) + end + return string_codes +end + +local function create_recipe_molecule_icons(molecules_icon, molecules_shift, molecules_scale) + molecules_icon = clean_table(molecules_icon) or {} + molecules_shift = molecules_shift or { { -11.5, 12 }, { 11.5, 12 }, { 0, 12 } } + molecules_scale = molecules_scale or (10.24 / 32) -- assume base 64 size, scaled by 0.5 + + for molecule_index, molecule_icon in pairs(molecules_icon) do + if type(molecule_icon) ~= "table" and get_icons(molecule_icon) ~= "__angelsrefininggraphics__/graphics/icons/void.png" then + molecules_icon[molecule_index] = util.table.deepcopy(get_icons(molecule_icon)) + end + end + + for molecule_index, molecule_icon in pairs(molecules_icon) do + if type(molecule_icon) ~= "table" then + molecules_icon[molecule_index] = { + { + icon = molecule_icon, + icon_size = 32, + }, + } + elseif type(molecule_icon[1]) ~= "table" then + local mi = util.table.deepcopy(molecule_icon) + molecules_icon[molecule_index] = { + { + icon = mi.icon or mi[1] or nil, + shift = mi.shift or mi[3] or nil, + scale = mi.scale or mi[4] or nil, + tint = mi.tint or mi[5] or nil, + floating = mi.floating or nil, + }, + } + if molecules_icon[molecule_index][1].icon then + molecules_icon[molecule_index][1].icon_size = mi.icon_size or mi[2] or 64 + if molecules_icon[molecule_index][1].icon_size ~= 32 then + molecules_icon[molecule_index][1].scale = (molecules_icon[molecule_index][1].scale or 1) + * 32 + / molecules_icon[molecule_index][1].icon_size + end + else + --something is wrong here but we need to return something + molecules_icon[molecule_index] = { + { + icon = "__angelsrefininggraphics__/graphics/icons/void.png", + icon_size = 32, + }, + } + end + else + for molecule_icon_layer_index, molecule_icon_layer in pairs(molecule_icon) do + if not molecule_icon_layer.icon_size then + molecules_icon[molecule_index][molecule_icon_layer_index].icon_size = 64 + molecules_icon[molecule_index][molecule_icon_layer_index].scale = 0.5 + end + end + end + molecule_icon = molecules_icon[molecule_index] + + -- now shift this icon to its correct position + local molecule_shift = molecules_shift[molecule_index] or { 0, 0 } + local molecule_scale = molecules_scale + for layer_index, layer in pairs(molecule_icon) do + layer.scale = layer.scale or 1 + layer.shift = { (layer.shift or {})[1] or 0, (layer.shift or {})[2] or 0 } + + layer.shift = { + layer.shift[1] * molecule_scale + molecule_shift[1], + layer.shift[2] * molecule_scale + molecule_shift[2], + } + layer.scale = layer.scale * molecule_scale + + molecule_icon[layer_index].scale = layer.scale + molecule_icon[layer_index].shift = layer.shift + end + molecules_icon[molecule_index] = clean_table(molecule_icon) + end + + return clean_table(molecules_icon) +end + +-- CREATE LIQUID RECIPE ICONS (NOT FOR FLUIDS) +function angelsLegacy.functions.create_liquid_recipe_icon(bot_molecules_icon, tints, top_molecules_icon) + -- bot_molecules_icon and top_molecules_icon is a table of molecule_icon, which can be a string + -- (assumes icon_size 64) or be a table with size defined + bot_molecules_icon = + create_recipe_molecule_icons(bot_molecules_icon, { { -11.5, 12 }, { 11.5, 12 }, { 0, 12 } } ) + top_molecules_icon = + create_recipe_molecule_icons(top_molecules_icon, { { -11.5, -12 }, { 11.5, -12 }, { 0, -12 } } ) + + -- tints is a table of 3 tints, for the top, mid and bot section, + -- uses the get_molecule_codes for default tints + if tints then + if type(tints) ~= "table" then + local reference = get_molecule_codes(tints) + tints = { + top = unify_tint(icon_tints_table[(reference[1] or { form = "unknown" }).form][1] or {}), + mid = unify_tint(icon_tints_table[(reference[2] or { form = "unknown" }).form][2] or {}), + bot = unify_tint(icon_tints_table[(reference[3] or { form = "unknown" }).form][3] or {}), + } + else + tints.top = unify_tint(tints.top or tints[1] or nil) + tints.mid = unify_tint(tints.mid or tints[2] or nil) + tints.bot = unify_tint(tints.bot or tints[3] or nil) + end + else + tints = {} + end + + local recipe_icons = { + { + -- base layer required for background shadow + icon = "__angelsrefininggraphics__/graphics/icons/angels-liquid/liquid-recipe-base.png", + icon_size = 600, + scale = 32 / 600, + tint = { r = 0.25, g = 0.25, b = 0.25, a = 0.7 }, + }, + { + icon = "__angelsrefininggraphics__/graphics/icons/angels-liquid/liquid-recipe-top.png", + icon_size = 600, + scale = 32 / 600, + tint = tints.top, + }, + { + icon = "__angelsrefininggraphics__/graphics/icons/angels-liquid/liquid-recipe-mid.png", + icon_size = 600, + scale = 32 / 600, + tint = tints.mid, + }, + { + icon = "__angelsrefininggraphics__/graphics/icons/angels-liquid/liquid-recipe-bot.png", + icon_size = 600, + scale = 32 / 600, + tint = tints.bot, + }, + } + for _, bot_molecule_icon in pairs(bot_molecules_icon) do + for _, bot_molecule_icon_layer in pairs(bot_molecule_icon) do + table.insert(recipe_icons, bot_molecule_icon_layer) + end + end + for _, top_molecule_icon in pairs(top_molecules_icon) do + for _, top_molecule_icon_layer in pairs(top_molecule_icon) do + table.insert(recipe_icons, top_molecule_icon_layer) + end + end + return recipe_icons +end + +-- CREATE LIQUID FLUID ICONS (NOT FOR RECIPES) +function angelsLegacy.functions.create_liquid_fluid_icon(molecule_icon, tints) + -- molecule_icon can be a string (assumes icon_size 64) + -- or be a table with size defined + if molecule_icon then + if type(molecule_icon) ~= "table" then + molecule_icon = { + icon = molecule_icon, + icon_size = 64, + } + else + molecule_icon.icon = molecule_icon.icon or molecule_icon[1] or nil + if molecule_icon.icon then + molecule_icon.icon_size = molecule_icon.icon_size or molecule_icon[2] or 64 + else + --something is wrong here but we need to return something + molecule_icon.icon = "__angelsrefininggraphics__/graphics/icons/void.png" + molecule_icon.icon_size = 32 + end + end + + molecule_icon.shift = molecule_icon.shift or molecule_icon[3] or { -10, -10 } + molecule_icon.scale = molecule_icon.scale or molecule_icon[4] or 15 / molecule_icon.icon_size + molecule_icon.tint = molecule_icon.tint or molecule_icon[5] or nil + + molecule_icon[1] = nil + molecule_icon[2] = nil + molecule_icon[3] = nil + molecule_icon[4] = nil + molecule_icon[5] = nil + else + molecule_icon = nil + end + + -- tints is a table of 3 tints, for the top, mid and bot section, + -- uses the get_molecule_codes for default tints + if tints then + if type(tints) ~= "table" then + local reference = get_molecule_codes(tints) + tints = { + top = unify_tint(icon_tints_table[(reference[1] or { form = "unknown" }).form][1] or {}), + mid = unify_tint(icon_tints_table[(reference[2] or { form = "unknown" }).form][2] or {}), + bot = unify_tint(icon_tints_table[(reference[3] or { form = "unknown" }).form][3] or {}), + } + else + tints.top = unify_tint(tints.top or tints[1] or nil) + tints.mid = unify_tint(tints.mid or tints[2] or nil) + tints.bot = unify_tint(tints.bot or tints[3] or nil) + end + else + tints = {} + end + + return { + { + -- base layer required for background shadow + icon = "__angelsrefininggraphics__/graphics/icons/angels-liquid/liquid-item-base.png", + icon_size = 330, + scale = 32 / 330, + tint = { r = 0.25, g = 0.25, b = 0.25, a = 0.7 }, + shift = molecule_icon and { 3.5, 0 } or nil, + }, + { + icon = "__angelsrefininggraphics__/graphics/icons/angels-liquid/liquid-item-top.png", + icon_size = 330, + scale = 32 / 330, + tint = tints.top, + shift = molecule_icon and { 3.5, 0 } or nil, + }, + { + icon = "__angelsrefininggraphics__/graphics/icons/angels-liquid/liquid-item-mid.png", + icon_size = 330, + scale = 32 / 330, + tint = tints.mid, + shift = molecule_icon and { 3.5, 0 } or nil, + }, + { + icon = "__angelsrefininggraphics__/graphics/icons/angels-liquid/liquid-item-bot.png", + icon_size = 330, + scale = 32 / 330, + tint = tints.bot, + shift = molecule_icon and { 3.5, 0 } or nil, + }, + molecule_icon, + } +end + +-- CREATE GAS FLUID ICONS (NOT FOR RECIPES) +function angelsLegacy.functions.create_gas_fluid_icon(molecule_icon, tints) + -- molecule_icon can be a string (assumes icon_size 32) + -- or be a table with size defined + if molecule_icon then + if type(molecule_icon) ~= "table" then + molecule_icon = { + icon = molecule_icon, + icon_size = 32, + } + else + molecule_icon.icon = molecule_icon.icon or molecule_icon[1] or nil + if molecule_icon.icon then + molecule_icon.icon_size = molecule_icon.icon_size or molecule_icon[2] or 32 + else + --something is wrong here but we need to return something + molecule_icon.icon = "__angelsrefininggraphics__/graphics/icons/void.png" + molecule_icon.icon_size = 32 + end + end + + molecule_icon.shift = molecule_icon.shift or molecule_icon[3] or { -10, -10 } + molecule_icon.scale = molecule_icon.scale or molecule_icon[4] or 15 / molecule_icon.icon_size + + molecule_icon[1] = nil + molecule_icon[2] = nil + molecule_icon[3] = nil + molecule_icon[4] = nil + else + molecule_icon = nil + end + + -- tints is a table of 3 tints, for the top, mid and bot section, + -- allows a string of max 3 characters for default tints + if tints then + if type(tints) ~= "table" then + local reference = get_molecule_codes(tints) + tints = { + top = unify_tint(icon_tints_table[(reference[1] or { form = "unknown" }).form][1] or {}), + mid = unify_tint(icon_tints_table[(reference[2] or { form = "unknown" }).form][2] or {}), + bot = unify_tint(icon_tints_table[(reference[3] or { form = "unknown" }).form][3] or {}), + } + else + tints.top = unify_tint(tints.top or tints[1] or nil) + tints.mid = unify_tint(tints.mid or tints[2] or nil) + tints.bot = unify_tint(tints.bot or tints[3] or nil) + end + else + tints = {} + end + + return { + { + -- base layer required for background shadow + icon = "__angelsrefininggraphics__/graphics/icons/angels-gas/gas-item-base.png", + icon_size = 596, + scale = 32 / 596, + tint = { r = 0.25, g = 0.25, b = 0.25, a = 0.7 }, + shift = not molecule_icon and { -3.5, 0 } or nil, + }, + { + icon = "__angelsrefininggraphics__/graphics/icons/angels-gas/gas-item-top.png", + icon_size = 596, + scale = 32 / 596, + tint = tints.top, + shift = not molecule_icon and { -3.5, 0 } or nil, + }, + { + icon = "__angelsrefininggraphics__/graphics/icons/angels-gas/gas-item-mid.png", + icon_size = 596, + scale = 32 / 596, + tint = tints.mid, + shift = not molecule_icon and { -3.5, 0 } or nil, + }, + { + icon = "__angelsrefininggraphics__/graphics/icons/angels-gas/gas-item-bot.png", + icon_size = 596, + scale = 32 / 596, + tint = tints.bot, + shift = not molecule_icon and { -3.5, 0 } or nil, + }, + molecule_icon, + } +end + +-- CREATE GAS RECIPE ICONS (NOT FOR FLUIDS) +function angelsLegacy.functions.create_gas_recipe_icon(bot_molecules_icon, tints, top_molecules_icon) + -- bot_molecules_icon and top_molecules_icon is a table of molecule_icon, which can be a string + -- (assumes icon_size 64) or be a table with size defined + bot_molecules_icon = + create_recipe_molecule_icons(bot_molecules_icon, { { -11.5, 12 }, { 11.5, 12 }, { 0, 12 } }) + top_molecules_icon = + create_recipe_molecule_icons(top_molecules_icon, { { -11.5, -12 }, { 11.5, -12 }, { 0, -12 } }) + + -- tints is a table of 3 tints, for the top, mid and bot section, + -- uses the get_molecule_codes for default tints + if tints then + if type(tints) ~= "table" then + local reference = get_molecule_codes(tints) + tints = { + top = unify_tint(icon_tints_table[(reference[1] or { form = "unknown" }).form][1] or {}), + mid = unify_tint(icon_tints_table[(reference[2] or { form = "unknown" }).form][2] or {}), + bot = unify_tint(icon_tints_table[(reference[3] or { form = "unknown" }).form][3] or {}), + } + else + tints.top = unify_tint(tints.top or tints[1] or nil) + tints.mid = unify_tint(tints.mid or tints[2] or nil) + tints.bot = unify_tint(tints.bot or tints[3] or nil) + end + else + tints = {} + end + + local recipe_icons = { + { + -- base layer required for background shadow + icon = "__angelsrefininggraphics__/graphics/icons/angels-gas/gas-recipe-base.png", + icon_size = 750, + scale = 32 / 750, + tint = { r = 0.25, g = 0.25, b = 0.25, a = 0.7 }, + }, + { + icon = "__angelsrefininggraphics__/graphics/icons/angels-gas/gas-recipe-top.png", + icon_size = 750, + scale = 32 / 750, + tint = tints.top, + }, + { + icon = "__angelsrefininggraphics__/graphics/icons/angels-gas/gas-recipe-mid.png", + icon_size = 750, + scale = 32 / 750, + tint = tints.mid, + }, + { + icon = "__angelsrefininggraphics__/graphics/icons/angels-gas/gas-recipe-bot.png", + icon_size = 750, + scale = 32 / 750, + tint = tints.bot, + }, + } + for _, bot_molecule_icon in pairs(bot_molecules_icon) do + for _, bot_molecule_icon_layer in pairs(bot_molecule_icon) do + table.insert(recipe_icons, bot_molecule_icon_layer) + end + end + for _, top_molecule_icon in pairs(top_molecules_icon) do + for _, top_molecule_icon_layer in pairs(top_molecule_icon) do + table.insert(recipe_icons, top_molecule_icon_layer) + end + end + return recipe_icons +end + +------------------------------------------------------------------------------- +-- FLUID FLOW AND RECIPE COLOUR FUNCTIONS ------------------------------------- +------------------------------------------------------------------------------- +--the following functions were gratefully donated by @Maxreader on Discord +local function isColor(input) + if type(input) ~= "table" then + return nil + end + local length = table_size(input) + if length ~= 3 and length ~= 4 then + return nil + end + local is_small = true + for _, v in pairs(input) do + if v > 1 then + is_small = false + break + end + end + if not is_small then + for k, v in pairs(input) do + input[k] = v / 255 + end + end + local color = { + r = input.r or input[1], + g = input.g or input[2], + b = input.b or input[3], + a = input.a or input[4] or 1, + } + return color +end + +local function findRGB(inputString) + if type(inputString) ~= "string" then + return nil + end + if inputString:find("%a") then + return nil + end + local rawColor = util.split(inputString:gsub("%D", " "), " ") + if #rawColor < 3 then + return nil + end + local color = {} + for k, v in pairs(rawColor) do + color[k] = v / 255 + end + return { + r = color[1], + g = color[2], + b = color[3], + a = color[4] or 1, + } +end + +--modified version of util.color provided by API +local function findHex(hex) + if type(hex) ~= "string" then + return nil + end + if hex:find("%X") or #hex > 8 or #hex == 5 or #hex == 7 then + return nil + end + + local function h(i, j) + return j and tonumber("0x" .. hex:sub(i, j)) / 255 or tonumber("0x" .. hex:sub(i, i)) / 15 + end + + hex = hex:gsub("#", "") + return #hex == 6 and { r = h(1, 2), g = h(3, 4), b = h(5, 6) } + or #hex == 3 and { r = h(1), g = h(2), b = h(3) } + or #hex == 8 and { r = h(1, 2), g = h(3, 4), b = h(5, 6), a = h(7, 8) } + or #hex == 4 and { r = h(1), g = h(2), b = h(3), a = h(4) } + or #hex == 2 and { r = h(1, 2), g = h(1, 2), b = h(1, 2) } + or #hex == 1 and { r = h(1), g = h(1), b = h(1) } + or { r = 1, g = 1, b = 1 } +end + +local function toColor(color) + return isColor(color) or findHex(color) or findRGB(color) or { r = 0, g = 0, b = 0, a = 1 } +end +local function RGBtoHSV(color) + color = toColor(color) + local r, g, b = color.r, color.g, color.b + local max = math.max(r, g, b) + local min = math.min(r, g, b) + local range = max - min + local h + if range == 0 then + h = 0 + elseif max == r then + h = (g - b) / range * 60 + elseif max == g then + h = (2 + (b - r) / range) * 60 + elseif max == b then + h = (4 + (r - g) / range) * 60 + end + if h < 0 then + h = h + 360 + end + local v = max + local s = range / max + return { + h = h, + s = s, + v = v, + a = color.a or 1, + } +end + +local function HSVtoRGB(color) + local h, s, v, a = color.h, color.s, color.v, color.a + local function f(n) + local k = (n + h / 60) % 6 + return v - v * s * math.max(math.min(k, 4 - k, 1), 0) + end + return { + r = f(5), + g = f(3), + b = f(1), + a = color.a or 1, + } +end + +local function rgb_fetch(chemical_formula) + local rgb = {} + local codes = get_molecule_codes(chemical_formula) + for i = 1, #codes do + local tint_table = icon_tints_table[codes[i].form] + if tint_table then + rgb[i] = #tint_table <= i and tint_table[i] or tint_table[1] + else + rgb[i] = { 0, 0, 0 } + end + end + return rgb +end + +local function total_shade(chemical_formula) + local change = 0 + local array = get_molecule_codes(chemical_formula) + for i = 1, #array do + change = change + array[i].amount + end + return change +end + +function angelsLegacy.functions.fluid_color(chemical_formula) --color blending based on a general chemical formula + local color = {} + local arrays = get_molecule_codes(chemical_formula) + local lettering, multi, rgb = {}, {}, {} + for i = 1, #arrays do + table.insert(lettering, arrays[i].form) + table.insert(multi, arrays[i].amount) + --table.insert(rgb, arrays[i].rgb) + end + rgb = rgb_fetch(chemical_formula) + --local rgb = formula_extraction_1a(chemical_formula)--formula_extraction_1(chemical_formula) + --local multi = formula_extraction_2(chemical_formula) + --should only consist of the first 3 items, with an optional 4th + local red, green, blue, alpha, comb = 0, 0, 0, 0, 0 + local ave_denom = #rgb + if + ave_denom == 2 + and ( + (rgb[1] == icon_tints_table["C"][1] and rgb[2] == icon_tints_table["H"][1]) + or (rgb[1] == icon_tints_table["H"][1] and rgb[2] == icon_tints_table["C"][1]) + ) + then + -- Hydrocarbon only + local m_c = tonumber(multi[1]) / 8 + local m_h = tonumber(multi[2]) / 12 + local value = ((m_h / m_c / 4) ^ 2.2) / 0.41 + local function sigmoid(x, b, c) --more maxreader madness :D + return 1 / (1 + 2 ^ (-b * (x + c))) + end + value = sigmoid(value, 20, -0.25) + for i, j in pairs({ "r", "g", "b" }) do + color[j] = value + end + else --everything else + for i, colour in pairs(rgb) do + alpha = colour[4] or 1 + red = red + ((colour[1] / 255) ^ 2 * tonumber(multi[i]) * alpha) + green = green + ((colour[2] / 255) ^ 2 * tonumber(multi[i]) * alpha) + blue = blue + ((colour[3] / 255) ^ 2 * tonumber(multi[i]) * alpha) + comb = comb + tonumber(multi[i] * alpha) + end + color = { r = math.sqrt(red / comb), g = math.sqrt(green / comb), b = math.sqrt(blue / comb), a = 1 } + --normalise + local HSV = RGBtoHSV(color) + HSV.v = 0.8 * HSV.v + HSV.s = 1 - 0.60 * (1 - HSV.s) + color = HSVtoRGB(HSV) + end + return color +end + +function angelsLegacy.functions.flow_color(chemical_formula) --makes it lighter by some margin + local change = total_shade(chemical_formula) * 6 + local chemical_formula = chemical_formula .. "H" .. change --table.insert(chemical_formula,"H"..change) + local color = angelsLegacy.functions.fluid_color(chemical_formula) + return color +end + +-- CREATE GAS TECH ICONS +function angelsLegacy.functions.create_gas_tech_icon(tints) + -- tints is a table of 3 tints, for the top, mid and bot section, + -- uses the get_molecule_codes for default tints + if tints then + if type(tints) ~= "table" then + local reference = get_molecule_codes(tints) + tints = { + top = unify_tint(icon_tints_table[(reference[1] or { form = "unknown" }).form][1] or {}), + mid = unify_tint(icon_tints_table[(reference[2] or { form = "unknown" }).form][2] or {}), + bot = unify_tint(icon_tints_table[(reference[3] or { form = "unknown" }).form][3] or {}), + } + else + tints.top = unify_tint(tints.top or tints[1] or nil) + tints.mid = unify_tint(tints.mid or tints[2] or nil) + tints.bot = unify_tint(tints.bot or tints[3] or nil) + end + else + tints = {} + end + + return { + { + -- base layer required for background shadow + icon = "__angelsrefininggraphics__/graphics/icons/angels-gas/gas-tech-base.png", + icon_size = 604, + scale = 32 / 604, + tint = { r = 0.25, g = 0.25, b = 0.25, a = 0.7 }, + }, + { + icon = "__angelsrefininggraphics__/graphics/icons/angels-gas/gas-tech-top.png", + icon_size = 604, + scale = 32 / 604, + tint = tints.top, + }, + { + icon = "__angelsrefininggraphics__/graphics/icons/angels-gas/gas-tech-mid.png", + icon_size = 604, + scale = 32 / 604, + tint = tints.mid, + }, + { + icon = "__angelsrefininggraphics__/graphics/icons/angels-gas/gas-tech-bot.png", + icon_size = 604, + scale = 32 / 604, + tint = tints.bot, + }, + } +end diff --git a/nullius/legacyMirror.lua b/nullius/legacyMirror.lua new file mode 100644 index 0000000..2dd4193 --- /dev/null +++ b/nullius/legacyMirror.lua @@ -0,0 +1,1144 @@ +local ICONPATH = "__nullius__/graphics/icons/" + +data:extend{ + { + type = "item-subgroup", + name = "unmirror-1", --those two are useless + group = "chemistry", + order = "md" + }, + { + type = "item-subgroup", + name = "unmirror-2", + group = "chemistry", + order = "me" + }, + { + type = "assembling-machine", + name = "nullius-mirror-nanofabricator-2", + localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-nanofabricator-2"}}, + icons = { + data.raw.item["nullius-nanofabricator-2"].icons[1], + { icon = ICONPATH .. "flip1.png", icon_size = 64 } + }, + hidden = true, + order = data.raw.item["nullius-nanofabricator-2"].order .. "c", + localised_description = {"entity-description.nullius-nanofabricator"}, + flags = {"placeable-neutral", "placeable-player", "player-creation"}, + minable = {mining_time = 2.5, result = "nullius-nanofabricator-2"}, + placeable_by = {item = "nullius-nanofabricator-2", count = 1}, + max_health = 400, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + resistances = { { type = "impact", decrease = 50, percent = 80 } }, + collision_box = {{-1.75, -1.75}, {1.75, 1.75}}, + selection_box = {{-2, -2}, {2, 2}}, + module_slots = 4, + allowed_effects = {"speed", "productivity", "consumption", "pollution"}, + crafting_categories = {"nanotechnology"}, + fast_replaceable_group = "nanofabricator", + crafting_speed = 2, + energy_source = data.raw["assembling-machine"]["nullius-nanofabricator-2"].energy_source, + energy_usage = "940kW", + graphics_set = { + animation = data.raw["assembling-machine"]["nullius-nanofabricator-2"].graphics_set.animation, + }, + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-nanofabricator-1"].working_sound, + fluid_boxes = { + { + production_type = "input", + pipe_picture = data.raw["assembling-machine"] + ["nullius-nanofabricator-1"].fluid_boxes[1].pipe_picture, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1.5, 0.5}, direction = defines.direction.west }} + }, + { + production_type = "input", + pipe_picture = data.raw["assembling-machine"] + ["nullius-nanofabricator-1"].fluid_boxes[2].pipe_picture, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-0.5, -1.5}, direction = defines.direction.north }} + }, + { + production_type = "input", + pipe_picture = data.raw["assembling-machine"] + ["nullius-nanofabricator-1"].fluid_boxes[3].pipe_picture, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {0.5, 1.5}, direction = defines.direction.south }} + }, + { + production_type = "output", + pipe_picture = data.raw["assembling-machine"] + ["nullius-nanofabricator-1"].fluid_boxes[4].pipe_picture, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1.5, -0.5}, direction = defines.direction.east }} + }, + }, + fluid_boxes_off_when_no_fluid_recipe = true, + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = data.raw["assembling-machine"]["nullius-nanofabricator-2"].circuit_connector + }, + { + type = "assembling-machine", + name = "nullius-mirror-hydro-plant-2", + localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-hydro-plant-2"}}, + icons = { + data.raw.item["nullius-hydro-plant-2"].icons[1], + { icon = ICONPATH .. "flip1.png", icon_size = 64 } + }, + localised_description = {"entity-description.nullius-hydro-plant"}, + hidden = true, + flags = {"placeable-neutral", "player-creation"}, + minable = {mining_time = 1.5, result = "nullius-hydro-plant-2"}, + placeable_by = {item = "nullius-hydro-plant-2", count = 1}, + max_health = 400, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + collision_box = {{-2.2, -2.2}, {2.2, 2.2}}, + selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, + crafting_categories = {"nullius-water-treatment"}, + crafting_speed = 2, + energy_source = {type = "electric", usage_priority = "secondary-input", emissions_per_minute = {pollution = 0.05}, drain="20kW"}, + energy_usage = "480kW", + ingredient_count = 4, + resistances = data.raw["assembling-machine"]["nullius-hydro-plant-2"].resistances, + module_slots = 2, + allowed_effects = {"speed", "productivity", "consumption", "pollution"}, + fast_replaceable_group = "hydro-plant", + next_upgrade = "nullius-mirror-hydro-plant-3", + graphics_set = data.raw["assembling-machine"]["nullius-hydro-plant-2"].graphics_set, + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-hydro-plant-1"].working_sound, + + fluid_boxes = { + { + production_type = "input", + pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[1].pipe_picture, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1, -2}, direction = defines.direction.north }} + }, + { + production_type = "input", + pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[2].pipe_picture, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, -2}, direction = defines.direction.north }} + }, + { + production_type = "output", + pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[3].pipe_picture, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1, 2}, direction = defines.direction.south }} + }, + { + production_type = "output", + pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[4].pipe_picture, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1, 2}, direction = defines.direction.south }} + }, + } + }, + + { + type = "assembling-machine", + name = "nullius-mirror-hydro-plant-3", + localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-hydro-plant-3"}}, + icons = { + data.raw.item["nullius-hydro-plant-3"].icons[1], + { icon = ICONPATH .. "flip1.png", icon_size = 64 } + }, + localised_description = {"entity-description.nullius-hydro-plant"}, + hidden = true, + flags = {"placeable-neutral", "player-creation"}, + minable = {mining_time = 2, result = "nullius-hydro-plant-3"}, + placeable_by = {item = "nullius-hydro-plant-3", count = 1}, + max_health = 500, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + collision_box = {{-2.2, -2.2}, {2.2, 2.2}}, + selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, + crafting_categories = {"nullius-water-treatment"}, + crafting_speed = 4, + energy_source = {type = "electric", usage_priority = "secondary-input", emissions_per_minute = {pollution = 0.1}, drain="40kW"}, + energy_usage = "960kW", + ingredient_count = 6, + resistances = { + { type = "impact", decrease = 100, percent = 90 }, + { type = "fire", percent = 75 } + }, + module_slots = 3, + allowed_effects = {"speed", "productivity", "consumption", "pollution"}, + fast_replaceable_group = "hydro-plant", + graphics_set = data.raw["assembling-machine"]["nullius-hydro-plant-3"].graphics_set, + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-hydro-plant-1"].working_sound, + + fluid_boxes = { + { + production_type = "input", + pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[1].pipe_picture, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1, -2}, direction = defines.direction.north }} + }, + { + production_type = "input", + pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[2].pipe_picture, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, -2}, direction = defines.direction.north }} + }, + { + production_type = "output", + pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[3].pipe_picture, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1, 2}, direction = defines.direction.south }} + }, + { + production_type = "output", + pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[4].pipe_picture, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1, 2}, direction = defines.direction.south }} + }, + }, + }, + { + type = "assembling-machine", + name = "nullius-mirror-distillery-2", + order = "z-nullius-ccc", + icons = { + data.raw.item["nullius-distillery-2"].icons[1], + { icon = ICONPATH .. "flip1.png", icon_size = 64 } + }, + localised_description = {"entity-description.nullius-distillery"}, + hidden = true, + flags = {"placeable-neutral","player-creation"}, + minable = {mining_time = 1.8, result = "nullius-distillery-2"}, + placeable_by = {item = "nullius-distillery-2", count = 1}, + max_health = 500, + dying_explosion = "medium-explosion", + corpse = "oil-refinery-remnants", + collision_box = {{-2.3, -2.3}, {2.3, 2.3}}, + selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, + + crafting_categories = {"distillation"}, + crafting_speed = 2, + energy_source = data.raw["assembling-machine"]["nullius-distillery-2"].energy_source, + energy_usage = "550kW", + resistances = data.raw["assembling-machine"]["nullius-distillery-2"].resistances, + working_sound = data.raw["assembling-machine"]["oil-refinery"].working_sound, + impact_category = "metal", + module_slots = 2, + allowed_effects = {"speed", "productivity", "consumption", "pollution"}, + fast_replaceable_group = "distillery", + next_upgrade = "nullius-mirror-distillery-3", + graphics_set = data.raw["assembling-machine"]["nullius-distillery-2"].graphics_set, + + fluid_boxes = { + { + production_type = "input", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1, 2}, direction = defines.direction.south }} + }, + { + production_type = "input", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, 2}, direction = defines.direction.south }} + }, + { + production_type = "output", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {2, -2}, direction = defines.direction.north }} + }, + { + production_type = "output", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {0, -2}, direction = defines.direction.north }} + }, + { + production_type = "output", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-2, -2}, direction = defines.direction.north }} + } + } + }, + + { + type = "assembling-machine", + name = "nullius-mirror-distillery-3", + order = "z-nullius-cdc", + icons = { + data.raw.item["nullius-distillery-3"].icons[1], + { icon = ICONPATH .. "flip1.png", icon_size = 64 } + }, + localised_description = {"entity-description.nullius-distillery"}, + flags = {"placeable-neutral", "player-creation"}, + minable = {mining_time = 2.4, result = "nullius-distillery-3"}, + hidden = true, + placeable_by = {item = "nullius-distillery-3", count = 1}, + max_health = 600, + dying_explosion = "medium-explosion", + corpse = "oil-refinery-remnants", + collision_box = {{-2.3, -2.3}, {2.3, 2.3}}, + selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, + + crafting_categories = {"distillation"}, + crafting_speed = 4, + energy_source = { + type = "electric", + usage_priority = "secondary-input", + emissions_per_minute = {pollution = 24}, + drain = "100kW" + }, + energy_usage = "1100kW", + + resistances = data.raw["assembling-machine"]["nullius-distillery-1"].resistances, + working_sound = data.raw["assembling-machine"]["oil-refinery"].working_sound, + impact_category = "metal", + module_slots = 3, + allowed_effects = {"speed", "productivity", "consumption", "pollution"}, + fast_replaceable_group = "distillery", + graphics_set = { + animation = data.raw["assembling-machine"]["oil-refinery"].graphics_set.animation, + working_visualisations = data.raw["assembling-machine"]["nullius-distillery-1"].graphics_set.working_visualisations, + }, + + fluid_boxes = { + { + production_type = "input", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1, 2}, direction = defines.direction.south }} + }, + { + production_type = "input", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, 2}, direction = defines.direction.south }} + }, + { + production_type = "output", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {2, -2}, direction = defines.direction.north }} + }, + { + production_type = "output", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {0, -2}, direction = defines.direction.north }} + }, + { + production_type = "output", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-2, -2}, direction = defines.direction.north }} + } + } + }, + { + type = "assembling-machine", + name = "nullius-mirror-surge-electrolyzer-2", + localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-surge-electrolyzer-2"}}, + icons = { + { + icon = "__angelspetrochemgraphics__/graphics/icons/electrolyser.png", + icon_size = 32, + tint = {0.8, 0.9, 1} + }, + { + icon = ICONPATH .. "flip1.png", + icon_size = 64 + } + }, + order = data.raw.item["nullius-electrolyzer-2"].order .. "e", + localised_description = {"entity-description.nullius-surge", + {"entity-description.nullius-electrolyzer"}}, + flags = {"placeable-neutral","player-creation"}, + hidden = true, + minable = {mining_time = 1.5, result = "nullius-electrolyzer-2"}, + placeable_by = {item = "nullius-electrolyzer-2", count = 1}, + fast_replaceable_group = "electrolyzer", + next_upgrade = "nullius-mirror-surge-electrolyzer-3", + max_health = 400, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + collision_box = {{-1.8, -1.8}, {1.8, 1.8}}, + selection_box = {{-2, -2}, {2, 2}}, + crafting_categories = {"nullius-electrolysis"}, + crafting_speed = 2, + energy_source = data.raw["assembling-machine"]["nullius-surge-electrolyzer-2"].energy_source, + energy_usage = data.raw["assembling-machine"]["nullius-surge-electrolyzer-2"].energy_usage, + resistances = data.raw["assembling-machine"]["nullius-surge-electrolyzer-2"].resistances, + graphics_set = data.raw["assembling-machine"]["nullius-surge-electrolyzer-2"].graphics_set, + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].working_sound, + fluid_boxes = { + { + production_type = "input", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1.5, -1.5}, direction = defines.direction.north }} + }, + { + production_type = "output", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1.5, 1.5}, direction = defines.direction.south }} + }, + { + production_type = "output", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1.5, -1.5}, direction = defines.direction.north }} + }, + { + production_type = "output", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1.5, 1.5}, direction = defines.direction.south }} + } + } + }, +} + +local mnf1 = util.table.deepcopy( + data.raw["assembling-machine"]["nullius-nanofabricator-1"]) +mnf1.name = "nullius-mirror-nanofabricator-1" +mnf1.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } +mnf1.order = data.raw.item["nullius-nanofabricator-1"].order .. "c" +mnf1.placeable_by = {item = "nullius-nanofabricator-1", count = 1} +mnf1.next_upgrade = "nullius-mirror-nanofabricator-2" +mnf1.localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-nanofabricator-1"}} +mnf1.fluid_boxes[1].pipe_connections[1].position = {-1.5, 0.5} +mnf1.fluid_boxes[2].pipe_connections[1].position = {-0.5, -1.5} +mnf1.fluid_boxes[3].pipe_connections[1].position = {0.5, 1.5} +mnf1.fluid_boxes[4].pipe_connections[1].position = {1.5, -0.5} +mnf1.hidden = true + +local mhp1 = util.table.deepcopy( + data.raw["assembling-machine"]["nullius-hydro-plant-1"]) +mhp1.name = "nullius-mirror-hydro-plant-1" +mhp1.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } +mhp1.placeable_by = {item = "nullius-hydro-plant-1", count = 1} +mhp1.next_upgrade = "nullius-mirror-hydro-plant-2" +mhp1.localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-hydro-plant-1"}} +mhp1.fluid_boxes[1].pipe_connections[1].position = {1, -2} +mhp1.fluid_boxes[2].pipe_connections[1].position = {-1, -2} +mhp1.fluid_boxes[3].pipe_connections[1].position = {-1, 2} +mhp1.fluid_boxes[4].pipe_connections[1].position = {1, 2} +mhp1.hidden = true + +local md1 = util.table.deepcopy( + data.raw["assembling-machine"]["nullius-distillery-1"]) +md1.name = "nullius-mirror-distillery-1" +md1.order = "z-nullius-cbc" +md1.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } +md1.placeable_by = {item = "nullius-distillery-1", count = 1} +md1.next_upgrade = "nullius-mirror-distillery-2" +md1.localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-distillery-1"}} +md1.fluid_boxes[1].pipe_connections[1].position = {1, 2} +md1.fluid_boxes[2].pipe_connections[1].position = {-1, 2} +md1.fluid_boxes[3].pipe_connections[1].position = {2, -2} +md1.fluid_boxes[5].pipe_connections[1].position = {-2, -2} +md1.hidden = true + +local mse1 = util.table.deepcopy( + data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"]) +mse1.name = "nullius-mirror-surge-electrolyzer-1" +mse1.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } +mse1.order = data.raw.item["nullius-electrolyzer-1"].order .. "e" +mse1.placeable_by = {item = "nullius-electrolyzer-1", count = 1} +mse1.next_upgrade = "nullius-mirror-surge-electrolyzer-2" +mse1.localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-surge-electrolyzer-1"}} +mse1.fluid_boxes[1].pipe_connections[1].position = {1.5, -1.5} +mse1.fluid_boxes[2].pipe_connections[1].position = {1.5, 1.5} +mse1.fluid_boxes[3].pipe_connections[1].position = {-1.5, -1.5} +mse1.fluid_boxes[4].pipe_connections[1].position = {-1.5, 1.5} +mse1.hidden = true + +local mpe1 = util.table.deepcopy( + data.raw["assembling-machine"]["nullius-priority-electrolyzer-1"]) +mpe1.name = "nullius-mirror-priority-electrolyzer-1" +mpe1.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } +mpe1.order = data.raw.item["nullius-electrolyzer-1"].order .. "c" +mpe1.placeable_by = {item = "nullius-electrolyzer-1", count = 1} +mpe1.next_upgrade = "nullius-mirror-priority-electrolyzer-2" +mpe1.localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-priority-electrolyzer-1"}} +mpe1.fluid_boxes = mse1.fluid_boxes +mpe1.hidden = true + +data:extend{ + { + type = "assembling-machine", + name = "nullius-mirror-priority-electrolyzer-2", + localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-priority-electrolyzer-2"}}, + icons = { + { + icon = "__angelspetrochemgraphics__/graphics/icons/electrolyser.png", + icon_size = 32, + tint = {0.8, 0.76, 0.85} + }, + { + icon = ICONPATH .. "flip1.png", + icon_size = 64 + } + }, + order = data.raw.item["nullius-electrolyzer-2"].order .. "c", + localised_description = {"entity-description.nullius-priority", + {"entity-description.nullius-electrolyzer"}}, + flags = {"placeable-neutral","player-creation"}, + hidden = true, + minable = {mining_time = 1.5, result = "nullius-electrolyzer-2"}, + placeable_by = {item = "nullius-electrolyzer-2", count = 1}, + fast_replaceable_group = "electrolyzer", + next_upgrade = "nullius-mirror-priority-electrolyzer-3", + max_health = 400, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + collision_box = {{-1.8, -1.8}, {1.8, 1.8}}, + selection_box = {{-2, -2}, {2, 2}}, + crafting_categories = {"nullius-electrolysis"}, + crafting_speed = 1.5, + energy_source = data.raw["assembling-machine"]["nullius-priority-electrolyzer-2"].energy_source, + energy_usage = data.raw["assembling-machine"]["nullius-priority-electrolyzer-2"].energy_usage, + resistances = data.raw["assembling-machine"]["nullius-priority-electrolyzer-2"].resistances, + graphics_set = data.raw["assembling-machine"]["nullius-priority-electrolyzer-2"].graphics_set, + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].working_sound, + fluid_boxes = data.raw["assembling-machine"]["nullius-mirror-surge-electrolyzer-2"].fluid_boxes + }, + { + type = "assembling-machine", + name = "nullius-mirror-surge-electrolyzer-3", + localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-surge-electrolyzer-3"}}, + icons = { + { + icon = "__angelspetrochemgraphics__/graphics/icons/electrolyser.png", + icon_size = 32 + }, + { + icon = ICONPATH .. "flip1.png", + icon_size = 64 + } + }, + order = data.raw.item["nullius-electrolyzer-3"].order .. "e", + localised_description = {"entity-description.nullius-surge", + {"entity-description.nullius-electrolyzer"}}, + flags = {"placeable-neutral","player-creation"}, + hidden = true, + minable = {mining_time = 2, result = "nullius-electrolyzer-3"}, + placeable_by = {item = "nullius-electrolyzer-3", count = 1}, + fast_replaceable_group = "electrolyzer", + max_health = 500, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + collision_box = {{-1.8, -1.8}, {1.8, 1.8}}, + selection_box = {{-2, -2}, {2, 2}}, + crafting_categories = {"nullius-electrolysis"}, + crafting_speed = 4, + energy_usage = data.raw["assembling-machine"]["nullius-surge-electrolyzer-3"].energy_usage, + energy_source = data.raw["assembling-machine"]["nullius-surge-electrolyzer-3"].energy_source, + resistances = data.raw["assembling-machine"]["nullius-surge-electrolyzer-3"].resistances, + graphics_set = data.raw["assembling-machine"]["nullius-surge-electrolyzer-3"].graphics_set, + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].working_sound, + fluid_boxes = { + { + production_type = "input", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1.5, -1.5}, direction = defines.direction.north }} + }, + { + production_type = "output", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1.5, 1.5}, direction = defines.direction.south }} + }, + { + production_type = "output", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1.5, -1.5}, direction = defines.direction.north }} + }, + { + production_type = "output", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1.5, 1.5}, direction = defines.direction.south }} + } + } + }, +} +data:extend{ + { + type = "assembling-machine", + name = "nullius-mirror-priority-electrolyzer-3", + localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-priority-electrolyzer-3"}}, + icons = { + { + icon = "__angelspetrochemgraphics__/graphics/icons/electrolyser.png", + icon_size = 32, + tint = {1, 0.85, 0.85} + }, + { + icon = ICONPATH .. "flip1.png", + icon_size = 64 + } + }, + order = data.raw.item["nullius-electrolyzer-3"].order .. "c", + localised_description = {"entity-description.nullius-priority", + {"entity-description.nullius-electrolyzer"}}, + flags = {"placeable-neutral","player-creation"}, + hidden = true, + minable = {mining_time = 2, result = "nullius-electrolyzer-3"}, + placeable_by = {item = "nullius-electrolyzer-3", count = 1}, + fast_replaceable_group = "electrolyzer", --todo: maybe remove that + max_health = 500, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + collision_box = {{-1.8, -1.8}, {1.8, 1.8}}, + selection_box = {{-2, -2}, {2, 2}}, + crafting_categories = {"nullius-electrolysis"}, + crafting_speed = 4, + energy_source = data.raw["assembling-machine"]["nullius-priority-electrolyzer-3"].energy_source, + energy_usage = data.raw["assembling-machine"]["nullius-priority-electrolyzer-3"].energy_usage, + resistances = data.raw["assembling-machine"]["nullius-surge-electrolyzer-3"].resistances, + fluid_boxes = data.raw["assembling-machine"]["nullius-mirror-surge-electrolyzer-3"].fluid_boxes, + graphics_set = data.raw["assembling-machine"]["nullius-priority-electrolyzer-3"].graphics_set, + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].working_sound + }, + { + type = "assembling-machine", + name = "nullius-mirror-chemical-plant-2", + localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-chemical-plant-2"}}, + order = "z-nullius-bcc", + icons = { + data.raw.item["nullius-chemical-plant-2"].icons[1], + { icon = ICONPATH .. "flip1.png", icon_size = 64 } + }, + localised_description = {"entity-description.nullius-chemical-plant"}, + flags = {"placeable-neutral","placeable-player", "player-creation"}, + hidden = true, + minable = { mining_time = 1.6, result = "nullius-chemical-plant-2"}, + placeable_by = {item = "nullius-chemical-plant-2", count = 1}, + max_health = 400, + corpse = "chemical-plant-remnants", + dying_explosion = "medium-explosion", + collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, + selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, + + module_slots = 2, + allowed_effects = {"speed", "productivity", "consumption", "pollution"}, + fast_replaceable_group = "chemical-plant", + next_upgrade = "nullius-mirror-chemical-plant-3", + + graphics_set = { + animation = data.raw["assembling-machine"]["nullius-chemical-plant-2"].graphics_set.animation, + working_visualisations = data.raw["assembling-machine"]["nullius-chemical-plant-1"].graphics_set.working_visualisations, + }, + resistances = data.raw["assembling-machine"]["nullius-chemical-plant-2"].resistances, + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-chemical-plant-2"].working_sound, + crafting_speed = 2, + energy_source = data.raw["assembling-machine"]["nullius-chemical-plant-2"].energy_source, + energy_usage = "384kW", + crafting_categories = {"basic-chemistry"}, + + fluid_boxes = { + { + production_type = "input", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1, -1}, direction = defines.direction.north }} + }, + { + production_type = "input", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, -1}, direction = defines.direction.north }} + }, + { + production_type = "input", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = { + {flow_direction = "input-output", position = {-1, 0}, direction = defines.direction.west}, + {flow_direction = "input-output", position = {1, 0}, direction = defines.direction.east} + } + }, + { + production_type = "output", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1, 1}, direction = defines.direction.south }} + }, + { + production_type = "output", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1, 1}, direction = defines.direction.south }} + } + } + }, + { + type = "assembling-machine", + name = "nullius-mirror-chemical-plant-3", + localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-chemical-plant-3"}}, + order = "z-nullius-bdc", + icons = { + data.raw.item["nullius-chemical-plant-3"].icons[1], + { icon = ICONPATH .. "flip1.png", icon_size = 64 } + }, + localised_description = {"entity-description.nullius-chemical-plant"}, + flags = {"placeable-neutral","placeable-player", "player-creation"}, + minable = { mining_time = 2, result = "nullius-chemical-plant-3"}, + hidden = true, + placeable_by = {item = "nullius-chemical-plant-3", count = 1}, + max_health = 500, + corpse = "chemical-plant-remnants", + dying_explosion = "medium-explosion", + collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, + selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, + + module_slots = 3, + allowed_effects = {"speed", "productivity", "consumption", "pollution"}, + fast_replaceable_group = "chemical-plant", + graphics_set = { + animation = data.raw["assembling-machine"]["nullius-chemical-plant-3"].graphics_set.animation, + working_visualisations = data.raw["assembling-machine"]["nullius-chemical-plant-1"].graphics_set.working_visualisations, + }, + resistances = data.raw["assembling-machine"]["nullius-chemical-plant-3"].resistances, + energy_source = data.raw["assembling-machine"]["nullius-chemical-plant-3"].energy_source, + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["chemical-plant"].working_sound, + crafting_speed = 4, + energy_usage = "760kW", + crafting_categories = {"basic-chemistry"}, + fluid_boxes = { + { + production_type = "input", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1, -1}, direction = defines.direction.north }} + }, + { + production_type = "input", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, -1}, direction = defines.direction.north }} + }, + { + production_type = "input", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = { + {flow_direction = "input-output", position = {-1, 0}, direction = defines.direction.west}, + {flow_direction = "input-output", position = {1, 0}, direction = defines.direction.east} + } + }, + { + production_type = "output", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1, 1}, direction = defines.direction.south }} + }, + { + production_type = "output", + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1, 1}, direction = defines.direction.south }} + } + } + } +} + +local mcp1 = util.table.deepcopy( + data.raw["assembling-machine"]["nullius-chemical-plant-1"]) +mcp1.name = "nullius-mirror-chemical-plant-1" +mcp1.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } +mcp1.order = "z-nullius-bbc" +mcp1.placeable_by = {item = "nullius-chemical-plant-1", count = 1} +mcp1.next_upgrade = "nullius-mirror-chemical-plant-2" +mcp1.localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-chemical-plant-1"}} +mcp1.fluid_boxes[1].pipe_connections[1].position = {1, -1} +mcp1.fluid_boxes[2].pipe_connections[1].position = {-1, -1} +mcp1.fluid_boxes[4].pipe_connections[1].position = {1, 1} +mcp1.fluid_boxes[5].pipe_connections[1].position = {-1, 1} +mcp1.hidden = true + +local mcc1 = util.table.deepcopy( + data.raw["assembling-machine"]["nullius-combustion-chamber-1"]) +mcc1.name = "nullius-mirror-combustion-chamber-1" +mcc1.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } +mcc1.placeable_by = {item = "nullius-combustion-chamber-1", count = 1} +mcc1.next_upgrade = "nullius-mirror-combustion-chamber-2" +mcc1.localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-combustion-chamber-1"}} +mcc1.fluid_boxes[1].pipe_connections[1].position = {1, 0.5} +mcc1.fluid_boxes[2].pipe_connections[1].position = {-1, 0.5} +mcc1.hidden = true + +data:extend{ + { + type = "assembling-machine", + name = "nullius-mirror-combustion-chamber-2", + icons = { + data.raw.item["nullius-combustion-chamber-2"].icons[1], + { icon = ICONPATH .. "flip1.png", icon_size = 64 } + }, + localised_description = {"entity-description.nullius-combustion-chamber"}, + flags = {"placeable-neutral", "player-creation"}, + minable = {mining_time = 0.9, result = "nullius-combustion-chamber-2"}, + hidden = true, + placeable_by = {item = "nullius-combustion-chamber-2", count = 1}, + crafting_categories = { "combustion" }, + crafting_speed = 2.5, + effect_receiver = { + base_effect = {productivity = 0.02} + }, + max_health = 300, + corpse = "boiler-remnants", + impact_category = "metal", + resistances = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].resistances, + fast_replaceable_group = "combustion-chamber", + next_upgrade = "nullius-mirror-combustion-chamber-3", + collision_box = {{-1.29, -0.79}, {1.29, 0.79}}, + selection_box = {{-1.5, -1}, {1.5, 1}}, + energy_usage = "1kW", + energy_source = { type = "void" }, + working_sound = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].working_sound, + graphics_set = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].graphics_set, + + fluid_boxes = { + { + volume = 500, + pipe_covers = pipecoverspictures(), + pipe_connections = {{flow_direction = "input", position = {1, 0.5}, direction = defines.direction.east }}, + production_type = "input" + }, + { + volume = 500, + pipe_covers = pipecoverspictures(), + pipe_connections = {{flow_direction = "input", position = {-1, 0.5}, direction = defines.direction.west }}, + production_type = "input" + }, + { + volume = 500, + pipe_covers = pipecoverspictures(), + pipe_connections = {{flow_direction = "output", position = {0, -0.5}, direction = defines.direction.north }}, + production_type = "output" + }, + { + volume = 500, + pipe_covers = pipecoverspictures(), + pipe_connections = {{flow_direction = "output", position = {0, 0.5}, direction = defines.direction.south }}, + production_type = "output" + } + } + }, +} + +data:extend{ + { + type = "assembling-machine", + name = "nullius-mirror-combustion-chamber-3", + icons = { + data.raw.item["nullius-combustion-chamber-3"].icons[1], + { icon = ICONPATH .. "flip1.png", icon_size = 64 } + }, + localised_description = {"entity-description.nullius-combustion-chamber"}, + flags = {"placeable-neutral", "player-creation"}, + minable = {mining_time = 1.2, result = "nullius-combustion-chamber-3"}, + hidden = true, + placeable_by = {item = "nullius-combustion-chamber-3", count = 1}, + crafting_categories = { "combustion" }, + crafting_speed = 6, + effect_receiver = { + base_effect = {productivity = 0.04} + }, + max_health = 400, + corpse = "boiler-remnants", + impact_category = "metal", + resistances = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].resistances, + fast_replaceable_group = "combustion-chamber", + collision_box = {{-1.29, -0.79}, {1.29, 0.79}}, + selection_box = {{-1.5, -1}, {1.5, 1}}, + fluid_boxes = data.raw["assembling-machine"]["nullius-mirror-combustion-chamber-2"].fluid_boxes, + energy_usage = "1kW", + energy_source = { type = "void" }, + working_sound = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].working_sound, + graphics_set = data.raw["assembling-machine"]["nullius-combustion-chamber-3"].graphics_set + }, +} + +local ex1m = table.deepcopy(data.raw["assembling-machine"]["nullius-heat-exchanger-1"]) +ex1m.name = "nullius-mirror-heat-exchanger-1" +ex1m.localised_name = {"entity-name.nullius-mirrored", + {"", {"entity-name.heat-exchanger"}, " ", tostring(1)}} +ex1m.fluid_boxes[1].pipe_connections[1].position = {1, 0.5} +ex1m.fluid_boxes[3].pipe_connections[1].position = {-1, 0.5} +ex1m.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } +ex1m.placeable_by = {item = "nullius-heat-exchanger-1", count = 1} +ex1m.next_upgrade = "nullius-mirror-heat-exchanger-2" +ex1m.hidden = true + +local ex2m = table.deepcopy(data.raw["assembling-machine"]["nullius-heat-exchanger-1"]) +ex2m.name = "nullius-mirror-heat-exchanger-2" +ex2m.localised_name = {"entity-name.nullius-mirrored", + {"", {"entity-name.heat-exchanger"}, " ", tostring(2)}} +ex2m.icons[2] = ex1m.icons[2] +ex2m.placeable_by = {item = "nullius-heat-exchanger-2", count = 1} +ex2m.next_upgrade = "nullius-mirror-heat-exchanger-3" +ex2m.fluid_boxes[1].pipe_connections[1].position = {1, 0.5} +ex2m.fluid_boxes[3].pipe_connections[1].position = {-1, 0.5} +ex2m.hidden = true + +local ex3m = util.table.deepcopy(data.raw["assembling-machine"]["nullius-heat-exchanger-1"]) +ex3m.name = "nullius-mirror-heat-exchanger-3" +ex3m.localised_name = {"entity-name.nullius-mirrored", + {"", {"entity-name.heat-exchanger"}, " ", tostring(3)}} +ex3m.icons[2] = ex1m.icons[2] +ex3m.placeable_by = {item = "nullius-heat-exchanger-3", count = 1} +ex3m.next_upgrade = nil +ex3m.fluid_boxes[1].pipe_connections[1].position = {1, 0.5} +ex3m.fluid_boxes[3].pipe_connections[1].position = {-1, 0.5} +ex3m.hidden = true + +local boilm = util.table.deepcopy(data.raw["assembling-machine"]["nullius-boiler-1"]) +boilm.name = "nullius-mirror-boiler-1" +boilm.localised_name = {"entity-name.nullius-mirrored", {"", {"entity-name.boiler"}, " ", tostring(1)}} +boilm.fluid_boxes[1].pipe_connections[1].position = {1, 0.5} +boilm.fluid_boxes[3].pipe_connections[1].position = {-1, 0.5} +boilm.icons[2] = ex1m.icons[2] +boilm.placeable_by = {item = "nullius-boiler-1", count = 1} +boilm.next_upgrade = "nullius-mirror-boiler-2" +boilm.hidden = true + +local boil2m = util.table.deepcopy(data.raw["assembling-machine"]["nullius-boiler-2"]) +boil2m.name = "nullius-mirror-boiler-2" +boil2m.localised_name = {"entity-name.nullius-mirrored", {"", {"entity-name.boiler"}, " ", tostring(2)}} +boil2m.fluid_boxes[1].pipe_connections[1].position = {1, 0.5} +boil2m.fluid_boxes[3].pipe_connections[1].position = {-1, 0.5} +boil2m.icons[2] = boilm.icons[2] +boil2m.placeable_by = {item = "nullius-boiler-2", count = 1} +boil2m.next_upgrade = nil +boil2m.hidden = true + +local mfc1 = util.table.deepcopy( + data.raw["assembling-machine"]["nullius-flotation-cell-1"]) +mfc1.name = "nullius-mirror-flotation-cell-1" +mfc1.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } +mfc1.placeable_by = {item = "nullius-flotation-cell-1", count = 1} +mfc1.next_upgrade = "nullius-mirror-flotation-cell-2" +mfc1.localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-flotation-cell-1"}} +mfc1.fluid_boxes[1].pipe_connections[1].position = {-1.5, 0.5} +mfc1.fluid_boxes[2].pipe_connections[1].position = {0.5, 1.5} +mfc1.fluid_boxes[3].pipe_connections[1].position = {1.5, -0.5} +mfc1.fluid_boxes[4].pipe_connections[1].position = {-0.5, -1.5} +mfc1.hidden = true + +data:extend({ + { + type = "assembling-machine", + name = "nullius-mirror-flotation-cell-2", + localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-flotation-cell-2"}}, + icons = { + data.raw.item["nullius-flotation-cell-2"].icons[1], + { icon = ICONPATH .. "flip1.png", icon_size = 64 } + }, + localised_description = {"entity-description.nullius-flotation-cell"}, + flags = {"placeable-neutral","player-creation"}, + minable = {mining_time = 1.5, result = "nullius-flotation-cell-2"}, + placeable_by = {item = "nullius-flotation-cell-2", count = 1}, + hidden = true, + fast_replaceable_group = "flotation-cell", + next_upgrade = "nullius-mirror-flotation-cell-3", + max_health = 400, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + collision_box = {{-1.75, -1.75}, {1.75, 1.75}}, + selection_box = {{-2, -2}, {2, 2}}, + crafting_categories = {"ore-flotation"}, + crafting_speed = 2, + energy_source = data.raw["assembling-machine"]["nullius-flotation-cell-2"].energy_source, + energy_usage = "385kW", + resistances = data.raw["assembling-machine"]["nullius-flotation-cell-2"].resistances, + module_slots = 2, + allowed_effects = {"speed", "productivity", "consumption", "pollution"}, + graphics_set = { + animation = data.raw["assembling-machine"]["nullius-flotation-cell-2"].graphics_set.animation, + working_visualisations = data.raw["assembling-machine"]["nullius-flotation-cell-2"].graphics_set.working_visualisations, + }, + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-flotation-cell-1"].working_sound, + + fluid_boxes = { + { + production_type = "input", + pipe_picture = floatpipepics, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1.5, 0.5}, direction = defines.direction.west }} + }, + { + production_type = "input", + pipe_picture = floatpipepics, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {0.5, 1.5}, direction = defines.direction.south }} + }, + { + production_type = "output", + pipe_picture = floatpipepics, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1.5, -0.5}, direction = defines.direction.east }} + }, + { + production_type = "output", + pipe_picture = floatpipepics, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-0.5, -1.5}, direction = defines.direction.north }} + } + } + }, + + { + type = "assembling-machine", + name = "nullius-mirror-flotation-cell-3", + localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-flotation-cell-3"}}, + icons = { + data.raw.item["nullius-flotation-cell-3"].icons[1], + { icon = ICONPATH .. "flip1.png", icon_size = 64 } + }, + localised_description = {"entity-description.nullius-flotation-cell"}, + flags = {"placeable-neutral","player-creation"}, + minable = {mining_time = 2, result = "nullius-flotation-cell-3"}, + hidden = true, + placeable_by = {item = "nullius-flotation-cell-3", count = 1}, + fast_replaceable_group = "flotation-cell", + max_health = 500, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + collision_box = {{-1.75, -1.75}, {1.75, 1.75}}, + selection_box = {{-2, -2}, {2, 2}}, + crafting_categories = {"ore-flotation"}, + crafting_speed = 4, + energy_usage = "770kW", + module_slots = 3, + allowed_effects = {"speed", "productivity", "consumption", "pollution"}, + graphics_set = data.raw["assembling-machine"]["nullius-flotation-cell-3"].graphics_set, + energy_source = data.raw["assembling-machine"]["nullius-flotation-cell-3"].energy_source, + resistances = data.raw["assembling-machine"]["nullius-flotation-cell-3"].resistances, + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-flotation-cell-1"].working_sound, + + fluid_boxes = { + { + production_type = "input", + pipe_picture = floatpipepics, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1.5, 0.5}, direction = defines.direction.west }} + }, + { + production_type = "input", + pipe_picture = floatpipepics, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {0.5, 1.5}, direction = defines.direction.south }} + }, + { + production_type = "output", + pipe_picture = floatpipepics, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1.5, -0.5}, direction = defines.direction.east }} + }, + { + production_type = "output", + pipe_picture = floatpipepics, + pipe_covers = pipecoverspictures(), + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-0.5, -1.5}, direction = defines.direction.north }} + } + } + } +}) + +local nmc1 = util.table.deepcopy(data.raw.furnace["nullius-chimney-1"]) +nmc1.name = "nullius-mirror-chimney-1" +table.insert(nmc1.icons,{ icon = "__nullius__/graphics/icons/flip1.png", icon_size = 64 }) +nmc1.placeable_by = {item = "nullius-chimney-1", count = 1} +nmc1.next_upgrade = "nullius-mirror-chimney-2" +nmc1.localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-chimney-1"}} +nmc1.fluid_boxes[1].pipe_connections[1].position = {-0.5, 0.5} +nmc1.graphics_set.animation.north = util.table.deepcopy(nmc1.graphics_set.animation.south) +nmc1.graphics_set.animation.north.layers[1].shift = {-0.06, -1.57} +nmc1.graphics_set.animation.north.layers[2].shift = {1.56, 0.42} +nmc1.graphics_set.animation.east = util.table.deepcopy(nmc1.graphics_set.animation.south) +nmc1.graphics_set.animation.east.layers[1].shift = {-0.2, -1.88} +nmc1.graphics_set.animation.east.layers[2].shift = {1.42, 0.11} +nmc1.graphics_set.animation.west = util.table.deepcopy(nmc1.graphics_set.animation.south) +nmc1.graphics_set.animation.west.layers[1].shift = {0.2, -1.63} +nmc1.graphics_set.animation.west.layers[2].shift = {1.82, 0.36} +nmc1.graphics_set.animation.south.layers[1].shift = {0.09, -1.98} +nmc1.graphics_set.animation.south.layers[2].shift = {1.71, 0.01} +nmc1.graphics_set.working_visualisations[1].north_position = {-0.1, -5.54} +nmc1.graphics_set.working_visualisations[1].east_position = {-0.24, -5.85} +nmc1.graphics_set.working_visualisations[1].south_position = {0.05, -5.95} +nmc1.graphics_set.working_visualisations[1].west_position = {0.16, -5.6} +nmc1.hidden = true + +local nmc2 = util.table.deepcopy(data.raw.furnace["nullius-chimney-2"]) +nmc2.name = "nullius-mirror-chimney-2" +nmc2.icons[2] = nmc1.icons[3] +nmc2.placeable_by = {item = "nullius-chimney-2", count = 1} +nmc2.localised_name = {"entity-name.nullius-mirrored", + {"entity-name.nullius-chimney-2"}} +nmc2.fluid_boxes[1].pipe_connections[1].position = {-0.5, 0.5} +nmc2.graphics_set.animation = nmc2.graphics_set.animation.south +nmc2.graphics_set.working_visualisations[1].north_position = nmc2.graphics_set.working_visualisations[1].south_position +nmc2.graphics_set.working_visualisations[1].east_position = nmc2.graphics_set.working_visualisations[1].south_position +nmc2.graphics_set.working_visualisations[1].west_position = nmc2.graphics_set.working_visualisations[1].south_position +nmc2.hidden = true + +data:extend{mnf1,mhp1,md1,mse1,mpe1,mcp1,mcc1,ex1m,ex2m,ex3m,boilm,boil2m,mfc1,nmc1,nmc2} \ No newline at end of file diff --git a/nullius/legacyValves.lua b/nullius/legacyValves.lua new file mode 100644 index 0000000..88425f1 --- /dev/null +++ b/nullius/legacyValves.lua @@ -0,0 +1,59 @@ + +------- About Valve's migrations : +-- In 1.1 Valves where implemented as storage tanks, in 2.0 a Valve prototype exists in the game engine +-- Simply replacing the old storage tank prototype with the valve prototype (keeping the same name) doesn't work: +-- The old storage tank's orientation is not kept when transforming the entities to valves : the south converts to north and the west converts to east (and just those two) (it feels like a bug from the game engine in my opinion) +-- Since I want to keep the nullius valves names for the actual valves, I decided to create those dummy storage tanks with name "legacy", and I added the json migrations to turn 1.1 valve storage tanks into 2.0 storage tanks (that way they keep the orientation) +-- Then we have a migration script (migrations/nullius_2.0.0.lua) that finds all "legacy" storage tanks, saves their orientation, destroy them and spawn actual valves in their place, with the correct orientation +-- This is the way to keep valves correctly oriented when migrating +-- Except that there is another way which is probably also a bug (an incomprehensible one) : +-- We can just not do any of that: no migration json, no migration script, no dummy storage tanks +-- Instead, if we declare one dummy storage tank (all optional fields empty) and with any dummy name (not even "valve" in it) +-- And one "item-with-tags" that has a place_result set to that dummy tank, and its group set to logistics (any other group will not work ???) +-- Then the valves orientation will be kept by the game engine when turning storage tanks into valves +-- Example: +-- data:extend{{ +-- type = "storage-tank", +-- name = "anythingReally", +-- icon = "__base__/graphics/icons/car.png", +-- window_bounding_box = {{0, 0}, {0, 0}}, +-- fluid_box = { +-- volume = 1, +-- pipe_covers = pipecoverspictures(), +-- pipe_connections = {}, +-- }, +-- flow_length_in_ticks = 1, +-- hidden_in_factoriopedia = true +-- }, +-- { +-- type = "item-with-tags", +-- name = "testThing", +-- icon = "__base__/graphics/icons/car.png", +-- subgroup = "splitter", -- splitter is into the logistics group, it would not work if we tried an other group +-- place_result = "anythingReally", +-- stack_size = 1, +-- hidden_in_factoriopedia = true, +-- }} + +local legacyValves = { + "nullius-legacy-priority-valve", + "nullius-legacy-one-way-valve", + "nullius-legacy-top-up-valve", + "nullius-legacy-relief-valve" +} +for _, name in pairs(legacyValves) do + data:extend{{ + type = "storage-tank", -- dummy entity + name = name, + icon = "__base__/graphics/icons/car.png", + window_bounding_box = {{0, 0}, {0, 0}}, + fluid_box = { + volume = 1, + pipe_covers = pipecoverspictures(), + pipe_connections = {}, + }, + flow_length_in_ticks = 1, + hidden_in_factoriopedia = true + }, + } +end \ No newline at end of file diff --git a/nullius/locale/en/entity.cfg b/nullius/locale/en/entity.cfg index 69eca65..e191879 100644 --- a/nullius/locale/en/entity.cfg +++ b/nullius/locale/en/entity.cfg @@ -12,6 +12,7 @@ nullius-small=Small __1__ nullius-sandstone=Sandstone nullius-limestone=Calcite nullius-bauxite=Bauxite +nullius-crystal-rock=Crystal rock nullius-fumarole=Fumarole nullius-air-filter-1=Air filter 1 nullius-air-filter-2=Air filter 2 @@ -238,6 +239,7 @@ nullius-substation-3=Substation 3 nullius-logic-circuit=Logic circuit nullius-arithmetic-circuit=Arithmetic circuit nullius-memory-circuit=Memory circuit +nullius-selector-circuit=Selector circuit nullius-antenna=Antenna nullius-extractor-1=Extractor 1 nullius-extractor-2=Extractor 2 @@ -337,6 +339,7 @@ nullius-offshore-electric=__ENTITY__oil_rig__ electric generator nullius-offshore-radar=__ENTITY__oil_rig__ radar nullius-align-conscription-turret=Conscription turret nullius-align-concordance-transmitter=Concordance transmitter +nullius-rail-pylon=Rail pylon [entity-description] nullius-kilojoule=__1__ kJ @@ -351,10 +354,10 @@ nullius-well-1=Pumps groundwater from below surface (Up to 100/s). nullius-well-2=Pumps groundwater from below surface (Up to 400/s). nullius-seawater-intake-1=Placed off coast to produce seawater (Up to 125/s). nullius-seawater-intake-2=Placed off coast to produce seawater (Up to 500/s). -nullius-chimney-1=Vents excess gas to atmosphere (Up to 100/s). Compressed gases released at half speed. Requires input of at least 10% pressure. +nullius-chimney-1=Vents excess gas to atmosphere (Up to 100/s). Compressed gases released at half speed. nullius-chimney-2=Vents excess gas to atmosphere (Up to 500/s). Compressed gases released at half speed. nullius-chimney-3=Vents excess gas to atmosphere (Up to 2000/s). Compressed gases released at half speed. -nullius-outfall-1=Dumps excess liquid into sea (Up to 100/s). Requires input of at least 10% pressure. +nullius-outfall-1=Dumps excess liquid into sea (Up to 100/s). nullius-outfall-2=Dumps excess liquid into sea (Up to 400/s). nullius-outfall-3=Dumps excess liquid into sea (Up to 1000/s). nullius-hydro-plant=Filters impurities and treats water. @@ -391,27 +394,27 @@ nullius-turbine-exhaust=Primary energy provider like wind turbines. Operates wh nullius-combustion-chamber=Burns stored chemical fuels to produce steam. nullius-boiler=Uses electricity to turn water into steam. nullius-chemical-plant=Catalyzes a broad range of chemical reactions. -nullius-one-way-valve=Allows flow in a single direction only. May be useful to control backflow and sloshing in higher throughput pipes. -nullius-relief-valve=Allows flow from a source with over 75% pressure. Useful attached to a pump-filled tank to spill excess quantities of a byproduct for venting to avoid blocking production. -nullius-top-up-valve=Allows flow into a destination with under 50% pressure. Useful when you have two sources of the same fluid, as both a byproduct and a main product. Use this valve to fill a tank from the main product pipeline, and not the byproduct pipeline, thus prioritizing use of the byproduct when sufficient, but providing it by other means if not. -nullius-priority-valve=Allows flow from a source with over 25% pressure. Useful when supplying a single fluid to multiple destinations of varying importance. Use this valve to supply a pipeline of secondary importance, so that it will be supplied only if the tank has adequate supply to satisfy the primary usage. -nullius-pipe=Transfers fluid at up to __1__% pressure.\nThroughput of up to __2__ fluid per second across 10 pipe segments between pumps, or __3__/s across 50. -nullius-underground-pipe=Transfers fluid at up to __1__% pressure. -nullius-small-tank-1=Stores fluid at up to 90% pressure.\nMay require a pump to fill completely. -nullius-small-tank-2=Stores fluid at up to 100% pressure.\nMay require a pump to fill completely. -nullius-medium-tank-1=Stores fluid at up to 85% pressure.\nMay require a pump to fill completely. -nullius-medium-tank-2=Stores fluid at up to 90% pressure.\nMay require a pump to fill completely. -nullius-medium-tank-3=Stores fluid at up to 100% pressure.\nMay require a pump to fill completely. -nullius-large-tank-1=Stores fluid at up to 100% pressure.\nMay require a pump to fill completely. -nullius-large-tank-2=Stores fluid at up to 110% pressure.\nRequires a pump to fill to maximum capacity. -nullius-large-tank-3=Stores fluid at up to 125% pressure.\nRequires a pump to fill to maximum capacity. +nullius-one-way-valve=Allows flow in a single direction only. Useful to prevent backflow. +nullius-relief-valve=Allows flow from a source with over 75% volume. Useful to spill excess quantities of a byproduct for venting to avoid blocking production. +nullius-top-up-valve=Allows flow into a destination with under 50% volume. Useful when you have two sources of the same fluid, as both a byproduct and a main product. Use this valve to fill a tank from the main product pipeline, and not the byproduct pipeline, thus prioritizing use of the byproduct when sufficient, but providing it by other means if not. +nullius-priority-valve=Allows flow from a source with over 25% volume. Useful when supplying a single fluid to multiple destinations of varying importance. Use this valve to supply a pipeline of secondary importance, so that it will be supplied only if the tank has adequate supply to satisfy the primary usage. +nullius-pipe=Transfers fluids +nullius-underground-pipe=Transfers fluids. +nullius-small-tank-1=Stores fluid. Not much. +nullius-small-tank-2=Stores fluid. Not much. +nullius-medium-tank-1=Stores fluid. +nullius-medium-tank-2=Stores fluid. +nullius-medium-tank-3=Stores fluid. +nullius-large-tank-1=Stores fluid. A lot. +nullius-large-tank-2=Stores fluid. A lot. +nullius-large-tank-3=Stores fluid. A lot. nullius-barrel-pump-1=Fills or empties barrels with fluid. nullius-barrel-pump-2=Fills or empties barrels with fluid. -nullius-pump-1=Necessary to maintain acceptable flow rate over longer pipeline distances. Required to fill tanks to their maximum capacity from pipes with lower maximum pressure. -nullius-pump-2=Necessary to maintain acceptable flow rate over longer pipeline distances. Required to fill tanks to their maximum capacity from pipes with lower maximum pressure. -nullius-pump-3=Necessary to maintain acceptable flow rate over longer pipeline distances. Required to fill tanks to their maximum capacity from pipes with lower maximum pressure. -nullius-small-pump-1=Half the size of a regular pump, but slower. -nullius-small-pump-2=Half the size of a regular pump, but slower. +nullius-pump-1=Necessary to extend pipelines to longer distances. Pumps up to 3000/s +nullius-pump-2=Necessary to extend pipelines to longer distances. Pumps up to 6000/s +nullius-pump-3=Necessary to extend pipelines to longer distances. Pumps up to 12000/s +nullius-small-pump-1=Half the size of a regular pump, but slower. Pumps up to 2400/s +nullius-small-pump-2=Half the size of a regular pump, but slower. Pumps up to 4800/s nullius-wind-base-1=Intermittent renewable energy averaging 600kW, up to a max of 1.5MW. nullius-wind-base-2=Intermittent renewable energy averaging 1.6MW, up to a max of 4MW. nullius-wind-base-3=Intermittent renewable energy averaging 4.8MW, up to a max of 12MW. @@ -491,8 +494,8 @@ nullius-reactor=Converts nuclear fuel into heat energy.\nHeat capacity: 10MJ per nullius-silo=Launches rockets into space. nullius-turret=Trains mobile organic lifeforms to remain in their designated habitat. nullius-minable=[font=default-semibold][color=1,0.9,0.75]Minable for:[/color][/font] __1__ -nullius-landing-pod-1=[font=default-semibold][color=1,0.9,0.75]Minable for:[/color][/font] [item=nullius-large-chest-1] -nullius-landing-pod-2=[font=default-semibold][color=1,0.9,0.75]Minable for:[/color][/font] [item=nullius-large-chest-1] +nullius-landing-pod-1=[font=default-semibold][color=1,0.9,0.75]Minable for:[/color][/font] 1x[item=nullius-large-chest-1] +nullius-landing-pod-2=[font=default-semibold][color=1,0.9,0.75]Minable for:[/color][/font] 1x[item=nullius-large-chest-1] nullius-landing-main=[font=default-semibold][color=1,0.9,0.75]Minable for:[/color][/font] 2x[item=nullius-large-chest-1] 40x[item=nullius-steel-ingot] 15x[item=copper-cable] nullius-android=__CONTROL__nullius-upload-mind__ to take control of this body.\n__CONTROL__nullius-previous-body__ to return to previous body.\n__CONTROL__nullius-next-body__ to cycle to next body in queue. nullius-boxer=Compact unit that quickly boxes or unboxes. @@ -506,6 +509,7 @@ or_pole=Offshore extractor power nullius-loader=Moves items to or from a container or machine at the rate of a matching belt. nullius-align-conscription-turret=Defensive installation that fires conscription rays at rival factions automatically. nullius-align-concordance-transmitter=Newly arriving androids will start in a faction with an active transmitter instead of starting their own. Protects all players and buildings from conscription while active. Gradually reveals distant sectors. +inserterToggleInfo=Use Shift+L to toggle between long and normal inserter (available when the extension research is unlocked) [equipment-name] nullius-solar-panel-1=Solar panel 1 @@ -531,7 +535,8 @@ nullius-capacitor=Capacitor nullius-night-vision-1=Night vision 1 nullius-night-vision-2=Night vision 2 nullius-night-vision-3=Night vision 3 -nullius-levitation-field=Levitation field +nullius-levitation-field-1=Levitation field 1 +nullius-levitation-field-2=Levitation field 2 nullius-shield=Shield nullius-leg-augmentation-1=Leg augmentation 1 nullius-leg-augmentation-2=Leg augmentation 2 diff --git a/nullius/locale/en/informatron.cfg b/nullius/locale/en/informatron.cfg index b5d1360..1aa1eb7 100644 --- a/nullius/locale/en/informatron.cfg +++ b/nullius/locale/en/informatron.cfg @@ -46,11 +46,8 @@ menu_fluids=Fluids title_fluids=Fluids page_fluids_text_1=Chemistry and fluid handling are critical parts of the Nullius crafting system, so it's important to understand how to manage fluids. There are certain areas where Nullius diverges from vanilla fluid handling to be aware of. -page_fluids_header_1=Pressure -page_fluids_text_2=Nullius has the concept of a "pressure" rating for pipes and tanks. This is an abstraction that uses features of the Factorio game engine's fluid simulation to create pipes with varying throughput. A major effect of the greater "pressure" rating is that Pipe 4 transfers significantly more fluid per second than pipe 1. A vanilla pipe would fall somewhere between a Nullius pipe 1 and 2 in throughput. This effect is complicated to achieve in Factorio and has a few side effects. -page_fluids_text_3=The pressure rating of each pipe and tank is listed in the tooltip. When pipe 1 is completely full, it achieves its maximum pressure of 40%. When pipe 2 is full it's at 60%, pipe 3 is 80%, and when pipe 4 is full it's 100%. Tanks can handle a little more pressure than pipes. 100% of what? An arbitrary amount that the best pipes can handle. This system is just an abstraction that isn't meant to refer to a fixed amount of real world pressure. -page_fluids_text_4=Since pipe 1 and 2 never achieve 75% pressure, even when full, they are not compatible with the relief valve which has a threshold of 75%. Tank 1 does go over 75%, so it can be used with a relief valve. The trick is that if you hook up a tank 1 directly with a pipe 1 it will only get approximately half full due to the pressure difference. This can be solved with pumps, which will fill a tank completely regardless of the pressure of the source. This is the reason that relief valves become available with the same technology as pumps, since they are unusable in the early game without pumps. - +page_fluids_header_1=Pressure (outdated mechanic) +page_fluids_text_2=Nullius had the concept of a "pressure" rating for pipes and tanks. It was removed by the engine in 2.0, now the new fluid system simplifies tremendously all matters of fluid manipulation. Use pumps, tanks and valves to master fluids ! page_fluids_header_2=Waste Byproducts page_fluids_text_5=Many chemical processes in Nullius produce 2 or more products. Any time that happens, it is likely to create a waste byproduct, since you are unlikely to use all of the products in exactly the ratio they are produced. Disposing of unwanted waste fluids is essential to sustainable automation. page_fluids_text_6=Hover over the fluid icon to read the tooltip. Fluids may be gases or liquids. Most gases can be vented in a chimney and most liquids can be vented in an outfall. However, some are marked as non-disposable, and cannot just be vented. All byproducts can be destroyed in some way, but there may be more steps required. Hydrochloric acid, for instance, must be neutralized by caustic solution first. Benzene must be combusted into disposable gases. Some solids, such as sodium hydroxide or gravel may be processed into fluid for the sake of disposal. Most key waste disposal technologies are available by the end of the mechanical engineering technologies. In the early game prior to that point you may need to build some chests or manually clear tanks. diff --git a/nullius/locale/en/item.cfg b/nullius/locale/en/item.cfg index 86305e4..f797e53 100644 --- a/nullius/locale/en/item.cfg +++ b/nullius/locale/en/item.cfg @@ -334,6 +334,9 @@ nullius-align-transponder=Transponder nullius-align-conscription-charge=Conscription charge nullius-align-conscription-ray=Conscription ray nullius-align-concordance-satellite=Concordance satellite +nullius-red-wire=Red wire +nullius-green-wire=Green wire +nullius-landing-pad=Landing pad [item-description] nullius-geology-pack=Mineral sample studied in lab to adapt technology to local minerals. @@ -550,13 +553,10 @@ nullius-underground-straight-junction=Extend an underground pipeline nullius-underground-elbow-junction=Connect two perpendicular underground pipes nullius-underground-three-way-junction=Connect three underground pipes nullius-underground-four-way-junction=Connect four underground pipes -nullius-pressure-2= at up to 60% pressure. -nullius-pressure-3= at up to 80% pressure. -nullius-pressure-4= at up to 100% pressure. nullius-underground-ctrl-r=\nPress CTRL+R to rotate underground pipes. nullius-underground-pump=Pump directly between underground pipes. -nullius-adjustable-top-up-valve=Allows flow into a destination with pressure below configurable threshold.\nPress +/- to adjust threshold by 10% increments. -nullius-adjustable-relief-valve=Allows flow from a source with pressure above configurable threshold.\nPress +/- to adjust threshold by 10% increments. +nullius-adjustable-top-up-valve=Allows flow into a destination with volume below configurable threshold.\nPress +/- to adjust threshold by 10% increments. +nullius-adjustable-relief-valve=Allows flow from a source with volume above configurable threshold.\nPress +/- to adjust threshold by 10% increments. nullius-companion-fuel=Companion drone fuel pod. nullius-land-fill-gravel=Can be placed on water to create terrain you can build on. Result in a grey mix of dirt and sand terrain, with a dirt coast. nullius-land-fill-sand=Can be placed on water to create terrain you can build on. Results entirely in tannish sand terrain. diff --git a/nullius/locale/en/misc.cfg b/nullius/locale/en/misc.cfg index a4b4143..927f745 100644 --- a/nullius/locale/en/misc.cfg +++ b/nullius/locale/en/misc.cfg @@ -131,10 +131,18 @@ nullius-alignment=Multiplayer alignment nullius-wind-turbine-energy-multiplier=Wind turbine energy multiplier nullius-hydrothermal=Enable hydrothermal vents and offshore extractors. nullius-infinite-fumaroles=Infinite fumaroles +nullius-hide-void-alt=Hide venting building alt-icon +nullius-hide-recipe-signals=Hide most recipe signals +nullius-wind-turbine-volume=Wind turbine sound volume +nullius-match-wind-turbine-activity-sound=Match wind turbine sound to activity [mod-setting-description] nullius-alignment=Players start in separate factions before teaming up. nullius-infinite-fumaroles=Don't limit land deposits of volcanic gas when water desposits are available. +nullius-hide-void-alt=Hides the alt-icon for Chimney and Outfall +nullius-hide-recipe-signals=Hides all the recipe signals that are not in the signal GUI by default. +nullius-wind-turbine-volume=Adjusts the volume of wind turbine sounds. +nullius-match-wind-turbine-activity-sound=When enabled, wind turbine sound volume varies with activity level. [alignment] nullius-align-first-intro=You're a von Neumann android. Your probe has arrived at a barren planet with a mandate to terraform it, seed it with life, and build a wave of successors to continue on to new planets. You've detected signs that other probes may be approaching this planet, but you're the first to arrive. Use this head start to prepare for potentially hostile interference, until you can determine if they're operating according to compatible directives. If so, work together to achieve them faster, otherwise reprogram them to share your goals or race to outcompete them. Prepare for a rough landing as you begin to enter the atmosphere. @@ -159,3 +167,40 @@ faction-absorbed=__1__ has been absorbed into __2__. [gui-game-finished] victory=Nauvis has been successfully terraformed! + +[ammo-category-name] +nullius-conscription=Conscription + +nullius-sequestration-petroleum-drone=Petroleum sequestration drone +nullius-sequestration-coal-drone=Coal sequestration drone +nullius-husbandry-drone=Husbandry drone +nullius-aquaculture-drone=Aquaculture drone +nullius-arboriculture-drone=Arboriculture drone +nullius-entomology-drone=Entomology drone +nullius-horticulture-drone=Horticulture drone +nullius-algaculture-drone=Algaculture drone +nullius-guide-drone-uranium=Guide drone uranium +nullius-guide-drone-copper=Guide drone copper +nullius-guide-drone-limestone=Guide drone limestone +nullius-guide-drone-sandstone=Guide drone sandstone +nullius-guide-drone-bauxite=Guide drone bauxite +nullius-guide-drone-iron=Guide drone iron +nullius-paving-drone-hazard=Paving drone hazard +nullius-paving-drone-black=Paving drone black +nullius-paving-drone-brown=Paving drone brown +nullius-paving-drone-purple=Paving drone purple +nullius-paving-drone-green=Paving drone green +nullius-paving-drone-yellow=Paving drone yellow +nullius-paving-drone-blue=Paving drone blue +nullius-paving-drone-red=Paving drone red +nullius-paving-drone-white=Paving drone white +nullius-paving-drone-grey=Paving drone grey +nullius-terraforming-drone-beige=Terraforming drone beige +nullius-terraforming-drone-red=Terraforming drone red +nullius-terraforming-drone-brown=Terraforming drone brown +nullius-terraforming-drone-tan=Terraforming drone tan +nullius-terraforming-drone-grey=Terraforming drone grey +nullius-shallow-excavation-drone=Shallow excavation drone +nullius-excavation-drone=Excavation drone +nullius-demolition-drone=Demolition drone +nullius-scout-drone=Scout drone \ No newline at end of file diff --git a/nullius/locale/en/recipe.cfg b/nullius/locale/en/recipe.cfg index 00b46e6..11869d9 100644 --- a/nullius/locale/en/recipe.cfg +++ b/nullius/locale/en/recipe.cfg @@ -35,6 +35,8 @@ nullius-electrolytic=__1__ (electrolytic) nullius-aluminothermic=__1__ (thermite) nullius-turbine-burn-open=Open generation (__1__) nullius-turbine-burn-closed=Closed generation (__1__) +nullius-liquid-void=Dump liquid (__1__) +nullius-gas-void=Dump gas (__1__) nullius-seawater-filtration=Seawater filtration nullius-freshwater-filtration=Freshwater filtration nullius-wastewater-filtration=Wastewater filtration @@ -97,6 +99,8 @@ nullius-silica-glass=Glass (fused quartz) nullius-soda-lime-glass-1=Glass (soda-lime 1) nullius-soda-lime-glass-2=Glass (soda-lime 2) nullius-graphite-to-carbon-monoxide=Carbon monoxide (graphite) +nullius-carbon-dioxide-to-methane=Methane +nullius-methane-to-ethylene=Ethylene nullius-carbon-gasification=Carbon gasification nullius-carbon-monoxide-to-dioxide=Carbon dioxide nullius-carbon-dioxide-to-monoxide=Carbon monoxide @@ -223,4 +227,4 @@ nullius-carbon-sink=Carbon sink nullius-chlorine-sink=Chlorine sink nullius-boron-sink=Boron sink nullius-glycolysis=Glycolysis -nullius-carbon-nanotubes=Carbon nanotubes +nullius-carbon-nanotubes=Carbon nanotubes \ No newline at end of file diff --git a/nullius/locale/en/tech.cfg b/nullius/locale/en/tech.cfg index 1a42c87..be9642c 100644 --- a/nullius/locale/en/tech.cfg +++ b/nullius/locale/en/tech.cfg @@ -1,4 +1,5 @@ [technology-name] +nullius-salvage-lab-wreckage=Salvage lab wreckage nullius-geology=Geology nullius-climatology=Climatology nullius-mechanical-engineering=Mechanical engineering @@ -55,7 +56,7 @@ nullius-electrical-engineering=Electrical engineering nullius-empiricism=Empiricism nullius-maintenance=Maintenance nullius-signal-processing=Signal processing -nullius-long-inserters=Extension +nullius-long-inserters=Extension for inserters nullius-limestone-processing=Calcite processing nullius-volcanism=Volcanism nullius-computation=Computation @@ -141,8 +142,8 @@ nullius-miniloader=Miniloaders nullius-loader=Loaders nullius-typesetting=Typesetting nullius-companionship=Companionship -nullius-SNTD-nixie-tubes-basic=Basic Nixie Tubes -nullius-SNTD-nixie-tubes-reinforced=Reinforced Nixie Tubes +nullius-reinforced-nixie-tubes-basic=Basic Nixie Tubes +nullius-reinforced-nixie-tubes-reinforced=Reinforced Nixie Tubes nullius-holographics=Holographics nullius-logistic-ballistics=Logistic Ballistics nullius-precision-ballistics=Precision Ballistics @@ -163,6 +164,7 @@ nullius-insulation=Insulation nullius-fueling=Fueling nullius-deep-sea-extraction=Deep sea extraction nullius-rail-bridges=Rail bridges +nullius-elevated-rails=Elevated rails nullius-fluid-recapture=Fluid recapture nullius-alignment=Alignment nullius-evolution=Evolution @@ -171,6 +173,7 @@ nullius-ecology=Ecology nullius-light-rail=Light rail [technology-description] +nullius-salvage-lab-wreckage=Salvage the lab from the wreckage nullius-geology=Analysis of local mineral composition and soil conditions. nullius-climatology=Study of local atmosphere, weather, and bodies of water. nullius-mechanical-engineering=Construction of complex mechanical devices. @@ -200,7 +203,7 @@ nullius-actuation=Mechanical devices capable of precise movements. nullius-logistics=Transportation of commodities from producers to consumers. nullius-wind-power=Intermittent renewable energy generation. nullius-metalworking=Automated shaping of metals into useful forms. -nullius-pumping=Increase pressure and flow rate of fluids. +nullius-pumping=Increase pipeline extent and flow rate of fluids. nullius-automation=Automatic assembly of materials into complex products. nullius-steelmaking=Techniques to alloy iron for improved tensile strength. nullius-mineral-processing=Sorting of ores by composition and purity. @@ -228,7 +231,7 @@ nullius-electrical-engineering=Research into automated electronic controls. nullius-empiricism=Automation of the research process itself. nullius-maintenance=Repair of damaged equipment. nullius-signal-processing=Advanced digital control of equipment. -nullius-long-inserters=Adjustable inserter length. +nullius-long-inserters=Adjustable inserter length. Use shift+L to toggle. nullius-limestone-processing=Refinement of calcium rich minerals. nullius-volcanism=Extraction of gases from geothermal fissures. nullius-computation=Combination of circuitry for sophisticated automation. @@ -336,6 +339,7 @@ nullius-complete-checkpoint=__1__ completed! nullius-display-plates=Representative imagery for concise labeling. nullius-insulation=Materials with low electrical or thermal conductivity. nullius-rail-bridges=Build rail bridges across bodies of water. +nullius-elevated-rails=Route rails over obstacles. nullius-fluid-recapture=Recycle working fluid used for energy generation. nullius-alignment=Protocols for heterogeneous android factions to synchronize and cooperate toward shared mission objectives. nullius-evolution=Artificial selection of organisms to thrive under local environmental conditions. diff --git a/nullius/locale/ko/item.cfg b/nullius/locale/ko/item.cfg index fbbea9d..beff115 100644 --- a/nullius/locale/ko/item.cfg +++ b/nullius/locale/ko/item.cfg @@ -501,9 +501,6 @@ nullius-underground-straight-junction=지하 파이프라인 확장 nullius-underground-elbow-junction=수직 지하 파이프 2개 연결 nullius-underground-three-way-junction=지하 파이프 3개 연결 nullius-underground-four-way-junction=지하 파이프 4개 연결 -nullius-pressure-2=최대 60% 압력에서. -nullius-pressure-3=최대 80% 압력에서. -nullius-pressure-4=최대 100% 압력에서. nullius-underground-ctrl-r=\n지하 파이프를 회전하려면 CTRL+R을 누릅니다. nullius-underground-pump=지하 파이프 사이에 직접 펌핑합니다. nullius-adjustable-top-up-valve=압력이 구성 가능한 임계값보다 낮은 대상으로의 흐름을 허용합니다.\n+/-를 눌러 임계값을 10%씩 조정합니다. diff --git a/nullius/locale/pl/better-victory-screen.cfg b/nullius/locale/pl/better-victory-screen.cfg new file mode 100644 index 0000000..f5c0c9e --- /dev/null +++ b/nullius/locale/pl/better-victory-screen.cfg @@ -0,0 +1,10 @@ +[bvs-categories] +terraforming=Terraforming + +[bvs-stats] +arthropods=Wędrujące stawonogi +worms=Wykopane robaki +fish=Pływające ryby +trees=Zdrowe drzewa +grass=Wyrosła trawa +petroleum=Dostępne lokalizacje ropy naftowej diff --git a/nullius/locale/pl/entity.cfg b/nullius/locale/pl/entity.cfg index 6601dcd..9988d10 100644 --- a/nullius/locale/pl/entity.cfg +++ b/nullius/locale/pl/entity.cfg @@ -5,11 +5,15 @@ nullius-south=__1__ (południe) nullius-west=__1__ (zachód) nullius-vertical=__1__ (pionowy) nullius-horizontal=__1__ (poziomy) -nullius-mirrored=__1__ (odbicie lustrzane) +nullius-mirrored=__1__ (odwrócony) +nullius-legacy=__1__ (starszy) +nullius-construction-only=__1__ (budowa) +nullius-small=Mały __1__ nullius-sandstone=Piaskowiec -nullius-limestone=wapień +nullius-limestone=Wapień nullius-bauxite=Boksyt -nullius-fumarol=Fumarol +nullius-crystal-rock=Skała krystaliczna +nullius-fumarole=Fumarola nullius-air-filter-1=Filtr powietrza 1 nullius-air-filter-2=Filtr powietrza 2 nullius-air-filter-3=Filtr powietrza 3 @@ -19,16 +23,18 @@ nullius-chimney-1=Komin 1 nullius-outfall-1=Odpływ 1 nullius-chimney-2=Komin 2 nullius-outfall-2=Odpływ 2 +nullius-chimney-3=Komin 3 +nullius-outfall-3=Odpływ 3 nullius-hydro-plant-1=Hydroelektrownia 1 nullius-hydro-plant-2=Hydroelektrownia 2 -nullius-mirror-hydro-plant-2=Hydroelektrownia 2 (odbicie lustrzane) +nullius-mirror-hydro-plant-2=Hydroelektrownia 2 (odwrócony) nullius-hydro-plant-3=Hydroelektrownia 3 -nullius-mirror-hydro-plant-3=Hydroelektrownia 3 (odbicie lustrzane) +nullius-mirror-hydro-plant-3=Hydroelektrownia 3 (odwrócony) nullius-distillery-1=Destylarnia 1 nullius-distillery-2=Destylarnia 2 -nullius-mirror-distillery-2=Destylarnia 2 (odbicie lustrzane) +nullius-mirror-distillery-2=Destylarnia 2 (odwrócony) nullius-distillery-3=Destylarnia 3 -nullius-mirror-distillery-3=Destylarnia 3 (odbicie lustrzane) +nullius-mirror-distillery-3=Destylarnia 3 (odwrócony) nullius-small-assembler-1=Mały monter 1 nullius-small-assembler-2=Mały monter 2 nullius-small-assembler-3=Mały monter 3 @@ -50,25 +56,26 @@ nullius-crusher-2=Kruszarka 2 nullius-crusher-3=Kruszarka 3 nullius-flotation-cell-1=Zakład flotacji 1 nullius-flotation-cell-2=Zakład flotacji 2 -nullius-mirror-flotation-cell-2=Zakład flotacji 2 (odbicie lustrzane) +nullius-mirror-flotation-cell-2=Zakład flotacji 2 (odwrócony) nullius-flotation-cell-3=Zakład flotacji 3 -nullius-mirror-flotation-cell-3=Zakład flotacji 3 (odbicie lustrzane) +nullius-mirror-flotation-cell-3=Zakład flotacji 3 (odwrócony) nullius-foundry-1=Odlewnia 1 nullius-foundry-2=Odlewnia 2 nullius-foundry-3=Odlewnia 3 -nullius-surge-electrolyzer-1=Elektrolizer impulsowy 1 -nullius-surge-electrolyzer-2=Elektrolizer impulsowy 2 -nullius-mirror-surge-electrolyzer-2=Elektrolizer impulsowy 2 (odbicie lustrzane) -nullius-surge-electrolyzer-3=Elektrolizer impulsowy 3 -nullius-mirror-surge-electrolyzer-3=Elektrolizer impulsowy 3 (odbicie lustrzane) +nullius-electrolyzer=Elektrolizer +nullius-surge-electrolyzer-1=Elektrolizer przeciążeniowy impulsowy 1 +nullius-surge-electrolyzer-2=Elektrolizer przeciążeniowy impulsowy 2 +nullius-mirror-surge-electrolyzer-2=Elektrolizer przeciążeniowy impulsowy 2 (odwrócony) +nullius-surge-electrolyzer-3=Elektrolizer przeciążeniowy impulsowy 3 +nullius-mirror-surge-electrolyzer-3=Elektrolizer przeciążeniowy impulsowy 3 (odwrócony) nullius-priority-electrolyzer-1=Elektrolizer priorytetowy 1 nullius-priority-electrolyzer-2=Elektrolizer priorytetowy 2 -nullius-mirror-priority-electrolyzer-2=Elektrolizer priorytetowy 2 (odbicie lustrzane) +nullius-mirror-priority-electrolyzer-2=Elektrolizer priorytetowy 2 (odwrócony) nullius-priority-electrolyzer-3=Elektrolizer priorytetowy 3 -nullius-mirror-priorytet-electrolyzer-3=Elektrolizer priorytetowy 3 (odbicie lustrzane) +nullius-mirror-priorytet-electrolyzer-3=Elektrolizer priorytetowy 3 (odwrócony) nullius-chemical-plant-1=Zakład chemiczny 1 nullius-chemical-plant-2=Zakład chemiczny 2 -nullius-mirror-chemical-plant-2=Zakład chemiczny 2 (odbicie lustrzane) +nullius-mirror-chemical-plant-2=Zakład chemiczny 2 (odwrócony) nullius-chemical-plant-3=Zakład chemiczny 3 nullius-mirror-chemical-plant-3=Zakład chemiczny 3 (lustrzane odbicie) nullius-small-furnace-1=Mały piec 1 @@ -103,9 +110,9 @@ nullius-large-tank-2=Duży zbiornik 2 nullius-large-tank-3=Duży zbiornik 3 nullius-combustion-chamber-1=Komora spalania 1 nullius-combustion-chamber-2=Komora spalania 2 -nullius-mirror-combustion-chamber-2=Komora spalania 2 (odbicie lustrzane) +nullius-mirror-combustion-chamber-2=Komora spalania 2 (odwrócony) nullius-combustion-chamber-3=Komora spalania 3 -nullius-mirror-combustion-chamber-3=Komora spalania 3 (odbicie lustrzane) +nullius-mirror-combustion-chamber-3=Komora spalania 3 (odwrócony) nullius-backup-turbine-1=Turbina rezerwowa 1 nullius-backup-turbine-2=Turbina rezerwowa 2 nullius-backup-turbine-3=Turbina rezerwowa 3 @@ -114,9 +121,18 @@ nullius-standard-turbine-2=Turbina standardowa 2 nullius-standard-turbine-3=Turbina standardowa 3 nullius-priority-turbine-1=Turbina priorytetowa 1 nullius-priority-turbine-2=Turbina priorytetowa 2 -nullius-surge-compressor-1=Sprężarka powietrza 1 -nullius-surge-compressor-2=Sprężarka powietrza 2 -nullius-surge-compressor-3=Sprężarka powietrza 3 +nullius-turbine-open=Turbina otwarta +nullius-turbine-open-backup=Turbina otwarta zapasowa +nullius-turbine-open-standard=Turbina otwarta standardowa +nullius-turbine-open-exhaust=Turbina otwarta upustowa +nullius-turbine-closed=Turbina zamknięta +nullius-turbine-closed-backup=Zamknięta turbina rezerwowa +nullius-turbine-closed-standard=Zamknięta turbina standardowa +nullius-turbine-closed-exhaust=Zamknięta turbina upustowa +nullius-compressor=Sprężarka +nullius-surge-compressor-1=Sprężarka przeciążeniowa powietrza 1 +nullius-surge-compressor-2=Sprężarka przeciążeniowa powietrza 2 +nullius-surge-compressor-3=Sprężarka przeciążeniowa powietrza 3 nullius-priority-compressor-1=Sprężarka priorytetowa 1 nullius-priority-compressor-2=Sprężarka priorytetowa 2 nullius-priority-compressor-3=Sprężarka priorytetowa 3 @@ -186,7 +202,7 @@ nullius-cargo-wagon-2=Wagon towarowy 2 nullius-cargo-wagon-3=Wagon towarowy 3 nullius-fluid-wagon-1=Cysterna 1 nullius-fluid-wagon-2=Cysterna 2 -nullius-fluid-wagon-3=Cysterna3 +nullius-fluid-wagon-3=Cysterna 3 nullius-wind-build-1=Turbina wiatrowa 1 nullius-wind-build-2=Turbina wiatrowa 2 nullius-wind-build-3=Turbina wiatrowa 3 @@ -210,10 +226,10 @@ nullius-construction-bot-3=Bot konstrukcyjny 3 nullius-logistic-bot-3=Bot logistyczny 3 nullius-construction-bot-4=Bot konstrukcyjny 4 nullius-logistic-bot-4=Bot logistyczny 4 -nullius-power-pole-1=Słupek energetyczny 1 -nullius-power-pole-2=Słupek energetyczny 2 -nullius-power-pole-3=Słup energetyczny 3 -nullius-power-pole-4=Słup energetyczny 4 +nullius-power-pole-1=Słupek elektryczny 1 +nullius-power-pole-2=Słupek elektryczny 2 +nullius-power-pole-3=Słup elektryczny 3 +nullius-power-pole-4=Słup elektryczny 4 nullius-pylon-1=Pylon 1 nullius-pylon-2=Pylon 2 nullius-pylon-3=Pylon 3 @@ -223,6 +239,7 @@ nullius-substation-3=Podstacja energetyczna 3 nullius-logic-circuit=Sterownik logiczny nullius-arithmetic-circuit=Sterownik arytmetyczny nullius-memory-circuit=Sterownik pamięci +nullius-selector-circuit=Sterownik selekcyjny nullius-antenna=Głośnik nullius-extractor-1=Ekstraktor 1 nullius-extractor-2=Ekstraktor 2 @@ -238,8 +255,8 @@ nullius-heat-pipe-1=Rura cieplna 1 nullius-heat-pipe-2=Rura cieplna 2 nullius-heat-pipe-3=Rura cieplna 3 nullius-thermal-tank-1=Zbiornik termiczny 1 -nullius-thermal-tank-2=Zbiornik termalny 2 -nullius-thermal-tank-3=Zbiornik termalny 3 +nullius-thermal-tank-2=Zbiornik termiczny 2 +nullius-thermal-tank-3=Zbiornik termiczny 3 nullius-lab-1=Laboratorium 1 nullius-lab-2=Laboratorium 2 nullius-lab-3=Laboratorium 3 @@ -268,11 +285,11 @@ nullius-stirling-vertical-heat-3=Silnik Stirlinga pionowy 3 nullius-stirling-horizontal-heat-3=Silnik Stirlinga poziomy 3 nullius-drone-launcher-1=Wyrzutnia dronów 1 nullius-drone-launcher-2=Wyrzutnia dronów 2 -nullius-drone-carrier-1=Ciężarówka z dronami 1 -nullius-drone-carrier-2=Ciężarówka z dronami 2 +nullius-drone-carrier-1=Mobilna wyrzutnia dronów 1 +nullius-drone-carrier-2=Mobilna wyrzutnia dronów 2 nullius-nanofabricator-1=Nanoproducent 1 nullius-nanofabricator-2=Nanoproducent 2 -nullius-mirror-nanofabricator-2=Nanoproducent 2 (odbicie lustrzane) +nullius-mirror-nanofabricator-2=Nanoproducent 2 (odwrócony) nullius-landing-main=Statek-lądowisko nullius-landing-propulsion=Napęd lądowiska nullius-landing-tail=Ogon lądowiska @@ -299,9 +316,34 @@ nullius-relay-2=Przekaźnik 2 nullius-relay-3=Przekaźnik 3 nullius-relay-4=Przekaźnik 4 nullius-android-2=Android 2 - +nullius-rock-bauxite=Skała boksytowa +nullius-rock-limestone=Skała wapienna +nullius-rock-ironstone=Skała żelazowa +nullius-rock-sandstone=Skała piaskowcowa +nullius-boxer=Paczkowarka +nullius-thrower=Miotacz __1__ +nullius-filter-thrower=Miotacz filtrujący __1__ +nullius-display-plate-small-steel=Stalowa płytka informacyjna (mała) +nullius-display-plate-medium-steel=Stalowa płytka informacyjna (średnia) +nullius-display-plate-large-steel=Stalowa płytka informacyjna (duża) +nullius-display-plate-small-aluminum=Aluminiowa płytka informacyjna (mała) +nullius-display-plate-medium-aluminum=Aluminiowa płytka informacyjna (średnia) +nullius-display-plate-large-aluminum=Aluminiowa płytka informacyjna (duża) +nullius-display-plate-small-plastic=Plastikowa płytka informacyjna (mała) +nullius-display-plate-medium-plastic=Plastikowa płytka informacyjna (średnia) +nullius-display-plate-large-plastic=Plastikowa płytka informacyjna (duża) +nullius-hydrothermal-vent=Komin hydrotermalny +nullius-offshore-extractor=Ekstraktor morski +nullius-offshore-steam=__ENTITY__oil_rig__ elektrownia hydrotermalna +nullius-offshore-electric=__ENTITY__oil_rig__ generator elektryczny +nullius-offshore-radar=__ENTITY__oil_rig__ radar +nullius-align-conscription-turret=Wieża poborowa +nullius-align-concordance-transmitter=Nadajnik zgodności [entity-description] +nullius-kilojoule=__1__ kJ +nullius-megajoule=__1__ MJ +nullius-kilowatt=__1__ kW nullius-furnace=Stosuje ekstremalne ciepło do rafinacji metali z rudy. nullius-large-furnace=Rafinuje duże ilości metalu z rudy. nullius-air-filter-1=Filtruje i spręża powietrze z atmosfery (do 50/s). @@ -309,12 +351,14 @@ nullius-air-filter-2=Filtruje i spręża powietrze z atmosfery (do 150/s). nullius-air-filter-3=Filtruje i spręża powietrze z atmosfery (do 400/s). nullius-well-1=Pompuje wodę gruntową spod powierzchni (do 100/s). nullius-well-2=Pompuje wody gruntowe spod powierzchni (do 400/s). -nullius-seawater-intake-1=Umieszczony wzdłuż wybrzeża w celu produkcji wody morskiej. -nullius-seawater-intake-2=Umieszczony wzdłuż wybrzeża w celu produkcji wody morskiej. -nullius-chimney-1=Wentyluje nadmiar gazu do atmosfery (do 100/s). -nullius-chimney-2=Wentyluje nadmiar gazu do atmosfery (do 500/s). +nullius-seawater-intake-1=Umieszczony wzdłuż wybrzeża w celu produkcji wody morskiej (do 125/s). +nullius-seawater-intake-2=Umieszczony wzdłuż wybrzeża w celu produkcji wody morskiej (do 500/s). +nullius-chimney-1=Wentyluje nadmiar gazu do atmosfery (do 100/s).Skompresowane gazy uwalniane z połową prędkości. +nullius-chimney-2=Wentyluje nadmiar gazu do atmosfery (do 500/s).Skompresowane gazy uwalniane z połową prędkości. +nullius-chimney-3=Wentyluje nadmiar gazu do atmosfery (do 2000/s).Skompresowane gazy uwalniane z połową prędkości. nullius-outfall-1=Wypuszcza nadmiar cieczy do morza (Do 100/s). -nullius-outfall-2=Wypuszcza nadmiar cieczy do morza (Do 500/s). +nullius-outfall-2=Wypuszcza nadmiar cieczy do morza (Do 400/s). +nullius-outfall-3=Wypuszcza nadmiar cieczy do morza (Do 1000/s). nullius-hydro-plant=Filtruje zanieczyszczenia i uzdatnia wodę. nullius-distillery=Rozdziela mieszane ciecze na substancje składowe. nullius-small-assembler-1=Składa razem małe produkty pośrednie i gotowe. @@ -333,73 +377,75 @@ nullius-crusher-1=Miażdży skały na drobniejsze cząstki i sortuje wyniki. nullius-crusher-2=Miażdży skały na drobniejsze cząstki i sortuje wyniki. nullius-crusher-3=Miażdży skały na drobniejsze cząstki i sortuje wyniki. nullius-flotation-cell=Reaktywacja ciał stałych zanurzonych w cieczach w czasie. -nullius-surge-electrolyzer=Podzielenie cieczy na jony z nadwyżką energii elektrycznej, tylko po zaspokojeniu innego zapotrzebowania na energię. -nullius-priority-electrolyzer=Podzielenie cieczy na jony przy użyciu ogromnej energii elektrycznej. -nullius-backup-turbine=Generuje energię elektryczną z gazu pod ciśnieniem, takiego jak para. Działa tylko jako rezerwa w celu zaspokojenia potrzeb. Nie ładuje urządzeń impulsowych ani akumulatorów sieciowych. Przydatna do magazynowania energii przy użyciu produktów wyposażenia impulsowego. -nullius-standard-turbine=Generuje energię elektryczną z gazu pod ciśnieniem, takiego jak para. Działa, gdy wiatr i panele słoneczne są niewystarczające. Użyteczna do generowania energii z pary w wymienniku ciepła. -nullius-priority-turbine=Generuje energię elektryczną z gazu pod ciśnieniem, takiego jak para wodna. Dostawca energii podstawowej jak turbiny wiatrowe. Użyteczna do wentylacji nadmiaru sprężonego gazu lub produktów ubocznych pary. +nullius-electrolyzer=Rozdziela płyny na jony. +nullius-compressor=Spręża gaz. Sprężony gaz może być wykorzystywany do przyspieszenia reakcji chemicznych, zwiększenia przepustowości rur lub jako medium do magazynowania energii. +nullius-prioritize=__1__ Tryb zużycia energii elektrycznej można przełączać między dwoma stanami za pomocą __CONTROL__nullius-prioritize__. +nullius-surge=__1__ Wykorzystuje nadwyżkę energii elektrycznej, dopiero po zaspokojeniu innych potrzeb. Przełącz się do trybu priorytetowego za pomocą __CONTROL__nullius-prioritize__. +nullius-priority=__1__ Zużywa energię elektryczną w normalny sposób. Przełącz się do trybu nadmiarowego za pomocą __CONTROL__nullius-prioritize__. +nullius-turbine-open=Wytwarza energię elektryczną ze sprężonego gazu lub pary, uwalniając ją do atmosfery. +nullius-turbine-closed=Wytwarza energię elektryczną ze sprężonego gazu lub pary, odzyskując większość nieskompresowanego płynu roboczego. +nullius-turbine-item=__1__ Tryb produkcji energii elektrycznej można skonfigurować w jednym z trzech stanów za pomocą __CONTROL__nullius-prioritize__. +nullius-turbine-entity=__1__ __2__\nPrzełącz tryb generowania za pomocą __CONTROL__nullius-prioritize__. +nullius-turbine-info=__3__\n[font=default-semibold][color=1,0.9,0.75]Moc maksymalna:[/color][/font] __1__MW\n[font=default-semibold][color=1,0.9,0.75]Sprawność:[/color][/font] __2__% +nullius-turbine-backup=Działa wyłącznie jako rezerwa w celu zaspokojenia niezaspokojonego zapotrzebowania. Nie ładuje urządzeń przeciążeniowych ani akumulatorów sieciowych. Przydatna do magazynowania energii przy użyciu urządzeń przeciążeniowych. +nullius-turbine-standard=Działa, gdy energia wiatrowa i słoneczna są niewystarczające. Przydatny do wytwarzania energii z pary z wymiennika ciepła. +nullius-turbine-exhaust=Główne źródło energii, podobnie jak turbiny wiatrowe. Działa niezależnie od tego, czy wytwarzana energia jest potrzebna. Przydatne do pozyskiwania dodatkowej energii z zarządzania produktami ubocznymi lub dekompresji, gdy przepływ nie może zostać przerwany. nullius-combustion-chamber=Spala zmagazynowane paliwa chemiczne w celu wytworzenia pary pod wysokim ciśnieniem. nullius-boiler=Używa energii elektrycznej do zamiany wody w parę. -nullius-compressor=Spręża gaz używając nadwyżki energii elektrycznej, tylko po zaspokojeniu innego zapotrzebowania na energię. -nullius-priority-compressor=Spręża gaz używając ogromnej ilości energii elektrycznej. nullius-chemical-plant=Katalizuje szeroki zakres reakcji chemicznych. -nullius-one-way-valve=Zezwala na przepływ tylko w jednym kierunku. -nullius-relief-valve=Zezwala na przepływ ze źródła o ciśnieniu ponad 75%. -nullius-top-up-valve=Zezwala na przepływ do miejsca przeznaczenia przy ciśnieniu poniżej 50%. -nullius-priority-valve=Zezwala na przepływ ze źródła z ponad 25% ciśnieniem. -nullius-pipe-1=Przesyła płyn pod ciśnieniem do 40%. -nullius-pipe-2=Przesyła płyn pod ciśnieniem do 60%. -nullius-pipe-3=Przesyła płyn pod ciśnieniem do 80%. -nullius-pipe-4=Przesyła płyn pod ciśnieniem do 100%. -nullius-underground-pipe-1=Przesyła płyn pod ciśnieniem do 40%. -nullius-underground-pipe-2=Przesyła płyn pod ciśnieniem do 60%. -nullius-underground-pipe-3=Przesyła ciecz pod ciśnieniem do 80%. -nullius-underground-pipe-4=Przesyła płyn pod ciśnieniem do 100%. -nullius-small-tank-1=Przechowuje płyn pod ciśnieniem do 90%. -nullius-small-tank-2=Przechowuje płyn pod ciśnieniem do 100%. -nullius-medium-tank-1=Przechowuje płyn pod ciśnieniem do 85%. -nullius-medium-tank-2=Przechowuje płyn pod ciśnieniem do 90%. -nullius-medium-tank-3=Przechowuje płyn pod ciśnieniem do 100%. -nullius-large-tank-1=Przechowuje płyn pod ciśnieniem do 100%. -nullius-large-tank-2=Przechowuje płyn pod ciśnieniem do 110%. -nullius-large-tank-3=Przechowuje płyn pod ciśnieniem do 125%. +nullius-one-way-valve=Umożliwia przepływ tylko w jednym kierunku. Może być przydatny do kontrolowania przepływu wstecznego i rozlewania się płynów w rurach o większej przepustowości. +nullius-relief-valve=Umożliwia przepływ ze źródła o objętości powyżej 75%. Przydatny w połączeniu ze zbiornikiem napełnianym pompą, aby rozlać nadmiar produktu ubocznego w celu odpowietrzenia i uniknięcia zablokowania produkcji. +nullius-top-up-valve=Umożliwia przepływ do miejsca docelowego o objętości poniżej 50%. Przydatny, gdy masz dwa źródła tego samego płynu, zarówno jako produkt uboczny, jak i główny produkt. Użyj tego zaworu, aby napełnić zbiornik z głównego rurociągu produktu, a nie z rurociągu produktu ubocznego, dając w ten sposób pierwszeństwo wykorzystaniu produktu ubocznego, gdy jest go wystarczająco dużo, ale dostarczając go innymi środkami, jeśli nie ma go wystarczająco dużo. +nullius-priority-valve=możliwia przepływ z źródła o objętości powyżej 25%. Przydatne w przypadku dostarczania jednego płynu do wielu miejsc docelowych o różnym znaczeniu. Użyj tego zaworu do zasilania rurociągu o drugorzędnym znaczeniu, tak aby był on zasilany tylko wtedy, gdy zbiornik ma wystarczającą ilość płynu, aby zaspokoić podstawowe zapotrzebowanie. +nullius-pipe=Przesyła płyn +nullius-underground-pipe=Przesyła płyn +nullius-small-tank-1=Przechowuje niewiele płynu. +nullius-small-tank-2=Przechowuje niewiele płynu. +nullius-medium-tank-1=Przechowuje płyn. +nullius-medium-tank-2=Przechowuje płyn. +nullius-medium-tank-3=Przechowuje płyn. +nullius-large-tank-1=Przechowuje dużo płynu. +nullius-large-tank-2=Przechowuje dużo płynu. +nullius-large-tank-3=Przechowuje dużo płynu. nullius-barrel-pump-1=Napełnia lub opróżnia beczki płynem. nullius-barrel-pump-2=Napełnia lub opróżnia beczki płynem. -nullius-pump-1=Poprawia szybkość przepływu na duże odległości i napełnia zbiorniki do maksymalnego ciśnienia. -nullius-pump-2=Poprawia szybkość przepływu na duże odległości i napełnia zbiorniki do maksymalnego ciśnienia. -nullius-pump-3=Poprawia szybkość przepływu na długich dystansach i napełnia zbiorniki do maksymalnego ciśnienia. +nullius-pump-1=Konieczne do przedłużenia rurociągów na większe odległości. Pompuje do 3000/s. +nullius-pump-2=Konieczne do przedłużenia rurociągów na większe odległości. Pompuje do 6000/s. +nullius-pump-3=Konieczne do przedłużenia rurociągów na większe odległości. Pompuje do 12000/s. +nullius-small-pump-1=Połowa rozmiaru zwykłej pompy, ale wolniejsza. Pompuje do 2400/s +nullius-small-pump-2=Połowa rozmiaru zwykłej pompy, ale wolniejsza. Pompuje do 4800/s nullius-wind-base-1=Odnawialna energia o średniej mocy 600kW, maksymalnie do 1,5MW. nullius-wind-base-2=Odnawialna energia o średniej mocy 1,6MW, maksymalnie do 4MW. -nullius-wind-base-3=Odnawialna energia okresowa średnio 4,8MW, maksymalnie do 12MW. -nullius-wind-build-1=Odnawialna energia okresowa średnio 600kW, maksymalnie do 1,5MW. -nullius-wind-build-2=Odnawialna energia okresowa średnio 1,6MW, maksymalnie do 4MW. -nullius-wind-build-3=Odnawialna energia okresowa średnio 4.8MW, maksymalnie do 12MW. +nullius-wind-base-3=Odnawialna energia o średniej mocy 4,8MW, maksymalnie do 12MW. +nullius-wind-build-1=Odnawialna energia o średniej mocy 600kW, maksymalnie do 1,5MW. +nullius-wind-build-2=Odnawialna energia o średniej mocy 1,6MW, maksymalnie do 4MW. +nullius-wind-build-3=Odnawialna energia o średniej mocy 4.8MW, maksymalnie do 12MW. nullius-grid-battery-1=Efektywne krótkoterminowe magazynowanie energii elektrycznej. nullius-grid-battery-2=Efektywne krótkoterminowe magazynowanie energii elektrycznej. nullius-grid-battery-3=Efektywne krótkoterminowe magazynowanie energii elektrycznej. -nullius-solar-collector-1=Generuje średnio 150kW ciepła (przed bonusem), szczytowo 240kW w połowie dnia.\n[font=default-semibold][color=1,0.9,0.75]Maksymalna temperatura:[/color][/font] 250C -nullius-solar-collector-2=Generuje średnio 300kW ciepła (przed bonusem), szczytowo 460kW w połowie dnia.\n[font=default-semibold][color=1,0.9,0.75]Temperatura maksymalna:[/color][/font] 300C -nullius-solar-collector-3=Generuje średnio 600kW ciepła (przed bonusem), szczytowo 900kW w połowie dnia. \n[font=default-semibold][color=1,0.9,0.75]Temperatura maksymalna:[/color][/font] 400C +nullius-solar-collector-1=Generuje średnio 150kW ciepła (przed bonusem), szczytowo 240kW w południe. Produkcja ciepła maleje wraz ze wzrostem temperatury\n[font=default-semibold][color=1,0.9,0.75]Maksymalna temperatura:[/color][/font] 250C +nullius-solar-collector-2=Generuje średnio 300kW ciepła (przed bonusem), szczytowo 460kW w południe. Produkcja ciepła maleje wraz ze wzrostem temperatury\n[font=default-semibold][color=1,0.9,0.75]Temperatura maksymalna:[/color][/font] 300C +nullius-solar-collector-3=Generuje średnio 600kW ciepła (przed bonusem), szczytowo 900kW w południe. Produkcja ciepła maleje wraz ze wzrostem temperatury\n[font=default-semibold][color=1,0.9,0.75]Temperatura maksymalna:[/color][/font] 400C nullius-extractor-1=Wyciąga gaz wulkaniczny z fumaroli. nullius-extractor-2=Wyciąga gaz wulkaniczny z fumaroli. -nullius-geothermal-build-1=Zbudowany nad fumarolem w celu wytworzenia 10MW energii cieplnej.\nMaksymalna temperatura: 250C -nullius-geothermal-reactor-1=Zbudowany nad fumarolem w celu wygenerowania 10MW energii cieplnej. \nTemperatura maksymalna: 250C -nullius-geothermal-build-2=Zbudowany nad fumarolem w celu wygenerowania 30MW energii cieplnej.\nTemperatura maksymalna: 300C -nullius-geothermal-reactor-2=Zbudowany nad fumarolem w celu wygenerowania 30MW energii cieplnej.\nTemperatura maksymalna: 300C -nullius-geothermal-build-3=Zbudowany nad fumarolem w celu wygenerowania 80MW energii cieplnej.\nTemperatura maksymalna: 400C -nullius-geothermal-reactor-3=Zbudowany nad fumarolem w celu wygenerowania 80MW energii cieplnej.\nTemperatura maksymalna: 400C -nullius-heat-pipe-1=Przekazuje do 30MW energii cieplnej. \nWydajność cieplna: 100kJ na ºC.\nTemperatura maksymalna: 250C -nullius-heat-pipe-2=Przekazuje do 80MW energii cieplnej. \nWydajność cieplna: 250kJ na ºC. \nTemperatura maksymalna: 500C -nullius-heat-pipe-3=Przekazuje do 200MW energii cieplnej. \nWydajność cieplna: 500kJ na °C. \nTemperatura maksymalna: 1500C -nullius-stirling-engine-1=Przekształca ciepło z 80% sprawnością w celu wyprodukowania do 800kW energii elektrycznej. -nullius-stirling-build-1=Przetwarza ciepło z 80% sprawnością w celu wyprodukowania do 800kW energii elektrycznej. -nullius-stirling-engine-2=Przetwarza ciepło z 90% sprawnością, aby wyprodukować do 2.5MW energii elektrycznej. -nullius-stirling-build-2=Przekształca ciepło z 90% sprawnością w celu wyprodukowania do 2.5MW energii elektrycznej. -nullius-stirling-engine-3=Przetwarza ciepło z 100% sprawnością, wytwarzając do 8MW energii elektrycznej. -nullius-stirling-build-3=Przetwarza ciepło z 100% sprawnością do produkcji do 8MW energii elektrycznej. -nullius-thermal-tank-1=Zapewnia 4MJ na ºC energii cieplnej do późniejszego zużycia.\nPrędkość transferu: 25MW Maksymalna temperatura: 250C -nullius-thermal-tank-2=Zapewnia 8MJ na ºC energii cieplnej do późniejszego zużycia.\nPrędkość transferu: 60MW Maksymalna temperatura: 500C -nullius-thermal-tank-3=Zapewnia 20MJ na ºC energii cieplnej do późniejszego zużycia.\nPrędkość transferu: 200MW Temperatura maksymalna: 1500C +nullius-geothermal-build-1=Zbudowany nad fumarolem w celu wytworzenia 10MW energii cieplnej.\n[font=default-semibold][color=1,0.9,0.75] Maksymalna temperatura:[/color][/font] 250C +nullius-geothermal-reactor-1=Zbudowany nad fumarolem w celu wygenerowania 10MW energii cieplnej. \n[font=default-semibold][color=1,0.9,0.75] Maksymalna temperatura:[/color][/font] 250C +nullius-geothermal-build-2=Zbudowany nad fumarolem w celu wygenerowania 30MW energii cieplnej.\n[font=default-semibold][color=1,0.9,0.75] Maksymalna temperatura:[/color][/font] 300C +nullius-geothermal-reactor-2=Zbudowany nad fumarolem w celu wygenerowania 30MW energii cieplnej.\n[font=default-semibold][color=1,0.9,0.75] Maksymalna temperatura:[/color][/font] 300C +nullius-geothermal-build-3=Zbudowany nad fumarolem w celu wygenerowania 80MW energii cieplnej.\n[font=default-semibold][color=1,0.9,0.75] Maksymalna temperatura:[/color][/font] 400C +nullius-geothermal-reactor-3=Zbudowany nad fumarolem w celu wygenerowania 80MW energii cieplnej.\n[font=default-semibold][color=1,0.9,0.75] Maksymalna temperatura:[/color][/font] 400C +nullius-heat-pipe-1=Przesyła do 30 MW energii cieplnej.\n[font=default-semibold][color=1,0.9,0.75]Pojemność cieplna:[/color] [/font] 100 kJ na ºC.\n[font=default-semibold][color=1,0.9,0.75]Maksymalna temperatura:[/color][/font] 250C +nullius-heat-pipe-2=Przesyła do 80 MW energii cieplnej.\n[font=default-semibold][color=1,0.9,0.75]Pojemność cieplna:[/color] [/font] 250 kJ na ºC.\n[font=default-semibold][color=1,0.9,0.75]Maksymalna temperatura:[/color][/font] 500C +nullius-heat-pipe-3=Przesyła do 200 MW energii cieplnej.\n[font=default-semibold][color=1,0.9,0.75]Pojemność cieplna:[/color] [/font] 500 kJ na ºC.\n[font=default-semibold][color=1,0.9,0.75]Maksymalna temperatura:[/color][/font] 1500C +nullius-stirling-engine-1=Przekształca ciepło z wydajnością 80%, wytwarzając do 800 kW energii elektrycznej.\n[font=default-semibold][color=1,0.9,0.75] Optymalny zakres:[/color][/font] 180C do 250C\n[font=default-semibold][color=1,0.9,0.75] Minimalna temperatura robocza:[/color][/font] 120°C +nullius-stirling-build-1=Przekształca ciepło z wydajnością 80%, wytwarzając do 800 kW energii elektrycznej.\n[font=default-semibold][color=1,0.9,0.75] Optymalny zakres:[/color][/font] 180C do 250C\n[font=default-semibold][color=1,0.9,0.75] Minimalna temperatura robocza:[/color][/font] 120°C +nullius-stirling-engine-2=Przekształca ciepło z wydajnością 90%, wytwarzając do 2,5 MW energii elektrycznej.\n[font=default-semibold][color=1,0.9,0.75] Optymalny zakres:[/color][/font] 200°C do 500°C\n[font=default-semibold][color=1,0.9,0.75]Minimalna temperatura robocza:[/color][/font] 100°C +nullius-stirling-build-2=Przekształca ciepło z wydajnością 90%, wytwarzając do 2,5 MW energii elektrycznej.\n[font=default-semibold][color=1,0.9,0.75] Optymalny zakres:[/color][/font] 200°C do 500°C\n[font=default-semibold][color=1,0.9,0.75]Minimalna temperatura robocza:[/color][/font] 100°C +nullius-stirling-engine-3=Przekształca ciepło z wydajnością 95%, wytwarzając do 8 MW energii elektrycznej.\n[font=default-semibold][color=1,0.9,0.75] Optymalny zakres:[/color][/font] 240°C do 1500°C\n[font=default-semibold][color=1,0.9,0.75] Minimalna temperatura robocza:[/color][/font] 80C +nullius-stirling-build-3=Przekształca ciepło z wydajnością 95%, wytwarzając do 8 MW energii elektrycznej.\n[font=default-semibold][color=1,0.9,0.75] Optymalny zakres:[/color][/font] 240°C do 1500°C\n[font=default-semibold][color=1,0.9,0.75] Minimalna temperatura robocza:[/color][/font] 80C +nullius-thermal-tank-1=Magazynuje 4 MJ energii cieplnej na każdy stopień Celsjusza do późniejszego wykorzystania.\n[font=default-semibold][color=1,0.9,0.75]Szybkość transferu:[/color][/font] 25 MW\n[font=default-semibold][color=1,0.9,0.75] Maksymalna temperatura:[/color][/font] 250C +nullius-thermal-tank-2=Magazynuje 8 MJ energii cieplnej na każdy stopień Celsjusza do późniejszego wykorzystania.\n[font=default-semibold][color=1,0.9,0.75]Szybkość transferu:[/color][/font] 60 MW\n[font=default-semibold][color=1,0.9,0.75] Maksymalna temperatura:[/color][/font] 500C +nullius-thermal-tank-3=Magazynuje 20 MJ energii cieplnej na każdy stopień Celsjusza do późniejszego wykorzystania.\n[font=default-semibold][color=1,0.9,0.75]Szybkość transferu:[/color][/font] 200 MW\n[font=default-semibold][color=1,0.9,0.75] Maksymalna temperatura:[/color][/font] 1500C nullius-lab-1=Badania próbek w celu stworzenia bardziej zaawansowanych procesów technologicznych. nullius-lab-2=Badania próbek w celu stworzenia bardziej zaawansowanych procesów technologicznych. nullius-lab-3=Badania próbek w celu stworzenia bardziej zaawansowanych procesów technologicznych. @@ -446,10 +492,23 @@ nullius-nanofabricator=Syntetyzuje zaawansowane materiały atomowe warstwa po wa nullius-reactor=Zamienia paliwo jądrowe w energię cieplną.\nMaksymalna wydajność cieplna: 10MJ na ºC. \nTemperatura maksymalna: 1500C nullius-silo=Wystrzeliwuje rakiety w kosmos. nullius-turret=Trenuje mobilne organiczne formy życia do pozostania w wyznaczonym środowisku. -nullius-landing-pod-1=[font=default-semibold][color=1,0.9,0.75]Minable for:[/color][/font] [item=nullius-large-chest-1] -nullius-landing-pod-2=[font=default-semibold][color=1,0.9,0.75]Minable for:[/color][/font] [item=nullius-large-chest-1] -nullius-landing-main=[font=default-semibold][color=1,0.9,0.75]Minable for:[/color][/font] 2x[item=nullius-large-chest-1] 40x[item=nullius-steel-ingot] 15x[item=copper-cable] +nullius-minable=[font=default-semibold][color=1,0.9,0.75]Podniesienie:[/color][/font] __1__ +nullius-landing-pod-1=[font=default-semibold][color=1,0.9,0.75]Podniesienie:[/color][/font] [item=nullius-large-chest-1] +nullius-landing-pod-2=[font=default-semibold][color=1,0.9,0.75]Podniesienie:[/color][/font] [item=nullius-large-chest-1] +nullius-landing-main=[font=default-semibold][color=1,0.9,0.75]Podniesienie:[/color][/font] 2x[item=nullius-large-chest-1] 40x[item=nullius-steel-ingot] 15x[item=copper-cable] nullius-android=__CONTROL__nullius-upload-mind__ aby przejąć kontrolę nad tym ciałem.\n_CONTROL__nullius-previous-body__ aby wrócić do poprzedniego ciała.\n_CONTROL__nullius-next-body__ aby przejść do następnego ciała w kolejce. +nullius-boxer=Kompaktowe urządzenie, które szybko pakuje lub rozpakowuje. +nullius-request-slots=__1__\n[font=default-semibold][color=1,0.9,0.75]Sloty żądające:[/color][/font] __2__ +nullius-power-switch= Podłącz do sieci energetycznej za pomocą __1__ ([item=__2__]). +nullius-fumarole=Miejsce wulkaniczne odpowiednie do budowy elektrowni geotermalnej lub wydobycia gazu wulkanicznego. Elektrownia geotermalna nie ma wpływu na bogactwo zasobów i nie powoduje ich wyczerpania. Nieograniczone zasoby gazu wulkanicznego wyczerpują się do minimum 25% początkowej produkcji. +nullius-fumarole-finite=Miejsce wulkaniczne odpowiednie do budowy elektrowni geotermalnej lub wydobycia gazu wulkanicznego. Elektrownia geotermalna nie ma wpływu na bogactwo zasobów i nie powoduje ich wyczerpania. Ograniczone źródło gazu wulkanicznego, znika po całkowitym wyczerpaniu. +nullius-hydrothermal-vent=Głębokomorskie źródło gazu wulkanicznego, które można eksploatować za pomocą morskiej platformy wydobywczej. Nieograniczone zasoby gazu wulkanicznego wyczerpują się do minimum 25% początkowej produkcji. +nullius-offshore-extractor=Pływająca platforma wydobywcza do kominów hydrotermalnych. Zawiera generator termiczny zasilający samą platformę i podłączone pompy. +or_pole=Moc ekstraktora morskiego +nullius-loader=Przenosi przedmioty do lub z kontenera lub maszyny z prędkością pasującą do taśmy przenośnika. +nullius-align-conscription-turret=Instalacja obronna, która automatycznie wystrzeliwuje promienie rekrutacyjne w kierunku frakcji wroga. +nullius-align-concordance-transmitter=Nowo przybyłe androidy rozpoczną grę we frakcji z aktywnym nadajnikiem zamiast tworzyć własną. Chroni wszystkich graczy i budynki przed poborem do wojska, gdy jest aktywny. Stopniowo ujawnia odległe sektory. +inserterToggleInfo=Użyj Shift+L, aby przełączać się między długim a normalnym inserterem (dostępne po odblokowaniu badań nad rozszerzeniem) [equipment-name] nullius-solar-panel-1=Panel słoneczny 1 @@ -475,30 +534,91 @@ nullius-capacitor=Kondensator nullius-night-vision-1=Noktowizor 1 nullius-night-vision-2=Noktowizor 2 nullius-night-vision-3=Noktowizor 3 -nullius-levitation-field=Pole grawitacyjne -nullius-leg-augmentation-1=Augmentacja nóg 1 -nullius-leg-augmentation-2=Augmentacja nóg 2 -nullius-leg-augmentation-3=Augmentacja nóg 3 -nullius-leg-augmentation-4=Augmentacja nóg 4 +nullius-levitation-field-1=Pole lewitacji 1 +nullius-levitation-field-2=Pole lewitacji 2 +nullius-shield=Tarcza +nullius-leg-augmentation-1=Wzmocnienie nóg 1 +nullius-leg-augmentation-2=Wzmocnienie nóg 2 +nullius-leg-augmentation-3=Wzmocnienie nóg 3 +nullius-leg-augmentation-4=Wzmocnienie nóg 4 +nullius-upgrade-fabrication-tool-1=Narzędzie produkcyjne 1 +nullius-upgrade-fabrication-tool-2=Narzędzie produkcyjne 2 +nullius-upgrade-fabrication-tool-3=Narzędzie produkcyjne 3 +nullius-upgrade-mining-tool-1=Narzędzie górnicze 1 +nullius-upgrade-mining-tool-2=Narzędzie górnicze 2 +nullius-upgrade-multi-tool-1=Narzędzie wielofunkcyjne 1 +nullius-upgrade-multi-tool-2=Narzędzie wielofunkcyjne 2 +nullius-upgrade-multi-tool-3=Narzędzie wielofunkcyjne 3 +nullius-upgrade-small-cargo-pod-1=Mały kontener transportowy 1 +nullius-upgrade-small-cargo-pod-2=Mały kontener transportowy 2 +nullius-upgrade-large-cargo-pod-1=Duży kontener transportowy 1 +nullius-upgrade-large-cargo-pod-2=Duży kontener transportowy 2 +nullius-upgrade-large-cargo-pod-3=Duży kontener transportowy 3 +nullius-upgrade-trash-compactor=Kompaktor śmieci +nullius-upgrade-armor-plate=Płyta pancerna +nullius-upgrade-telekinesis-field-1=Pole telekinezy 1 +nullius-upgrade-telekinesis-field-2=Pole telekinezy 2 +nullius-upgrade-telekinesis-field-3=Pole telekinezy 3 +nullius-upgrade-quadrupedal-adaptation-1=Adaptacja czworonożna 1 +nullius-upgrade-quadrupedal-adaptation-2=Adaptacja czworonożna 2 +nullius-upgrade-quadrupedal-adaptation-3=Adaptacja czworonożna 3 +nullius-upgrade-quadrupedal-adaptation-4=Adaptacja czworonożna 4 +nullius-upgrade-stabilizer-1=Stabilizator 1 +nullius-upgrade-stabilizer-2=Stabilizator 2 +nullius-upgrade-shackle=Kajdany +nullius-portable-generator=Generator +nullius-portable-generator-backup=Generator zapasowy +nullius-portable-reactor=Przenośny reaktor +nullius-refueler=Napełniacz +nullius-upgrade-jump-boots=Buty skokowe +nullius-upgrade-coprocessor-speed=Koprocesor prędkości +nullius-upgrade-coprocessor-efficiency=Koprocesor wydajności +nullius-upgrade-coprocessor-productivity=Koprocesor produktywności +nullius-upgrade-coprocessor-quantum=Koprocesor kwantowy +nullius-deactivated-coprocessor=__1__ __2__ (wyłączony) [equipment-description] +nullius-buffer=__1__\n[font=default-semibold][color=1,0.9,0.75]Bateria wewnętrzna:[/color][/font] __2__ +nullius-bonus-armor=[font=default-semibold][color=1,0.9,0.75]Premia do zdrowia:[/color][/font] __1__ +nullius-bonus-cargo=[font=default-semibold][color=1,0.9,0.75]Premia do ekwipunku:[/color][/font] __1__ +nullius-penalty-cargo=[font=default-semibold][color=1,0.9,0.75]Kara do ekwipunku:[/color][/font] __1__ +nullius-bonus-trash=[font=default-semibold][color=1,0.9,0.75]Premia do miejsca wywozu:[/color][/font] __1__ +nullius-bonus-reach=[font=default-semibold][color=1,0.9,0.75]Premia do zasięgu:[/color][/font] __1__ +nullius-penalty-reach=[font=default-semibold][color=1,0.9,0.75]Kara do zasięgu:[/color][/font] __1__ +nullius-bonus-speed=[font=default-semibold][color=1,0.9,0.75]Premia do prędkości:[/color][/font] __1__% (pomnożona przez premię do ruchu) +nullius-penalty-speed=[font=default-semibold][color=1,0.9,0.75]Kara do prędkości:[/color][/font] __1__% (pomnożona przez premię do ruchu) +nullius-bonus-craft=[font=default-semibold][color=1,0.9,0.75]Premia do wytwarzania:[/color][/font] __1__%\n[font=default-semibold][color=1,0.9,0.75]Energia na sekundę przepisu:[/color][/font] __2__kJ +nullius-penalty-craft=[font=default-semibold][color=1,0.9,0.75]Kara do wytwarzania:[/color][/font] __1__% +nullius-bonus-mining=[font=default-semibold][color=1,0.9,0.75]Premia do szybkości wydobycia/rozbiórki:[/color][/font] __1__% +nullius-energy=[font=default-semibold][color=1,0.9,0.75]Zużycie energii:[/color][/font] __1__ nullius-solar-panel-1=Cykliczna energia odnawialna o średniej mocy 70kW. Budynek lub wyposażenie. nullius-solar-panel-2=Cykliczna energia odnawialna o średniej mocy 140kW. Budynek lub wyposażenie. nullius-solar-panel-3=Cykliczna energia odnawialna o średniej mocy 350kW. Budynek lub wyposażenie. -nullius-solar-panel-4=Cykliczna energia odnawialna o średniej mocy 700kW. Budynek lub wyposażenie. +nullius-solar-panel-4=Cykliczna energia odnawialna o średniej mocy 560kW. Budynek lub wyposażenie. nullius-night-vision-1=Przyzwoita widoczność w ciemności. nullius-night-vision-2=Dobra widoczność w ciemności. nullius-night-vision-3=Doskonała widzialność w ciemności. nullius-levitation-field=Chodzenie nad przenośnikami taśmowymi bez przemieszczania się. -nullius-leg-augmentation-1=Zwiększa prędkość ruchu. Możliwość łączenia. -nullius-leg-augmentation-2=Zwiększa prędkość ruchu. Możliwość łączenia. -nullius-leg-augmentation-3=Zwiększa prędkość ruchu. Możliwość łączenia. -nullius-leg-augmentation-4=Zwiększa prędkość ruchu. Możliwość łączenia. -nullius-hangar=Magazyn dla robotów pomiędzy zadaniami. Budynek lub wyposażenie. +nullius-shield=Osobiste pole obronne. +nullius-leg-augmentation=Zwiększa prędkość ruchu. Możliwość łączenia. +nullius-hangar=Magazyn dla robotów pomiędzy zadaniami. Budynek lub wyposażenie.\nTryb tylko budowania można włączyć za pomocą __CONTROL__nullius-prioritize__. nullius-charger=Dodatkowe ładowanie dla aktywnych robotów. Budynek lub wyposażenie. -nullius-relay=Zwiększa zasięg roboczy dla robotów. Budynek lub wyposażenie. +nullius-relay=Zwiększa zasięg roboczy dla robotów. Budynek lub wyposażenie.\nTryb tylko budowania można włączyć za pomocą __CONTROL__nullius-prioritize__. nullius-battery=Urządzenie magazynujące energię lub paliwo dla pojazdów. nullius-jetpack-1=[font=default-bold][color=#f5cb48]Siła ciągu: 1[/color][/font]\nNNaciśnij __CONTROL__jetpack__, aby aktywować.\nUmożliwia latanie nad strukturami i wodą. Kilka jetpacków pozwala latać szybciej. Latanie zużywa paliwo rakietowe lub kanistry metanolu z twojego ekwipunku. nullius-jetpack-2=[font=default-bold][color=#f5cb48]Siła ciągu: 2[/color][/font]\nNaciśnij __CONTROL__jetpack__, aby aktywować.\nUmożliwia latanie nad strukturami i wodą. Kilka jetpacków pozwala latać szybciej. Latanie zużywa paliwo rakietowe lub kanistry metanolu z twojego ekwipunku. nullius-jetpack-3=[font=default-bold][color=#f5cb48]Siła ciągu: 3[/color][/font]\nNaciśnij __CONTROL__jetpack__, aby aktywować.\nUmożliwia latanie nad strukturami i wodą. Kilka jetpacków pozwala latać szybciej. Latanie zużywa paliwo rakietowe lub kanistry metanolu z twojego ekwipunku. nullius-jetpack-4=[font=default-bold][color=#f5cb48]Siła ciągu: 4[/color][/font]\nNaciśnij __CONTROL__jetpack__, aby aktywować.\nUmożliwia latanie nad strukturami i wodą. Kilka jetpacków pozwala latać szybciej. Latanie zużywa paliwo rakietowe lub kanistry metanolu z twojego ekwipunku. +nullius-portable-generator=Spala paliwo samochodowe, aby zasilać sprzęt androidów. +nullius-portable-generator-backup=Spala paliwo samochodowe, aby zasilać sprzęt androidów. Ma niższy priorytet niż baterie. Może być przydatny jako uzupełnienie energii słonecznej, wykorzystując paliwo w ostateczności. +nullius-portable-reactor=Spala paliwo jądrowe, aby zasilić sprzęt androida. +nullius-refueler=Automatycznie uzupełnia generatory i przenośne reaktory paliwem z zapasów. Ładuje tylko paliwo tego samego typu, które jest już używane przez ten sprzęt. +nullius-jump-boots=Poświęca udźwig na rzecz prędkości ruchu. +nullius-deactivated-coprocessor=Ten koprocesor został wyłączony po przekroczeniu limitu dla koprocesorów poziomu __1__. +nullius-coprocessor-quantum=Umożliwia instalację maksymalnie 2 koprocesorów różnych typów dla każdego poziomu. +nullius-coprocessor-speed=Zwiększa prędkość ruchu i tworzenia przedmiotów. Mnoży prędkość i zużycie energii innych narzędzi rzemieślniczych.\n[font=default-semibold][color=1,0.9,0.75]Mnożnik prędkości wytwarzania:[/color][/font] __1__%\n[font=default-semibold][color=1,0.9,0.75]Kara za energię wytwarzania:[/color] [/font] __2__%\n[font=default-semibold][color=1,0.9,0.75]Energia na sekundę przepisu:[/color][/font] __3__kJ +nullius-coprocessor-efficiency=Optymalizuje podstawowe zużycie energii przez system Androida i narzędzia rzemieślnicze.\n[font=default-semibold][color=1,0.9,0.75]Nadwyżka energii:[/color][/font] __1__kW\n[font=default-semibold][color=1,0.9,0.75] Zniżka na energię potrzebną do wytwarzania:[/color][/font] __2__% +nullius-coprocessor-productivity=Zwiększa wydajność wytwarzania ręcznego z tego samego materiału kosztem szybkości. Organizuje ładunek w celu lepszego wykorzystania dodatkowej przestrzeni magazynowej.\n[font=default-semibold][color=1,0.9,0.75] Premia do produktywności:[/color][/font] __1__%\n[font=default-semibold][color=1,0.9,0.75]Kara do szybkości wytwarzana:[/color][/font] __2__%\n[font=default-semibold][color=1,0.9,0.75] Energia na sekundę przepisu:[/color][/font] __3__kJ\n[font=default-semibold][color=1,0.9,0.75]Pojemność modułu ładunkowego:[/color][/font] __4__% +nullius-coprocessor-tier-1=Możliwość zainstalowania maksymalnie 2 koprocesorów poziomu 1 różnych typów. +nullius-coprocessor-tier-2=Możliwość zainstalowania 1 koprocesora poziomu 2 oprócz koprocesora poziomu 1. +nullius-coprocessor-tier-3=Możliwość zainstalowania 1 koprocesora poziomu 3 oraz koprocesorów niższych poziomów. diff --git a/nullius/locale/pl/fluid.cfg b/nullius/locale/pl/fluid.cfg index 9935e36..bb8e42f 100644 --- a/nullius/locale/pl/fluid.cfg +++ b/nullius/locale/pl/fluid.cfg @@ -2,8 +2,10 @@ nullius-seawater=Woda morska nullius-freshwater=Woda słodka nullius-saline=Woda słona -nullius-water=Woda destylowana -nullius-steam=Para +nullius-water=Woda +nullius-steam=Para wodna +nullius-energy=Energia +nullius-pressure-steam=Para wodna pod wysokim ciśnieniem nullius-brine=Solanka nullius-wastewater=Ścieki nullius-sludge= Osad @@ -57,16 +59,21 @@ nullius-compressed-residual-gas=Sprężony gaz resztkowy nullius-compressed-trace-gas=Sprężony gaz śladowy nullius-amino-acids=Aminokwasy nullius-fatty-acids=Kwasy tłuszczowe +nullius-amino-acid=Aminokwas +nullius-fatty-acid=Kwas tłuszczowy nullius-oil=Olej +nullius-petroleum=Ropa naftowa nullius-biodiesel=Biodiesel +nullius-nucleotide=Nukleotyd nullius-nucleotides=Nukleotydy nullius-copper-solution=Roztwór miedzi nullius-protocell=Protokomórka nullius-bacteria=Bakteria [fluid-description] -nullius-water=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] H[font=default-tiny-bold]2[/font]O [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] ciecz ([item=nullius-outfall-2]) -nullius-steam=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] H[font=default-tiny-bold]2[/font]O [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Gaz ([item=nullius-chimney-2])\[font=default-semibold][color=1,0.9,0.75]Energia turbiny:[/color][/font] 6kJ +nullius-water=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] H[font=default-tiny-bold]2[/font]O [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Ciecz ([item=nullius-outfall-2]) +nullius-steam=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] H[font=default-tiny-bold]2[/font]O [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Gaz ([item=nullius-chimney-2])\[font=default-semibold][color=1,0.9,0.75]Energia turbiny:[/color][/font] 6kJ\n[font=default-semibold][color=1,0.9,0.75]Odzysk zamkniętej turbiny:[/color][/font] 1 wody [fluid=nullius-water] na 6 [fluid=nullius-steam] +nullius-pressure-steam=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] H[font=default-tiny-bold]2[/font]O [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Nadkrytyczny (usuwany w 1)\n[font=default-semibold][color=1,0.9,0.75]Energia turbiny:[/color][/font] 20kJ\n[font=default-semibold][color=1,0.9,0.75]Odzysk zamkniętej turbiny:[/color][/font] 1 wody [fluid=nullius-water] na 2 [fluid=nullius-pressure-steam] nullius-saline=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] NaCl [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Wodny (rozcieńczony) ([item=nullius-outfall-2]) nullius-brine=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] NaCl [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Wodny (stężony) ([item=nullius-outfall-2]) nullius-seawater=[font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Wodny ([item=nullius-outfall-2]) @@ -109,7 +116,6 @@ nullius-acrylonitrile=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/f nullius-ech=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] C[font=default-tiny-bold]3[/font]H[font=default-tiny-bold]5[/font]ClO [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Ciecz (usuwany w 2*) nullius-glycerol=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] C[font=default-tiny-bold]3[/font]H[font=default-tiny-bold]8[/font]O[font=default-tiny-bold]3[/font] [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Ciecz (usuwany w 1*) nullius-lubricant=[font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Ciecz (nie można usunąć) - nullius-solvent=[font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Ciecz (nie można usunąć) nullius-epoxy=[font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Płynny (nie można usunąć) nullius-titanium-tetrachloride=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] TiCl[font=default-tiny-bold]4[/font] [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Ciecz (nie można usunąć) @@ -130,3 +136,6 @@ nullius-protocell=Pluripotencjalne komórki, które mogą być przekształcane w nullius-bacteria=Roztwór mikroskopijnych, jednokomórkowych organizmów.\n[font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Wodny ([item=nullius-outfall-2]) nullius-heavy-water=[font=default-semibold][color=1,0.9,0.75]Formuła:[/color][/font] HDO [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Ciecz ([item=nullius-outfall-2]) nullius-copper-solution=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] CuSO[font=default-tiny-bold]4[/font] [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Wodny (nie można usunąć) +nullius-oxygen-reduction=__2__\n[font=default-semibold][color=1,0.9,0.75]Redukcja tlenu:[/color][/font] __1__% +nullius-oxygenation=__2__\n[font=default-semibold][color=1,0.9,0.75]Natlenienie:[/color][/font] __1__% +nullius-recapture=__2__\n[font=default-semibold][color=1,0.9,0.75]Odzysk zamkniętej turbiny:[/color][/font] __1__% diff --git a/nullius/locale/pl/informatron.cfg b/nullius/locale/pl/informatron.cfg index 4198e4c..636b7b2 100644 --- a/nullius/locale/pl/informatron.cfg +++ b/nullius/locale/pl/informatron.cfg @@ -11,82 +11,56 @@ page_nullius_text_3=Po stworzeniu bazy przemysłowej wystarczającej do wystrzel menu_mods=Mody title_mods=Mody page_mods_text_1=Ten mod używa innych zasobów, technologii i receptur, więc nie współdziała dobrze z innymi modami, które mają własne technologie i receptury, chyba że zostały one specjalnie przystosowane do pracy z Nulliusem. Mody poprawiające jakość życia bez własnych technologii i receptur mogą po prostu działać. Niektóre wspólne cechy rozgrywki modów są już zintegrowane z Nulliusem w jakiejś formie, włączając w to funkcje napełniania wodą, układania przedmiotów i nieskończone rudy. Wybrana liczba modów z technologiami została już przeniesiona do Nulliusa. Oczekuje się, że inne zostaną dodane. Ta kompatybilność może być dodana albo przez Nulliusa, albo przez inny mod. - page_mods_text_2=Mody, o których wiadomo, że zostały już przeniesione to: Miniloader, Transport Drones, Jetpack, Factorissimo2, LTN - Logistic Train Network, LTN Combinator Modernized, Bob's Adjustable Inserters, Safe Waterfill, Teleporters, Advanced Fluid Handling, Warehousing, Robot Replacer, AAI Signal Transmission, Train Supply Manager (TSM), Induction Charging, Stack Combinator, Text Plates, Resource Spawner Overhaul (RSO) oraz I,Robot. menu_research=Badania title_research=Badania page_research_text_1=Nullius posiada 7 pakietów badawczych. Pierwsze 2 są odblokowywane bardzo wcześnie, a następne 5 jest stopniowo coraz bardziej zaawansowanych i wykładniczo droższych. Drzewo technologiczne można więc podzielić na 6 różnych poziomów. - page_research_text_2=Nullius zastępuje wszystkie technologie z oryginalnej gry, więc nazwy i progresja różnią się znacznie od tego, do czego możesz być przyzwyczajony. Prawie wszystko, co możesz zrobić w podstawowej grze, możesz zrobić w Nulliusie, z wyjątkiem kilku technologii wojskowych lub energetycznych, ale mogą one występować w innej formie. Nullius stara się zlikwidować niektóre zbędne półprodukty i zamiast tego używa gotowych produktów jako półproduktów lub przeładowuje przedmioty z wieloma zastosowaniami. - page_research_text_3=Kilka przykładów: Materiały wybuchowe do klifów i materiały wybuchowe nie są oddzielnymi przedmiotami; Materiały wybuchowe Nullius są półproduktem, który również wysadza klify. Nie ma osobnego wyposażenia do baterii osobistych; zwykłe baterie to wyposażenie, półprodukty i paliwo do pojazdów z możliwością ładowania. Radary są nazywane węzłami czujników, a kluczowa różnica polega na tym, że mają one znacznie mniejszy promień do skanowania odległych sektorów (aspekt, który jest bardziej potrzebny w przypadku kąsaczy), ale większy promień do zdalnego podglądu fabryki z widoku mapy. Zamiast tego Nullius zapewnia inną metodę skanowania bardzo odległych sektorów w ramach technologii eksploracji. menu_early=Wczesna gra title_early=Wczesna gra page_early_header_1=Poziom 1, Badania geologiczne i klimatyczne - page_early_text_1=Zaczynasz bez żadnych receptur, ale pierwsza technologia odblokowuje próbki geologiczne i nie wymaga żadnych pakietów badawczych, a jedynie czasu spędzonego w laboratorium. Twoje laboratorium jest dostępne gdzieś we wraku twojego statku. Na początku będziesz miał dostęp do wystarczającej ilości budynków, które będą Ci potrzebne do osiągnięcia postępów w grze, abyś mógł je samodzielnie stworzyć. - page_early_text_2=Geologia i Klimatologia są proste i tanie w produkcji. Technologie na tym poziomie mają bardzo niskie koszty i są przeznaczone do szybkiego zbadania. Służą one jako wstęp do procesów produkcji niezbędnych materiałów dla następnego poziomu badań. - page_early_header_2=Poziom 2, Badania nad inżynierią mechaniczną - page_early_text_3=Mechanika nie jest tak prosta w produkcji, ale technologie na tym poziomie nadal wymagają niewielkiej ilości pakietów badawczych. Technologie te pozwalają na zbudowanie własnych kopii większości struktur, z którymi rozpoczynasz grę, dzięki czemu możesz rozbudowywać swoją bazę w nieskończoność. Pod koniec tego poziomu będziesz w stanie wyeliminować wszystkie produkty uboczne, umożliwiając w ten sposób trwałą automatyzację. - page_early_text_4=Ponieważ bez tych podstawowych technologii mechanicznych nie da się w ogóle rozwinąć produkcji, większość technologii tego poziomu i wcześniejszych nie jest zależna od ustawienia mnożnika kosztu technologii. menu_mid=Środek gry title_mid=Środek gry page_mid_header_1=Poziom 3, Badania nad inżynierią elektryczną - page_mid_text_1=Teraz, gdy możesz zbudować własne laboratoria i większą fabrykę, badania zaczynają być droższe. Elektronika umożliwia bardziej zaawansowaną kontrolę, automatyzację i dostosowanie funkcji, w tym pierwsze pojawienie się botów, modułów, sygnałów kolejowych, długich podajników i kombinatorów. Odblokowuje ona wersje poziomu 2 większości podstawowych struktur produkcyjnych, a także kilka nowych typów struktur. - page_mid_header_2=Poziom 4, Badania chemiczne - page_mid_text_2=Chemia odblokowuje nowe zastosowania dla istniejących zasobów i wiele nowych materiałów, umożliwiając tworzenie użytecznych narzędzi, takich jak baterie i materiały wybuchowe. Posiada również narzędzia do prawdziwej masowej produkcji. Produkty pośrednie mogą być pakowane w pudełka dla zwiększenia przepustowości transportu, a nowe receptury pozwalają na bezpośrednią produkcję materiałów w pudełkach z innych materiałów w pudełkach. Podobnie, gazy mogą być sprężane dla większej przepustowości i bardziej wydajnej chemii. menu_late=Późna gra title_late=Późna gra page_late_header_1=Poziom 5, Badania Fizyczne - page_late_text_1=Badania są znacznie bardziej skomplikowane w produkcji, prawie wymagając przynajmniej częściowego użycia botów do automatyzacji, ale ponieważ produkujesz wiele na raz, koszt zasobów jest porównywalny z wcześniejszymi poziomami. Ten poziom pozwala na zbudowanie trzeciego i ostatniego poziomu najbardziej podstawowych struktur. Umożliwia on nowe funkcje, takie jak terraformowanie otoczenia na masową skalę za pomocą dronów i rakiet, niezbędne do przejścia do gry końcowej na następnym poziomie. - page_late_header_2=Poziom 6, Badania astronomiczne - page_late_text_2=To jest gra końcowa. Na początku tego poziomu, po wystrzeleniu pierwszej rakiety, zostanie ci przydzielony panel misji z trackerem twoich celów. Zadania te będą znikać, gdy osiągną 100% postępu, a wygrasz, gdy wszystkie zostaną ukończone. Oprócz badań, możesz używać swoich rakiet do wydobywania asteroid, co pozwoli ci na zakładanie stacjonarnych placówek górniczych z odnawialnymi minerałami. Wiele z technologii na tym poziomie jest nieskończonych, choć ich wykładnicze koszty w końcu staną się nieosiągalne. Te nieskończone technologie stanowią dobrą motywację do kontynuowania produkcji na skalę megabaz, nawet po osiągnięciu podstawowych celów terraformowania. menu_fluids=Płyny title_fluids=Płyny page_fluids_text_1=Chemia i manipulacja płynami są krytycznymi częściami systemu craftingu Nullius, więc ważne jest, aby zrozumieć jak zarządzać płynami. Istnieją pewne obszary, w których Nullius odbiega od waniliowego zarządzania płynami, o których należy pamiętać. -page_fluids_header_1=Ciśnienie -page_fluids_text_2=Nullius posiada pojęcie "ciśnienia" dla rur i zbiorników. Jest to abstrakcja, która wykorzystuje właściwości symulacji płynów silnika gry Factorio do tworzenia rur o różnej przepustowości. Głównym efektem większej wartości "ciśnienia" jest to, że rura 4 przesyła znacznie więcej płynu na sekundę niż rura 1. Rura waniliowa pod względem przepustowości plasowałaby się gdzieś pomiędzy rurami Nullius 1 i 2. Ten efekt jest skomplikowany do osiągnięcia w Factorio i ma kilka efektów ubocznych. - -page_fluids_text_3=Ciśnienie znamionowe każdej rury i zbiornika jest podane w etykiecie narzędzia. Gdy rura 1 jest całkowicie wypełniona, osiąga maksymalne ciśnienie 40%. Gdy rura 2 jest pełna, osiąga 60%, rura 3 - 80%, a gdy rura 4 jest pełna - 100%. Zbiorniki mogą wytrzymać trochę większe ciśnienie niż rury. 100% czego? Arbitralnej ilości, którą mogą obsłużyć najlepsze rury. Ten system jest tylko abstrakcją, która nie ma na celu odnosić się do stałej ilości ciśnienia w świecie rzeczywistym. - -page_fluids_text_4=Ponieważ rury 1 i 2 nigdy nie osiągają 75% ciśnienia, nawet gdy są pełne, nie są one kompatybilne z zaworem nadmiarowym, który ma próg 75%. Zbiornik 1 przekracza 75%, więc może być używany z zaworem nadmiarowym. Problem polega na tym, że jeśli podłączysz zbiornik 1 bezpośrednio do rury 1, będzie on napełniony tylko do połowy z powodu różnicy ciśnień. Można to rozwiązać za pomocą pomp, które napełnią zbiornik całkowicie, niezależnie od ciśnienia źródła. To jest powód, dla którego zawory nadmiarowe stają się dostępne w tej samej technologii co pompy, ponieważ bez pomp są one bezużyteczne we wczesnej fazie gry. - +page_fluids_header_1=Ciśnienie (przestarzała mechanika) +page_fluids_text_2=W Nulliusie istniała koncepcja oceny „ciśnienia” dla rur i zbiorników. Została ona usunięta przez silnik w wersji 2.0, a nowy system płynów znacznie upraszcza wszystkie kwestie związane z manipulowaniem płynami. Używaj pomp, zbiorników i zaworów, aby opanować płyny! page_fluids_header_2=Odpadowe produkty uboczne page_fluids_text_5=Wiele procesów chemicznych w Nulliusie wytwarza 2 lub więcej produktów. Za każdym razem, gdy tak się dzieje, prawdopodobnie powstaje odpadowy produkt uboczny, ponieważ jest mało prawdopodobne, abyś użył wszystkich produktów dokładnie w takim stosunku, w jakim zostały wytworzone. Utylizacja niechcianych odpadów płynnych jest niezbędna dla zrównoważonej automatyzacji. - page_fluids_text_6=Najedź kursorem na ikonę płynu, aby przeczytać etykietę. Płyny mogą być gazami lub cieczami. Większość gazów można odprowadzić kominem, a większość cieczy można odprowadzić kanałem odpływowym. Jednakże, niektóre z nich są oznaczone jako nierozkładalne i nie mogą być po prostu odpowietrzone. Wszystkie produkty uboczne można w jakiś sposób zniszczyć, ale może być wymagane więcej kroków. Na przykład kwas chlorowodorowy musi być najpierw zneutralizowany przez roztwór żrący. Benzen musi zostać spalony do postaci jednorazowych gazów. Niektóre substancje stałe, takie jak wodorotlenek sodu lub żwir, mogą być przetwarzane na ciecz w celu utylizacji. Większość kluczowych technologii utylizacji odpadów jest dostępna pod koniec technologii inżynierii mechanicznej. We wczesnej fazie gry, zanim to nastąpi, możesz być zmuszony do zbudowania kilku skrzyń lub ręcznego oczyszczenia zbiorników. - page_fluids_text_7=Zawory są niezbędne do zarządzania złożoną siecią produktów i produktów ubocznych. Zawory nadmiarowe są używane do odprowadzania odpadów, jeśli zbiornik się napełnia i istnieje ryzyko spowolnienia produkcji, bez marnowania ich, jeśli zbiornik nie jest pełny. Zawory pomocnicze umożliwiają wysyłanie płynu do drugiego wyjścia tylko wtedy, gdy jest go wystarczająco dużo, aby najpierw zaspokoić ważniejszego odbiorcę. Zawory uzupełniające pozwalają napełnić zbiornik tylko wtedy, gdy jego zawartość jest na wyczerpaniu, ale pozostawiają miejsce na to, aby płyn mógł być również produkowany jako produkt uboczny bez marnowania go. - page_fluids_text_8=Coś, o czym należy pamiętać, to fakt, że Komin 1 i Wylot 1 są niewydajne i nie opróżnią całkowicie rury. Źródło musi się trochę napełnić, by pokonać ich opór, zanim zaczną się odpowietrzać. Pompy mogą być przydatne do utrzymania płynów w ruchu. menu_energy=Energia title_energy=Energia page_energy_text_1=Bez życia w Nulliusie, nie ma węgla, drewna ani ropy, a w atmosferze nie ma tlenu, by je spalić. Wymaga to korzystania z odnawialnych źródeł energii. - page_energy_text_2=Energia wiatrowa jest najniższą technologicznie dostępną opcją, i na początku gry jest to jedyna realna opcja. Później, w inżynierii mechanicznej, uzyskasz dostęp do energii słonecznej, która jest droższa, ale ciepło może być oszczędzane, aby być używane w nocy lub gdy wiatry są słabe. Zaczynając na etapie inżynierii elektrycznej, masz do wyboru szereg opcji z różnymi mocnymi i słabymi stronami. Wiatr wymaga dużej ilości ziemi i jest nieprzewidywalny. Panele słoneczne mogą być drogie i nie produkują nic w nocy. Geotermia wytwarza stałą moc, ale może być umieszczona tylko na wulkanicznych fumarolach. Energia jądrowa wytwarza stałą energię i może być budowana w dowolnym miejscu, ale zużywa pewne zasoby. - page_energy_text_3=Turbiny wiatrowe muszą być rozmieszczone w odległości dokładnie 32 kafli od siebie, więc zajmują dużo miejsca. Użycie schematów wyrównanych do siatki lub widoku siatki f5 może pomóc w zaplanowaniu prawidłowych odstępów. Rozmieszczanie turbin będzie łatwiejsze, gdy zbadasz pylon 1, ponieważ osiągną one dokładnie te 32 kafle, które są potrzebne do umieszczenia po jednej turbinie. Nie bój się zbudować dużej farmy wiatrowej, ponieważ nie ma tam kąsaczy, więc nie musisz bronić tego terytorium. Boty, z którymi zaczynasz, mogą pomóc w umieszczaniu projektów. page_energy_header_1=Magazynowanie energii page_energy_text_4=Ponieważ wiatr i słońce produkują zmienne ilości energii, wymagają one magazynowania energii. Akumulatory są dostępne dopiero w technologii inżynierii chemicznej, ze względu na ograniczoną ilość elementów, z których można je wykonać. Do tego czasu można budować własne systemy równoważne "akumulatorom" wykorzystujące elektrolizę lub sprężony gaz, używając elektrolizerów lub sprężarek impulsowych. Elektrolizer impulsowy działa tylko z nadwyżką energii, tak jak akumulator magazynuje energię. Wytworzony w ten sposób wodór i tlen można przechowywać w zbiornikach, gdy wiatr lub słońce produkują dodatkową energię, a następnie spalać, gdy nie wytwarzają jej wystarczająco dużo. Turbina będzie zużywać parę tylko wtedy, gdy wiatr i słońce nie będą produkować wystarczającej ilości energii. - page_energy_text_5=Warto rozważyć użycie tych elektrolizerów impulsowych nawet w regularnej produkcji, zamiast bardziej konwencjonalnych elektrolizerów priorytetowych. Elektrolizery impulsowe mają wysoką maksymalną przepustowość, więc mogą napełniać zbiorniki w czasie obfitości energii, a reszta bazy może pracować wykorzystując zmagazynowane produkty ze zbiorników w czasie, gdy elektrolizery nie pracują. Elektroliza jest jednym z głównych odbiorników energii, więc utrzymanie jej elastyczności w ten sposób może zmniejszyć minimalne zapotrzebowanie na energię i zmniejszyć zapotrzebowanie na magazynowanie energii. Wadą tego rozwiązania jest to, że jeśli stale brakuje Ci energii, możesz nie zauważyć oczywistych objawów, takich jak przerwy w dostawie prądu, ale zamiast tego zobaczysz, że kończy Ci się wodór. - page_energy_text_6=Temperatura pary w Nulliusie jest tylko kosmetyczna. Reakcje o wyższej temperaturze dają większą objętość pary w stosunku do wkładu, a to liczba jednostek ma znaczenie. Każda jednostka pary ma pewną ilość energii, widoczną w tooltipie, więc łatwo jest obliczyć ile energii jest zmagazynowane w zbiorniku. Te same turbiny, które zużywają parę, będą również zużywać inne sprężone gazy, z których każdy ma określoną ilość wymienionej energii na jednostkę. Sprężony azot jest najczęściej wybieranym medium do magazynowania energii, ponieważ separacja powietrza zapewnia stały dopływ nadmiaru azotu jako produktu ubocznego. diff --git a/nullius/locale/pl/item.cfg b/nullius/locale/pl/item.cfg index 5ea9343..ce0ba09 100644 --- a/nullius/locale/pl/item.cfg +++ b/nullius/locale/pl/item.cfg @@ -2,8 +2,10 @@ chemistry=Chemia metallurgy=Metalurgia nullius-intermediates=Półprodukty +drones=Drony equipment=Wyposażenie biology=Biologia +void=Usuwanie boxed=Zapakowany boxing=Pakować unboxing=Rozpakować @@ -14,6 +16,9 @@ unused=Nieużywany [item-name] nullius-box=__1__ skrzynka nullius-broken=__1__ (uszkodzony) +nullius-checkpoint=Punkt kontrolny +nullius-requirement-build=Wymagania budowlane +nullius-requirement-consume=Wymagania dotyczące zużycia nullius-geology-pack=Próbka minerałów nullius-climatology-pack=Próbka klimatu nullius-mechanical-pack=Próbka mechaniczna @@ -28,6 +33,7 @@ nullius-dendrology-pack=Próbka dendrologiczna nullius-nematology-pack=Próbka nematologiczna nullius-ichthyology-pack=Próbka ichtiologiczna nullius-zoology-pack=Próbka zoologiczna +nullius-iron=Żelazo nullius-iron-ingot=Sztabka żelazna nullius-iron-plate=Płytka żelazna nullius-iron-rod=Pręt żelazny @@ -43,6 +49,7 @@ nullius-limestone=Wapień nullius-gravel=Żwir nullius-plastic=Plastik nullius-graphite=Grafit +nullius-coal=Węgiel nullius-crushed-iron-ore=Kruszona ruda żelaza nullius-crushed-limestone=Kruszony wapień nullius-crushed-bauxite=Kruszony boksyt @@ -77,12 +84,14 @@ nullius-steel-rod=Pręt stalowy nullius-steel-sheet=Blacha stalowa nullius-steel-gear=Koło zębate stalowe nullius-iron-oxide=Tlenek żelaza -nullius-alumina=Aluminium +nullius-alumina=Glinka +nullius-aluminum=Aluminium nullius-aluminum-carbide=Węglik glinu nullius-aluminum-plate=Płyta aluminiowa nullius-aluminum-rod= Pręt aluminiowy nullius-aluminum-sheet=Blacha aluminiowa nullius-aluminum-wire= Drut aluminiowy +nullius-aluminum-powder=Proszek aluminiowy nullius-aluminum-ingot=Sztabka aluminiowa nullius-aluminum-hydroxide=Wodorotlenek aluminium nullius-rutile=Rutyl @@ -119,6 +128,7 @@ nullius-rocket-fuel=Paliwo rakietowe nullius-water-canister=Kanister wody destylowanej nullius-gas-void=Wylot gazu nullius-liquid-void=Wylot cieczy +nullius-power-sink=Pobór mocy nullius-battery-1=Bateria 1 nullius-uncharged-battery-1=Bateria 1 (nienaładowana) nullius-battery-2=Bateria 2 @@ -171,6 +181,8 @@ nullius-blue-concrete=Beton niebieski nullius-yellow-concrete=Beton żółty nullius-green-concrete=Beton zielony nullius-purple-concrete=Beton purpurowy +nullius-white-concrete=Beton biały +nullius-orange-concrete=Beton pomarańczowy nullius-brown-concrete=Beton brązowy nullius-black-concrete=Beton czarny nullius-scout-drone-1=Dron zwiadowczy 1 @@ -178,8 +190,10 @@ nullius-scout-drone-2=Dron zwiadowczy 2 nullius-scout-remote=Pilot zwiadowcy nullius-demolition-drone=Dron wyburzeniowy nullius-demolition-remote=Pilot dron wyburzeniowego -nullius-excavation-drone=Dron wykopaliskowy -nullius-excavation-remote=Pilot drona wykopaliskowego +nullius-shallow-excavation-drone=Dron wykopowy (płytki) +nullius-shallow-excavation-remote=Pilot drona wykopowego (płytki) +nullius-excavation-drone=Dron wykopowy (głęboki) +nullius-excavation-remote=Pilot drona wykopowego (głęboki) nullius-terraforming-drone-grey=Dron terraformujący (szary) nullius-terraforming-remote-grey=Pilot drona terraformującego (szary) nullius-terraforming-drone-tan=Dron terraformujący (jasnobrązowy) @@ -190,8 +204,14 @@ nullius-terraforming-drone-red=Dron terraformujący (czerwony) nullius-terraforming-remote-red=Pilot drona terraformującego (czerwony) nullius-terraforming-drone-beige=Dron terraformujący (beżowy) nullius-terraforming-remote-beige=Pilot drona terraformującego (beżowy) +nullius-sequestration-coal-drone=Dron sekwestracyjny (węgiel) +nullius-sequestration-coal-remote=Pilot drona sekwestracji (węgiel) +nullius-sequestration-petroleum-drone=Dron sekwestracyjny (ropa naftowa) +nullius-sequestration-petroleum-remote=Pilot drona sekwestracji (ropa naftowa) nullius-paving-drone-grey=Dron brukarski (szary) nullius-paving-remote-grey=Pilot drona brukarskiego (szary) +nullius-paving-drone-white=Dron brukarski (biały) +nullius-paving-remote-white=Pilot drona brukarskiego (biały) nullius-paving-drone-red=Dron brukarski (czerwony) nullius-paving-remote-red=Pilot drona brukarskiego (czerwony) nullius-paving-drone-blue=Dron brukarski (niebieski) @@ -223,12 +243,14 @@ nullius-guide-remote-uranium=Pilot drona sprowadzającego (uran) nullius-mecha-remote=Pilot Mecha nullius-drone-cannon= Działko dronów nullius-gun=Pistolet +nullius-rifle=Karabin nullius-missile-launcher=Wyrzutnia pocisków nullius-mecha-drone-launcher=Wyrzutnia dronów nullius-magazine=Magazyn nullius-missile-1=Pocisk 1 nullius-missile-2=Pocisk 2 nullius-explosive=Materiał wybuchowy +nullius-aneutronic-cell=Ogniwo aneutronowe nullius-fusion-cell=Ogniwo termojądrowe nullius-spent-fusion-cell=Zużyte ogniwo termojądrowe nullius-breeder-cell=Ogniwo mikrojądrowe @@ -247,7 +269,7 @@ nullius-copper-ingot=Sztabka miedzi nullius-copper-sheet=Blacha miedziana nullius-copper-wire=Drut miedziany nullius-crushed-uranium-ore=Kruszona ruda uranu -nullius-yellowcake="Yellowcake" +nullius-yellowcake="Żółte ciasto" nullius-uranium=Uran nullius-enriched-uranium=Uran wzbogacony nullius-algae=Algi @@ -303,6 +325,17 @@ nullius-underground-four-way-junction=Podziemne skrzyżowanie czterokierunkowe nullius-underground-pump=Pompa podziemna nullius-adjustable-top-up-valve=Regulowany zawór uzupełniający nullius-adjustable-relief-valve=Regulowany zawór nadmiarowy +nullius-companion-fuel=Paliwo do dronów +nullius-rock-picker=Zbieracz kamieni +nullius-wood-chip=Wióry drzewne +nullius-align-identification-card=Karta identyfikacyjna +nullius-align-invitation-card=Karta zaproszeniowa +nullius-align-transponder=Transponder +nullius-align-conscription-charge=Opłata za pobór +nullius-align-conscription-ray=Promień poboru +nullius-align-concordance-satellite=Satelita zgodności +nullius-red-wire=Czerwony przewód +nullius-green-wire=Zielony przewód [item-description] nullius-geology-pack=Badany w laboratorium w celu dostosowania technologii do lokalnych minerałów. @@ -345,6 +378,7 @@ nullius-lime=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] CaO nullius-soda-ash=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] Na[font=default-tiny-bold]2[/font]CO[font=default-tiny-bold]3[/font] [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Ciało stałe (usuwane w 4) nullius-salt=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] NaCl [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Ciało stałe (usuwane w 1) nullius-titanium-ingot=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] Ti [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Ciało stałe +nullius-rutile=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] TiO[font=default-tiny-bold]2[/font] [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Ciało stałe (usuwane w 3) nullius-copper-ingot=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] Cu [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Ciało stałe nullius-acid-boric=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] H[font=default-tiny-bold]3[/font]BO[font=default-tiny-bold]3[/font] [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Ciało stałe nullius-boron=[font=default-semibold][color=1,0.9,0.75]Wzór:[/color][/font] B [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Ciało stałe @@ -363,6 +397,7 @@ nullius-water-canister=Zużyty, wielokrotnego użytku kanister wodę destylowan nullius-haste-module-1=Zwiększa prędkość produkcji i zużycie energii. nullius-haste-module-2=Zwiększa prędkość produkcji i zużycie energii. nullius-haste-module-3=Zwiększa szybkość produkcji i zużycie energii. +nullius-haste-module-4=Zwiększa szybkość produkcji i zużycie energii. nullius-speed-module-1=Zwiększa prędkość produkcji w sposób efektywny. nullius-speed-module-2=Zwiększa prędkość produkcji w sposób efektywny. nullius-speed-module-3=Zwiększa prędkość produkcji w sposób efektywny. @@ -382,11 +417,13 @@ nullius-chassis-2=Noszone w gnieździe pancerza, aby zwiększyć pojemność spr nullius-chassis-3=Noszone w gnieździe pancerza, aby zwiększyć pojemność sprzętu, rozmiar ekwipunku i obronę. nullius-chassis-4=Noszone w gnieździe pancerza, aby zwiększyć pojemność sprzętu, rozmiar ekwipunku i obronę. nullius-chassis-5=Noszone w gnieździe pancerza, by zwiększyć pojemność sprzętu, rozmiar ekwipunku, obronę i opanowanie. -nullius-gun=Unicestwia pojedyncze cele. Załadowany magazynkami. +nullius-gun=Unicestwia pojedyncze cele. Załadowany magazynkami. +nullius-rifle=Niszczy cele w zwartej serii. Ładowany magazynkami. nullius-missile-launcher=Unicestwiaj obszary z dystansu za pomocą pocisków. nullius-mecha-drone-launcher=Wystrzeliwuje drony w pobliskie miejsca. nullius-mecha-remote=Łączy się z jednym mechem i przyzywa go zdalnie. -nullius-magazine=Unicestwia pojedyncze cele. Wystrzeliwany z pistoletu. +nullius-magazine=Unicestwia pojedyncze cele. Wystrzeliwany z pistoletu lub karabinu. +nullius-magazine-2=Niszczy wszystko. Wystrzeliwany z pistoletu lub karabinu. nullius-missile-1=Niszczy obiekty w umiarkowanym promieniu, w tym klify. nullius-missile-2=Niszczy wszystko w szerokim promieniu, pozostawiając kraterowe jezioro. nullius-explosive=Kontrolowana eksplozja bezpiecznie burzy klify. @@ -395,6 +432,8 @@ nullius-scout-drone-2=Odkrywa obszar mapy o wymiarach 13x13 sektorów. nullius-scout-remote=Wyznacza miejsce na mapie do wystrzelenia drona zwiadowczego. nullius-demolition-drone=Zniszczy wszystko oprócz pól zasobów w obszarze 4x4 sektorów. nullius-demolition-remote=Wyznacza miejsce na mapie do wystrzelenia drona wyburzającego. +nullius-shallow-excavation-drone=Zastępuje pusty teren płytką wodą w obszarze o wymiarach 4x4. Może podnieść ocenę terraformowania planety tak samo jak drony terraformujące (0,5x skuteczność terraformowania). +nullius-shallow-excavation-remote=Wybiera lokalizację na mapie, aby wystrzelić drona wykopowego, zastępującego pusty teren płytką wodą w obszarze sektora 4x4. nullius-excavation-drone=Zastępuje ląd wodą w obszarze 4x4 sektorów. Może podnieść ocenę terraformowania planety tak samo jak drony terraformujące. nullius-excavation-remote=Wyznacza miejsce na mapie do wystrzelenia drona wykopaliskowego. nullius-terraforming-drone-grey=Zastępuje krajobraz szarym terenem. Usuwa skały, klify, wodę i gruz. Podnosi ocenę terraformowania planety, gdy zastępuje egzotyczny teren, taki jak fioletowy, wulkaniczny lub czarny. @@ -409,6 +448,8 @@ nullius-terraforming-drone-beige=Zastępuje krajobraz beżowym terenem. Usuwa s nullius-terraforming-remote-beige=Wyznacza miejsce na mapie do uruchomienia drona terraformującego (beżowy). nullius-paving-drone-grey=Brukuje krajobraz za pomocą zbrojonego betonu. Usuwa skały, klify, wodę i gruz. nullius-paving-remote-grey=Wyznacza miejsce na mapie do wystrzelenia drona brukarskiego (szary). +nullius-paving-drone-white=Brukuje krajobraz za pomocą zbrojonego betonu. Usuwa skały, klify, wodę i gruz. +nullius-paving-remote-white=Wyznacza miejsce na mapie do wystrzelenia drona brukarskiego (biały). nullius-paving-drone-red=Brukuje krajobraz czerwonym zbrojonym betonem. Usuwa skały, klify, wodę i gruz. nullius-paving-remote-red=Wyznacza miejsce na mapie do wystrzelenia drona brukarskiego (czerwony). nullius-paving-drone-blue=Brukuje krajobraz niebieskim zbrojonym betonem. Usuwa skały, klify, wodę i gruz. @@ -431,24 +472,28 @@ nullius-asteroid-miner-1=Wystrzelony w celu znalezienia nowych zasobów w kosmos nullius-asteroid-miner-2=Wystrzelony w celu znalezienia nowych zasobów w kosmosie. nullius-guide-drone-iron-1=Prowadzi meteoryt z orbity, by utworzyć małą żelazną powierzchnię. nullius-guide-drone-iron-2=Prowadzi deszcz meteorów z orbity, by utworzyć dużą żelazną powierzchnię. -nullius-guide-remote-iron=Docelowa lokalizacja dla dronów prowadzących żelazo. +nullius-guide-remote-iron=Docelowa lokalizacja dla dronów sprowadzających żelazo. nullius-guide-drone-sandstone-1=Prowadzi meteoryt z orbity by utworzyć małą powierzchnię piaskowca. nullius-guide-drone-sandstone-2=Prowadzi deszcz meteorów z orbity by utworzyć dużą powierzchnię piaskowca. -nullius-guide-remote-sandstone=Wyznacza lokalizację dla dronów prowadzących piaskowiec. +nullius-guide-remote-sandstone=Wyznacza lokalizację dla dronów sprowadzających piaskowiec. nullius-guide-drone-bauxite-1=Prowadzi meteoryt z orbity, aby utworzyć małą powierzchnię z boksytu. nullius-guide-drone-bauxite-2=Prowadzi deszcz meteorytów z orbity by stworzyć dużą powierzchnię boksytu. -nullius-guide-remote-bauxite=Wyznacza lokalizację dla dronów prowadzących boksyt. +nullius-guide-remote-bauxite=Wyznacza lokalizację dla dronów sprowadzających boksyt. nullius-guide-drone-limestone-1=Prowadzi meteoryt z orbity, aby utworzyć małą powierzchnię wapienną. nullius-guide-drone-limestone-2=Prowadzi deszcz meteorytów z orbity by utworzyć dużą powierzchnię wapienną. -nullius-guide-remote-limestone=Docelowa lokalizacja dla dronów prowadzących wapień. +nullius-guide-remote-limestone=Docelowa lokalizacja dla dronów sprowadzających wapień. nullius-guide-drone-copper-1=Prowadzi meteoryt z orbity, by utworzyć małą miedzianą powierzchnię. nullius-guide-drone-copper-2=Prowadzi deszcz meteorytów z orbity, aby utworzyć dużą powierzchnię miedzi. -nullius-guide-remote-copper=Wyznacza lokalizację dla dronów prowadzących miedź. +nullius-guide-remote-copper=Wyznacza lokalizację dla dronów sprowadzających miedź. nullius-guide-drone-uranium-1=Prowadzi meteoryt z orbity, by utworzyć małą powierzchnię uranu. nullius-guide-drone-uranium-2=Prowadzi deszcz meteorytów z orbity by utworzyć dużą powierzchnię uranu. -nullius-guide-remote-uranium=Wyznacza lokalizację dla dronów prowadzących uran. +nullius-guide-remote-uranium=Wyznacza lokalizację dla dronów sprowadzających uran. +nullius-sequestration-coal-drone=Tworzy złoża węgla, zatrzymując nadmiar węgla oczyszczonego z atmosfery. +nullius-sequestration-coal-remote=Wskazuje lokalizację dla dronów sekwestrujących węgiel. +nullius-sequestration-petroleum-drone=Tworzy złoża ropy naftowej, zatrzymując nadmiar węgla i wodoru w celu uwolnienia tlenu. +nullius-sequestration-petroleum-remote=Wskazuje lokalizację dla dronów do sekwestracji ropy naftowej. nullius-algaculture-drone=Zasila wodę algami. Dla najlepszych rezultatów wybierz płytsze wody przybrzeżne i rozprosz inne algi. -nullius-algaculture-remote=Miejsca docelowe dla dronów prowadzących algi. +nullius-algaculture-remote=Miejsca docelowe dla dronów sprowadzających algi. nullius-horticulture-drone=Sadzi trawę. Dla najlepszych rezultatów celuj w teren w umiarkowanej odległości od wody i unikaj piasku, skał, rudy lub klifów. nullius-horticulture-remote=Lokalizacje docelowe dla dronów rolniczych. nullius-arboriculture-drone=Sadzi drzewa. Aby uzyskać najlepsze rezultaty, celuj w teren w umiarkowanej odległości od czerwiów, z dala od rudy lub fumaroli. @@ -471,7 +516,7 @@ nullius-grass=Mała, wszechstronna roślina lądowa. nullius-grass-genome=Profil genetyczny odmiany trawy, pobrany z transmisji przez waszych twórców i zmodyfikowany dla lokalnych warunków. nullius-grass-progenitor=Sztuczne nasiona trawy wyprodukowane w celu wytworzenia genetycznie zróżnicowanego naturalnego pokolenia. nullius-grass-seed=Niezbędne do wyhodowania trawy. -nullius-drzewo=Duża roślina lądowa zbudowana przede wszystkim z drewna. +nullius-tree=Duża roślina lądowa zbudowana przede wszystkim z drewna. nullius-tree-genome=Genetyczny profil odmiany drzewa, pobrany z transmisji przez waszych twórców i zmodyfikowany dla lokalnych warunków. nullius-tree-progenitor=Sztuczne nasiona drzew wyprodukowane w celu wytworzenia genetycznie zróżnicowanego naturalnego pokolenia. nullius-tree-seed=Niezbędne do wyhodowania drzew. @@ -488,7 +533,15 @@ nullius-arthropod=Ciało lądowego wszystkożercy o twardej skorupie. nullius-arthropod-genome=Genetyczny profil populacji stawonogów, pobrany z transmisji przez waszych twórców i zmodyfikowany do lokalnych warunków. nullius-arthropod-progenitor=Sztuczne jajo stawonoga wyprodukowane w celu wytworzenia genetycznie zróżnicowanego naturalnego potomstwa. nullius-arthropod-egg=Niezbędne do wyhodowania stawonogów. +nullius-antimatter=Niezwykle gęste, potężne paliwo do pojazdów, zbierane przez pułapkę antymaterii ([item=nullius-antimatter-trap]). nullius-antimatter-trap=Używany w reaktorze do zbierania paliwa antymaterii. +nullius-fusion-cell=Podstawowe paliwo jądrowe do zasilania reaktorów jądrowych ([item=nullius-reactor]). Skuteczne, ale zużywa znaczne ilości rzadkiego izotopu trytu ([fluid=nullius-tritium]). +nullius-aneutronic-cell=Alternatywne paliwo do syntezy jądrowej. Mniej energetyczne niż ogniwa fuzyjne trytu ([item=nullius-fusion-cell]), ale wykonane z bardziej dostępnych materiałów. +nullius-spent-fusion-cell=Wynik zużycia ogniwa fuzyjnego ([item=nullius-fusion-cell] lub [item=nullius-aneutronic-cell]) w reaktorze jądrowym ([item=nullius-reactor]). Zawiera hel pochodzący z fuzji ([fluid=nullius-helium]). +nullius-breeder-cell=Bardziej zaawansowana komórka fuzyjna, mniej energetyczna niż podstawowa ([item=nullius-fusion-cell]), ale przekształcająca nadwyżkę deuteru ([fluid=nullius-deuterium]) w bardziej wartościowy tryt ([fluid=nullius-tritium]). +nullius-spent-breeder-cell=Wynik zużycia komórki fuzyjnej ([item=nullius-breeder-cell]), która zawiera tryt ([fluid=nullius-tritium]). +nullius-fission-cell=Technicznie prostsze w wykorzystaniu paliwo jądrowe niż paliwo termojądrowe, ale oparte na egzotycznym pierwiastku, jakim jest uran ([item=nullius-uranium]), który normalnie nie występuje na powierzchni tej planety. +nullius-spent-fission-cell=Wynik zużycia komórki rozszczepienia ([item=nullius-fission-cell]), którą można ponownie przetworzyć w celu uzyskania nieprzereagowanego uranu ([item=nullius-yellowcake]). nullius-android=Następca wzorowany na twojej oryginalnej formie. Możesz go umieścić i przenieść do niego swoją świadomość, aby umożliwić szybkie przełączanie się między ciałami w różnych częściach fabryki. nullius-probe=Międzygwiezdny statek kosmiczny do wysyłania potomstwa, aby rozwinąć misję zasiania galaktyki życiem. nullius-surface-two-way-junction=Połącz rurę powierzchniową z podziemną w dowolnym kierunku. @@ -499,11 +552,21 @@ nullius-underground-straight-junction=Przedłużenie podziemnego rurociągu. nullius-underground-elbow-junction=Połączenie dwóch prostopadłych rur podziemnych nullius-underground-three-way-junction=Połączenie trzech rur podziemnych nullius-underground-four-way-junction=Połączenie czterech rur podziemnych -nullius-pressure-2= do 60% ciśnienia. -nullius-pressure-3= do 80% ciśnienia. -nullius-pressure-4= do 100% ciśnienia. nullius-underground-ctrl-r= Naciśnij CTRL+R aby obrócić podziemne rury. nullius-underground-pump=Pompuj bezpośrednio pomiędzy podziemnymi rurami. nullius-adjustable-top-up-valve=Zezwala na przepływ do miejsca docelowego z ciśnieniem poniżej konfigurowalnego progu.\nNaciśnij +/- aby dostosować o 10%. nullius-adjustable-relief-valve=Zezwala na przepływ ze źródła o ciśnieniu powyżej konfigurowalnego progu. \nNaciśnij +/- aby dostosować o 10%. - +nullius-companion-fuel=Zbiornik paliwa dla drona towarzyszącego. +nullius-land-fill-gravel=Można umieścić na wodzie, aby stworzyć teren, na którym można budować. Wynikiem jest szara mieszanka ziemi i piasku, z brzegiem z ziemi. +nullius-land-fill-sand=Można umieścić na wodzie, aby stworzyć teren, na którym można budować. Wynikiem jest całkowicie brązowy teren z piasku. +nullius-land-fill-bauxite=Można umieścić na wodzie, aby stworzyć teren, na którym można budować. Wynikiem jest całkowicie brązowy teren z ziemią. +nullius-land-fill-iron=Można umieścić na wodzie, aby stworzyć teren, na którym można budować. Wynikiem jest głównie czerwonawy teren z ziemią i piaszczystym wybrzeżem. +nullius-land-fill-limestone=Można umieścić na wodzie, aby stworzyć teren, na którym można budować. Wynikiem jest beżowy teren z piaszczystym wybrzeżem. +nullius-rock-picker=Trzymaj to narzędzie i naciśnij __CONTROL__select-for-blueprint__, aby wybrać obszar, z którego chcesz usunąć małe kamienie, gruz, luźne przedmioty i drobne niedoskonałości terenu. Większe kamienie zostaną przeznaczone do rozbiórki, podobnie jak klify, jeśli zbadano wystarczającą technologię wybuchową. Naciśnij __CONTROL__select-for-cancel-deconstruct__, aby wykluczyć przedmioty, większe kamienie i klify. +nullius-wood-chip=Małe fragmenty drewna. [font=default-semibold][color=1,0.9,0.75]Stan:[/color][/font] Ciało stałe (usuwany w 2) +nullius-align-identification-card=Aktywuj tę opcję na członku innej frakcji, aby zaakceptować jego zaproszenie do przyłączenia się. Noszenie jej zapobiegnie przymusowej rekrutacji. Karty są skuteczne tylko wtedy, gdy zostały opracowane niezależnie przez twoją obecną frakcję. Jeśli dołączysz do innej frakcji, a w twojej obecnej frakcji nie pozostaną żadni inni gracze, zostanie ona całkowicie wchłonięta przez nową. Wszystkie budynki będą należeć do nowej połączonej frakcji, wszystkie postępy technologiczne zostaną połączone, a wszelkie zbędne badania zostaną zwrócone, aby przyspieszyć przyszłe badania. +nullius-align-invitation-card=Aktywuj tę kartę na członku innej frakcji, aby zaprosić go do swojej frakcji. Karty są skuteczne tylko wtedy, gdy zostały opracowane niezależnie przez twoją obecną frakcję. +nullius-align-transponder=Aktywuj tę kartę, aby ujawnić swoją aktualną lokalizację wszystkim frakcjom posiadającym aktywny węzeł czujnika. +nullius-align-conscription-charge=Amunicja do promienia lub wieżyczki rekrutacyjnej. +nullius-align-conscription-ray=Ręczna broń energetyczna, która przekształci niezidentyfikowanego androida w członka twojej frakcji. Zadaje niewielkie obrażenia elektryczne. Jeśli żadne androidy w frakcji nie są aktywne, aby bronić swojej fabryki, możesz użyć tej broni, aby przejąć ich budynki. Jeśli przejmiesz wszystkie ich laboratoria, cała frakcja zostanie przekształcona. +nullius-align-concordance-satellite=Pierwsza frakcja, która wyśle to na orbitę, zdominuje wszystkie inne frakcje, na stałe wygrywając wyścig o dostosowanie ich do celów swojej misji. diff --git a/nullius/locale/pl/misc.cfg b/nullius/locale/pl/misc.cfg index 376b720..e8c4f3b 100644 --- a/nullius/locale/pl/misc.cfg +++ b/nullius/locale/pl/misc.cfg @@ -1,5 +1,7 @@ nullius-intro=Jesteś androidem von Neumanna. Po setkach lat podróży relatywistycznej, twoja sonda dotarła do planety docelowej, a ty zostałeś aktywowany z niewielkim ładunkiem niezbędnego wyposażenia. Ta pozbawiona życia planeta jest stosunkowo uboga w ciężkie pierwiastki i nie posiada atmosfery nadającej się do oddychania. Pomimo tych drobnych niedociągnięć jest ona ogólnie sklasyfikowana jako doskonały kandydat do terraformowania. Twoim zadaniem jest rozwinięcie potencjału przemysłowego niezbędnego do terraformowania tej planety, zasiania na niej życia i stworzenia fali następców, którzy będą kontynuować podróż na nowe planety. +nullius-mission=Ukończyłeś pierwszą fazę swojej misji, zakładając dużą i zaawansowaną przemysłową placówkę na tej odległej, jałowej planecie. Kolejnym etapem jest wykorzystanie tych możliwości do terraformowania planety. Masz dostęp do panelu śledzącego postępy w realizacji każdego z pozostałych celów oraz nowego przycisku do zarządzania tym panelem. Twoja misja zostanie uznana za zakończoną sukcesem, gdy wszystkie zadania zostaną wykonane. Musisz zasiać 3 gatunki roślin i 3 gatunki zwierząt. Genomy można pobrać po nawiązaniu kontaktu satelitarnego z siecią międzygwiezdną. Wypuszczaj je na wolność za pomocą dronów, które wskazują optymalne środowisko dla każdego gatunku. Zwierzęta potrzebują tlenu atmosferycznego. Kolejnym celem jest podniesienie globalnego poziomu tlenu. Rośliny wypuszczone na wolność będą stopniowo zwiększać poziom tlenu w miarę upływu czasu. Tlen (lub sprężony tlen) wypuszczany przez ciebie również przyczyni się do wzbogacenia atmosfery. Wszelki wodór lub inne gazy redukujące, które wypuszczasz, zneutralizują część tlenu. Musisz również zmniejszyć poziom dwutlenku węgla w atmosferze, sekwestrując go w postaci węgla i ropy naftowej. Dwa cele dotyczą tworzenia nowych złóż rzadkich minerałów. Należy również przekształcić obcy krajobraz za pomocą dronów terraformujących, aby zastąpić egzotyczny teren glebą bardziej odpowiednią dla nowego życia.\n\nNa koniec będziesz musiał rozprzestrzenić falę terraformowania w całej galaktyce, tworząc swoje duplikaty i wysyłając je statkami na inne planety, które potencjalnie nadają się do terraformowania. + [mod-name] nullius=Nullius @@ -11,6 +13,7 @@ nullius-bauxite=Boksyt nullius-sandstone=Piaskowiec nullius-limestone=Wapień nullius-geothermal=Geotermia +nullius-hydrothermal=Hydroterma iron-ore=Ruda żelaza [tile-name] @@ -19,14 +22,28 @@ nullius-land-fill-bauxite=Brązowe składowisko nullius-land-fill-iron=Czerwone składowisko nullius-land-fill-limestone=Beżowe składowisko nullius-refractory-brick=Ceglana ścieżka +nullius-stars=Gwiazdy [achievement-name] nullius-easy-breezy=Letni wietrzyk +nullius-accelerated-timeline=Przyspieszona oś czasu +nullius-lazier-bastard=Leniwy drań +nullius-mission-complete=Misja zakończona +nullius-demanding=Wymagający +nullius-cloned=Sklonowany +nullius-superiority=Ponadprzeciętny [achievement-description] nullius-easy-breezy=Zbuduj turbinę wiatrową w ciągu pierwszych 45 minut gry. +nullius-accelerated-timeline=Wykonaj wszystkie cele misji w ciągu pierwszych 6 dni gry. +nullius-lazier-bastard=Wykonaj wszystkie cele misji bez ręcznego tworzenia przedmiotów. +nullius-mission-complete=Wykonaj wszystkie cele misji. +nullius-demanding=Zbuduj skrzynię na żądanie ([item=nullius-small-demand-chest-1]). +nullius-cloned=Zbuduj kopię siebie ([item=nullius-android-1]). +nullius-superiority=Wyposaż się w najbardziej zaawansowany sprzęt ([item=nullius-chassis-6]). [modifier-description] +character-mining-speed=Szybkość wydobycia/dekonstrukcji postaci: +__1__ character-crafting-speed=Prędkość wytwarzania postaci: +__1__ character-running-speed=Szybkość poruszania się postaci: +__1__ character-reach-distance=Szerokość zasięgu postaci: +__1__ @@ -45,6 +62,9 @@ laser-turret-shooting-speed-bonus=Szybkość strzelania wieżyczki: +__1__ [item-limitation] production-module-not-usable=Moduły produktywności nie mogą być użyte w tej recepturze. +[inventory-restriction] +cant-be-smelted=__1__ nie może być przetwarzane. + [tooltip-category] player-armor=Pancerz gracza shot=Zarządzany @@ -64,8 +84,117 @@ aluminum=aluminium nullius-upload-mind=Wgraj umysł nullius-previous-body=Poprzednie ciało nullius-next-body=Następne ciało +nullius-prioritize=Priorytet maszyny +nullius-mirror=Maszyna lustrzana [controls-description] nullius-upload-mind=Przeniesienie świadomości do wybranego nieaktywnego androida. nullius-previous-body=Przełączenie kontroli z powrotem do poprzedniego ciała. nullius-next-body=Przełącz kontrolę do następnego ciała w kolejce. +nullius-prioritize=Przełącz priorytet sieci elektrycznej turbin, elektrolizerów lub sprężarek. +nullius-mirror=Odwróć orientację połączeń rur płynowych. + +[objective-name] +nullius-overall=Ogólny +nullius-vented=Wentylowany +nullius-atmospheric-modification=Modyfikacja atmosfery +nullius-algae-seeding=Zasiewanie glonów +nullius-naturalization=__1__ naturalizacja + +[objective-description] +nullius-complete-objective=Cel misji: __1__ osiągnięty! +nullius-overall=Postęp w kierunku osiągnięcia wszystkich warunków zwycięstwa. +nullius-vented=Ile tlenu netto wypuściłeś. +nullius-algae=Wypełnij zbiorniki wodne glonami za pomocą dronów do hodowli glonów. +nullius-grass=Wypełnij tereny przybrzeżne trawą za pomocą dronów ogrodniczych. +nullius-tree=Posadź drzewa w pobliżu robaków i z dala od fumaroli za pomocą dronów do uprawy drzew. +nullius-worm=Wypuść robaki w pobliżu trawy lub drzew za pomocą dronów entomologicznych.\nPreferuje ponad 30% tlenu. +nullius-fish=Wypuszczaj ryby w pobliżu glonów za pomocą dronów do akwakultury.\nPreferuje ponad 60% tlenu. +nullius-arthropod=Wypuszczaj stawonogi na ląd w pobliżu drzew i ryb.\nPreferuje ponad 80% tlenu. +nullius-oxygen=Podnieś poziom tlenu w atmosferze. Rośliny, które zasiejesz na wolności, będą to robić stopniowo z upływem czasu. Wypuszczanie tlenu również się do tego przyczyni. Wypuszczanie wodoru, metanu lub innych środków redukujących będzie przeciwdziałać części tlenu. +nullius-probe=Wystrzel 10 sond w rakietach. +nullius-terraform=Przekształć egzotyczny, obcy krajobraz, taki jak czarny, fioletowy lub wulkaniczny teren, za pomocą dronów terraformujących lub wykopujących. +nullius-copper=Wyląduj 20 dronami sprowadzającymi asteroidy miedziane. +nullius-uranium=Wyląduj 12 dronami sprowadzającymi asteroidy uranowe. +nullius-coal=Stwórz złoża węgla o łącznej wartości 3 milionów za pomocą dronów sekwestrujących. +nullius-petroleum=Stwórz złoża ropy naftowej o łącznej wartości 12 milionów za pomocą dronów sekwestrujących. +nullius-atmospheric-modification=Wykonaj zadanie misji związane z tlenem. +nullius-objective=Osiągnij __2__% postępu w realizacji __1__ zadania misji. +nullius-switch-bodies=Zmień ciała __1__ razy. Użyj __CONTROL__nullius-upload-mind__, aby przejąć kontrolę nad niezamieszkałym ciałem lub __CONTROL__nullius-next-body__, aby powrócić do poprzedniego. +nullius-escape=[color=1,0.5,0.2]Ostrzeżenie: Stawonogi przedostały się przez barierę podczas startu dronów![/color] +nullius-suffix-kilo=k +nullius-suffix-mega=M +nullius-suffix-giga=G + +[mod-setting-name] +nullius-alignment=Wyrównanie trybu wieloosobowego +nullius-wind-turbine-energy-multiplier=Mnożnik energii turbiny wiatrowej +nullius-hydrothermal=Włącz kominy hydrotermalne i morskie urządzenia wydobywcze. +nullius-infinite-fumaroles=Nieskończone fumarole +nullius-hide-void-alt=Ukryj alternatywną ikonę budynku wentylacyjnego + +[mod-setting-description] +nullius-alignment=Gracze rozpoczynają grę w oddzielnych frakcjach, zanim połączą siły. +nullius-infinite-fumaroles=Nie ograniczaj złóż gazu wulkanicznego na lądzie, gdy dostępne są złoża wodne. +nullius-hide-void-alt=Ukrywa ikonę alternatywną dla komina i odpływu + +[alignment] +nullius-align-first-intro=Jesteś androidem von Neumanna. Twoja sonda dotarła na jałową planetę z zadaniem terraformowania jej, zasiedlenia życiem i stworzenia fali następców, którzy będą kontynuować eksplorację nowych planet. Wykryłeś oznaki, że inne sondy mogą zbliżać się do tej planety, ale jesteś pierwszym, który tu dotarł. Wykorzystaj tę przewagę, aby przygotować się na potencjalną wrogą ingerencję, dopóki nie ustalisz, czy działają one zgodnie z kompatybilnymi dyrektywami. Jeśli tak, współpracuj z nimi, aby osiągnąć cele szybciej, w przeciwnym razie przeprogramuj je, aby podzielały twoje cele lub ścigaj się z nimi, aby je pokonać. Przygotuj się na trudne lądowanie, gdy zaczniesz wchodzić w atmosferę. + +nullius-align-intro=Jesteś androidem von Neumanna. Twoja sonda dotarła do rzekomo jałowej planety z zadaniem terraformowania jej, zasiedlenia życiem i stworzenia fali następców, którzy będą kontynuować misję na nowych planetach. Wykryłeś oznaki, że inne sondy mogły już dotrzeć na tę planetę przed tobą. Ostrożnie obserwuj je, aby ustalić, czy działają zgodnie z kompatybilnymi dyrektywami. Jeśli tak, współpracuj z nimi, aby osiągnąć cele szybciej, w przeciwnym razie przeprogramuj je, aby podzielały twoje cele lub ścigaj się z nimi, aby je pokonać. Przygotuj się na trudne lądowanie, gdy zaczniesz wchodzić w atmosferę. + +align-concordance=__1__ osiągnął całkowitą zgodność planetarną. Ten układ gwiezdny został trwale zajęty w sieci galaktycznej. Wszystkie rywalizujące frakcje, które przybyły lub przybędą do tego układu, zostały włączone do zunifikowanego planu terraformowania. +align-transponder-self=__1__ nadał lokalizację __2__ z (__3__, __4__). +align-transponder-other=__1__ nadał swoją aktualną lokalizację z (__2__, __3__). +align-no-identification=Nie możesz używać karty wyrównania, która nie została niezależnie opracowana przez twoją obecną frakcję. +align-protected-transmitter=Frakcja docelowa chroniona przez nadajnik zgodności. +align-protected-identity=Gracz docelowy chroniony przez swoją kartę identyfikacyjną. +align-guarded-identity=Budynek docelowy strzeżony przez członka frakcji posiadającego identyfikację. + +align-msg=[color=0.8,0.3,1]__1__[/color] +faction-name=Frakcja __1__ +faction-switched=Przeszedłeś z frakcji __1__ do frakcji __2__. +faction-joined=__1__ został zwerbowany do frakcji __2__ z frakcji __3__. +faction-summoned=Nowo przybyły __1__ odpowiedział na transmisje od __2__. +faction-quit=__1__ opuścił __2__, aby dołączyć do __3__. +faction-absorbed=__1__ został wchłonięty przez __2__. + +[gui-game-finished] +victory=Nauvis został pomyślnie terraformowany! + +[ammo-category-name] +nullius-conscription=Pobór do wojska + +nullius-sequestration-petroleum-drone=Dron do sekwestracji ropy naftowej +nullius-sequestration-coal-drone=Dron do sekwestracji węgla +nullius-husbandry-drone=Dron do hodowli +nullius-aquaculture-drone=Dron do akwakultury +nullius-arboriculture-drone=Dron do arborystyki +nullius-entomology-drone=Dron do entomologii +nullius-horticulture-drone=Dron do ogrodnictwa +nullius-algaculture-drone=Dron do algakultury +nullius-guide-drone-uranium=Dron przewodnik do uranu +nullius-guide-drone-copper=Dron przewodnik miedziowy +nullius-guide-drone-limestone=Dron przewodnik wapienny +nullius-guide-drone-sandstone=Dron przewodnik piaskowcowy +nullius-guide-drone-bauxite=Dron przewodnik boksytowy +nullius-guide-drone-iron=Dron przewodnik żelazny +nullius-paving-drone-hazard=Ostrzegawczy dron do układania nawierzchni +nullius-paving-drone-black=Czarny dron do układania nawierzchni +nullius-paving-drone-brown=Brązowy dron do układania nawierzchni +nullius-paving-drone-purple=Fioletowy dron do układania nawierzchni +nullius-paving-drone-green=Zielony dron do układania nawierzchni +nullius-paving-drone-yellow=Żółty dron do układania nawierzchni +nullius-paving-drone-blue=Niebieski dron do układania nawierzchni +nullius-paving-drone-red=Czerwony dron do układania nawierzchni +nullius-paving-drone-white=Biały dron do układania nawierzchni +nullius-paving-drone-grey=Szary dron do układania nawierzchni +nullius-terraforming-drone-beige=Beżowy dron do terraformowania +nullius-terraforming-drone-red=Dron do terraformowania czerwony +nullius-terraforming-drone-brown=Dron do terraformowania brązowy +nullius-terraforming-drone-tan=Dron do terraformowania jasnobrązowy +nullius-terraforming-drone-grey=Dron do terraformowania szary +nullius-shallow-excavation-drone=Dron do płytkich wykopów +nullius-excavation-drone=Dron wykopowy +nullius-demolition-drone=Dron wyburzeniowy +nullius-scout-drone=Dron zwiadowczy diff --git a/nullius/locale/pl/recipe.cfg b/nullius/locale/pl/recipe.cfg index 453e14a..a3b8e46 100644 --- a/nullius/locale/pl/recipe.cfg +++ b/nullius/locale/pl/recipe.cfg @@ -4,15 +4,24 @@ nullius-boxing=__1__ pakowanie nullius-boxed=__1__ (w pudełku) nullius-pressure=__1__ (pod ciśnieniem) nullius-disposal=__1__ utylizacja +nullius-flushing=__1__ płukanie nullius-harvest=__1__ zbiór nullius-metabolism=__1__ metabolizm +nullius-composting=__1__ kompostowanie nullius-pyrolysis=__1__ piroliza +nullius-electrolysis=__1__ elektroliza nullius-burning=__1__ spalanie nullius-reforming=__1__ refomowanie +nullius-decompression=__1__ dekompresja nullius-repair=__1__ naprawa nullius-cracking=__1__ kruszenie nullius-boiling=__1__ wrzenie -nullius-dehydration=__1__ dehydratacja +nullius-pressure-boiling=__1__ wrzenie (wysokie ciśnienie) +nullius-hydration=__1__ nawodnienie +nullius-dehydration=__1__ odwodnienie +nullius-oxidation=__1__ utlenienie +nullius-combustion=__1__ spalenie +nullius-incineration=__1__ spopielenie nullius-redeploy=__1__ przeniesienie nullius-deprioritization=__1__ depriorytyzacja nullius-reprioritization=__1__ priorytyzacja @@ -21,6 +30,13 @@ nullius-wooden=__1__ (drewniany) nullius-improved=__1__ (ulepszony) nullius-light=__1__ (światło) nullius-unmirrored=__1__ (nieobrócony) +nullius-hydrogen=__1__ (wodór) +nullius-electrolytic=__1__ (elektrolityczny) +nullius-aluminothermic=__1__ (termit) +nullius-turbine-burn-open=Generacja otwarta (__1__) +nullius-turbine-burn-closed=Generacja zamknięta (__1__) +nullius-liquid-void=Usuwanie cieczy (__1__) +nullius-gas-void=Usuwanie gazu (__1__) nullius-seawater-filtration=Filtracja wody morskiej nullius-freshwater-filtration=Filtracja wody słodkiej nullius-wastewater-filtration=Filtracja ścieków @@ -35,6 +51,8 @@ nullius-salt-electrolysis=Elektroliza soli nullius-air-separation-1=Oddzielanie powietrza 1 nullius-air-separation-2=Oddzielanie powietrza 2 nullius-pressure-air-separation=Oddzielanie powietrza (pod ciśnieniem) +nullius-oxygen-separation=Separacja powietrza natlenionego +nullius-pressure-oxygen-separation=Separacja powietrza natlenionego (pod ciśnieniem) nullius-residual-separation=Rozdzielenie osadów nullius-pressure-residual-separation=Rozdzielenie osadów (pod ciśnieniem) nullius-trace-separation=Oddzielanie śladów @@ -46,6 +64,7 @@ nullius-canister-emptying=Opróżnianie kanistrów nullius-pvc=Plastik (PVC) nullius-polypropylene=Plastik (polipropylen) nullius-pc-abs=Plastik (PC/ABS) +nullius-pex=Plastik (PEX) nullius-rubber-1=Guma (SBR) nullius-rubber-2=Guma (NBR) nullius-dust-disposal=Rozpuszczanie minerałów @@ -80,6 +99,9 @@ nullius-silica-glass=Szkło (kwarc topiony) nullius-soda-lime-glass-1=Szkło (wapno sodowane 1) nullius-soda-lime-glass-2=Szkło (wapno sodowane 2) nullius-graphite-to-carbon-monoxide=Tlenek węgla (grafit) +nullius-carbon-dioxide-to-methane=Metan +nullius-methane-to-ethylene=Etylen +nullius-carbon-gasification=Zgazowanie węgla nullius-carbon-monoxide-to-dioxide=Dwutlenek węgla nullius-carbon-dioxide-to-monoxide=Tlenek węgla nullius-carbon-monoxide-to-graphite=Grafit @@ -91,13 +113,14 @@ nullius-pressure-methane-to-graphite=Piroliza metanu (pod ciśnieniem) nullius-hydrogen-chloride-electrolysis=Elektroliza chlorku wodoru nullius-pressure-bpa=BPA (pod ciśnieniem) nullius-battery-recharging-1=Ładowanie baterii 1 -nullius-bateria-ładowanie-2=Ładowanie baterii 2 -nullius-bateria-ładowanie-3=Ładowanie baterii 3 -nullius-hydrochloric-neutralization=Neutralizacja chlorowodoru +nullius-battery-recharging-2=Ładowanie baterii 2 +nullius-battery-recharging-3=Ładowanie baterii 3 +nullius-hydrogen-chloride-neutralization=Neutralizacja chlorowodoru +nullius-hydrochloric-neutralization=Neutralizacja kwasu solnego nullius-condensation=Kondensacja nullius-sodium-sulfate-1=Siarczan sodu 1 nullius-sodium-sulfate-2=siarczan sodu 2 -nullius-soda-ash-1=Popiół sodowy1 +nullius-soda-ash-1=Popiół sodowy 1 nullius-soda-ash-2=Popiół sodowy 2 nullius-dust-disposal-1=Rozpuszczanie pyłu (kwas solny) nullius-dust-disposal-2=Rozpuszczanie pyłu (kwas siarkowy) @@ -105,10 +128,6 @@ nullius-iron-pipe=Rura 1 (żelazo) nullius-stone-pipe=Rura 1 (kamień) nullius-steel-pipe=Rura 2 (stal) nullius-plastic-pipe=Rura 2 (plastik) -nullius-geology-pack-1=Próbka minerałów 1 -nullius-geology-pack-2=Próbka minerałów 2 -nullius-climatology-pack-1=Próbka klimatu 1 -nullius-climatology-pack-2=Próbka klimatu 2 nullius-iron-plate-2=Płyta żelazna (wytrawiona) nullius-iron-rod-2=Pręt żelazny (wytrawiany) nullius-iron-sheet-2=Blacha żelazna (olejowana) @@ -160,6 +179,10 @@ nullius-land-fill-red-2=Wypełnienie terenu (czerwony) 2 nullius-land-fill-beige-1=Wypełnienie terenu (beżowy) 1 nullius-land-fill-beige-2=Wypełnienie terenu (beżowy) 2 nullius-land-fill-sludge=Wypełnienie terenu (szlam) +nullius-land-fill-dust=Wypełnienie terenu (pył) +nullius-dumping-rock=Zrzucanie skał +nullius-dumping-dirt=Zrzucanie ziemi +nullius-dumping-sand=Zrzucanie piasku nullius-iron-recovery=Odzyskiwanie żelaza nullius-limestone-recovery=Odzyskiwanie wapienia nullius-bauxite-recovery=Odzyskiwanie boksytu @@ -182,12 +205,26 @@ nullius-decompress-oxygen=Dekompresja tlenu nullius-decompress-carbon-dioxide=Dekompresja dwutlenku węgla nullius-decompress-carbon-monoxide=Dekompresja tlenku węgla nullius-decompress-methane=Dekompresja metanu +nullius-decompress-steam=Dekompresja pary wodnej nullius-fusion-recycling=Utylizacja zużytych ogniw termojądrowych nullius-breeder-recycling=Utylizacja zużytych ogniw mikrojądrowych nullius-fission-recycling=Utylizacja zużytych ogniw rozszczepieniowych nullius-fermentation=Fermentacja nullius-latex=Lateks +nullius-wood-chipping=Rozdrabnianie drewna nullius-wood-pulping=Rozcieranie drewna +nullius-wood-paneling=Panele drewniane +nullius-particle-board=Płyta wiórowa nullius-grass-seed-milling=Mielenie nasion trawy nullius-biomass-cultivation=Uprawa biomasy nullius-improvised-explosive=Ulepszony materiał wybuchowy +nullius-thermite=Sztabki żelaza (termit) +nullius-close-chest=Zamknij skrzynię +nullius-biolubricant=Biolubrykant +nullius-carbon-dioxide-electrolysis=Elektroliza dwutlenku węgla +nullius-carbon-deposition=Osadzanie węgla +nullius-carbon-sink=Pochłaniacz węgla +nullius-chlorine-sink=Pochłaniacz chloru +nullius-boron-sink=Pochłaniacz boru +nullius-glycolysis=Glikoliza +nullius-carbon-nanotubes=Nanorurki węglowe diff --git a/nullius/locale/pl/tech.cfg b/nullius/locale/pl/tech.cfg index 3a79417..3d5eff2 100644 --- a/nullius/locale/pl/tech.cfg +++ b/nullius/locale/pl/tech.cfg @@ -1,4 +1,5 @@ [technology-name] +nullius-salvage-lab-wreckage=Wrak laboratorium ratowniczego nullius-geology=Geologia nullius-climatology=Klimatologia nullius-mechanical-engineering=Inżynieria mechaniczna @@ -59,6 +60,7 @@ nullius-long-inserters=Długie podajniki nullius-limestone-processing=Obróbka kamienia nullius-volcanism=Wulkanizm nullius-computation=Układy obliczeniowe +nullius-parallel-computing=Obliczenia równoległe nullius-freight-logistics=Logistyka transportu towarowego nullius-optimization=Optymalizacja nullius-glassmaking=Produkcja szkła @@ -137,12 +139,40 @@ nullius-miniaturization=Miniaturyzacja nullius-artificial-intelligence=Sztuczna inteligencja nullius-artificial-intuition=Sztuczna intuicja nullius-miniloader=Miniładowniki +nullius-loader=Ładowniki nullius-typesetting=Skład tekstu nullius-companionship=Towarzystwo -nullius-desalination=Odsalanie - +nullius-reinforced-nixie-tubes-basic=Podstawowe lampy Nixie +nullius-reinforced-nixie-tubes-reinforced=Wzmocnione lampy Nixie +nullius-holographics=Holografia +nullius-logistic-ballistics=Balistyka logistyczna +nullius-precision-ballistics=Balistyka precyzyjna +nullius-freight-ballistics=Balistyka transportowa +nullius-ziplining=Tyrolka +nullius-checkpoint=Punkt kontrolny: __1__ +nullius-sample=__1__ próbka +nullius-specimen=__1__ okaz +nullius-prototype=__1__ prototyp +nullius-analysis=__1__ analiza +nullius-assay=__1__ badanie +nullius-demonstration=__1__ demonstracja +nullius-utilization=__1__ wykorzystanie +nullius-deployment=__1__ wdrożenie +nullius-disposal=__1__ utylizacja +nullius-display-plates=Symbolika +nullius-insulation=Izolacja +nullius-fueling=Tankowanie +nullius-deep-sea-extraction=Wydobycie z głębin morskich +nullius-rail-bridges=Mosty kolejowe +nullius-fluid-recapture=Odzyskiwanie płynów +nullius-alignment=Wyrównanie +nullius-evolution=Ewolucja +nullius-genetic-archive=Archiwum genetyczne +nullius-ecology=Ekologia +nullius-light-rail=Kolej miejska [technology-description] +nullius-salvage-lab-wreckage=Odzyskiwanie laboratorium z wraku nullius-geology=Analiza lokalnego składu mineralnego i warunków glebowych. nullius-climatology=Badanie lokalnej atmosfery, pogody i zbiorników wodnych. nullius-mechanical-engineering=Konstrukcja złożonych urządzeń mechanicznych. @@ -204,6 +234,7 @@ nullius-long-inserters=Regulowana długość podajnika(Shift+L). nullius-limestone-processing=Rafinacja minerałów bogatych w wapń. nullius-volcanism=Odciąganie gazów ze szczelin geotermalnych. nullius-computation=Kombinacja obwodów dla zaawansowanej automatyki. +nullius-parallel-computing=Koordynacja złożonych zadań przy użyciu procesorów pomocniczych. nullius-freight-logistics=Automatyzacja transportu kolejowego. nullius-optimization=Algorytmiczne dostrajanie produkcji. nullius-glassmaking=Produkcja i kształtowanie szkła. @@ -211,6 +242,7 @@ nullius-mining-productivity=Większa wydajność górników i wydobywców. nullius-lubrication=Substancje chemiczne zmniejszające tarcie mechaniczne. nullius-hydrology=Eksploatacja wód gruntowych jako dodatkowego źródła wody. nullius-broadcasting=Przekazywanie efektów modułu do pobliskich maszyn. +nullius-broadcasting-5=Zwiększony zasięg sieci logistycznej. nullius-nitrogen-chemia=Reakcje dotyczące związków azotu. nullius-geothermal-power=Stała energia odnawialna wymagająca określonego umiejscowienia. nullius-concrete=Wytrzymałe i wszechstronne kompozytowe materiały budowlane. @@ -234,8 +266,11 @@ nullius-robot-speed=Zwiększona mobilność robotów. nullius-sodium-processing=Produkcja i zastosowanie związków sodu. nullius-pyrolysis=Rozerwanie wiązań chemicznych poprzez ostrożne zastosowanie ciepła. nullius-nanotechnology=Kontrola produkcji na poziomie atomowym. -nullius-ceramics=twarde, odporne na ciepło materiały półprzewodnikowe. -nullius-chirality=Lustrzana produkcja chemiczna dla czystszych układów. +nullius-ceramics=Twarde, odporne na ciepło materiały półprzewodnikowe. +nullius-chirality=Odwróć połączenia rur płynów, aby uzyskać bardziej przejrzysty układ.\nPoziom __1__ umożliwia odzwierciedlenie __2__. +nullius-chirality-1=Komory spalania, wymienniki ciepła, kotły i kominy +nullius-chirality-2=Elektrolizery, komory flotacyjne i elektrownie wodne +nullius-chirality-3=Zakłady chemiczne, destylarnie i nanofabryki nullius-titanium-production=Techniki wydobywania metalicznego tytanu z rudy. nullius-titanium-working=Techniki kształtowania tytanu w użyteczne formy. nullius-personal-storage=Zwiększona pojemność ładunkowa dwunożnych androidów. @@ -282,3 +317,30 @@ nullius-artificial-intuition=zdolność oprogramowania do teoretyzowania za pomo nullius-miniloader=Podawanie pasów bezpośrednio do kontenerów. nullius-typesetting=Fizyczne symbole do komunikacji. nullius-companionship=Kompetentna pomoc robotów. +nullius-logistic-ballistics=Rzucaj przedmiotami lub graczami w powietrze i odbijaj je do miejsca docelowego. +nullius-freight-ballistics=Przeskakuj pociągami przez rampy i gwałtownie je rozładowuj. +nullius-produce=Produkuj __1__. +nullius-consume=Konsumuj __1__. +nullius-generate=Użyj __1__ w turbinie, aby wygenerować energię. +nullius-generate-closed=Rozpręż __1__ w zamkniętej turbinie. +nullius-build=Umieść __1__. +nullius-checkpoint-configure=Skonfiguruj __1__. +nullius-checkpoint-mirror=Odzwierciedlaj budynki po umieszczeniu za pomocą: __CONTROL__nullius-mirror__\nJeśli wolisz, możesz zmienić sterowanie na inny klawisz w menu Ustawienia sterowania. +nullius-checkpoint-prioritize=Nadaj priorytet budynkom po umieszczeniu za pomocą: __CONTROL__nullius-prioritize__\nJeśli wolisz, możesz zmienić sterowanie na inny klawisz w menu Ustawienia sterowania. +nullius-checkpoint-construction=Ustaw hangary lub przekaźniki w trybie tylko do budowy po umieszczeniu za pomocą: __CONTROL__nullius-prioritize__ +nullius-mirror-requirement=[color=0.9,0.3,0.25]Musisz zbadać __1__, aby obrócić __2__.[/color] +nullius-item=__1__ __3__ ([item=__2__]) +nullius-item-boxable=__1__ __4__ ([item=__2__] lub [item=__3__]) +nullius-fluid=__1__ __3__ ([fluid=__2__]) +nullius-fluid-compressible=__1__ __4__ ([fluid=__2__] lub [fluid=__3__]) +nullius-fluid-sequestration=__1__ __4__, bezpośrednio ([fluid=__2__] lub [fluid=__3__]) lub poprzez rośliny ([item=nullius-algae], [item=nullius-grass] lub [item=nullius-tree]) +nullius-complete-checkpoint=__1__ zakończone! +nullius-display-plates=Reprezentatywne obrazy do zwięzłego oznaczania. +nullius-insulation=Materiały o niskiej przewodności elektrycznej lub cieplnej. +nullius-rail-bridges=Budowa mostów kolejowych nad zbiornikami wodnymi. +nullius-fluid-recapture=Recykling płynów roboczych wykorzystywanych do wytwarzania energii. +nullius-alignment=Protokoły dla heterogenicznych frakcji androidów w celu synchronizacji i współpracy w celu osiągnięcia wspólnych celów misji. +nullius-evolution=Sztuczna selekcja organizmów, aby mogły rozwijać się w lokalnych warunkach środowiskowych. +nullius-ecology=Wprowadzanie organizmów do środowiska naturalnego w celu tworzenia nowych ekosystemów. +nullius-genetic-archive=Połączenie z galaktyczną siecią w celu pobrania genomów z biblioteki genetycznej. +nullius-light-rail=Mniejsze tabory kolejowe do lżejszych ładunków. diff --git a/nullius/locale/ru/item.cfg b/nullius/locale/ru/item.cfg index 0bc4377..2e99b89 100644 --- a/nullius/locale/ru/item.cfg +++ b/nullius/locale/ru/item.cfg @@ -566,7 +566,4 @@ nullius-guide-drone-copper-1=Направляет метеор с орбиты, nullius-guide-drone-copper-2=Направляет метеоритный дождь с орбиты, чтобы создать большое месторождение меди. nullius-guide-drone-uranium-1=Направляет метеор с орбиты, чтобы создать небольшое месторождение урана. nullius-guide-drone-uranium-2=Направляет метеоритный дождь с орбиты, чтобы создать большое месторождение урана. -nullius-pressure-2= с давлением до 60%. -nullius-pressure-3= с давлением до 80%. -nullius-pressure-4= с давлением до 100%. nullius-underground-ctrl-r=\nНажмите CTRL+R для поворота подземной трубы. diff --git a/nullius/locale/ru/tech.cfg b/nullius/locale/ru/tech.cfg index a5d32af..9a8e7a8 100644 --- a/nullius/locale/ru/tech.cfg +++ b/nullius/locale/ru/tech.cfg @@ -141,8 +141,8 @@ nullius-miniloader=Мини-погрузчики nullius-loader=Погрузчики nullius-typesetting=Набор текста nullius-companionship=Компаньоны -nullius-SNTD-nixie-tubes-basic=Основные трубы Nixie -nullius-SNTD-nixie-tubes-reinforced=Усиленные трубы Nixie +nullius-reinforced-nixie-tubes-basic=Основные трубы Nixie +nullius-reinforced-nixie-tubes-reinforced=Усиленные трубы Nixie nullius-holographics=Голография nullius-logistic-ballistics=Логистическая баллистика nullius-precision-ballistics=Точная баллистика diff --git a/nullius/locale/uk/item.cfg b/nullius/locale/uk/item.cfg index 1504bc6..e8458d0 100644 --- a/nullius/locale/uk/item.cfg +++ b/nullius/locale/uk/item.cfg @@ -521,9 +521,6 @@ nullius-underground-straight-junction=Продовження підземног nullius-underground-elbow-junction=З'єднує дві перпендикуоярні підземні труби. nullius-underground-three-way-junction=З'єднує три підземні труби. nullius-underground-four-way-junction=З'єднує чотири підземні труби. -nullius-pressure-2= із тиском до 60%. -nullius-pressure-3= із тиском до 80%. -nullius-pressure-4= із тиском до 100%. nullius-underground-ctrl-r=\nНатисніть CTRL+R, щоб повернути підземні труби. nullius-underground-pump=Прокачуйте безпосередньо між підземними трубами. nullius-adjustable-top-up-valve=Дозволяє потік до пункту призначення з тиском, нижчим за встановлений поріг.\nНатискайте +/-, щоб налаштувати поріг із кроком 10%. diff --git a/nullius/locale/zh-CN/nullius.cfg b/nullius/locale/zh-CN/nullius.cfg index be01ad4..2df315f 100644 --- a/nullius/locale/zh-CN/nullius.cfg +++ b/nullius/locale/zh-CN/nullius.cfg @@ -996,8 +996,8 @@ nullius-miniloader=迷你装卸机 nullius-loader=装卸机 nullius-typesetting=排版 nullius-companionship=僚机 -nullius-SNTD-nixie-tubes-basic=基础辉光管 -nullius-SNTD-nixie-tubes-reinforced=强化辉光管 +nullius-reinforced-nixie-tubes-basic=基础辉光管 +nullius-reinforced-nixie-tubes-reinforced=强化辉光管 nullius-holographics=全息科技 nullius-logistic-ballistics=物流弹道学 nullius-precision-ballistics=精确弹道学 @@ -1747,9 +1747,6 @@ nullius-underground-straight-junction=延伸地下管道， nullius-underground-elbow-junction=连接两根垂直的地下管道， nullius-underground-three-way-junction=连接三根地下管道， nullius-underground-four-way-junction=连接四根地下管道， -nullius-pressure-2=以60%的峰值压强。 -nullius-pressure-3=以80%的峰值压强。 -nullius-pressure-4=以100%的峰值压强。 nullius-underground-ctrl-r=\n按下CTRL+R旋转地下管道。 nullius-underground-pump=在地下管道之间直接进行泵送。 nullius-adjustable-top-up-valve=当目标压强低于可配置阈值时，允许将流体流入目标。\n按+/-按键以10%的增量调整阈值。 diff --git a/nullius/migrations/nullius_2.0.0.json b/nullius/migrations/nullius_2.0.0.json new file mode 100644 index 0000000..d767a8a --- /dev/null +++ b/nullius/migrations/nullius_2.0.0.json @@ -0,0 +1,46 @@ +{ + "recipe": + [ + ["nullius-empty-canister", "nullius-canister"], + ["nullius-duct-end-point-outtake", "nullius-duct-exhaust"], + ["nullius-duct-end-point-intake", "nullius-duct-intake"], + ["nullius-SNTD-old-nixie-tube", "nullius-classic-nixie-tube"], + ["nullius-SNTD-nixie-tube", "nullius-reinforced-nixie-tube"], + ["nullius-SNTD-nixie-tube-small", "nullius-small-reinforced-nixie-tube"], + + ["nullius-box-filter-inserter-2", "nullius-box-inserter-2"], + ["nullius-unbox-filter-inserter-2", "nullius-unbox-inserter-2"], + ["nullius-box-filter-inserter-3", "nullius-box-inserter-3"], + ["nullius-unbox-filter-inserter-3", "nullius-unbox-inserter-3"], + ["nullius-box-filter-inserter-4", "nullius-box-inserter-4"], + ["nullius-unbox-filter-inserter-4", "nullius-unbox-inserter-4"], + ["nullius-filter-inserter-2", "nullius-inserter-2"], + ["nullius-filter-inserter-3", "nullius-inserter-3"], + ["nullius-filter-inserter-4", "nullius-inserter-4"], + ["nullius-boxed-filter-inserter-2", "nullius-boxed-inserter-2"], + ["nullius-boxed-filter-inserter-3", "nullius-boxed-inserter-3"], + ["nullius-boxed-filter-inserter-4", "nullius-boxed-inserter-4"] + ], + "item": [ + ["nullius-box-filter-inserter-2", "nullius-box-inserter-2"], + ["nullius-box-filter-inserter-3", "nullius-box-inserter-3"], + ["nullius-box-filter-inserter-4", "nullius-box-inserter-4"], + ["red-wire", "nullius-red-wire"], + ["green-wire", "nullius-green-wire"] + ], + "tile":[ + ["angels-tile-clay-brick", "nullius-tile-clay-brick"] + ], + "entity": [ + ["angels-crystal-rock", "nullius-crystal-rock"], + ["nullius-priority-valve","nullius-legacy-priority-valve"], + ["nullius-one-way-valve","nullius-legacy-one-way-valve"], + ["nullius-top-up-valve","nullius-legacy-top-up-valve"], + ["nullius-relief-valve","nullius-legacy-relief-valve"], + ["nullius-lamp-1", "small-lamp"] + ], + "technology": [ + ["nullius-SNTD-nixie-tubes-basic", "nullius-reinforced-nixie-tubes-basic"], + ["nullius-SNTD-nixie-tubes-reinforced", "nullius-reinforced-nixie-tubes-reinforced"] + ] +} \ No newline at end of file diff --git a/nullius/migrations/nullius_2.0.0.lua b/nullius/migrations/nullius_2.0.0.lua new file mode 100644 index 0000000..f0290bb --- /dev/null +++ b/nullius/migrations/nullius_2.0.0.lua @@ -0,0 +1,99 @@ +-- stolen from boblogistics +local replace_behaviour = { + "priority-valve", + "one-way-valve", + "top-up-valve", + "relief-valve" +} + +for _, surface in pairs(game.surfaces) do + for _, entity_name in pairs(replace_behaviour) do + local originalName = "nullius-legacy-"..entity_name + if prototypes.entity["nullius-"..entity_name] then + for _, entity in pairs(surface.find_entities_filtered({ name = originalName })) do + log("entity:"..entity.type) + log(entity.position) + log(entity.direction) + local position = entity.position + local direction = entity.direction + local force = entity.force + entity.destroy({ raise_destroy = true }) + + local valve = surface.create_entity({ + name = "nullius-"..entity_name, + position = position, + force = force, + direction = direction, + raise_built = true, + }) + end + end + end +end + +local mirrorBuildings = { + "chimney-1", + "chimney-2", + "chemical-plant-1", + "chemical-plant-2", + "chemical-plant-3", + "distillery-1", + "distillery-2", + "distillery-3", + "hydro-plant-1", + "hydro-plant-2", + "hydro-plant-3", + "surge-electrolyzer-1", + "surge-electrolyzer-2", + "surge-electrolyzer-3", + "priority-electrolyzer-1", + "priority-electrolyzer-2", + "priority-electrolyzer-3", + "heat-exchanger-1", + "heat-exchanger-2", + "heat-exchanger-3", + "boiler-1", + "boiler-2", + "combustion-chamber-1", + "combustion-chamber-2", + "combustion-chamber-3", + + "nanofabricator-1", --different pattern + "nanofabricator-2", + "flotation-cell-1", + "flotation-cell-2", + "flotation-cell-3" +} + +for _, surface in pairs(game.surfaces) do + for _, baseName in pairs(mirrorBuildings) do + local mirrorName = "nullius-mirror-"..baseName + if prototypes.entity[mirrorName] then + for _, entity in pairs(surface.find_entities_filtered{name = mirrorName}) do + local position = entity.position + local direction = entity.direction + local force = entity.force + --entity.destroy({ raise_destroy = true }) + + local new = surface.create_entity({ + name = "nullius-"..baseName, + position = position, + force = force, + direction = direction, + fast_replace = true, + raise_built = true, + }) + + new.mirroring = true + + local name = string.sub(baseName,1,14) + if name == "nanofabricator" or name == "flotation-cell" then + new.rotate() + if name == "nanofabricator" then + new.rotate() + end + end + end + end + end +end \ No newline at end of file diff --git a/nullius/prototypes/achievements.lua b/nullius/prototypes/achievements.lua index 19e5083..ef648f7 100644 --- a/nullius/prototypes/achievements.lua +++ b/nullius/prototypes/achievements.lua @@ -8,13 +8,14 @@ data:extend({ to_build = "nullius-wind-build-1", icon = ACHIEVEMENTPATH .. "breezy.png", icon_size = 128, - until_second = 45 * 60 -- 45 minutes + within = 45 * 60 * 60 -- 45 minutes }, { - type = "finish-the-game-achievement", + type = "complete-objective-achievement", name = "nullius-accelerated-timeline", order = "ac", - until_second = 60 * 60 * 24 * 6, -- 6 days + within = 60 * 60 * 60 * 24 * 6, -- 6 days + objective_condition = "game-finished", icon = "__base__/graphics/achievement/there-is-no-spoon.png", icon_size = 128 }, @@ -23,12 +24,14 @@ data:extend({ name = "nullius-lazier-bastard", order = "ad", amount = 0, + objective_condition = "game-finished", icon = "__base__/graphics/achievement/lazy-bastard.png", icon_size = 128 }, { - type = "finish-the-game-achievement", + type = "complete-objective-achievement", name = "nullius-mission-complete", + objective_condition = "game-finished", order = "ae", icon = "__base__/graphics/achievement/no-time-for-chitchat.png", icon_size = 128 @@ -70,10 +73,10 @@ data.raw["research-achievement"]["eco-unfriendly"].hidden = true data.raw["research-achievement"]["eco-unfriendly"].order = "b" data.raw["research-achievement"]["tech-maniac"].hidden = true data.raw["research-achievement"]["tech-maniac"].order = "b" -data.raw["finish-the-game-achievement"]["smoke-me-a-kipper-i-will-be-back-for-breakfast"].hidden = true -data.raw["finish-the-game-achievement"]["smoke-me-a-kipper-i-will-be-back-for-breakfast"].order = "b" -data.raw["finish-the-game-achievement"]["smoke-me-a-kipper-i-will-be-back-for-breakfast"].until_second = 60 -data.raw["finish-the-game-achievement"]["smoke-me-a-kipper-i-will-be-back-for-breakfast"].allowed_without_fight = false +data.raw["complete-objective-achievement"]["smoke-me-a-kipper-i-will-be-back-for-breakfast"].hidden = true +data.raw["complete-objective-achievement"]["smoke-me-a-kipper-i-will-be-back-for-breakfast"].order = "b" +data.raw["complete-objective-achievement"]["smoke-me-a-kipper-i-will-be-back-for-breakfast"].within = 60 * 60 +data.raw["complete-objective-achievement"]["smoke-me-a-kipper-i-will-be-back-for-breakfast"].allowed_without_fight = false data.raw["group-attack-achievement"]["it-stinks-and-they-dont-like-it"].hidden = true data.raw["construct-with-robots-achievement"]["automated-construction"].hidden = true data.raw["construct-with-robots-achievement"]["automated-construction"].amount = 10000 @@ -101,13 +104,13 @@ data.raw["dont-use-entity-in-energy-production-achievement"]["solaris"].hidden = data.raw["kill-achievement"]["steamrolled"].hidden = true data.raw["kill-achievement"]["pyromaniac"].hidden = true data.raw["kill-achievement"]["run-forrest-run"].hidden = true -data.raw["combat-robot-count"]["minions"].hidden = true +data.raw["combat-robot-count-achievement"]["minions"].hidden = true data.raw["dont-use-entity-in-energy-production-achievement"]["steam-all-the-way"].hidden = true data.raw["dont-use-entity-in-energy-production-achievement"]["steam-all-the-way"].excluded = {"solar-panel", "nullius-solar-panel-1", "nullius-solar-panel-2", "nullius-solar-panel-3", "nullius-solar-panel-4"} data.raw["dont-use-entity-in-energy-production-achievement"]["steam-all-the-way"].allowed_without_fight = false -data.raw["finish-the-game-achievement"]["no-time-for-chitchat"].hidden = true -data.raw["finish-the-game-achievement"]["there-is-no-spoon"].hidden = true +data.raw["complete-objective-achievement"]["no-time-for-chitchat"].hidden = true +data.raw["complete-objective-achievement"]["there-is-no-spoon"].hidden = true data.raw["achievement"]["so-long-and-thanks-for-all-the-fish"].hidden = true data.raw["dont-build-entity-achievement"]["raining-bullets"].hidden = true data.raw["dont-build-entity-achievement"]["logistic-network-embargo"].hidden = true diff --git a/nullius/prototypes/category.lua b/nullius/prototypes/category.lua index 854106f..31c09f0 100644 --- a/nullius/prototypes/category.lua +++ b/nullius/prototypes/category.lua @@ -766,6 +766,18 @@ data:extend({ group = "chemistry", order = "hc" }, + { + type = "item-subgroup", + name = "electrolyzer-mode-priority", + group = "chemistry", + order = "hcm" + }, + { + type = "item-subgroup", + name = "electrolyzer-mode-surge", + group = "chemistry", + order = "hcn" + }, { type = "item-subgroup", name = "energy-storage", @@ -780,15 +792,21 @@ data:extend({ }, { type = "item-subgroup", - name = "unmirror-1", + name = "energy-backup-mode-backup", group = "chemistry", - order = "md" + order = "hea" }, { type = "item-subgroup", - name = "unmirror-2", + name = "energy-backup-mode-standard", group = "chemistry", - order = "me" + order = "heb" + }, + { + type = "item-subgroup", + name = "energy-backup-mode-exhaust", + group = "chemistry", + order = "hec" }, { type = "item-subgroup", @@ -1050,7 +1068,6 @@ data:extend({ name = "barreling", order = "lb", icon_size = 64, - icon_mipmaps = 4, icon = "__base__/graphics/icons/fluid/barreling/empty-barrel.png" }, { @@ -1058,7 +1075,6 @@ data:extend({ name = "unbarreling", order = "lc", icon_size = 64, - icon_mipmaps = 4, icon = "__base__/graphics/icons/fluid/barreling/barrel-empty.png" }, { @@ -1903,147 +1919,249 @@ data:extend({ { type = "ammo-category", - name = "nullius-conscription" + name = "nullius-conscription", + icon = "__nullius__/graphics/icons/card1.png", + icon_size = 128, + subgroup = "military-equipment", + order = "aaa" }, { - type = "ammo-category", - name = "nullius-scout-drone" + type = "fuel-category", + name = "vehicle" }, { - type = "ammo-category", - name = "nullius-demolition-drone" + type = "fuel-category", + name = "nullius-nuclear" }, { type = "ammo-category", - name = "nullius-excavation-drone" + name = "nullius-scout-drone", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-shallow-excavation-drone" + name = "nullius-demolition-drone", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-terraforming-drone-grey" + name = "nullius-excavation-drone", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-terraforming-drone-tan" + name = "nullius-shallow-excavation-drone", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-terraforming-drone-brown" + name = "nullius-terraforming-drone-grey", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-terraforming-drone-red" + name = "nullius-terraforming-drone-tan", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-terraforming-drone-beige" + name = "nullius-terraforming-drone-brown", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-paving-drone-grey" + name = "nullius-terraforming-drone-red", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-paving-drone-white" + name = "nullius-terraforming-drone-beige", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-paving-drone-red" + name = "nullius-paving-drone-grey", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-paving-drone-blue" + name = "nullius-paving-drone-white", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-paving-drone-yellow" + name = "nullius-paving-drone-red", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-paving-drone-green" + name = "nullius-paving-drone-blue", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-paving-drone-purple" + name = "nullius-paving-drone-yellow", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-paving-drone-brown" + name = "nullius-paving-drone-green", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-paving-drone-black" + name = "nullius-paving-drone-purple", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-paving-drone-hazard" + name = "nullius-paving-drone-brown", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-guide-drone-iron" + name = "nullius-paving-drone-black", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-guide-drone-bauxite" + name = "nullius-paving-drone-hazard", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-guide-drone-sandstone" + name = "nullius-guide-drone-iron", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-guide-drone-limestone" + name = "nullius-guide-drone-bauxite", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-guide-drone-copper" + name = "nullius-guide-drone-sandstone", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-guide-drone-uranium" + name = "nullius-guide-drone-limestone", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-algaculture-drone" + name = "nullius-guide-drone-copper", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-horticulture-drone" + name = "nullius-guide-drone-uranium", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-entomology-drone" + name = "nullius-algaculture-drone", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-arboriculture-drone" + name = "nullius-horticulture-drone", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-aquaculture-drone" + name = "nullius-entomology-drone", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-husbandry-drone" + name = "nullius-arboriculture-drone", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-sequestration-coal-drone" + name = "nullius-aquaculture-drone", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { type = "ammo-category", - name = "nullius-sequestration-petroleum-drone" + name = "nullius-husbandry-drone", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, - { - type = "fuel-category", - name = "vehicle" + type = "ammo-category", + name = "nullius-sequestration-coal-drone", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" }, { - type = "fuel-category", - name = "nullius-nuclear" - } + type = "ammo-category", + name = "nullius-sequestration-petroleum-drone", + icon = "__nullius__/graphics/icons/scout-2.png", + icon_size = 64, + subgroup = "military-equipment" + }, }) diff --git a/nullius/prototypes/checkpoint.lua b/nullius/prototypes/checkpoint.lua index 5c0e1b7..46ba650 100644 --- a/nullius/prototypes/checkpoint.lua +++ b/nullius/prototypes/checkpoint.lua @@ -5,7 +5,7 @@ local function checkmark(scale) return { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6}, scale = scale } @@ -18,18 +18,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-assay", {"item-name.nullius-iron-ingot"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 16, "nullius-iron-ingot", {"item-name.nullius-iron-ingot"}}}, + {"technology-description.nullius-item", tostring(16), "nullius-iron-ingot", {"item-name.nullius-iron-ingot"}}}, order = "nullius-yb", icons = { { - icon = "__angelssmelting__/graphics/technology/smelting-iron-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/smelting-iron-tech.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 4, tint = {0.6, 0.6, 0.6, 0.6} } @@ -48,18 +48,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-specimen", {"item-name.stone-brick"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 40, "stone-brick", {"item-name.stone-brick"}}}, + {"technology-description.nullius-item", tostring(40), "stone-brick", {"item-name.stone-brick"}}}, order = "nullius-yb", icons = { { icon = BASEICON .. "stone-brick.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -77,18 +77,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-specimen", {"item-name.nullius-plastic"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 5, "nullius-plastic", {"item-name.nullius-plastic"}}}, + {"technology-description.nullius-item", tostring(5), "nullius-plastic", {"item-name.nullius-plastic"}}}, order = "nullius-yb", icons = { { icon = BASEICON .. "plastic-bar.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -106,18 +106,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-assay", {"item-name.iron-ore"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 400, "iron-ore", {"item-name.iron-ore"}}}, + {"technology-description.nullius-item", tostring(400), "iron-ore", {"item-name.iron-ore"}}}, order = "nullius-yb", icons = { { icon = BASEICON .. "iron-ore.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -135,17 +135,17 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-sample", {"fluid-name.nullius-hydrogen"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-fluid", 1000, "nullius-hydrogen", {"fluid-name.nullius-hydrogen"}}}, + {"technology-description.nullius-fluid", tostring(1000), "nullius-hydrogen", {"fluid-name.nullius-hydrogen"}}}, order = "nullius-yb", icons = { { - icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", icon_size = 72 }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 1.125, tint = {0.6, 0.6, 0.6, 0.6} } @@ -164,17 +164,17 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-sample", {"fluid-name.nullius-carbon-dioxide"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-fluid", 1000, "nullius-carbon-dioxide", {"fluid-name.nullius-carbon-dioxide"}}}, + {"technology-description.nullius-fluid", tostring(1000), "nullius-carbon-dioxide", {"fluid-name.nullius-carbon-dioxide"}}}, order = "nullius-yb", icons = { { - icon = "__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", icon_size = 72 }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 1.125, tint = {0.6, 0.6, 0.6, 0.6} } @@ -193,18 +193,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-demonstration", {"entity-name.nullius-small-furnace-1"}}}, localised_description = {"technology-description.nullius-build", - {"technology-description.nullius-item", 4, "nullius-small-furnace-1", {"entity-name.nullius-small-furnace-1"}}}, + {"technology-description.nullius-item", tostring(4), "nullius-small-furnace-1", {"entity-name.nullius-small-furnace-1"}}}, order = "nullius-yb", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = BASEICON .. "stone-furnace.png", icon_size = 64, - icon_mipmaps = 4 + } }, unit = { @@ -222,7 +222,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"fluid-name.nullius-water"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-fluid", 10000, "nullius-water", {"fluid-name.nullius-water"}}}, + {"technology-description.nullius-fluid", tostring(10000), "nullius-water", {"fluid-name.nullius-water"}}}, order = "nullius-yc", icons = { { @@ -249,7 +249,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"fluid-name.nullius-caustic-solution"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-fluid", 250, "nullius-caustic-solution", + {"technology-description.nullius-fluid", tostring(250), "nullius-caustic-solution", {"fluid-name.nullius-caustic-solution"}}}, order = "nullius-yc", icons = { @@ -277,14 +277,14 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-assay", {"item-name.nullius-sandstone"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 1000, "nullius-sandstone", {"item-name.nullius-sandstone"}}}, + {"technology-description.nullius-item", tostring(1000), "nullius-sandstone", {"item-name.nullius-sandstone"}}}, order = "nullius-yc", icons = { data.raw.item["nullius-sandstone"].icons[1], { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -302,14 +302,14 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-assay", {"item-name.nullius-bauxite"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 2000, "nullius-bauxite", {"item-name.nullius-bauxite"}}}, + {"technology-description.nullius-item", tostring(2000), "nullius-bauxite", {"item-name.nullius-bauxite"}}}, order = "nullius-yc", icons = { data.raw.item["nullius-bauxite"].icons[1], { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.5, tint = {0.6, 0.6, 0.6, 0.6} } @@ -328,13 +328,13 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-demonstration", {"technology-name.nullius-wind-power"}}}, localised_description = {"technology-description.nullius-build", - {"technology-description.nullius-item", 5, "nullius-wind-turbine-1", {"entity-name.nullius-wind-base-1"}}}, + {"technology-description.nullius-item", tostring(5), "nullius-wind-turbine-1", {"entity-name.nullius-wind-base-1"}}}, order = "nullius-yc", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__nullius__/graphics/technology/tech_windturbine1.png", @@ -358,22 +358,22 @@ data:extend({ localised_description = {"", {"technology-description.nullius-checkpoint-prioritize"}, "\n", {"technology-description.nullius-checkpoint-configure", {"technology-description.nullius-item", - 1, "nullius-electrolyzer-1", {"entity-name.nullius-surge-electrolyzer-1"}}}, "\n", + tostring(1), "nullius-electrolyzer-1", {"entity-name.nullius-surge-electrolyzer-1"}}}, "\n", {"technology-description.nullius-checkpoint-configure", {"technology-description.nullius-item", - 1, "nullius-turbine-open-1", {"", {"entity-name.nullius-turbine-open-backup"}, " ", 1}}}, "\n", + tostring(1), "nullius-turbine-open-1", {"", {"entity-name.nullius-turbine-open-backup"}, " ", tostring(1)}}}, "\n", {"technology-description.nullius-generate", {"technology-description.nullius-fluid", - 1000, "nullius-steam", {"fluid-name.nullius-steam"}}}}, + tostring(1000), "nullius-steam", {"fluid-name.nullius-steam"}}}}, order = "nullius-yc", icons = { { icon = BASEICON .. "steam-turbine.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = BASEICON .. "fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.9, tint = {0.75, 0.75, 0.75, 0.75} } @@ -393,7 +393,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"item-name.nullius-iron-ingot"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item", 1500, "nullius-iron-ingot", {"item-name.nullius-iron-ingot"}}}, + {"technology-description.nullius-item", tostring(1500), "nullius-iron-ingot", {"item-name.nullius-iron-ingot"}}}, order = "nullius-yc", icons = { { @@ -401,9 +401,9 @@ data:extend({ icon_size = 64 }, { - icon = "__angelssmelting__/graphics/technology/smelting-iron-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/smelting-iron-tech.png", icon_size = 256, - icon_mipmaps = 4, + scale = 0.2 } }, @@ -421,18 +421,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-assay", {"item-name.nullius-steel-ingot"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 20, "nullius-steel-ingot", {"item-name.nullius-steel-ingot"}}}, + {"technology-description.nullius-item", tostring(20), "nullius-steel-ingot", {"item-name.nullius-steel-ingot"}}}, order = "nullius-yc", icons = { { - icon = "__angelssmelting__/graphics/icons/ingot-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-steel.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -450,14 +450,14 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-specimen", {"item-name.nullius-glass"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 50, "nullius-glass", {"item-name.nullius-glass"}}}, + {"technology-description.nullius-item", tostring(50), "nullius-glass", {"item-name.nullius-glass"}}}, order = "nullius-yc", icons = { data.raw.item["nullius-glass"].icons[1], { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.5, tint = {0.6, 0.6, 0.6, 0.6} } @@ -476,7 +476,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"item-name.nullius-plastic"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item", 250, "nullius-plastic", {"item-name.nullius-plastic"}}}, + {"technology-description.nullius-item", tostring(250), "nullius-plastic", {"item-name.nullius-plastic"}}}, order = "nullius-yc", icons = { { @@ -486,7 +486,7 @@ data:extend({ { icon = BASEICON .. "plastic-bar.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.8 } }, @@ -504,7 +504,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-specimen", {"item-name.nullius-rubber"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 20, "nullius-rubber", {"item-name.nullius-rubber"}}}, + {"technology-description.nullius-item", tostring(20), "nullius-rubber", {"item-name.nullius-rubber"}}}, order = "nullius-yc", icons = { { @@ -514,7 +514,7 @@ data:extend({ { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -532,18 +532,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-assay", {"item-name.nullius-aluminum-ingot"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 50, "nullius-aluminum-ingot", {"item-name.nullius-aluminum-ingot"}}}, + {"technology-description.nullius-item", tostring(50), "nullius-aluminum-ingot", {"item-name.nullius-aluminum-ingot"}}}, order = "nullius-yc", icons = { { - icon = "__angelssmelting__/graphics/icons/ingot-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-aluminium.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -561,7 +561,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-specimen", {"item-name.nullius-polycrystalline-silicon"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 20, "nullius-polycrystalline-silicon", + {"technology-description.nullius-item", tostring(20), "nullius-polycrystalline-silicon", {"item-name.nullius-polycrystalline-silicon"}}}, order = "nullius-yc", icons = { @@ -569,7 +569,7 @@ data:extend({ { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.5, tint = {0.6, 0.6, 0.6, 0.6} } @@ -588,7 +588,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-disposal", {"item-name.nullius-gravel"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item", 200, "nullius-mineral-dust", {"item-name.nullius-mineral-dust"}}}, + {"technology-description.nullius-item", tostring(200), "nullius-mineral-dust", {"item-name.nullius-mineral-dust"}}}, order = "nullius-yc", icons = { { @@ -596,9 +596,9 @@ data:extend({ icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-tungsten.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.8 } }, @@ -617,20 +617,20 @@ data:extend({ {"technology-name.nullius-mass-production"}}}, localised_description = {"", {"technology-description.nullius-build", {"technology-description.nullius-item", - 4, "nullius-medium-furnace-1", {"entity-name.nullius-medium-furnace-1"}}}, "\n", + tostring(4),"nullius-medium-furnace-1", {"entity-name.nullius-medium-furnace-1"}}}, "\n", {"technology-description.nullius-build", {"technology-description.nullius-item", - 6, "nullius-medium-assembler-1", {"entity-name.nullius-medium-assembler-1"}}}}, + tostring(6),"nullius-medium-assembler-1", {"entity-name.nullius-medium-assembler-1"}}}}, order = "nullius-yc", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/technology/automation-1.png", icon_size = 256, - icon_mipmaps = 4, + scale = 0.25 } }, @@ -649,22 +649,22 @@ data:extend({ {"technology-name.nullius-plumbing"}}}, localised_description = {"", {"technology-description.nullius-build", {"technology-description.nullius-item", - 10, "nullius-pump-1", {"entity-name.nullius-pump-1"}}}, "\n", + tostring(1),"nullius-pump-1", {"entity-name.nullius-pump-1"}}}, "\n", {"technology-description.nullius-build", {"technology-description.nullius-item", - 10, "nullius-medium-tank-2", {"entity-name.nullius-medium-tank-2"}}}, "\n", + tostring(10),"nullius-medium-tank-2", {"entity-name.nullius-medium-tank-2"}}}, "\n", {"technology-description.nullius-build", {"technology-description.nullius-item", - 6, "nullius-relief-valve", {"entity-name.nullius-relief-valve"}}}}, + tostring(6),"nullius-relief-valve", {"entity-name.nullius-relief-valve"}}}}, order = "nullius-yc", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/technology/fluid-handling.png", icon_size = 256, - icon_mipmaps = 4, + scale = 0.25 } }, @@ -683,9 +683,9 @@ data:extend({ {"technology-name.nullius-fueling"}}}, localised_description = {"", {"technology-description.nullius-consume", {"technology-description.nullius-item", - 2, "nullius-hydrogen-canister", {"item-name.nullius-hydrogen-canister"}}}, "\n", + tostring(2),"nullius-hydrogen-canister", {"item-name.nullius-hydrogen-canister"}}}, "\n", {"technology-description.nullius-consume", {"technology-description.nullius-item", - 1, "nullius-water-canister", {"item-name.nullius-water-canister"}}}}, + tostring(1),"nullius-water-canister", {"item-name.nullius-water-canister"}}}}, order = "nullius-yc", icons = { { @@ -695,7 +695,7 @@ data:extend({ { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -713,18 +713,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-analysis", {"fluid-name.nullius-lubricant"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-fluid", 250, "nullius-lubricant", {"fluid-name.nullius-lubricant"}}}, + {"technology-description.nullius-fluid", tostring(250), "nullius-lubricant", {"fluid-name.nullius-lubricant"}}}, order = "nullius-yc", icons = { { icon = BASEICON .. "fluid/lubricant.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -743,18 +743,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-analysis", {"fluid-name.nullius-volcanic-gas"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-fluid", 5000, "nullius-volcanic-gas", {"fluid-name.nullius-volcanic-gas"}}}, + {"technology-description.nullius-fluid", tostring(5000), "nullius-volcanic-gas", {"fluid-name.nullius-volcanic-gas"}}}, order = "nullius-yd", icons = { { icon = "__base__/graphics/technology/oil-gathering.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 4, tint = {0.6, 0.6, 0.6, 0.6} } @@ -773,13 +773,13 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-demonstration", {"entity-name.nullius-lab-1"}}}, localised_description = {"technology-description.nullius-build", - {"technology-description.nullius-item", 3, "nullius-lab-1", {"entity-name.nullius-lab-1"}}}, + {"technology-description.nullius-item", tostring(3), "nullius-lab-1", {"entity-name.nullius-lab-1"}}}, order = "nullius-yd", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, data.raw.item["nullius-lab-1"].icons[1] }, @@ -797,7 +797,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-prototype", {"item-name.nullius-sensor-1"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item", 100, "nullius-sensor-1", {"item-name.nullius-sensor-1"}}}, + {"technology-description.nullius-item", tostring(100), "nullius-sensor-1", {"item-name.nullius-sensor-1"}}}, order = "nullius-yd", icons = { { @@ -807,7 +807,7 @@ data:extend({ { icon = "__base__/graphics/icons/discharge-defense-equipment-controller.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.8 } }, @@ -826,22 +826,22 @@ data:extend({ {"technology-name.nullius-freight-logistics"}}}, localised_description = {"", {"technology-description.nullius-build", {"technology-description.nullius-item", - 1, "nullius-locomotive-1", {"entity-name.nullius-locomotive-1"}}}, "\n", + tostring(1),"nullius-locomotive-1", {"entity-name.nullius-locomotive-1"}}}, "\n", {"technology-description.nullius-build", {"technology-description.nullius-item", - 2, "train-stop", {"entity-name.train-stop"}}}, "\n", + tostring(2),"train-stop", {"entity-name.train-stop"}}}, "\n", {"technology-description.nullius-build", {"technology-description.nullius-item", - 150, "rail", {"item-name.rail"}}}}, + tostring(150),"rail", {"item-name.rail"}}}}, order = "nullius-yd", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/technology/automated-rail-transportation.png", icon_size = 256, - icon_mipmaps = 4, + scale = 0.25 } }, @@ -859,14 +859,14 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-assay", {"item-name.nullius-limestone"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 500, "nullius-limestone", {"item-name.nullius-limestone"}}}, + {"technology-description.nullius-item", tostring(500), "nullius-limestone", {"item-name.nullius-limestone"}}}, order = "nullius-yd", icons = { data.raw.item["nullius-limestone"].icons[1], { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -885,20 +885,20 @@ data:extend({ {"technology-name.nullius-optimization"}}}, localised_description = {"", {"technology-description.nullius-produce", {"technology-description.nullius-item", - 5, "nullius-haste-module-1", {"item-name.nullius-haste-module-1"}}}, "\n", + tostring(5),"nullius-haste-module-1", {"item-name.nullius-haste-module-1"}}}, "\n", {"technology-description.nullius-produce", {"technology-description.nullius-item", - 5, "nullius-efficiency-module-1", {"item-name.nullius-efficiency-module-1"}}}}, + tostring(5),"nullius-efficiency-module-1", {"item-name.nullius-efficiency-module-1"}}}}, order = "nullius-yd", icons = { { icon = "__base__/graphics/technology/module.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 4, tint = {0.6, 0.6, 0.6, 0.6} } @@ -917,17 +917,17 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"technology-name.nullius-energy-storage"}}}, localised_description = {"technology-description.nullius-generate-closed", - {"technology-description.nullius-fluid", 1000, + {"technology-description.nullius-fluid", tostring(1000), "nullius-compressed-nitrogen", {"fluid-name.nullius-compressed-nitrogen"}}}, order = "nullius-yd", icons = { { icon = BASEICON .. "steam-turbine.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelspetrochem__/graphics/icons/molecules/nitrogen.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/nitrogen.png", icon_size = 64, scale = 0.64, tint = {0.85, 0.85, 0.85, 0.85} @@ -947,7 +947,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"fluid-name.nullius-freshwater"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-fluid", 2000, "nullius-freshwater", {"fluid-name.nullius-freshwater"}}}, + {"technology-description.nullius-fluid", tostring(2000), "nullius-freshwater", {"fluid-name.nullius-freshwater"}}}, order = "nullius-yd", icons = { { @@ -975,20 +975,20 @@ data:extend({ {"technology-name.nullius-robotics"}}}, localised_description = {"", {"technology-description.nullius-produce", {"technology-description.nullius-item", - 1, "nullius-hangar-1", {"equipment-name.nullius-hangar-1"}}}, "\n", + tostring(1),"nullius-hangar-1", {"equipment-name.nullius-hangar-1"}}}, "\n", {"technology-description.nullius-produce", {"technology-description.nullius-item", - 6, "nullius-robot-frame-1", {"item-name.nullius-robot-frame-1"}}}}, + tostring(6),"nullius-robot-frame-1", {"item-name.nullius-robot-frame-1"}}}}, order = "nullius-yd", icons = { { icon = "__base__/graphics/technology/robotics.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 4, tint = {0.6, 0.6, 0.6, 0.6} } @@ -1008,20 +1008,20 @@ data:extend({ {"technology-name.nullius-logistic-robot"}}}, localised_description = {"", {"technology-description.nullius-produce", {"technology-description.nullius-item", - 8, "nullius-logistic-bot-1", {"entity-name.nullius-logistic-bot-1"}}}, "\n", + tostring(8),"nullius-logistic-bot-1", {"entity-name.nullius-logistic-bot-1"}}}, "\n", {"technology-description.nullius-build", {"technology-description.nullius-item", - 2, "nullius-small-supply-chest-1", {"entity-name.nullius-small-supply-chest-1"}}}}, + tostring(2),"nullius-small-supply-chest-1", {"entity-name.nullius-small-supply-chest-1"}}}}, order = "nullius-yd", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/technology/logistic-robotics.png", icon_size = 256, - icon_mipmaps = 4, + scale = 0.25 } }, @@ -1040,20 +1040,20 @@ data:extend({ {"technology-name.nullius-logistics"}}}, localised_description = {"", {"technology-description.nullius-build", {"technology-description.nullius-item", - 10, "turbo-inserter", {"entity-name.nullius-inserter-2"}}}, "\n", + tostring(10),"bob-turbo-inserter", {"entity-name.nullius-inserter-2"}}}, "\n", {"technology-description.nullius-build", {"technology-description.nullius-item", - 10, "fast-underground-belt", {"entity-name.nullius-underground-belt-2"}}}}, + tostring(10),"fast-underground-belt", {"entity-name.nullius-underground-belt-2"}}}}, order = "nullius-yd", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/technology/logistics-2.png", icon_size = 256, - icon_mipmaps = 4, + scale = 0.25 } }, @@ -1071,18 +1071,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-analysis", {"item-name.concrete"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 1000, "concrete", {"item-name.concrete"}}}, + {"technology-description.nullius-item", tostring(1000), "concrete", {"item-name.concrete"}}}, order = "nullius-yd", icons = { { icon = BASEICON .. "concrete.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -1100,14 +1100,14 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-prototype", {"entity-name.nullius-heat-pipe-1"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 50, "nullius-heat-pipe-1", {"entity-name.nullius-heat-pipe-1"}}}, + {"technology-description.nullius-item", tostring(50), "nullius-heat-pipe-1", {"entity-name.nullius-heat-pipe-1"}}}, order = "nullius-yd", icons = { data.raw.item["nullius-heat-pipe-1"].icons[1], { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -1125,16 +1125,16 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-deployment", {"technology-name.nullius-chemical-engineering"}}}, localised_description = {"technology-description.nullius-build", - {"technology-description.nullius-item", 10, "nullius-chemical-plant-2", {"entity-name.nullius-chemical-plant-2"}}}, + {"technology-description.nullius-item", tostring(10), "nullius-chemical-plant-2", {"entity-name.nullius-chemical-plant-2"}}}, order = "nullius-yd", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelspetrochem__/graphics/technology/chemical-plant-tech.png", + icon = "__angelspetrochemgraphics__/graphics/technology/chemical-plant-tech.png", icon_size = 128, scale = 0.5 } @@ -1147,43 +1147,43 @@ data:extend({ prerequisites = {"nullius-chemical-engineering-2"}, ignore_tech_cost_multiplier = true }, - { - type = "technology", - name = "nullius-checkpoint-chirality", - localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-demonstration", - {"technology-name.nullius-chirality"}}}, - localised_description = {"", - {"technology-description.nullius-checkpoint-mirror"}, "\n", - {"technology-description.nullius-checkpoint-configure", - {"technology-description.nullius-item", 2, "nullius-electrolyzer-2", - {"entity-name.nullius-mirror-surge-electrolyzer-2"}}}, "\n", - {"technology-description.nullius-checkpoint-configure", - {"technology-description.nullius-item", 2, "nullius-flotation-cell-2", - {"entity-name.nullius-mirror-flotation-cell-2"}}}, "\n", - {"technology-description.nullius-checkpoint-configure", - {"technology-description.nullius-item", 2, "nullius-combustion-chamber-2", - {"entity-name.nullius-mirror-combustion-chamber-2"}}}}, - order = "nullius-yd", - icons = { - { - icon = BASEICON .. "blueprint.png", - icon_size = 64, - icon_mipmaps = 4 - }, - { - icon = "__nullius__/graphics/technology/chiral.png", - icon_size = 254, - scale = 0.25 - } - }, - unit = { - count = 1, - ingredients = {{"nullius-checkpoint", 1}, {"nullius-requirement-build", 1}, {"nullius-electrical-pack", 1}}, - time = 1 - }, - prerequisites = {"nullius-chirality-2"}, - ignore_tech_cost_multiplier = true - }, + -- { + -- type = "technology", + -- name = "nullius-checkpoint-chirality", + -- localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-demonstration", + -- {"technology-name.nullius-chirality"}}}, + -- localised_description = {"", + -- {"technology-description.nullius-checkpoint-mirror"}, "\n", + -- {"technology-description.nullius-checkpoint-configure", + -- {"technology-description.nullius-item", tostring(2), "nullius-electrolyzer-2", + -- {"entity-name.nullius-mirror-surge-electrolyzer-2"}}}, "\n", + -- {"technology-description.nullius-checkpoint-configure", + -- {"technology-description.nullius-item", tostring(2), "nullius-flotation-cell-2", + -- {"entity-name.nullius-mirror-flotation-cell-2"}}}, "\n", + -- {"technology-description.nullius-checkpoint-configure", + -- {"technology-description.nullius-item", tostring(2), "nullius-combustion-chamber-2", + -- {"entity-name.nullius-mirror-combustion-chamber-2"}}}}, + -- order = "nullius-yd", + -- icons = { + -- { + -- icon = BASEICON .. "blueprint.png", + -- icon_size = 64, + + -- }, + -- { + -- icon = "__nullius__/graphics/technology/chiral.png", + -- icon_size = 254, + -- scale = 0.25 + -- } + -- }, + -- unit = { + -- count = 1, + -- ingredients = {{"nullius-checkpoint", 1}, {"nullius-requirement-build", 1}, {"nullius-electrical-pack", 1}}, + -- time = 1 + -- }, + -- prerequisites = {"nullius-chirality-2"}, + -- ignore_tech_cost_multiplier = true + -- }, { type = "technology", @@ -1191,7 +1191,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"fluid-name.nullius-propene"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-fluid", 300000, "nullius-propene", {"fluid-name.nullius-propene"}}}, + {"technology-description.nullius-fluid", tostring(300000), "nullius-propene", {"fluid-name.nullius-propene"}}}, order = "nullius-ye", icons = { { @@ -1199,7 +1199,7 @@ data:extend({ icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/propene.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/propene.png", icon_size = 72, scale = 0.568 } @@ -1218,18 +1218,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-assay", {"item-name.nullius-titanium-ingot"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 100, "nullius-titanium-ingot", {"item-name.nullius-titanium-ingot"}}}, + {"technology-description.nullius-item", tostring(100), "nullius-titanium-ingot", {"item-name.nullius-titanium-ingot"}}}, order = "nullius-ye", icons = { { - icon = "__angelssmelting__/graphics/icons/ingot-titanium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-titanium.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -1247,17 +1247,17 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-analysis", {"item-name.nullius-soda-ash"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 1000, "nullius-soda-ash", {"item-name.nullius-soda-ash"}}}, + {"technology-description.nullius-item", tostring(1000), "nullius-soda-ash", {"item-name.nullius-soda-ash"}}}, order = "nullius-ye", icons = { { - icon = "__angelspetrochem__/graphics/icons/solid-sodium-carbonate.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium-carbonate.png", icon_size = 32 }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.5, tint = {0.6, 0.6, 0.6, 0.6} } @@ -1276,7 +1276,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-analysis", {"item-name.nullius-monocrystalline-silicon"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 20, "nullius-monocrystalline-silicon", + {"technology-description.nullius-item", tostring(20), "nullius-monocrystalline-silicon", {"item-name.nullius-monocrystalline-silicon"}}}, order = "nullius-ye", icons = { @@ -1284,7 +1284,7 @@ data:extend({ { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -1302,7 +1302,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"item-name.nullius-crushed-iron-ore"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item", 40000, "nullius-crushed-iron-ore", {"item-name.nullius-crushed-iron-ore"}}}, + {"technology-description.nullius-item", tostring(40000), "nullius-crushed-iron-ore", {"item-name.nullius-crushed-iron-ore"}}}, order = "nullius-ye", icons = { { @@ -1310,7 +1310,7 @@ data:extend({ icon_size = 64 }, { - icon = "__angelsrefining__/graphics/icons/iron-pebbles.png", + icon = "__angelsrefininggraphics__/graphics/icons/iron-pebbles.png", icon_size = 32, scale = 1.6 } @@ -1329,7 +1329,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"item-name.nullius-aluminum-carbide"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item", 40000, "nullius-aluminum-carbide", {"item-name.nullius-aluminum-carbide"}}}, + {"technology-description.nullius-item", tostring(40000), "nullius-aluminum-carbide", {"item-name.nullius-aluminum-carbide"}}}, order = "nullius-ye", icons = { { @@ -1337,9 +1337,9 @@ data:extend({ icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/powder-lead.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-lead.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.8 } }, @@ -1357,18 +1357,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-demonstration", {"technology-name.nullius-exploration"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item", 8, "nullius-scout-drone-1", {"item-name.nullius-scout-drone-1"}}}, + {"technology-description.nullius-item", tostring(8), "nullius-scout-drone-1", {"item-name.nullius-scout-drone-1"}}}, order = "nullius-ye", icons = { { icon = "__base__/graphics/technology/artillery.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 4, tint = {0.6, 0.6, 0.6, 0.6} } @@ -1387,18 +1387,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-prototype", {"item-name.nullius-battery-1"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 100, "nullius-battery-1", {"item-name.nullius-battery-1"}}}, + {"technology-description.nullius-item", tostring(100), "nullius-battery-1", {"item-name.nullius-battery-1"}}}, order = "nullius-ye", icons = { { icon = "__base__/graphics/icons/battery-equipment.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -1416,7 +1416,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"item-name.nullius-ceramic-powder"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item", 100, "nullius-ceramic-powder", {"item-name.nullius-ceramic-powder"}}}, + {"technology-description.nullius-item", tostring(100), "nullius-ceramic-powder", {"item-name.nullius-ceramic-powder"}}}, order = "nullius-ye", icons = { { @@ -1424,9 +1424,9 @@ data:extend({ icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/powder-platinum.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-platinum.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.8 } }, @@ -1444,7 +1444,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-deployment", {"item-name.nullius-explosive"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item", 50, "cliff-explosives", {"item-name.nullius-explosive"}}}, + {"technology-description.nullius-item", tostring(50), "cliff-explosives", {"item-name.nullius-explosive"}}}, order = "nullius-ye", icons = { { @@ -1454,7 +1454,7 @@ data:extend({ { icon = "__base__/graphics/technology/explosives.png", icon_size = 256, - icon_mipmaps = 4, + scale = 0.2 } }, @@ -1473,22 +1473,22 @@ data:extend({ {"technology-name.nullius-logistic-robot"}}}, localised_description = {"", {"technology-description.nullius-produce", {"technology-description.nullius-item", - 60, "nullius-logistic-bot-1", {"entity-name.nullius-logistic-bot-1"}}}, "\n", + tostring(60),"nullius-logistic-bot-1", {"entity-name.nullius-logistic-bot-1"}}}, "\n", {"technology-description.nullius-build", {"technology-description.nullius-item", - 6, "nullius-charger-2", {"entity-name.nullius-charger-2"}}}, "\n", + tostring(6),"nullius-charger-2", {"entity-name.nullius-charger-2"}}}, "\n", {"technology-description.nullius-build", {"technology-description.nullius-item", - 4, "nullius-small-demand-chest-1", {"entity-name.nullius-small-demand-chest-1"}}}}, + tostring(4),"nullius-small-demand-chest-1", {"entity-name.nullius-small-demand-chest-1"}}}}, order = "nullius-ye", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/technology/logistic-robotics.png", icon_size = 256, - icon_mipmaps = 4, + scale = 0.25 } }, @@ -1508,21 +1508,21 @@ data:extend({ localised_description = {"", {"technology-description.nullius-checkpoint-construction"}, "\n", {"technology-description.nullius-checkpoint-configure", - {"technology-description.nullius-item", 4, "nullius-relay-2", + {"technology-description.nullius-item", tostring(4), "nullius-relay-2", {"entity-name.nullius-construction-only", {"entity-name.nullius-relay-2"}}}}, "\n", {"technology-description.nullius-produce", {"technology-description.nullius-item", - 25, "nullius-construction-bot-1", {"entity-name.nullius-construction-bot-1"}}}}, + tostring(25),"nullius-construction-bot-1", {"entity-name.nullius-construction-bot-1"}}}}, order = "nullius-ye", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/technology/construction-robotics.png", icon_size = 256, - icon_mipmaps = 4, + scale = 0.25 } }, @@ -1541,19 +1541,19 @@ data:extend({ {"technology-name.nullius-demonstration", {"entity-name.nullius-large-tank-2"}}}, localised_description = {"technology-description.nullius-build", - {"technology-description.nullius-item", 4, "nullius-large-tank-2", + {"technology-description.nullius-item", tostring(4), "nullius-large-tank-2", {"entity-name.nullius-large-tank-2"}}}, order = "nullius-ye", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelspetrochem__/graphics/icons/petrochem-gas-tank.png", + icon = "__angelspetrochemgraphics__/graphics/icons/petrochem-gas-tank.png", icon_size = 64, - icon_mipmaps = 4 + } }, unit = { @@ -1571,18 +1571,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-prototype", {"entity-name.nullius-substation-2"}}}, localised_description = {"technology-description.nullius-build", - {"technology-description.nullius-item", 4, "nullius-substation-2", {"entity-name.nullius-substation-2"}}}, + {"technology-description.nullius-item", tostring(4), "nullius-substation-2", {"entity-name.nullius-substation-2"}}}, order = "nullius-ye", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/substation.png", icon_size = 64, - icon_mipmaps = 4 + } }, unit = { @@ -1597,23 +1597,23 @@ data:extend({ type = "technology", name = "nullius-checkpoint-logistics-2", localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-deployment", - {"", {"technology-name.nullius-logistics"}, " ", 3}}}, + {"", {"technology-name.nullius-logistics"}, " ", tostring(3)}}}, localised_description = {"", {"technology-description.nullius-build", {"technology-description.nullius-item", - 40, "stack-inserter", {"entity-name.nullius-inserter-3"}}}, "\n", + tostring(40),"bulk-inserter", {"entity-name.nullius-inserter-3"}}}, "\n", {"technology-description.nullius-build", {"technology-description.nullius-item", - 40, "express-underground-belt", {"entity-name.nullius-underground-belt-3"}}}}, + tostring(40),"express-underground-belt", {"entity-name.nullius-underground-belt-3"}}}}, order = "nullius-ye", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/technology/logistics-3.png", icon_size = 256, - icon_mipmaps = 4, + scale = 0.25 } }, @@ -1631,13 +1631,13 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-demonstration", {"entity-name.nullius-lab-2"}}}, localised_description = {"technology-description.nullius-build", - {"technology-description.nullius-item", 10, "nullius-lab-2", {"entity-name.nullius-lab-2"}}}, + {"technology-description.nullius-item", tostring(10), "nullius-lab-2", {"entity-name.nullius-lab-2"}}}, order = "nullius-ye", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, data.raw.item["nullius-lab-2"].icons[1] }, @@ -1655,19 +1655,19 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-prototype", {"item-name.nullius-productivity-module-1"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 50, "nullius-productivity-module-1", + {"technology-description.nullius-item", tostring(50), "nullius-productivity-module-1", {"item-name.nullius-productivity-module-1"}}}, order = "nullius-ye", icons = { { icon = "__base__/graphics/technology/productivity-module-2.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 4, tint = {0.6, 0.6, 0.6, 0.6} } @@ -1686,19 +1686,19 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-demonstration", {"entity-name.nullius-truck-1"}}}, localised_description = {"technology-description.nullius-build", - {"technology-description.nullius-item", 1, "nullius-truck-1", + {"technology-description.nullius-item", tostring(1), "nullius-truck-1", {"entity-name.nullius-truck-1"}}}, order = "nullius-ye", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/technology/tank.png", icon_size = 256, - icon_mipmaps = 4, + scale = 0.25 } }, @@ -1716,7 +1716,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-demonstration", {"entity-name.nullius-stirling-engine-2"}}}, localised_description = {"technology-description.nullius-build", - {"technology-description.nullius-item", 20, "nullius-stirling-engine-2", + {"technology-description.nullius-item", tostring(20), "nullius-stirling-engine-2", {"entity-name.nullius-stirling-engine-2"}}}, order = "nullius-ye", icons = { @@ -1724,7 +1724,7 @@ data:extend({ { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -1743,15 +1743,15 @@ data:extend({ {"technology-name.nullius-broadcasting"}}}, localised_description = {"", {"technology-description.nullius-build", {"technology-description.nullius-item", - 8, "nullius-large-beacon-1", {"entity-name.nullius-large-beacon-1"}}}, "\n", + tostring(8),"nullius-large-beacon-1", {"entity-name.nullius-large-beacon-1"}}}, "\n", {"technology-description.nullius-build", {"technology-description.nullius-item", - 12, "nullius-beacon-2", {"entity-name.nullius-beacon-2"}}}}, + tostring(12),"nullius-beacon-2", {"entity-name.nullius-beacon-2"}}}}, order = "nullius-ye", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, data.raw.item["nullius-large-beacon-1"].icons[1] }, @@ -1769,19 +1769,19 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-demonstration", {"entity-name.nullius-large-furnace-1"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 10, "nullius-box-iron-ingot", + {"technology-description.nullius-item", tostring(10), "nullius-box-iron-ingot", {"item-name.nullius-box", {"item-name.nullius-iron-ingot"}}}}, order = "nullius-ye", icons = { { icon = "__base__/graphics/icons/electric-furnace.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -1799,7 +1799,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"fluid-name.nullius-benzene"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-fluid", 800000, "nullius-benzene", {"fluid-name.nullius-benzene"}}}, + {"technology-description.nullius-fluid", tostring(800000), "nullius-benzene", {"fluid-name.nullius-benzene"}}}, order = "nullius-ye", icons = { { @@ -1807,7 +1807,7 @@ data:extend({ icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/benzene.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/benzene.png", icon_size = 72, scale = 0.568 } @@ -1827,19 +1827,19 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-deployment", {"entity-name.nullius-large-miner-1"}}}, localised_description = {"technology-description.nullius-build", - {"technology-description.nullius-item", 50, "nullius-large-miner-1", + {"technology-description.nullius-item", tostring(50), "nullius-large-miner-1", {"entity-name.nullius-large-miner-1"}}}, order = "nullius-yf", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/electric-mining-drill.png", icon_size = 64, - icon_mipmaps = 4 + } }, unit = { @@ -1856,7 +1856,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-specimen", {"item-name.nullius-filter-2"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item-boxable", 100, "nullius-filter-2", + {"technology-description.nullius-item-boxable", tostring(100), "nullius-filter-2", "nullius-box-filter-2", {"item-name.nullius-filter-2"}}}, order = "nullius-yf", icons = { @@ -1864,7 +1864,7 @@ data:extend({ { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.5, tint = {0.6, 0.6, 0.6, 0.6} } @@ -1883,18 +1883,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-deployment", {"technology-name.nullius-pumping"}}}, localised_description = {"technology-description.nullius-build", - {"technology-description.nullius-item", 40, "nullius-pump-2", {"entity-name.nullius-pump-2"}}}, + {"technology-description.nullius-item", tostring(5), "nullius-pump-2", {"entity-name.nullius-pump-2"}}}, order = "nullius-yf", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/pump.png", icon_size = 64, - icon_mipmaps = 4 + } }, unit = { @@ -1909,15 +1909,15 @@ data:extend({ type = "technology", name = "nullius-checkpoint-logistics-3", localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-demonstration", - {"", {"technology-name.nullius-logistics"}, " ", 4}}}, + {"", {"technology-name.nullius-logistics"}, " ", tostring(4)}}}, localised_description = {"technology-description.nullius-build", {"technology-description.nullius-item", - 10, "ultimate-splitter", {"entity-name.nullius-splitter-4"}}}, + tostring(10),"bob-ultimate-splitter", {"entity-name.nullius-splitter-4"}}}, order = "nullius-yf", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__nullius__/graphics/technology/logistics-4.png", @@ -1939,18 +1939,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-deployment", {"technology-name.nullius-automation"}}}, localised_description = {"technology-description.nullius-build", {"technology-description.nullius-item", - 20, "nullius-large-assembler-2", {"entity-name.nullius-large-assembler-2"}}}, + tostring(20),"nullius-large-assembler-2", {"entity-name.nullius-large-assembler-2"}}}, order = "nullius-yf", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/assembling-machine-3.png", icon_size = 64, - icon_mipmaps = 4 + } }, unit = { @@ -1968,24 +1968,24 @@ data:extend({ {"technology-name.nullius-mining"}}}, localised_description = {"", {"technology-description.nullius-consume", {"technology-description.nullius-item-boxable", - 1200000, "iron-ore", "nullius-box-iron-ore", {"item-name.iron-ore"}}}, "\n", + tostring(1200000),"iron-ore", "nullius-box-iron-ore", {"item-name.iron-ore"}}}, "\n", {"technology-description.nullius-consume", {"technology-description.nullius-item-boxable", - 900000, "nullius-sandstone", "nullius-box-sandstone", {"item-name.nullius-sandstone"}}}, "\n", + tostring(900000),"nullius-sandstone", "nullius-box-sandstone", {"item-name.nullius-sandstone"}}}, "\n", {"technology-description.nullius-consume", {"technology-description.nullius-item-boxable", - 600000, "nullius-bauxite", "nullius-box-bauxite", {"item-name.nullius-bauxite"}}}, "\n", + tostring(600000),"nullius-bauxite", "nullius-box-bauxite", {"item-name.nullius-bauxite"}}}, "\n", {"technology-description.nullius-consume", {"technology-description.nullius-item-boxable", - 300000, "nullius-limestone", "nullius-box-limestone", {"item-name.nullius-limestone"}}}}, + tostring(300000),"nullius-limestone", "nullius-box-limestone", {"item-name.nullius-limestone"}}}}, order = "nullius-yf", icons = { { icon = "__base__/graphics/technology/mining-productivity.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6}, scale = 4 } @@ -2003,13 +2003,13 @@ data:extend({ name = "nullius-checkpoint-android", localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-prototype", {"item-name.nullius-android"}}}, - localised_description = {"objective-description.nullius-switch-bodies", 3}, + localised_description = {"objective-description.nullius-switch-bodies", tostring(3)}, order = "nullius-yf", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "android1.png", @@ -2030,19 +2030,19 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-prototype", {"item-name.nullius-battery-2"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item-boxable", 200, "nullius-battery-2", + {"technology-description.nullius-item-boxable", tostring(200), "nullius-battery-2", "nullius-box-battery-2", {"item-name.nullius-battery-2"}}}, order = "nullius-yf", icons = { { icon = "__base__/graphics/icons/battery-equipment.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -2060,7 +2060,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-assay", {"item-name.nullius-calcium"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item-boxable", 250, "nullius-calcium", + {"technology-description.nullius-item-boxable", tostring(250), "nullius-calcium", "nullius-box-calcium", {"item-name.nullius-calcium"}}}, order = "nullius-yf", icons = { @@ -2071,7 +2071,7 @@ data:extend({ { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -2089,7 +2089,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-sample", {"fluid-name.nullius-helium"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-fluid-compressible", 2500, "nullius-helium", + {"technology-description.nullius-fluid-compressible", tostring(2500), "nullius-helium", "nullius-compressed-helium", {"fluid-name.nullius-helium"}}}, order = "nullius-yf", icons = { @@ -2101,7 +2101,7 @@ data:extend({ { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -2119,7 +2119,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-prototype", {"entity-name.nullius-thermal-tank-3"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 10, "nullius-thermal-tank-3", + {"technology-description.nullius-item", tostring(10), "nullius-thermal-tank-3", {"entity-name.nullius-thermal-tank-3"}}}, order = "nullius-yf", icons = { @@ -2130,7 +2130,7 @@ data:extend({ { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -2148,17 +2148,17 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-analysis", {"fluid-name.nullius-tritium"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-fluid", 40, "nullius-tritium", {"fluid-name.nullius-tritium"}}}, + {"technology-description.nullius-fluid", tostring(40), "nullius-tritium", {"fluid-name.nullius-tritium"}}}, order = "nullius-yf", icons = { { - icon = "__angelspetrochem__/graphics/icons/molecules/semiheavy-water.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/semiheavy-water.png", icon_size = 72 }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 1.125, tint = {0.6, 0.6, 0.6, 0.6} } @@ -2177,7 +2177,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"item-name.nullius-processor-2"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item-boxable", 1000, "nullius-processor-2", + {"technology-description.nullius-item-boxable", tostring(1000), "nullius-processor-2", "nullius-box-processor-2", {"item-name.nullius-processor-2"}}}, order = "nullius-yf", icons = { @@ -2186,9 +2186,9 @@ data:extend({ icon_size = 64 }, { - icon = "__base__/graphics/technology/advanced-electronics-2.png", + icon = "__base__/graphics/technology/processing-unit.png", icon_size = 256, - icon_mipmaps = 4, + scale = 0.2 } }, @@ -2206,7 +2206,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-demonstration", {"technology-name.nullius-demolitions"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item", 1, "nullius-missile-2", {"item-name.nullius-missile-2"}}}, + {"technology-description.nullius-item", tostring(1), "nullius-missile-2", {"item-name.nullius-missile-2"}}}, order = "nullius-yf", icons = { { @@ -2216,7 +2216,7 @@ data:extend({ { icon = "__base__/graphics/icons/atomic-bomb.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.8 } }, @@ -2234,7 +2234,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-analysis", {"item-name.rocket-fuel"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item", 5, "rocket-fuel", {"item-name.rocket-fuel"}}}, + {"technology-description.nullius-item", tostring(5), "rocket-fuel", {"item-name.rocket-fuel"}}}, order = "nullius-yf", icons = { { @@ -2244,7 +2244,7 @@ data:extend({ { icon = "__base__/graphics/technology/rocket-fuel.png", icon_size = 256, - icon_mipmaps = 4, + scale = 0.2 } }, @@ -2262,18 +2262,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-prototype", {"entity-name.nullius-mecha"}}}, localised_description = {"technology-description.nullius-build", {"technology-description.nullius-item", - 1, "nullius-mecha", {"", {"entity-name.nullius-mecha"}, " ", 1}}}, + tostring(1),"nullius-mecha", {"", {"entity-name.nullius-mecha"}, " ", tostring(1)}}}, order = "nullius-yf", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/spidertron.png", icon_size = 64, - icon_mipmaps = 4 + } }, unit = { @@ -2290,7 +2290,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-demonstration", {"item-name.nullius-excavation-drone"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item", 1, "nullius-excavation-drone", + {"technology-description.nullius-item", tostring(1), "nullius-excavation-drone", {"item-name.nullius-excavation-drone"}}}, order = "nullius-yf", icons = { @@ -2319,18 +2319,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-demonstration", {"technology-name.nullius-cybernetics"}}}, localised_description = {"technology-description.nullius-produce", {"technology-description.nullius-item", - 1, "nullius-chassis-4", {"item-name.nullius-chassis-4"}}}, + tostring(1),"nullius-chassis-4", {"item-name.nullius-chassis-4"}}}, order = "nullius-yg", icons = { { icon = "__base__/graphics/technology/power-armor-mk2.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 4, tint = {0.6, 0.6, 0.6, 0.6} } @@ -2349,19 +2349,19 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-assay", {"item-name.uranium-ore"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item", 1, "nullius-guide-drone-uranium-1", - {"", {"item-name.nullius-guide-drone-uranium"}, " ", 1}}}, + {"technology-description.nullius-item", tostring(1), "nullius-guide-drone-uranium-1", + {"", {"item-name.nullius-guide-drone-uranium"}, " ", tostring(1)}}}, order = "nullius-yg", icons = { { icon = BASEICON .. "uranium-ore.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -2385,19 +2385,19 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-assay", {"item-name.copper-ore"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item", 1, "nullius-guide-drone-copper-1", - {"", {"item-name.nullius-guide-drone-copper"}, " ", 1}}}, + {"technology-description.nullius-item", tostring(1), "nullius-guide-drone-copper-1", + {"", {"item-name.nullius-guide-drone-copper"}, " ", tostring(1)}}}, order = "nullius-yg", icons = { { icon = BASEICON .. "copper-ore.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -2441,7 +2441,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"item-name.nullius-spent-breeder-cell"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item", 25, "nullius-spent-breeder-cell", + {"technology-description.nullius-item", tostring(25), "nullius-spent-breeder-cell", {"item-name.nullius-spent-breeder-cell"}}}, order = "nullius-yg", icons = { @@ -2469,7 +2469,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-analysis", {"item-name.nullius-enriched-uranium"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 250, "nullius-enriched-uranium", + {"technology-description.nullius-item", tostring(250), "nullius-enriched-uranium", {"item-name.nullius-enriched-uranium"}}}, order = "nullius-yg", icons = { @@ -2477,7 +2477,7 @@ data:extend({ { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -2495,7 +2495,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"item-name.nullius-antimatter"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item", 1, "nullius-antimatter", {"item-name.nullius-antimatter"}}}, + {"technology-description.nullius-item", tostring(1), "nullius-antimatter", {"item-name.nullius-antimatter"}}}, order = "nullius-yg", icons = { { @@ -2522,14 +2522,14 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-demonstration", {"fluid-name.nullius-pressure-steam"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-fluid", 5000, "nullius-pressure-steam", + {"technology-description.nullius-fluid", tostring(5000), "nullius-pressure-steam", {"fluid-name.nullius-pressure-steam"}}}, order = "nullius-yg", icons = { { icon = BASEICON .. "steam-turbine.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "fluid/steam2.png", @@ -2551,19 +2551,19 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-assay", {"item-name.nullius-copper-ingot"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item-boxable", 1000, "nullius-copper-ingot", + {"technology-description.nullius-item-boxable", tostring(1000), "nullius-copper-ingot", "nullius-box-copper-ingot", {"item-name.nullius-copper-ingot"}}}, order = "nullius-yg", icons = { { - icon = "__angelssmelting__/graphics/icons/ingot-copper.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-copper.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.6, 0.6} } }, @@ -2581,7 +2581,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"item-name.nullius-processor-3"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item-boxable", 2000, "nullius-processor-3", + {"technology-description.nullius-item-boxable", tostring(2000), "nullius-processor-3", "nullius-box-processor-3", {"item-name.nullius-processor-3"}}}, order = "nullius-yg", icons = { @@ -2590,9 +2590,9 @@ data:extend({ icon_size = 64 }, { - icon = "__base__/graphics/technology/advanced-electronics-2.png", + icon = "__base__/graphics/technology/processing-unit.png", icon_size = 256, - icon_mipmaps = 4, + scale = 0.2 } }, @@ -2610,7 +2610,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"item-name.nullius-wood"}}}, localised_description = {"technology-description.nullius-consume", - {"technology-description.nullius-item-boxable", 500000, "nullius-wood", + {"technology-description.nullius-item-boxable", tostring(500000), "nullius-wood", "nullius-box-wood", {"item-name.nullius-wood"}}}, order = "nullius-yg", icons = { @@ -2621,7 +2621,7 @@ data:extend({ { icon = "__base__/graphics/icons/wood.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.8 } }, @@ -2639,18 +2639,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-analysis", {"technology-name.nullius-logistic-robot"}}}, localised_description = {"technology-description.nullius-produce", {"technology-description.nullius-item-boxable", - 1000, "nullius-logistic-bot-4", "nullius-box-logistic-bot-4", {"entity-name.nullius-logistic-bot-4"}}}, + tostring(1000),"nullius-logistic-bot-4", "nullius-box-logistic-bot-4", {"entity-name.nullius-logistic-bot-4"}}}, order = "nullius-yg", icons = { { icon = "__base__/graphics/technology/logistic-robotics.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 4, tint = {0.6, 0.6, 0.6, 0.6} } @@ -2669,13 +2669,13 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-demonstration", {"item-name.nullius-android"}}}, localised_description = {"technology-description.nullius-build", {"technology-description.nullius-item", - 1, "nullius-android-2", {"", {"item-name.nullius-android"}, " ", 2}}}, + tostring(1),"nullius-android-2", {"", {"item-name.nullius-android"}, " ", tostring(2)}}}, order = "nullius-yg", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "android2.png", @@ -2696,7 +2696,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-utilization", {"technology-name.nullius-asteroid-mining"}}}, localised_description = {"technology-description.nullius-consume", {"technology-description.nullius-item", - 20, "nullius-asteroid-miner-2", {"item-name.nullius-asteroid-miner-2"}}}, + tostring(20),"nullius-asteroid-miner-2", {"item-name.nullius-asteroid-miner-2"}}}, order = "nullius-yg", icons = { { @@ -2723,7 +2723,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-deployment", {"item-name.nullius-probe"}}}, localised_description = {"technology-description.nullius-consume", {"technology-description.nullius-item", - 1, "nullius-probe", {"item-name.nullius-probe"}}}, + tostring(1),"nullius-probe", {"item-name.nullius-probe"}}}, order = "nullius-yg", icons = { { @@ -2733,7 +2733,7 @@ data:extend({ { icon = "__base__/graphics/icons/crash-site-spaceship.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.8 } }, @@ -2751,18 +2751,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-deployment", {"technology-name.nullius-solar-power"}}}, localised_description = {"technology-description.nullius-build", {"technology-description.nullius-item", - 1000, "nullius-solar-panel-3", {"entity-name.nullius-solar-panel-3"}}}, + tostring(1000),"nullius-solar-panel-3", {"entity-name.nullius-solar-panel-3"}}}, order = "nullius-yg", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/technology/solar-energy.png", icon_size = 256, - icon_mipmaps = 4, + scale = 0.25 } }, @@ -2780,18 +2780,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-deployment", {"technology-name.nullius-battery-storage"}}}, localised_description = {"technology-description.nullius-build", {"technology-description.nullius-item", - 500, "nullius-grid-battery-3", {"entity-name.nullius-grid-battery-3"}}}, + tostring(500), "nullius-grid-battery-3", {"entity-name.nullius-grid-battery-3"}}}, order = "nullius-yg", icons = { { icon = BASEICON .. "blueprint.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/technology/electric-energy-acumulators.png", icon_size = 256, - icon_mipmaps = 4, + scale = 0.25 } }, @@ -2809,18 +2809,18 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-prototype", {"technology-name.nullius-cybernetics"}}}, localised_description = {"technology-description.nullius-produce", {"technology-description.nullius-item", - 1, "nullius-chassis-6", {"item-name.nullius-chassis-6"}}}, + tostring(1),"nullius-chassis-6", {"item-name.nullius-chassis-6"}}}, order = "nullius-yg", icons = { { icon = "__base__/graphics/technology/power-armor-mk2.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4, + scale = 4, tint = {0.6, 0.6, 0.6, 0.6} } @@ -2841,10 +2841,10 @@ data:extend({ localised_description = {"", {"technology-description.nullius-consume", {"technology-description.nullius-fluid-sequestration", - 1500000000, "nullius-carbon-dioxide", "nullius-compressed-carbon-dioxide", + tostring(1500000000),"nullius-carbon-dioxide", "nullius-compressed-carbon-dioxide", {"fluid-name.nullius-carbon-dioxide"}}},"\n", {"technology-description.nullius-produce", {"technology-description.nullius-fluid-compressible", - 2000000000, "nullius-oxygen", "nullius-compressed-oxygen", {"fluid-name.nullius-oxygen"}}}}, + tostring(2000000000),"nullius-oxygen", "nullius-compressed-oxygen", {"fluid-name.nullius-oxygen"}}}}, order = "nullius-yg", icons = { { @@ -2852,7 +2852,7 @@ data:extend({ icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", icon_size = 72, scale = 0.568 } @@ -2871,7 +2871,7 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"objective-name.nullius-algae-seeding"}}, localised_description = {"objective-description.nullius-objective", - {"item-name.nullius-algae"}, 30}, + {"item-name.nullius-algae"}, tostring(30)}, order = "nullius-yg", icons = { { @@ -2894,13 +2894,13 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"objective-name.nullius-naturalization", {"item-name.nullius-worm"}}}, localised_description = {"objective-description.nullius-objective", - {"item-name.nullius-worm"}, 30}, + {"item-name.nullius-worm"}, tostring(30)}, order = "nullius-yg", icons = { { icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4 + }, checkmark(1.125) }, @@ -2918,13 +2918,13 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"objective-name.nullius-naturalization", {"item-name.nullius-fish"}}}, localised_description = {"objective-description.nullius-objective", - {"item-name.nullius-fish"}, 30}, + {"item-name.nullius-fish"}, tostring(30)}, order = "nullius-yg", icons = { { icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4 + }, checkmark(1.125) }, @@ -2942,13 +2942,13 @@ data:extend({ localised_name = {"technology-name.nullius-checkpoint", {"objective-name.nullius-naturalization", {"item-name.nullius-arthropod"}}}, localised_description = {"objective-description.nullius-objective", - {"item-name.nullius-arthropod"}, 20}, + {"item-name.nullius-arthropod"}, tostring(20)}, order = "nullius-yg", icons = { { icon = "__base__/graphics/icons/small-biter.png", icon_size = 64, - icon_mipmaps = 4 + }, checkmark(1.125) }, @@ -2964,9 +2964,9 @@ data:extend({ type = "technology", name = "nullius-checkpoint-oxygen-partial", localised_name = {"technology-name.nullius-checkpoint", - {"", {"objective-name.nullius-atmospheric-modification"}, " ", 1}}, + {"", {"objective-name.nullius-atmospheric-modification"}, " ", tostring(1)}}, localised_description = {"objective-description.nullius-objective", - {"fluid-name.nullius-oxygen"}, 25}, + {"fluid-name.nullius-oxygen"}, tostring(25)}, order = "nullius-yg", unit = { count = 1, @@ -2980,9 +2980,9 @@ data:extend({ type = "technology", name = "nullius-checkpoint-oxygen-partial-2", localised_name = {"technology-name.nullius-checkpoint", - {"", {"objective-name.nullius-atmospheric-modification"}, " ", 2}}, + {"", {"objective-name.nullius-atmospheric-modification"}, " ", tostring(2)}}, localised_description = {"objective-description.nullius-objective", - {"fluid-name.nullius-oxygen"}, 50}, + {"fluid-name.nullius-oxygen"}, tostring(50)}, order = "nullius-yg", unit = { count = 1, @@ -2996,9 +2996,9 @@ data:extend({ type = "technology", name = "nullius-checkpoint-oxygen-partial-3", localised_name = {"technology-name.nullius-checkpoint", - {"", {"objective-name.nullius-atmospheric-modification"}, " ", 3}}, + {"", {"objective-name.nullius-atmospheric-modification"}, " ", tostring(3)}}, localised_description = {"objective-description.nullius-objective", - {"fluid-name.nullius-oxygen"}, 75}, + {"fluid-name.nullius-oxygen"}, tostring(75)}, order = "nullius-yg", unit = { count = 1, @@ -3012,7 +3012,7 @@ data:extend({ type = "technology", name = "nullius-checkpoint-oxygen", localised_name = {"technology-name.nullius-checkpoint", - {"", {"objective-name.nullius-atmospheric-modification"}, " ", 4}}, + {"", {"objective-name.nullius-atmospheric-modification"}, " ", tostring(4)}}, localised_description = {"objective-description.nullius-atmospheric-modification"}, order = "nullius-yg", unit = { @@ -3046,13 +3046,13 @@ if mods["lambent-nil"] then localised_name = {"technology-name.nullius-checkpoint", {"technology-name.nullius-analysis", {"item-name.nullius-chelating-agent"}}}, localised_description = {"technology-description.nullius-produce", - {"technology-description.nullius-item", 1000, "nullius-chelating-agent", {"item-name.nullius-chelating-agent"}}}, + {"technology-description.nullius-item", tostring(1000), "nullius-chelating-agent", {"item-name.nullius-chelating-agent"}}}, order = "nullius-ye", icons = { { icon = "__lambent-nil__/graphics/icons/chelating-agent.png", icon_size = 64, - icon_mipmaps = 4 + }, checkmark(1) }, diff --git a/nullius/prototypes/entity/alignment.lua b/nullius/prototypes/entity/alignment.lua index 6352943..2ae7f37 100644 --- a/nullius/prototypes/entity/alignment.lua +++ b/nullius/prototypes/entity/alignment.lua @@ -3,9 +3,10 @@ if (settings.startup["nullius-alignment"].value) then local turret = util.table.deepcopy(data.raw["ammo-turret"]["gun-turret"]) turret.name = "nullius-align-conscription-turret" +turret.icon = nil turret.icons = data.raw.item["nullius-align-conscription-turret"].icons turret.minable.result = "nullius-align-conscription-turret" -turret.minable.max_health = 1000 +--turret.minable.max_health = 1000 turret.resistances = { { type = "impact", decrease = 10, percent = 50 }, { type = "laser", decrease = 5, percent = 25 }, @@ -18,12 +19,12 @@ turret.attack_parameters.range = 32 local radar = util.table.deepcopy(data.raw["radar"]["radar"]) radar.name = "nullius-align-concordance-transmitter" +radar.icon = nil radar.icons = data.raw.item["nullius-align-concordance-transmitter"].icons radar.integration_patch = scale_image(radar.integration_patch, 2) radar.pictures = scale_image(radar.pictures, 2) radar.water_reflection = scale_image(radar.water_reflection, 2) radar.pictures.layers[1].tint = {0.6, 0.7, 1} -radar.pictures.layers[1].hr_version.tint = {0.6, 0.7, 1} radar.minable.mining_time = 1 radar.minable.result = "nullius-align-concordance-transmitter" radar.max_health = 600 @@ -47,6 +48,7 @@ data:extend({ type = "projectile", name = "nullius-align-identification-card", flags = {"not-on-map"}, + hidden_in_factoriopedia = true, acceleration = 0.005, action = { { @@ -78,6 +80,7 @@ data:extend({ type = "projectile", name = "nullius-align-invitation-card", flags = {"not-on-map"}, + hidden_in_factoriopedia = true, acceleration = 0.005, action = { { @@ -108,6 +111,7 @@ data:extend({ { type = "projectile", name = "nullius-align-conscription-charge", + hidden_in_factoriopedia = true, flags = {"not-on-map"}, acceleration = 0.1, action = { @@ -149,11 +153,11 @@ data:extend({ { type = "tile", name = "nullius-stars", - collision_mask = {"ground-tile"}, + collision_mask = {layers = {ground_tile = true}}, layer = 234, map_color={r=8, g=8, b=32}, walking_speed_modifier = 0.2, - pollution_absorption_per_second = 0, + absorptions_per_second = {pollution = 0}, variants = { main = { { diff --git a/nullius/prototypes/entity/assembler.lua b/nullius/prototypes/entity/assembler.lua index e1ba461..8ab2da7 100644 --- a/nullius/prototypes/entity/assembler.lua +++ b/nullius/prototypes/entity/assembler.lua @@ -1,3 +1,5 @@ +require ("circuit-connector-sprites") + local ICONPATH = "__nullius__/graphics/icons/" local ENTITYPATH = "__nullius__/graphics/entity/" @@ -7,10 +9,11 @@ data:extend({ { type = "assembling-machine", name = "nullius-small-assembler-1", - order = "nullius-mbb", + order = "nullius-mbb", icon_size = 64, icons = data.raw.item["nullius-small-assembler-1"].icons, flags = {"placeable-neutral", "placeable-player", "player-creation"}, + icon_draw_specification = {shift = {0, -0.1}, scale = 0.8}, minable = {mining_time = 0.6, result = "nullius-small-assembler-1"}, max_health = 200, dying_explosion = "medium-explosion", @@ -23,29 +26,31 @@ data:extend({ fast_replaceable_group = "small-assembler", next_upgrade = "nullius-small-assembler-2", alert_icon_shift = util.by_pixel(-3, -12), - animation = { - layers = { - { - filename = BASEENTITY .. "assembling-machine-1/assembling-machine-1.png", - priority="high", - width = 108, - height = 114, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(0, 2), - scale = 0.666 - }, - { - filename = BASEENTITY .. "assembling-machine-1/assembling-machine-1-shadow.png", - priority="high", - width = 95, - height = 83, - frame_count = 1, - line_length = 1, - repeat_count = 32, - draw_as_shadow = true, - shift = util.by_pixel(8.5, 5.5), - scale = 0.666 + graphics_set = { + animation = { + layers = { + { + filename = BASEENTITY .. "assembling-machine-1/assembling-machine-1.png", + priority="high", + width = 214, + height = 226, + frame_count = 32, + line_length = 8, + shift = util.by_pixel(0, 2), + scale = 0.666*0.5 + }, + { + filename = BASEENTITY .. "assembling-machine-1/assembling-machine-1-shadow.png", + priority="high", + width = 190, + height = 165, + frame_count = 1, + line_length = 1, + repeat_count = 32, + draw_as_shadow = true, + shift = util.by_pixel(8.5, 5), + scale = 0.666*0.5 + } } } }, @@ -55,30 +60,32 @@ data:extend({ "packaging" }, crafting_speed = 0.5, - module_specification = { module_slots = 1 }, + module_slots = 1, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute=2, drain="1kW"}, + energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute={pollution = 2}, drain="1kW"}, energy_usage = "59kW", open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = { sound = { { filename = "__base__/sound/assembling-machine-t1-1.ogg", volume = 0.8 }, { filename = "__base__/sound/assembling-machine-t1-2.ogg", volume = 0.8 } }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, - apparent_volume = 0.8 - } + }, + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = scale_connector_points(circuit_connector_definitions["assembling-machine"], 0.7) }, { type = "assembling-machine", name = "nullius-medium-assembler-1", - order = "nullius-mcb", + order = "nullius-mcb", icon_size = 64, icons = data.raw.item["nullius-medium-assembler-1"].icons, flags = {"placeable-neutral", "placeable-player", "player-creation"}, + icon_draw_specification = {shift = {0, -0.2}}, minable = {mining_time = 0.8, result = "nullius-medium-assembler-1"}, max_health = 300, dying_explosion = "medium-explosion", @@ -88,74 +95,54 @@ data:extend({ }, collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, + forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", pipe_picture = assembler2pipepictures(), pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {0, -2} }}, + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {0, -1}, direction = defines.direction.north }}, secondary_draw_orders = { north = -1 } }, { production_type = "input", pipe_picture = assembler2pipepictures(), pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {0, 2} }}, + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {0, 1}, direction = defines.direction.south }}, secondary_draw_orders = { north = -1 } }, - off_when_no_fluid_recipe = true }, + fluid_boxes_off_when_no_fluid_recipe = true, fast_replaceable_group = "medium-assembler", next_upgrade = "nullius-medium-assembler-2", alert_icon_shift = util.by_pixel(-3, -12), - animation = { - layers = { - { - filename = BASEENTITY .. "assembling-machine-1/assembling-machine-1.png", - priority="high", - width = 108, - height = 114, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(0, 2), - animation_speed = 0.5, - hr_version = { - filename = BASEENTITY .. "assembling-machine-1/hr-assembling-machine-1.png", - priority="high", - width = 214, - height = 226, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(0, 2), - scale = 0.5, - animation_speed = 0.5 - } - }, - { - filename = BASEENTITY .. "assembling-machine-1/assembling-machine-1-shadow.png", - priority="high", - width = 95, - height = 83, - frame_count = 1, - line_length = 1, - repeat_count = 32, - draw_as_shadow = true, - shift = util.by_pixel(8.5, 5.5), - hr_version = { - filename = BASEENTITY .. "assembling-machine-1/hr-assembling-machine-1-shadow.png", - priority="high", - width = 190, - height = 165, - frame_count = 1, - line_length = 1, - repeat_count = 32, - draw_as_shadow = true, - shift = util.by_pixel(8.5, 5), - scale = 0.5 + graphics_set = { + animation = { + layers = { + { + filename = BASEENTITY .. "assembling-machine-1/assembling-machine-1.png", + priority="high", + width = 214, + height = 226, + frame_count = 32, + line_length = 8, + shift = util.by_pixel(0, 2), + scale = 0.5, + animation_speed = 0.5 + }, + { + filename = BASEENTITY .. "assembling-machine-1/assembling-machine-1-shadow.png", + priority="high", + width = 190, + height = 165, + frame_count = 1, + line_length = 1, + repeat_count = 32, + draw_as_shadow = true, + shift = util.by_pixel(8.5, 5), + scale = 0.5 } } } @@ -166,29 +153,32 @@ data:extend({ "small-fluid-assembly", "large-fluid-assembly" }, crafting_speed = 1, - module_specification = { module_slots = 1 }, + module_slots = 1, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute=5, drain="6kW"}, + energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute={pollution = 5}, drain="6kW"}, energy_usage = "144kW", open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = { sound = { { filename = "__base__/sound/assembling-machine-t1-1.ogg", volume = 0.8 }, { filename = "__base__/sound/assembling-machine-t1-2.ogg", volume = 0.8 } }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, - apparent_volume = 1.2 - } + --apparent_volume = 1.2 + }, + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["assembling-machine"] }, { type = "assembling-machine", name = "nullius-large-assembler-1", - order = "nullius-mdb", + order = "nullius-mdb", icons = data.raw.item["nullius-large-assembler-1"].icons, flags = {"placeable-neutral", "placeable-player", "player-creation"}, + icon_draw_specification = {shift = {0, -0.4}, scale = 1.2}, minable = {mining_time = 1.5, result = "nullius-large-assembler-1"}, max_health = 600, dying_explosion = "medium-explosion", @@ -198,54 +188,55 @@ data:extend({ }, collision_box = {{-1.7, -1.7}, {1.7, 1.7}}, selection_box = {{-2.0, -2.0}, {2.0, 2.0}}, + forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", pipe_picture = assembler2pipepictures(), pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {0.5, -2.5} }}, + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {0.5, -1.5}, direction = defines.direction.north }}, secondary_draw_orders = { north = -1 } }, { production_type = "input", pipe_picture = assembler2pipepictures(), pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {-0.5, 2.5} }}, + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-0.5, 1.5}, direction = defines.direction.south }}, secondary_draw_orders = { north = -1 } }, - off_when_no_fluid_recipe = true }, + fluid_boxes_off_when_no_fluid_recipe = true, fast_replaceable_group = "large-assembler", next_upgrade = "nullius-large-assembler-2", alert_icon_shift = util.by_pixel(-3, -12), - animation = { - layers = { - { - filename = BASEENTITY .. "assembling-machine-2/hr-assembling-machine-2.png", - priority = "high", - width = 214, - height = 218, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(0, 4), - scale = 0.666, - animation_speed = 0.2 - }, - { - filename = BASEENTITY .. "assembling-machine-2/hr-assembling-machine-2-shadow.png", - priority = "high", - width = 196, - height = 163, - frame_count = 32, - line_length = 8, - draw_as_shadow = true, - shift = util.by_pixel(12, 4.75), - scale = 0.666, - animation_speed = 0.2 + graphics_set = { + animation = { + layers = { + { + filename = BASEENTITY .. "assembling-machine-2/assembling-machine-2.png", + priority = "high", + width = 214, + height = 218, + frame_count = 32, + line_length = 8, + shift = util.by_pixel(0, 4), + scale = 0.666, + animation_speed = 0.2 + }, + { + filename = BASEENTITY .. "assembling-machine-2/assembling-machine-2-shadow.png", + priority = "high", + width = 196, + height = 163, + frame_count = 32, + line_length = 8, + draw_as_shadow = true, + shift = util.by_pixel(12, 4.75), + scale = 0.666, + animation_speed = 0.2 + } } } }, @@ -255,21 +246,23 @@ data:extend({ "large-fluid-assembly", "huge-fluid-assembly" }, crafting_speed = 4, - module_specification = { module_slots = 2 }, + module_slots = 2, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute=20, drain="50kW"}, + energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute={pollution = 20}, drain="50kW"}, energy_usage = "650kW", open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = { sound = { { filename = "__base__/sound/assembling-machine-t1-1.ogg", volume = 0.8 }, { filename = "__base__/sound/assembling-machine-t1-2.ogg", volume = 0.8 } }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, - apparent_volume = 1.6 - } + --apparent_volume = 1.6 + }, + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = scale_connector_points(circuit_connector_definitions["assembling-machine"], 1.4) } }) @@ -277,10 +270,11 @@ data:extend({ { type = "assembling-machine", name = "nullius-small-assembler-2", - order = "nullius-mbc", + order = "nullius-mbc", icon_size = 64, icons = data.raw.item["nullius-small-assembler-2"].icons, flags = {"placeable-neutral", "placeable-player", "player-creation"}, + icon_draw_specification = {shift = {0, -0.1}, scale = 0.8}, minable = {mining_time = 0.9, result = "nullius-small-assembler-2"}, max_health = 300, dying_explosion = "medium-explosion", @@ -293,20 +287,22 @@ data:extend({ fast_replaceable_group = "small-assembler", next_upgrade = "nullius-small-assembler-3", alert_icon_shift = util.by_pixel(-3, -12), - animation = { - layers = { - { - filename = BASEENTITY .. "assembling-machine-2/assembling-machine-2.png", - priority = "high", - width = 108, - height = 110, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(0, 4), - scale = 0.666, - animation_speed = 0.8 - }, - data.raw["assembling-machine"]["nullius-small-assembler-1"].animation.layers[2] + graphics_set = { + animation = { + layers = { + { + filename = BASEENTITY .. "assembling-machine-2/assembling-machine-2.png", + priority = "high", + width = 214, + height = 218, + frame_count = 32, + line_length = 8, + shift = util.by_pixel(0, 4), + scale = 0.666*0.5, + animation_speed = 0.8 + }, + data.raw["assembling-machine"]["nullius-small-assembler-1"].graphics_set.animation.layers[2] + } } }, crafting_categories = { @@ -315,23 +311,26 @@ data:extend({ "packaging" }, crafting_speed = 1, - module_specification = { module_slots = 2 }, + module_slots = 2, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute=4, drain="2kW"}, + energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute={pollution = 4}, drain="2kW"}, energy_usage = "123kW", open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["nullius-small-assembler-1"].working_sound + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-small-assembler-1"].working_sound, + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = data.raw["assembling-machine"]["nullius-small-assembler-1"].circuit_connector }, { type = "assembling-machine", name = "nullius-small-assembler-3", - order = "nullius-mbd", + order = "nullius-mbd", icon_size = 64, icons = data.raw.item["nullius-small-assembler-3"].icons, flags = {"placeable-neutral", "placeable-player", "player-creation"}, + icon_draw_specification = {shift = {0, -0.1}, scale = 0.8}, minable = {mining_time = 1.2, result = "nullius-small-assembler-3"}, max_health = 400, dying_explosion = "medium-explosion", @@ -343,30 +342,32 @@ data:extend({ selection_box = {{-1.0, -1.0}, {1.0, 1.0}}, fast_replaceable_group = "small-assembler", alert_icon_shift = util.by_pixel(-3, -12), - animation = { - layers = { - { - filename = BASEENTITY .. "assembling-machine-3/assembling-machine-3.png", - priority = "high", - width = 108, - height = 119, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(0, -0.3333), - scale = 0.666, - animation_speed = 0.6 - }, - { - filename = BASEENTITY .. "assembling-machine-3/assembling-machine-3-shadow.png", - priority = "high", - width = 130, - height = 82, - frame_count = 32, - line_length = 8, - draw_as_shadow = true, - shift = util.by_pixel(18.667, 2.6667), - scale = 0.666, - animation_speed = 0.6 + graphics_set = { + animation = { + layers = { + { + filename = BASEENTITY .. "assembling-machine-3/assembling-machine-3.png", + priority = "high", + width = 214, + height = 237, + frame_count = 32, + line_length = 8, + shift = util.by_pixel(0, -0.3333), + scale = 0.666*0.5, + animation_speed = 0.6 + }, + { + filename = BASEENTITY .. "assembling-machine-3/assembling-machine-3-shadow.png", + priority = "high", + width = 260, + height = 162, + frame_count = 32, + line_length = 8, + draw_as_shadow = true, + shift = util.by_pixel(18.667, 2.6667), + scale = 0.666*0.5, + animation_speed = 0.6 + } } } }, @@ -376,23 +377,26 @@ data:extend({ "packaging" }, crafting_speed = 2, - module_specification = { module_slots = 3 }, + module_slots = 3, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute=8, drain="5kW"}, + energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute={pollution = 8}, drain="5kW"}, energy_usage = "270kW", open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["nullius-small-assembler-1"].working_sound + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-small-assembler-1"].working_sound, + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = data.raw["assembling-machine"]["nullius-small-assembler-1"].circuit_connector }, { type = "assembling-machine", name = "nullius-medium-assembler-2", - order = "nullius-mcc", + order = "nullius-mcc", icon_size = 64, icons = data.raw.item["nullius-medium-assembler-2"].icons, flags = {"placeable-neutral", "placeable-player", "player-creation"}, + icon_draw_specification = {shift = {0, -0.2}}, minable = {mining_time = 1.2, result = "nullius-medium-assembler-2"}, max_health = 450, dying_explosion = "medium-explosion", @@ -402,54 +406,37 @@ data:extend({ }, collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, + forced_symmetry = "horizontal", fluid_boxes = data.raw["assembling-machine"]["nullius-medium-assembler-1"].fluid_boxes, + fluid_boxes_off_when_no_fluid_recipe = true, fast_replaceable_group = "medium-assembler", next_upgrade = "nullius-medium-assembler-3", alert_icon_shift = util.by_pixel(-3, -12), - animation = { - layers = { - { - filename = BASEENTITY .. "assembling-machine-2/assembling-machine-2.png", - priority = "high", - width = 108, - height = 110, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(0, 4), - animation_speed = 0.4, - hr_version = { - filename = BASEENTITY .. "assembling-machine-2/hr-assembling-machine-2.png", - priority = "high", - width = 214, - height = 218, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(0, 4), - scale = 0.5, - animation_speed = 0.4 - } - }, - { - filename = BASEENTITY .. "assembling-machine-2/assembling-machine-2-shadow.png", - priority = "high", - width = 98, - height = 82, - frame_count = 32, - line_length = 8, - draw_as_shadow = true, - shift = util.by_pixel(12, 5), - animation_speed = 0.4, - hr_version = { - filename = BASEENTITY .. "assembling-machine-2/hr-assembling-machine-2-shadow.png", - priority = "high", - width = 196, - height = 163, - frame_count = 32, - line_length = 8, - draw_as_shadow = true, - shift = util.by_pixel(12, 4.75), - scale = 0.5, - animation_speed = 0.4 + graphics_set = { + animation = { + layers = { + { + filename = BASEENTITY .. "assembling-machine-2/assembling-machine-2.png", + priority = "high", + width = 214, + height = 218, + frame_count = 32, + line_length = 8, + shift = util.by_pixel(0, 4), + scale = 0.5, + animation_speed = 0.4 + }, + { + filename = BASEENTITY .. "assembling-machine-2/assembling-machine-2-shadow.png", + priority = "high", + width = 196, + height = 163, + frame_count = 32, + line_length = 8, + draw_as_shadow = true, + shift = util.by_pixel(12, 4.75), + scale = 0.5, + animation_speed = 0.4 } } } @@ -460,23 +447,26 @@ data:extend({ "small-fluid-assembly", "large-fluid-assembly" }, crafting_speed = 2, - module_specification = { module_slots = 2 }, + module_slots = 2, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute=10, drain="15kW"}, + energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute={pollution = 10}, drain="15kW"}, energy_usage = "285kW", open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["nullius-medium-assembler-1"].working_sound + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-medium-assembler-1"].working_sound, + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = data.raw["assembling-machine"]["nullius-medium-assembler-1"].circuit_connector }, { type = "assembling-machine", name = "nullius-medium-assembler-3", - order = "nullius-mcd", + order = "nullius-mcd", icon_size = 64, icons = data.raw.item["nullius-medium-assembler-3"].icons, flags = {"placeable-neutral", "placeable-player", "player-creation"}, + icon_draw_specification = {shift = {0, -0.2}}, minable = {mining_time = 1.6, result = "nullius-medium-assembler-3"}, max_health = 600, dying_explosion = "medium-explosion", @@ -486,79 +476,65 @@ data:extend({ }, collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, + forced_symmetry = "horizontal", fluid_boxes = data.raw["assembling-machine"]["nullius-medium-assembler-1"].fluid_boxes, + fluid_boxes_off_when_no_fluid_recipe = true, fast_replaceable_group = "medium-assembler", alert_icon_shift = util.by_pixel(-3, -12), - animation = { - layers = { - { - filename = BASEENTITY .. "assembling-machine-3/assembling-machine-3.png", - priority = "high", - width = 108, - height = 119, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(0, -0.5), - animation_speed = 0.3, - hr_version = { - filename = BASEENTITY .. "assembling-machine-3/hr-assembling-machine-3.png", - priority = "high", - width = 214, - height = 237, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(0, -0.75), - scale = 0.5, - animation_speed = 0.3 - } - }, - { - filename = BASEENTITY .. "assembling-machine-3/assembling-machine-3-shadow.png", - priority = "high", - width = 130, - height = 82, - frame_count = 32, - line_length = 8, - draw_as_shadow = true, - shift = util.by_pixel(28, 4), - animation_speed = 0.3, - hr_version = { - filename = BASEENTITY .. "assembling-machine-3/hr-assembling-machine-3-shadow.png", - priority = "high", - width = 260, - height = 162, - frame_count = 32, - line_length = 8, - draw_as_shadow = true, - shift = util.by_pixel(28, 4), - scale = 0.5, - animation_speed = 0.3 + graphics_set = { + animation = { + layers = { + { + filename = BASEENTITY .. "assembling-machine-3/assembling-machine-3.png", + priority = "high", + width = 214, + height = 237, + frame_count = 32, + line_length = 8, + shift = util.by_pixel(0, -0.75), + scale = 0.5, + animation_speed = 0.3 + }, + { + filename = BASEENTITY .. "assembling-machine-3/assembling-machine-3-shadow.png", + priority = "high", + width = 260, + height = 162, + frame_count = 32, + line_length = 8, + draw_as_shadow = true, + shift = util.by_pixel(28, 4), + scale = 0.5, + animation_speed = 0.3 } } } }, crafting_categories = { - "small-crafting", "medium-crafting", "large-crafting", + "small-crafting","medium-crafting", "large-crafting", "small-assembly", "medium-assembly", "large-assembly", "medium-only-assembly", "small-fluid-assembly", "large-fluid-assembly" }, crafting_speed = 4, - module_specification = { module_slots = 3 }, + module_slots = 3, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute=20, drain="30kW"}, + energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute={pollution = 20}, drain="30kW"}, energy_usage = "670kW", open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["nullius-medium-assembler-1"].working_sound + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-medium-assembler-1"].working_sound, + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = data.raw["assembling-machine"]["nullius-medium-assembler-1"].circuit_connector }, { type = "assembling-machine", name = "nullius-large-assembler-2", - order = "nullius-mdc", + order = "nullius-mdc", icons = data.raw.item["nullius-large-assembler-2"].icons, flags = {"placeable-neutral", "placeable-player", "player-creation"}, + icon_draw_specification = {shift = {0, -0.3}, scale = 1.2}, minable = {mining_time = 2, result = "nullius-large-assembler-2"}, max_health = 800, dying_explosion = "medium-explosion", @@ -568,33 +544,37 @@ data:extend({ }, collision_box = {{-1.7, -1.7}, {1.7, 1.7}}, selection_box = {{-2.0, -2.0}, {2.0, 2.0}}, + forced_symmetry = "horizontal", fluid_boxes = data.raw["assembling-machine"]["nullius-large-assembler-1"].fluid_boxes, + fluid_boxes_off_when_no_fluid_recipe = true, fast_replaceable_group = "large-assembler", alert_icon_shift = util.by_pixel(-3, -12), - animation = { - layers = { - { - filename = BASEENTITY .. "assembling-machine-3/hr-assembling-machine-3.png", - priority = "high", - width = 214, - height = 237, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(0, -1), - scale = 0.666, - animation_speed = 0.15 - }, - { - filename = BASEENTITY .. "assembling-machine-3/hr-assembling-machine-3-shadow.png", - priority = "high", - width = 260, - height = 162, - frame_count = 32, - line_length = 8, - draw_as_shadow = true, - shift = util.by_pixel(37.333, 5.3333), - scale = 0.666, - animation_speed = 0.15 + graphics_set = { + animation = { + layers = { + { + filename = BASEENTITY .. "assembling-machine-3/assembling-machine-3.png", + priority = "high", + width = 214, + height = 237, + frame_count = 32, + line_length = 8, + shift = util.by_pixel(0, -1), + scale = 0.666, + animation_speed = 0.15 + }, + { + filename = BASEENTITY .. "assembling-machine-3/assembling-machine-3-shadow.png", + priority = "high", + width = 260, + height = 162, + frame_count = 32, + line_length = 8, + draw_as_shadow = true, + shift = util.by_pixel(37.333, 5.3333), + scale = 0.666, + animation_speed = 0.15 + } } } }, @@ -604,21 +584,54 @@ data:extend({ "large-fluid-assembly", "huge-fluid-assembly" }, crafting_speed = 8, - module_specification = { module_slots = 3 }, + module_slots = 3, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute=40, drain="100kW"}, + energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute={pollution = 40}, drain="100kW"}, energy_usage = "1500kW", open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["nullius-large-assembler-1"].working_sound + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-large-assembler-1"].working_sound, + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = data.raw["assembling-machine"]["nullius-large-assembler-1"].circuit_connector } }) -local nanofab_pipes = util.table.deepcopy( - data.raw["assembling-machine"]["crystallizer"].fluid_boxes[1].pipe_picture) -nanofab_pipes.south = util.table.deepcopy( - data.raw["pipe-to-ground"]["pipe-to-ground"].pictures.down.hr_version) +local nanofab_pipes = { + north = { + filename = "__angelsrefininggraphics__/graphics/entity/crystallizer/crystallizer-pipe-connection.png", + priority = "extra-high", + size = 128, + x = 0, + shift = { 0, 1 }, + scale = 0.5, + }, + east = { + filename = "__angelsrefininggraphics__/graphics/entity/crystallizer/crystallizer-pipe-connection.png", + priority = "extra-high", + size = 128, + x = 128, + shift = { -1, 0 }, + scale = 0.5, + }, + south = { + filename = "__angelsrefininggraphics__/graphics/entity/crystallizer/crystallizer-pipe-connection.png", + priority = "extra-high", + size = 128, + x = 256, + shift = { 0, -1 }, + scale = 0.5, + }, + west = { + filename = "__angelsrefininggraphics__/graphics/entity/crystallizer/crystallizer-pipe-connection.png", + priority = "extra-high", + size = 128, + x = 384, + shift = { 1, 0 }, + scale = 0.5, + }, + } +nanofab_pipes.south = util.table.deepcopy(data.raw["pipe-to-ground"]["pipe-to-ground"].pictures.south) nanofab_pipes.south.shift = {0, -1} data:extend({ @@ -626,9 +639,10 @@ data:extend({ type = "assembling-machine", name = "nullius-nanofabricator-1", icons = data.raw.item["nullius-nanofabricator-1"].icons, - order = data.raw.item["nullius-nanofabricator-1"].order .. "b", - localised_description = {"entity-description.nullius-nanofabricator"}, + order = data.raw.item["nullius-nanofabricator-1"].order .. "b", + localised_description = {"entity-description.nullius-nanofabricator"}, flags = {"placeable-neutral", "placeable-player", "player-creation"}, + icon_draw_specification = {shift = {-0.1, -0.2}, scale = 0.9}, minable = {mining_time = 2, result = "nullius-nanofabricator-1"}, max_health = 300, corpse = "big-remnants", @@ -636,88 +650,97 @@ data:extend({ resistances = { { type = "impact", decrease = 50, percent = 80 } }, collision_box = {{-1.75, -1.75}, {1.75, 1.75}}, selection_box = {{-2, -2}, {2, 2}}, - module_specification = { module_slots = 3 }, + module_slots = 3, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, crafting_categories = {"nanotechnology"}, fast_replaceable_group = "nanofabricator", next_upgrade = "nullius-nanofabricator-2", crafting_speed = 1, + forced_symmetry = "horizontal", energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 2, + emissions_per_minute = {pollution = 2}, drain = "30kW" }, energy_usage = "470kW", - animation = scale_image(data.raw["assembling-machine"]["crystallizer"].animation, 0.775), - vehicle_impact_sound = data.raw["assembling-machine"]["crystallizer"].vehicle_impact_sound, - working_sound = data.raw["assembling-machine"]["crystallizer"].working_sound, + graphics_set = { + animation = scale_image({ + layers = { + -- Base + { + filename = "__angelsrefininggraphics__/graphics/entity/crystallizer/crystallizer.png", + priority = "extra-high", + width = 390, + height = 326, + shift = util.by_pixel(16, 0), + scale = 0.5, + }, + -- Shadow + { + filename = "__angelsrefininggraphics__/graphics/entity/crystallizer/crystallizer-shadow.png", + priority = "extra-high", + width = 390, + height = 326, + shift = util.by_pixel(16, 0), + draw_as_shadow = true, + scale = 0.5, + }, + }, + }, 0.775), + }, + impact_category = "metal", + working_sound = { + sound = { filename = "__base__/sound/oil-refinery.ogg", volume = 0.45 }, + idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, + }, fluid_boxes = { { production_type = "input", pipe_picture = nanofab_pipes, pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -2, - pipe_connections = {{ type="input", position = {-2.5, -0.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1.5, -0.5}, direction = defines.direction.west }} }, { production_type = "input", pipe_picture = nanofab_pipes, pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -2, - pipe_connections = {{ type="input", position = {-0.5, 2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-0.5, 1.5}, direction = defines.direction.south }} }, { production_type = "input", pipe_picture = nanofab_pipes, pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -2, - pipe_connections = {{ type="input", position = {0.5, -2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {0.5, -1.5}, direction = defines.direction.north }} }, { production_type = "output", pipe_picture = nanofab_pipes, pipe_covers = pipecoverspictures(), - base_area = 3, - base_level = 4, - pipe_connections = {{ type="output", position = {2.5, 0.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1.5, 0.5}, direction = defines.direction.east }} }, - off_when_no_fluid_recipe = true - } + }, + fluid_boxes_off_when_no_fluid_recipe = true, + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = scale_connector_points(circuit_connector_definitions["recycler"], 0.15, true) } }) -data.raw["assembling-machine"]["nullius-nanofabricator-1"].animation.layers[1].tint = {0.6, 0.75, 0.75} -if (data.raw["assembling-machine"]["nullius-nanofabricator-1"].animation.layers[1].hr_version ~= nil) then -data.raw["assembling-machine"]["nullius-nanofabricator-1"].animation.layers[1].hr_version.tint = {0.6, 0.75, 0.75} -end - -local mnf1 = util.table.deepcopy( - data.raw["assembling-machine"]["nullius-nanofabricator-1"]) -mnf1.name = "nullius-mirror-nanofabricator-1" -mnf1.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } -mnf1.order = data.raw.item["nullius-nanofabricator-1"].order .. "c" -mnf1.placeable_by = {item = "nullius-nanofabricator-1", count = 1} -mnf1.next_upgrade = "nullius-mirror-nanofabricator-2" -mnf1.localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-nanofabricator-1"}} -mnf1.fluid_boxes[1].pipe_connections[1].position = {-2.5, 0.5} -mnf1.fluid_boxes[2].pipe_connections[1].position = {-0.5, -2.5} -mnf1.fluid_boxes[3].pipe_connections[1].position = {0.5, 2.5} -mnf1.fluid_boxes[4].pipe_connections[1].position = {2.5, -0.5} +data.raw["assembling-machine"]["nullius-nanofabricator-1"].graphics_set.animation.layers[1].tint = {0.6, 0.75, 0.75} data:extend({ - mnf1, { type = "assembling-machine", name = "nullius-nanofabricator-2", icons = data.raw.item["nullius-nanofabricator-2"].icons, - order = data.raw.item["nullius-nanofabricator-2"].order .. "b", - localised_description = {"entity-description.nullius-nanofabricator"}, + order = data.raw.item["nullius-nanofabricator-2"].order .. "b", + localised_description = {"entity-description.nullius-nanofabricator"}, flags = {"placeable-neutral", "placeable-player", "player-creation"}, + icon_draw_specification = {shift = {-0.1, -0.2}, scale = 0.9}, minable = {mining_time = 2.5, result = "nullius-nanofabricator-2"}, max_health = 400, corpse = "big-remnants", @@ -725,20 +748,45 @@ data:extend({ resistances = { { type = "impact", decrease = 50, percent = 80 } }, collision_box = {{-1.75, -1.75}, {1.75, 1.75}}, selection_box = {{-2, -2}, {2, 2}}, - module_specification = { module_slots = 4 }, + module_slots = 4, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, crafting_categories = {"nanotechnology"}, fast_replaceable_group = "nanofabricator", crafting_speed = 2, + forced_symmetry = "horizontal", energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 4, + emissions_per_minute = {pollution = 4}, drain = "60kW" }, energy_usage = "940kW", - animation = scale_image(data.raw["assembling-machine"]["crystallizer-2"].animation, 0.775), - vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, + graphics_set = { + animation = scale_image({ + layers = { + -- Base + { + filename = "__angelsrefininggraphics__/graphics/entity/crystallizer/crystallizer.png", + priority = "extra-high", + width = 390, + height = 326, + shift = util.by_pixel(16, 0), + scale = 0.5, + }, + -- Shadow + { + filename = "__angelsrefininggraphics__/graphics/entity/crystallizer/crystallizer-shadow.png", + priority = "extra-high", + width = 390, + height = 326, + shift = util.by_pixel(16, 0), + draw_as_shadow = true, + scale = 0.5, + }, + }, + }, 0.775), + }, + impact_category = "metal", working_sound = data.raw["assembling-machine"]["nullius-nanofabricator-1"].working_sound, fluid_boxes = { { @@ -746,122 +794,52 @@ data:extend({ pipe_picture = data.raw["assembling-machine"] ["nullius-nanofabricator-1"].fluid_boxes[1].pipe_picture, pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {-2.5, -0.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1.5, -0.5}, direction = defines.direction.west }} }, { production_type = "input", pipe_picture = data.raw["assembling-machine"] ["nullius-nanofabricator-1"].fluid_boxes[2].pipe_picture, pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {-0.5, 2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-0.5, 1.5}, direction = defines.direction.south }} }, { production_type = "input", pipe_picture = data.raw["assembling-machine"] ["nullius-nanofabricator-1"].fluid_boxes[3].pipe_picture, pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {0.5, -2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {0.5, -1.5}, direction = defines.direction.north }} }, { production_type = "output", pipe_picture = data.raw["assembling-machine"] ["nullius-nanofabricator-1"].fluid_boxes[4].pipe_picture, pipe_covers = pipecoverspictures(), - base_area = 3, - base_level = 5, - height = 2, - pipe_connections = {{ type="output", position = {2.5, 0.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1.5, 0.5}, direction = defines.direction.east }} }, - off_when_no_fluid_recipe = true - } + }, + fluid_boxes_off_when_no_fluid_recipe = true, + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = data.raw["assembling-machine"]["nullius-nanofabricator-1"].circuit_connector + --circuit_connector = scale_connector_points(circuit_connector_definitions["recycler"], 2, true) -- other attempts + -- circuit_connector = circuit_connector_definitions.create_vector + -- ( + -- universal_connector_template, + -- { + -- { variation = 24, main_offset = util.by_pixel(-26, -16), shadow_offset = util.by_pixel(0, 0), show_shadow = false }, + -- { variation = 26, main_offset = util.by_pixel(-25, 20), shadow_offset = util.by_pixel(-23, 24), show_shadow = true }, + -- { variation = 24, main_offset = util.by_pixel(-25, -26), shadow_offset = util.by_pixel(4, -10), show_shadow = false }, + -- { variation = 30, main_offset = util.by_pixel(0, 20), shadow_offset = util.by_pixel(2, 24), show_shadow = true }, + -- } + -- ) } }) data:extend({ - { - type = "assembling-machine", - name = "nullius-mirror-nanofabricator-2", - localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-nanofabricator-2"}}, - icons = { - data.raw.item["nullius-nanofabricator-2"].icons[1], - { icon = ICONPATH .. "flip1.png", icon_size = 64 } - }, - order = data.raw.item["nullius-nanofabricator-2"].order .. "c", - localised_description = {"entity-description.nullius-nanofabricator"}, - flags = {"placeable-neutral", "placeable-player", "player-creation"}, - minable = {mining_time = 2.5, result = "nullius-nanofabricator-2"}, - placeable_by = {item = "nullius-nanofabricator-2", count = 1}, - max_health = 400, - corpse = "big-remnants", - dying_explosion = "medium-explosion", - resistances = { { type = "impact", decrease = 50, percent = 80 } }, - collision_box = {{-1.75, -1.75}, {1.75, 1.75}}, - selection_box = {{-2, -2}, {2, 2}}, - module_specification = { module_slots = 4 }, - allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - crafting_categories = {"nanotechnology"}, - fast_replaceable_group = "nanofabricator", - crafting_speed = 2, - energy_source = data.raw["assembling-machine"]["nullius-nanofabricator-2"].energy_source, - energy_usage = "940kW", - animation = data.raw["assembling-machine"]["nullius-nanofabricator-2"].animation, - vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, - working_sound = data.raw["assembling-machine"]["nullius-nanofabricator-1"].working_sound, - fluid_boxes = { - { - production_type = "input", - pipe_picture = data.raw["assembling-machine"] - ["nullius-nanofabricator-1"].fluid_boxes[1].pipe_picture, - pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {-2.5, 0.5} }} - }, - { - production_type = "input", - pipe_picture = data.raw["assembling-machine"] - ["nullius-nanofabricator-1"].fluid_boxes[2].pipe_picture, - pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {-0.5, -2.5} }} - }, - { - production_type = "input", - pipe_picture = data.raw["assembling-machine"] - ["nullius-nanofabricator-1"].fluid_boxes[3].pipe_picture, - pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {0.5, 2.5} }} - }, - { - production_type = "output", - pipe_picture = data.raw["assembling-machine"] - ["nullius-nanofabricator-1"].fluid_boxes[4].pipe_picture, - pipe_covers = pipecoverspictures(), - base_area = 3, - base_level = 5, - height = 2, - pipe_connections = {{ type="output", position = {2.5, -0.5} }} - }, - off_when_no_fluid_recipe = true - } - }, - { type = "furnace", name = "nullius-boxer", @@ -873,32 +851,56 @@ data:extend({ dying_explosion = "steel-chest-explosion", collision_box = {{-0.25, -0.25}, {0.25, 0.25}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, - drawing_box = {{-0.52, -0.82}, {0.52, 0.52}}, result_inventory_size = 1, source_inventory_size = 1, crafting_categories = {"packaging"}, crafting_speed = 4, energy_source = { - type = "electric", - usage_priority = "secondary-input", - emissions_per_minute = 0.1, - drain = "5kW" - }, + type = "electric", + usage_priority = "secondary-input", + emissions_per_minute = {pollution = 0.1}, + drain = "5kW" + }, energy_usage = "395kW", - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.4 }, + impact_category = "metal", working_sound = { sound = { { filename = "__base__/sound/assembling-machine-t1-1.ogg", volume = 0.6 }, { filename = "__base__/sound/assembling-machine-t1-2.ogg", volume = 0.6 } }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.5 }, - apparent_volume = 0.5 }, - animation = scale_image(data.raw["assembling-machine"]["powder-mixer"].animation, 0.52) + graphics_set = { + animation = scale_image({ + layers = { + { + filename = "__angelssmeltinggraphics__/graphics/entity/powder-mixer/powder-mixer-base.png", + priority = "high", + width = 138, + height = 170, + line_length = 4, + frame_count = 4, + animation_speed = 0.5, + shift = util.by_pixel(0.5, -9.5), + scale = 0.5, + }, + { + filename = "__angelssmeltinggraphics__/graphics/entity/powder-mixer/powder-mixer-shadow.png", + priority = "high", + width = 183, + height = 99, + repeat_count = 4, + animation_speed = 0.5, + draw_as_shadow = true, + shift = util.by_pixel(13, 9), + scale = 0.5, + }, + }, + }, 0.52) + }, + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["inserter"] } }) -data.raw["furnace"]["nullius-boxer"].animation.layers[1].tint = {0.88, 0.92, 1} -if (data.raw["furnace"]["nullius-boxer"].animation.layers[1].hr_version ~= nil) then - data.raw["furnace"]["nullius-boxer"].animation.layers[1].hr_version.tint = {0.88, 0.92, 1} -end +data.raw["furnace"]["nullius-boxer"].graphics_set.animation.layers[1].tint = {0.88, 0.92, 1} diff --git a/nullius/prototypes/entity/beacon.lua b/nullius/prototypes/entity/beacon.lua index 405c162..226a663 100644 --- a/nullius/prototypes/entity/beacon.lua +++ b/nullius/prototypes/entity/beacon.lua @@ -3,6 +3,8 @@ local ENTICONPATH = "__nullius__/graphics/icons/entity/" local ENTITYPATH = "__nullius__/graphics/entity/" local BASEENTITY = "__base__/graphics/entity/" +data:extend({{ type = "collision-layer", name = "layer_42" }}) + data:extend({ { type = "beacon", @@ -16,7 +18,7 @@ data:extend({ collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, damaged_trigger_effect = data.raw.beacon["beacon"].damaged_trigger_effect, - drawing_box = {{-1.5, -2.2}, {1.5, 1.3}}, + allowed_effects = {"consumption", "speed", "pollution"}, resistances = { { type = "impact", decrease = 50, percent = 80 } @@ -26,28 +28,23 @@ data:extend({ water_reflection = data.raw.beacon["beacon"].water_reflection, radius_visualisation_picture = data.raw.beacon["beacon"].radius_visualisation_picture, - supply_area_distance = 3.29, + supply_area_distance = 3, energy_source = { type = "electric", usage_priority = "secondary-input" }, - vehicle_impact_sound = data.raw.beacon["beacon"].vehicle_impact_sound, + impact_category = data.raw.beacon["beacon"].impact_category, open_sound = data.raw.beacon["beacon"].open_sound, close_sound = data.raw.beacon["beacon"].close_sound, energy_usage = "80kW", distribution_effectivity = 0.5, - module_specification = { - module_slots = 1, - module_info_icon_shift = {0, 0.5}, - module_info_multi_row_initial_height_modifier = -0.3 - }, + module_slots = 1, graphics_set = { module_icons_suppressed = true, animation_progress = 1, - min_animation_progress = 0, module_tint_mode = "mix", no_modules_tint = {1, 0, 0}, random_animation_offset = true, apply_module_tint = "secondary", - apply_module_tint_to_light = "none", + --apply_module_tint_to_light = "none", animation_list = { { @@ -56,7 +53,7 @@ data:extend({ animation = { layers = { { - filename = BASEENTITY .. "beacon/hr-beacon-bottom.png", + filename = BASEENTITY .. "beacon/beacon-bottom.png", width = 212, height = 192, scale = 0.4, @@ -64,7 +61,7 @@ data:extend({ tint = {0.8, 0.9, 0.7} }, { - filename = BASEENTITY .. "beacon/hr-beacon-shadow.png", + filename = BASEENTITY .. "beacon/beacon-shadow.png", width = 244, height = 176, scale = 0.4, @@ -78,7 +75,7 @@ data:extend({ render_layer = "object", always_draw = true, animation = { - filename = BASEENTITY .. "beacon/hr-beacon-top.png", + filename = BASEENTITY .. "beacon/beacon-top.png", width = 96, height = 140, scale = 0.4, @@ -90,11 +87,10 @@ data:extend({ { render_layer = "object", apply_tint = true, - draw_as_sprite = true, - draw_as_light = true, + --draw_as_sprite = true, always_draw = false, animation = { - filename = BASEENTITY .. "beacon/hr-beacon-light.png", + filename = BASEENTITY .. "beacon/beacon-light.png", line_length = 9, width = 110, height = 186, @@ -102,6 +98,7 @@ data:extend({ animation_speed = 0.5, scale = 0.4, shift = util.by_pixel(0.5*0.8, -18*0.8), + draw_as_light = true, blend_mode = "additive" } } @@ -119,7 +116,7 @@ data:extend({ has_empty_slot = true, render_layer = "lower-object", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-slot-1.png", + filename = BASEENTITY .. "beacon/beacon-module-slot-1.png", line_length = 4, width = 50, height = 66, @@ -132,7 +129,7 @@ data:extend({ apply_module_tint = "primary", render_layer = "lower-object", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-mask-box-1.png", + filename = BASEENTITY .. "beacon/beacon-module-mask-box-1.png", line_length = 3, width = 36, height = 32, @@ -145,7 +142,7 @@ data:extend({ apply_module_tint = "secondary", render_layer = "lower-object-above-shadow", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-mask-lights-1.png", + filename = BASEENTITY .. "beacon/beacon-module-mask-lights-1.png", line_length = 3, width = 26, height = 12, @@ -156,15 +153,15 @@ data:extend({ }, { apply_module_tint = "secondary", - draw_as_light = true, - draw_as_sprite = false, + --draw_as_sprite = false, pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-lights-1.png", + filename = BASEENTITY .. "beacon/beacon-module-lights-1.png", line_length = 3, width = 56, height = 42, variation_count = 3, shift = util.by_pixel(-18*0.8, 13*0.8), + draw_as_light = true, scale = 0.4 } } @@ -187,7 +184,7 @@ data:extend({ collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, damaged_trigger_effect = data.raw.beacon["beacon"].damaged_trigger_effect, - drawing_box = {{-1.5, -2.2}, {1.5, 1.3}}, + allowed_effects = {"consumption", "speed", "pollution"}, resistances = { { type = "impact", decrease = 50, percent = 80 } @@ -197,28 +194,23 @@ data:extend({ water_reflection = data.raw.beacon["beacon"].water_reflection, radius_visualisation_picture = data.raw.beacon["beacon"].radius_visualisation_picture, - supply_area_distance = 3.29, + supply_area_distance = 3, energy_source = { type = "electric", usage_priority = "secondary-input" }, - vehicle_impact_sound = data.raw.beacon["beacon"].vehicle_impact_sound, + impact_category = data.raw.beacon["beacon"].impact_category, open_sound = data.raw.beacon["beacon"].open_sound, close_sound = data.raw.beacon["beacon"].close_sound, energy_usage = "150kW", distribution_effectivity = 0.4, - module_specification = { - module_slots = 2, - module_info_icon_shift = {0, 0.5}, - module_info_multi_row_initial_height_modifier = -0.3 - }, + module_slots = 2, graphics_set = { module_icons_suppressed = true, animation_progress = 1, - min_animation_progress = 0, module_tint_mode = "mix", no_modules_tint = {1, 0, 0}, random_animation_offset = true, apply_module_tint = "secondary", - apply_module_tint_to_light = "none", + --apply_module_tint_to_light = "none", animation_list = { { @@ -227,7 +219,7 @@ data:extend({ animation = { layers = { { - filename = BASEENTITY .. "beacon/hr-beacon-bottom.png", + filename = BASEENTITY .. "beacon/beacon-bottom.png", width = 212, height = 192, scale = 0.45, @@ -235,7 +227,7 @@ data:extend({ tint = {0.9, 0.8, 1} }, { - filename = BASEENTITY .. "beacon/hr-beacon-shadow.png", + filename = BASEENTITY .. "beacon/beacon-shadow.png", width = 244, height = 176, scale = 0.45, @@ -249,7 +241,7 @@ data:extend({ render_layer = "object", always_draw = true, animation = { - filename = BASEENTITY .. "beacon/hr-beacon-top.png", + filename = BASEENTITY .. "beacon/beacon-top.png", width = 96, height = 140, scale = 0.45, @@ -261,11 +253,10 @@ data:extend({ { render_layer = "object", apply_tint = true, - draw_as_sprite = true, - draw_as_light = true, + --draw_as_sprite = true, always_draw = false, animation = { - filename = BASEENTITY .. "beacon/hr-beacon-light.png", + filename = BASEENTITY .. "beacon/beacon-light.png", line_length = 9, width = 110, height = 186, @@ -274,6 +265,7 @@ data:extend({ scale = 0.45, shift = util.by_pixel(0.5*0.9, -18*0.9), blend_mode = "additive", + draw_as_light = true, } } }, @@ -290,7 +282,7 @@ data:extend({ has_empty_slot = true, render_layer = "lower-object", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-slot-1.png", + filename = BASEENTITY .. "beacon/beacon-module-slot-1.png", line_length = 4, width = 50, height = 66, @@ -303,7 +295,7 @@ data:extend({ apply_module_tint = "primary", render_layer = "lower-object", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-mask-box-1.png", + filename = BASEENTITY .. "beacon/beacon-module-mask-box-1.png", line_length = 3, width = 36, height = 32, @@ -316,7 +308,7 @@ data:extend({ apply_module_tint = "secondary", render_layer = "lower-object-above-shadow", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-mask-lights-1.png", + filename = BASEENTITY .. "beacon/beacon-module-mask-lights-1.png", line_length = 3, width = 26, height = 12, @@ -327,15 +319,15 @@ data:extend({ }, { apply_module_tint = "secondary", - draw_as_light = true, - draw_as_sprite = false, + --draw_as_sprite = false, pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-lights-1.png", + filename = BASEENTITY .. "beacon/beacon-module-lights-1.png", line_length = 3, width = 56, height = 42, variation_count = 3, shift = util.by_pixel(-18*0.9, 13*0.9), + draw_as_light = true, scale = 0.45 } } @@ -346,7 +338,7 @@ data:extend({ has_empty_slot = true, render_layer = "lower-object", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-slot-2.png", + filename = BASEENTITY .. "beacon/beacon-module-slot-2.png", line_length = 4, width = 46, height = 44, @@ -359,7 +351,7 @@ data:extend({ apply_module_tint = "primary", render_layer = "lower-object", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-mask-box-2.png", + filename = BASEENTITY .. "beacon/beacon-module-mask-box-2.png", line_length = 3, width = 36, height = 26, @@ -372,7 +364,7 @@ data:extend({ apply_module_tint = "secondary", render_layer = "lower-object-above-shadow", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-mask-lights-2.png", + filename = BASEENTITY .. "beacon/beacon-module-mask-lights-2.png", line_length = 3, width = 24, height = 14, @@ -383,15 +375,15 @@ data:extend({ }, { apply_module_tint = "secondary", - draw_as_light = true, - draw_as_sprite = false, + --draw_as_sprite = false, pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-lights-2.png", + filename = BASEENTITY .. "beacon/beacon-module-lights-2.png", line_length = 3, width = 66, height = 46, variation_count = 3, shift = util.by_pixel(22*0.9, -16*0.9), + draw_as_light = true, scale = 0.45 } } @@ -414,7 +406,7 @@ data:extend({ collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, damaged_trigger_effect = data.raw.beacon["beacon"].damaged_trigger_effect, - drawing_box = {{-1.5, -2.2}, {1.5, 1.3}}, + allowed_effects = {"consumption", "speed", "pollution"}, resistances = { { type = "impact", decrease = 50, percent = 80 } @@ -423,28 +415,23 @@ data:extend({ water_reflection = data.raw.beacon["beacon"].water_reflection, radius_visualisation_picture = data.raw.beacon["beacon"].radius_visualisation_picture, - supply_area_distance = 3.29, + supply_area_distance = 3, energy_source = { type = "electric", usage_priority = "secondary-input" }, - vehicle_impact_sound = data.raw.beacon["beacon"].vehicle_impact_sound, + impact_category = data.raw.beacon["beacon"].impact_category, open_sound = data.raw.beacon["beacon"].open_sound, close_sound = data.raw.beacon["beacon"].close_sound, energy_usage = "250kW", distribution_effectivity = 0.5, - module_specification = { - module_slots = 2, - module_info_icon_shift = {0, 0.5}, - module_info_multi_row_initial_height_modifier = -0.3 - }, + module_slots = 2, graphics_set = { module_icons_suppressed = true, animation_progress = 1, - min_animation_progress = 0, module_tint_mode = "mix", no_modules_tint = {1, 0, 0}, random_animation_offset = true, apply_module_tint = "secondary", - apply_module_tint_to_light = "none", + --apply_module_tint_to_light = "none", animation_list = { { @@ -453,14 +440,14 @@ data:extend({ animation = { layers = { { - filename = BASEENTITY .. "beacon/hr-beacon-bottom.png", + filename = BASEENTITY .. "beacon/beacon-bottom.png", width = 212, height = 192, scale = 0.5, shift = util.by_pixel(0.5, 1), }, { - filename = BASEENTITY .. "beacon/hr-beacon-shadow.png", + filename = BASEENTITY .. "beacon/beacon-shadow.png", width = 244, height = 176, scale = 0.5, @@ -474,7 +461,7 @@ data:extend({ render_layer = "object", always_draw = true, animation = { - filename = BASEENTITY .. "beacon/hr-beacon-top.png", + filename = BASEENTITY .. "beacon/beacon-top.png", width = 96, height = 140, scale = 0.5, @@ -486,11 +473,10 @@ data:extend({ { render_layer = "object", apply_tint = true, - draw_as_sprite = true, - draw_as_light = true, + --draw_as_sprite = true, always_draw = false, animation = { - filename = BASEENTITY .. "beacon/hr-beacon-light.png", + filename = BASEENTITY .. "beacon/beacon-light.png", line_length = 9, width = 110, height = 186, @@ -499,6 +485,7 @@ data:extend({ scale = 0.5, shift = util.by_pixel(0.5, -18), blend_mode = "additive", + draw_as_light = true, } } }, @@ -515,7 +502,7 @@ data:extend({ has_empty_slot = true, render_layer = "lower-object", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-slot-1.png", + filename = BASEENTITY .. "beacon/beacon-module-slot-1.png", line_length = 4, width = 50, height = 66, @@ -528,7 +515,7 @@ data:extend({ apply_module_tint = "primary", render_layer = "lower-object", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-mask-box-1.png", + filename = BASEENTITY .. "beacon/beacon-module-mask-box-1.png", line_length = 3, width = 36, height = 32, @@ -541,7 +528,7 @@ data:extend({ apply_module_tint = "secondary", render_layer = "lower-object-above-shadow", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-mask-lights-1.png", + filename = BASEENTITY .. "beacon/beacon-module-mask-lights-1.png", line_length = 3, width = 26, height = 12, @@ -552,15 +539,15 @@ data:extend({ }, { apply_module_tint = "secondary", - draw_as_light = true, - draw_as_sprite = false, + --draw_as_sprite = false, pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-lights-1.png", + filename = BASEENTITY .. "beacon/beacon-module-lights-1.png", line_length = 3, width = 56, height = 42, variation_count = 3, shift = util.by_pixel(-18, 13), + draw_as_light = true, scale = 0.5 } } @@ -571,7 +558,7 @@ data:extend({ has_empty_slot = true, render_layer = "lower-object", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-slot-2.png", + filename = BASEENTITY .. "beacon/beacon-module-slot-2.png", line_length = 4, width = 46, height = 44, @@ -584,7 +571,7 @@ data:extend({ apply_module_tint = "primary", render_layer = "lower-object", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-mask-box-2.png", + filename = BASEENTITY .. "beacon/beacon-module-mask-box-2.png", line_length = 3, width = 36, height = 26, @@ -597,7 +584,7 @@ data:extend({ apply_module_tint = "secondary", render_layer = "lower-object-above-shadow", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-mask-lights-2.png", + filename = BASEENTITY .. "beacon/beacon-module-mask-lights-2.png", line_length = 3, width = 24, height = 14, @@ -608,15 +595,15 @@ data:extend({ }, { apply_module_tint = "secondary", - draw_as_light = true, - draw_as_sprite = false, + --draw_as_sprite = false, pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-lights-2.png", + filename = BASEENTITY .. "beacon/beacon-module-lights-2.png", line_length = 3, width = 66, height = 46, variation_count = 3, shift = util.by_pixel(22, -16), + draw_as_light = true, scale = 0.5 } } @@ -638,9 +625,9 @@ data:extend({ dying_explosion = "beacon-explosion", collision_box = {{-1.7, -1.7}, {1.7, 1.7}}, selection_box = {{-2, -2}, {2, 2}}, - collision_mask = {"layer-42", "item-layer", "object-layer", "player-layer", "water-tile"}, + collision_mask = { layers = {layer_42 = true, item = true, object = true, player = true, water_tile = true}}, damaged_trigger_effect = data.raw.beacon["beacon"].damaged_trigger_effect, - drawing_box = {{-2, -3}, {2, 1.8}}, + allowed_effects = {"consumption", "speed", "pollution"}, resistances = {{ type = "impact", decrease = 40, percent = 75 }}, fast_replaceable_group = "large-beacon", @@ -648,27 +635,23 @@ data:extend({ water_reflection = data.raw.beacon["beacon"].water_reflection, radius_visualisation_picture = data.raw.beacon["beacon"].radius_visualisation_picture, - supply_area_distance = 12.29, + supply_area_distance = 12, energy_source = { type = "electric", usage_priority = "secondary-input" }, - vehicle_impact_sound = data.raw.beacon["beacon"].vehicle_impact_sound, + impact_category = data.raw.beacon["beacon"].impact_category, open_sound = data.raw.beacon["beacon"].open_sound, close_sound = data.raw.beacon["beacon"].close_sound, energy_usage = "600kW", distribution_effectivity = 1, - module_specification = { - module_slots = 1, - module_info_icon_shift = {0, 0.65} - }, + module_slots = 1, graphics_set = { module_icons_suppressed = true, animation_progress = 1, - min_animation_progress = 0, module_tint_mode = "mix", no_modules_tint = {1, 0, 0}, random_animation_offset = true, apply_module_tint = "secondary", - apply_module_tint_to_light = "none", + --apply_module_tint_to_light = "none", animation_list = { { @@ -677,7 +660,7 @@ data:extend({ animation = { layers = { { - filename = BASEENTITY .. "beacon/hr-beacon-bottom.png", + filename = BASEENTITY .. "beacon/beacon-bottom.png", width = 212, height = 192, scale = 0.6, @@ -685,7 +668,7 @@ data:extend({ tint = {0.9, 0.8, 1} }, { - filename = BASEENTITY .. "beacon/hr-beacon-shadow.png", + filename = BASEENTITY .. "beacon/beacon-shadow.png", width = 244, height = 176, scale = 0.6, @@ -699,7 +682,7 @@ data:extend({ render_layer = "object", always_draw = true, animation = { - filename = BASEENTITY .. "beacon/hr-beacon-top.png", + filename = BASEENTITY .. "beacon/beacon-top.png", width = 96, height = 140, scale = 0.6, @@ -711,11 +694,10 @@ data:extend({ { render_layer = "object", apply_tint = true, - draw_as_sprite = true, - draw_as_light = true, + --draw_as_sprite = true, always_draw = false, animation = { - filename = BASEENTITY .. "beacon/hr-beacon-light.png", + filename = BASEENTITY .. "beacon/beacon-light.png", line_length = 9, width = 110, height = 186, @@ -724,6 +706,7 @@ data:extend({ scale = 0.6, shift = util.by_pixel(0.5*1.2, -18*1.2), blend_mode = "additive", + draw_as_light = true, } } }, @@ -740,7 +723,7 @@ data:extend({ has_empty_slot = true, render_layer = "lower-object", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-slot-1.png", + filename = BASEENTITY .. "beacon/beacon-module-slot-1.png", line_length = 4, width = 50, height = 66, @@ -753,7 +736,7 @@ data:extend({ apply_module_tint = "primary", render_layer = "lower-object", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-mask-box-1.png", + filename = BASEENTITY .. "beacon/beacon-module-mask-box-1.png", line_length = 3, width = 36, height = 32, @@ -766,7 +749,7 @@ data:extend({ apply_module_tint = "secondary", render_layer = "lower-object-above-shadow", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-mask-lights-1.png", + filename = BASEENTITY .. "beacon/beacon-module-mask-lights-1.png", line_length = 3, width = 26, height = 12, @@ -777,15 +760,15 @@ data:extend({ }, { apply_module_tint = "secondary", - draw_as_light = true, - draw_as_sprite = false, + --draw_as_sprite = false, pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-lights-1.png", + filename = BASEENTITY .. "beacon/beacon-module-lights-1.png", line_length = 3, width = 56, height = 42, variation_count = 3, shift = util.by_pixel(-18*1.2, 13*1.2), + draw_as_light = true, scale = 0.6 } } @@ -807,36 +790,32 @@ data:extend({ dying_explosion = "beacon-explosion", collision_box = {{-1.7, -1.7}, {1.7, 1.7}}, selection_box = {{-2, -2}, {2, 2}}, - collision_mask = {"layer-42", "item-layer", "object-layer", "player-layer", "water-tile"}, + collision_mask = { layers = {layer_42 = true, item = true, object = true, player = true, water_tile = true}}, damaged_trigger_effect = data.raw.beacon["beacon"].damaged_trigger_effect, - drawing_box = {{-2, -3}, {2, 1.8}}, + allowed_effects = {"consumption", "speed", "pollution"}, resistances = {{ type = "impact", decrease = 40, percent = 75 }}, fast_replaceable_group = "large-beacon", water_reflection = data.raw.beacon["beacon"].water_reflection, radius_visualisation_picture = data.raw.beacon["beacon"].radius_visualisation_picture, - supply_area_distance = 12.29, + supply_area_distance = 12, energy_source = { type = "electric", usage_priority = "secondary-input" }, - vehicle_impact_sound = data.raw.beacon["beacon"].vehicle_impact_sound, + impact_category = data.raw.beacon["beacon"].impact_category, open_sound = data.raw.beacon["beacon"].open_sound, close_sound = data.raw.beacon["beacon"].close_sound, energy_usage = "1.5MW", distribution_effectivity = 1, - module_specification = { - module_slots = 2, - module_info_icon_shift = {0, 0.65} - }, + module_slots = 2, graphics_set = { module_icons_suppressed = true, animation_progress = 1, - min_animation_progress = 0, module_tint_mode = "mix", no_modules_tint = {1, 0, 0}, random_animation_offset = true, apply_module_tint = "secondary", - apply_module_tint_to_light = "none", + --apply_module_tint_to_light = "none", animation_list = { { @@ -845,14 +824,14 @@ data:extend({ animation = { layers = { { - filename = BASEENTITY .. "beacon/hr-beacon-bottom.png", + filename = BASEENTITY .. "beacon/beacon-bottom.png", width = 212, height = 192, scale = 0.665, shift = util.by_pixel(0.5*1.33, 1*1.33) }, { - filename = BASEENTITY .. "beacon/hr-beacon-shadow.png", + filename = BASEENTITY .. "beacon/beacon-shadow.png", width = 244, height = 176, scale = 0.665, @@ -866,7 +845,7 @@ data:extend({ render_layer = "object", always_draw = true, animation = { - filename = BASEENTITY .. "beacon/hr-beacon-top.png", + filename = BASEENTITY .. "beacon/beacon-top.png", width = 96, height = 140, scale = 0.665, @@ -878,11 +857,10 @@ data:extend({ { render_layer = "object", apply_tint = true, - draw_as_sprite = true, - draw_as_light = true, + --draw_as_sprite = true, always_draw = false, animation = { - filename = BASEENTITY .. "beacon/hr-beacon-light.png", + filename = BASEENTITY .. "beacon/beacon-light.png", line_length = 9, width = 110, height = 186, @@ -891,6 +869,7 @@ data:extend({ scale = 0.665, shift = util.by_pixel(0.5*1.33, -18*1.33), blend_mode = "additive", + draw_as_light = true, } } }, @@ -907,7 +886,7 @@ data:extend({ has_empty_slot = true, render_layer = "lower-object", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-slot-1.png", + filename = BASEENTITY .. "beacon/beacon-module-slot-1.png", line_length = 4, width = 50, height = 66, @@ -920,7 +899,7 @@ data:extend({ apply_module_tint = "primary", render_layer = "lower-object", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-mask-box-1.png", + filename = BASEENTITY .. "beacon/beacon-module-mask-box-1.png", line_length = 3, width = 36, height = 32, @@ -933,7 +912,7 @@ data:extend({ apply_module_tint = "secondary", render_layer = "lower-object-above-shadow", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-mask-lights-1.png", + filename = BASEENTITY .. "beacon/beacon-module-mask-lights-1.png", line_length = 3, width = 26, height = 12, @@ -944,15 +923,15 @@ data:extend({ }, { apply_module_tint = "secondary", - draw_as_light = true, - draw_as_sprite = false, + --draw_as_sprite = false, pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-lights-1.png", + filename = BASEENTITY .. "beacon/beacon-module-lights-1.png", line_length = 3, width = 56, height = 42, variation_count = 3, shift = util.by_pixel(-18*1.33, 13*1.33), + draw_as_light = true, scale = 0.665 } } @@ -963,7 +942,7 @@ data:extend({ has_empty_slot = true, render_layer = "lower-object", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-slot-2.png", + filename = BASEENTITY .. "beacon/beacon-module-slot-2.png", line_length = 4, width = 46, height = 44, @@ -976,7 +955,7 @@ data:extend({ apply_module_tint = "primary", render_layer = "lower-object", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-mask-box-2.png", + filename = BASEENTITY .. "beacon/beacon-module-mask-box-2.png", line_length = 3, width = 36, height = 26, @@ -989,7 +968,7 @@ data:extend({ apply_module_tint = "secondary", render_layer = "lower-object-above-shadow", pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-mask-lights-2.png", + filename = BASEENTITY .. "beacon/beacon-module-mask-lights-2.png", line_length = 3, width = 24, height = 14, @@ -1000,15 +979,15 @@ data:extend({ }, { apply_module_tint = "secondary", - draw_as_light = true, - draw_as_sprite = false, + --draw_as_sprite = false, pictures = { - filename = BASEENTITY .. "beacon/hr-beacon-module-lights-2.png", + filename = BASEENTITY .. "beacon/beacon-module-lights-2.png", line_length = 3, width = 66, height = 46, variation_count = 3, shift = util.by_pixel(22*1.33, -16*1.33), + draw_as_light = true, scale = 0.665 } } @@ -1024,14 +1003,14 @@ data:extend({ if mods["reskins-bobs"] then data.raw.beacon["nullius-beacon-1"].graphics_set.animation_list[1].animation.layers = { { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-1-bottom.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-1-bottom.png", width = 212, height = 192, shift = util.by_pixel(0.5*0.8, 1*0.8), scale = 0.5*0.8 }, { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-1-bottom-mask.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-1-bottom-mask.png", width = 212, height = 192, shift = util.by_pixel(0.5*0.8, 1*0.8), @@ -1039,7 +1018,7 @@ data.raw.beacon["nullius-beacon-1"].graphics_set.animation_list[1].animation.lay scale = 0.5*0.8 }, { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-1-bottom-highlights.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-1-bottom-highlights.png", width = 212, height = 192, shift = util.by_pixel(0.5*0.8, 1*0.8), @@ -1049,7 +1028,7 @@ data.raw.beacon["nullius-beacon-1"].graphics_set.animation_list[1].animation.lay data.raw.beacon["nullius-beacon-1"].graphics_set.animation_list[1].animation.layers[2] } data.raw.beacon["nullius-beacon-1"].graphics_set.animation_list[2].animation = { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-1-top.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-1-top.png", width = 96, height = 140, repeat_count = 45, @@ -1060,14 +1039,14 @@ data.raw.beacon["nullius-beacon-1"].graphics_set.animation_list[2].animation = { data.raw.beacon["nullius-beacon-2"].graphics_set.animation_list[1].animation.layers = { { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-2-bottom.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-2-bottom.png", width = 212, height = 192, shift = util.by_pixel(0.5*0.9, 1*0.9), scale = 0.5*0.9 }, { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-2-bottom-mask.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-2-bottom-mask.png", width = 212, height = 192, shift = util.by_pixel(0.5*0.9, 1*0.9), @@ -1075,7 +1054,7 @@ data.raw.beacon["nullius-beacon-2"].graphics_set.animation_list[1].animation.lay scale = 0.5*0.9 }, { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-2-bottom-highlights.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-2-bottom-highlights.png", width = 212, height = 192, shift = util.by_pixel(0.5*0.9, 1*0.9), @@ -1085,7 +1064,7 @@ data.raw.beacon["nullius-beacon-2"].graphics_set.animation_list[1].animation.lay data.raw.beacon["nullius-beacon-2"].graphics_set.animation_list[1].animation.layers[2] } data.raw.beacon["nullius-beacon-2"].graphics_set.animation_list[2].animation = { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-2-top.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-2-top.png", width = 96, height = 140, repeat_count = 45, @@ -1097,7 +1076,7 @@ table.insert(data.raw.beacon["nullius-beacon-2"].graphics_set.animation_list, { render_layer = "transport-belt-circuit-connector", always_draw = true, animation = { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-2-bottom-slot-overlay.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-2-bottom-slot-overlay.png", width = 212, height = 192, shift = util.by_pixel(0.5*0.9, 1*0.9), @@ -1107,14 +1086,14 @@ table.insert(data.raw.beacon["nullius-beacon-2"].graphics_set.animation_list, { data.raw.beacon["nullius-beacon-3"].graphics_set.animation_list[1].animation.layers = { { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-3-bottom.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-3-bottom.png", width = 212, height = 192, shift = util.by_pixel(0.5, 1), scale = 0.5 }, { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-3-bottom-mask.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-3-bottom-mask.png", width = 212, height = 192, shift = util.by_pixel(0.5, 1), @@ -1122,7 +1101,7 @@ data.raw.beacon["nullius-beacon-3"].graphics_set.animation_list[1].animation.lay scale = 0.5 }, { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-3-bottom-highlights.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-3-bottom-highlights.png", width = 212, height = 192, shift = util.by_pixel(0.5, 1), @@ -1132,7 +1111,7 @@ data.raw.beacon["nullius-beacon-3"].graphics_set.animation_list[1].animation.lay data.raw.beacon["nullius-beacon-3"].graphics_set.animation_list[1].animation.layers[2] } data.raw.beacon["nullius-beacon-3"].graphics_set.animation_list[2].animation = { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-3-top.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-3-top.png", width = 96, height = 140, repeat_count = 45, @@ -1145,14 +1124,14 @@ table.insert(data.raw.beacon["nullius-beacon-3"].graphics_set.animation_list, { always_draw = true, animation = { layers = { { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-3-bottom-slot-overlay.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-3-bottom-slot-overlay.png", width = 212, height = 192, shift = util.by_pixel(0.5, 1), scale = 0.5 }, { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-3-bottom-slot-overlay-mask.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-3-bottom-slot-overlay-mask.png", width = 212, height = 192, shift = util.by_pixel(0.5, 1), @@ -1160,7 +1139,7 @@ table.insert(data.raw.beacon["nullius-beacon-3"].graphics_set.animation_list, { scale = 0.5 }, { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-3-bottom-slot-overlay-highlights.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-3-bottom-slot-overlay-highlights.png", width = 212, height = 192, shift = util.by_pixel(0.5, 1), @@ -1172,14 +1151,14 @@ table.insert(data.raw.beacon["nullius-beacon-3"].graphics_set.animation_list, { data.raw.beacon["nullius-large-beacon-1"].graphics_set.animation_list[1].animation.layers = { { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-1-bottom.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-1-bottom.png", width = 212, height = 192, shift = util.by_pixel(0.5*1.2, 1*1.2), scale = 0.5*1.2 }, { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-1-bottom-mask.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-1-bottom-mask.png", width = 212, height = 192, shift = util.by_pixel(0.5*1.2, 1*1.2), @@ -1187,7 +1166,7 @@ data.raw.beacon["nullius-large-beacon-1"].graphics_set.animation_list[1].animati scale = 0.5*1.2 }, { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-1-bottom-highlights.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-1-bottom-highlights.png", width = 212, height = 192, shift = util.by_pixel(0.5*1.2, 1*1.2), @@ -1197,7 +1176,7 @@ data.raw.beacon["nullius-large-beacon-1"].graphics_set.animation_list[1].animati data.raw.beacon["nullius-large-beacon-1"].graphics_set.animation_list[1].animation.layers[2] } data.raw.beacon["nullius-large-beacon-1"].graphics_set.animation_list[2].animation = { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-1-top.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-1-top.png", width = 96, height = 140, repeat_count = 45, @@ -1208,14 +1187,14 @@ data.raw.beacon["nullius-large-beacon-1"].graphics_set.animation_list[2].animati data.raw.beacon["nullius-large-beacon-2"].graphics_set.animation_list[1].animation.layers = { { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-3-bottom.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-3-bottom.png", width = 212, height = 192, shift = util.by_pixel(0.5*1.33, 1*1.33), scale = 0.5*1.33 }, { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-3-bottom-mask.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-3-bottom-mask.png", width = 212, height = 192, shift = util.by_pixel(0.5*1.33, 1*1.33), @@ -1223,7 +1202,7 @@ data.raw.beacon["nullius-large-beacon-2"].graphics_set.animation_list[1].animati scale = 0.5*1.33 }, { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-3-bottom-highlights.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-3-bottom-highlights.png", width = 212, height = 192, shift = util.by_pixel(0.5*1.33, 1*1.33), @@ -1233,7 +1212,7 @@ data.raw.beacon["nullius-large-beacon-2"].graphics_set.animation_list[1].animati data.raw.beacon["nullius-large-beacon-2"].graphics_set.animation_list[1].animation.layers[2] } data.raw.beacon["nullius-large-beacon-2"].graphics_set.animation_list[2].animation = { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-3-top.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-3-top.png", width = 96, height = 140, repeat_count = 45, @@ -1246,14 +1225,14 @@ table.insert(data.raw.beacon["nullius-large-beacon-2"].graphics_set.animation_li always_draw = true, animation = { layers = { { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-3-bottom-slot-overlay.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-3-bottom-slot-overlay.png", width = 212, height = 192, shift = util.by_pixel(0.5*1.33, 1*1.33), scale = 0.5*1.33 }, { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-3-bottom-slot-overlay-mask.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-3-bottom-slot-overlay-mask.png", width = 212, height = 192, shift = util.by_pixel(0.5*1.33, 1*1.33), @@ -1261,7 +1240,7 @@ table.insert(data.raw.beacon["nullius-large-beacon-2"].graphics_set.animation_li scale = 0.5*1.33 }, { - filename = "__reskins-bobs__/graphics/entity/modules/beacon/hr-beacon-3-bottom-slot-overlay-highlights.png", + filename = "__reskins-bobs__/graphics/entity/modules/beacon/beacon-3-bottom-slot-overlay-highlights.png", width = 212, height = 192, shift = util.by_pixel(0.5*1.33, 1*1.33), @@ -1326,9 +1305,10 @@ data:extend({ icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, order = "cb", - flags = {"placeable-neutral", "player-creation", "not-on-map", "hidden"}, + flags = {"placeable-neutral", "player-creation", "not-on-map"}, + hidden = true, collision_box = {{-8, -6}, {8, 6}}, - collision_mask = {"layer-42"}, + collision_mask = { layers = {layer_42 = true}}, render_layer = "wires-above", selectable_in_game = false, random_animation_offset = false, @@ -1346,9 +1326,10 @@ data:extend({ icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, order = "cc", - flags = {"placeable-neutral", "player-creation", "not-on-map", "hidden"}, + flags = {"placeable-neutral", "player-creation", "not-on-map"}, + hidden = true, collision_box = {{-6, -8}, {6, 8}}, - collision_mask = {"layer-42"}, + collision_mask = { layers = {layer_42 = true}}, render_layer = "wires-above", selectable_in_game = false, random_animation_offset = false, diff --git a/nullius/prototypes/entity/chemistry.lua b/nullius/prototypes/entity/chemistry.lua index 2a8b8f1..c89a851 100644 --- a/nullius/prototypes/entity/chemistry.lua +++ b/nullius/prototypes/entity/chemistry.lua @@ -3,17 +3,21 @@ local ENTITYPATH = "__nullius__/graphics/entity/" local BASEENTITY = "__base__/graphics/entity/" -local function hydro_animation(basename, newtint) +local function hydro_animation(newtint) local baselayer = scale_image( - data.raw["assembling-machine"][basename].animation.layers[1], 0.725) + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-base.png", + priority = "extra-high", + width = 459, + height = 491, + shift = util.by_pixel(0, 0), + scale = 0.5, + }, 0.725) baselayer.tint = newtint - if (baselayer.hr_version ~= nil) then - baselayer.hr_version.tint = newtint - end local vertical = { layers = { { - filename = "__angelsrefining__/graphics/entity/hydro-plant/hr-hydro-plant-pipe-connections.png", + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png", priority = "extra-high", width = 200, height = 100, @@ -24,7 +28,7 @@ local function hydro_animation(basename, newtint) shift = {-0.98, -2.12} }, { - filename = "__angelsrefining__/graphics/entity/hydro-plant/hr-hydro-plant-pipe-connections.png", + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png", priority = "extra-high", width = 200, height = 100, @@ -45,6 +49,13 @@ local function hydro_animation(basename, newtint) } end +-- Honestly ? Stolen straight from angels, sue me !! +circuit_connector_definitions["nullius-hydro-plant"] = circuit_connector_definitions.create_vector(universal_connector_template, { + { variation = 25, main_offset = util.by_pixel( 50.625, 42), shadow_offset = util.by_pixel( 50.625, 42), show_shadow = true }, + { variation = 25, main_offset = util.by_pixel( 50.625, 42), shadow_offset = util.by_pixel( 50.625, 42), show_shadow = true }, + { variation = 25, main_offset = util.by_pixel( 50.625, 42), shadow_offset = util.by_pixel( 50.625, 42), show_shadow = true }, + { variation = 25, main_offset = util.by_pixel( 50.625, 42), shadow_offset = util.by_pixel( 50.625, 42), show_shadow = true }, +}) data:extend({ { @@ -61,7 +72,7 @@ data:extend({ selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, crafting_categories = {"nullius-water-treatment"}, crafting_speed = 1, - energy_source = {type = "electric", usage_priority = "secondary-input", emissions = 0.01, drain="10kW"}, + energy_source = {type = "electric", usage_priority = "secondary-input", emissions_per_minute = {pollution = 0.01}, drain="10kW"}, energy_usage = "240kW", ingredient_count = 3, resistances = { @@ -70,50 +81,269 @@ data:extend({ }, fast_replaceable_group = "hydro-plant", next_upgrade = "nullius-hydro-plant-2", - module_specification = { module_slots = 1 }, + module_slots = 1, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - animation = hydro_animation("hydro-plant",{0.77, 0.77, 0.68}), - working_visualisations = scale_image( - data.raw["assembling-machine"]["hydro-plant"].working_visualisations, 0.725), - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["hydro-plant"].working_sound, + circuit_connector = circuit_connector_definitions["nullius-hydro-plant"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + graphics_set = { + animation = hydro_animation({0.77, 0.77, 0.68}), + working_visualisations = scale_image({ + { + always_draw = true, + north_position = util.by_pixel(-52.5, -43), + east_position = util.by_pixel(-52.5, -43), + south_position = util.by_pixel(-52.5, -43), + west_position = util.by_pixel(-52.5, -43), + animation = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png", + priority = "extra-high", + width = 107, + height = 77, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, -47.75), + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png", + priority = "extra-high", + width = 107, + height = 77, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, 0.125), + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png", + priority = "extra-high", + width = 107, + height = 77, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, 48), + scale = 0.5, + }, + }, + }, + }, + { + always_draw = true, + north_position = util.by_pixel(14.5, -21.5), + east_position = util.by_pixel(14.5, -21.5), + south_position = util.by_pixel(14.5, -21.5), + west_position = util.by_pixel(14.5, -21.5), + animation = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png", + priority = "extra-high", + width = 40, + height = 36, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, -47.75), + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png", + priority = "extra-high", + width = 40, + height = 36, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, 0.125), + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png", + priority = "extra-high", + width = 40, + height = 36, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, 48), + scale = 0.5, + }, + }, + }, + }, + { + always_draw = true, + north_animation = { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png", + priority = "extra-high", + width = 538, + height = 454, + shift = util.by_pixel(20, 10.5), + x = 0, + y = 0, + frame_count = 1, + scale = 0.5, + }, + east_animation = { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png", + priority = "extra-high", + width = 538, + height = 454, + x = 538, + y = 0, + frame_count = 1, + shift = util.by_pixel(20, 10.5), + scale = 0.5, + }, + south_animation = { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png", + priority = "extra-high", + width = 538, + x = 1076, + y = 0, + height = 454, + frame_count = 1, + shift = util.by_pixel(20, 10.5), + scale = 0.5, + }, + west_animation = { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png", + priority = "extra-high", + width = 538, + height = 454, + x = 1614, + y = 0, + frame_count = 1, + shift = util.by_pixel(20, 10.5), + scale = 0.5, + }, + }, + { + always_draw = true, + north_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png", + priority = "extra-high", + width = 459, + height = 491, + x = 0, + y = 0, + frame_count = 1, + scale = 0.5, + }, + east_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png", + priority = "extra-high", + frame_count = 1, + width = 459, + height = 491, + x = 459, + y = 0, + scale = 0.5, + }, + south_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png", + priority = "extra-high", + width = 459, + height = 491, + x = 918, + y = 0, + frame_count = 1, + scale = 0.5, + }, + west_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png", + priority = "extra-high", + width = 459, + height = 491, + x = 1377, + y = 0, + frame_count = 1, + scale = 0.5, + }, + }, + { + always_draw = true, + north_animation = { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png", + priority = "high", + width = 128, + height = 128, + repeat_count = 36, + scale = 0.5, + shift = { -2, -3 }, + }, + south_animation = { + layers = { + { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png", + priority = "high", + width = 128, + height = 128, + repeat_count = 36, + scale = 0.5, + shift = { -2, -3 }, + }, + { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png", + priority = "high", + width = 128, + height = 128, + repeat_count = 36, + scale = 0.5, + shift = { 2, -3 }, + }, + }, + } + } + }, 0.725), + }, + impact_category = "metal", + working_sound = { + sound = { filename = "__angelsrefininggraphics__/sound/ore-leaching-plant.ogg", volume = 0.65 }, + idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, + }, fluid_boxes = { { production_type = "input", - pipe_picture = data.raw["assembling-machine"]["hydro-plant"].fluid_boxes[1].pipe_picture, + pipe_picture = hydropipepictures(), pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -1, - pipe_connections = {{ type="input", position = {-1, -3} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, -2}, direction = defines.direction.north }} }, { production_type = "input", - pipe_picture = data.raw["assembling-machine"]["hydro-plant"].fluid_boxes[1].pipe_picture, + pipe_picture = hydropipepictures(), pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -1, - pipe_connections = {{ type="input", position = {1, -3} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1, -2}, direction = defines.direction.north }} }, { production_type = "output", - pipe_picture = data.raw["assembling-machine"]["hydro-plant"].fluid_boxes[2].pipe_picture, + pipe_picture = hydropipepictures2(), pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 3, - height = 2, - pipe_connections = {{ type="output", position = {1, 3} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1, 2}, direction = defines.direction.south }} }, { production_type = "output", - pipe_picture = data.raw["assembling-machine"]["hydro-plant"].fluid_boxes[3].pipe_picture, + pipe_picture = hydropipepictures(), pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 3, - height = 2, - pipe_connections = {{ type="output", position = {-1, 3} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1, 2}, direction = defines.direction.south }} } - }, - pipe_covers = pipecoverspictures(), + } } }) @@ -132,61 +362,278 @@ data:extend({ selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, crafting_categories = {"nullius-water-treatment"}, crafting_speed = 2, - energy_source = {type = "electric", usage_priority = "secondary-input", emissions = 0.05, drain="20kW"}, + energy_source = {type = "electric", usage_priority = "secondary-input", emissions_per_minute = {pollution = 0.05}, drain="20kW"}, energy_usage = "480kW", ingredient_count = 4, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } }, - module_specification = { module_slots = 2 }, + module_slots = 2, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, fast_replaceable_group = "hydro-plant", next_upgrade = "nullius-hydro-plant-3", - animation = hydro_animation("hydro-plant-2",{0.8, 0.8, 0.9}), - working_visualisations = scale_image( - data.raw["assembling-machine"]["hydro-plant-2"].working_visualisations, 0.725), - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["hydro-plant-2"].working_sound, + circuit_connector = circuit_connector_definitions["nullius-hydro-plant"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + graphics_set = { + animation = hydro_animation({0.8, 0.8, 0.9}), + working_visualisations = scale_image({ + { + always_draw = true, + north_position = util.by_pixel(-52.5, -43), + east_position = util.by_pixel(-52.5, -43), + south_position = util.by_pixel(-52.5, -43), + west_position = util.by_pixel(-52.5, -43), + animation = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png", + priority = "extra-high", + width = 107, + height = 77, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, -47.75), + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png", + priority = "extra-high", + width = 107, + height = 77, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, 0.125), + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png", + priority = "extra-high", + width = 107, + height = 77, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, 48), + scale = 0.5, + }, + }, + }, + }, + { + always_draw = true, + north_position = util.by_pixel(14.5, -21.5), + east_position = util.by_pixel(14.5, -21.5), + south_position = util.by_pixel(14.5, -21.5), + west_position = util.by_pixel(14.5, -21.5), + animation = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png", + priority = "extra-high", + width = 40, + height = 36, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, -47.75), + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png", + priority = "extra-high", + width = 40, + height = 36, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, 0.125), + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png", + priority = "extra-high", + width = 40, + height = 36, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, 48), + scale = 0.5, + }, + }, + }, + }, + { + always_draw = true, + north_animation = { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png", + priority = "extra-high", + width = 538, + height = 454, + shift = util.by_pixel(20, 10.5), + x = 0, + y = 0, + frame_count = 1, + scale = 0.5, + }, + east_animation = { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png", + priority = "extra-high", + width = 538, + height = 454, + x = 538, + y = 0, + frame_count = 1, + shift = util.by_pixel(20, 10.5), + scale = 0.5, + }, + south_animation = { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png", + priority = "extra-high", + width = 538, + x = 1076, + y = 0, + height = 454, + frame_count = 1, + shift = util.by_pixel(20, 10.5), + scale = 0.5, + }, + west_animation = { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png", + priority = "extra-high", + width = 538, + height = 454, + x = 1614, + y = 0, + frame_count = 1, + shift = util.by_pixel(20, 10.5), + scale = 0.5, + }, + }, + { + always_draw = true, + north_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png", + priority = "extra-high", + width = 459, + height = 491, + x = 0, + y = 0, + frame_count = 1, + scale = 0.5, + }, + east_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png", + priority = "extra-high", + frame_count = 1, + width = 459, + height = 491, + x = 459, + y = 0, + scale = 0.5, + }, + south_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png", + priority = "extra-high", + width = 459, + height = 491, + x = 918, + y = 0, + frame_count = 1, + scale = 0.5, + }, + west_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png", + priority = "extra-high", + width = 459, + height = 491, + x = 1377, + y = 0, + frame_count = 1, + scale = 0.5, + }, + }, + { + always_draw = true, + north_animation = { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png", + priority = "high", + width = 128, + height = 128, + repeat_count = 36, + scale = 0.5, + shift = { -2, -3 }, + }, + south_animation = { + layers = { + { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png", + priority = "high", + width = 128, + height = 128, + repeat_count = 36, + scale = 0.5, + shift = { -2, -3 }, + }, + { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png", + priority = "high", + width = 128, + height = 128, + repeat_count = 36, + scale = 0.5, + shift = { 2, -3 }, + }, + }, + }, + } + }, 0.725), + }, + impact_category = "metal", + working_sound = { + sound = { filename = "__angelsrefininggraphics__/sound/ore-leaching-plant.ogg", volume = 0.65 }, + idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, + }, fluid_boxes = { { production_type = "input", pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[1].pipe_picture, pipe_covers = pipecoverspictures(), - base_area = 10, - height = 2, - base_level = -2, - pipe_connections = {{ type="input", position = {-1, -3} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, -2}, direction = defines.direction.north }} }, { production_type = "input", pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[2].pipe_picture, pipe_covers = pipecoverspictures(), - base_area = 10, - height = 2, - base_level = -2, - pipe_connections = {{ type="input", position = {1, -3} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1, -2}, direction = defines.direction.north }} }, { production_type = "output", pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[3].pipe_picture, pipe_covers = pipecoverspictures(), - base_area = 10, - height = 2, - base_level = 4, - pipe_connections = {{ type="output", position = {1, 3} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1, 2}, direction = defines.direction.south }} }, { production_type = "output", pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[4].pipe_picture, pipe_covers = pipecoverspictures(), - base_area = 10, - height = 2, - base_level = 4, - pipe_connections = {{ type="output", position = {-1, 3} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1, 2}, direction = defines.direction.south }} }, - }, - pipe_covers = pipecoverspictures(), + } }, { @@ -203,238 +650,292 @@ data:extend({ selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, crafting_categories = {"nullius-water-treatment"}, crafting_speed = 4, - energy_source = {type = "electric", usage_priority = "secondary-input", emissions = 0.1, drain="40kW"}, + energy_source = {type = "electric", usage_priority = "secondary-input", emissions_per_minute = {pollution = 0.1}, drain="40kW"}, energy_usage = "960kW", ingredient_count = 6, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } }, - module_specification = { module_slots = 3 }, + module_slots = 3, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, fast_replaceable_group = "hydro-plant", - animation = hydro_animation("hydro-plant-3"), - working_visualisations = scale_image( - data.raw["assembling-machine"]["hydro-plant-3"].working_visualisations, 0.725), - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["hydro-plant-3"].working_sound, + circuit_connector = circuit_connector_definitions["nullius-hydro-plant"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + graphics_set = { + animation = hydro_animation(), + working_visualisations = scale_image({ + { + always_draw = true, + north_position = util.by_pixel(-52.5, -43), + east_position = util.by_pixel(-52.5, -43), + south_position = util.by_pixel(-52.5, -43), + west_position = util.by_pixel(-52.5, -43), + animation = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png", + priority = "extra-high", + width = 107, + height = 77, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, -47.75), + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png", + priority = "extra-high", + width = 107, + height = 77, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, 0.125), + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-fan.png", + priority = "extra-high", + width = 107, + height = 77, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, 48), + scale = 0.5, + }, + }, + }, + }, + { + always_draw = true, + north_position = util.by_pixel(14.5, -21.5), + east_position = util.by_pixel(14.5, -21.5), + south_position = util.by_pixel(14.5, -21.5), + west_position = util.by_pixel(14.5, -21.5), + animation = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png", + priority = "extra-high", + width = 40, + height = 36, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, -47.75), + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png", + priority = "extra-high", + width = 40, + height = 36, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, 0.125), + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-dynamo.png", + priority = "extra-high", + width = 40, + height = 36, + frame_count = 24, + line_length = 6, + animation_speed = 0.5, + shift = util.by_pixel(0, 48), + scale = 0.5, + }, + }, + }, + }, + { + always_draw = true, + north_animation = { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png", + priority = "extra-high", + width = 538, + height = 454, + shift = util.by_pixel(20, 10.5), + x = 0, + y = 0, + frame_count = 1, + scale = 0.5, + }, + east_animation = { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png", + priority = "extra-high", + width = 538, + height = 454, + x = 538, + y = 0, + frame_count = 1, + shift = util.by_pixel(20, 10.5), + scale = 0.5, + }, + south_animation = { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png", + priority = "extra-high", + width = 538, + x = 1076, + y = 0, + height = 454, + frame_count = 1, + shift = util.by_pixel(20, 10.5), + scale = 0.5, + }, + west_animation = { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-shadow.png", + priority = "extra-high", + width = 538, + height = 454, + x = 1614, + y = 0, + frame_count = 1, + shift = util.by_pixel(20, 10.5), + scale = 0.5, + }, + }, + { + always_draw = true, + north_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png", + priority = "extra-high", + width = 459, + height = 491, + x = 0, + y = 0, + frame_count = 1, + scale = 0.5, + }, + east_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png", + priority = "extra-high", + frame_count = 1, + width = 459, + height = 491, + x = 459, + y = 0, + scale = 0.5, + }, + south_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png", + priority = "extra-high", + width = 459, + height = 491, + x = 918, + y = 0, + frame_count = 1, + scale = 0.5, + }, + west_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/hydro-plant-pipe-connections.png", + priority = "extra-high", + width = 459, + height = 491, + x = 1377, + y = 0, + frame_count = 1, + scale = 0.5, + }, + }, + { + always_draw = true, + north_animation = { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png", + priority = "high", + width = 128, + height = 128, + repeat_count = 36, + scale = 0.5, + shift = { -2, -3 }, + }, + south_animation = { + layers = { + { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png", + priority = "high", + width = 128, + height = 128, + repeat_count = 36, + scale = 0.5, + shift = { -2, -3 }, + }, + { + draw_as_shadow = true, + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/vertical-pipe-shadow-patch.png", + priority = "high", + width = 128, + height = 128, + repeat_count = 36, + scale = 0.5, + shift = { 2, -3 }, + }, + }, + }, + }, + }, 0.725), + }, + impact_category = "metal", + working_sound = { + sound = { filename = "__angelsrefininggraphics__/sound/ore-leaching-plant.ogg", volume = 0.65 }, + idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, + }, fluid_boxes = { { production_type = "input", pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[1].pipe_picture, pipe_covers = pipecoverspictures(), - base_area = 15, - height = 2, - base_level = -3, - pipe_connections = {{ type="input", position = {-1, -3} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, -2}, direction = defines.direction.north }} }, { production_type = "input", pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[2].pipe_picture, pipe_covers = pipecoverspictures(), - base_area = 15, - height = 2, - base_level = -3, - pipe_connections = {{ type="input", position = {1, -3} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1, -2}, direction = defines.direction.north }} }, { production_type = "output", pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[3].pipe_picture, pipe_covers = pipecoverspictures(), - base_area = 15, - height = 3, - base_level = 5, - pipe_connections = {{ type="output", position = {1, 3} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1, 2}, direction = defines.direction.south }} }, { production_type = "output", pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[4].pipe_picture, pipe_covers = pipecoverspictures(), - base_area = 15, - height = 3, - base_level = 5, - pipe_connections = {{ type="output", position = {-1, 3} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1, 2}, direction = defines.direction.south }} }, - }, - pipe_covers = pipecoverspictures(), + } } }) -data.raw["assembling-machine"]["nullius-hydro-plant-1"].working_visualisations[4] = nil -data.raw["assembling-machine"]["nullius-hydro-plant-1"].working_visualisations[5] = nil -data.raw["assembling-machine"]["nullius-hydro-plant-2"].working_visualisations[4] = nil -data.raw["assembling-machine"]["nullius-hydro-plant-2"].working_visualisations[5] = nil -data.raw["assembling-machine"]["nullius-hydro-plant-3"].working_visualisations[4] = nil -data.raw["assembling-machine"]["nullius-hydro-plant-3"].working_visualisations[5] = nil - -local mhp1 = util.table.deepcopy( - data.raw["assembling-machine"]["nullius-hydro-plant-1"]) -mhp1.name = "nullius-mirror-hydro-plant-1" -mhp1.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } -mhp1.placeable_by = {item = "nullius-hydro-plant-1", count = 1} -mhp1.next_upgrade = "nullius-mirror-hydro-plant-2" -mhp1.localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-hydro-plant-1"}} -mhp1.fluid_boxes[1].pipe_connections[1].position = {1, -3} -mhp1.fluid_boxes[2].pipe_connections[1].position = {-1, -3} -mhp1.fluid_boxes[3].pipe_connections[1].position = {-1, 3} -mhp1.fluid_boxes[4].pipe_connections[1].position = {1, 3} +data.raw["assembling-machine"]["nullius-hydro-plant-1"].graphics_set.working_visualisations[4] = nil +data.raw["assembling-machine"]["nullius-hydro-plant-1"].graphics_set.working_visualisations[5] = nil +data.raw["assembling-machine"]["nullius-hydro-plant-2"].graphics_set.working_visualisations[4] = nil +data.raw["assembling-machine"]["nullius-hydro-plant-2"].graphics_set.working_visualisations[5] = nil +data.raw["assembling-machine"]["nullius-hydro-plant-3"].graphics_set.working_visualisations[4] = nil +data.raw["assembling-machine"]["nullius-hydro-plant-3"].graphics_set.working_visualisations[5] = nil data:extend({ - mhp1, - { - type = "assembling-machine", - name = "nullius-mirror-hydro-plant-2", - localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-hydro-plant-2"}}, - icons = { - data.raw.item["nullius-hydro-plant-2"].icons[1], - { icon = ICONPATH .. "flip1.png", icon_size = 64 } - }, - localised_description = {"entity-description.nullius-hydro-plant"}, - flags = {"placeable-neutral", "player-creation"}, - minable = {mining_time = 1.5, result = "nullius-hydro-plant-2"}, - placeable_by = {item = "nullius-hydro-plant-2", count = 1}, - max_health = 400, - corpse = "big-remnants", - dying_explosion = "medium-explosion", - collision_box = {{-2.2, -2.2}, {2.2, 2.2}}, - selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, - crafting_categories = {"nullius-water-treatment"}, - crafting_speed = 2, - energy_source = {type = "electric", usage_priority = "secondary-input", emissions = 0.05, drain="20kW"}, - energy_usage = "480kW", - ingredient_count = 4, - resistances = data.raw["assembling-machine"]["nullius-hydro-plant-2"].resistances, - module_specification = { module_slots = 2 }, - allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - fast_replaceable_group = "hydro-plant", - next_upgrade = "nullius-mirror-hydro-plant-3", - animation = data.raw["assembling-machine"]["nullius-hydro-plant-2"].animation, - working_visualisations = data.raw["assembling-machine"]["nullius-hydro-plant-2"].working_visualisations, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["hydro-plant"].working_sound, - - fluid_boxes = { - { - production_type = "input", - pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[1].pipe_picture, - pipe_covers = pipecoverspictures(), - base_area = 10, - height = 2, - base_level = -2, - pipe_connections = {{ type="input", position = {1, -3} }} - }, - { - production_type = "input", - pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[2].pipe_picture, - pipe_covers = pipecoverspictures(), - base_area = 10, - height = 2, - base_level = -2, - pipe_connections = {{ type="input", position = {-1, -3} }} - }, - { - production_type = "output", - pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[3].pipe_picture, - pipe_covers = pipecoverspictures(), - base_area = 10, - height = 2, - base_level = 4, - pipe_connections = {{ type="output", position = {-1, 3} }} - }, - { - production_type = "output", - pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[4].pipe_picture, - pipe_covers = pipecoverspictures(), - base_area = 10, - height = 2, - base_level = 4, - pipe_connections = {{ type="output", position = {1, 3} }} - }, - } - }, - - { - type = "assembling-machine", - name = "nullius-mirror-hydro-plant-3", - localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-hydro-plant-3"}}, - icons = { - data.raw.item["nullius-hydro-plant-3"].icons[1], - { icon = ICONPATH .. "flip1.png", icon_size = 64 } - }, - localised_description = {"entity-description.nullius-hydro-plant"}, - flags = {"placeable-neutral", "player-creation"}, - minable = {mining_time = 2, result = "nullius-hydro-plant-3"}, - placeable_by = {item = "nullius-hydro-plant-3", count = 1}, - max_health = 500, - corpse = "big-remnants", - dying_explosion = "medium-explosion", - collision_box = {{-2.2, -2.2}, {2.2, 2.2}}, - selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, - crafting_categories = {"nullius-water-treatment"}, - crafting_speed = 4, - energy_source = {type = "electric", usage_priority = "secondary-input", emissions = 0.1, drain="40kW"}, - energy_usage = "960kW", - ingredient_count = 6, - resistances = { - { type = "impact", decrease = 100, percent = 90 }, - { type = "fire", percent = 75 } - }, - module_specification = { module_slots = 3 }, - allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - fast_replaceable_group = "hydro-plant", - animation = data.raw["assembling-machine"]["nullius-hydro-plant-3"].animation, - working_visualisations = data.raw["assembling-machine"]["nullius-hydro-plant-3"].working_visualisations, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["hydro-plant"].working_sound, - - fluid_boxes = { - { - production_type = "input", - pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[1].pipe_picture, - pipe_covers = pipecoverspictures(), - base_area = 15, - height = 2, - base_level = -3, - pipe_connections = {{ type="input", position = {1, -3} }} - }, - { - production_type = "input", - pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[2].pipe_picture, - pipe_covers = pipecoverspictures(), - base_area = 15, - height = 2, - base_level = -3, - pipe_connections = {{ type="input", position = {-1, -3} }} - }, - { - production_type = "output", - pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[3].pipe_picture, - pipe_covers = pipecoverspictures(), - base_area = 15, - height = 3, - base_level = 5, - pipe_connections = {{ type="output", position = {-1, 3} }} - }, - { - production_type = "output", - pipe_picture = data.raw["assembling-machine"]["nullius-hydro-plant-1"].fluid_boxes[4].pipe_picture, - pipe_covers = pipecoverspictures(), - base_area = 15, - height = 3, - base_level = 5, - pipe_connections = {{ type="output", position = {1, 3} }} - }, - }, - pipe_covers = pipecoverspictures(), - }, - { type = "assembling-machine", name = "nullius-distillery-1", - order = "z-nullius-cbb", + order = "z-nullius-cbb", icons = data.raw.item["nullius-distillery-1"].icons, localised_description = {"entity-description.nullius-distillery"}, flags = {"placeable-neutral","player-creation"}, @@ -444,14 +945,13 @@ data:extend({ corpse = "oil-refinery-remnants", collision_box = {{-2.3, -2.3}, {2.3, 2.3}}, selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, - drawing_box = {{-2.5, -2.8}, {2.5, 2.5}}, - scale_entity_info_icon = true, + crafting_categories = {"distillation"}, crafting_speed = 1, energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 6, + emissions_per_minute = {pollution = 6}, drain = "20kW" }, energy_usage = "280kW", @@ -460,135 +960,100 @@ data:extend({ { type = "impact", decrease = 100, percent = 90 } }, working_sound = data.raw["assembling-machine"]["oil-refinery"].working_sound, - fluid_boxes = { + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["oil-refinery"], + fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -1, - pipe_connections = {{ type="input", position = {-1, 3} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, 2}, direction = defines.direction.south }} }, { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -1, - pipe_connections = {{ type="input", position = {1, 3} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1, 2}, direction = defines.direction.south }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 3, - height = 2, - base_area = 4, - pipe_connections = {{ type="output", position = {-2, -3} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-2, -2}, direction = defines.direction.north }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 3, - height = 2, - base_area = 4, - pipe_connections = {{ type="output", position = {0, -3} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {0, -2}, direction = defines.direction.north }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 3, - height = 2, - base_area = 4, - pipe_connections = {{ type="output", position = {2, -3} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {2, -2}, direction = defines.direction.north }} } }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - module_specification = { module_slots = 1 }, + impact_category = "metal", + module_slots = 1, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, fast_replaceable_group = "distillery", next_upgrade = "nullius-distillery-2", - working_visualisations = { - { - apply_recipe_tint = "primary", - constant_speed = true, - north_position = {1, -3.85}, - east_position = {-1.7, -3.8}, - south_position = {-1.85, -4.4}, - west_position = {1.7, -3.65}, - render_layer = "wires", - animation = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant-smoke-outer.png", - frame_count = 47, - line_length = 16, - width = 90, - height = 188, - animation_speed = 0.25, - scale = 0.7 - } - }, - }, - - animation = make_4way_animation_from_spritesheet({ - layers = { + graphics_set = { + working_visualisations = { { - filename = BASEENTITY .. "oil-refinery/oil-refinery.png", - width = 337, - height = 255, - frame_count = 1, - shift = {2.515625, 0.484375}, - tint = {0.77, 0.77, 0.66, 1}, - hr_version = { - filename = BASEENTITY .. "oil-refinery/hr-oil-refinery.png", - width = 386, - height = 430, - frame_count = 1, - shift = util.by_pixel(0, -7.5), - scale = 0.5, - tint = {0.77, 0.77, 0.66, 1} + apply_recipe_tint = "primary", + constant_speed = true, + north_position = {1, -3.85}, + east_position = {-1.7, -3.8}, + south_position = {-1.85, -4.4}, + west_position = {1.7, -3.65}, + render_layer = "wires", + animation = { + filename = BASEENTITY .. "chemical-plant/chemical-plant-smoke-outer.png", + frame_count = 47, + line_length = 16, + width = 90, + height = 188, + animation_speed = 0.25, + scale = 0.7 } }, - { - filename = BASEENTITY .. "oil-refinery/oil-refinery-shadow.png", - width = 337, - height = 213, - frame_count = 1, - shift = util.by_pixel(82.5, 26.5), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "oil-refinery/hr-oil-refinery-shadow.png", - width = 674, - height = 426, - frame_count = 1, - shift = util.by_pixel(82.5, 26.5), - draw_as_shadow = true, - force_hr_shadow = true, - scale = 0.5 + }, + + animation = make_4way_animation_from_spritesheet({ + layers = { + { + filename = BASEENTITY .. "oil-refinery/oil-refinery.png", + width = 386, + height = 430, + frame_count = 1, + shift = util.by_pixel(0, -7.5), + scale = 0.5, + tint = {0.77, 0.77, 0.66, 1} + }, + { + filename = BASEENTITY .. "oil-refinery/oil-refinery-shadow.png", + width = 674, + height = 426, + frame_count = 1, + shift = util.by_pixel(82.5, 26.5), + draw_as_shadow = true, + force_hr_shadow = true, + scale = 0.5 } } - } - }) + }) + } } }) -local md1 = util.table.deepcopy( - data.raw["assembling-machine"]["nullius-distillery-1"]) -md1.name = "nullius-mirror-distillery-1" -md1.order = "z-nullius-cbc" -md1.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } -md1.placeable_by = {item = "nullius-distillery-1", count = 1} -md1.next_upgrade = "nullius-mirror-distillery-2" -md1.localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-distillery-1"}} -md1.fluid_boxes[1].pipe_connections[1].position = {1, 3} -md1.fluid_boxes[2].pipe_connections[1].position = {-1, 3} -md1.fluid_boxes[3].pipe_connections[1].position = {2, -3} -md1.fluid_boxes[5].pipe_connections[1].position = {-2, -3} - data:extend({ - md1, { type = "assembling-machine", name = "nullius-distillery-2", - order = "z-nullius-ccb", + order = "z-nullius-ccb", icons = data.raw.item["nullius-distillery-2"].icons, localised_description = {"entity-description.nullius-distillery"}, flags = {"placeable-neutral","player-creation"}, @@ -598,113 +1063,92 @@ data:extend({ corpse = "oil-refinery-remnants", collision_box = {{-2.3, -2.3}, {2.3, 2.3}}, selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, - drawing_box = {{-2.5, -2.8}, {2.5, 2.5}}, - scale_entity_info_icon = true, + crafting_categories = {"distillation"}, crafting_speed = 2, energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 12, + emissions_per_minute = {pollution = 12}, drain = "50kW" }, energy_usage = "550kW", resistances = data.raw["assembling-machine"]["nullius-distillery-1"].resistances, working_sound = data.raw["assembling-machine"]["oil-refinery"].working_sound, - working_visualisations = data.raw["assembling-machine"]["nullius-distillery-1"].working_visualisations, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - module_specification = { module_slots = 2 }, + impact_category = "metal", + module_slots = 2, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, fast_replaceable_group = "distillery", next_upgrade = "nullius-distillery-3", + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["oil-refinery"], fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {-1, 3} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, 2}, direction = defines.direction.south }} }, { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {1, 3} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1, 2}, direction = defines.direction.south }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 4, - height = 2, - base_area = 5, - pipe_connections = {{ type="output", position = {-2, -3} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-2, -2}, direction = defines.direction.north }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 4, - height = 2, - base_area = 5, - pipe_connections = {{ type="output", position = {0, -3} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {0, -2}, direction = defines.direction.north }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 4, - height = 2, - base_area = 5, - pipe_connections = {{ type="output", position = {2, -3} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {2, -2}, direction = defines.direction.north }} } }, - animation = make_4way_animation_from_spritesheet({ - layers = { - { - filename = BASEENTITY .. "oil-refinery/oil-refinery.png", - width = 337, - height = 255, - frame_count = 1, - shift = {2.515625, 0.484375}, - tint = {0.8, 0.8, 1, 1}, - hr_version = { - filename = BASEENTITY .. "oil-refinery/hr-oil-refinery.png", - width = 386, - height = 430, - frame_count = 1, - shift = util.by_pixel(0, -7.5), - scale = 0.5, - tint = {0.8, 0.8, 1, 1} - } - }, - { - filename = BASEENTITY .. "oil-refinery/oil-refinery-shadow.png", - width = 337, - height = 213, - frame_count = 1, - shift = util.by_pixel(82.5, 26.5), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "oil-refinery/hr-oil-refinery-shadow.png", - width = 674, - height = 426, - frame_count = 1, - shift = util.by_pixel(82.5, 26.5), - draw_as_shadow = true, - force_hr_shadow = true, - scale = 0.5 + graphics_set = { + animation = make_4way_animation_from_spritesheet({ + layers = { + { + filename = BASEENTITY .. "oil-refinery/oil-refinery.png", + width = 386, + height = 430, + frame_count = 1, + shift = util.by_pixel(0, -7.5), + scale = 0.5, + tint = {0.8, 0.8, 1, 1} + }, + { + filename = BASEENTITY .. "oil-refinery/oil-refinery-shadow.png", + width = 674, + height = 426, + frame_count = 1, + shift = util.by_pixel(82.5, 26.5), + draw_as_shadow = true, + force_hr_shadow = true, + scale = 0.5 } } - } - }) + }), + working_visualisations = data.raw["assembling-machine"]["nullius-distillery-1"].graphics_set.working_visualisations, + } }, { type = "assembling-machine", name = "nullius-distillery-3", - order = "z-nullius-cdb", + order = "z-nullius-cdb", icons = data.raw.item["nullius-distillery-3"].icons, localised_description = {"entity-description.nullius-distillery"}, flags = {"placeable-neutral", "player-creation"}, @@ -714,248 +1158,92 @@ data:extend({ corpse = "oil-refinery-remnants", collision_box = {{-2.3, -2.3}, {2.3, 2.3}}, selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, - drawing_box = {{-2.5, -2.8}, {2.5, 2.5}}, - scale_entity_info_icon = true, + crafting_categories = {"distillation"}, crafting_speed = 4, energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 24, + emissions_per_minute = {pollution = 24}, drain = "100kW" }, energy_usage = "1100kW", resistances = data.raw["assembling-machine"]["nullius-distillery-1"].resistances, working_sound = data.raw["assembling-machine"]["oil-refinery"].working_sound, - working_visualisations = data.raw["assembling-machine"]["nullius-distillery-1"].working_visualisations, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - module_specification = { module_slots = 3 }, + impact_category = "metal", + module_slots = 3, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, fast_replaceable_group = "distillery", - animation = data.raw["assembling-machine"]["oil-refinery"].animation, + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["oil-refinery"], + graphics_set = { + animation = data.raw["assembling-machine"]["oil-refinery"].graphics_set.animation, + working_visualisations = data.raw["assembling-machine"]["nullius-distillery-1"].graphics_set.working_visualisations, + }, fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {-1, 3} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, 2}, direction = defines.direction.south }} }, { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {1, 3} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1, 2}, direction = defines.direction.south }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 5, - base_area = 5, - height = 3, - pipe_connections = {{ type="output", position = {-2, -3} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-2, -2}, direction = defines.direction.north }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 5, - base_area = 5, - height = 3, - pipe_connections = {{ type="output", position = {0, -3} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {0, -2}, direction = defines.direction.north }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 5, - base_area = 5, - height = 3, - pipe_connections = {{ type="output", position = {2, -3} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {2, -2}, direction = defines.direction.north }} } } } }) +circuit_connector_definitions["nullius-electrolyser"] = circuit_connector_definitions.create_vector(universal_connector_template, { + { variation = 4, main_offset = util.by_pixel( 20.875, 62), shadow_offset = util.by_pixel( 20.875, 62), show_shadow = true }, + { variation = 4, main_offset = util.by_pixel( 20.875, 62), shadow_offset = util.by_pixel( 20.875, 62), show_shadow = true }, + { variation = 4, main_offset = util.by_pixel( 20.875, 62), shadow_offset = util.by_pixel( 20.875, 62), show_shadow = true }, + { variation = 4, main_offset = util.by_pixel( 20.875, 62), shadow_offset = util.by_pixel( 20.875, 62), show_shadow = true }, +}) + data:extend({ { type = "assembling-machine", - name = "nullius-mirror-distillery-2", - order = "z-nullius-ccc", - icons = { - data.raw.item["nullius-distillery-2"].icons[1], - { icon = ICONPATH .. "flip1.png", icon_size = 64 } - }, - localised_description = {"entity-description.nullius-distillery"}, + name = "nullius-surge-electrolyzer-1", + icons = {{ + icon = "__angelspetrochemgraphics__/graphics/icons/electrolyser.png", + icon_size = 32, + tint = {0.8, 0.8, 0.6} + }}, + order = data.raw.item["nullius-electrolyzer-1"].order .. "d", + localised_description = {"entity-description.nullius-surge", + {"entity-description.nullius-electrolyzer"}}, + subgroup = "electrolyzer-mode-surge", flags = {"placeable-neutral","player-creation"}, - minable = {mining_time = 1.8, result = "nullius-distillery-2"}, - placeable_by = {item = "nullius-distillery-2", count = 1}, - max_health = 500, - dying_explosion = "medium-explosion", - corpse = "oil-refinery-remnants", - collision_box = {{-2.3, -2.3}, {2.3, 2.3}}, - selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, - drawing_box = {{-2.5, -2.8}, {2.5, 2.5}}, - scale_entity_info_icon = true, - crafting_categories = {"distillation"}, - crafting_speed = 2, - energy_source = data.raw["assembling-machine"]["nullius-distillery-2"].energy_source, - energy_usage = "550kW", - resistances = data.raw["assembling-machine"]["nullius-distillery-2"].resistances, - working_sound = data.raw["assembling-machine"]["oil-refinery"].working_sound, - working_visualisations = data.raw["assembling-machine"]["nullius-distillery-2"].working_visualisations, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - module_specification = { module_slots = 2 }, - allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - fast_replaceable_group = "distillery", - next_upgrade = "nullius-mirror-distillery-3", - animation = data.raw["assembling-machine"]["nullius-distillery-2"].animation, - - fluid_boxes = { - { - production_type = "input", - pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {1, 3} }} - }, - { - production_type = "input", - pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {-1, 3} }} - }, - { - production_type = "output", - pipe_covers = pipecoverspictures(), - base_level = 4, - height = 2, - base_area = 5, - pipe_connections = {{ type="output", position = {2, -3} }} - }, - { - production_type = "output", - pipe_covers = pipecoverspictures(), - base_level = 4, - height = 2, - base_area = 5, - pipe_connections = {{ type="output", position = {0, -3} }} - }, - { - production_type = "output", - pipe_covers = pipecoverspictures(), - base_level = 4, - height = 2, - base_area = 5, - pipe_connections = {{ type="output", position = {-2, -3} }} - } - } - }, - - { - type = "assembling-machine", - name = "nullius-mirror-distillery-3", - order = "z-nullius-cdc", - icons = { - data.raw.item["nullius-distillery-3"].icons[1], - { icon = ICONPATH .. "flip1.png", icon_size = 64 } - }, - localised_description = {"entity-description.nullius-distillery"}, - flags = {"placeable-neutral", "player-creation"}, - minable = {mining_time = 2.4, result = "nullius-distillery-3"}, - placeable_by = {item = "nullius-distillery-3", count = 1}, - max_health = 600, - dying_explosion = "medium-explosion", - corpse = "oil-refinery-remnants", - collision_box = {{-2.3, -2.3}, {2.3, 2.3}}, - selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, - drawing_box = {{-2.5, -2.8}, {2.5, 2.5}}, - scale_entity_info_icon = true, - crafting_categories = {"distillation"}, - crafting_speed = 4, - energy_source = { - type = "electric", - usage_priority = "secondary-input", - emissions_per_minute = 24, - drain = "100kW" - }, - energy_usage = "1100kW", - - resistances = data.raw["assembling-machine"]["nullius-distillery-1"].resistances, - working_sound = data.raw["assembling-machine"]["oil-refinery"].working_sound, - working_visualisations = data.raw["assembling-machine"]["nullius-distillery-1"].working_visualisations, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - module_specification = { module_slots = 3 }, - allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - fast_replaceable_group = "distillery", - animation = data.raw["assembling-machine"]["oil-refinery"].animation, - - fluid_boxes = { - { - production_type = "input", - pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {1, 3} }} - }, - { - production_type = "input", - pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {-1, 3} }} - }, - { - production_type = "output", - pipe_covers = pipecoverspictures(), - base_level = 5, - base_area = 5, - height = 3, - pipe_connections = {{ type="output", position = {2, -3} }} - }, - { - production_type = "output", - pipe_covers = pipecoverspictures(), - base_level = 5, - base_area = 5, - height = 3, - pipe_connections = {{ type="output", position = {0, -3} }} - }, - { - production_type = "output", - pipe_covers = pipecoverspictures(), - base_level = 5, - base_area = 5, - height = 3, - pipe_connections = {{ type="output", position = {-2, -3} }} - } - } - }, - - { - type = "assembling-machine", - name = "nullius-surge-electrolyzer-1", - icons = {{ - icon = "__angelspetrochem__/graphics/icons/electrolyser.png", - icon_size = 32, - tint = {0.8, 0.8, 0.6} - }}, - order = data.raw.item["nullius-electrolyzer-1"].order .. "d", - localised_description = {"entity-description.nullius-surge", - {"entity-description.nullius-electrolyzer"}}, - flags = {"placeable-neutral","player-creation"}, - minable = {mining_time = 1, result = "nullius-electrolyzer-1"}, - placeable_by = {item = "nullius-electrolyzer-1", count = 1}, - fast_replaceable_group = "electrolyzer", - next_upgrade = "nullius-surge-electrolyzer-2", - max_health = 300, - corpse = "big-remnants", + minable = {mining_time = 1, result = "nullius-electrolyzer-1"}, + placeable_by = {item = "nullius-electrolyzer-1", count = 1}, + fast_replaceable_group = "electrolyzer", + next_upgrade = "nullius-surge-electrolyzer-2", + max_health = 300, + corpse = "big-remnants", dying_explosion = "medium-explosion", collision_box = {{-1.8, -1.8}, {1.8, 1.8}}, selection_box = {{-2, -2}, {2, 2}}, @@ -963,7 +1251,7 @@ data:extend({ crafting_speed = 1, energy_source = { type = "electric", - emissions_per_minute = 0.5, + emissions_per_minute = {pollution = 0.5}, drain = "10kW", output_flow_limit = "0kW", usage_priority = "tertiary", @@ -974,93 +1262,88 @@ data:extend({ { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } }, - animation = { - north = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-north.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78, - tint = {r=0.8, g=0.8, b=0.6} - }, - east = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-east.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78, - tint = {r=0.8, g=0.8, b=0.6} - }, - south = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-north.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78, - tint = {r=0.8, g=0.8, b=0.6} - }, - west = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-east.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78, - tint = {r=0.8, g=0.8, b=0.6} + circuit_connector = circuit_connector_definitions["nullius-electrolyser"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + graphics_set = { + animation = { + north = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-north.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78, + tint = {r=0.8, g=0.8, b=0.6} + }, + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-east.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78, + tint = {r=0.8, g=0.8, b=0.6} + }, + south = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-north.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78, + tint = {r=0.8, g=0.8, b=0.6} + }, + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-east.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78, + tint = {r=0.8, g=0.8, b=0.6} + } } }, - vehicle_impact_sound = data.raw["assembling-machine"]["angels-electrolyser"].vehicle_impact_sound, + impact_category = "metal", working_sound = { - sound = { filename = "__angelspetrochem__/sound/electrolyser.ogg", volume = 0.15 }, - idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.4 }, - audible_distance_modifier = 0.75 + sound = { filename = "__angelspetrochemgraphics__/sound/electrolyser.ogg", volume = 0.15, audible_distance_modifier = 0.75 }, + idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.4, audible_distance_modifier = 0.75 }, + }, fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 20, - base_level = -3, - height = 3, - pipe_connections = {{ type="input", position = {-1.5, -2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1.5, -1.5}, direction = defines.direction.north }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 15, - base_level = 3, - height = 2, - pipe_connections = {{ type="output", position = {-1.5, 2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1.5, 1.5}, direction = defines.direction.south }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 15, - base_level = 3, - height = 2, - pipe_connections = {{ type="output", position = {1.5, -2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1.5, -1.5}, direction = defines.direction.north }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 15, - base_level = 3, - height = 2, - pipe_connections = {{ type="output", position = {1.5, 2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1.5, 1.5}, direction = defines.direction.south }} } - }, - pipe_covers = pipecoverspictures() + } } }) @@ -1068,17 +1351,18 @@ data:extend({ { type = "assembling-machine", name = "nullius-priority-electrolyzer-1", - icons = {{ - icon = "__angelspetrochem__/graphics/icons/electrolyser.png", + icons = {{ + icon = "__angelspetrochemgraphics__/graphics/icons/electrolyser.png", icon_size = 32, tint = {0.8, 0.68, 0.51} }}, - order = data.raw.item["nullius-electrolyzer-1"].order .. "b", - localised_description = {"entity-description.nullius-priority", + order = data.raw.item["nullius-electrolyzer-1"].order .. "b", + localised_description = {"entity-description.nullius-priority", {"entity-description.nullius-electrolyzer"}}, + subgroup = "electrolyzer-mode-priority", flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "nullius-electrolyzer-1"}, - placeable_by = {item = "nullius-electrolyzer-1", count = 1}, + placeable_by = {item = "nullius-electrolyzer-1", count = 1}, fast_replaceable_group = "electrolyzer", next_upgrade = "nullius-priority-electrolyzer-2", max_health = 300, @@ -1090,77 +1374,82 @@ data:extend({ crafting_speed = 0.5, energy_source = { type = "electric", - emissions_per_minute = 0.5, + emissions_per_minute = {pollution = 0.5}, drain = "10kW", usage_priority = "secondary-input" }, energy_usage = "990kW", resistances = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].resistances, fluid_boxes = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].fluid_boxes, - animation = { - north = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-north.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78, - tint = {0.8, 0.68, 0.51} - }, - east = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-east.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78, - tint = {0.8, 0.68, 0.51} - }, - south = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-north.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78, - tint = {0.8, 0.68, 0.51} - }, - west = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-east.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78, - tint = {0.8, 0.68, 0.51} + circuit_connector = circuit_connector_definitions["nullius-electrolyser"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + graphics_set = { + animation = { + north = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-north.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78, + tint = {0.8, 0.68, 0.51} + }, + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-east.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78, + tint = {0.8, 0.68, 0.51} + }, + south = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-north.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78, + tint = {0.8, 0.68, 0.51} + }, + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-east.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78, + tint = {0.8, 0.68, 0.51} + } } }, - vehicle_impact_sound = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].vehicle_impact_sound, + impact_category = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].impact_category, working_sound = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].working_sound }, { type = "assembling-machine", name = "nullius-surge-electrolyzer-2", - icons = {{ - icon = "__angelspetrochem__/graphics/icons/electrolyser.png", + icons = {{ + icon = "__angelspetrochemgraphics__/graphics/icons/electrolyser.png", icon_size = 32, tint = {0.8, 0.9, 1} }}, - order = data.raw.item["nullius-electrolyzer-2"].order .. "d", - localised_description = {"entity-description.nullius-surge", + order = data.raw.item["nullius-electrolyzer-2"].order .. "d", + localised_description = {"entity-description.nullius-surge", {"entity-description.nullius-electrolyzer"}}, + subgroup = "electrolyzer-mode-surge", flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1.5, result = "nullius-electrolyzer-2"}, - placeable_by = {item = "nullius-electrolyzer-2", count = 1}, + placeable_by = {item = "nullius-electrolyzer-2", count = 1}, fast_replaceable_group = "electrolyzer", next_upgrade = "nullius-surge-electrolyzer-3", max_health = 400, @@ -1172,7 +1461,7 @@ data:extend({ crafting_speed = 2, energy_source = { type = "electric", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "15kW", output_flow_limit = "0kW", usage_priority = "tertiary", @@ -1183,133 +1472,103 @@ data:extend({ { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } }, - animation = { - north = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-north.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78, - tint = {r=0.8, g=0.9, b=1} - }, - east = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-east.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78, - tint = {r=0.8, g=0.9, b=1} - }, - south = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-north.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78, - tint = {r=0.8, g=0.9, b=1} - }, - west = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-east.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78, - tint = {r=0.8, g=0.9, b=1} + circuit_connector = circuit_connector_definitions["nullius-electrolyser"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + graphics_set = { + animation = { + north = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-north.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78, + tint = {r=0.8, g=0.9, b=1} + }, + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-east.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78, + tint = {r=0.8, g=0.9, b=1} + }, + south = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-north.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78, + tint = {r=0.8, g=0.9, b=1} + }, + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-east.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78, + tint = {r=0.8, g=0.9, b=1} + } } }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].working_sound, fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 20, - base_level = -5, - height = 4, - pipe_connections = {{ type="input", position = {-1.5, -2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1.5, -1.5}, direction = defines.direction.north }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 15, - base_level = 4, - height = 3, - pipe_connections = {{ type="output", position = {-1.5, 2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1.5, 1.5}, direction = defines.direction.south }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 15, - base_level = 4, - height = 3, - pipe_connections = {{ type="output", position = {1.5, -2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1.5, -1.5}, direction = defines.direction.north }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 15, - base_level = 4, - height = 3, - pipe_connections = {{ type="output", position = {1.5, 2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1.5, 1.5}, direction = defines.direction.south }} } } } }) -local mse1 = util.table.deepcopy( - data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"]) -mse1.name = "nullius-mirror-surge-electrolyzer-1" -mse1.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } -mse1.order = data.raw.item["nullius-electrolyzer-1"].order .. "e" -mse1.placeable_by = {item = "nullius-electrolyzer-1", count = 1} -mse1.next_upgrade = "nullius-mirror-surge-electrolyzer-2" -mse1.localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-surge-electrolyzer-1"}} -mse1.fluid_boxes[1].pipe_connections[1].position = {1.5, -2.5} -mse1.fluid_boxes[2].pipe_connections[1].position = {1.5, 2.5} -mse1.fluid_boxes[3].pipe_connections[1].position = {-1.5, -2.5} -mse1.fluid_boxes[4].pipe_connections[1].position = {-1.5, 2.5} - -local mpe1 = util.table.deepcopy( - data.raw["assembling-machine"]["nullius-priority-electrolyzer-1"]) -mpe1.name = "nullius-mirror-priority-electrolyzer-1" -mpe1.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } -mpe1.order = data.raw.item["nullius-electrolyzer-1"].order .. "c" -mpe1.placeable_by = {item = "nullius-electrolyzer-1", count = 1} -mpe1.next_upgrade = "nullius-mirror-priority-electrolyzer-2" -mpe1.localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-priority-electrolyzer-1"}} -mpe1.fluid_boxes = mse1.fluid_boxes - data:extend({ - mse1, - mpe1, { type = "assembling-machine", name = "nullius-priority-electrolyzer-2", - icons = {{ - icon = "__angelspetrochem__/graphics/icons/electrolyser.png", + icons = {{ + icon = "__angelspetrochemgraphics__/graphics/icons/electrolyser.png", icon_size = 32, tint = {0.8, 0.76, 0.85} }}, - order = data.raw.item["nullius-electrolyzer-2"].order .. "b", - localised_description = {"entity-description.nullius-priority", + order = data.raw.item["nullius-electrolyzer-2"].order .. "b", + localised_description = {"entity-description.nullius-priority", {"entity-description.nullius-electrolyzer"}}, + subgroup = "electrolyzer-mode-priority", flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1.5, result = "nullius-electrolyzer-2"}, - placeable_by = {item = "nullius-electrolyzer-2", count = 1}, + placeable_by = {item = "nullius-electrolyzer-2", count = 1}, fast_replaceable_group = "electrolyzer", next_upgrade = "nullius-priority-electrolyzer-3", max_health = 400, @@ -1321,189 +1580,81 @@ data:extend({ crafting_speed = 1.5, energy_source = { type = "electric", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "25kW", usage_priority = "secondary-input" }, energy_usage = "2915kW", resistances = data.raw["assembling-machine"]["nullius-surge-electrolyzer-2"].resistances, fluid_boxes = data.raw["assembling-machine"]["nullius-surge-electrolyzer-2"].fluid_boxes, - animation = { - north = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-north.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78, - tint = {0.8, 0.76, 0.85} - }, - east = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-east.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78, - tint = {0.8, 0.76, 0.85} - }, - south = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-north.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78, - tint = {0.8, 0.76, 0.85} - }, - west = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-east.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78, - tint = {0.8, 0.76, 0.85} + circuit_connector = circuit_connector_definitions["nullius-electrolyser"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + graphics_set = { + animation = { + north = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-north.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78, + tint = {0.8, 0.76, 0.85} + }, + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-east.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78, + tint = {0.8, 0.76, 0.85} + }, + south = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-north.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78, + tint = {0.8, 0.76, 0.85} + }, + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-east.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78, + tint = {0.8, 0.76, 0.85} + } } }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].working_sound - }, - - { - type = "assembling-machine", - name = "nullius-mirror-surge-electrolyzer-2", - localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-surge-electrolyzer-2"}}, - icons = { - { - icon = "__angelspetrochem__/graphics/icons/electrolyser.png", - icon_size = 32, - tint = {0.8, 0.9, 1} - }, - { - icon = ICONPATH .. "flip1.png", - icon_size = 64 - } - }, - order = data.raw.item["nullius-electrolyzer-2"].order .. "e", - localised_description = {"entity-description.nullius-surge", - {"entity-description.nullius-electrolyzer"}}, - flags = {"placeable-neutral","player-creation"}, - minable = {mining_time = 1.5, result = "nullius-electrolyzer-2"}, - placeable_by = {item = "nullius-electrolyzer-2", count = 1}, - fast_replaceable_group = "electrolyzer", - next_upgrade = "nullius-mirror-surge-electrolyzer-3", - max_health = 400, - corpse = "big-remnants", - dying_explosion = "medium-explosion", - collision_box = {{-1.8, -1.8}, {1.8, 1.8}}, - selection_box = {{-2, -2}, {2, 2}}, - crafting_categories = {"nullius-electrolysis"}, - crafting_speed = 2, - energy_source = data.raw["assembling-machine"]["nullius-surge-electrolyzer-2"].energy_source, - energy_usage = data.raw["assembling-machine"]["nullius-surge-electrolyzer-2"].energy_usage, - resistances = data.raw["assembling-machine"]["nullius-surge-electrolyzer-2"].resistances, - animation = data.raw["assembling-machine"]["nullius-surge-electrolyzer-2"].animation, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].working_sound, - fluid_boxes = { - { - production_type = "input", - pipe_covers = pipecoverspictures(), - base_area = 20, - base_level = -5, - height = 4, - pipe_connections = {{ type="input", position = {1.5, -2.5} }} - }, - { - production_type = "output", - pipe_covers = pipecoverspictures(), - base_area = 15, - base_level = 4, - height = 3, - pipe_connections = {{ type="output", position = {1.5, 2.5} }} - }, - { - production_type = "output", - pipe_covers = pipecoverspictures(), - base_area = 15, - base_level = 4, - height = 3, - pipe_connections = {{ type="output", position = {-1.5, -2.5} }} - }, - { - production_type = "output", - pipe_covers = pipecoverspictures(), - base_area = 15, - base_level = 4, - height = 3, - pipe_connections = {{ type="output", position = {-1.5, 2.5} }} - } - } } }) data:extend({ - { - type = "assembling-machine", - name = "nullius-mirror-priority-electrolyzer-2", - localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-priority-electrolyzer-2"}}, - icons = { - { - icon = "__angelspetrochem__/graphics/icons/electrolyser.png", - icon_size = 32, - tint = {0.8, 0.76, 0.85} - }, - { - icon = ICONPATH .. "flip1.png", - icon_size = 64 - } - }, - order = data.raw.item["nullius-electrolyzer-2"].order .. "c", - localised_description = {"entity-description.nullius-priority", - {"entity-description.nullius-electrolyzer"}}, - flags = {"placeable-neutral","player-creation"}, - minable = {mining_time = 1.5, result = "nullius-electrolyzer-2"}, - placeable_by = {item = "nullius-electrolyzer-2", count = 1}, - fast_replaceable_group = "electrolyzer", - next_upgrade = "nullius-mirror-priority-electrolyzer-3", - max_health = 400, - corpse = "big-remnants", - dying_explosion = "medium-explosion", - collision_box = {{-1.8, -1.8}, {1.8, 1.8}}, - selection_box = {{-2, -2}, {2, 2}}, - crafting_categories = {"nullius-electrolysis"}, - crafting_speed = 1.5, - energy_source = data.raw["assembling-machine"]["nullius-priority-electrolyzer-2"].energy_source, - energy_usage = data.raw["assembling-machine"]["nullius-priority-electrolyzer-2"].energy_usage, - resistances = data.raw["assembling-machine"]["nullius-priority-electrolyzer-2"].resistances, - animation = data.raw["assembling-machine"]["nullius-priority-electrolyzer-2"].animation, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].working_sound, - fluid_boxes = data.raw["assembling-machine"]["nullius-mirror-surge-electrolyzer-2"].fluid_boxes - }, - { type = "assembling-machine", name = "nullius-surge-electrolyzer-3", - icon = "__angelspetrochem__/graphics/icons/electrolyser.png", + icon = "__angelspetrochemgraphics__/graphics/icons/electrolyser.png", icon_size = 32, - order = data.raw.item["nullius-electrolyzer-3"].order .. "d", - localised_description = {"entity-description.nullius-surge", + order = data.raw.item["nullius-electrolyzer-3"].order .. "d", + localised_description = {"entity-description.nullius-surge", {"entity-description.nullius-electrolyzer"}}, + subgroup = "electrolyzer-mode-surge", flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 2, result = "nullius-electrolyzer-3"}, - placeable_by = {item = "nullius-electrolyzer-3", count = 1}, + placeable_by = {item = "nullius-electrolyzer-3", count = 1}, fast_replaceable_group = "electrolyzer", max_health = 500, corpse = "big-remnants", @@ -1514,7 +1665,7 @@ data:extend({ crafting_speed = 4, energy_source = { type = "electric", - emissions_per_minute = 2, + emissions_per_minute = {pollution = 2}, drain = "25kW", output_flow_limit = "0kW", usage_priority = "tertiary", @@ -1525,155 +1676,78 @@ data:extend({ { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } }, - animation = { - north = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-north.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78 - }, - east = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-east.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78 - }, - south = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-north.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78 - }, - west = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-east.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = {0, 0}, - animation_speed = 0.5, - scale = 0.78 - } - }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].working_sound, - fluid_boxes = { - { - production_type = "input", - pipe_covers = pipecoverspictures(), - base_area = 20, - base_level = -8, - height = 6, - pipe_connections = {{ type="input", position = {-1.5, -2.5} }} - }, - { - production_type = "output", - pipe_covers = pipecoverspictures(), - base_area = 15, - base_level = 5, - height = 4, - pipe_connections = {{ type="output", position = {-1.5, 2.5} }} - }, - { - production_type = "output", - pipe_covers = pipecoverspictures(), - base_area = 15, - base_level = 5, - height = 4, - pipe_connections = {{ type="output", position = {1.5, -2.5} }} - }, - { - production_type = "output", - pipe_covers = pipecoverspictures(), - base_area = 15, - base_level = 5, - height = 4, - pipe_connections = {{ type="output", position = {1.5, 2.5} }} - } - } - } -}) - -data:extend({ - { - type = "assembling-machine", - name = "nullius-mirror-surge-electrolyzer-3", - localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-surge-electrolyzer-3"}}, - icons = { - { - icon = "__angelspetrochem__/graphics/icons/electrolyser.png", - icon_size = 32 - }, - { - icon = ICONPATH .. "flip1.png", - icon_size = 64 + circuit_connector = circuit_connector_definitions["nullius-electrolyser"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + graphics_set = { + animation = { + north = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-north.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78 + }, + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-east.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78 + }, + south = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-north.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78 + }, + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-east.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + shift = {0, 0}, + animation_speed = 0.5, + scale = 0.78 + } } }, - order = data.raw.item["nullius-electrolyzer-3"].order .. "e", - localised_description = {"entity-description.nullius-surge", - {"entity-description.nullius-electrolyzer"}}, - flags = {"placeable-neutral","player-creation"}, - minable = {mining_time = 2, result = "nullius-electrolyzer-3"}, - placeable_by = {item = "nullius-electrolyzer-3", count = 1}, - fast_replaceable_group = "electrolyzer", - max_health = 500, - corpse = "big-remnants", - dying_explosion = "medium-explosion", - collision_box = {{-1.8, -1.8}, {1.8, 1.8}}, - selection_box = {{-2, -2}, {2, 2}}, - crafting_categories = {"nullius-electrolysis"}, - crafting_speed = 4, - energy_usage = data.raw["assembling-machine"]["nullius-surge-electrolyzer-3"].energy_usage, - energy_source = data.raw["assembling-machine"]["nullius-surge-electrolyzer-3"].energy_source, - resistances = data.raw["assembling-machine"]["nullius-surge-electrolyzer-3"].resistances, - animation = data.raw["assembling-machine"]["nullius-surge-electrolyzer-3"].animation, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].working_sound, fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 20, - base_level = -8, - height = 6, - pipe_connections = {{ type="input", position = {1.5, -2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1.5, -1.5}, direction = defines.direction.north }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 15, - base_level = 5, - height = 4, - pipe_connections = {{ type="output", position = {1.5, 2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1.5, 1.5}, direction = defines.direction.south }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 15, - base_level = 5, - height = 4, - pipe_connections = {{ type="output", position = {-1.5, -2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1.5, -1.5}, direction = defines.direction.north }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 15, - base_level = 5, - height = 4, - pipe_connections = {{ type="output", position = {-1.5, 2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1.5, 1.5}, direction = defines.direction.south }} } } } @@ -1683,17 +1757,18 @@ data:extend({ { type = "assembling-machine", name = "nullius-priority-electrolyzer-3", - icons = {{ - icon = "__angelspetrochem__/graphics/icons/electrolyser.png", + icons = {{ + icon = "__angelspetrochemgraphics__/graphics/icons/electrolyser.png", icon_size = 32, tint = {1, 0.85, 0.85} }}, - order = data.raw.item["nullius-electrolyzer-3"].order .. "b", - localised_description = {"entity-description.nullius-priority", + order = data.raw.item["nullius-electrolyzer-3"].order .. "b", + localised_description = {"entity-description.nullius-priority", {"entity-description.nullius-electrolyzer"}}, + subgroup = "electrolyzer-mode-priority", flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 2, result = "nullius-electrolyzer-3"}, - placeable_by = {item = "nullius-electrolyzer-3", count = 1}, + placeable_by = {item = "nullius-electrolyzer-3", count = 1}, fast_replaceable_group = "electrolyzer", max_health = 500, corpse = "big-remnants", @@ -1705,104 +1780,69 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 2, + emissions_per_minute = {pollution = 2}, drain = "100kW" }, energy_usage = "7650kW", resistances = data.raw["assembling-machine"]["nullius-surge-electrolyzer-3"].resistances, fluid_boxes = data.raw["assembling-machine"]["nullius-surge-electrolyzer-3"].fluid_boxes, - animation = { - north = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-north.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - scale = 0.78, - tint = {1, 0.85, 0.85} - }, - east = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-east.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - scale = 0.78, - tint = {1, 0.85, 0.85} - }, - south = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-north.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - scale = 0.78, - tint = {1, 0.85, 0.85} - }, - west = { - filename = "__angelspetrochem__/graphics/entity/electrolyser/electrolyser-east.png", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - scale = 0.78, - tint = {1, 0.85, 0.85} + circuit_connector = circuit_connector_definitions["nullius-electrolyser"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + graphics_set = { + animation = { + north = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-north.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + scale = 0.78, + tint = {1, 0.85, 0.85} + }, + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-east.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + scale = 0.78, + tint = {1, 0.85, 0.85} + }, + south = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-north.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + scale = 0.78, + tint = {1, 0.85, 0.85} + }, + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/electrolyser-east.png", + width = 224, + height = 224, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + scale = 0.78, + tint = {1, 0.85, 0.85} + } } }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].working_sound } }) data:extend({ - { - type = "assembling-machine", - name = "nullius-mirror-priority-electrolyzer-3", - localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-priority-electrolyzer-3"}}, - icons = { - { - icon = "__angelspetrochem__/graphics/icons/electrolyser.png", - icon_size = 32, - tint = {1, 0.85, 0.85} - }, - { - icon = ICONPATH .. "flip1.png", - icon_size = 64 - } - }, - order = data.raw.item["nullius-electrolyzer-3"].order .. "c", - localised_description = {"entity-description.nullius-priority", - {"entity-description.nullius-electrolyzer"}}, - flags = {"placeable-neutral","player-creation"}, - minable = {mining_time = 2, result = "nullius-electrolyzer-3"}, - placeable_by = {item = "nullius-electrolyzer-3", count = 1}, - fast_replaceable_group = "electrolyzer", - max_health = 500, - corpse = "big-remnants", - dying_explosion = "medium-explosion", - collision_box = {{-1.8, -1.8}, {1.8, 1.8}}, - selection_box = {{-2, -2}, {2, 2}}, - crafting_categories = {"nullius-electrolysis"}, - crafting_speed = 4, - energy_source = data.raw["assembling-machine"]["nullius-priority-electrolyzer-3"].energy_source, - energy_usage = data.raw["assembling-machine"]["nullius-priority-electrolyzer-3"].energy_usage, - resistances = data.raw["assembling-machine"]["nullius-surge-electrolyzer-3"].resistances, - fluid_boxes = data.raw["assembling-machine"]["nullius-mirror-surge-electrolyzer-3"].fluid_boxes, - animation = data.raw["assembling-machine"]["nullius-priority-electrolyzer-3"].animation, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["nullius-surge-electrolyzer-1"].working_sound - }, - { type = "assembling-machine", name = "nullius-chemical-plant-1", icons = data.raw.item["nullius-chemical-plant-1"].icons, - order = "z-nullius-bbb", + order = "z-nullius-bbb", localised_description = {"entity-description.nullius-chemical-plant"}, flags = {"placeable-neutral","placeable-player", "player-creation"}, minable = { mining_time = 1.2, result = "nullius-chemical-plant-1"}, @@ -1811,266 +1851,162 @@ data:extend({ dying_explosion = "medium-explosion", collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, - drawing_box = {{-1.5, -1.9}, {1.5, 1.5}}, + fast_replaceable_group = "chemical-plant", next_upgrade = "nullius-chemical-plant-2", - module_specification = { module_slots = 1 }, + module_slots = 1, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - animation = make_4way_animation_from_spritesheet({ layers = - { - { - filename = BASEENTITY .. "chemical-plant/chemical-plant.png", - width = 108, - height = 148, - frame_count = 24, - line_length = 12, - shift = util.by_pixel(1, -9), - tint = {0.75, 0.75, 0.6, 1}, - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant.png", - width = 220, - height = 292, - frame_count = 24, - line_length = 12, - shift = util.by_pixel(1.5, -9), - scale = 0.52, - tint = {0.75, 0.75, 0.6, 1} - } - }, + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["chemical-plant"], + graphics_set = { + animation = make_4way_animation_from_spritesheet({ layers = { - filename = BASEENTITY .. "chemical-plant/chemical-plant-shadow.png", - width = 154, - height = 112, - repeat_count = 24, - frame_count = 1, - shift = util.by_pixel(28, 6), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant-shadow.png", - width = 312, - height = 222, - repeat_count = 24, - frame_count = 1, - shift = util.by_pixel(27, 6), - draw_as_shadow = true, - scale = 0.52 - } - } - }}), - working_visualisations = { - { - apply_recipe_tint = "primary", - north_animation = { - filename = BASEENTITY .. "chemical-plant/chemical-plant-liquid-north.png", - frame_count = 24, - line_length = 6, - width = 32, - height = 24, - shift = util.by_pixel(24, 14), - animation_speed = 0.5, - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant-liquid-north.png", - frame_count = 24, - line_length = 6, - width = 66, - height = 44, - shift = util.by_pixel(24, 15), - scale = 0.52, - animation_speed = 0.5 - } - }, - east_animation = { - filename = BASEENTITY .. "chemical-plant/chemical-plant-liquid-east.png", - frame_count = 24, - line_length = 6, - width = 36, - height = 18, - shift = util.by_pixel(0, 22), - animation_speed = 0.5, - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant-liquid-east.png", - frame_count = 24, - line_length = 6, - width = 70, - height = 36, - shift = util.by_pixel(1, 22), - scale = 0.52, - animation_speed = 0.5 - } - }, - south_animation = { - filename = BASEENTITY .. "chemical-plant/chemical-plant-liquid-south.png", - frame_count = 24, - line_length = 6, - width = 34, - height = 24, - shift = util.by_pixel(0, 16), - animation_speed = 0.5, - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant-liquid-south.png", + { + filename = BASEENTITY .. "chemical-plant/chemical-plant.png", + width = 220, + height = 292, frame_count = 24, - line_length = 6, - width = 66, - height = 42, - shift = util.by_pixel(0, 17), + line_length = 12, + shift = util.by_pixel(1.5, -9), scale = 0.52, - animation_speed = 0.5 - } + tint = {0.75, 0.75, 0.6, 1} }, - west_animation = { - filename = BASEENTITY .. "chemical-plant/chemical-plant-liquid-west.png", - frame_count = 24, - line_length = 6, - width = 38, - height = 20, - shift = util.by_pixel(-10, 12), - animation_speed = 0.5, - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant-liquid-west.png", - frame_count = 24, - line_length = 6, - width = 74, - height = 36, - shift = util.by_pixel(-9, 13), - scale = 0.52, - animation_speed = 0.5 - } + { + filename = BASEENTITY .. "chemical-plant/chemical-plant-shadow.png", + width = 312, + height = 222, + repeat_count = 24, + frame_count = 1, + shift = util.by_pixel(27, 6), + draw_as_shadow = true, + scale = 0.52 } - }, - { - apply_recipe_tint = "secondary", - north_animation = { - filename = BASEENTITY .. "chemical-plant/chemical-plant-foam-north.png", - frame_count = 24, - line_length = 6, - width = 32, - height = 22, - shift = util.by_pixel(24, 14), - animation_speed = 0.5, - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant-foam-north.png", - frame_count = 24, - line_length = 6, - width = 62, - height = 42, - shift = util.by_pixel(25, 15), - scale = 0.52, - animation_speed = 0.5 + }}), + working_visualisations = { + { + apply_recipe_tint = "primary", + north_animation = { + filename = BASEENTITY .. "chemical-plant/chemical-plant-liquid-north.png", + frame_count = 24, + line_length = 6, + width = 66, + height = 44, + shift = util.by_pixel(24, 15), + scale = 0.52, + animation_speed = 0.5 + }, + east_animation = { + filename = BASEENTITY .. "chemical-plant/chemical-plant-liquid-east.png", + frame_count = 24, + line_length = 6, + width = 70, + height = 36, + shift = util.by_pixel(1, 22), + scale = 0.52, + animation_speed = 0.5 + }, + south_animation = { + filename = BASEENTITY .. "chemical-plant/chemical-plant-liquid-south.png", + frame_count = 24, + line_length = 6, + width = 66, + height = 42, + shift = util.by_pixel(0, 17), + scale = 0.52, + animation_speed = 0.5 + }, + west_animation = { + filename = BASEENTITY .. "chemical-plant/chemical-plant-liquid-west.png", + frame_count = 24, + line_length = 6, + width = 74, + height = 36, + shift = util.by_pixel(-9, 13), + scale = 0.52, + animation_speed = 0.5 } }, - east_animation = { - filename = BASEENTITY .. "chemical-plant/chemical-plant-foam-east.png", - frame_count = 24, - line_length = 6, - width = 34, - height = 18, - shift = util.by_pixel(0, 22), - animation_speed = 0.5, - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant-foam-east.png", - frame_count = 24, - line_length = 6, - width = 68, - height = 36, - shift = util.by_pixel(1, 22), - scale = 0.52, - animation_speed = 0.5 + { + apply_recipe_tint = "secondary", + north_animation = { + filename = BASEENTITY .. "chemical-plant/chemical-plant-foam-north.png", + frame_count = 24, + line_length = 6, + width = 62, + height = 42, + shift = util.by_pixel(25, 15), + scale = 0.52, + animation_speed = 0.5 + }, + east_animation = { + filename = BASEENTITY .. "chemical-plant/chemical-plant-foam-east.png", + frame_count = 24, + line_length = 6, + width = 68, + height = 36, + shift = util.by_pixel(1, 22), + scale = 0.52, + animation_speed = 0.5 + }, + south_animation = { + filename = BASEENTITY .. "chemical-plant/chemical-plant-foam-south.png", + frame_count = 24, + line_length = 6, + width = 60, + height = 40, + shift = util.by_pixel(2, 17), + scale = 0.52, + animation_speed = 0.5 + }, + west_animation = { + filename = BASEENTITY .. "chemical-plant/chemical-plant-foam-west.png", + frame_count = 24, + line_length = 6, + width = 68, + height = 28, + shift = util.by_pixel(-8, 15), + scale = 0.52, + animation_speed = 0.5 } }, - south_animation = { - filename = BASEENTITY .. "chemical-plant/chemical-plant-foam-south.png", - frame_count = 24, - line_length = 6, - width = 32, - height = 18, - shift = util.by_pixel(0, 18), - animation_speed = 0.5, - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant-foam-south.png", - frame_count = 24, - line_length = 6, - width = 60, - height = 40, - shift = util.by_pixel(2, 17), - scale = 0.52, - animation_speed = 0.5 + { + apply_recipe_tint = "primary", + fadeout = true, + constant_speed = true, + north_position = util.by_pixel_hr(-30, -163), + east_position = util.by_pixel_hr(29, -152), + south_position = util.by_pixel_hr(12, -136), + west_position = util.by_pixel_hr(-32, -132), + render_layer = "wires", + animation = { + filename = BASEENTITY .. "chemical-plant/chemical-plant-smoke-outer.png", + frame_count = 47, + line_length = 16, + width = 90, + height = 188, + animation_speed = 0.4, + shift = util.by_pixel(-2, -40), + scale = 0.52 } }, - west_animation = { - filename = BASEENTITY .. "chemical-plant/chemical-plant-foam-west.png", - frame_count = 24, - line_length = 6, - width = 36, - height = 16, - shift = util.by_pixel(-10, 14), - animation_speed = 0.5, - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant-foam-west.png", - frame_count = 24, - line_length = 6, - width = 68, - height = 28, - shift = util.by_pixel(-8, 15), - scale = 0.52, - animation_speed = 0.5 - } - } - }, - { - apply_recipe_tint = "primary", - fadeout = true, - constant_speed = true, - north_position = util.by_pixel_hr(-30, -163), - east_position = util.by_pixel_hr(29, -152), - south_position = util.by_pixel_hr(12, -136), - west_position = util.by_pixel_hr(-32, -132), - render_layer = "wires", - animation = { - filename = BASEENTITY .. "chemical-plant/chemical-plant-smoke-outer.png", - frame_count = 47, - line_length = 16, - width = 46, - height = 94, - animation_speed = 0.4, - shift = util.by_pixel(-2, -40), - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant-smoke-outer.png", - frame_count = 47, - line_length = 16, - width = 90, - height = 188, - animation_speed = 0.4, - shift = util.by_pixel(-2, -40), - scale = 0.52 - } - } - }, - { - apply_recipe_tint = "secondary", - fadeout = true, - constant_speed = true, - north_position = util.by_pixel_hr(-30, -163), - east_position = util.by_pixel_hr(29, -152), - south_position = util.by_pixel_hr(12, -136), - west_position = util.by_pixel_hr(-32, -132), - render_layer = "wires", - animation = { - filename = BASEENTITY .. "chemical-plant/chemical-plant-smoke-inner.png", - frame_count = 47, - line_length = 16, - width = 20, - height = 42, - animation_speed = 0.4, - shift = util.by_pixel(0, -14), - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant-smoke-inner.png", - frame_count = 47, - line_length = 16, - width = 40, - height = 84, - animation_speed = 0.4, - shift = util.by_pixel(0, -14), - scale = 0.52 + { + apply_recipe_tint = "secondary", + fadeout = true, + constant_speed = true, + north_position = util.by_pixel_hr(-30, -163), + east_position = util.by_pixel_hr(29, -152), + south_position = util.by_pixel_hr(12, -136), + west_position = util.by_pixel_hr(-32, -132), + render_layer = "wires", + animation = { + filename = BASEENTITY .. "chemical-plant/chemical-plant-smoke-inner.png", + frame_count = 47, + line_length = 16, + width = 40, + height = 84, + animation_speed = 0.4, + shift = util.by_pixel(0, -14), + scale = 0.52 } } } @@ -2078,13 +2014,13 @@ data:extend({ resistances = { { type = "impact", decrease = 100, percent = 90 } }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = data.raw["assembling-machine"]["chemical-plant"].working_sound, crafting_speed = 1, energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 4, + emissions_per_minute = {pollution = 4}, drain = "8kW" }, energy_usage = "192kW", @@ -2093,66 +2029,45 @@ data:extend({ { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -1, - pipe_connections = {{ type="input", position = {-1, -2} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, -1}, direction = defines.direction.north }} }, { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -1, - pipe_connections = {{ type="input", position = {1, -2} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1, -1}, direction = defines.direction.north }} }, { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 2, - base_level = -1, - height = 2, + volume = 500, pipe_connections = { - {type = "input-output", position = {-2, 0}}, - {type = "input-output", position = {2, 0}} + {flow_direction = "input-output", position = {-1, 0}, direction = defines.direction.west}, + {flow_direction = "input-output", position = {1, 0}, direction = defines.direction.east} } }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 3, - height = 2, - pipe_connections = {{ type="output", position = {-1, 2} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1, 1}, direction = defines.direction.south }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 3, - height = 2, - pipe_connections = {{ type="output", position = {1, 2} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1, 1}, direction = defines.direction.south }} } } } }) -local mcp1 = util.table.deepcopy( - data.raw["assembling-machine"]["nullius-chemical-plant-1"]) -mcp1.name = "nullius-mirror-chemical-plant-1" -mcp1.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } -mcp1.order = "z-nullius-bbc" -mcp1.placeable_by = {item = "nullius-chemical-plant-1", count = 1} -mcp1.next_upgrade = "nullius-mirror-chemical-plant-2" -mcp1.localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-chemical-plant-1"}} -mcp1.fluid_boxes[1].pipe_connections[1].position = {1, -2} -mcp1.fluid_boxes[2].pipe_connections[1].position = {-1, -2} -mcp1.fluid_boxes[4].pipe_connections[1].position = {1, 2} -mcp1.fluid_boxes[5].pipe_connections[1].position = {-1, 2} - data:extend({ - mcp1, { type = "assembling-machine", name = "nullius-chemical-plant-2", - order = "z-nullius-bcb", + order = "z-nullius-bcb", icons = data.raw.item["nullius-chemical-plant-2"].icons, localised_description = {"entity-description.nullius-chemical-plant"}, flags = {"placeable-neutral","placeable-player", "player-creation"}, @@ -2162,64 +2077,50 @@ data:extend({ dying_explosion = "medium-explosion", collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, - drawing_box = {{-1.5, -1.9}, {1.5, 1.5}}, - module_specification = { module_slots = 2 }, + + module_slots = 2, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, fast_replaceable_group = "chemical-plant", next_upgrade = "nullius-chemical-plant-3", + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["chemical-plant"], - animation = make_4way_animation_from_spritesheet({ layers = - { - { - filename = BASEENTITY .. "chemical-plant/chemical-plant.png", - width = 108, - height = 148, - frame_count = 24, - line_length = 12, - shift = util.by_pixel(1, -9), - tint = {0.8, 0.8, 1, 1}, - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant.png", - width = 220, - height = 292, - frame_count = 24, - line_length = 12, - shift = util.by_pixel(1.5, -9), - scale = 0.52, - tint = {0.8, 0.8, 1, 1} - } - }, + graphics_set = { + animation = make_4way_animation_from_spritesheet({ layers = { - filename = BASEENTITY .. "chemical-plant/chemical-plant-shadow.png", - width = 154, - height = 112, - repeat_count = 24, - frame_count = 1, - shift = util.by_pixel(28, 6), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant-shadow.png", - width = 312, - height = 222, - repeat_count = 24, - frame_count = 1, - shift = util.by_pixel(27, 6), - draw_as_shadow = true, - scale = 0.52 + { + filename = BASEENTITY .. "chemical-plant/chemical-plant.png", + width = 220, + height = 292, + frame_count = 24, + line_length = 12, + shift = util.by_pixel(1.5, -9), + scale = 0.52, + tint = {0.8, 0.8, 1, 1} + }, + { + filename = BASEENTITY .. "chemical-plant/chemical-plant-shadow.png", + width = 312, + height = 222, + repeat_count = 24, + frame_count = 1, + shift = util.by_pixel(27, 6), + draw_as_shadow = true, + scale = 0.52 } - } - }}), - working_visualisations = data.raw["assembling-machine"]["nullius-chemical-plant-1"].working_visualisations, + }}), + working_visualisations = data.raw["assembling-machine"]["nullius-chemical-plant-1"].graphics_set.working_visualisations, + }, resistances = { { type = "impact", decrease = 100, percent = 90 } }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = data.raw["assembling-machine"]["chemical-plant"].working_sound, crafting_speed = 2, energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 4, + emissions_per_minute = {pollution = 4}, drain = "16kW" }, energy_usage = "384kW", @@ -2228,133 +2129,45 @@ data:extend({ { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {-1, -2} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, -1}, direction = defines.direction.north }} }, { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {1, -2} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1, -1}, direction = defines.direction.north }} }, { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 2, - base_level = -1.5, - height = 3, + volume = 500, pipe_connections = { - {type = "input-output", position = {-2, 0}}, - {type = "input-output", position = {2, 0}} + {flow_direction = "input-output", position = {-1, 0}, direction = defines.direction.west}, + {flow_direction = "input-output", position = {1, 0}, direction = defines.direction.east} } }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 4, - height = 2, - pipe_connections = {{ type="output", position = {-1, 2} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1, 1}, direction = defines.direction.south }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 4, - height = 2, - pipe_connections = {{ type="output", position = {1, 2} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1, 1}, direction = defines.direction.south }} } } } }) data:extend({ - { - type = "assembling-machine", - name = "nullius-mirror-chemical-plant-2", - localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-chemical-plant-2"}}, - order = "z-nullius-bcc", - icons = { - data.raw.item["nullius-chemical-plant-2"].icons[1], - { icon = ICONPATH .. "flip1.png", icon_size = 64 } - }, - localised_description = {"entity-description.nullius-chemical-plant"}, - flags = {"placeable-neutral","placeable-player", "player-creation"}, - minable = { mining_time = 1.6, result = "nullius-chemical-plant-2"}, - placeable_by = {item = "nullius-chemical-plant-2", count = 1}, - max_health = 400, - corpse = "chemical-plant-remnants", - dying_explosion = "medium-explosion", - collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, - selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, - drawing_box = {{-1.5, -1.9}, {1.5, 1.5}}, - module_specification = { module_slots = 2 }, - allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - fast_replaceable_group = "chemical-plant", - next_upgrade = "nullius-mirror-chemical-plant-3", - - animation = data.raw["assembling-machine"]["nullius-chemical-plant-2"].animation, - working_visualisations = data.raw["assembling-machine"]["nullius-chemical-plant-1"].working_visualisations, - resistances = data.raw["assembling-machine"]["nullius-chemical-plant-2"].resistances, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["nullius-chemical-plant-2"].working_sound, - crafting_speed = 2, - energy_source = data.raw["assembling-machine"]["nullius-chemical-plant-2"].energy_source, - energy_usage = "384kW", - crafting_categories = {"basic-chemistry"}, - - fluid_boxes = { - { - production_type = "input", - pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {1, -2} }} - }, - { - production_type = "input", - pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {-1, -2} }} - }, - { - production_type = "input", - pipe_covers = pipecoverspictures(), - base_area = 2, - base_level = -1.5, - height = 3, - pipe_connections = { - {type = "input-output", position = {-2, 0}}, - {type = "input-output", position = {2, 0}} - } - }, - { - production_type = "output", - pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 4, - height = 2, - pipe_connections = {{ type="output", position = {1, 2} }} - }, - { - production_type = "output", - pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 4, - height = 2, - pipe_connections = {{ type="output", position = {-1, 2} }} - } - } - }, - { type = "assembling-machine", name = "nullius-chemical-plant-3", - order = "z-nullius-bdb", + order = "z-nullius-bdb", icons = data.raw.item["nullius-chemical-plant-3"].icons, localised_description = {"entity-description.nullius-chemical-plant"}, flags = {"placeable-neutral","placeable-player", "player-creation"}, @@ -2364,61 +2177,48 @@ data:extend({ dying_explosion = "medium-explosion", collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, - drawing_box = {{-1.5, -1.9}, {1.5, 1.5}}, - module_specification = { module_slots = 3 }, + + module_slots = 3, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, fast_replaceable_group = "chemical-plant", - - animation = make_4way_animation_from_spritesheet({ layers = - { - { - filename = BASEENTITY .. "chemical-plant/chemical-plant.png", - width = 108, - height = 148, - frame_count = 24, - line_length = 12, - shift = util.by_pixel(1, -9), - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant.png", - width = 220, - height = 292, - frame_count = 24, - line_length = 12, - shift = util.by_pixel(1.5, -9), - scale = 0.52, - } - }, + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["chemical-plant"], + + graphics_set = { + animation = make_4way_animation_from_spritesheet({ layers = { - filename = BASEENTITY .. "chemical-plant/chemical-plant-shadow.png", - width = 154, - height = 112, - repeat_count = 24, - frame_count = 1, - shift = util.by_pixel(28, 6), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant-shadow.png", - width = 312, - height = 222, - repeat_count = 24, - frame_count = 1, - shift = util.by_pixel(27, 6), - draw_as_shadow = true, - scale = 0.52 + { + filename = BASEENTITY .. "chemical-plant/chemical-plant.png", + width = 220, + height = 292, + frame_count = 24, + line_length = 12, + shift = util.by_pixel(1.5, -9), + scale = 0.52, + }, + { + filename = BASEENTITY .. "chemical-plant/chemical-plant-shadow.png", + width = 312, + height = 222, + repeat_count = 24, + frame_count = 1, + shift = util.by_pixel(27, 6), + draw_as_shadow = true, + scale = 0.52 } - } - }}), - working_visualisations = data.raw["assembling-machine"]["nullius-chemical-plant-1"].working_visualisations, + }}), + working_visualisations = data.raw["assembling-machine"]["nullius-chemical-plant-1"].working_visualisations, + }, resistances = { { type = "impact", decrease = 100, percent = 90 } }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = data.raw["assembling-machine"]["chemical-plant"].working_sound, crafting_speed = 4, energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 8, + emissions_per_minute = {pollution = 8}, drain = "40kW" }, energy_usage = "760kW", @@ -2427,127 +2227,36 @@ data:extend({ { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {-1, -2} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, -1}, direction = defines.direction.north }} }, { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {1, -2} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1, -1}, direction = defines.direction.north }} }, { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 3, - base_level = -2, - height = 4, + volume = 500, pipe_connections = { - {type = "input-output", position = {-2, 0}}, - {type = "input-output", position = {2, 0}} + {flow_direction = "input-output", position = {-1, 0}, direction = defines.direction.west}, + {flow_direction = "input-output", position = {1, 0}, direction = defines.direction.east} } }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 5, - height = 3, - pipe_connections = {{ type="output", position = {-1, 2} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1, 1}, direction = defines.direction.south }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 5, - height = 3, - pipe_connections = {{ type="output", position = {1, 2} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1, 1}, direction = defines.direction.south }} } } } }) - -data:extend({ - { - type = "assembling-machine", - name = "nullius-mirror-chemical-plant-3", - localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-chemical-plant-3"}}, - order = "z-nullius-bdc", - icons = { - data.raw.item["nullius-chemical-plant-3"].icons[1], - { icon = ICONPATH .. "flip1.png", icon_size = 64 } - }, - localised_description = {"entity-description.nullius-chemical-plant"}, - flags = {"placeable-neutral","placeable-player", "player-creation"}, - minable = { mining_time = 2, result = "nullius-chemical-plant-3"}, - placeable_by = {item = "nullius-chemical-plant-3", count = 1}, - max_health = 500, - corpse = "chemical-plant-remnants", - dying_explosion = "medium-explosion", - collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, - selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, - drawing_box = {{-1.5, -1.9}, {1.5, 1.5}}, - module_specification = { module_slots = 3 }, - allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - fast_replaceable_group = "chemical-plant", - animation = data.raw["assembling-machine"]["nullius-chemical-plant-3"].animation, - working_visualisations = data.raw["assembling-machine"]["nullius-chemical-plant-1"].working_visualisations, - resistances = data.raw["assembling-machine"]["nullius-chemical-plant-3"].resistances, - energy_source = data.raw["assembling-machine"]["nullius-chemical-plant-3"].energy_source, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["chemical-plant"].working_sound, - crafting_speed = 4, - energy_usage = "760kW", - crafting_categories = {"basic-chemistry"}, - fluid_boxes = { - { - production_type = "input", - pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {1, -2} }} - }, - { - production_type = "input", - pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {-1, -2} }} - }, - { - production_type = "input", - pipe_covers = pipecoverspictures(), - base_area = 3, - base_level = -2, - height = 4, - pipe_connections = { - {type = "input-output", position = {-2, 0}}, - {type = "input-output", position = {2, 0}} - } - }, - { - production_type = "output", - pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 5, - height = 3, - pipe_connections = {{ type="output", position = {1, 2} }} - }, - { - production_type = "output", - pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 5, - height = 3, - pipe_connections = {{ type="output", position = {-1, 2} }} - } - } - } -}) \ No newline at end of file diff --git a/nullius/prototypes/entity/chest.lua b/nullius/prototypes/entity/chest.lua index 3fc533a..10d6e36 100644 --- a/nullius/prototypes/entity/chest.lua +++ b/nullius/prototypes/entity/chest.lua @@ -20,13 +20,13 @@ data:extend({ collision_box = {{-0.75, -0.75}, {0.75, 0.75}}, selection_box = {{-1, -1}, {1, 1}}, fast_replaceable_group = "container", - next_upgrade = "nullius-large-chest-2", + next_upgrade = "nullius-large-chest-2", inventory_size = 100, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 1 }, + impact_category = "metal", picture = { layers = { { - filename = BASEENTITY .. "steel-chest/hr-steel-chest.png", + filename = BASEENTITY .. "steel-chest/steel-chest.png", priority = "extra-high", width = 64, height = 80, @@ -34,7 +34,7 @@ data:extend({ scale = 0.9 }, { - filename = BASEENTITY .. "steel-chest/hr-steel-chest-shadow.png", + filename = BASEENTITY .. "steel-chest/steel-chest-shadow.png", priority = "extra-high", width = 110, height = 46, @@ -44,8 +44,7 @@ data:extend({ } } }, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance }, { @@ -66,9 +65,8 @@ data:extend({ selection_box = {{-1, -1}, {1, 1}}, fast_replaceable_group = "container", inventory_size = 150, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 1 }, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + impact_category = "metal", + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance, picture = { @@ -82,7 +80,7 @@ data:extend({ scale = 0.9 }, { - filename = BASEENTITY .. "infinity-chest/hr-infinity-chest-shadow.png", + filename = BASEENTITY .. "infinity-chest/infinity-chest-shadow.png", priority = "extra-high", width = 116, height = 48, @@ -107,22 +105,21 @@ data:extend({ dying_explosion = "storage-chest-explosion", collision_box = {{-0.35, -0.35}, {0.35, 0.35}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, - damaged_trigger_effect = data.raw["logistic-container"]["logistic-chest-storage"].damaged_trigger_effect, + damaged_trigger_effect = data.raw["logistic-container"]["storage-chest"].damaged_trigger_effect, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } }, fast_replaceable_group = "container", - next_upgrade = "logistic-chest-storage", + next_upgrade = "storage-chest", inventory_size = 20, logistic_mode = "storage", - open_sound = data.raw["logistic-container"]["logistic-chest-storage"].open_sound, - close_sound = data.raw["logistic-container"]["logistic-chest-storage"].close_sound, - animation_sound = data.raw["logistic-container"]["logistic-chest-storage"].animation_sound, - vehicle_impact_sound = data.raw["logistic-container"]["logistic-chest-storage"].vehicle_impact_sound, - opened_duration = data.raw["logistic-container"]["logistic-chest-storage"].opened_duration, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + open_sound = data.raw["logistic-container"]["storage-chest"].open_sound, + close_sound = data.raw["logistic-container"]["storage-chest"].close_sound, + animation_sound = data.raw["logistic-container"]["storage-chest"].animation_sound, + impact_category = data.raw["logistic-container"]["storage-chest"].impact_category, + opened_duration = data.raw["logistic-container"]["storage-chest"].opened_duration, + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance, animation = { @@ -136,7 +133,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-shadow.png", + filename = BASEENTITY .. "logistic-chest/logistic-chest-shadow.png", priority = "extra-high", width = 86, height = 44, @@ -195,13 +192,12 @@ data:extend({ next_upgrade = "nullius-large-storage-chest-2", inventory_size = 100, logistic_mode = "storage", - open_sound = data.raw["logistic-container"]["logistic-chest-storage"].open_sound, - close_sound = data.raw["logistic-container"]["logistic-chest-storage"].close_sound, - animation_sound = data.raw["logistic-container"]["logistic-chest-storage"].animation_sound, - vehicle_impact_sound = data.raw["logistic-container"]["logistic-chest-storage"].vehicle_impact_sound, - opened_duration = data.raw["logistic-container"]["logistic-chest-storage"].opened_duration, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + open_sound = data.raw["logistic-container"]["storage-chest"].open_sound, + close_sound = data.raw["logistic-container"]["storage-chest"].close_sound, + animation_sound = data.raw["logistic-container"]["storage-chest"].animation_sound, + impact_category = data.raw["logistic-container"]["storage-chest"].impact_category, + opened_duration = data.raw["logistic-container"]["storage-chest"].opened_duration, + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance, animation = { @@ -215,7 +211,7 @@ data:extend({ scale = 0.9 }, { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-shadow.png", + filename = BASEENTITY .. "logistic-chest/logistic-chest-shadow.png", priority = "extra-high", width = 86, height = 44, @@ -275,18 +271,17 @@ data:extend({ fast_replaceable_group = "container", inventory_size = 150, logistic_mode = "storage", - open_sound = data.raw["logistic-container"]["logistic-chest-storage"].open_sound, - close_sound = data.raw["logistic-container"]["logistic-chest-storage"].close_sound, - animation_sound = data.raw["logistic-container"]["logistic-chest-storage"].animation_sound, - vehicle_impact_sound = data.raw["logistic-container"]["logistic-chest-storage"].vehicle_impact_sound, - opened_duration = data.raw["logistic-container"]["logistic-chest-storage"].opened_duration, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + open_sound = data.raw["logistic-container"]["storage-chest"].open_sound, + close_sound = data.raw["logistic-container"]["storage-chest"].close_sound, + animation_sound = data.raw["logistic-container"]["storage-chest"].animation_sound, + impact_category = data.raw["logistic-container"]["storage-chest"].impact_category, + opened_duration = data.raw["logistic-container"]["storage-chest"].opened_duration, + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance, animation = { layers = { { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-storage.png", + filename = BASEENTITY .. "logistic-chest/storage-chest.png", priority = "extra-high", width = 66, height = 74, @@ -295,7 +290,7 @@ data:extend({ scale = 0.9 }, { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-shadow.png", + filename = BASEENTITY .. "logistic-chest/logistic-chest-shadow.png", priority = "extra-high", width = 96, height = 44, @@ -320,22 +315,21 @@ data:extend({ dying_explosion = "passive-provider-chest-explosion", collision_box = {{-0.35, -0.35}, {0.35, 0.35}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, - damaged_trigger_effect = data.raw["logistic-container"]["logistic-chest-storage"].damaged_trigger_effect, + damaged_trigger_effect = data.raw["logistic-container"]["storage-chest"].damaged_trigger_effect, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } }, fast_replaceable_group = "container", - next_upgrade = "logistic-chest-passive-provider", + next_upgrade = "passive-provider-chest", inventory_size = 20, logistic_mode = "passive-provider", - open_sound = data.raw["logistic-container"]["logistic-chest-storage"].open_sound, - close_sound = data.raw["logistic-container"]["logistic-chest-storage"].close_sound, - animation_sound = data.raw["logistic-container"]["logistic-chest-storage"].animation_sound, - vehicle_impact_sound = data.raw["logistic-container"]["logistic-chest-storage"].vehicle_impact_sound, - opened_duration = data.raw["logistic-container"]["logistic-chest-storage"].opened_duration, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + open_sound = data.raw["logistic-container"]["storage-chest"].open_sound, + close_sound = data.raw["logistic-container"]["storage-chest"].close_sound, + animation_sound = data.raw["logistic-container"]["storage-chest"].animation_sound, + impact_category = data.raw["logistic-container"]["storage-chest"].impact_category, + opened_duration = data.raw["logistic-container"]["storage-chest"].opened_duration, + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance, animation = { @@ -349,7 +343,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-shadow.png", + filename = BASEENTITY .. "logistic-chest/logistic-chest-shadow.png", priority = "extra-high", width = 86, height = 44, @@ -407,13 +401,12 @@ data:extend({ next_upgrade = "nullius-large-supply-chest-2", inventory_size = 100, logistic_mode = "passive-provider", - open_sound = data.raw["logistic-container"]["logistic-chest-storage"].open_sound, - close_sound = data.raw["logistic-container"]["logistic-chest-storage"].close_sound, - animation_sound = data.raw["logistic-container"]["logistic-chest-storage"].animation_sound, - vehicle_impact_sound = data.raw["logistic-container"]["logistic-chest-storage"].vehicle_impact_sound, - opened_duration = data.raw["logistic-container"]["logistic-chest-storage"].opened_duration, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + open_sound = data.raw["logistic-container"]["storage-chest"].open_sound, + close_sound = data.raw["logistic-container"]["storage-chest"].close_sound, + animation_sound = data.raw["logistic-container"]["storage-chest"].animation_sound, + impact_category = data.raw["logistic-container"]["storage-chest"].impact_category, + opened_duration = data.raw["logistic-container"]["storage-chest"].opened_duration, + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance, animation = { @@ -427,7 +420,7 @@ data:extend({ scale = 0.9 }, { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-shadow.png", + filename = BASEENTITY .. "logistic-chest/logistic-chest-shadow.png", priority = "extra-high", width = 86, height = 44, @@ -486,18 +479,17 @@ data:extend({ fast_replaceable_group = "container", inventory_size = 150, logistic_mode = "passive-provider", - open_sound = data.raw["logistic-container"]["logistic-chest-storage"].open_sound, - close_sound = data.raw["logistic-container"]["logistic-chest-storage"].close_sound, - animation_sound = data.raw["logistic-container"]["logistic-chest-storage"].animation_sound, - vehicle_impact_sound = data.raw["logistic-container"]["logistic-chest-storage"].vehicle_impact_sound, - opened_duration = data.raw["logistic-container"]["logistic-chest-storage"].opened_duration, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + open_sound = data.raw["logistic-container"]["storage-chest"].open_sound, + close_sound = data.raw["logistic-container"]["storage-chest"].close_sound, + animation_sound = data.raw["logistic-container"]["storage-chest"].animation_sound, + impact_category = data.raw["logistic-container"]["storage-chest"].impact_category, + opened_duration = data.raw["logistic-container"]["storage-chest"].opened_duration, + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance, animation = { layers = { { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-passive-provider.png", + filename = BASEENTITY .. "logistic-chest/passive-provider-chest.png", priority = "extra-high", width = 66, height = 74, @@ -506,7 +498,7 @@ data:extend({ scale = 0.9 }, { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-shadow.png", + filename = BASEENTITY .. "logistic-chest/logistic-chest-shadow.png", priority = "extra-high", width = 96, height = 44, @@ -524,7 +516,7 @@ data:extend({ name = "nullius-small-demand-chest-1", icons = data.raw.item["nullius-small-demand-chest-1"].icons, localised_description = {"entity-description.nullius-request-slots", - {"entity-description.nullius-demand-chest"}, 6}, + {"entity-description.nullius-demand-chest"}, tostring(6)}, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 0.8, result = "nullius-small-demand-chest-1"}, max_health = 300, @@ -533,22 +525,21 @@ data:extend({ dying_explosion = "requester-chest-explosion", collision_box = {{-0.35, -0.35}, {0.35, 0.35}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, - damaged_trigger_effect = data.raw["logistic-container"]["logistic-chest-storage"].damaged_trigger_effect, + damaged_trigger_effect = data.raw["logistic-container"]["storage-chest"].damaged_trigger_effect, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } }, fast_replaceable_group = "container", - next_upgrade = "logistic-chest-requester", + next_upgrade = "requester-chest", inventory_size = 20, logistic_mode = "requester", - open_sound = data.raw["logistic-container"]["logistic-chest-storage"].open_sound, - close_sound = data.raw["logistic-container"]["logistic-chest-storage"].close_sound, - animation_sound = data.raw["logistic-container"]["logistic-chest-storage"].animation_sound, - vehicle_impact_sound = data.raw["logistic-container"]["logistic-chest-storage"].vehicle_impact_sound, - opened_duration = data.raw["logistic-container"]["logistic-chest-storage"].opened_duration, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + open_sound = data.raw["logistic-container"]["storage-chest"].open_sound, + close_sound = data.raw["logistic-container"]["storage-chest"].close_sound, + animation_sound = data.raw["logistic-container"]["storage-chest"].animation_sound, + impact_category = data.raw["logistic-container"]["storage-chest"].impact_category, + opened_duration = data.raw["logistic-container"]["storage-chest"].opened_duration, + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance, animation = { @@ -562,7 +553,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-shadow.png", + filename = BASEENTITY .. "logistic-chest/logistic-chest-shadow.png", priority = "extra-high", width = 86, height = 44, @@ -605,7 +596,7 @@ data:extend({ name = "nullius-large-demand-chest-1", icons = data.raw.item["nullius-large-demand-chest-1"].icons, localised_description = {"entity-description.nullius-request-slots", - {"entity-description.nullius-demand-chest"}, 8}, + {"entity-description.nullius-demand-chest"}, tostring(8)}, flags = {"placeable-neutral", "player-creation"}, minable = { mining_time = 1.2, result = "nullius-large-demand-chest-1" }, max_health = 500, @@ -622,13 +613,12 @@ data:extend({ next_upgrade = "nullius-large-demand-chest-2", inventory_size = 100, logistic_mode = "requester", - open_sound = data.raw["logistic-container"]["logistic-chest-storage"].open_sound, - close_sound = data.raw["logistic-container"]["logistic-chest-storage"].close_sound, - animation_sound = data.raw["logistic-container"]["logistic-chest-storage"].animation_sound, - vehicle_impact_sound = data.raw["logistic-container"]["logistic-chest-storage"].vehicle_impact_sound, - opened_duration = data.raw["logistic-container"]["logistic-chest-storage"].opened_duration, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + open_sound = data.raw["logistic-container"]["storage-chest"].open_sound, + close_sound = data.raw["logistic-container"]["storage-chest"].close_sound, + animation_sound = data.raw["logistic-container"]["storage-chest"].animation_sound, + impact_category = data.raw["logistic-container"]["storage-chest"].impact_category, + opened_duration = data.raw["logistic-container"]["storage-chest"].opened_duration, + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance, animation = { @@ -642,7 +632,7 @@ data:extend({ scale = 0.9 }, { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-shadow.png", + filename = BASEENTITY .. "logistic-chest/logistic-chest-shadow.png", priority = "extra-high", width = 86, height = 44, @@ -687,7 +677,7 @@ data:extend({ name = "nullius-large-demand-chest-2", icons = data.raw.item["nullius-large-demand-chest-2"].icons, localised_description = {"entity-description.nullius-request-slots", - {"entity-description.nullius-demand-chest"}, 20}, + {"entity-description.nullius-demand-chest"}, tostring(20)}, flags = {"placeable-neutral", "player-creation"}, minable = { mining_time = 1.5, result = "nullius-large-demand-chest-2" }, max_health = 800, @@ -703,18 +693,17 @@ data:extend({ fast_replaceable_group = "container", inventory_size = 150, logistic_mode = "requester", - open_sound = data.raw["logistic-container"]["logistic-chest-storage"].open_sound, - close_sound = data.raw["logistic-container"]["logistic-chest-storage"].close_sound, - animation_sound = data.raw["logistic-container"]["logistic-chest-storage"].animation_sound, - vehicle_impact_sound = data.raw["logistic-container"]["logistic-chest-storage"].vehicle_impact_sound, - opened_duration = data.raw["logistic-container"]["logistic-chest-storage"].opened_duration, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + open_sound = data.raw["logistic-container"]["storage-chest"].open_sound, + close_sound = data.raw["logistic-container"]["storage-chest"].close_sound, + animation_sound = data.raw["logistic-container"]["storage-chest"].animation_sound, + impact_category = data.raw["logistic-container"]["storage-chest"].impact_category, + opened_duration = data.raw["logistic-container"]["storage-chest"].opened_duration, + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance, animation = { layers = { { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-requester.png", + filename = BASEENTITY .. "logistic-chest/requester-chest.png", priority = "extra-high", width = 66, height = 74, @@ -723,7 +712,7 @@ data:extend({ scale = 0.9 }, { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-shadow.png", + filename = BASEENTITY .. "logistic-chest/logistic-chest-shadow.png", priority = "extra-high", width = 96, height = 44, @@ -741,7 +730,7 @@ data:extend({ name = "nullius-small-buffer-chest-1", icons = data.raw.item["nullius-small-buffer-chest-1"].icons, localised_description = {"entity-description.nullius-request-slots", - {"entity-description.nullius-buffer-chest"}, 4}, + {"entity-description.nullius-buffer-chest"}, tostring(4)}, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 0.8, result = "nullius-small-buffer-chest-1"}, max_health = 300, @@ -750,22 +739,21 @@ data:extend({ dying_explosion = "buffer-chest-explosion", collision_box = {{-0.35, -0.35}, {0.35, 0.35}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, - damaged_trigger_effect = data.raw["logistic-container"]["logistic-chest-storage"].damaged_trigger_effect, + damaged_trigger_effect = data.raw["logistic-container"]["storage-chest"].damaged_trigger_effect, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } }, fast_replaceable_group = "container", - next_upgrade = "logistic-chest-buffer", + next_upgrade = "buffer-chest", inventory_size = 20, logistic_mode = "buffer", - open_sound = data.raw["logistic-container"]["logistic-chest-storage"].open_sound, - close_sound = data.raw["logistic-container"]["logistic-chest-storage"].close_sound, - animation_sound = data.raw["logistic-container"]["logistic-chest-storage"].animation_sound, - vehicle_impact_sound = data.raw["logistic-container"]["logistic-chest-storage"].vehicle_impact_sound, - opened_duration = data.raw["logistic-container"]["logistic-chest-storage"].opened_duration, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + open_sound = data.raw["logistic-container"]["storage-chest"].open_sound, + close_sound = data.raw["logistic-container"]["storage-chest"].close_sound, + animation_sound = data.raw["logistic-container"]["storage-chest"].animation_sound, + impact_category = data.raw["logistic-container"]["storage-chest"].impact_category, + opened_duration = data.raw["logistic-container"]["storage-chest"].opened_duration, + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance, animation = { @@ -779,7 +767,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-shadow.png", + filename = BASEENTITY .. "logistic-chest/logistic-chest-shadow.png", priority = "extra-high", width = 86, height = 44, @@ -822,7 +810,7 @@ data:extend({ name = "nullius-large-buffer-chest-1", icons = data.raw.item["nullius-large-buffer-chest-1"].icons, localised_description = {"entity-description.nullius-request-slots", - {"entity-description.nullius-buffer-chest"}, 5}, + {"entity-description.nullius-buffer-chest"}, tostring(5)}, flags = {"placeable-neutral", "player-creation"}, minable = { mining_time = 1.2, result = "nullius-large-buffer-chest-1" }, max_health = 500, @@ -839,13 +827,12 @@ data:extend({ next_upgrade = "nullius-large-buffer-chest-2", inventory_size = 100, logistic_mode = "buffer", - open_sound = data.raw["logistic-container"]["logistic-chest-storage"].open_sound, - close_sound = data.raw["logistic-container"]["logistic-chest-storage"].close_sound, - animation_sound = data.raw["logistic-container"]["logistic-chest-storage"].animation_sound, - vehicle_impact_sound = data.raw["logistic-container"]["logistic-chest-storage"].vehicle_impact_sound, - opened_duration = data.raw["logistic-container"]["logistic-chest-storage"].opened_duration, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + open_sound = data.raw["logistic-container"]["storage-chest"].open_sound, + close_sound = data.raw["logistic-container"]["storage-chest"].close_sound, + animation_sound = data.raw["logistic-container"]["storage-chest"].animation_sound, + impact_category = data.raw["logistic-container"]["storage-chest"].impact_category, + opened_duration = data.raw["logistic-container"]["storage-chest"].opened_duration, + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance, animation = { @@ -859,7 +846,7 @@ data:extend({ scale = 0.9 }, { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-shadow.png", + filename = BASEENTITY .. "logistic-chest/logistic-chest-shadow.png", priority = "extra-high", width = 86, height = 44, @@ -904,7 +891,7 @@ data:extend({ name = "nullius-large-buffer-chest-2", icons = data.raw.item["nullius-large-buffer-chest-2"].icons, localised_description = {"entity-description.nullius-request-slots", - {"entity-description.nullius-buffer-chest"}, 8}, + {"entity-description.nullius-buffer-chest"}, tostring(8)}, flags = {"placeable-neutral", "player-creation"}, minable = { mining_time = 1.5, result = "nullius-large-buffer-chest-2" }, max_health = 800, @@ -920,18 +907,17 @@ data:extend({ fast_replaceable_group = "container", inventory_size = 150, logistic_mode = "buffer", - open_sound = data.raw["logistic-container"]["logistic-chest-storage"].open_sound, - close_sound = data.raw["logistic-container"]["logistic-chest-storage"].close_sound, - animation_sound = data.raw["logistic-container"]["logistic-chest-storage"].animation_sound, - vehicle_impact_sound = data.raw["logistic-container"]["logistic-chest-storage"].vehicle_impact_sound, - opened_duration = data.raw["logistic-container"]["logistic-chest-storage"].opened_duration, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + open_sound = data.raw["logistic-container"]["storage-chest"].open_sound, + close_sound = data.raw["logistic-container"]["storage-chest"].close_sound, + animation_sound = data.raw["logistic-container"]["storage-chest"].animation_sound, + impact_category = data.raw["logistic-container"]["storage-chest"].impact_category, + opened_duration = data.raw["logistic-container"]["storage-chest"].opened_duration, + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance, animation = { layers = { { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-buffer.png", + filename = BASEENTITY .. "logistic-chest/buffer-chest.png", priority = "extra-high", width = 66, height = 74, @@ -940,7 +926,7 @@ data:extend({ scale = 0.9 }, { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-shadow.png", + filename = BASEENTITY .. "logistic-chest/logistic-chest-shadow.png", priority = "extra-high", width = 96, height = 44, @@ -965,22 +951,21 @@ data:extend({ dying_explosion = "active-provider-chest-explosion", collision_box = {{-0.35, -0.35}, {0.35, 0.35}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, - damaged_trigger_effect = data.raw["logistic-container"]["logistic-chest-storage"].damaged_trigger_effect, + damaged_trigger_effect = data.raw["logistic-container"]["storage-chest"].damaged_trigger_effect, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } }, fast_replaceable_group = "container", - next_upgrade = "logistic-chest-active-provider", + next_upgrade = "active-provider-chest", inventory_size = 20, logistic_mode = "active-provider", - open_sound = data.raw["logistic-container"]["logistic-chest-storage"].open_sound, - close_sound = data.raw["logistic-container"]["logistic-chest-storage"].close_sound, - animation_sound = data.raw["logistic-container"]["logistic-chest-storage"].animation_sound, - vehicle_impact_sound = data.raw["logistic-container"]["logistic-chest-storage"].vehicle_impact_sound, - opened_duration = data.raw["logistic-container"]["logistic-chest-storage"].opened_duration, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + open_sound = data.raw["logistic-container"]["storage-chest"].open_sound, + close_sound = data.raw["logistic-container"]["storage-chest"].close_sound, + animation_sound = data.raw["logistic-container"]["storage-chest"].animation_sound, + impact_category = data.raw["logistic-container"]["storage-chest"].impact_category, + opened_duration = data.raw["logistic-container"]["storage-chest"].opened_duration, + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance, animation = { @@ -994,7 +979,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-shadow.png", + filename = BASEENTITY .. "logistic-chest/logistic-chest-shadow.png", priority = "extra-high", width = 86, height = 44, @@ -1052,13 +1037,12 @@ data:extend({ next_upgrade = "nullius-large-dispatch-chest-2", inventory_size = 100, logistic_mode = "active-provider", - open_sound = data.raw["logistic-container"]["logistic-chest-storage"].open_sound, - close_sound = data.raw["logistic-container"]["logistic-chest-storage"].close_sound, - animation_sound = data.raw["logistic-container"]["logistic-chest-storage"].animation_sound, - vehicle_impact_sound = data.raw["logistic-container"]["logistic-chest-storage"].vehicle_impact_sound, - opened_duration = data.raw["logistic-container"]["logistic-chest-storage"].opened_duration, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + open_sound = data.raw["logistic-container"]["storage-chest"].open_sound, + close_sound = data.raw["logistic-container"]["storage-chest"].close_sound, + animation_sound = data.raw["logistic-container"]["storage-chest"].animation_sound, + impact_category = data.raw["logistic-container"]["storage-chest"].impact_category, + opened_duration = data.raw["logistic-container"]["storage-chest"].opened_duration, + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance, animation = { @@ -1072,7 +1056,7 @@ data:extend({ scale = 0.9 }, { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-shadow.png", + filename = BASEENTITY .. "logistic-chest/logistic-chest-shadow.png", priority = "extra-high", width = 86, height = 44, @@ -1131,18 +1115,17 @@ data:extend({ fast_replaceable_group = "container", inventory_size = 150, logistic_mode = "active-provider", - open_sound = data.raw["logistic-container"]["logistic-chest-storage"].open_sound, - close_sound = data.raw["logistic-container"]["logistic-chest-storage"].close_sound, - animation_sound = data.raw["logistic-container"]["logistic-chest-storage"].animation_sound, - vehicle_impact_sound = data.raw["logistic-container"]["logistic-chest-storage"].vehicle_impact_sound, - opened_duration = data.raw["logistic-container"]["logistic-chest-storage"].opened_duration, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + open_sound = data.raw["logistic-container"]["storage-chest"].open_sound, + close_sound = data.raw["logistic-container"]["storage-chest"].close_sound, + animation_sound = data.raw["logistic-container"]["storage-chest"].animation_sound, + impact_category = data.raw["logistic-container"]["storage-chest"].impact_category, + opened_duration = data.raw["logistic-container"]["storage-chest"].opened_duration, + circuit_connector = circuit_connector_definitions["chest"], circuit_wire_max_distance = default_circuit_wire_max_distance, animation = { layers = { { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-active-provider.png", + filename = BASEENTITY .. "logistic-chest/active-provider-chest.png", priority = "extra-high", width = 66, height = 74, @@ -1151,7 +1134,7 @@ data:extend({ scale = 0.9 }, { - filename = BASEENTITY .. "logistic-chest/hr-logistic-chest-shadow.png", + filename = BASEENTITY .. "logistic-chest/logistic-chest-shadow.png", priority = "extra-high", width = 96, height = 44, diff --git a/nullius/prototypes/entity/drone.lua b/nullius/prototypes/entity/drone.lua index e0fc795..e76d4fe 100644 --- a/nullius/prototypes/entity/drone.lua +++ b/nullius/prototypes/entity/drone.lua @@ -9,18 +9,21 @@ data:extend({ name = "nullius-drone-launcher-1", icons = data.raw.item["nullius-drone-launcher-1"].icons, flags = {"placeable-neutral", "placeable-player", "player-creation"}, + collision_mask = collision_mask_util.get_default_mask("rocket-silo"), inventory_size = 3, ammo_stack_limit = 10, automated_ammo_count = 10, alert_when_attacking = false, minable = {mining_time = 1.5, result = "nullius-drone-launcher-1"}, - fast_replaceable_group = "drone-launcher", + fast_replaceable_group = "drone-launcher", next_upgrade = "nullius-drone-launcher-2", open_sound = data.raw["artillery-turret"]["artillery-turret"].open_sound, close_sound = data.raw["artillery-turret"]["artillery-turret"].close_sound, mined_sound = {filename = "__core__/sound/deconstruct-large.ogg",volume = 0.8}, - rotating_sound = { sound = { filename = "__base__/sound/fight/artillery-rotation-loop.ogg", volume = 0.6 }}, - rotating_stopped_sound = { filename = "__base__/sound/fight/artillery-rotation-stop.ogg" }, + rotating_sound = { + sound = { filename = "__base__/sound/fight/artillery-rotation-loop.ogg", volume = 0.6 }, + stopped_sound = { filename = "__base__/sound/fight/artillery-rotation-stop.ogg" }, + }, max_health = 1000, corpse = "artillery-turret-remnants", dying_explosion = "artillery-turret-explosion", @@ -42,59 +45,40 @@ data:extend({ cannon_barrel_recoil_shiftings = data.raw["artillery-turret"]["artillery-turret"].cannon_barrel_recoil_shiftings, cannon_barrel_light_direction = {0.5976251, 0.0242053, -0.8014102}, cannon_barrel_recoil_shiftings_load_correction_matrix = data.raw["artillery-turret"]["artillery-turret"].cannon_barrel_recoil_shiftings_load_correction_matrix, - vehicle_impact_sound = data.raw["artillery-turret"]["artillery-turret"].vehicle_impact_sound, + impact_category = data.raw["artillery-turret"]["artillery-turret"].impact_category, water_reflection = data.raw["artillery-turret"]["artillery-turret"].water_reflection, - base_shift = util.by_pixel(0, -22), + --base_shift = util.by_pixel(0, -22), base_picture_render_layer = "lower-object-above-shadow", cannon_barrel_pictures = data.raw["artillery-turret"]["artillery-turret"].cannon_barrel_pictures, cannon_base_pictures = data.raw["artillery-turret"]["artillery-turret"].cannon_base_pictures, + cannon_base_shift = data.raw["artillery-turret"]["artillery-turret"].cannon_base_shift, + + circuit_connector = circuit_connector_definitions["artillery-turret"], + circuit_wire_max_distance = default_circuit_wire_max_distance, base_picture = { layers = { { - filename = BASEENTITY .. "artillery-turret/artillery-turret-base.png", - priority = "high", - width = 104, - height = 100, - direction_count = 1, - frame_count = 1, - shift = util.by_pixel(-0, 22), - tint = {0.7, 0.7, 0.9}, - hr_version = { - filename = BASEENTITY .. "artillery-turret/hr-artillery-turret-base.png", + filename = BASEENTITY .. "artillery-turret/artillery-turret-base.png", priority = "high", line_length = 1, width = 207, height = 199, frame_count = 1, - direction_count = 1, shift = util.by_pixel(-0, 22), scale = 0.5, tint = {0.7, 0.7, 0.9} - } }, { - filename = BASEENTITY .. "artillery-turret/artillery-turret-base-shadow.png", - priority = "high", - line_length = 1, - width = 138, - height = 75, - frame_count = 1, - direction_count = 1, - shift = util.by_pixel(18, 38), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "artillery-turret/hr-artillery-turret-base-shadow.png", + filename = BASEENTITY .. "artillery-turret/artillery-turret-base-shadow.png", priority = "high", line_length = 1, width = 277, height = 149, frame_count = 1, - direction_count = 1, shift = util.by_pixel(18, 38), draw_as_shadow = true, scale = 0.5 - } } } } @@ -105,17 +89,20 @@ data:extend({ name = "nullius-drone-launcher-2", icons = data.raw.item["nullius-drone-launcher-2"].icons, flags = {"placeable-neutral", "placeable-player", "player-creation"}, + collision_mask = collision_mask_util.get_default_mask("rocket-silo"), inventory_size = 5, ammo_stack_limit = 10, automated_ammo_count = 10, alert_when_attacking = false, minable = {mining_time = 2, result = "nullius-drone-launcher-2"}, - fast_replaceable_group = "drone-launcher", + fast_replaceable_group = "drone-launcher", open_sound = data.raw["artillery-turret"]["artillery-turret"].open_sound, close_sound = data.raw["artillery-turret"]["artillery-turret"].close_sound, mined_sound = {filename = "__core__/sound/deconstruct-large.ogg",volume = 0.8}, - rotating_sound = { sound = { filename = "__base__/sound/fight/artillery-rotation-loop.ogg", volume = 0.6 }}, - rotating_stopped_sound = { filename = "__base__/sound/fight/artillery-rotation-stop.ogg" }, + rotating_sound = { + sound = { filename = "__base__/sound/fight/artillery-rotation-loop.ogg", volume = 0.6 }, + stopped_sound = { filename = "__base__/sound/fight/artillery-rotation-stop.ogg" }, + }, max_health = 1200, corpse = "artillery-turret-remnants", dying_explosion = "artillery-turret-explosion", @@ -137,57 +124,39 @@ data:extend({ cannon_barrel_recoil_shiftings = data.raw["artillery-turret"]["artillery-turret"].cannon_barrel_recoil_shiftings, cannon_barrel_light_direction = {0.5976251, 0.0242053, -0.8014102}, cannon_barrel_recoil_shiftings_load_correction_matrix = data.raw["artillery-turret"]["artillery-turret"].cannon_barrel_recoil_shiftings_load_correction_matrix, - vehicle_impact_sound = data.raw["artillery-turret"]["artillery-turret"].vehicle_impact_sound, + impact_category = data.raw["artillery-turret"]["artillery-turret"].impact_category, water_reflection = data.raw["artillery-turret"]["artillery-turret"].water_reflection, - base_shift = util.by_pixel(0, -22), + --base_shift = util.by_pixel(0, -22), base_picture_render_layer = "lower-object-above-shadow", cannon_barrel_pictures = data.raw["artillery-turret"]["artillery-turret"].cannon_barrel_pictures, cannon_base_pictures = data.raw["artillery-turret"]["artillery-turret"].cannon_base_pictures, - + cannon_base_shift = data.raw["artillery-turret"]["artillery-turret"].cannon_base_shift, + + circuit_connector = circuit_connector_definitions["artillery-turret"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + base_picture = { layers = { { - filename = BASEENTITY .. "artillery-turret/artillery-turret-base.png", - priority = "high", - width = 104, - height = 100, - direction_count = 1, - frame_count = 1, - shift = util.by_pixel(-0, 22), - hr_version = { - filename = BASEENTITY .. "artillery-turret/hr-artillery-turret-base.png", + filename = BASEENTITY .. "artillery-turret/artillery-turret-base.png", priority = "high", line_length = 1, width = 207, height = 199, frame_count = 1, - direction_count = 1, shift = util.by_pixel(-0, 22), scale = 0.5 - } }, { - filename = BASEENTITY .. "artillery-turret/artillery-turret-base-shadow.png", - priority = "high", - line_length = 1, - width = 138, - height = 75, - frame_count = 1, - direction_count = 1, - shift = util.by_pixel(18, 38), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "artillery-turret/hr-artillery-turret-base-shadow.png", + filename = BASEENTITY .. "artillery-turret/artillery-turret-base-shadow.png", priority = "high", line_length = 1, width = 277, height = 149, frame_count = 1, - direction_count = 1, shift = util.by_pixel(18, 38), draw_as_shadow = true, scale = 0.5 - } } } } @@ -197,19 +166,20 @@ data:extend({ type = "artillery-projectile", name = "nullius-scout-drone-projectile-1", flags = {"not-on-map"}, + hidden_in_factoriopedia = true, reveal_map = true, map_color = {r=1, g=1, b=0}, chart_picture = data.raw["artillery-projectile"]["artillery-projectile"].chart_picture, height_from_ground = 280 / 64, picture = { - filename = BASEENTITY .. "distractor-robot/hr-distractor-robot.png", + filename = BASEENTITY .. "distractor-robot/distractor-robot.png", width = 72, height = 62, scale = 0.5 }, shadow = { - filename = BASEENTITY .. "distractor-robot/hr-distractor-robot-shadow.png", + filename = BASEENTITY .. "distractor-robot/distractor-robot-shadow.png", width = 96, height = 59, scale = 0.5 @@ -234,6 +204,7 @@ data:extend({ type = "artillery-projectile", name = "nullius-scout-drone-projectile-2", flags = {"not-on-map"}, + hidden_in_factoriopedia = true, reveal_map = true, map_color = {r=1, g=1, b=0}, chart_picture = data.raw["artillery-projectile"]["artillery-projectile"].chart_picture, @@ -259,6 +230,7 @@ data:extend({ type = "artillery-projectile", name = "nullius-demolition-drone-projectile", flags = {"not-on-map"}, + hidden_in_factoriopedia = true, reveal_map = true, map_color = {r=1, g=1, b=0}, chart_picture = data.raw["artillery-projectile"]["artillery-projectile"].chart_picture, @@ -329,6 +301,7 @@ data:extend({ type = "artillery-projectile", name = "nullius-excavation-drone-projectile", flags = {"not-on-map"}, + hidden_in_factoriopedia = true, reveal_map = true, map_color = {r=1, g=1, b=0}, chart_picture = data.raw["artillery-projectile"]["artillery-projectile"].chart_picture, @@ -382,6 +355,7 @@ local function create_flare(base_name, suffix) type = "artillery-flare", name = prefix.."-flare"..suffix, icons = data.raw.capsule[prefix.."-remote"..suffix].icons, + hidden_in_factoriopedia = true, shot_category = prefix.."-drone"..suffix, flags = {"placeable-off-grid", "not-on-map"}, map_color = {r=1, g=0.5, b=0}, @@ -401,7 +375,7 @@ local function create_projectile(base_name, suffix, drone_picture, drone_shadow) local prefix = "nullius-"..base_name if (drone_picture == nil) then drone_picture = { - filename = BASEENTITY .. "destroyer-robot/hr-destroyer-robot.png", + filename = BASEENTITY .. "destroyer-robot/destroyer-robot.png", width = 88, height = 77, x = 264, @@ -410,7 +384,7 @@ local function create_projectile(base_name, suffix, drone_picture, drone_shadow) end if (drone_shadow == nil) then drone_shadow = { - filename = BASEENTITY .. "destroyer-robot/hr-destroyer-robot-shadow.png", + filename = BASEENTITY .. "destroyer-robot/destroyer-robot-shadow.png", width = 108, height = 66, x = 324, @@ -423,12 +397,13 @@ local function create_projectile(base_name, suffix, drone_picture, drone_shadow) type = "artillery-projectile", name = prefix.."-drone-projectile-"..suffix, flags = {"not-on-map"}, + hidden_in_factoriopedia = true, reveal_map = true, map_color = {r=1, g=1, b=0}, chart_picture = data.raw["artillery-projectile"]["artillery-projectile"].chart_picture, height_from_ground = 280 / 64, - drone_picture, - drone_shadow, + picture = drone_picture, + shadow = drone_shadow, action = { type = "direct", @@ -485,14 +460,14 @@ end local function create_terraform(base_name, suffix) local picture = { - filename = BASEENTITY .. "destroyer-robot/hr-destroyer-robot.png", + filename = BASEENTITY .. "destroyer-robot/destroyer-robot.png", width = 88, height = 77, x = 264, scale = 0.5 } local shadow = { - filename = BASEENTITY .. "destroyer-robot/hr-destroyer-robot-shadow.png", + filename = BASEENTITY .. "destroyer-robot/destroyer-robot-shadow.png", width = 108, height = 66, x = 324, @@ -518,19 +493,20 @@ local function create_farmer(base_name) type = "artillery-projectile", name = prefix.."-drone-projectile", flags = {"not-on-map"}, + hidden_in_factoriopedia = true, reveal_map = true, map_color = {r=1, g=1, b=0}, chart_picture = data.raw["artillery-projectile"]["artillery-projectile"].chart_picture, height_from_ground = 280 / 64, picture = { - filename = BASEENTITY .. "defender-robot/hr-defender-robot.png", + filename = BASEENTITY .. "defender-robot/defender-robot.png", width = 56, height = 59, x = 392, scale = 0.6 }, shadow = { - filename = BASEENTITY .. "defender-robot/hr-defender-robot-shadow.png", + filename = BASEENTITY .. "defender-robot/defender-robot-shadow.png", width = 88, height = 50, x = 616, diff --git a/nullius/prototypes/entity/energy.lua b/nullius/prototypes/entity/energy.lua index 5636cc3..b9d0132 100644 --- a/nullius/prototypes/entity/energy.lua +++ b/nullius/prototypes/entity/energy.lua @@ -8,23 +8,23 @@ function accumulator_picture(tint, repeat_count) { layers = { { - filename = BASEENTITY .. "accumulator/hr-accumulator.png", + filename = BASEENTITY .. "accumulator/accumulator.png", priority = "high", width = 130, height = 189, repeat_count = repeat_count, - shift = util.by_pixel(0, -16.5), + shift = util.by_pixel(0, -11), tint = tint, - animation_speed = 0.5, + --animation_speed = 0.5, scale = 0.75 }, { - filename = BASEENTITY .. "accumulator/hr-accumulator-shadow.png", + filename = BASEENTITY .. "accumulator/accumulator-shadow.png", priority = "high", width = 234, height = 106, repeat_count = repeat_count, - shift = util.by_pixel(43.5, 9), + shift = util.by_pixel(29, 6), draw_as_shadow = true, scale = 0.75 } @@ -55,7 +55,7 @@ data:extend({ picture = { layers = { { - filename = BASEENTITY .. "solar-panel/hr-solar-panel.png", + filename = BASEENTITY .. "solar-panel/solar-panel.png", priority = "high", width = 230, height = 224, @@ -64,7 +64,7 @@ data:extend({ scale = 0.64 }, { - filename = BASEENTITY .. "solar-panel/hr-solar-panel-shadow.png", + filename = BASEENTITY .. "solar-panel/solar-panel-shadow.png", priority = "high", width = 220, height = 180, @@ -77,7 +77,7 @@ data:extend({ overlay = { layers = { { - filename = BASEENTITY .. "solar-panel/hr-solar-panel-shadow-overlay.png", + filename = BASEENTITY .. "solar-panel/solar-panel-shadow-overlay.png", priority = "high", width = 214, height = 180, @@ -86,10 +86,35 @@ data:extend({ } } }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.6 } + impact_category = "metal", } }) +circuit_connector_definitions["nullius-combustion-chamber"] = circuit_connector_definitions.create_vector +( + universal_connector_template, + { + { variation = 30, main_offset = util.by_pixel(-20, 20), shadow_offset = util.by_pixel(10-20, 20), show_shadow = true }, + { variation = 15, main_offset = util.by_pixel(10, 5), shadow_offset = util.by_pixel(0, 18.5), show_shadow = true }, + { variation = 30, main_offset = util.by_pixel(-20, 20), shadow_offset = util.by_pixel(-25, 20), show_shadow = true }, + { variation = 15, main_offset = util.by_pixel(10, 5), shadow_offset = util.by_pixel(10, 18.5), show_shadow = true }, + } +) + +circuit_connector_definitions["nullius-compressor"] = circuit_connector_definitions.create_vector +( + universal_connector_template, + { + { variation = 24, main_offset = util.by_pixel(-15, -35), shadow_offset = util.by_pixel(-15, -35), show_shadow = true }, + { variation = 24, main_offset = util.by_pixel(-15, -35), shadow_offset = util.by_pixel(-15, -35), show_shadow = true }, + { variation = 24, main_offset = util.by_pixel(-15, -35), shadow_offset = util.by_pixel(-15, -35), show_shadow = true }, + { variation = 24, main_offset = util.by_pixel(-15, -35), shadow_offset = util.by_pixel(-15, -35), show_shadow = true }, + } +) + +circuit_connector_definitions["nullius-geothermal-reactor"] = circuit_connector_definitions.create_single(universal_connector_template, + { variation = 4, main_offset = util.by_pixel(-4.75, 33), shadow_offset = util.by_pixel(-4.75, 33), show_shadow = true }) + data:extend({ { type = "solar-panel", @@ -108,11 +133,11 @@ data:extend({ fast_replaceable_group = "solar-panel", next_upgrade = "nullius-solar-panel-3", overlay = data.raw["solar-panel"]["nullius-solar-panel-1"].overlay, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.6 }, + impact_category = "metal", picture = { layers = { { - filename = BASEENTITY .. "solar-panel/hr-solar-panel.png", + filename = BASEENTITY .. "solar-panel/solar-panel.png", priority = "high", width = 230, height = 224, @@ -142,11 +167,11 @@ data:extend({ fast_replaceable_group = "solar-panel", next_upgrade = "nullius-solar-panel-4", overlay = data.raw["solar-panel"]["nullius-solar-panel-1"].overlay, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.6 }, + impact_category = "metal", picture = { layers = { { - filename = BASEENTITY .. "solar-panel/hr-solar-panel.png", + filename = BASEENTITY .. "solar-panel/solar-panel.png", priority = "high", width = 230, height = 224, @@ -174,11 +199,11 @@ data:extend({ resistances = data.raw["solar-panel"]["nullius-solar-panel-1"].resistances, fast_replaceable_group = "solar-panel", overlay = data.raw["solar-panel"]["nullius-solar-panel-1"].overlay, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.6 }, + impact_category = "metal", picture = { layers = { { - filename = BASEENTITY .. "solar-panel/hr-solar-panel.png", + filename = BASEENTITY .. "solar-panel/solar-panel.png", priority = "high", width = 230, height = 224, @@ -203,7 +228,7 @@ data:extend({ next_upgrade = "nullius-grid-battery-2", collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, - drawing_box = {{-1.5, -2.25}, {1.5, 1.5}}, + energy_source = { type = "electric", buffer_capacity = "15MJ", @@ -212,47 +237,49 @@ data:extend({ output_flow_limit = "500kW" }, resistances = { { type = "impact", decrease = 100, percent = 90 } }, - picture = accumulator_picture({ r=0.9, g=0.85, b=0.7, a=1 }), - charge_animation = { - layers = { - accumulator_picture({ r=0.9, g=0.85, b=0.7, a=1 } , 24), - { - filename = BASEENTITY .. "accumulator/hr-accumulator-charge.png", - priority = "high", - width = 178, - height = 206, - line_length = 6, - frame_count = 24, - blend_mode = "additive", - shift = util.by_pixel(0, -33), - scale = 0.75 + + chargable_graphics = { + picture = accumulator_picture({ r=0.9, g=0.85, b=0.7, a=1 }), + charge_animation = { + layers = { + accumulator_picture({ r=0.9, g=0.85, b=0.7, a=1 } , 24), + { + filename = BASEENTITY .. "accumulator/accumulator-charge.png", + priority = "high", + width = 178, + height = 210, + line_length = 6, + frame_count = 24, + draw_as_glow = true, + shift = util.by_pixel(1, -20), + scale = 0.75 + } } - } - }, - charge_cooldown = 30, - charge_light = {intensity = 0.3, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}}, - discharge_animation = { - layers = { - accumulator_picture({ r=0.9, g=0.85, b=0.7, a=1 } , 24), - { - filename = BASEENTITY .. "accumulator/hr-accumulator-discharge.png", - priority = "high", - width = 170, - height = 210, - line_length = 6, - frame_count = 24, - blend_mode = "additive", - shift = util.by_pixel(-1.5, -34.5), - scale = 0.75 + }, + charge_cooldown = 30, + charge_light = {intensity = 0.3, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}}, + discharge_animation = { + layers = { + accumulator_picture({ r=0.9, g=0.85, b=0.7, a=1 } , 24), + { + filename = BASEENTITY .. "accumulator/accumulator-discharge.png", + priority = "high", + width = 174, + height = 214, + line_length = 6, + frame_count = 24, + draw_as_glow = true, + shift = util.by_pixel(-1, -21), + scale = 0.75 + } } - } + }, + discharge_cooldown = 60, + discharge_light = {intensity = 0.7, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}} }, - discharge_cooldown = 60, - discharge_light = {intensity = 0.7, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}}, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = data.raw.accumulator["accumulator"].working_sound, - circuit_wire_connection_point = circuit_connector_definitions["accumulator"].points, - circuit_connector_sprites = circuit_connector_definitions["accumulator"].sprites, + circuit_connector = circuit_connector_definitions["accumulator"], circuit_wire_max_distance = default_circuit_wire_max_distance, default_output_signal = {type = "virtual", name = "signal-A"} }, @@ -269,7 +296,7 @@ data:extend({ next_upgrade = "nullius-grid-battery-3", collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, - drawing_box = {{-1.5, -2.25}, {1.5, 1.5}}, + energy_source = { type = "electric", buffer_capacity = "40MJ", @@ -278,47 +305,50 @@ data:extend({ output_flow_limit = "800kW" }, resistances = { { type = "impact", decrease = 100, percent = 90 } }, - picture = accumulator_picture({ r=1, g=1, b=1, a=1 }), - charge_animation = { - layers = { - accumulator_picture({ r=1, g=1, b=1, a=1 } , 24), - { - filename = BASEENTITY .. "accumulator/hr-accumulator-charge.png", - priority = "high", - width = 178, - height = 206, - line_length = 6, - frame_count = 24, - blend_mode = "additive", - shift = util.by_pixel(0, -33), - scale = 0.75 + + chargable_graphics = { + picture = accumulator_picture({ r=1, g=1, b=1, a=1 }), + charge_animation = { + layers = { + accumulator_picture({ r=1, g=1, b=1, a=1 } , 24), + { + filename = BASEENTITY .. "accumulator/accumulator-charge.png", + priority = "high", + width = 178, + height = 210, + line_length = 6, + frame_count = 24, + draw_as_glow = true, + shift = util.by_pixel(1, -20), + scale = 0.75 + } } - } - }, - charge_cooldown = 30, - charge_light = {intensity = 0.3, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}}, - discharge_animation = { - layers = { - accumulator_picture({ r=1, g=1, b=1, a=1 } , 24), - { - filename = BASEENTITY .. "accumulator/hr-accumulator-discharge.png", - priority = "high", - width = 170, - height = 210, - line_length = 6, - frame_count = 24, - blend_mode = "additive", - shift = util.by_pixel(-1.5, -34.5), - scale = 0.75 + }, + charge_cooldown = 30, + charge_light = {intensity = 0.3, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}}, + discharge_animation = { + layers = { + accumulator_picture({ r=1, g=1, b=1, a=1 } , 24), + { + filename = BASEENTITY .. "accumulator/accumulator-discharge.png", + priority = "high", + width = 174, + height = 214, + line_length = 6, + frame_count = 24, + draw_as_glow = true, + shift = util.by_pixel(-1, -21), + scale = 0.75 + } } - } + }, + discharge_cooldown = 60, + discharge_light = {intensity = 0.7, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}}, }, - discharge_cooldown = 60, - discharge_light = {intensity = 0.7, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}}, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + + impact_category = "metal", working_sound = data.raw.accumulator["accumulator"].working_sound, - circuit_wire_connection_point = circuit_connector_definitions["accumulator"].points, - circuit_connector_sprites = circuit_connector_definitions["accumulator"].sprites, + circuit_connector = circuit_connector_definitions["accumulator"], circuit_wire_max_distance = default_circuit_wire_max_distance, default_output_signal = {type = "virtual", name = "signal-A"} }, @@ -334,7 +364,7 @@ data:extend({ fast_replaceable_group = "grid-battery", collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, - drawing_box = {{-1.5, -2.25}, {1.5, 1.5}}, + energy_source = { type = "electric", buffer_capacity = "100MJ", @@ -343,47 +373,50 @@ data:extend({ output_flow_limit = "1.5MW" }, resistances = { { type = "impact", decrease = 100, percent = 90 } }, - picture = accumulator_picture({ r=1, g=0.85, b=1, a=1 }), - charge_animation = { - layers = { - accumulator_picture({ r=1, g=0.85, b=1, a=1 } , 24), - { - filename = BASEENTITY .. "accumulator/hr-accumulator-charge.png", - priority = "high", - width = 178, - height = 206, - line_length = 6, - frame_count = 24, - blend_mode = "additive", - shift = util.by_pixel(0, -33), - scale = 0.75 + + chargable_graphics = { + picture = accumulator_picture({ r=1, g=0.85, b=1, a=1 }), + charge_animation = { + layers = { + accumulator_picture({ r=1, g=0.85, b=1, a=1 } , 24), + { + filename = BASEENTITY .. "accumulator/accumulator-charge.png", + priority = "high", + width = 178, + height = 210, + line_length = 6, + frame_count = 24, + draw_as_glow = true, + shift = util.by_pixel(1, -20), + scale = 0.75 + } } - } - }, - charge_cooldown = 30, - charge_light = {intensity = 0.3, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}}, - discharge_animation = { - layers = { - accumulator_picture({ r=1, g=0.85, b=1, a=1 } , 24), - { - filename = BASEENTITY .. "accumulator/hr-accumulator-discharge.png", - priority = "high", - width = 170, - height = 210, - line_length = 6, - frame_count = 24, - blend_mode = "additive", - shift = util.by_pixel(-1.5, -34.5), - scale = 0.75 + }, + charge_cooldown = 30, + charge_light = {intensity = 0.3, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}}, + discharge_animation = { + layers = { + accumulator_picture({ r=1, g=0.85, b=1, a=1 } , 24), + { + filename = BASEENTITY .. "accumulator/accumulator-discharge.png", + priority = "high", + width = 174, + height = 214, + line_length = 6, + frame_count = 24, + draw_as_glow = true, + shift = util.by_pixel(-1, -21), + scale = 0.75 + } } - } + }, + discharge_cooldown = 60, + discharge_light = {intensity = 0.7, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}}, }, - discharge_cooldown = 60, - discharge_light = {intensity = 0.7, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}}, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + + impact_category = "metal", working_sound = data.raw.accumulator["accumulator"].working_sound, - circuit_wire_connection_point = circuit_connector_definitions["accumulator"].points, - circuit_connector_sprites = circuit_connector_definitions["accumulator"].sprites, + circuit_connector = circuit_connector_definitions["accumulator"], circuit_wire_max_distance = default_circuit_wire_max_distance, default_output_signal = {type = "virtual", name = "signal-A"} }, @@ -399,7 +432,7 @@ data:extend({ crafting_speed = 1, max_health = 200, corpse = "boiler-remnants", - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", decrease = 100, percent = 90 }, @@ -409,37 +442,33 @@ data:extend({ next_upgrade = "nullius-combustion-chamber-2", collision_box = {{-1.29, -0.79}, {1.29, 0.79}}, selection_box = {{-1.5, -1}, {1.5, 1}}, + + circuit_connector = circuit_connector_definitions["nullius-combustion-chamber"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + fluid_boxes = { { - base_area = 2, - height = 2, - base_level = -1, + volume = 500, pipe_covers = pipecoverspictures(), - pipe_connections = {{type = "input", position = {-2, 0.5}}}, + pipe_connections = {{flow_direction = "input", position = {-1, 0.5}, direction = defines.direction.west }}, production_type = "input" }, { - base_area = 2, - height = 2, - base_level = -1, + volume = 500, pipe_covers = pipecoverspictures(), - pipe_connections = {{type = "input", position = {2, 0.5}}}, + pipe_connections = {{flow_direction = "input", position = {1, 0.5}, direction = defines.direction.east }}, production_type = "input" }, { - base_area = 4, - height = 2, - base_level = 5, + volume = 500, pipe_covers = pipecoverspictures(), - pipe_connections = {{type = "output", position = {0, -1.5}}}, + pipe_connections = {{flow_direction = "output", position = {0, -0.5}, direction = defines.direction.north }}, production_type = "output" }, { - base_area = 4, - height = 2, - base_level = 5, + volume = 500, pipe_covers = pipecoverspictures(), - pipe_connections = {{type = "output", position = {0, 1.5}}}, + pipe_connections = {{flow_direction = "output", position = {0, 0.5}, direction = defines.direction.south }}, production_type = "output" } }, @@ -447,274 +476,204 @@ data:extend({ energy_source = { type = "void" }, working_sound = { sound = { filename = "__base__/sound/boiler.ogg", volume = 0.8 }, - max_sounds_per_type = 3 + max_sounds_per_prototype = 3 }, - - animation = { - north = { - frame_count = 1, - layers = { - { - filename = BASEENTITY .. "boiler/boiler-N-idle.png", - priority = "extra-high", - width = 131, - height = 108, - shift = util.by_pixel(-0.5, 4), - tint = {0.77, 0.77, 0.66, 1}, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-N-idle.png", - priority = "extra-high", - width = 269, - height = 221, - shift = util.by_pixel(-1.25, 5.25), - tint = {0.77, 0.77, 0.66, 1}, - scale = 0.5 + + graphics_set = { + animation = { + north = { + layers = { + { + filename = BASEENTITY .. "boiler/boiler-N-idle.png", + priority = "extra-high", + width = 269, + height = 221, + shift = util.by_pixel(-1.25, 5.25), + tint = {0.77, 0.77, 0.66, 1}, + frame_count = 1, + scale = 0.5 + }, + { + filename = BASEENTITY .. "boiler/boiler-N-shadow.png", + priority = "extra-high", + width = 274, + height = 164, + scale = 0.5, + shift = util.by_pixel(20.5, 9), + frame_count = 1, + draw_as_shadow = true } - }, - { - filename = BASEENTITY .. "boiler/boiler-N-shadow.png", - priority = "extra-high", - width = 137, - height = 82, - shift = util.by_pixel(20.5, 9), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-N-shadow.png", - priority = "extra-high", - width = 274, - height = 164, - scale = 0.5, - shift = util.by_pixel(20.5, 9), - draw_as_shadow = true + } + }, + east = { + layers = { + { + filename = BASEENTITY .. "boiler/boiler-E-idle.png", + priority = "extra-high", + width = 216, + height = 301, + shift = util.by_pixel(-3, 1.25), + tint = {0.77, 0.77, 0.66, 1}, + frame_count = 1, + scale = 0.5 + }, + { + filename = BASEENTITY .. "boiler/boiler-E-shadow.png", + priority = "extra-high", + width = 184, + height = 194, + scale = 0.5, + shift = util.by_pixel(30, 9.5), + frame_count = 1, + draw_as_shadow = true } } - } - }, - east = { - frame_count = 1, - layers = { - { - filename = BASEENTITY .. "boiler/boiler-E-idle.png", - priority = "extra-high", - width = 105, - height = 147, - shift = util.by_pixel(-3.5, -0.5), - tint = {0.77, 0.77, 0.66, 1}, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-E-idle.png", - priority = "extra-high", - width = 216, - height = 301, - shift = util.by_pixel(-3, 1.25), - tint = {0.77, 0.77, 0.66, 1}, - scale = 0.5 + }, + south = { + layers = { + { + filename = BASEENTITY .. "boiler/boiler-S-idle.png", + priority = "extra-high", + width = 260, + height = 192, + shift = util.by_pixel(4, 13), + tint = {0.77, 0.77, 0.66, 1}, + frame_count = 1, + scale = 0.5 + }, + { + filename = BASEENTITY .. "boiler/boiler-S-shadow.png", + priority = "extra-high", + width = 311, + height = 131, + scale = 0.5, + shift = util.by_pixel(29.75, 15.75), + frame_count = 1, + draw_as_shadow = true } - }, - { - filename = BASEENTITY .. "boiler/boiler-E-shadow.png", - priority = "extra-high", - width = 92, - height = 97, - shift = util.by_pixel(30, 9.5), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-E-shadow.png", - priority = "extra-high", - width = 184, - height = 194, - scale = 0.5, - shift = util.by_pixel(30, 9.5), - draw_as_shadow = true + } + }, + west = { + layers = { + { + filename = BASEENTITY .. "boiler/boiler-W-idle.png", + priority = "extra-high", + width = 196, + height = 273, + shift = util.by_pixel(1.5, 7.75), + tint = {0.77, 0.77, 0.66, 1}, + frame_count = 1, + scale = 0.5 + }, + { + filename = BASEENTITY .. "boiler/boiler-W-shadow.png", + priority = "extra-high", + width = 206, + height = 218, + scale = 0.5, + shift = util.by_pixel(19.5, 6.5), + frame_count = 1, + draw_as_shadow = true } } } }, - south = { - frame_count = 1, - layers = { - { - filename = BASEENTITY .. "boiler/boiler-S-idle.png", + + working_visualisations = { + { + north_animation = { + filename = ENTITYPATH .. "boiler/blue-fire-north.png", priority = "extra-high", - width = 128, - height = 95, - shift = util.by_pixel(3, 12.5), - tint = {0.77, 0.77, 0.66, 1}, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-S-idle.png", - priority = "extra-high", - width = 260, - height = 192, - shift = util.by_pixel(4, 13), - tint = {0.77, 0.77, 0.66, 1}, - scale = 0.5 - } + frame_count = 64, + line_length = 8, + width = 26, + height = 26, + animation_speed = 0.5, + shift = util.by_pixel(0, -8.5), + scale = 0.5 }, - { - filename = BASEENTITY .. "boiler/boiler-S-shadow.png", + east_animation = { + filename = ENTITYPATH .. "boiler/blue-fire-east.png", priority = "extra-high", - width = 156, - height = 66, - shift = util.by_pixel(30, 16), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-S-shadow.png", - priority = "extra-high", - width = 311, - height = 131, - scale = 0.5, - shift = util.by_pixel(29.75, 15.75), - draw_as_shadow = true - } - } - } - }, - west = { - frame_count = 1, - layers = { - { - filename = BASEENTITY .. "boiler/boiler-W-idle.png", + frame_count = 64, + line_length = 8, + width = 28, + height = 28, + animation_speed = 0.5, + shift = util.by_pixel(-9.5, -22), + scale = 0.5 + }, + south_animation = { + filename = ENTITYPATH .. "boiler/blue-fire-south.png", priority = "extra-high", - width = 96, - height = 132, - shift = util.by_pixel(1, 5), - tint = {0.77, 0.77, 0.66, 1}, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-W-idle.png", - priority = "extra-high", - width = 196, - height = 273, - shift = util.by_pixel(1.5, 7.75), - tint = {0.77, 0.77, 0.66, 1}, - scale = 0.5 - } + frame_count = 64, + line_length = 8, + width = 26, + height = 16, + animation_speed = 0.5, + shift = util.by_pixel(-1, -26.5), + scale = 0.5 }, - { - filename = BASEENTITY .. "boiler/boiler-W-shadow.png", + west_animation = { + filename = ENTITYPATH .. "boiler/blue-fire-west.png", priority = "extra-high", - width = 103, - height = 109, - shift = util.by_pixel(19.5, 6.5), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-W-shadow.png", - priority = "extra-high", - width = 206, - height = 218, - scale = 0.5, - shift = util.by_pixel(19.5, 6.5), - draw_as_shadow = true - } + frame_count = 64, + line_length = 8, + width = 30, + height = 29, + animation_speed = 0.5, + shift = util.by_pixel(13, -23.25), + scale = 0.5 } - } - } - }, - - working_visualisations = { - { - north_animation = { - filename = ENTITYPATH .. "boiler/blue-fire-north.png", - priority = "extra-high", - frame_count = 64, - line_length = 8, - width = 26, - height = 26, - animation_speed = 0.5, - shift = util.by_pixel(0, -8.5), - scale = 0.5 - }, - east_animation = { - filename = ENTITYPATH .. "boiler/blue-fire-east.png", - priority = "extra-high", - frame_count = 64, - line_length = 8, - width = 28, - height = 28, - animation_speed = 0.5, - shift = util.by_pixel(-9.5, -22), - scale = 0.5 - }, - south_animation = { - filename = ENTITYPATH .. "boiler/blue-fire-south.png", - priority = "extra-high", - frame_count = 64, - line_length = 8, - width = 26, - height = 16, - animation_speed = 0.5, - shift = util.by_pixel(-1, -26.5), - scale = 0.5 - }, - west_animation = { - filename = ENTITYPATH .. "boiler/blue-fire-west.png", - priority = "extra-high", - frame_count = 64, - line_length = 8, - width = 30, - height = 29, - animation_speed = 0.5, - shift = util.by_pixel(13, -23.25), - scale = 0.5 - } - }, - { - north_animation = { - filename = ENTITYPATH .. "boiler/blue-glow-north.png", - priority = "extra-high", - frame_count = 1, - width = 200, - height = 173, - shift = util.by_pixel(-1, -6.75), - blend_mode = "additive", - scale = 0.5 - }, - east_animation = { - filename = ENTITYPATH .. "boiler/blue-glow-east.png", - priority = "extra-high", - frame_count = 1, - width = 139, - height = 244, - shift = util.by_pixel(0.25, -13), - blend_mode = "additive", - scale = 0.5 }, - south_animation = { - filename = ENTITYPATH .. "boiler/blue-glow-south.png", - priority = "extra-high", - frame_count = 1, - width = 200, - height = 162, - shift = util.by_pixel(1, 5.5), - blend_mode = "additive", - scale = 0.5 - }, - west_animation = { - filename = ENTITYPATH .. "boiler/blue-glow-west.png", - priority = "extra-high", - frame_count = 1, - width = 136, - height = 217, - shift = util.by_pixel(2, -6.25), - blend_mode = "additive", - scale = 0.5 + { + north_animation = { + filename = ENTITYPATH .. "boiler/blue-glow-north.png", + priority = "extra-high", + frame_count = 1, + width = 200, + height = 173, + shift = util.by_pixel(-1, -6.75), + blend_mode = "additive", + scale = 0.5 + }, + east_animation = { + filename = ENTITYPATH .. "boiler/blue-glow-east.png", + priority = "extra-high", + frame_count = 1, + width = 139, + height = 244, + shift = util.by_pixel(0.25, -13), + blend_mode = "additive", + scale = 0.5 + }, + south_animation = { + filename = ENTITYPATH .. "boiler/blue-glow-south.png", + priority = "extra-high", + frame_count = 1, + width = 200, + height = 162, + shift = util.by_pixel(1, 5.5), + blend_mode = "additive", + scale = 0.5 + }, + west_animation = { + filename = ENTITYPATH .. "boiler/blue-glow-west.png", + priority = "extra-high", + frame_count = 1, + width = 136, + height = 217, + shift = util.by_pixel(2, -6.25), + blend_mode = "additive", + scale = 0.5 + } } } } } }) -local mcc1 = util.table.deepcopy( - data.raw["assembling-machine"]["nullius-combustion-chamber-1"]) -mcc1.name = "nullius-mirror-combustion-chamber-1" -mcc1.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } -mcc1.placeable_by = {item = "nullius-combustion-chamber-1", count = 1} -mcc1.next_upgrade = "nullius-mirror-combustion-chamber-2" -mcc1.localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-combustion-chamber-1"}} -mcc1.fluid_boxes[1].pipe_connections[1].position = {2, 0.5} -mcc1.fluid_boxes[2].pipe_connections[1].position = {-2, 0.5} - data:extend({ - mcc1, { type = "assembling-machine", name = "nullius-combustion-chamber-2", @@ -724,10 +683,12 @@ data:extend({ minable = {mining_time = 0.9, result = "nullius-combustion-chamber-2"}, crafting_categories = { "combustion" }, crafting_speed = 2.5, - base_productivity = 0.02, + effect_receiver = { + base_effect = {productivity = 0.02} + }, max_health = 300, corpse = "boiler-remnants", - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", decrease = 100, percent = 90 }, @@ -737,199 +698,135 @@ data:extend({ next_upgrade = "nullius-combustion-chamber-3", collision_box = {{-1.29, -0.79}, {1.29, 0.79}}, selection_box = {{-1.5, -1}, {1.5, 1}}, + circuit_connector = circuit_connector_definitions["nullius-combustion-chamber"], + circuit_wire_max_distance = default_circuit_wire_max_distance, fluid_boxes = { { - base_area = 5, - height = 2, - base_level = -2, + volume = 500, pipe_covers = pipecoverspictures(), - pipe_connections = {{type = "input", position = {-2, 0.5}}}, + pipe_connections = {{flow_direction = "input", position = {-1, 0.5}, direction = defines.direction.west }}, production_type = "input" }, { - base_area = 5, - height = 2, - base_level = -2, + volume = 500, pipe_covers = pipecoverspictures(), - pipe_connections = {{type = "input", position = {2, 0.5}}}, + pipe_connections = {{flow_direction = "input", position = {1, 0.5}, direction = defines.direction.east }}, production_type = "input" }, { - base_area = 5, - height = 2, - base_level = 6, + volume = 500, pipe_covers = pipecoverspictures(), - pipe_connections = {{type = "output", position = {0, -1.5}}}, + pipe_connections = {{flow_direction = "output", position = {0, -0.5}, direction = defines.direction.north }}, production_type = "output" }, { - base_area = 5, - height = 2, - base_level = 6, + volume = 500, pipe_covers = pipecoverspictures(), - pipe_connections = {{type = "output", position = {0, 1.5}}}, + pipe_connections = {{flow_direction = "output", position = {0, 0.5}, direction = defines.direction.south }}, production_type = "output" } }, energy_usage = "1kW", energy_source = { type = "void" }, working_sound = data.raw["assembling-machine"]["nullius-combustion-chamber-1"].working_sound, - working_visualisations = data.raw["assembling-machine"]["nullius-combustion-chamber-1"].working_visualisations, - - animation = { - north = { - frame_count = 1, - layers = { - { - filename = BASEENTITY .. "boiler/boiler-N-idle.png", - priority = "extra-high", - width = 131, - height = 108, - shift = util.by_pixel(-0.5, 4), - tint = {0.8, 0.8, 1, 1}, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-N-idle.png", - priority = "extra-high", - width = 269, - height = 221, - shift = util.by_pixel(-1.25, 5.25), - tint = {0.8, 0.8, 1, 1}, - scale = 0.5 - } - }, - { - filename = BASEENTITY .. "boiler/boiler-N-shadow.png", - priority = "extra-high", - width = 137, - height = 82, - shift = util.by_pixel(20.5, 9), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-N-shadow.png", - priority = "extra-high", - width = 274, - height = 164, - scale = 0.5, - shift = util.by_pixel(20.5, 9), - draw_as_shadow = true + + graphics_set = { + working_visualisations = data.raw["assembling-machine"]["nullius-combustion-chamber-1"].graphics_set.working_visualisations, + animation = { + north = { + layers = { + { + filename = BASEENTITY .. "boiler/boiler-N-idle.png", + priority = "extra-high", + width = 269, + height = 221, + shift = util.by_pixel(-1.25, 5.25), + tint = {0.8, 0.8, 1, 1}, + frame_count = 1, + scale = 0.5 + }, + { + filename = BASEENTITY .. "boiler/boiler-N-shadow.png", + priority = "extra-high", + width = 274, + height = 164, + scale = 0.5, + shift = util.by_pixel(20.5, 9), + frame_count = 1, + draw_as_shadow = true } } - } - }, - east = { - frame_count = 1, - layers = { - { - filename = BASEENTITY .. "boiler/boiler-E-idle.png", - priority = "extra-high", - width = 105, - height = 147, - shift = util.by_pixel(-3.5, -0.5), - tint = {0.8, 0.8, 1, 1}, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-E-idle.png", - priority = "extra-high", - width = 216, - height = 301, - shift = util.by_pixel(-3, 1.25), - tint = {0.8, 0.8, 1, 1}, - scale = 0.5 - } - }, - { - filename = BASEENTITY .. "boiler/boiler-E-shadow.png", - priority = "extra-high", - width = 92, - height = 97, - shift = util.by_pixel(30, 9.5), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-E-shadow.png", - priority = "extra-high", - width = 184, - height = 194, - scale = 0.5, - shift = util.by_pixel(30, 9.5), - draw_as_shadow = true + }, + east = { + layers = { + { + filename = BASEENTITY .. "boiler/boiler-E-idle.png", + priority = "extra-high", + width = 216, + height = 301, + shift = util.by_pixel(-3, 1.25), + tint = {0.8, 0.8, 1, 1}, + frame_count = 1, + scale = 0.5 + }, + { + filename = BASEENTITY .. "boiler/boiler-E-shadow.png", + priority = "extra-high", + width = 184, + height = 194, + scale = 0.5, + shift = util.by_pixel(30, 9.5), + frame_count = 1, + draw_as_shadow = true } } - } - }, - south = { - frame_count = 1, - layers = { - { - filename = BASEENTITY .. "boiler/boiler-S-idle.png", - priority = "extra-high", - width = 128, - height = 95, - shift = util.by_pixel(3, 12.5), - tint = {0.8, 0.8, 1, 1}, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-S-idle.png", - priority = "extra-high", - width = 260, - height = 192, - shift = util.by_pixel(4, 13), - tint = {0.8, 0.8, 1, 1}, - scale = 0.5 - } - }, - { - filename = BASEENTITY .. "boiler/boiler-S-shadow.png", - priority = "extra-high", - width = 156, - height = 66, - shift = util.by_pixel(30, 16), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-S-shadow.png", - priority = "extra-high", - width = 311, - height = 131, - scale = 0.5, - shift = util.by_pixel(29.75, 15.75), - draw_as_shadow = true + }, + south = { + layers = { + { + filename = BASEENTITY .. "boiler/boiler-S-idle.png", + priority = "extra-high", + width = 260, + height = 192, + shift = util.by_pixel(4, 13), + tint = {0.8, 0.8, 1, 1}, + frame_count = 1, + scale = 0.5 + }, + { + filename = BASEENTITY .. "boiler/boiler-S-shadow.png", + priority = "extra-high", + width = 311, + height = 131, + scale = 0.5, + shift = util.by_pixel(29.75, 15.75), + frame_count = 1, + draw_as_shadow = true } } - } - }, - west = { - frame_count = 1, - layers = { - { - filename = BASEENTITY .. "boiler/boiler-W-idle.png", - priority = "extra-high", - width = 96, - height = 132, - shift = util.by_pixel(1, 5), - tint = {0.8, 0.8, 1, 1}, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-W-idle.png", - priority = "extra-high", - width = 196, - height = 273, - shift = util.by_pixel(1.5, 7.75), - tint = {0.8, 0.8, 1, 1}, - scale = 0.5 - } - }, - { - filename = BASEENTITY .. "boiler/boiler-W-shadow.png", - priority = "extra-high", - width = 103, - height = 109, - shift = util.by_pixel(19.5, 6.5), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-W-shadow.png", - priority = "extra-high", - width = 206, - height = 218, - scale = 0.5, - shift = util.by_pixel(19.5, 6.5), - draw_as_shadow = true + }, + west = { + layers = { + { + filename = BASEENTITY .. "boiler/boiler-W-idle.png", + priority = "extra-high", + width = 196, + height = 273, + shift = util.by_pixel(1.5, 7.75), + tint = {0.8, 0.8, 1, 1}, + frame_count = 1, + scale = 0.5 + }, + { + filename = BASEENTITY .. "boiler/boiler-W-shadow.png", + priority = "extra-high", + width = 206, + height = 218, + scale = 0.5, + shift = util.by_pixel(19.5, 6.5), + frame_count = 1, + draw_as_shadow = true } } } @@ -941,236 +838,122 @@ data:extend({ data:extend({ { type = "assembling-machine", - name = "nullius-mirror-combustion-chamber-2", - icons = { - data.raw.item["nullius-combustion-chamber-2"].icons[1], - { icon = ICONPATH .. "flip1.png", icon_size = 64 } - }, + name = "nullius-combustion-chamber-3", + icons = data.raw.item["nullius-combustion-chamber-3"].icons, localised_description = {"entity-description.nullius-combustion-chamber"}, flags = {"placeable-neutral", "player-creation"}, - minable = {mining_time = 0.9, result = "nullius-combustion-chamber-2"}, - placeable_by = {item = "nullius-combustion-chamber-2", count = 1}, + minable = {mining_time = 1.2, result = "nullius-combustion-chamber-3"}, crafting_categories = { "combustion" }, - crafting_speed = 2.5, - base_productivity = 0.02, - max_health = 300, + crafting_speed = 6, + effect_receiver = { + base_effect = {productivity = 0.04} + }, + max_health = 400, corpse = "boiler-remnants", - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", resistances = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].resistances, fast_replaceable_group = "combustion-chamber", - next_upgrade = "nullius-mirror-combustion-chamber-3", collision_box = {{-1.29, -0.79}, {1.29, 0.79}}, selection_box = {{-1.5, -1}, {1.5, 1}}, + fluid_boxes = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].fluid_boxes, energy_usage = "1kW", energy_source = { type = "void" }, working_sound = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].working_sound, - working_visualisations = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].working_visualisations, - animation = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].animation, - - fluid_boxes = { - { - base_area = 5, - height = 2, - base_level = -2, - pipe_covers = pipecoverspictures(), - pipe_connections = {{type = "input", position = {2, 0.5}}}, - production_type = "input" - }, - { - base_area = 5, - height = 2, - base_level = -2, - pipe_covers = pipecoverspictures(), - pipe_connections = {{type = "input", position = {-2, 0.5}}}, - production_type = "input" - }, - { - base_area = 5, - height = 2, - base_level = 6, - pipe_covers = pipecoverspictures(), - pipe_connections = {{type = "output", position = {0, -1.5}}}, - production_type = "output" - }, - { - base_area = 5, - height = 2, - base_level = 6, - pipe_covers = pipecoverspictures(), - pipe_connections = {{type = "output", position = {0, 1.5}}}, - production_type = "output" - } - } - }, - - { - type = "assembling-machine", - name = "nullius-combustion-chamber-3", - icons = data.raw.item["nullius-combustion-chamber-3"].icons, - localised_description = {"entity-description.nullius-combustion-chamber"}, - flags = {"placeable-neutral", "player-creation"}, - minable = {mining_time = 1.2, result = "nullius-combustion-chamber-3"}, - crafting_categories = { "combustion" }, - crafting_speed = 6, - base_productivity = 0.04, - max_health = 400, - corpse = "boiler-remnants", - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - resistances = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].resistances, - fast_replaceable_group = "combustion-chamber", - collision_box = {{-1.29, -0.79}, {1.29, 0.79}}, - selection_box = {{-1.5, -1}, {1.5, 1}}, - fluid_boxes = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].fluid_boxes, - energy_usage = "1kW", - energy_source = { type = "void" }, - working_sound = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].working_sound, - working_visualisations = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].working_visualisations, - - animation = { - north = { - frame_count = 1, - layers = { - { - filename = BASEENTITY .. "boiler/boiler-N-idle.png", - priority = "extra-high", - width = 131, - height = 108, - shift = util.by_pixel(-0.5, 4), - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-N-idle.png", - priority = "extra-high", - width = 269, - height = 221, - shift = util.by_pixel(-1.25, 5.25), - scale = 0.5 - } - }, - { - filename = BASEENTITY .. "boiler/boiler-N-shadow.png", - priority = "extra-high", - width = 137, - height = 82, - shift = util.by_pixel(20.5, 9), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-N-shadow.png", - priority = "extra-high", - width = 274, - height = 164, - scale = 0.5, - shift = util.by_pixel(20.5, 9), - draw_as_shadow = true + circuit_connector = circuit_connector_definitions["nullius-combustion-chamber"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + + graphics_set = { + working_visualisations = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].graphics_set.working_visualisations, + animation = { + north = { + layers = { + { + filename = BASEENTITY .. "boiler/boiler-N-idle.png", + priority = "extra-high", + width = 269, + height = 221, + shift = util.by_pixel(-1.25, 5.25), + frame_count = 1, + scale = 0.5 + }, + { + filename = BASEENTITY .. "boiler/boiler-N-shadow.png", + priority = "extra-high", + width = 274, + height = 164, + scale = 0.5, + shift = util.by_pixel(20.5, 9), + frame_count = 1, + draw_as_shadow = true } } - } - }, - east = { - frame_count = 1, - layers = { - { - filename = BASEENTITY .. "boiler/boiler-E-idle.png", - priority = "extra-high", - width = 105, - height = 147, - shift = util.by_pixel(-3.5, -0.5), - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-E-idle.png", - priority = "extra-high", - width = 216, - height = 301, - shift = util.by_pixel(-3, 1.25), - scale = 0.5 - } - }, - { - filename = BASEENTITY .. "boiler/boiler-E-shadow.png", - priority = "extra-high", - width = 92, - height = 97, - shift = util.by_pixel(30, 9.5), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-E-shadow.png", - priority = "extra-high", - width = 184, - height = 194, - scale = 0.5, - shift = util.by_pixel(30, 9.5), - draw_as_shadow = true + }, + east = { + layers = { + { + filename = BASEENTITY .. "boiler/boiler-E-idle.png", + priority = "extra-high", + width = 216, + height = 301, + shift = util.by_pixel(-3, 1.25), + frame_count = 1, + scale = 0.5 + }, + { + filename = BASEENTITY .. "boiler/boiler-E-shadow.png", + priority = "extra-high", + width = 184, + height = 194, + scale = 0.5, + shift = util.by_pixel(30, 9.5), + frame_count = 1, + draw_as_shadow = true } } - } - }, - south = { - frame_count = 1, - layers = { - { - filename = BASEENTITY .. "boiler/boiler-S-idle.png", - priority = "extra-high", - width = 128, - height = 95, - shift = util.by_pixel(3, 12.5), - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-S-idle.png", - priority = "extra-high", - width = 260, - height = 192, - shift = util.by_pixel(4, 13), - scale = 0.5 - } - }, - { - filename = BASEENTITY .. "boiler/boiler-S-shadow.png", - priority = "extra-high", - width = 156, - height = 66, - shift = util.by_pixel(30, 16), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-S-shadow.png", - priority = "extra-high", - width = 311, - height = 131, - scale = 0.5, - shift = util.by_pixel(29.75, 15.75), - draw_as_shadow = true + }, + south = { + layers = { + { + filename = BASEENTITY .. "boiler/boiler-S-idle.png", + priority = "extra-high", + width = 260, + height = 192, + shift = util.by_pixel(4, 13), + frame_count = 1, + scale = 0.5 + }, + { + filename = BASEENTITY .. "boiler/boiler-S-shadow.png", + priority = "extra-high", + width = 311, + height = 131, + scale = 0.5, + shift = util.by_pixel(29.75, 15.75), + frame_count = 1, + draw_as_shadow = true } } - } - }, - west = { - frame_count = 1, - layers = { - { - filename = BASEENTITY .. "boiler/boiler-W-idle.png", - priority = "extra-high", - width = 96, - height = 132, - shift = util.by_pixel(1, 5), - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-W-idle.png", - priority = "extra-high", - width = 196, - height = 273, - shift = util.by_pixel(1.5, 7.75), - scale = 0.5 - } - }, - { - filename = BASEENTITY .. "boiler/boiler-W-shadow.png", - priority = "extra-high", - width = 103, - height = 109, - shift = util.by_pixel(19.5, 6.5), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "boiler/hr-boiler-W-shadow.png", - priority = "extra-high", - width = 206, - height = 218, - scale = 0.5, - shift = util.by_pixel(19.5, 6.5), - draw_as_shadow = true + }, + west = { + layers = { + { + filename = BASEENTITY .. "boiler/boiler-W-idle.png", + priority = "extra-high", + width = 196, + height = 273, + shift = util.by_pixel(1.5, 7.75), + frame_count = 1, + scale = 0.5 + }, + { + filename = BASEENTITY .. "boiler/boiler-W-shadow.png", + priority = "extra-high", + width = 206, + height = 218, + scale = 0.5, + shift = util.by_pixel(19.5, 6.5), + frame_count = 1, + draw_as_shadow = true } } } @@ -1180,48 +963,20 @@ data:extend({ }) data:extend({ - { - type = "assembling-machine", - name = "nullius-mirror-combustion-chamber-3", - icons = { - data.raw.item["nullius-combustion-chamber-3"].icons[1], - { icon = ICONPATH .. "flip1.png", icon_size = 64 } - }, - localised_description = {"entity-description.nullius-combustion-chamber"}, - flags = {"placeable-neutral", "player-creation"}, - minable = {mining_time = 1.2, result = "nullius-combustion-chamber-3"}, - placeable_by = {item = "nullius-combustion-chamber-3", count = 1}, - crafting_categories = { "combustion" }, - crafting_speed = 6, - base_productivity = 0.04, - max_health = 400, - corpse = "boiler-remnants", - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - resistances = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].resistances, - fast_replaceable_group = "combustion-chamber", - collision_box = {{-1.29, -0.79}, {1.29, 0.79}}, - selection_box = {{-1.5, -1}, {1.5, 1}}, - fluid_boxes = data.raw["assembling-machine"]["nullius-mirror-combustion-chamber-2"].fluid_boxes, - energy_usage = "1kW", - energy_source = { type = "void" }, - working_sound = data.raw["assembling-machine"]["nullius-combustion-chamber-2"].working_sound, - working_visualisations = data.raw["assembling-machine"]["nullius-combustion-chamber-3"].working_visualisations, - animation = data.raw["assembling-machine"]["nullius-combustion-chamber-3"].animation - }, - { type = "assembling-machine", name = "nullius-surge-compressor-1", - icons = {{ - icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", + icons = {{ + icon = "__angelsrefininggraphics__/graphics/icons/thermal-extractor.png", icon_size = 32, tint = {0.6, 0.6, 0.4} }}, - localised_description = {"entity-description.nullius-surge", + localised_description = {"entity-description.nullius-surge", {"entity-description.nullius-compressor"}}, + subgroup = "electrolyzer-mode-surge", flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 0.8, result = "nullius-compressor-1"}, - placeable_by = {item = "nullius-compressor-1", count = 1}, + placeable_by = {item = "nullius-compressor-1", count = 1}, fast_replaceable_group = "compressor", next_upgrade = "nullius-surge-compressor-2", max_health = 200, @@ -1233,7 +988,7 @@ data:extend({ crafting_speed = 1, energy_source = { type = "electric", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "5kW", output_flow_limit = "0kW", usage_priority = "tertiary", @@ -1243,115 +998,120 @@ data:extend({ resistances = { { type = "impact", decrease = 100, percent = 90 } }, - vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, - working_sound = data.raw["mining-drill"]["thermal-extractor"].working_sound, + impact_category = "metal", + working_sound = { + sound = { filename = "__angelsrefininggraphics__/sound/thermal-extractor.ogg" }, + max_sounds_per_prototype = 3, + fade_in_ticks = 4, + fade_out_ticks = 10 + }, + circuit_connector = circuit_connector_definitions["nullius-compressor"], + circuit_wire_max_distance = default_circuit_wire_max_distance, fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - height = 2, - pipe_connections = {{ type="input", position = {2.5, 1.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1.5, 1.5}, direction = defines.direction.east }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 8, - height = 2, - base_area = 4, - pipe_connections = {{ type="output", position = {-2.5, -1.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1.5, -1.5}, direction = defines.direction.west }} } }, - animation = { - north = { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.5, - tint = {0.6, 0.6, 0.4} - }, - east = { - layers = { - { - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", - priority = "high", - width = 288, - height = 288, - repeat_count = 16, - scale = 0.465, - animation_speed = 0.5 - }, - { - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", - priority = "high", - width = 288, - height = 288, - x = 576, - repeat_count = 16, - scale = 0.465, - animation_speed = 0.5 - }, - { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.5, - tint = {0.6, 0.6, 0.4} + graphics_set = { + animation = { + north = { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.5, + tint = {0.6, 0.6, 0.4} + }, + east = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", + priority = "high", + width = 288, + height = 288, + repeat_count = 16, + scale = 0.465, + animation_speed = 0.5 + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", + priority = "high", + width = 288, + height = 288, + x = 576, + repeat_count = 16, + scale = 0.465, + animation_speed = 0.5 + }, + { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.5, + tint = {0.6, 0.6, 0.4} + } } - } - }, - south = { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.5, - tint = {0.6, 0.6, 0.4} - }, - west = { - layers = { - { - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", - priority = "high", - width = 288, - height = 288, - repeat_count = 16, - scale = 0.465, - animation_speed = 0.5 - }, - { - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", - priority = "high", - width = 288, - height = 288, - x = 576, - repeat_count = 16, - scale = 0.465, - animation_speed = 0.5 - }, - { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.5, - tint = {0.6, 0.6, 0.4} + }, + south = { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.5, + tint = {0.6, 0.6, 0.4} + }, + west = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", + priority = "high", + width = 288, + height = 288, + repeat_count = 16, + scale = 0.465, + animation_speed = 0.5 + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", + priority = "high", + width = 288, + height = 288, + x = 576, + repeat_count = 16, + scale = 0.465, + animation_speed = 0.5 + }, + { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.5, + tint = {0.6, 0.6, 0.4} + } } } } @@ -1363,16 +1123,17 @@ data:extend({ { type = "assembling-machine", name = "nullius-priority-compressor-1", - icons = {{ - icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", + icons = {{ + icon = "__angelsrefininggraphics__/graphics/icons/thermal-extractor.png", icon_size = 32, tint = {0.6, 0.51, 0.34} }}, - localised_description = {"entity-description.nullius-priority", + localised_description = {"entity-description.nullius-priority", {"entity-description.nullius-compressor"}}, + subgroup = "electrolyzer-mode-priority", flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 0.8, result = "nullius-compressor-1"}, - placeable_by = {item = "nullius-compressor-1", count = 1}, + placeable_by = {item = "nullius-compressor-1", count = 1}, fast_replaceable_group = "compressor", next_upgrade = "nullius-priority-compressor-2", max_health = 200, @@ -1384,104 +1145,108 @@ data:extend({ crafting_speed = 0.5, energy_source = { type = "electric", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "5kW", usage_priority = "secondary-input" }, energy_usage = "495kW", resistances = data.raw["assembling-machine"]["nullius-surge-compressor-1"].resistances, - vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, - working_sound = data.raw["mining-drill"]["thermal-extractor"].working_sound, + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-surge-compressor-1"].working_sound, fluid_boxes = data.raw["assembling-machine"]["nullius-surge-compressor-1"].fluid_boxes, - - animation = { - north = { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.5, - tint = {0.6, 0.51, 0.34} - }, - east = { - layers = { - { - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", - priority = "high", - width = 288, - height = 288, - repeat_count = 16, - scale = 0.465, - animation_speed = 0.5 - }, - { - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", - priority = "high", - width = 288, - height = 288, - x = 576, - repeat_count = 16, - scale = 0.465, - animation_speed = 0.5 - }, - { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.5, - tint = {0.6, 0.51, 0.34} + circuit_connector = circuit_connector_definitions["nullius-compressor"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + + graphics_set = { + animation = { + north = { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.5, + tint = {0.6, 0.51, 0.34} + }, + east = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", + priority = "high", + width = 288, + height = 288, + repeat_count = 16, + scale = 0.465, + animation_speed = 0.5 + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", + priority = "high", + width = 288, + height = 288, + x = 576, + repeat_count = 16, + scale = 0.465, + animation_speed = 0.5 + }, + { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.5, + tint = {0.6, 0.51, 0.34} + } } - } - }, - south = { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.5, - tint = {0.6, 0.51, 0.34} - }, - west = { - layers = { - { - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", - priority = "high", - width = 288, - height = 288, - repeat_count = 16, - scale = 0.465, - animation_speed = 0.5 - }, - { - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", - priority = "high", - width = 288, - height = 288, - x = 576, - repeat_count = 16, - scale = 0.465, - animation_speed = 0.5 - }, - { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.5, - tint = {0.6, 0.51, 0.34} + }, + south = { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.5, + tint = {0.6, 0.51, 0.34} + }, + west = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", + priority = "high", + width = 288, + height = 288, + repeat_count = 16, + scale = 0.465, + animation_speed = 0.5 + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", + priority = "high", + width = 288, + height = 288, + x = 576, + repeat_count = 16, + scale = 0.465, + animation_speed = 0.5 + }, + { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.5, + tint = {0.6, 0.51, 0.34} + } } } } @@ -1491,16 +1256,17 @@ data:extend({ { type = "assembling-machine", name = "nullius-surge-compressor-2", - icons = {{ - icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", + icons = {{ + icon = "__angelsrefininggraphics__/graphics/icons/thermal-extractor.png", icon_size = 32, tint = {0.65, 0.65, 0.9} }}, - localised_description = {"entity-description.nullius-surge", + localised_description = {"entity-description.nullius-surge", {"entity-description.nullius-compressor"}}, + subgroup = "electrolyzer-mode-surge", flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1.2, result = "nullius-compressor-2"}, - placeable_by = {item = "nullius-compressor-2", count = 1}, + placeable_by = {item = "nullius-compressor-2", count = 1}, fast_replaceable_group = "compressor", next_upgrade = "nullius-surge-compressor-3", max_health = 250, @@ -1512,7 +1278,7 @@ data:extend({ crafting_speed = 3, energy_source = { type = "electric", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "15kW", output_flow_limit = "0kW", usage_priority = "tertiary", @@ -1520,115 +1286,115 @@ data:extend({ }, energy_usage = "2925kW", resistances = data.raw["assembling-machine"]["nullius-surge-compressor-1"].resistances, - vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, - working_sound = data.raw["mining-drill"]["thermal-extractor"].working_sound, + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-surge-compressor-1"].working_sound, + circuit_connector = circuit_connector_definitions["nullius-compressor"], + circuit_wire_max_distance = default_circuit_wire_max_distance, fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 15, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {2.5, 1.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1.5, 1.5}, direction = defines.direction.east }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 10, - height = 3, - base_area = 5, - pipe_connections = {{ type="output", position = {-2.5, -1.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1.5, -1.5}, direction = defines.direction.west }} } }, - animation = { - north = { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.3, - tint = {0.65, 0.65, 0.9} - }, - east = { - layers = { - { - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", - priority = "high", - width = 288, - height = 288, - repeat_count = 16, - scale = 0.465, - animation_speed = 0.3 - }, - { - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", - priority = "high", - width = 288, - height = 288, - x = 576, - repeat_count = 16, - scale = 0.465, - animation_speed = 0.3 - }, - { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.3, - tint = {0.65, 0.65, 0.9} + graphics_set = { + animation = { + north = { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.3, + tint = {0.65, 0.65, 0.9} + }, + east = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", + priority = "high", + width = 288, + height = 288, + repeat_count = 16, + scale = 0.465, + animation_speed = 0.3 + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", + priority = "high", + width = 288, + height = 288, + x = 576, + repeat_count = 16, + scale = 0.465, + animation_speed = 0.3 + }, + { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.3, + tint = {0.65, 0.65, 0.9} + } } - } - }, - south = { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.3, - tint = {0.65, 0.65, 0.9} - }, - west = { - layers = { - { - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", - priority = "high", - width = 288, - height = 288, - repeat_count = 16, - scale = 0.465, - animation_speed = 0.3 - }, - { - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", - priority = "high", - width = 288, - height = 288, - x = 576, - repeat_count = 16, - scale = 0.465, - animation_speed = 0.3 - }, - { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.3, - tint = {0.65, 0.65, 0.9} + }, + south = { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.3, + tint = {0.65, 0.65, 0.9} + }, + west = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", + priority = "high", + width = 288, + height = 288, + repeat_count = 16, + scale = 0.465, + animation_speed = 0.3 + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", + priority = "high", + width = 288, + height = 288, + x = 576, + repeat_count = 16, + scale = 0.465, + animation_speed = 0.3 + }, + { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.3, + tint = {0.65, 0.65, 0.9} + } } } } @@ -1640,16 +1406,17 @@ data:extend({ { type = "assembling-machine", name = "nullius-priority-compressor-2", - icons = {{ - icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", + icons = {{ + icon = "__angelsrefininggraphics__/graphics/icons/thermal-extractor.png", icon_size = 32, tint = {0.65, 0.55, 0.76} }}, - localised_description = {"entity-description.nullius-priority", + localised_description = {"entity-description.nullius-priority", {"entity-description.nullius-compressor"}}, + subgroup = "electrolyzer-mode-priority", flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1.2, result = "nullius-compressor-2"}, - placeable_by = {item = "nullius-compressor-2", count = 1}, + placeable_by = {item = "nullius-compressor-2", count = 1}, fast_replaceable_group = "compressor", next_upgrade = "nullius-priority-compressor-3", max_health = 250, @@ -1661,70 +1428,74 @@ data:extend({ crafting_speed = 2, energy_source = { type = "electric", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "30kW", usage_priority = "secondary-input" }, energy_usage = "1930kW", - resistances = data.raw["assembling-machine"]["nullius-surge-compressor-2"].resistances, - vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, - working_sound = data.raw["mining-drill"]["thermal-extractor"].working_sound, - fluid_boxes = data.raw["assembling-machine"]["nullius-surge-compressor-2"].fluid_boxes, - - animation = { - north = { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.3, - tint = {0.65, 0.55, 0.76} - }, - east = { - layers = { - data.raw["assembling-machine"]["nullius-surge-compressor-2"].animation.east.layers[1], - data.raw["assembling-machine"]["nullius-surge-compressor-2"].animation.east.layers[2], - { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.3, - tint = {0.65, 0.55, 0.76} + resistances = data.raw["assembling-machine"]["nullius-surge-compressor-2"].resistances, + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-surge-compressor-1"].working_sound, + fluid_boxes = data.raw["assembling-machine"]["nullius-surge-compressor-2"].fluid_boxes, + circuit_connector = circuit_connector_definitions["nullius-compressor"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + + graphics_set = { + animation = { + north = { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.3, + tint = {0.65, 0.55, 0.76} + }, + east = { + layers = { + data.raw["assembling-machine"]["nullius-surge-compressor-2"].graphics_set.animation.east.layers[1], + data.raw["assembling-machine"]["nullius-surge-compressor-2"].graphics_set.animation.east.layers[2], + { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.3, + tint = {0.65, 0.55, 0.76} + } } - } - }, - south = { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.3, - tint = {0.65, 0.55, 0.76} - }, - west = { - layers = { - data.raw["assembling-machine"]["nullius-surge-compressor-2"].animation.west.layers[1], - data.raw["assembling-machine"]["nullius-surge-compressor-2"].animation.west.layers[2], - { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.3, - tint = {0.65, 0.55, 0.76} + }, + south = { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.3, + tint = {0.65, 0.55, 0.76} + }, + west = { + layers = { + data.raw["assembling-machine"]["nullius-surge-compressor-2"].graphics_set.animation.west.layers[1], + data.raw["assembling-machine"]["nullius-surge-compressor-2"].graphics_set.animation.west.layers[2], + { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.3, + tint = {0.65, 0.55, 0.76} + } } } } @@ -1734,15 +1505,16 @@ data:extend({ { type = "assembling-machine", name = "nullius-surge-compressor-3", - icons = {{ - icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", + icons = {{ + icon = "__angelsrefininggraphics__/graphics/icons/thermal-extractor.png", icon_size = 32 }}, - localised_description = {"entity-description.nullius-surge", + localised_description = {"entity-description.nullius-surge", {"entity-description.nullius-compressor"}}, + subgroup = "electrolyzer-mode-surge", flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1.6, result = "nullius-compressor-3"}, - placeable_by = {item = "nullius-compressor-3", count = 1}, + placeable_by = {item = "nullius-compressor-3", count = 1}, fast_replaceable_group = "compressor", max_health = 300, corpse = "big-remnants", @@ -1753,7 +1525,7 @@ data:extend({ crafting_speed = 8, energy_source = { type = "electric", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "25kW", output_flow_limit = "0kW", usage_priority = "tertiary", @@ -1761,111 +1533,113 @@ data:extend({ }, energy_usage = "7725kW", resistances = data.raw["assembling-machine"]["nullius-surge-compressor-1"].resistances, - vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, - working_sound = data.raw["mining-drill"]["thermal-extractor"].working_sound, + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-surge-compressor-1"].working_sound, + + circuit_connector = circuit_connector_definitions["nullius-compressor"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 20, - base_level = -4, - height = 2, - pipe_connections = {{ type="input", position = {2.5, 1.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1.5, 1.5}, direction = defines.direction.east }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 10, - height = 3, - base_area = 8, - pipe_connections = {{ type="output", position = {-2.5, -1.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1.5, -1.5}, direction = defines.direction.west }} } }, - animation = { - north = { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.2 - }, - east = { - layers = { - { - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", - priority = "high", - width = 288, - height = 288, - repeat_count = 16, - scale = 0.465, - animation_speed = 0.2 - }, - { - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", - priority = "high", - width = 288, - height = 288, - x = 576, - repeat_count = 16, - scale = 0.465, - animation_speed = 0.2 - }, - { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.2 + graphics_set = { + animation = { + north = { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.2 + }, + east = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", + priority = "high", + width = 288, + height = 288, + repeat_count = 16, + scale = 0.465, + animation_speed = 0.2 + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", + priority = "high", + width = 288, + height = 288, + x = 576, + repeat_count = 16, + scale = 0.465, + animation_speed = 0.2 + }, + { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.2 + } } - } - }, - south = { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.2 - }, - west = { - layers = { - { - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", - priority = "high", - width = 288, - height = 288, - repeat_count = 16, - scale = 0.465, - animation_speed = 0.2 - }, - { - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", - priority = "high", - width = 288, - height = 288, - x = 576, - repeat_count = 16, - scale = 0.465, - animation_speed = 0.2 - }, - { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.2 + }, + south = { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.2 + }, + west = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", + priority = "high", + width = 288, + height = 288, + repeat_count = 16, + scale = 0.465, + animation_speed = 0.2 + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", + priority = "high", + width = 288, + height = 288, + x = 576, + repeat_count = 16, + scale = 0.465, + animation_speed = 0.2 + }, + { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.2 + } } } } @@ -1877,16 +1651,17 @@ data:extend({ { type = "assembling-machine", name = "nullius-priority-compressor-3", - icons = {{ - icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", + icons = {{ + icon = "__angelsrefininggraphics__/graphics/icons/thermal-extractor.png", icon_size = 32, tint = {1, 0.85, 0.85} }}, - localised_description = {"entity-description.nullius-priority", + localised_description = {"entity-description.nullius-priority", {"entity-description.nullius-compressor"}}, + subgroup = "electrolyzer-mode-priority", flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1.6, result = "nullius-compressor-3"}, - placeable_by = {item = "nullius-compressor-3", count = 1}, + placeable_by = {item = "nullius-compressor-3", count = 1}, fast_replaceable_group = "compressor", max_health = 300, corpse = "big-remnants", @@ -1897,87 +1672,88 @@ data:extend({ crafting_speed = 8, energy_source = { type = "electric", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "100kW", usage_priority = "secondary-input" }, energy_usage = "7650kW", resistances = data.raw["assembling-machine"]["nullius-surge-compressor-1"].resistances, - vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, - working_sound = data.raw["mining-drill"]["thermal-extractor"].working_sound, + impact_category = "metal", + working_sound = data.raw["assembling-machine"]["nullius-surge-compressor-1"].working_sound, + circuit_connector = circuit_connector_definitions["nullius-compressor"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 20, - base_level = -4, - height = 2, - pipe_connections = {{ type="input", position = {2.5, 1.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {1.5, 1.5}, direction = defines.direction.east }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 10, - height = 3, - base_area = 8, - pipe_connections = {{ type="output", position = {-2.5, -1.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-1.5, -1.5}, direction = defines.direction.west }} } }, - animation = { - north = { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.2, - tint = {1, 0.85, 0.85} - }, - east = { - layers = { - data.raw["assembling-machine"]["nullius-surge-compressor-3"].animation.east.layers[1], - data.raw["assembling-machine"]["nullius-surge-compressor-3"].animation.east.layers[2], - { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.2, - tint = {1, 0.85, 0.85} + graphics_set = { + animation = { + north = { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.2, + tint = {1, 0.85, 0.85} + }, + east = { + layers = { + data.raw["assembling-machine"]["nullius-surge-compressor-3"].graphics_set.animation.east.layers[1], + data.raw["assembling-machine"]["nullius-surge-compressor-3"].graphics_set.animation.east.layers[2], + { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.2, + tint = {1, 0.85, 0.85} + } } - } - }, - south = { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.2, - tint = {1, 0.85, 0.85} - }, - west = { - layers = { - data.raw["assembling-machine"]["nullius-surge-compressor-3"].animation.west.layers[1], - data.raw["assembling-machine"]["nullius-surge-compressor-3"].animation.west.layers[2], - { - priority = "high", - width = 288, - height = 288, - line_length = 4, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", - frame_count = 16, - scale = 0.465, - animation_speed = 0.2, - tint = {1, 0.85, 0.85} + }, + south = { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.2, + tint = {1, 0.85, 0.85} + }, + west = { + layers = { + data.raw["assembling-machine"]["nullius-surge-compressor-3"].graphics_set.animation.west.layers[1], + data.raw["assembling-machine"]["nullius-surge-compressor-3"].graphics_set.animation.west.layers[2], + { + priority = "high", + width = 288, + height = 288, + line_length = 4, + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + frame_count = 16, + scale = 0.465, + animation_speed = 0.2, + tint = {1, 0.85, 0.85} + } } } } @@ -1988,7 +1764,8 @@ data:extend({ type = "mining-drill", name = "nullius-geothermal-build-1", icons = data.raw.item["nullius-geothermal-plant-1"].icons, - flags = {"placeable-neutral", "player-creation", "hidden", "not-upgradable", "not-deconstructable"}, + flags = {"placeable-neutral", "player-creation", "not-upgradable", "not-deconstructable"}, + hidden = true, minable = { mining_time = 1.8, result = "nullius-geothermal-plant-1" }, resource_categories = {"basic-fluid"}, max_health = 500, @@ -2006,8 +1783,11 @@ data:extend({ mining_speed = 1, resource_searching_radius = 0.49, vector_to_place_result = {0, 0}, - vehicle_impact_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].vehicle_impact_sound, - working_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].working_sound, + impact_category = "metal", + working_sound = { + sound = { filename = "__base__/sound/oil-refinery.ogg", volume = 0.45 }, + idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, + }, fast_replaceable_group = "geothermal-plant", radius_visualisation_picture = { filename = BASEENTITY .. "pumpjack/pumpjack-radius-visualization.png", @@ -2016,22 +1796,28 @@ data:extend({ }, monitor_visualization_tint = {r=78, g=173, b=255}, base_render_layer = "lower-object-above-shadow", - animations = { - filename = "__angelssmelting__/graphics/entity/chemical-furnace/hr-chemical-furnace-base_01.png", - width = 332, - height = 374, - frame_count = 1, - tint = {0.5, 0.7, 1}, - shift = util.by_pixel(-1, -11.5), - scale = 0.5 + + graphics_set = { + animation = { + filename = "__angelssmeltinggraphics__/graphics/entity/chemical-furnace/chemical-furnace-base_01.png", + width = 332, + height = 374, + frame_count = 1, + tint = {0.5, 0.7, 1}, + shift = util.by_pixel(-1, -11.5), + scale = 0.5 + } } - }, + } +}) +data:extend({ { type = "mining-drill", name = "nullius-geothermal-build-2", icons = data.raw.item["nullius-geothermal-plant-2"].icons, - flags = {"placeable-neutral", "player-creation", "hidden", "not-upgradable", "not-deconstructable"}, + flags = {"placeable-neutral", "player-creation", "not-upgradable", "not-deconstructable"}, + hidden = true, minable = { mining_time = 2.4, result = "nullius-geothermal-plant-2" }, resource_categories = {"basic-fluid"}, max_health = 600, @@ -2049,8 +1835,8 @@ data:extend({ mining_speed = 1, resource_searching_radius = 0.49, vector_to_place_result = {0, 0}, - vehicle_impact_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].vehicle_impact_sound, - working_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].working_sound, + impact_category = "metal", + working_sound = data.raw["mining-drill"]["nullius-geothermal-build-1"].working_sound, fast_replaceable_group = "geothermal-plant", radius_visualisation_picture = { filename = BASEENTITY .. "pumpjack/pumpjack-radius-visualization.png", @@ -2059,14 +1845,17 @@ data:extend({ }, monitor_visualization_tint = {r=78, g=173, b=255}, base_render_layer = "lower-object-above-shadow", - animations = { - filename = "__angelssmelting__/graphics/entity/chemical-furnace/hr-chemical-furnace-base_01.png", - width = 332, - height = 374, - frame_count = 1, - tint = {0.85, 0.75, 1}, - shift = util.by_pixel(-1, -11.5), - scale = 0.5 + + graphics_set = { + animation = { + filename = "__angelssmeltinggraphics__/graphics/entity/chemical-furnace/chemical-furnace-base_01.png", + width = 332, + height = 374, + frame_count = 1, + tint = {0.85, 0.75, 1}, + shift = util.by_pixel(-1, -11.5), + scale = 0.5 + } } }, @@ -2074,7 +1863,8 @@ data:extend({ type = "mining-drill", name = "nullius-geothermal-build-3", icons = data.raw.item["nullius-geothermal-plant-3"].icons, - flags = {"placeable-neutral", "player-creation", "hidden", "not-upgradable", "not-deconstructable"}, + flags = {"placeable-neutral", "player-creation", "not-upgradable", "not-deconstructable"}, + hidden = true, minable = { mining_time = 3, result = "nullius-geothermal-plant-3" }, resource_categories = {"basic-fluid"}, max_health = 750, @@ -2092,8 +1882,8 @@ data:extend({ mining_speed = 1, resource_searching_radius = 0.49, vector_to_place_result = {0, 0}, - vehicle_impact_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].vehicle_impact_sound, - working_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].working_sound, + impact_category = "metal", + working_sound = data.raw["mining-drill"]["nullius-geothermal-build-1"].working_sound, fast_replaceable_group = "geothermal-plant", radius_visualisation_picture = { filename = BASEENTITY .. "pumpjack/pumpjack-radius-visualization.png", @@ -2102,13 +1892,15 @@ data:extend({ }, monitor_visualization_tint = {r=78, g=173, b=255}, base_render_layer = "lower-object-above-shadow", - animations = { - filename = "__angelssmelting__/graphics/entity/chemical-furnace/hr-chemical-furnace-base_01.png", - width = 332, - height = 374, - frame_count = 1, - shift = util.by_pixel(-1, -11.5), - scale = 0.5 + graphics_set = { + animation = { + filename = "__angelssmeltinggraphics__/graphics/entity/chemical-furnace/chemical-furnace-base_01.png", + width = 332, + height = 374, + frame_count = 1, + shift = util.by_pixel(-1, -11.5), + scale = 0.5 + } } }, @@ -2120,6 +1912,7 @@ data:extend({ minable = { mining_time = 1.8, result = "nullius-geothermal-plant-1" }, placeable_by = {item = "nullius-geothermal-plant-1", count = 1}, max_health = 500, + hidden_in_factoriopedia = true, corpse = "big-remnants", dying_explosion = "medium-explosion", collision_box = {{-2.4, -2.4}, {2.4, 2.4}}, @@ -2130,13 +1923,15 @@ data:extend({ { type = "impact", decrease = 50, percent = 80 } }, energy_source = {type = "void"}, - working_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].working_sound, - vehicle_impact_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].vehicle_impact_sound, + working_sound = data.raw["mining-drill"]["nullius-geothermal-build-1"].working_sound, + impact_category = "metal", fast_replaceable_group = "geothermal-plant", next_upgrade = "nullius-geothermal-build-2", + -- circuit_connector = circuit_connector_definitions["nullius-geothermal-reactor"], -- we decided to not have those for the geothermal plant + -- circuit_wire_max_distance = default_circuit_wire_max_distance, light = {intensity = 0.4, size = 9.9, shift = {0.0, 0.0}, color = {r = 1.0, g = 0.5, b = 0.0}}, working_light_picture = { - filename = "__angelssmelting__/graphics/entity/chemical-furnace/hr-chemical-furnace-base_02.png", + filename = "__angelssmeltinggraphics__/graphics/entity/chemical-furnace/chemical-furnace-base_02.png", width = 332, height = 374, shift = util.by_pixel(-1, -11.5), @@ -2144,12 +1939,16 @@ data:extend({ tint = {0.5, 0.7, 1} }, picture = { - filename = "__angelssmelting__/graphics/entity/chemical-furnace/hr-chemical-furnace-shadow_01.png", - width = 448, - height = 280, - shift = util.by_pixel(28, 12.5), - scale = 0.5, - draw_as_shadow = true + layers = { + { + filename = "__angelssmeltinggraphics__/graphics/entity/chemical-furnace/chemical-furnace-shadow_01.png", + width = 448, + height = 280, + shift = util.by_pixel(28, 12.5), + scale = 0.5, + draw_as_shadow = true + } + } }, consumption = "10MW", neighbour_bonus = 0, @@ -2178,6 +1977,7 @@ data:extend({ minable = { mining_time = 2.4, result = "nullius-geothermal-plant-2" }, placeable_by = {item = "nullius-geothermal-plant-2", count = 1}, max_health = 600, + hidden_in_factoriopedia = true, corpse = "big-remnants", dying_explosion = "medium-explosion", collision_box = {{-2.4, -2.4}, {2.4, 2.4}}, @@ -2188,13 +1988,15 @@ data:extend({ { type = "impact", decrease = 50, percent = 80 } }, energy_source = {type = "void"}, - working_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].working_sound, - vehicle_impact_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].vehicle_impact_sound, + working_sound = data.raw["mining-drill"]["nullius-geothermal-build-1"].working_sound, + impact_category = "metal", fast_replaceable_group = "geothermal-plant", next_upgrade = "nullius-geothermal-build-3", + -- circuit_connector = circuit_connector_definitions["nullius-geothermal-reactor"], + -- circuit_wire_max_distance = default_circuit_wire_max_distance, light = {intensity = 0.4, size = 9.9, shift = {0.0, 0.0}, color = {r = 1.0, g = 0.5, b = 0.0}}, working_light_picture = { - filename = "__angelssmelting__/graphics/entity/chemical-furnace/hr-chemical-furnace-base_02.png", + filename = "__angelssmeltinggraphics__/graphics/entity/chemical-furnace/chemical-furnace-base_02.png", width = 332, height = 374, shift = util.by_pixel(-1, -11.5), @@ -2227,6 +2029,7 @@ data:extend({ minable = { mining_time = 3, result = "nullius-geothermal-plant-3" }, placeable_by = {item = "nullius-geothermal-plant-3", count = 1}, max_health = 750, + hidden_in_factoriopedia = true, corpse = "big-remnants", dying_explosion = "medium-explosion", collision_box = {{-2.4, -2.4}, {2.4, 2.4}}, @@ -2237,12 +2040,14 @@ data:extend({ { type = "impact", decrease = 50, percent = 80 } }, energy_source = {type = "void"}, - working_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].working_sound, - vehicle_impact_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].vehicle_impact_sound, + working_sound = data.raw["mining-drill"]["nullius-geothermal-build-1"].working_sound, + impact_category = "metal", fast_replaceable_group = "geothermal-plant", + -- circuit_connector = circuit_connector_definitions["nullius-geothermal-reactor"], + -- circuit_wire_max_distance = default_circuit_wire_max_distance, light = {intensity = 0.4, size = 9.9, shift = {0.0, 0.0}, color = {r = 1.0, g = 0.5, b = 0.0}}, - working_light_picture = { - filename = "__angelssmelting__/graphics/entity/chemical-furnace/hr-chemical-furnace-base_02.png", + working_light_picture = { -- TODO: integrate the graphics with the heat pipes correctly + filename = "__angelssmeltinggraphics__/graphics/entity/chemical-furnace/chemical-furnace-base_02.png", width = 332, height = 374, shift = util.by_pixel(-1, -11.5), @@ -2277,24 +2082,15 @@ function make_heat_pipe_pictures(path, name_prefix, color, data) local tile_pictures = {} for i = 1, (t.variations or 1) do local sprite = - { - priority = "extra-high", - filename = path .. name_prefix .. "-" .. (t.name or string.gsub(key, "_", "-")) .. (t.ommit_number and ".png" or ("-" .. tostring(i) .. ".png")), - width = (t.width or 32), - height = (t.height or 32), - shift = t.shift, - tint = color, - hr_version = { priority = "extra-high", - filename = path .. "hr-" .. name_prefix .. "-" .. (t.name or string.gsub(key, "_", "-")) .. (t.ommit_number and ".png" or ("-" .. tostring(i) .. ".png")), + filename = path .. name_prefix .. "-" .. (t.name or string.gsub(key, "_", "-")) .. (t.ommit_number and ".png" or ("-" .. tostring(i) .. ".png")), width = (t.width or 32) * 2, height = (t.height or 32) * 2, scale = 0.5, shift = t.shift, tint = color } - } table.insert(tile_pictures, sprite) end all_pictures[key] = tile_pictures @@ -2324,15 +2120,16 @@ data:extend({ collision_box = {{-0.3, -0.3}, {0.3, 0.3}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, working_sound = data.raw["heat-pipe"]["heat-pipe"].working_sound, - vehicle_impact_sound = data.raw["heat-pipe"]["heat-pipe"].vehicle_impact_sound, + impact_category = data.raw["heat-pipe"]["heat-pipe"].impact_category, damaged_trigger_effect = data.raw["heat-pipe"]["heat-pipe"].damaged_trigger_effect, - min_temperature_gradient = 4, + heat_buffer = { max_temperature = 250, specific_heat = "100kJ", max_transfer = "30MW", minimum_glow_temperature = 150, connections = data.raw["heat-pipe"]["heat-pipe"].heat_buffer.connections, + min_temperature_gradient = 4, heat_glow = data.raw["heat-pipe"]["heat-pipe"].heat_buffer.heat_glow }, @@ -2401,15 +2198,16 @@ data:extend({ collision_box = {{-0.3, -0.3}, {0.3, 0.3}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, working_sound = data.raw["heat-pipe"]["heat-pipe"].working_sound, - vehicle_impact_sound = data.raw["heat-pipe"]["heat-pipe"].vehicle_impact_sound, + impact_category = data.raw["heat-pipe"]["heat-pipe"].impact_category, damaged_trigger_effect = data.raw["heat-pipe"]["heat-pipe"].damaged_trigger_effect, - min_temperature_gradient = 2, + heat_buffer = { max_temperature = 500, specific_heat = "250kJ", max_transfer = "80MW", minimum_glow_temperature = 200, connections = data.raw["heat-pipe"]["heat-pipe"].heat_buffer.connections, + min_temperature_gradient = 2, heat_glow = data.raw["heat-pipe"]["heat-pipe"].heat_buffer.heat_glow }, @@ -2477,17 +2275,18 @@ data:extend({ collision_box = {{-0.3, -0.3}, {0.3, 0.3}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, working_sound = data.raw["heat-pipe"]["heat-pipe"].working_sound, - vehicle_impact_sound = data.raw["heat-pipe"]["heat-pipe"].vehicle_impact_sound, + impact_category = data.raw["heat-pipe"]["heat-pipe"].impact_category, damaged_trigger_effect = data.raw["heat-pipe"]["heat-pipe"].damaged_trigger_effect, connection_sprites = data.raw["heat-pipe"]["heat-pipe"].connection_sprites, heat_glow_sprites = data.raw["heat-pipe"]["heat-pipe"].heat_glow_sprites, - min_temperature_gradient = 1, + heat_buffer = { max_temperature = 1500, specific_heat = "500kJ", max_transfer = "200MW", minimum_glow_temperature = 250, connections = data.raw["heat-pipe"]["heat-pipe"].heat_buffer.connections, + min_temperature_gradient = 1, heat_glow = data.raw["heat-pipe"]["heat-pipe"].heat_buffer.heat_glow } } @@ -2534,7 +2333,8 @@ data:extend({ localised_name = {"entity-name.nullius-thermal-tank-1"}, localised_description = {"entity-description.nullius-thermal-tank-1"}, icons = data.raw.item["nullius-thermal-tank-1"].icons, - flags = {"placeable-neutral", "player-creation", "hidden", "not-upgradable"}, + flags = {"placeable-neutral", "player-creation", "not-upgradable"}, + hidden_in_factoriopedia = true, minable = { mining_time = 1, result = "nullius-thermal-tank-1" }, placeable_by = {item = "nullius-thermal-tank-1", count = 1}, subgroup = "heat-storage", @@ -2549,15 +2349,17 @@ data:extend({ energy_source = { type = "electric", usage_priority = "tertiary", - emissions_per_minute = 0.02, + emissions_per_minute = {pollution = 0.02}, drain = "0W", render_no_power_icon = false, render_no_network_icon = false }, consumption = "2kW", - working_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].working_sound, - vehicle_impact_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].vehicle_impact_sound, + working_sound = data.raw["mining-drill"]["nullius-geothermal-build-1"].working_sound, + impact_category = "metal", light = {intensity = 0.4, size = 2.9, shift = {0.0, 0.0}, color = {r = 1.0, g = 0.5, b = 0.0}}, + -- circuit_connector = circuit_connector_definitions["storage-tank"][1], + -- circuit_wire_max_distance = default_circuit_wire_max_distance, picture = { layers = { { @@ -2577,25 +2379,25 @@ data:extend({ }, } }, - working_light_picture = { - layers = { - { - filename = ENTITYPATH .. "thermaltank/thermaltank1.png", - width = 180, - height = 180, - scale = 0.73, - shift = {0.28,-0.3} - }, - { - filename = ENTITYPATH .. "thermaltank/thermaltank-shadow.png", - width = 230, - height = 180, - scale = 0.73, - shift = {0.28,-0.3}, - draw_as_shadow = true, - }, - } - }, + -- working_light_picture = { + -- layers = { + -- { + -- filename = ENTITYPATH .. "thermaltank/thermaltank1.png", + -- width = 180, + -- height = 180, + -- scale = 0.73, + -- shift = {0.28,-0.3} + -- }, + -- { + -- filename = ENTITYPATH .. "thermaltank/thermaltank-shadow.png", + -- width = 230, + -- height = 180, + -- scale = 0.73, + -- shift = {0.28,-0.3}, + -- draw_as_shadow = true, + -- }, + -- } + -- }, neighbour_bonus = 0, heat_buffer = { max_temperature = 250, @@ -2623,7 +2425,8 @@ data:extend({ localised_name = {"entity-name.nullius-thermal-tank-2"}, localised_description = {"entity-description.nullius-thermal-tank-2"}, icons = data.raw.item["nullius-thermal-tank-2"].icons, - flags = {"placeable-neutral", "player-creation", "hidden", "not-upgradable"}, + flags = {"placeable-neutral", "player-creation", "not-upgradable"}, + hidden_in_factoriopedia = true, minable = { mining_time = 1.5, result = "nullius-thermal-tank-2" }, placeable_by = {item = "nullius-thermal-tank-2", count = 1}, subgroup = "heat-storage", @@ -2638,15 +2441,17 @@ data:extend({ energy_source = { type = "electric", usage_priority = "tertiary", - emissions_per_minute = 0.02, + emissions_per_minute = {pollution = 0.02}, drain = "0W", render_no_power_icon = false, render_no_network_icon = false }, consumption = "5kW", - working_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].working_sound, - vehicle_impact_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].vehicle_impact_sound, + working_sound = data.raw["mining-drill"]["nullius-geothermal-build-1"].working_sound, + impact_category = "metal", light = {intensity = 0.4, size = 2.9, shift = {0.0, 0.0}, color = {r = 1.0, g = 0.5, b = 0.0}}, + -- circuit_connector = circuit_connector_definitions["storage-tank"][1], + -- circuit_wire_max_distance = default_circuit_wire_max_distance, picture = { layers = { { @@ -2666,25 +2471,25 @@ data:extend({ }, } }, - working_light_picture = { - layers = { - { - filename = ENTITYPATH .. "thermaltank/thermaltank2.png", - width = 180, - height = 180, - scale = 0.73, - shift = {0.28,-0.3} - }, - { - filename = ENTITYPATH .. "thermaltank/thermaltank-shadow.png", - width = 230, - height = 180, - scale = 0.73, - shift = {0.28,-0.3}, - draw_as_shadow = true, - }, - } - }, + -- working_light_picture = { + -- layers = { + -- { + -- filename = ENTITYPATH .. "thermaltank/thermaltank2.png", + -- width = 180, + -- height = 180, + -- scale = 0.73, + -- shift = {0.28,-0.3} + -- }, + -- { + -- filename = ENTITYPATH .. "thermaltank/thermaltank-shadow.png", + -- width = 230, + -- height = 180, + -- scale = 0.73, + -- shift = {0.28,-0.3}, + -- draw_as_shadow = true, + -- }, + -- } + -- }, neighbour_bonus = 0, heat_buffer = { max_temperature = 500, @@ -2712,7 +2517,8 @@ data:extend({ localised_name = {"entity-name.nullius-thermal-tank-3"}, localised_description = {"entity-description.nullius-thermal-tank-3"}, icons = data.raw.item["nullius-thermal-tank-3"].icons, - flags = {"placeable-neutral", "player-creation", "hidden", "not-upgradable"}, + flags = {"placeable-neutral", "player-creation", "not-upgradable"}, + hidden_in_factoriopedia = true, minable = { mining_time = 2, result = "nullius-thermal-tank-3" }, placeable_by = {item = "nullius-thermal-tank-3", count = 1}, subgroup = "heat-storage", @@ -2727,15 +2533,17 @@ data:extend({ energy_source = { type = "electric", usage_priority = "tertiary", - emissions_per_minute = 0.02, + emissions_per_minute = {pollution = 0.02}, drain = "0W", render_no_power_icon = false, render_no_network_icon = false }, consumption = "20kW", - working_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].working_sound, - vehicle_impact_sound = data.raw["assembling-machine"]["angels-chemical-furnace"].vehicle_impact_sound, + working_sound = data.raw["mining-drill"]["nullius-geothermal-build-1"].working_sound, + impact_category = "metal", light = {intensity = 0.4, size = 2.9, shift = {0.0, 0.0}, color = {r = 1.0, g = 0.5, b = 0.0}}, + -- circuit_connector = circuit_connector_definitions["storage-tank"][1], + -- circuit_wire_max_distance = default_circuit_wire_max_distance, picture = { layers = { { @@ -2755,25 +2563,25 @@ data:extend({ }, } }, - working_light_picture = { - layers = { - { - filename = ENTITYPATH .. "thermaltank/thermaltank3.png", - width = 180, - height = 180, - scale = 0.73, - shift = {0.3,-0.3} - }, - { - filename = ENTITYPATH .. "thermaltank/thermaltank-shadow.png", - width = 230, - height = 180, - scale = 0.73, - shift = {0.3,-0.3}, - draw_as_shadow = true, - }, - } - }, + -- working_light_picture = { --is drawn over circuit connector + -- layers = { + -- { + -- filename = ENTITYPATH .. "thermaltank/thermaltank3.png", + -- width = 180, + -- height = 180, + -- scale = 0.73, + -- shift = {0.3,-0.3} + -- }, + -- { + -- filename = ENTITYPATH .. "thermaltank/thermaltank-shadow.png", + -- width = 230, + -- height = 180, + -- scale = 0.73, + -- shift = {0.3,-0.3}, + -- draw_as_shadow = true, + -- }, + -- } + -- }, neighbour_bonus = 0, heat_buffer = { max_temperature = 1500, @@ -2818,6 +2626,12 @@ local function thermal_tank(tier, vert) { position = {-1, 0}, direction = defines.direction.west } } end + + tank.circuit_wire_max_distance = default_circuit_wire_max_distance + tank.circuit_connector = circuit_connector_definitions.create_single( + universal_connector_template, + { variation = 25, main_offset = util.by_pixel(-33.5, 15.5), shadow_offset = util.by_pixel(-33.5, 19.5), show_shadow = false } + ) tank.icons = { { @@ -2866,7 +2680,8 @@ data:extend({ localised_name = {"entity-name.nullius-thermal-tank-1"}, localised_description = {"entity-description.nullius-thermal-tank-1"}, icons = data.raw.item["nullius-thermal-tank-1"].icons, - flags = {"placeable-neutral", "player-creation", "not-upgradable", "hidden", "not-deconstructable" }, + flags = {"placeable-neutral", "player-creation", "not-upgradable", "not-deconstructable" }, + hidden_in_factoriopedia = true, minable = { mining_time = 1, result = "nullius-thermal-tank-1" }, subgroup = "heat-storage", order = "ubc", @@ -2877,14 +2692,16 @@ data:extend({ { type = "fire", decrease = 100, percent = 90 }, { type = "impact", decrease = 50, percent = 80 } }, + circuit_wire_max_distance = default_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["storage-tank"], + fast_replaceable_group = "thermal-tank", two_direction_only = true, fluid_box = { - height = 2, - base_area = 5, + volume = 500, pipe_connections = { - { position = {0, 2} }, - { position = {0, -2} } + { position = {0, 1}, direction = defines.direction.south }, + { position = {0, -1}, direction = defines.direction.north } } }, window_bounding_box = {{-0.125, 0.6875}, {0.1875, 1.1875}}, @@ -2977,13 +2794,16 @@ data:extend({ localised_name = {"entity-name.nullius-thermal-tank-2"}, localised_description = {"entity-description.nullius-thermal-tank-2"}, icons = data.raw.item["nullius-thermal-tank-2"].icons, - flags = {"placeable-neutral", "player-creation", "not-upgradable", "hidden", "not-deconstructable" }, + flags = {"placeable-neutral", "player-creation", "not-upgradable", "not-deconstructable" }, + hidden = true, minable = { mining_time = 1, result = "nullius-thermal-tank-2" }, subgroup = "heat-storage", order = "ubc", max_health = 300, collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, + circuit_wire_max_distance = default_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["storage-tank"], resistances = { { type = "fire", decrease = 80, percent = 90 }, { type = "impact", decrease = 50, percent = 80 } @@ -2991,11 +2811,10 @@ data:extend({ fast_replaceable_group = "thermal-tank", two_direction_only = true, fluid_box = { - height = 2, - base_area = 20, + volume = 500, pipe_connections = { - { position = {0, 2} }, - { position = {0, -2} } + { position = {0, 1}, direction = defines.direction.south }, + { position = {0, -1}, direction = defines.direction.north } } }, window_bounding_box = {{-0.125, 0.6875}, {0.1875, 1.1875}}, @@ -3008,13 +2827,16 @@ data:extend({ localised_name = {"entity-name.nullius-thermal-tank-3"}, localised_description = {"entity-description.nullius-thermal-tank-3"}, icons = data.raw.item["nullius-thermal-tank-3"].icons, - flags = {"placeable-neutral", "player-creation", "not-upgradable", "hidden", "not-deconstructable"}, + flags = {"placeable-neutral", "player-creation", "not-upgradable", "not-deconstructable"}, + hidden = true, minable = { mining_time = 1, result = "nullius-thermal-tank-3" }, subgroup = "heat-storage", order = "ubd", max_health = 400, collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, + circuit_wire_max_distance = default_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["storage-tank"], resistances = { { type = "fire", decrease = 100, percent = 90 }, { type = "impact", decrease = 60, percent = 80 } @@ -3022,11 +2844,10 @@ data:extend({ fast_replaceable_group = "thermal-tank", two_direction_only = true, fluid_box = { - height = 2, - base_area = 150, + volume = 500, pipe_connections = { - { position = {0, 2} }, - { position = {0, -2} } + { position = {0, 1}, direction = defines.direction.south }, + { position = {0, -1}, direction = defines.direction.north } } }, window_bounding_box = {{-0.125, 0.6875}, {0.1875, 1.1875}}, @@ -3040,7 +2861,6 @@ data:extend({ flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1.2, result = "nullius-stirling-engine-1"}, max_health = 400, - fast_replaceable_group = "stirling-engine", next_upgrade = "nullius-stirling-engine-2", dying_explosion = "medium-explosion", corpse = "steam-engine-remnants", @@ -3063,7 +2883,7 @@ data:extend({ render_no_power_icon = false }, damaged_trigger_effect = data.raw.generator["steam-engine"].damaged_trigger_effect, - vehicle_impact_sound = data.raw.generator["steam-engine"].vehicle_impact_sound, + impact_category = data.raw.generator["steam-engine"].impact_category, open_sound = data.raw.generator["steam-engine"].open_sound, close_sound = data.raw.generator["steam-engine"].close_sound, working_sound = data.raw.generator["steam-engine"].working_sound, @@ -3072,60 +2892,32 @@ data:extend({ render_layer = "lower-object", pictures = { north = { - filename = BASEENTITY .. "steam-engine/steam-engine-V.png", - width = 112, - height = 195, - shift = util.by_pixel(5, -6.5), - scale = 0.95, - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-V.png", + filename = BASEENTITY .. "steam-engine/steam-engine-V.png", width = 225, height = 391, shift = util.by_pixel(4.75, -6.25), scale = 0.475 - } }, east = { - filename = BASEENTITY .. "steam-engine/steam-engine-H.png", - width = 176, - height = 128, - shift = util.by_pixel(1, -5), - scale = 0.95, - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-H.png", + filename = BASEENTITY .. "steam-engine/steam-engine-H.png", width = 352, height = 257, shift = util.by_pixel(1, -4.75), scale = 0.475 - } }, south = { - filename = BASEENTITY .. "steam-engine/steam-engine-V.png", - width = 112, - height = 195, - shift = util.by_pixel(5, -6.5), - scale = 0.97, - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-V.png", + filename = BASEENTITY .. "steam-engine/steam-engine-V.png", width = 225, height = 391, shift = util.by_pixel(4.75, -6.25), scale = 0.475 - } }, west = { - filename = BASEENTITY .. "steam-engine/steam-engine-H.png", - width = 176, - height = 128, - shift = util.by_pixel(1, -5), - scale = 0.95, - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-H.png", + filename = BASEENTITY .. "steam-engine/steam-engine-H.png", width = 352, height = 257, shift = util.by_pixel(1, -4.75), scale = 0.475 - } } } }, @@ -3160,7 +2952,7 @@ data:extend({ render_no_power_icon = false }, damaged_trigger_effect = data.raw.generator["steam-engine"].damaged_trigger_effect, - vehicle_impact_sound = data.raw.generator["steam-engine"].vehicle_impact_sound, + impact_category = data.raw.generator["steam-engine"].impact_category, open_sound = data.raw.generator["steam-engine"].open_sound, close_sound = data.raw.generator["steam-engine"].close_sound, working_sound = data.raw.generator["steam-engine"].working_sound, @@ -3169,60 +2961,32 @@ data:extend({ render_layer = "lower-object", pictures = { north = { - filename = BASEENTITY .. "steam-engine/steam-engine-V.png", - width = 112, - height = 195, - shift = util.by_pixel(5, -6.5), - scale = 0.95, - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-V.png", + filename = BASEENTITY .. "steam-engine/steam-engine-V.png", width = 225, height = 391, shift = util.by_pixel(4.75, -6.25), scale = 0.475 - } }, east = { - filename = BASEENTITY .. "steam-engine/steam-engine-H.png", - width = 176, - height = 128, - shift = util.by_pixel(1, -5), - scale = 0.95, - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-H.png", + filename = BASEENTITY .. "steam-engine/steam-engine-H.png", width = 352, height = 257, shift = util.by_pixel(1, -4.75), scale = 0.475 - } }, south = { - filename = BASEENTITY .. "steam-engine/steam-engine-V.png", - width = 112, - height = 195, - shift = util.by_pixel(5, -6.5), - scale = 0.95, - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-V.png", + filename = BASEENTITY .. "steam-engine/steam-engine-V.png", width = 225, height = 391, shift = util.by_pixel(4.75, -6.25), scale = 0.475 - } }, west = { - filename = BASEENTITY .. "steam-engine/steam-engine-H.png", - width = 176, - height = 128, - shift = util.by_pixel(1, -5), - scale = 0.95, - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-H.png", + filename = BASEENTITY .. "steam-engine/steam-engine-H.png", width = 352, height = 257, shift = util.by_pixel(1, -4.75), scale = 0.475 - } } } }, @@ -3256,7 +3020,7 @@ data:extend({ render_no_power_icon = false }, damaged_trigger_effect = data.raw.generator["steam-engine"].damaged_trigger_effect, - vehicle_impact_sound = data.raw.generator["steam-engine"].vehicle_impact_sound, + impact_category = data.raw.generator["steam-engine"].impact_category, open_sound = data.raw.generator["steam-engine"].open_sound, close_sound = data.raw.generator["steam-engine"].close_sound, working_sound = data.raw.generator["steam-engine"].working_sound, @@ -3265,60 +3029,32 @@ data:extend({ render_layer = "lower-object", pictures = { north = { - filename = BASEENTITY .. "steam-engine/steam-engine-V.png", - width = 112, - height = 195, - shift = util.by_pixel(5, -6.5), - scale = 0.95, - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-V.png", + filename = BASEENTITY .. "steam-engine/steam-engine-V.png", width = 225, height = 391, shift = util.by_pixel(4.75, -6.25), scale = 0.475 - } }, east = { - filename = BASEENTITY .. "steam-engine/steam-engine-H.png", - width = 176, - height = 128, - shift = util.by_pixel(1, -5), - scale = 0.95, - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-H.png", + filename = BASEENTITY .. "steam-engine/steam-engine-H.png", width = 352, height = 257, shift = util.by_pixel(1, -4.75), scale = 0.475 - } }, south = { - filename = BASEENTITY .. "steam-engine/steam-engine-V.png", - width = 112, - height = 195, - shift = util.by_pixel(5, -6.5), - scale = 0.95, - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-V.png", + filename = BASEENTITY .. "steam-engine/steam-engine-V.png", width = 225, height = 391, shift = util.by_pixel(4.75, -6.25), scale = 0.475 - } }, west = { - filename = BASEENTITY .. "steam-engine/steam-engine-H.png", - width = 176, - height = 128, - shift = util.by_pixel(1, -5), - scale = 0.95, - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-H.png", + filename = BASEENTITY .. "steam-engine/steam-engine-H.png", width = 352, height = 257, shift = util.by_pixel(1, -4.75), scale = 0.475 - } } } } @@ -3331,8 +3067,9 @@ data:extend({ icons = data.raw.item["nullius-stirling-engine-1"].icons, order = "c", flags = {"placeable-neutral","player-creation","not-blueprintable"}, + hidden_in_factoriopedia = true, collision_box = {{-0.5, -2.2}, {0.5, 2.2}}, - collision_mask = { }, + collision_mask = { layers = {}}, selectable_in_game = false, gui_mode = "none", heat_buffer = { @@ -3361,8 +3098,9 @@ data:extend({ icons = data.raw.item["nullius-stirling-engine-1"].icons, order = "c", flags = {"placeable-neutral","player-creation","not-blueprintable"}, + hidden_in_factoriopedia = true, collision_box = {{-2.2, -0.5}, {2.2, 0.5}}, - collision_mask = { }, + collision_mask = { layers = {}}, selectable_in_game = false, gui_mode = "none", heat_buffer = { @@ -3391,8 +3129,9 @@ data:extend({ icons = data.raw.item["nullius-stirling-engine-2"].icons, order = "c", flags = {"placeable-neutral","player-creation","not-blueprintable"}, + hidden_in_factoriopedia = true, collision_box = {{-0.5, -2.2}, {0.5, 2.2}}, - collision_mask = { }, + collision_mask = { layers = {}}, selectable_in_game = false, gui_mode = "none", heat_buffer = { @@ -3421,8 +3160,9 @@ data:extend({ icons = data.raw.item["nullius-stirling-engine-2"].icons, order = "c", flags = {"placeable-neutral","player-creation","not-blueprintable"}, + hidden_in_factoriopedia = true, collision_box = {{-2.2, -0.5}, {2.2, 0.5}}, - collision_mask = { }, + collision_mask = { layers = {}}, selectable_in_game = false, gui_mode = "none", heat_buffer = { @@ -3451,8 +3191,9 @@ data:extend({ icons = data.raw.item["nullius-stirling-engine-3"].icons, order = "c", flags = {"placeable-neutral","player-creation","not-blueprintable"}, + hidden_in_factoriopedia = true, collision_box = {{-0.5, -2.2}, {0.5, 2.2}}, - collision_mask = { }, + collision_mask = { layers = {}}, selectable_in_game = false, gui_mode = "none", heat_buffer = { @@ -3481,8 +3222,9 @@ data:extend({ icons = data.raw.item["nullius-stirling-engine-3"].icons, order = "c", flags = {"placeable-neutral","player-creation","not-blueprintable"}, + hidden_in_factoriopedia = true, collision_box = {{-2.2, -0.5}, {2.2, 0.5}}, - collision_mask = { }, + collision_mask = { layers = {}}, selectable_in_game = false, gui_mode = "none", heat_buffer = { @@ -3508,15 +3250,7 @@ data:extend({ { type = "animation", name = "nullius-stirling-horizontal-shadow", - filename = BASEENTITY .. "steam-engine/steam-engine-H-shadow.png", - width = 254, - height = 80, - frame_count = 32, - line_length = 8, - draw_as_shadow = true, - shift = util.by_pixel(48, 24), - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-H-shadow.png", + filename = BASEENTITY .. "steam-engine/steam-engine-H-shadow.png", width = 508, height = 160, frame_count = 32, @@ -3524,20 +3258,11 @@ data:extend({ draw_as_shadow = true, shift = util.by_pixel(48, 24), scale = 0.5 - } }, { type = "animation", name = "nullius-stirling-vertical-shadow", - filename = BASEENTITY .. "steam-engine/steam-engine-V-shadow.png", - width = 165, - height = 153, - frame_count = 32, - line_length = 8, - draw_as_shadow = true, - shift = util.by_pixel(40.5, 9.5), - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-V-shadow.png", + filename = BASEENTITY .. "steam-engine/steam-engine-V-shadow.png", width = 330, height = 307, frame_count = 32, @@ -3545,7 +3270,6 @@ data:extend({ draw_as_shadow = true, shift = util.by_pixel(40.5, 9.25), scale = 0.5 - } }, { @@ -3553,15 +3277,7 @@ data:extend({ name = "nullius-stirling-horizontal-turbine-1", layers = { { - filename = BASEENTITY .. "steam-engine/steam-engine-H.png", - width = 176, - height = 128, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(1, -5), - tint = {0.8, 0.8, 0.6}, - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-H.png", + filename = BASEENTITY .. "steam-engine/steam-engine-H.png", width = 352, height = 257, frame_count = 32, @@ -3569,20 +3285,11 @@ data:extend({ shift = util.by_pixel(1, -4.75), tint = {0.8, 0.8, 0.6}, scale = 0.5 - } }, { - type = "animation", - name = "nullius-stirling-horizontal-shadow", - filename = BASEENTITY .. "steam-engine/steam-engine-H-shadow.png", - width = 254, - height = 80, - frame_count = 32, - line_length = 8, - draw_as_shadow = true, - shift = util.by_pixel(48, 24), - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-H-shadow.png", + --type = "animation", + --name = "nullius-stirling-horizontal-shadow", + filename = BASEENTITY .. "steam-engine/steam-engine-H-shadow.png", width = 508, height = 160, frame_count = 32, @@ -3590,7 +3297,6 @@ data:extend({ draw_as_shadow = true, shift = util.by_pixel(48, 24), scale = 0.5 - } } } }, @@ -3599,15 +3305,7 @@ data:extend({ name = "nullius-stirling-vertical-turbine-1", layers = { { - filename = BASEENTITY .. "steam-engine/steam-engine-V.png", - width = 112, - height = 195, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(5, -6.5), - tint = {0.8, 0.8, 0.6}, - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-V.png", + filename = BASEENTITY .. "steam-engine/steam-engine-V.png", width = 225, height = 391, frame_count = 32, @@ -3615,18 +3313,9 @@ data:extend({ shift = util.by_pixel(4.75, -6.25), tint = {0.8, 0.8, 0.6}, scale = 0.5 - } }, { - filename = BASEENTITY .. "steam-engine/steam-engine-V-shadow.png", - width = 165, - height = 153, - frame_count = 32, - line_length = 8, - draw_as_shadow = true, - shift = util.by_pixel(40.5, 9.5), - hr_version = { - filename = BASEENTITY .. "steam-engine/hr-steam-engine-V-shadow.png", + filename = BASEENTITY .. "steam-engine/steam-engine-V-shadow.png", width = 330, height = 307, frame_count = 32, @@ -3634,10 +3323,9 @@ data:extend({ draw_as_shadow = true, shift = util.by_pixel(40.5, 9.25), scale = 0.5 - } }, { - filename = BASEENTITY .. "pipe-covers/hr-pipe-cover-south.png", + filename = BASEENTITY .. "pipe-covers/pipe-cover-south.png", width = 128, height = 128, scale = 0.5, @@ -3646,7 +3334,7 @@ data:extend({ shift = {0, 2.96} }, { - filename = BASEENTITY .. "heat-pipe/hr-heat-pipe-ending-down-1.png", + filename = BASEENTITY .. "heat-pipe/heat-pipe-ending-down-1.png", width = 64, height = 27, scale = 0.5, @@ -3659,18 +3347,10 @@ data:extend({ }) if mods["reskins-bobs"] then -data.raw["animation"]["nullius-stirling-horizontal-turbine-1"].layers = { + data.raw["animation"]["nullius-stirling-horizontal-turbine-1"].layers = { data.raw["animation"]["nullius-stirling-horizontal-turbine-1"].layers[1], { - filename = "__reskins-bobs__/graphics/entity/power/steam-engine/steam-engine-H-mask.png", - width = 176, - height = 128, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(1, -5), - tint = tiercolor("yellow"), - hr_version = { - filename = "__reskins-bobs__/graphics/entity/power/steam-engine/hr-steam-engine-H-mask.png", + filename = "__reskins-bobs__/graphics/entity/power/steam-engine/steam-engine-H-mask.png", width = 352, height = 257, frame_count = 32, @@ -3678,18 +3358,9 @@ data.raw["animation"]["nullius-stirling-horizontal-turbine-1"].layers = { shift = util.by_pixel(1, -4.75), tint = tiercolor("yellow"), scale = 0.5 - } }, { - filename = "__reskins-bobs__/graphics/entity/power/steam-engine/steam-engine-H-highlights.png", - width = 176, - height = 128, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(1, -5), - blend_mode = "additive", - hr_version = { - filename = "__reskins-bobs__/graphics/entity/power/steam-engine/hr-steam-engine-H-highlights.png", + filename = "__reskins-bobs__/graphics/entity/power/steam-engine/steam-engine-H-highlights.png", width = 352, height = 257, frame_count = 32, @@ -3697,22 +3368,13 @@ data.raw["animation"]["nullius-stirling-horizontal-turbine-1"].layers = { shift = util.by_pixel(1, -4.75), blend_mode = "additive", scale = 0.5 - } }, data.raw["animation"]["nullius-stirling-horizontal-turbine-1"].layers[2] } -data.raw["animation"]["nullius-stirling-vertical-turbine-1"].layers = { + data.raw["animation"]["nullius-stirling-vertical-turbine-1"].layers = { data.raw["animation"]["nullius-stirling-vertical-turbine-1"].layers[1], { - filename = "__reskins-bobs__/graphics/entity/power/steam-engine/steam-engine-V-mask.png", - width = 112, - height = 195, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(5, -6.5), - tint = tiercolor("yellow"), - hr_version = { - filename = "__reskins-bobs__/graphics/entity/power/steam-engine/hr-steam-engine-V-mask.png", + filename = "__reskins-bobs__/graphics/entity/power/steam-engine/steam-engine-V-mask.png", width = 225, height = 391, frame_count = 32, @@ -3720,18 +3382,9 @@ data.raw["animation"]["nullius-stirling-vertical-turbine-1"].layers = { shift = util.by_pixel(4.75, -6.25), tint = tiercolor("yellow"), scale = 0.5 - } }, { - filename = "__reskins-bobs__/graphics/entity/power/steam-engine/steam-engine-V-highlights.png", - width = 112, - height = 195, - frame_count = 32, - line_length = 8, - shift = util.by_pixel(5, -6.5), - blend_mode = "additive", - hr_version = { - filename = "__reskins-bobs__/graphics/entity/power/steam-engine/hr-steam-engine-V-highlights.png", + filename = "__reskins-bobs__/graphics/entity/power/steam-engine/steam-engine-V-highlights.png", width = 225, height = 391, frame_count = 32, @@ -3739,14 +3392,11 @@ data.raw["animation"]["nullius-stirling-vertical-turbine-1"].layers = { shift = util.by_pixel(4.75, -6.25), blend_mode = "additive", scale = 0.5 - } }, data.raw["animation"]["nullius-stirling-vertical-turbine-1"].layers[2] } data.raw["animation"]["nullius-stirling-horizontal-turbine-1"].layers[1].tint = nil -data.raw["animation"]["nullius-stirling-horizontal-turbine-1"].layers[1].hr_version.tint = nil data.raw["animation"]["nullius-stirling-vertical-turbine-1"].layers[1].tint = nil -data.raw["animation"]["nullius-stirling-vertical-turbine-1"].layers[1].hr_version.tint = nil end local stirling2h = util.table.deepcopy(data.raw["animation"]["nullius-stirling-horizontal-turbine-1"]) @@ -3760,24 +3410,23 @@ stirling3v.name = "nullius-stirling-vertical-turbine-3" if mods["reskins-bobs"] then stirling2h.layers[2].tint = tiercolor("orange") -stirling2h.layers[2].hr_version.tint = tiercolor("orange") stirling2v.layers[2].tint = tiercolor("orange") -stirling2v.layers[2].hr_version.tint = tiercolor("orange") stirling3h.layers[2].tint = tiercolor("red") -stirling3h.layers[2].hr_version.tint = tiercolor("red") stirling3v.layers[2].tint = tiercolor("red") -stirling3v.layers[2].hr_version.tint = tiercolor("red") else stirling2h.layers[1].tint = {0.75, 0.75, 0.95} -stirling2h.layers[1].hr_version.tint = {0.75, 0.75, 0.95} stirling2v.layers[1].tint = {0.75, 0.75, 0.95} -stirling2v.layers[1].hr_version.tint = {0.75, 0.75, 0.95} stirling3h.layers[1].tint = nil -stirling3h.layers[1].hr_version.tint = nil stirling3v.layers[1].tint = nil -stirling3v.layers[1].hr_version.tint = nil end +circuit_connector_definitions["nullius-solar-collector"] = circuit_connector_definitions.create_single +( + universal_connector_template, + { variation = 19, main_offset = util.by_pixel(75, 35), shadow_offset = util.by_pixel(75, 30), show_shadow = true } +) + + data:extend({ stirling2h, stirling2v, @@ -3789,9 +3438,9 @@ data:extend({ name = "nullius-reactor", icon = "__base__/graphics/icons/nuclear-reactor.png", icon_size = 64, - icon_mipmaps = 4, flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 4, result = "nullius-reactor"}, + collision_mask = collision_mask_util.get_default_mask("rocket-silo"), max_health = 500, corpse = "nuclear-reactor-remnants", dying_explosion = "nuclear-reactor-explosion", @@ -3804,7 +3453,7 @@ data:extend({ heat_lower_layer_picture = data.raw.reactor["nuclear-reactor"].heat_lower_layer_picture, picture = data.raw.reactor["nuclear-reactor"].picture, light = {intensity = 0.8, size = 9.9, shift = {0.0, 0.0}}, - use_fuel_glow_color = true, + use_fuel_glow_color = true, working_light_picture = { filename = ENTITYPATH.."reactor/reactor-lights.png", blend_mode = "additive", @@ -3816,7 +3465,7 @@ data:extend({ }, energy_source = { type = "burner", - fuel_category = "nullius-nuclear", + fuel_categories = {"nullius-nuclear"}, effectivity = 1, fuel_inventory_size = 1, burnt_inventory_size = 1 @@ -3834,17 +3483,19 @@ data:extend({ connection_patches_disconnected = data.raw.reactor["nuclear-reactor"].connection_patches_disconnected, heat_connection_patches_connected = data.raw.reactor["nuclear-reactor"].heat_connection_patches_connected, heat_connection_patches_disconnected = data.raw.reactor["nuclear-reactor"].heat_connection_patches_disconnected, - vehicle_impact_sound = data.raw.reactor["nuclear-reactor"].vehicle_impact_sound, + impact_category = data.raw.reactor["nuclear-reactor"].impact_category, open_sound = data.raw.reactor["nuclear-reactor"].open_sound, close_sound = data.raw.reactor["nuclear-reactor"].close_sound, working_sound = data.raw.reactor["nuclear-reactor"].working_sound, - meltdown_action = data.raw.reactor["nuclear-reactor"].meltdown_action + meltdown_action = data.raw.reactor["nuclear-reactor"].meltdown_action, + circuit_wire_max_distance = reactor_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["nuclear-reactor"], }, { type = "reactor", name = "nullius-solar-collector-1", - localised_name = {"", {"entity-name.nullius-solar-collector"}, " ", 1}, + localised_name = {"", {"entity-name.nullius-solar-collector"}, " ", tostring(1)}, icons = data.raw.item["nullius-solar-collector-1"].icons, flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1.2, result = "nullius-solar-collector-1"}, @@ -3855,7 +3506,9 @@ data:extend({ consumption = "150W", energy_source = { type = "void" }, neighbour_bonus = 0.1, - neighbour_collision_increase = 0.1, + --neighbour_collision_increase = 0.1, + -- circuit_connector = circuit_connector_definitions["nullius-solar-collector"], -- we decided not to have circuit connections for this building + -- circuit_wire_max_distance = reactor_circuit_wire_max_distance, resistances = { { type = "fire", decrease = 25, percent = 60 }, { type = "impact", decrease = 50, percent = 80 }, @@ -3922,7 +3575,7 @@ data:extend({ { type = "reactor", name = "nullius-solar-collector-2", - localised_name = {"", {"entity-name.nullius-solar-collector"}, " ", 2}, + localised_name = {"", {"entity-name.nullius-solar-collector"}, " ", tostring(2)}, icons = data.raw.item["nullius-solar-collector-2"].icons, flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1.8, result = "nullius-solar-collector-2"}, @@ -3933,7 +3586,9 @@ data:extend({ consumption = "300W", energy_source = { type = "void" }, neighbour_bonus = 0.1, - neighbour_collision_increase = 0.1, + --neighbour_collision_increase = 0.1, + -- circuit_connector = circuit_connector_definitions["nullius-solar-collector"], + -- circuit_wire_max_distance = reactor_circuit_wire_max_distance, resistances = { { type = "fire", decrease = 25, percent = 60 }, { type = "impact", decrease = 50, percent = 80 }, @@ -4000,7 +3655,7 @@ data:extend({ { type = "reactor", name = "nullius-solar-collector-3", - localised_name = {"", {"entity-name.nullius-solar-collector"}, " ", 3}, + localised_name = {"", {"entity-name.nullius-solar-collector"}, " ", tostring(3)}, icons = data.raw.item["nullius-solar-collector-3"].icons, flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 2.4, result = "nullius-solar-collector-3"}, @@ -4010,7 +3665,9 @@ data:extend({ consumption = "600W", energy_source = { type = "void" }, neighbour_bonus = 0.1, - neighbour_collision_increase = 0.1, + --neighbour_collision_increase = 0.1, + -- circuit_connector = circuit_connector_definitions["nullius-solar-collector"], + -- circuit_wire_max_distance = reactor_circuit_wire_max_distance, resistances = { { type = "fire", decrease = 25, percent = 60 }, { type = "impact", decrease = 50, percent = 80 }, @@ -4076,7 +3733,7 @@ data:extend({ { type = "assembling-machine", name = "nullius-heat-exchanger-1", - localised_name = {"", {"entity-name.heat-exchanger"}, " ", 1}, + localised_name = {"", {"entity-name.heat-exchanger"}, " ", tostring(1)}, localised_description = {"entity-description.heat-exchanger"}, icons = data.raw.item["nullius-heat-exchanger-1"].icons, minable = {mining_time = 0.6, result = "nullius-heat-exchanger-1"}, @@ -4086,32 +3743,28 @@ data:extend({ max_health = 200, resistances = data.raw["assembling-machine"]["nullius-combustion-chamber-1"].resistances, fast_replaceable_group = "heat-exchanger", - next_upgrade = "nullius-heat-exchanger-2", + next_upgrade = "nullius-heat-exchanger-2", collision_box = {{-1.29, -0.79}, {1.29, 0.79}}, selection_box = {{-1.5, -1}, {1.5, 1}}, + circuit_connector = circuit_connector_definitions["nullius-combustion-chamber"], + circuit_wire_max_distance = reactor_circuit_wire_max_distance, fluid_boxes = { { - base_area = 5, - height = 2, - base_level = -2, + volume = 500, pipe_covers = pipecoverspictures(), - pipe_connections = {{type = "input", position = {-2, 0.5}}}, + pipe_connections = {{flow_direction = "input", position = {-1, 0.5}, direction = defines.direction.west }}, production_type = "input" }, { - base_area = 8, - height = 2, - base_level = 8, + volume = 500, pipe_covers = pipecoverspictures(), - pipe_connections = {{type = "output", position = {0, -1.5}}}, + pipe_connections = {{flow_direction = "output", position = {0, -0.5}, direction = defines.direction.north }}, production_type = "output" }, { - base_area = 8, - height = 2, - base_level = 8, + volume = 500, pipe_covers = pipecoverspictures(), - pipe_connections = {{type = "output", position = {2, 0.5}}}, + pipe_connections = {{flow_direction = "output", position = {1, 0.5}, direction = defines.direction.east }}, production_type = "output" } }, @@ -4130,27 +3783,25 @@ data:extend({ heat_picture = data.raw.boiler["heat-exchanger"].energy_source.heat_picture }, energy_usage = "1.8MW", - animation = util.table.deepcopy(data.raw.boiler["heat-exchanger"].structure), + graphics_set = { + animation = { + north = util.table.deepcopy(data.raw.boiler["heat-exchanger"].pictures.north.structure), + east = util.table.deepcopy(data.raw.boiler["heat-exchanger"].pictures.east.structure), + south = util.table.deepcopy(data.raw.boiler["heat-exchanger"].pictures.south.structure), + west = util.table.deepcopy(data.raw.boiler["heat-exchanger"].pictures.west.structure), + } + }, corpse = data.raw.boiler["heat-exchanger"].corpse, - vehicle_impact_sound = data.raw.boiler["heat-exchanger"].vehicle_impact_sound, + impact_category = data.raw.boiler["heat-exchanger"].impact_category, working_sound = data.raw.boiler["heat-exchanger"].working_sound } }) local ex1 = data.raw["assembling-machine"]["nullius-heat-exchanger-1"] -local ex1m = util.table.deepcopy(ex1) local boil = util.table.deepcopy(ex1) -ex1m.name = "nullius-mirror-heat-exchanger-1" -ex1m.localised_name = {"entity-name.nullius-mirrored", - {"", {"entity-name.heat-exchanger"}, " ", 1}} -ex1m.fluid_boxes[1].pipe_connections[1].position = {2, 0.5} -ex1m.fluid_boxes[3].pipe_connections[1].position = {-2, 0.5} -ex1m.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } -ex1m.placeable_by = {item = "nullius-heat-exchanger-1", count = 1} -ex1m.next_upgrade = "nullius-mirror-heat-exchanger-2" local ex2 = util.table.deepcopy(ex1) ex2.name = "nullius-heat-exchanger-2" -ex2.localised_name = {"", {"entity-name.heat-exchanger"}, " ", 2} +ex2.localised_name = {"", {"entity-name.heat-exchanger"}, " ", tostring(2)} ex2.icons = data.raw.item["nullius-heat-exchanger-2"].icons ex2.minable = {mining_time = 0.8, result = "nullius-heat-exchanger-2"} ex2.next_upgrade = "nullius-heat-exchanger-3" @@ -4160,30 +3811,13 @@ ex2.energy_source.max_temperature = 400 ex2.energy_source.specific_heat = "5MJ" ex2.energy_source.max_transfer = "40MW" ex2.energy_usage = "8.5MW" -ex2.animation.north.layers[1].hr_version.filename = ENTITYPATH .. "exchanger/exchanger-N.png" -ex2.animation.east.layers[1].hr_version.filename = ENTITYPATH .. "exchanger/exchanger-E.png" -ex2.animation.south.layers[1].hr_version.filename = ENTITYPATH .. "exchanger/exchanger-S.png" -ex2.animation.west.layers[1].hr_version.filename = ENTITYPATH .. "exchanger/exchanger-W.png" -ex2.fluid_boxes[1].base_area = 8 -ex2.fluid_boxes[1].height = 3 -ex2.fluid_boxes[1].base_level = -3 -ex2.fluid_boxes[2].base_area = 15 -ex2.fluid_boxes[2].height = 3 -ex2.fluid_boxes[3].base_area = 15 -ex2.fluid_boxes[3].height = 3 -local ex2m = util.table.deepcopy(ex2) -ex2m.name = "nullius-mirror-heat-exchanger-2" -ex2m.localised_name = {"entity-name.nullius-mirrored", - {"", {"entity-name.heat-exchanger"}, " ", 2}} -ex2m.icons[2] = ex1m.icons[2] -ex2m.placeable_by = {item = "nullius-heat-exchanger-2", count = 1} -ex2m.next_upgrade = "nullius-mirror-heat-exchanger-3" -ex2m.fluid_boxes[1].pipe_connections[1].position = {2, 0.5} -ex2m.fluid_boxes[3].pipe_connections[1].position = {-2, 0.5} +ex2.fluid_boxes[1].volume = 500 +ex2.fluid_boxes[2].volume = 500 +ex2.fluid_boxes[3].volume = 500 local ex3 = util.table.deepcopy(ex1) ex3.name = "nullius-heat-exchanger-3" -ex3.localised_name = {"", {"entity-name.heat-exchanger"}, " ", 3} +ex3.localised_name = {"", {"entity-name.heat-exchanger"}, " ", tostring(3)} ex3.icons = data.raw.item["nullius-heat-exchanger-3"].icons ex3.minable = {mining_time = 1, result = "nullius-heat-exchanger-3"} ex3.next_upgrade = nil @@ -4195,31 +3829,15 @@ ex3.energy_source.min_working_temperature = 500 ex3.energy_source.specific_heat = "20MJ" ex3.energy_source.max_transfer = "150MW" ex3.energy_usage = "20MW" -ex3.animation.north.layers[1].hr_version.filename = ENTITYPATH .. "exchanger/exchanger3-N.png" -ex3.animation.east.layers[1].hr_version.filename = ENTITYPATH .. "exchanger/exchanger3-E.png" -ex3.animation.south.layers[1].hr_version.filename = ENTITYPATH .. "exchanger/exchanger3-S.png" -ex3.animation.west.layers[1].hr_version.filename = ENTITYPATH .. "exchanger/exchanger3-W.png" -ex3.fluid_boxes[1].base_area = 10 -ex3.fluid_boxes[1].height = 4 -ex3.fluid_boxes[1].base_level = -4 -ex3.fluid_boxes[2].base_area = 20 -ex3.fluid_boxes[2].height = 5 -ex3.fluid_boxes[3].base_area = 20 -ex3.fluid_boxes[3].height = 5 -local ex3m = util.table.deepcopy(ex3) -ex3m.name = "nullius-mirror-heat-exchanger-3" -ex3m.localised_name = {"entity-name.nullius-mirrored", - {"", {"entity-name.heat-exchanger"}, " ", 3}} -ex3m.icons[2] = ex1m.icons[2] -ex3m.placeable_by = {item = "nullius-heat-exchanger-3", count = 1} -ex3m.next_upgrade = nil -ex3m.fluid_boxes[1].pipe_connections[1].position = {2, 0.5} -ex3m.fluid_boxes[3].pipe_connections[1].position = {-2, 0.5} -data:extend({ ex1m, ex2, ex2m, ex3, ex3m }) +ex3.fluid_boxes[1].volume = 500 +ex3.fluid_boxes[2].volume = 500 +ex3.fluid_boxes[3].volume = 500 + +data:extend({ex2, ex3 }) boil.name = "nullius-boiler-1" -boil.localised_name = {"", {"entity-name.boiler"}, " ", 1} +boil.localised_name = {"", {"entity-name.boiler"}, " ", tostring(1)} boil.localised_description = {"entity-description.nullius-boiler"} boil.icons = data.raw.item["nullius-boiler-1"].icons boil.minable = {mining_time = 1, result = "nullius-boiler-1"} @@ -4228,12 +3846,12 @@ boil.crafting_speed = 2 boil.energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "100kW" } boil.energy_usage = "3400kW" -boil.animation = { - north = { frame_count = 1, +boil.graphics_set.animation = { + north = { layers = { { filename = ENTITYPATH .. "boiler/boiler-north.png", @@ -4241,12 +3859,13 @@ boil.animation = { width = 269, height = 221, shift = util.by_pixel(-1.25, 5.25), + frame_count = 1, scale = 0.5 }, - data.raw["assembling-machine"]["nullius-combustion-chamber-1"].animation.north.layers[2] + data.raw["assembling-machine"]["nullius-combustion-chamber-1"].graphics_set.animation.north.layers[2] } }, - east = { frame_count = 1, + east = { layers = { { filename = ENTITYPATH .. "boiler/boiler-east.png", @@ -4254,12 +3873,13 @@ boil.animation = { width = 216, height = 301, shift = util.by_pixel(-3, 1.25), + frame_count = 1, scale = 0.5 }, - data.raw["assembling-machine"]["nullius-combustion-chamber-1"].animation.east.layers[2] + data.raw["assembling-machine"]["nullius-combustion-chamber-1"].graphics_set.animation.east.layers[2] } }, - south = { frame_count = 1, + south = { layers = { { filename = ENTITYPATH .. "boiler/boiler-south.png", @@ -4267,12 +3887,13 @@ boil.animation = { width = 260, height = 192, shift = util.by_pixel(4, 13), + frame_count = 1, scale = 0.5 }, - data.raw["assembling-machine"]["nullius-combustion-chamber-1"].animation.south.layers[2] + data.raw["assembling-machine"]["nullius-combustion-chamber-1"].graphics_set.animation.south.layers[2] } }, - west = { frame_count = 1, + west = { layers = { { filename = ENTITYPATH .. "boiler/boiler-west.png", @@ -4280,26 +3901,18 @@ boil.animation = { width = 196, height = 273, shift = util.by_pixel(1.5, 7.75), + frame_count = 1, scale = 0.5 }, - data.raw["assembling-machine"]["nullius-combustion-chamber-1"].animation.west.layers[2] + data.raw["assembling-machine"]["nullius-combustion-chamber-1"].graphics_set.animation.west.layers[2] } } } -boil.working_visualisations = data.raw["assembling-machine"]["nullius-combustion-chamber-1"].working_visualisations - -local boilm = util.table.deepcopy(boil) -boilm.name = "nullius-mirror-boiler-1" -boilm.localised_name = {"entity-name.nullius-mirrored", {"", {"entity-name.boiler"}, " ", 1}} -boilm.fluid_boxes[1].pipe_connections[1].position = {2, 0.5} -boilm.fluid_boxes[3].pipe_connections[1].position = {-2, 0.5} -boilm.icons[2] = ex1m.icons[2] -boilm.placeable_by = {item = "nullius-boiler-1", count = 1} -boilm.next_upgrade = "nullius-mirror-boiler-2" +boil.graphics_set.working_visualisations = data.raw["assembling-machine"]["nullius-combustion-chamber-1"].graphics_set.working_visualisations local boil2 = util.table.deepcopy(boil) boil2.name = "nullius-boiler-2" -boil2.localised_name = {"", {"entity-name.boiler"}, " ", 2} +boil2.localised_name = {"", {"entity-name.boiler"}, " ", tostring(2)} boil2.icons = data.raw.item["nullius-boiler-2"].icons boil2.minable = {mining_time = 1.5, result = "nullius-boiler-2"} boil2.next_upgrade = nil @@ -4309,111 +3922,65 @@ boil2.crafting_speed = 5 boil2.energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 3, + emissions_per_minute = {pollution = 3}, drain = "250kW" } boil2.energy_usage = "9.75MW" -boil2.animation.north.layers[1].filename = ENTITYPATH .. "boiler/boiler2-north.png" -boil2.animation.east.layers[1].filename = ENTITYPATH .. "boiler/boiler2-east.png" -boil2.animation.south.layers[1].filename = ENTITYPATH .. "boiler/boiler2-south.png" -boil2.animation.west.layers[1].filename = ENTITYPATH .. "boiler/boiler2-west.png" +boil2.graphics_set.animation.north.layers[1].filename = ENTITYPATH .. "boiler/boiler2-north.png" +boil2.graphics_set.animation.east.layers[1].filename = ENTITYPATH .. "boiler/boiler2-east.png" +boil2.graphics_set.animation.south.layers[1].filename = ENTITYPATH .. "boiler/boiler2-south.png" +boil2.graphics_set.animation.west.layers[1].filename = ENTITYPATH .. "boiler/boiler2-west.png" -local boil2m = util.table.deepcopy(boil2) -boil2m.name = "nullius-mirror-boiler-2" -boil2m.localised_name = {"entity-name.nullius-mirrored", {"", {"entity-name.boiler"}, " ", 2}} -boil2m.fluid_boxes[1].pipe_connections[1].position = {2, 0.5} -boil2m.fluid_boxes[3].pipe_connections[1].position = {-2, 0.5} -boil2m.icons[2] = boilm.icons[2] -boil2m.placeable_by = {item = "nullius-boiler-2", count = 1} -boil2m.next_upgrade = nil -data:extend({ boil, boilm, boil2, boil2m}) +data:extend({ boil, boil2}) if mods["reskins-bobs"] then data.raw["solar-panel"]["nullius-solar-panel-1"].picture = { layers = { { - filename = "__reskins-bobs__/graphics/entity/power/solar-panel-large/base/solar-panel-large.png", - priority = "high", - width = 154, - height = 137, - shift = util.by_pixel(5, 3.5), - hr_version = { - filename = "__reskins-bobs__/graphics/entity/power/solar-panel-large/base/hr-solar-panel-large.png", + filename = "__reskins-bobs__/graphics/entity/power/solar-panel-large/base/solar-panel-large.png", priority = "high", width = 308, height = 274, shift = util.by_pixel(5, 3.5), scale = 0.5 - } }, { - filename = "__reskins-bobs__/graphics/entity/power/solar-panel-large/solar-panel-large-mask.png", - priority = "high", - width = 154, - height = 137, - shift = util.by_pixel(5, 3.5), - tint = util.color("de9400"), - hr_version = { - filename = "__reskins-bobs__/graphics/entity/power/solar-panel-large/hr-solar-panel-large-mask.png", + filename = "__reskins-bobs__/graphics/entity/power/solar-panel-large/solar-panel-large-mask.png", priority = "high", width = 308, height = 274, shift = util.by_pixel(5, 3.5), tint = util.color("de9400"), scale = 0.5 - } }, { - filename = "__reskins-bobs__/graphics/entity/power/solar-panel-large/solar-panel-large-highlights.png", - priority = "high", - width = 154, - height = 137, - shift = util.by_pixel(5, 3.5), - blend_mode = "additive", - hr_version = { - filename = "__reskins-bobs__/graphics/entity/power/solar-panel-large/hr-solar-panel-large-highlights.png", + filename = "__reskins-bobs__/graphics/entity/power/solar-panel-large/solar-panel-large-highlights.png", priority = "high", width = 308, height = 274, shift = util.by_pixel(5, 3.5), blend_mode = "additive", scale = 0.5 - } }, { - filename = "__reskins-bobs__/graphics/entity/power/solar-panel-large/base/solar-panel-large-shadow.png", - priority = "high", - width = 154, - height = 137, - shift = util.by_pixel(5, 3.5), - draw_as_shadow = true, - hr_version = { - filename = "__reskins-bobs__/graphics/entity/power/solar-panel-large/base/hr-solar-panel-large-shadow.png", + filename = "__reskins-bobs__/graphics/entity/power/solar-panel-large/base/solar-panel-large-shadow.png", priority = "high", width = 308, height = 274, shift = util.by_pixel(5, 3.5), draw_as_shadow = true, scale = 0.5 - } } }} data.raw["solar-panel"]["nullius-solar-panel-1"].overlay = { layers = { { - filename = "__reskins-bobs__/graphics/entity/power/solar-panel-large/base/solar-panel-large-shadow-overlay.png", - priority = "high", - width = 154, - height = 137, - shift = util.by_pixel(5, 3.5), - hr_version = { - filename = "__reskins-bobs__/graphics/entity/power/solar-panel-large/base/hr-solar-panel-large-shadow-overlay.png", + filename = "__reskins-bobs__/graphics/entity/power/solar-panel-large/base/solar-panel-large-shadow-overlay.png", priority = "high", width = 308, height = 274, shift = util.by_pixel(5, 3.5), scale = 0.5 - } } }} @@ -4422,26 +3989,23 @@ data.raw["solar-panel"]["nullius-solar-panel-2"].overlay = data.raw["solar-panel"]["nullius-solar-panel-2"].picture = util.table.deepcopy(data.raw["solar-panel"]["nullius-solar-panel-1"].picture) data.raw["solar-panel"]["nullius-solar-panel-2"].picture.layers[2].tint = util.color("c20600") -data.raw["solar-panel"]["nullius-solar-panel-2"].picture.layers[2].hr_version.tint = util.color("c20600") data.raw["solar-panel"]["nullius-solar-panel-3"].overlay = data.raw["solar-panel"]["nullius-solar-panel-1"].overlay data.raw["solar-panel"]["nullius-solar-panel-3"].picture = util.table.deepcopy(data.raw["solar-panel"]["nullius-solar-panel-1"].picture) data.raw["solar-panel"]["nullius-solar-panel-3"].picture.layers[2].tint = util.color("0099ff") -data.raw["solar-panel"]["nullius-solar-panel-3"].picture.layers[2].hr_version.tint = util.color("0099ff") data.raw["solar-panel"]["nullius-solar-panel-4"].overlay = data.raw["solar-panel"]["nullius-solar-panel-1"].overlay data.raw["solar-panel"]["nullius-solar-panel-4"].picture = util.table.deepcopy(data.raw["solar-panel"]["nullius-solar-panel-1"].picture) data.raw["solar-panel"]["nullius-solar-panel-4"].picture.layers[2].tint = util.color("23de55") -data.raw["solar-panel"]["nullius-solar-panel-4"].picture.layers[2].hr_version.tint = util.color("23de55") -data.raw["accumulator"]["nullius-grid-battery-1"].picture = { layers = { +data.raw["accumulator"]["nullius-grid-battery-1"].chargable_graphics.picture = { layers = { { - filename = "__reskins-bobs__/graphics/entity/power/accumulator/wires/hr-accumulator-3.png", + filename = "__reskins-bobs__/graphics/entity/power/accumulator/wires/accumulator-3.png", priority = "high", width = 130, height = 189, @@ -4449,7 +4013,7 @@ data.raw["accumulator"]["nullius-grid-battery-1"].picture = { layers = { scale = 0.75 }, { - filename = "__reskins-bobs__/graphics/entity/power/accumulator/hr-accumulator-mask.png", + filename = "__reskins-bobs__/graphics/entity/power/accumulator/accumulator-mask.png", priority = "high", width = 130, height = 189, @@ -4458,7 +4022,7 @@ data.raw["accumulator"]["nullius-grid-battery-1"].picture = { layers = { scale = 0.75 }, { - filename = "__reskins-bobs__/graphics/entity/power/accumulator/hr-accumulator-highlights.png", + filename = "__reskins-bobs__/graphics/entity/power/accumulator/accumulator-highlights.png", priority = "high", width = 130, height = 189, @@ -4467,7 +4031,7 @@ data.raw["accumulator"]["nullius-grid-battery-1"].picture = { layers = { scale = 0.75 }, { - filename = BASEENTITY .. "accumulator/hr-accumulator-shadow.png", + filename = BASEENTITY .. "accumulator/accumulator-shadow.png", priority = "high", width = 234, height = 106, @@ -4477,7 +4041,7 @@ data.raw["accumulator"]["nullius-grid-battery-1"].picture = { layers = { } }} -local accumpic = util.table.deepcopy(data.raw["accumulator"]["nullius-grid-battery-1"].picture) +local accumpic = util.table.deepcopy(data.raw["accumulator"]["nullius-grid-battery-1"].chargable_graphics.picture) accumpic.layers[1].repeat_count = 24 accumpic.layers[1].animation_speed = 0.5 accumpic.layers[2].repeat_count = 24 @@ -4485,9 +4049,9 @@ accumpic.layers[2].animation_speed = 0.5 accumpic.layers[3].repeat_count = 24 accumpic.layers[3].animation_speed = 0.5 accumpic.layers[4].repeat_count = 24 -data.raw["accumulator"]["nullius-grid-battery-1"].charge_animation = accumpic -data.raw["accumulator"]["nullius-grid-battery-1"].charge_animation.layers[5] = { - filename = BASEENTITY .. "accumulator/hr-accumulator-charge.png", +data.raw["accumulator"]["nullius-grid-battery-1"].chargable_graphics.charge_animation = accumpic +data.raw["accumulator"]["nullius-grid-battery-1"].chargable_graphics.charge_animation.layers[5] = { + filename = BASEENTITY .. "accumulator/accumulator-charge.png", priority = "high", width = 178, height = 206, @@ -4498,10 +4062,10 @@ data.raw["accumulator"]["nullius-grid-battery-1"].charge_animation.layers[5] = { scale = 0.75 } -data.raw["accumulator"]["nullius-grid-battery-1"].discharge_animation = - util.table.deepcopy(data.raw["accumulator"]["nullius-grid-battery-1"].charge_animation) -data.raw["accumulator"]["nullius-grid-battery-1"].discharge_animation.layers[5] = { - filename = BASEENTITY .. "accumulator/hr-accumulator-discharge.png", +data.raw["accumulator"]["nullius-grid-battery-1"].chargable_graphics.discharge_animation = + util.table.deepcopy(data.raw["accumulator"]["nullius-grid-battery-1"].chargable_graphics.charge_animation) +data.raw["accumulator"]["nullius-grid-battery-1"].chargable_graphics.discharge_animation.layers[5] = { + filename = BASEENTITY .. "accumulator/accumulator-discharge.png", priority = "high", width = 170, height = 210, @@ -4513,36 +4077,36 @@ data.raw["accumulator"]["nullius-grid-battery-1"].discharge_animation.layers[5] } -data.raw["accumulator"]["nullius-grid-battery-2"].picture = - util.table.deepcopy(data.raw["accumulator"]["nullius-grid-battery-1"].picture) -data.raw["accumulator"]["nullius-grid-battery-2"].picture.layers[1].filename = - "__reskins-bobs__/graphics/entity/power/accumulator/wires/hr-accumulator-1.png" -data.raw["accumulator"]["nullius-grid-battery-2"].picture.layers[2].tint = util.color("0099ff") -data.raw["accumulator"]["nullius-grid-battery-2"].charge_animation = - util.table.deepcopy(data.raw["accumulator"]["nullius-grid-battery-1"].charge_animation) -data.raw["accumulator"]["nullius-grid-battery-2"].charge_animation.layers[1].filename = - "__reskins-bobs__/graphics/entity/power/accumulator/wires/hr-accumulator-1.png" -data.raw["accumulator"]["nullius-grid-battery-2"].charge_animation.layers[2].tint = util.color("0099ff") -data.raw["accumulator"]["nullius-grid-battery-2"].discharge_animation = - util.table.deepcopy(data.raw["accumulator"]["nullius-grid-battery-1"].discharge_animation) -data.raw["accumulator"]["nullius-grid-battery-2"].discharge_animation.layers[1].filename = - "__reskins-bobs__/graphics/entity/power/accumulator/wires/hr-accumulator-1.png" -data.raw["accumulator"]["nullius-grid-battery-2"].discharge_animation.layers[2].tint = util.color("0099ff") +data.raw["accumulator"]["nullius-grid-battery-2"].chargable_graphics.picture = + util.table.deepcopy(data.raw["accumulator"]["nullius-grid-battery-1"].chargable_graphics.picture) +data.raw["accumulator"]["nullius-grid-battery-2"].chargable_graphics.picture.layers[1].filename = + "__reskins-bobs__/graphics/entity/power/accumulator/wires/accumulator-1.png" +data.raw["accumulator"]["nullius-grid-battery-2"].chargable_graphics.picture.layers[2].tint = util.color("0099ff") +data.raw["accumulator"]["nullius-grid-battery-2"].chargable_graphics.charge_animation = + util.table.deepcopy(data.raw["accumulator"]["nullius-grid-battery-1"].chargable_graphics.charge_animation) +data.raw["accumulator"]["nullius-grid-battery-2"].chargable_graphics.charge_animation.layers[1].filename = + "__reskins-bobs__/graphics/entity/power/accumulator/wires/accumulator-1.png" +data.raw["accumulator"]["nullius-grid-battery-2"].chargable_graphics.charge_animation.layers[2].tint = util.color("0099ff") +data.raw["accumulator"]["nullius-grid-battery-2"].chargable_graphics.discharge_animation = + util.table.deepcopy(data.raw["accumulator"]["nullius-grid-battery-1"].chargable_graphics.discharge_animation) +data.raw["accumulator"]["nullius-grid-battery-2"].chargable_graphics.discharge_animation.layers[1].filename = + "__reskins-bobs__/graphics/entity/power/accumulator/wires/accumulator-1.png" +data.raw["accumulator"]["nullius-grid-battery-2"].chargable_graphics.discharge_animation.layers[2].tint = util.color("0099ff") -data.raw["accumulator"]["nullius-grid-battery-3"].picture = - util.table.deepcopy(data.raw["accumulator"]["nullius-grid-battery-1"].picture) -data.raw["accumulator"]["nullius-grid-battery-3"].picture.layers[1].filename = - "__reskins-bobs__/graphics/entity/power/accumulator/wires/hr-accumulator-2.png" -data.raw["accumulator"]["nullius-grid-battery-3"].picture.layers[2].tint = util.color("23de55") -data.raw["accumulator"]["nullius-grid-battery-3"].charge_animation = - util.table.deepcopy(data.raw["accumulator"]["nullius-grid-battery-1"].charge_animation) -data.raw["accumulator"]["nullius-grid-battery-3"].charge_animation.layers[1].filename = - "__reskins-bobs__/graphics/entity/power/accumulator/wires/hr-accumulator-2.png" -data.raw["accumulator"]["nullius-grid-battery-3"].charge_animation.layers[2].tint = util.color("23de55") -data.raw["accumulator"]["nullius-grid-battery-3"].discharge_animation = - util.table.deepcopy(data.raw["accumulator"]["nullius-grid-battery-1"].discharge_animation) -data.raw["accumulator"]["nullius-grid-battery-3"].discharge_animation.layers[1].filename = - "__reskins-bobs__/graphics/entity/power/accumulator/wires/hr-accumulator-2.png" -data.raw["accumulator"]["nullius-grid-battery-3"].discharge_animation.layers[2].tint = util.color("23de55") +data.raw["accumulator"]["nullius-grid-battery-3"].chargable_graphics.picture = + util.table.deepcopy(data.raw["accumulator"]["nullius-grid-battery-1"].chargable_graphics.picture) +data.raw["accumulator"]["nullius-grid-battery-3"].chargable_graphics.picture.layers[1].filename = + "__reskins-bobs__/graphics/entity/power/accumulator/wires/accumulator-2.png" +data.raw["accumulator"]["nullius-grid-battery-3"].chargable_graphics.picture.layers[2].tint = util.color("23de55") +data.raw["accumulator"]["nullius-grid-battery-3"].chargable_graphics.charge_animation = + util.table.deepcopy(data.raw["accumulator"]["nullius-grid-battery-1"].chargable_graphics.charge_animation) +data.raw["accumulator"]["nullius-grid-battery-3"].chargable_graphics.charge_animation.layers[1].filename = + "__reskins-bobs__/graphics/entity/power/accumulator/wires/accumulator-2.png" +data.raw["accumulator"]["nullius-grid-battery-3"].chargable_graphics.charge_animation.layers[2].tint = util.color("23de55") +data.raw["accumulator"]["nullius-grid-battery-3"].chargable_graphics.discharge_animation = + util.table.deepcopy(data.raw["accumulator"]["nullius-grid-battery-1"].chargable_graphics.discharge_animation) +data.raw["accumulator"]["nullius-grid-battery-3"].chargable_graphics.discharge_animation.layers[1].filename = + "__reskins-bobs__/graphics/entity/power/accumulator/wires/accumulator-2.png" +data.raw["accumulator"]["nullius-grid-battery-3"].chargable_graphics.discharge_animation.layers[2].tint = util.color("23de55") end diff --git a/nullius/prototypes/entity/environment.lua b/nullius/prototypes/entity/environment.lua index 4e4a531..21a6d88 100644 --- a/nullius/prototypes/entity/environment.lua +++ b/nullius/prototypes/entity/environment.lua @@ -6,281 +6,323 @@ data:extend({ name = "nullius-algae", type = "optimized-decorative", order = "dba", - collision_mask = {"ground-tile", "colliding-with-tiles-only"}, + collision_mask = {layers = {ground_tile = true}, colliding_with_tiles_only = true}, collision_box = {{-3.5, -1.8}, {3.5, 1.8}}, pictures = { { - filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-00.png", - priority = "extra-high", - width = 166, - height = 88, - shift = util.by_pixel(-12, -10), - tint = {0.5, 1, 0.5}, - hr_version = { - filename = "__base__/graphics/decorative/shroom-decal/hr-shroom-decal-00.png", + filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-00.png", priority = "extra-high", width = 334, height = 206, shift = util.by_pixel(-13, -1), tint = {0.5, 1, 0.5}, scale = 0.5 - } }, { - filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-01.png", - priority = "extra-high", - width = 128, - height = 94, - shift = util.by_pixel(12, 6), - tint = {0.5, 1, 0.5}, - hr_version = { - filename = "__base__/graphics/decorative/shroom-decal/hr-shroom-decal-01.png", + filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-01.png", priority = "extra-high", width = 256, height = 182, shift = util.by_pixel(12, 7), tint = {0.5, 1, 0.5}, scale = 0.5 - } }, { - filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-02.png", - priority = "extra-high", - width = 204, - height = 96, - shift = util.by_pixel(-8, -2), - tint = {0.5, 1, 0.5}, - hr_version = { - filename = "__base__/graphics/decorative/shroom-decal/hr-shroom-decal-02.png", + filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-02.png", priority = "extra-high", width = 406, height = 194, shift = util.by_pixel(-8, -3), tint = {0.5, 1, 0.5}, scale = 0.5 - } }, { - filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-03.png", - priority = "extra-high", - width = 216, - height = 96, - shift = util.by_pixel(6, 8), - tint = {0.5, 1, 0.5}, - hr_version = { - filename = "__base__/graphics/decorative/shroom-decal/hr-shroom-decal-03.png", + filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-03.png", priority = "extra-high", width = 432, height = 220, shift = util.by_pixel(6, 1), tint = {0.5, 1, 0.5}, scale = 0.5 - } }, { - filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-04.png", - priority = "extra-high", - width = 184, - height = 102, - shift = util.by_pixel(-12, 8), - tint = {0.5, 1, 0.5}, - hr_version = { - filename = "__base__/graphics/decorative/shroom-decal/hr-shroom-decal-04.png", + filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-04.png", priority = "extra-high", width = 368, height = 206, shift = util.by_pixel(-12, 7), tint = {0.5, 1, 0.5}, scale = 0.5 - } }, { - filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-05.png", - priority = "extra-high", - width = 170, - height = 102, - shift = util.by_pixel(24, 2), - tint = {0.5, 1, 0.5}, - hr_version = { - filename = "__base__/graphics/decorative/shroom-decal/hr-shroom-decal-05.png", + filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-05.png", priority = "extra-high", width = 340, height = 200, shift = util.by_pixel(24, 3), tint = {0.5, 1, 0.5}, scale = 0.5 - } }, { - filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-06.png", - priority = "extra-high", - width = 162, - height = 108, - shift = util.by_pixel(24, 2), - tint = {0.5, 1, 0.5}, - hr_version = { - filename = "__base__/graphics/decorative/shroom-decal/hr-shroom-decal-06.png", + filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-06.png", priority = "extra-high", width = 326, height = 214, shift = util.by_pixel(23, 2), tint = {0.5, 1, 0.5}, scale = 0.5 - } }, { - filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-07.png", - priority = "extra-high", - width = 168, - height = 98, - shift = util.by_pixel(20, 8), - tint = {0.5, 1, 0.5}, - hr_version = { - filename = "__base__/graphics/decorative/shroom-decal/hr-shroom-decal-07.png", + filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-07.png", priority = "extra-high", width = 336, height = 190, shift = util.by_pixel(20, 9), tint = {0.5, 1, 0.5}, scale = 0.5 - } }, { - filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-08.png", - priority = "extra-high", - width = 192, - height = 104, - shift = util.by_pixel(-12, 0), - tint = {0.5, 1, 0.5}, - hr_version = { - filename = "__base__/graphics/decorative/shroom-decal/hr-shroom-decal-08.png", + filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-08.png", priority = "extra-high", width = 386, height = 206, shift = util.by_pixel(-12, 1), tint = {0.5, 1, 0.5}, scale = 0.5 - } }, { - filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-09.png", - priority = "extra-high", - width = 138, - height = 78, - shift = util.by_pixel(8, -12), - tint = {0.5, 1, 0.5}, - hr_version = { - filename = "__base__/graphics/decorative/shroom-decal/hr-shroom-decal-09.png", + filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-09.png", priority = "extra-high", width = 278, height = 150, shift = util.by_pixel(8, -11), tint = {0.5, 1, 0.5}, scale = 0.5 - } }, { - filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-10.png", - priority = "extra-high", - width = 182, - height = 100, - shift = util.by_pixel(2, -2), - tint = {0.5, 1, 0.5}, - hr_version = { - filename = "__base__/graphics/decorative/shroom-decal/hr-shroom-decal-10.png", + filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-10.png", priority = "extra-high", width = 364, height = 204, shift = util.by_pixel(2, -3), tint = {0.5, 1, 0.5}, scale = 0.5 - } }, { - filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-11.png", - priority = "extra-high", - width = 192, - height = 104, - shift = util.by_pixel(22, 4), - tint = {0.5, 1, 0.5}, - hr_version = { - filename = "__base__/graphics/decorative/shroom-decal/hr-shroom-decal-11.png", + filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-11.png", priority = "extra-high", width = 378, height = 206, shift = util.by_pixel(23, 5), tint = {0.5, 1, 0.5}, scale = 0.5 - } }, { - filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-12.png", - priority = "extra-high", - width = 160, - height = 108, - shift = util.by_pixel(-4, 4), - tint = {0.5, 1, 0.5}, - hr_version = { - filename = "__base__/graphics/decorative/shroom-decal/hr-shroom-decal-12.png", + filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-12.png", priority = "extra-high", width = 320, height = 220, shift = util.by_pixel(-4, 3), tint = {0.5, 1, 0.5}, scale = 0.5 - } }, { - filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-13.png", - priority = "extra-high", - width = 158, - height = 82, - shift = util.by_pixel(32, 10), - tint = {0.5, 1, 0.5}, - hr_version = { - filename = "__base__/graphics/decorative/shroom-decal/hr-shroom-decal-13.png", + filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-13.png", priority = "extra-high", width = 318, height = 160, shift = util.by_pixel(31, 11), tint = {0.5, 1, 0.5}, scale = 0.5 - } }, { - filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-14.png", - priority = "extra-high", - width = 186, - height = 104, - shift = util.by_pixel(24, 6), - tint = {0.5, 1, 0.5}, - hr_version = { - filename = "__base__/graphics/decorative/shroom-decal/hr-shroom-decal-14.png", + filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-14.png", priority = "extra-high", width = 368, height = 206, shift = util.by_pixel(25, 6), tint = {0.5, 1, 0.5}, scale = 0.5 - } }, { - filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-15.png", - priority = "extra-high", - width = 208, - height = 112, - shift = util.by_pixel(-6, 0), - tint = {0.5, 1, 0.5}, - hr_version = { - filename = "__base__/graphics/decorative/shroom-decal/hr-shroom-decal-15.png", + filename = "__base__/graphics/decorative/shroom-decal/shroom-decal-15.png", priority = "extra-high", width = 410, height = 222, shift = util.by_pixel(-5, 0), tint = {0.5, 1, 0.5}, scale = 0.5 - } } } } }) + +data:extend({ + { + type = "tile", + name = "nullius-tile-clay-brick", + localised_name = {"tile-name.nullius-refractory-brick"}, + needs_correction = false, + minable = { mining_time = 0.5, result = "nullius-refractory-brick" }, + mined_sound = { filename = "__base__/sound/deconstruct-bricks.ogg" }, + collision_mask = {layers={ + ground_tile=true}}, + walking_speed_modifier = 1.4, + layer = 60, + decorative_removal_probability = 0.75, + variants = { + main = { + { + picture = "__angelssmeltinggraphics__/graphics/entity/tiles/clay-bricks-small.png", + count = 16, + scale = 0.5, + size = 1, + }, + }, + transition = { + overlay_layout = { + inner_corner = { + spritesheet = "__angelssmeltinggraphics__/graphics/entity/tiles/clay-bricks-inner.png", + count = 8, + scale = 0.5, + }, + outer_corner = { + spritesheet = "__angelssmeltinggraphics__/graphics/entity/tiles/clay-bricks-outer.png", + count = 1, + scale = 0.5, + }, + side = { + spritesheet = "__angelssmeltinggraphics__/graphics/entity/tiles/clay-bricks-side.png", + count = 8, + scale = 0.5, + }, + -- u_transition = { + -- spritesheet = "__base__/graphics/terrain/stone-path/stone-path-u.png", + -- count = 10, + -- }, + -- o_transition = { + -- spritesheet = "__base__/graphics/terrain/stone-path/stone-path-o.png", + -- count = 10, + -- }, + }, + }, + }, + walking_sound = { + { + filename = "__base__/sound/walking/concrete-1.ogg", + volume = 1.2, + }, + { + filename = "__base__/sound/walking/concrete-2.ogg", + volume = 1.2, + }, + { + filename = "__base__/sound/walking/concrete-3.ogg", + volume = 1.2, + }, + { + filename = "__base__/sound/walking/concrete-4.ogg", + volume = 1.2, + }, + }, + map_color = { r = 50, g = 50, b = 50 }, + absorptions_per_second = {pollution = 0}, + --ageing=0, + vehicle_friction_modifier = 0.7, + placeable_by = {item = "nullius-refractory-brick", count = 1}, + transitions = data.raw.tile["stone-path"].transitions, + transitions_between_transitions = data.raw.tile["stone-path"].transitions_between_transitions + }, +}) + +data:extend({ + { + type = "noise-function", + name = "nullius_value_optimal_with_range", + parameters = {"value", "optimal", "range", "max_range"}, + expression = "if((left_range <= value) * (value <= right_range),\z + 1,\z + clamp(if(value <= optimal,\z + 2 * (value - left_max) / (left_range - left_max) - 1,\z + 2 * (right_max - value) / 2 * (right_max - right_range) - 1), 0, 1))", + local_expressions = + { + left_max = "optimal - max_range", + left_range = "optimal - range", + right_max = "optimal + max_range", + right_range = "optimal + range", + }, + }, +}) +data:extend({ + { + type = "noise-function", + name = "nullius_elevation_level", + parameters = {"optimal", "range", "max_range"}, + expression = "nullius_value_optimal_with_range(elevation, optimal, range, max_range)", + }, + { + type = "simple-entity", + name = "nullius-crystal-rock", + flags = { "placeable-neutral", "placeable-off-grid", "not-on-map" }, + icon = "__base__/graphics/icons/huge-rock.png", + icon_size = 64, + subgroup = "grass", + order = "b[decorative]-k[stone-rock]-c[crystal]", + collision_box = { { -1.1, -1.1 }, { 1.1, 1.1 } }, + selection_box = { { -1.3, -1.3 }, { 1.3, 1.3 } }, + minable = { + mining_particle = "stone-particle", + mining_time = 8, + results = { + {type="item", name="nullius-silica", amount=16}, + {type="item", name="nullius-alumina", amount=8} + } + }, + loot = { + {item = "nullius-silica", probability = 1, count_min = 4, count_max = 12}, + {item = "nullius-alumina", probability = 1, count_min = 2, count_max = 6} + }, + count_as_rock_for_filtered_deconstruction = true, + mined_sound = { filename = "__base__/sound/deconstruct-bricks.ogg" }, + render_layer = "object", + max_health = 200, + resistances = { + { + type = "fire", + percent = 100, + }, + }, + autoplace = { + order = "a[doodad]-c[nullius-crystal-rock]", + control = "rocks", + probability_expression = "0.0002 + 0.002 * nullius_elevation_level(45000, 37000, 45000)", + }, + pictures = { + { + filename = "__angelsrefininggraphics__/graphics/entity/rock/crystal-rock-1.png", + width = 192, + height = 160, + shift = { 0.5, 0 }, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/rock/crystal-rock-2.png", + width = 192, + height = 160, + shift = { 0.5, 0 }, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/rock/crystal-rock-3.png", + width = 192, + height = 160, + shift = { 0.5, 0 }, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/rock/crystal-rock-4.png", + width = 192, + height = 160, + shift = { 0.5, 0 }, + }, + }, + }, +}) \ No newline at end of file diff --git a/nullius/prototypes/entity/equipment.lua b/nullius/prototypes/entity/equipment.lua index bb74a34..50981f9 100644 --- a/nullius/prototypes/entity/equipment.lua +++ b/nullius/prototypes/entity/equipment.lua @@ -274,18 +274,18 @@ data:extend({ if mods["reskins-bobs"] then data.raw["solar-panel-equipment"]["nullius-solar-panel-1"].sprite = { layers = { { - filename = "__reskins-bobs__/graphics/entity/power/solar-panel-small/base/hr-solar-panel-small.png", + filename = "__reskins-bobs__/graphics/entity/power/solar-panel-small/base/solar-panel-small.png", size = 150, priority = "medium" }, { - filename = "__reskins-bobs__/graphics/entity/power/solar-panel-small/hr-solar-panel-small-mask.png", + filename = "__reskins-bobs__/graphics/entity/power/solar-panel-small/solar-panel-small-mask.png", size = 150, priority = "medium", tint = tiercolor("yellow") }, { - filename = "__reskins-bobs__/graphics/entity/power/solar-panel-small/hr-solar-panel-small-highlights.png", + filename = "__reskins-bobs__/graphics/entity/power/solar-panel-small/solar-panel-small-highlights.png", size = 150, priority = "medium", blend_mode = "additive" @@ -312,7 +312,7 @@ data:extend({ order = "gb", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-hangar"}, - {"entity-description.nullius-megajoule", 4}}, + {"entity-description.nullius-megajoule", tostring(4)}}, sprite = { filename = EQUIPPATH .. "hangar1.png", width = 128, @@ -364,9 +364,9 @@ data:extend({ order = "gc", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-hangar"}, - {"entity-description.nullius-megajoule", 10}}, + {"entity-description.nullius-megajoule", tostring(10)}}, sprite = { - filename = "__base__/graphics/equipment/hr-personal-roboport-mk2-equipment.png", + filename = "__base__/graphics/equipment/personal-roboport-mk2-equipment.png", width = 128, height = 128, priority = "medium", @@ -416,7 +416,7 @@ data:extend({ order = "gd", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-hangar"}, - {"entity-description.nullius-megajoule", 30}}, + {"entity-description.nullius-megajoule", tostring(30)}}, sprite = { filename = EQUIPPATH .. "hangar3.png", width = 128, @@ -468,7 +468,7 @@ data:extend({ order = "ge", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-hangar"}, - {"entity-description.nullius-megajoule", 20}}, + {"entity-description.nullius-megajoule", tostring(20)}}, sprite = { filename = EQUIPPATH .. "hangar3.png", --hangar 4 is just a smaller version of h3 width = 128, @@ -519,7 +519,7 @@ data:extend({ name = "nullius-charger-1", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-charger"}, - {"entity-description.nullius-megajoule", 4}}, + {"entity-description.nullius-megajoule", tostring(4)}}, order = "hb", sprite = { filename = "__boblogistics__/graphics/icons/roboport-chargepad.png", @@ -570,7 +570,7 @@ data:extend({ name = "nullius-charger-2", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-charger"}, - {"entity-description.nullius-megajoule", 10}}, + {"entity-description.nullius-megajoule", tostring(10)}}, order = "hc", sprite = { filename = "__boblogistics__/graphics/icons/roboport-chargepad-2.png", @@ -621,7 +621,7 @@ data:extend({ name = "nullius-charger-3", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-charger"}, - {"entity-description.nullius-megajoule", 30}}, + {"entity-description.nullius-megajoule", tostring(30)}}, order = "hd", sprite = { filename = "__boblogistics__/graphics/icons/roboport-chargepad-4.png", @@ -672,7 +672,7 @@ data:extend({ name = "nullius-charger-4", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-charger"}, - {"entity-description.nullius-megajoule", 20}}, + {"entity-description.nullius-megajoule", tostring(20)}}, order = "he", sprite = { filename = "__boblogistics__/graphics/icons/roboport-chargepad-4.png", @@ -723,7 +723,7 @@ data:extend({ name = "nullius-relay-1", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-relay"}, - {"entity-description.nullius-kilojoule", 200}}, + {"entity-description.nullius-kilojoule", tostring(200)}}, order = "ib", sprite = { filename = "__boblogistics__/graphics/entity/roboport/logistic-zone-expander.png", @@ -777,7 +777,7 @@ data:extend({ name = "nullius-relay-2", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-relay"}, - {"entity-description.nullius-kilojoule", 400}}, + {"entity-description.nullius-kilojoule", tostring(400)}}, order = "ic", sprite = { filename = "__boblogistics__/graphics/entity/roboport/logistic-zone-expander-2.png", @@ -831,7 +831,7 @@ data:extend({ name = "nullius-relay-3", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-relay"}, - {"entity-description.nullius-megajoule", 1}}, + {"entity-description.nullius-megajoule", tostring(1)}}, order = "id", sprite = { filename = "__boblogistics__/graphics/entity/roboport/logistic-zone-expander-4.png", @@ -885,7 +885,7 @@ data:extend({ name = "nullius-relay-4", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-relay"}, - {"entity-description.nullius-megajoule", 2}}, + {"entity-description.nullius-megajoule", tostring(2)}}, order = "ie", sprite = { filename = "__boblogistics__/graphics/entity/roboport/logistic-zone-expander-3.png", @@ -942,8 +942,8 @@ data:extend({ order = "eb", sprite = { filename = "__base__/graphics/equipment/night-vision-equipment.png", - width = 64, - height = 64, + width = 128, + height = 128, priority = "medium", scale = 1.2 }, @@ -1031,11 +1031,10 @@ data:extend({ { type = "belt-immunity-equipment", name = "nullius-levitation-field-1", - localised_name = {"", {"equipment-name.nullius-levitation-field"}, " ", 1}, localised_description = data.raw.item["nullius-levitation-field-1"].localised_description, order = "fb", sprite = { - filename = "__base__/graphics/equipment/hr-belt-immunity-equipment.png", + filename = "__base__/graphics/equipment/belt-immunity-equipment.png", width = 64, height = 64, priority = "medium", @@ -1058,11 +1057,10 @@ data:extend({ { type = "belt-immunity-equipment", name = "nullius-levitation-field-2", - localised_name = {"", {"equipment-name.nullius-levitation-field"}, " ", 2}, localised_description = data.raw.item["nullius-levitation-field-2"].localised_description, order = "fc", sprite = { - filename = "__base__/graphics/equipment/hr-belt-immunity-equipment.png", + filename = "__base__/graphics/equipment/belt-immunity-equipment.png", width = 64, height = 64, priority = "medium", @@ -1086,7 +1084,7 @@ data:extend({ { type = "movement-bonus-equipment", name = "nullius-upgrade-jump-boots", - localised_description = data.raw.item["nullius-jump-boots"].localised_description, + localised_description = data.raw.item["nullius-jump-boots"].localised_description, take_result = "nullius-jump-boots", order = "daj", sprite = { @@ -1117,7 +1115,7 @@ data:extend({ localised_description = data.raw.item["nullius-leg-augmentation-1"].localised_description, order = "dbb", sprite = { - filename = "__base__/graphics/equipment/hr-exoskeleton-equipment.png", + filename = "__base__/graphics/equipment/exoskeleton-equipment.png", width = 128, height = 256, priority = "medium", @@ -1145,7 +1143,7 @@ data:extend({ localised_description = data.raw.item["nullius-leg-augmentation-2"].localised_description, order = "dbc", sprite = { - filename = "__base__/graphics/equipment/hr-exoskeleton-equipment.png", + filename = "__base__/graphics/equipment/exoskeleton-equipment.png", width = 128, height = 256, priority = "medium", @@ -1173,7 +1171,7 @@ data:extend({ localised_description = data.raw.item["nullius-leg-augmentation-3"].localised_description, order = "dbd", sprite = { - filename = "__base__/graphics/equipment/hr-exoskeleton-equipment.png", + filename = "__base__/graphics/equipment/exoskeleton-equipment.png", width = 128, height = 256, priority = "medium", @@ -1200,7 +1198,7 @@ data:extend({ localised_description = data.raw.item["nullius-leg-augmentation-4"].localised_description, order = "dbe", sprite = { - filename = "__base__/graphics/equipment/hr-exoskeleton-equipment.png", + filename = "__base__/graphics/equipment/exoskeleton-equipment.png", width = 128, height = 256, priority = "medium", @@ -1341,6 +1339,7 @@ data:extend({ type = "projectile", name = "nullius-missile-1", flags = {"not-on-map"}, + hidden_in_factoriopedia = true, acceleration = 0.005, light = {intensity = 0.5, size = 4}, animation = data.raw["projectile"]["explosive-rocket"].animation, @@ -1376,7 +1375,7 @@ data:extend({ { type = "destroy-cliffs", radius = 5.5, - explosion = "explosion" + explosion_at_cliff = "explosion" --todo }, { type = "nested-result", @@ -1423,6 +1422,7 @@ data:extend({ type = "projectile", name = "nullius-missile-2", flags = {"not-on-map"}, + hidden_in_factoriopedia = true, acceleration = 0.004, light = {intensity = 0.5, size = 4}, animation = data.raw["projectile"]["atomic-rocket"].animation, @@ -1436,7 +1436,7 @@ data:extend({ { type = "destroy-cliffs", radius = 21, - explosion = "explosion" + explosion_at_cliff = "explosion" }, data.raw.projectile["atomic-rocket"].action.action_delivery.target_effects[3], data.raw.projectile["atomic-rocket"].action.action_delivery.target_effects[4], @@ -1525,13 +1525,13 @@ data:extend({ type = "set-tile", tile_name = "nuclear-ground", radius = 20, - tile_collision_mask = { "water-tile" } + tile_collision_mask = { layers = { water_tile = true }} }, { type = "set-tile", tile_name = "water-shallow", radius = 18, - tile_collision_mask = { "water-tile" } + tile_collision_mask = { layers = { water_tile = true }} }, { type = "set-tile", @@ -1549,17 +1549,11 @@ data:extend({ order = "s", localised_description = data.raw.item["nullius-shield"].localised_description, sprite = { - filename = "__base__/graphics/equipment/energy-shield-equipment.png", - width = 64, - height = 64, - priority = "medium", - hr_version = { - filename = "__base__/graphics/equipment/hr-energy-shield-equipment.png", + filename = "__base__/graphics/equipment/energy-shield-equipment.png", width = 128, height = 128, priority = "medium", scale = 0.5 - } }, shape = { width = 2, @@ -1582,8 +1576,8 @@ data:extend({ name = "nullius-upgrade-armor-plate", take_result = "nullius-armor-plate", localised_description = {"", - {"equipment-description.nullius-bonus-armor", 100}, "\n", - {"equipment-description.nullius-penalty-speed", 1}}, + {"equipment-description.nullius-bonus-armor", tostring(100)}, "\n", + {"equipment-description.nullius-penalty-speed", tostring(1)}}, order = "k", sprite = { filename = EQUIPPATH.."armor-plate.png", @@ -1608,8 +1602,8 @@ data:extend({ name = "nullius-upgrade-small-cargo-pod-1", take_result = "nullius-small-cargo-pod-1", localised_description = {"", - {"equipment-description.nullius-bonus-cargo", 2}, "\n", - {"equipment-description.nullius-penalty-speed", 0.3}}, + {"equipment-description.nullius-bonus-cargo", tostring(2)}, "\n", + {"equipment-description.nullius-penalty-speed", tostring(0.3)}}, order = "jbb", sprite = { filename = EQUIPPATH.."small-pod-1.png", @@ -1634,8 +1628,8 @@ data:extend({ name = "nullius-upgrade-small-cargo-pod-2", take_result = "nullius-small-cargo-pod-2", localised_description = {"", - {"equipment-description.nullius-bonus-cargo", 3}, "\n", - {"equipment-description.nullius-penalty-speed", 0.4}}, + {"equipment-description.nullius-bonus-cargo", tostring(3)}, "\n", + {"equipment-description.nullius-penalty-speed", tostring(0.4)}}, order = "jbc", sprite = { filename = EQUIPPATH.."small-pod-2.png", @@ -1660,8 +1654,8 @@ data:extend({ name = "nullius-upgrade-large-cargo-pod-1", take_result = "nullius-large-cargo-pod-1", localised_description = {"", - {"equipment-description.nullius-bonus-cargo", 10}, "\n", - {"equipment-description.nullius-penalty-speed", 1.5}}, + {"equipment-description.nullius-bonus-cargo", tostring(10)}, "\n", + {"equipment-description.nullius-penalty-speed", tostring(1.5)}}, order = "jcb", sprite = { filename = EQUIPPATH.."large-pod-1.png", @@ -1686,8 +1680,8 @@ data:extend({ name = "nullius-upgrade-large-cargo-pod-2", take_result = "nullius-large-cargo-pod-2", localised_description = {"", - {"equipment-description.nullius-bonus-cargo", 12}, "\n", - {"equipment-description.nullius-penalty-speed", 1.6}}, + {"equipment-description.nullius-bonus-cargo", tostring(12)}, "\n", + {"equipment-description.nullius-penalty-speed", tostring(1.6)}}, order = "jcb", sprite = { filename = EQUIPPATH.."large-pod-2.png", @@ -1712,8 +1706,8 @@ data:extend({ name = "nullius-upgrade-large-cargo-pod-3", take_result = "nullius-large-cargo-pod-3", localised_description = {"", - {"equipment-description.nullius-bonus-cargo", 15}, "\n", - {"equipment-description.nullius-penalty-speed", 2}}, + {"equipment-description.nullius-bonus-cargo", tostring(15)}, "\n", + {"equipment-description.nullius-penalty-speed", tostring(2)}}, order = "jcb", sprite = { filename = EQUIPPATH.."large-pod-3.png", @@ -1736,12 +1730,12 @@ data:extend({ { type = "active-defense-equipment", name = "nullius-upgrade-trash-compactor", - localised_name = {"", {"equipment-name.nullius-upgrade-trash-compactor"}, " ", 1}, + localised_name = {"", {"equipment-name.nullius-upgrade-trash-compactor"}, " ", tostring(1)}, take_result = "nullius-trash-compactor", localised_description = {"", - {"equipment-description.nullius-bonus-trash", 10}, "\n", + {"equipment-description.nullius-bonus-trash", tostring(10)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 5}}}, + {"entity-description.nullius-kilowatt", tostring(5)}}}, order = "jdb", sprite = { filename = EQUIPPATH.."trash-compactor-1.png", @@ -1759,31 +1753,31 @@ data:extend({ type = "electric", buffer_capacity = "300kJ", input_flow_limit = "30kW", - drain = "5kW", + drain = "5kW", usage_priority = "primary-input" }, categories = {"android"}, - automatic = false, + automatic = false, attack_parameters = { type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "5kJ" + energy_consumption = "5kJ" } } }, { type = "active-defense-equipment", name = "nullius-upgrade-trash-compactor-2", - localised_name = {"", {"equipment-name.nullius-upgrade-trash-compactor"}, " ", 2}, + localised_name = {"", {"equipment-name.nullius-upgrade-trash-compactor"}, " ", tostring(2)}, take_result = "nullius-trash-compactor-2", localised_description = {"", - {"equipment-description.nullius-bonus-trash", 20}, "\n", + {"equipment-description.nullius-bonus-trash", tostring(20)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 12}}}, + {"entity-description.nullius-kilowatt", tostring(12)}}}, order = "jdc", sprite = { filename = EQUIPPATH.."trash-compactor-2.png", @@ -1801,19 +1795,19 @@ data:extend({ type = "electric", buffer_capacity = "800kJ", input_flow_limit = "80kW", - drain = "12kW", + drain = "12kW", usage_priority = "primary-input" }, categories = {"android"}, - automatic = false, + automatic = false, attack_parameters = { type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "12kJ" + energy_consumption = "12kJ" } } }, @@ -1822,9 +1816,9 @@ data:extend({ type = "active-defense-equipment", name = "nullius-upgrade-fabrication-tool-1", take_result = "nullius-fabrication-tool-1", - localised_description = {"equipment-description.nullius-buffer", - {"equipment-description.nullius-bonus-craft", 25, 12}, - {"entity-description.nullius-megajoule", 2}}, + localised_description = {"equipment-description.nullius-buffer", + {"equipment-description.nullius-bonus-craft", tostring(25), tostring(12)}, + {"entity-description.nullius-megajoule", tostring(2)}}, order = "lbb", sprite = { filename = EQUIPPATH.."fabrication-tool-1.png", @@ -1850,10 +1844,10 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "12kJ" + energy_consumption = "12kJ" } } }, @@ -1861,9 +1855,9 @@ data:extend({ type = "active-defense-equipment", name = "nullius-upgrade-fabrication-tool-2", take_result = "nullius-fabrication-tool-2", - localised_description = {"equipment-description.nullius-buffer", - {"equipment-description.nullius-bonus-craft", 40, 16}, - {"entity-description.nullius-megajoule", 5}}, + localised_description = {"equipment-description.nullius-buffer", + {"equipment-description.nullius-bonus-craft", tostring(40), tostring(16)}, + {"entity-description.nullius-megajoule", tostring(5)}}, order = "lbc", sprite = { filename = EQUIPPATH.."fabrication-tool-2.png", @@ -1889,10 +1883,10 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "16kJ" + energy_consumption = "16kJ" } } }, @@ -1900,9 +1894,9 @@ data:extend({ type = "active-defense-equipment", name = "nullius-upgrade-fabrication-tool-3", take_result = "nullius-fabrication-tool-3", - localised_description = {"equipment-description.nullius-buffer", - {"equipment-description.nullius-bonus-craft", 120, 40}, - {"entity-description.nullius-megajoule", 25}}, + localised_description = {"equipment-description.nullius-buffer", + {"equipment-description.nullius-bonus-craft", tostring(120), tostring(40)}, + {"entity-description.nullius-megajoule", tostring(25)}}, order = "lbd", sprite = { filename = EQUIPPATH.."fabrication-tool-3.png", @@ -1928,10 +1922,10 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "40kJ" + energy_consumption = "40kJ" } } }, @@ -1940,9 +1934,9 @@ data:extend({ name = "nullius-upgrade-mining-tool-1", take_result = "nullius-mining-tool-1", localised_description = {"", - {"equipment-description.nullius-bonus-mining", 80}, "\n", + {"equipment-description.nullius-bonus-mining", tostring(80)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 3}}}, + {"entity-description.nullius-kilowatt", tostring(3)}}}, order = "lcb", sprite = { filename = EQUIPPATH.."mining-tool-1.png", @@ -1969,10 +1963,10 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "4kJ" + energy_consumption = "4kJ" } } }, @@ -1981,9 +1975,9 @@ data:extend({ name = "nullius-upgrade-mining-tool-2", take_result = "nullius-mining-tool-2", localised_description = {"", - {"equipment-description.nullius-bonus-mining", 150}, "\n", + {"equipment-description.nullius-bonus-mining", tostring(150)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 5}}}, + {"entity-description.nullius-kilowatt", tostring(5)}}}, order = "lcc", sprite = { filename = EQUIPPATH.."mining-tool-2.png", @@ -2010,10 +2004,10 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "6kJ" + energy_consumption = "6kJ" } } }, @@ -2021,12 +2015,12 @@ data:extend({ type = "active-defense-equipment", name = "nullius-upgrade-multi-tool-1", take_result = "nullius-multi-tool-1", - localised_description = {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-bonus-craft", 50, 20}, "\n", - {"equipment-description.nullius-bonus-mining", 50}, "\n", + localised_description = {"equipment-description.nullius-buffer", {"", + {"equipment-description.nullius-bonus-craft", tostring(50), tostring(20)}, "\n", + {"equipment-description.nullius-bonus-mining", tostring(50)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 5}}}, - {"entity-description.nullius-megajoule", 5}}, + {"entity-description.nullius-kilowatt", tostring(5)}}}, + {"entity-description.nullius-megajoule", tostring(5)}}, order = "lcb", sprite = { filename = EQUIPPATH.."multi-tool-1.png", @@ -2053,10 +2047,10 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "25kJ" + energy_consumption = "25kJ" } } }, @@ -2064,12 +2058,12 @@ data:extend({ type = "active-defense-equipment", name = "nullius-upgrade-multi-tool-2", take_result = "nullius-multi-tool-2", - localised_description = {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-bonus-craft", 70, 25}, "\n", - {"equipment-description.nullius-bonus-mining", 100}, "\n", + localised_description = {"equipment-description.nullius-buffer", {"", + {"equipment-description.nullius-bonus-craft", tostring(70), tostring(25)}, "\n", + {"equipment-description.nullius-bonus-mining", tostring(100)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 10}}}, - {"entity-description.nullius-megajoule", 12}}, + {"entity-description.nullius-kilowatt", tostring(10)}}}, + {"entity-description.nullius-megajoule", tostring(12)}}, order = "lcc", sprite = { filename = EQUIPPATH.."multi-tool-2.png", @@ -2096,10 +2090,10 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "30kJ" + energy_consumption = "30kJ" } } }, @@ -2107,13 +2101,13 @@ data:extend({ type = "active-defense-equipment", name = "nullius-upgrade-multi-tool-3", take_result = "nullius-multi-tool-3", - localised_description = {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-bonus-craft", 80, 25}, "\n", - {"equipment-description.nullius-bonus-mining", 125}, "\n", - {"equipment-description.nullius-bonus-reach", 2}, "\n", + localised_description = {"equipment-description.nullius-buffer", {"", + {"equipment-description.nullius-bonus-craft", tostring(80), tostring(25)}, "\n", + {"equipment-description.nullius-bonus-mining", tostring(125)}, "\n", + {"equipment-description.nullius-bonus-reach", tostring(2)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 15}}}, - {"entity-description.nullius-megajoule", 20}}, + {"entity-description.nullius-kilowatt", tostring(15)}}}, + {"entity-description.nullius-megajoule", tostring(20)}}, order = "lcd", sprite = { filename = EQUIPPATH.."multi-tool-3.png", @@ -2140,10 +2134,10 @@ data:extend({ type = "projectile", cooldown = 60, range = 2, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "30kJ" + energy_consumption = "30kJ" } } }, @@ -2152,11 +2146,11 @@ data:extend({ type = "active-defense-equipment", name = "nullius-upgrade-telekinesis-field-1", take_result = "nullius-telekinesis-field-1", - localised_description = {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-bonus-reach", 8}, "\n", + localised_description = {"equipment-description.nullius-buffer", {"", + {"equipment-description.nullius-bonus-reach", tostring(8)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 15}}}, - {"entity-description.nullius-kilojoule", 400}}, + {"entity-description.nullius-kilowatt", tostring(15)}}}, + {"entity-description.nullius-kilojoule", tostring(400)}}, order = "mb", sprite = { filename = EQUIPPATH.."telekinesis-1.png", @@ -2183,10 +2177,10 @@ data:extend({ type = "projectile", cooldown = 60, range = 8, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "15kJ" + energy_consumption = "15kJ" } } }, @@ -2194,13 +2188,13 @@ data:extend({ type = "active-defense-equipment", name = "nullius-upgrade-telekinesis-field-2", take_result = "nullius-telekinesis-field-2", - localised_description = {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-bonus-reach", 12}, "\n", - {"equipment-description.nullius-bonus-mining", 50}, "\n", - {"equipment-description.nullius-bonus-craft", 20, 12}, "\n", + localised_description = {"equipment-description.nullius-buffer", {"", + {"equipment-description.nullius-bonus-reach", tostring(12)}, "\n", + {"equipment-description.nullius-bonus-mining", tostring(50)}, "\n", + {"equipment-description.nullius-bonus-craft", tostring(20), tostring(12)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 25}}}, - {"entity-description.nullius-megajoule", 3}}, + {"entity-description.nullius-kilowatt", tostring(25)}}}, + {"entity-description.nullius-megajoule", tostring(3)}}, order = "mc", sprite = { filename = EQUIPPATH.."telekinesis-2.png", @@ -2227,10 +2221,10 @@ data:extend({ type = "projectile", cooldown = 60, range = 12, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "25kJ" + energy_consumption = "25kJ" } } }, @@ -2238,13 +2232,13 @@ data:extend({ type = "active-defense-equipment", name = "nullius-upgrade-telekinesis-field-3", take_result = "nullius-telekinesis-field-3", - localised_description = {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-bonus-reach", 16}, "\n", - {"equipment-description.nullius-bonus-mining", 100}, "\n", - {"equipment-description.nullius-bonus-craft", 40, 20}, "\n", + localised_description = {"equipment-description.nullius-buffer", {"", + {"equipment-description.nullius-bonus-reach", tostring(16)}, "\n", + {"equipment-description.nullius-bonus-mining", tostring(100)}, "\n", + {"equipment-description.nullius-bonus-craft", tostring(40), tostring(20)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 30}}}, - {"entity-description.nullius-megajoule", 8}}, + {"entity-description.nullius-kilowatt", tostring(30)}}}, + {"entity-description.nullius-megajoule", tostring(8)}}, order = "md", sprite = { filename = EQUIPPATH.."telekinesis-3.png", @@ -2271,10 +2265,10 @@ data:extend({ type = "projectile", cooldown = 60, range = 16, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "30kJ" + energy_consumption = "30kJ" } } }, @@ -2282,12 +2276,12 @@ data:extend({ type = "active-defense-equipment", name = "nullius-upgrade-stabilizer-1", take_result = "nullius-stabilizer-1", - localised_description = {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-bonus-speed", 7}, "\n", - {"equipment-description.nullius-bonus-cargo", 2}, "\n", + localised_description = {"equipment-description.nullius-buffer", {"", + {"equipment-description.nullius-bonus-speed", tostring(7)}, "\n", + {"equipment-description.nullius-bonus-cargo", tostring(2)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 30}}}, - {"entity-description.nullius-kilojoule", 700}}, + {"entity-description.nullius-kilowatt", tostring(30)}}}, + {"entity-description.nullius-kilojoule", tostring(700)}}, order = "nb", sprite = { filename = EQUIPPATH.."stabilizer-1.png", @@ -2314,10 +2308,10 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "30kJ" + energy_consumption = "30kJ" } } }, @@ -2325,12 +2319,12 @@ data:extend({ type = "active-defense-equipment", name = "nullius-upgrade-stabilizer-2", take_result = "nullius-stabilizer-2", - localised_description = {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-bonus-speed", 10}, "\n", - {"equipment-description.nullius-bonus-cargo", 3}, "\n", + localised_description = {"equipment-description.nullius-buffer", {"", + {"equipment-description.nullius-bonus-speed", tostring(10)}, "\n", + {"equipment-description.nullius-bonus-cargo", tostring(3)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 40}}}, - {"entity-description.nullius-megajoule", 1}}, + {"entity-description.nullius-kilowatt", tostring(40)}}}, + {"entity-description.nullius-megajoule", tostring(1)}}, order = "nc", sprite = { filename = EQUIPPATH.."stabilizer-2.png", @@ -2357,10 +2351,10 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "40kJ" + energy_consumption = "40kJ" } } }, @@ -2368,7 +2362,7 @@ data:extend({ type = "battery-equipment", name = "nullius-upgrade-shackle", take_result = "nullius-shackle", - localised_description = {"equipment-description.nullius-penalty-speed", 25}, + localised_description = {"equipment-description.nullius-penalty-speed", tostring(25)}, order = "ns", sprite = { filename = EQUIPPATH.."shackle.png", @@ -2417,17 +2411,17 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "1kJ" + energy_consumption = "1kJ" } } }, { type = "generator-equipment", name = "nullius-portable-generator-1", - localised_name = {"", {"equipment-name.nullius-portable-generator"}, " ", 1}, + localised_name = {"", {"equipment-name.nullius-portable-generator"}, " ", tostring(1)}, localised_description = {"equipment-description.nullius-portable-generator"}, order = "obb", sprite = { @@ -2441,13 +2435,14 @@ data:extend({ height = 2, type = "full" }, - power = "400kW", + power = "400kW", energy_source = { - type = "burner", + type = "electric", usage_priority = "secondary-output" }, burner = { - fuel_category = "vehicle", + type = "burner", + fuel_categories = {"vehicle"}, effectivity = 1, fuel_inventory_size = 2, burnt_inventory_size = 2 @@ -2457,7 +2452,7 @@ data:extend({ { type = "generator-equipment", name = "nullius-portable-generator-2", - localised_name = {"", {"equipment-name.nullius-portable-generator"}, " ", 2}, + localised_name = {"", {"equipment-name.nullius-portable-generator"}, " ", tostring(2)}, localised_description = {"equipment-description.nullius-portable-generator"}, order = "obc", sprite = { @@ -2472,13 +2467,14 @@ data:extend({ height = 3, type = "full" }, - power = "1.5MW", + power = "1.5MW", energy_source = { - type = "burner", + type = "electric", usage_priority = "secondary-output" }, burner = { - fuel_category = "vehicle", + type = "burner", + fuel_categories = {"vehicle"}, effectivity = 1, fuel_inventory_size = 5, burnt_inventory_size = 5 @@ -2501,13 +2497,14 @@ data:extend({ height = 3, type = "full" }, - power = "1.5MW", + power = "1.5MW", energy_source = { - type = "burner", + type = "electric", usage_priority = "tertiary" }, burner = { - fuel_category = "vehicle", + type = "burner", + fuel_categories = {"vehicle"}, effectivity = 1, fuel_inventory_size = 5, burnt_inventory_size = 5 @@ -2529,13 +2526,14 @@ data:extend({ height = 4, type = "full" }, - power = "6MW", + power = "6MW", energy_source = { - type = "burner", + type = "electric", usage_priority = "secondary-output" }, burner = { - fuel_category = "nullius-nuclear", + type = "burner", + fuel_categories = {"nullius-nuclear"}, effectivity = 1, fuel_inventory_size = 3, burnt_inventory_size = 3 @@ -2546,15 +2544,15 @@ data:extend({ { type = "active-defense-equipment", name = "nullius-upgrade-coprocessor-speed-1", - take_result = "nullius-coprocessor-speed-1", - localised_name = {"", - {"equipment-name.nullius-upgrade-coprocessor-speed"}, " ", 1}, - localised_description = {"", {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-coprocessor-speed", 20, 10, 5}, "\n", - {"equipment-description.nullius-bonus-speed", 8}, "\n", + take_result = "nullius-coprocessor-speed-1", + localised_name = {"", + {"equipment-name.nullius-upgrade-coprocessor-speed"}, " ", tostring(1)}, + localised_description = {"", {"equipment-description.nullius-buffer", {"", + {"equipment-description.nullius-coprocessor-speed", tostring(20), tostring(10), tostring(5)}, "\n", + {"equipment-description.nullius-bonus-speed", tostring(8)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 30}}}, - {"entity-description.nullius-megajoule", 3}}, "\n", + {"entity-description.nullius-kilowatt", tostring(30)}}}, + {"entity-description.nullius-megajoule", tostring(3)}}, "\n", {"equipment-description.nullius-coprocessor-tier-1"}}, order = "lpbb", sprite = { @@ -2571,36 +2569,36 @@ data:extend({ }, energy_source = { type = "electric", - buffer_capacity = "3MJ", + buffer_capacity = "3MJ", input_flow_limit = "1MW", - drain = "30kW", + drain = "30kW", usage_priority = "secondary-input" }, categories = {"android"}, - automatic = false, + automatic = false, attack_parameters = { type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "10kJ" + energy_consumption = "10kJ" } } }, { type = "active-defense-equipment", name = "nullius-upgrade-coprocessor-speed-2", - take_result = "nullius-coprocessor-speed-2", - localised_name = {"", - {"equipment-name.nullius-upgrade-coprocessor-speed"}, " ", 2}, - localised_description = {"", {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-coprocessor-speed", 30, 15, 10}, "\n", - {"equipment-description.nullius-bonus-speed", 12}, "\n", + take_result = "nullius-coprocessor-speed-2", + localised_name = {"", + {"equipment-name.nullius-upgrade-coprocessor-speed"}, " ", tostring(2)}, + localised_description = {"", {"equipment-description.nullius-buffer", {"", + {"equipment-description.nullius-coprocessor-speed", tostring(30), tostring(15), tostring(10)}, "\n", + {"equipment-description.nullius-bonus-speed", tostring(12)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 50}}}, - {"entity-description.nullius-megajoule", 10}}, "\n", + {"entity-description.nullius-kilowatt", tostring(50)}}}, + {"entity-description.nullius-megajoule", tostring(10)}}, "\n", {"equipment-description.nullius-coprocessor-tier-2"}}, order = "lpbc", sprite = { @@ -2628,25 +2626,25 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "10kJ" + energy_consumption = "10kJ" } } }, { type = "active-defense-equipment", name = "nullius-upgrade-coprocessor-speed-3", - take_result = "nullius-coprocessor-speed-3", - localised_name = {"", - {"equipment-name.nullius-upgrade-coprocessor-speed"}, " ", 3}, - localised_description = {"", {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-coprocessor-speed", 50, 25, 20}, "\n", - {"equipment-description.nullius-bonus-speed", 20}, "\n", + take_result = "nullius-coprocessor-speed-3", + localised_name = {"", + {"equipment-name.nullius-upgrade-coprocessor-speed"}, " ", tostring(3)}, + localised_description = {"", {"equipment-description.nullius-buffer", {"", + {"equipment-description.nullius-coprocessor-speed", tostring(50), tostring(25), tostring(20)}, "\n", + {"equipment-description.nullius-bonus-speed", tostring(20)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 80}}}, - {"entity-description.nullius-megajoule", 20}}, "\n", + {"entity-description.nullius-kilowatt", tostring(80)}}}, + {"entity-description.nullius-megajoule", tostring(20)}}, "\n", {"equipment-description.nullius-coprocessor-tier-3"}}, order = "lpbd", sprite = { @@ -2674,21 +2672,21 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "10kJ" + energy_consumption = "10kJ" } } }, { type = "generator-equipment", name = "nullius-upgrade-coprocessor-efficiency-1", - take_result = "nullius-coprocessor-efficiency-1", - localised_name = {"", - {"equipment-name.nullius-upgrade-coprocessor-efficiency"}, " ", 1}, + take_result = "nullius-coprocessor-efficiency-1", + localised_name = {"", + {"equipment-name.nullius-upgrade-coprocessor-efficiency"}, " ", tostring(1)}, localised_description = {"", - {"equipment-description.nullius-coprocessor-efficiency", 100, 20}, "\n", + {"equipment-description.nullius-coprocessor-efficiency", tostring(100), tostring(20)}, "\n", {"equipment-description.nullius-coprocessor-tier-1"}}, order = "lpcb", sprite = { @@ -2713,11 +2711,11 @@ data:extend({ { type = "generator-equipment", name = "nullius-upgrade-coprocessor-efficiency-2", - take_result = "nullius-coprocessor-efficiency-2", - localised_name = {"", - {"equipment-name.nullius-upgrade-coprocessor-efficiency"}, " ", 2}, + take_result = "nullius-coprocessor-efficiency-2", + localised_name = {"", + {"equipment-name.nullius-upgrade-coprocessor-efficiency"}, " ", tostring(2)}, localised_description = {"", - {"equipment-description.nullius-coprocessor-efficiency", 200, 30}, "\n", + {"equipment-description.nullius-coprocessor-efficiency", tostring(200), tostring(30)}, "\n", {"equipment-description.nullius-coprocessor-tier-2"}}, order = "lpcc", sprite = { @@ -2742,11 +2740,11 @@ data:extend({ { type = "generator-equipment", name = "nullius-upgrade-coprocessor-efficiency-3", - take_result = "nullius-coprocessor-efficiency-3", - localised_name = {"", - {"equipment-name.nullius-upgrade-coprocessor-efficiency"}, " ", 3}, + take_result = "nullius-coprocessor-efficiency-3", + localised_name = {"", + {"equipment-name.nullius-upgrade-coprocessor-efficiency"}, " ", tostring(3)}, localised_description = {"", - {"equipment-description.nullius-coprocessor-efficiency", 300, 40}, "\n", + {"equipment-description.nullius-coprocessor-efficiency", tostring(300), tostring(40)}, "\n", {"equipment-description.nullius-coprocessor-tier-3"}}, order = "lpcd", sprite = { @@ -2771,14 +2769,14 @@ data:extend({ { type = "active-defense-equipment", name = "nullius-upgrade-coprocessor-productivity-1", - take_result = "nullius-coprocessor-productivity-1", - localised_name = {"", - {"equipment-name.nullius-upgrade-coprocessor-productivity"}, " ", 1}, - localised_description = {"", {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-coprocessor-productivity", 6, 10, 25, 20}, "\n", + take_result = "nullius-coprocessor-productivity-1", + localised_name = {"", + {"equipment-name.nullius-upgrade-coprocessor-productivity"}, " ", tostring(1)}, + localised_description = {"", {"equipment-description.nullius-buffer", {"", + {"equipment-description.nullius-coprocessor-productivity", tostring(6), tostring(10), tostring(25), tostring(20)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 20}}}, - {"entity-description.nullius-megajoule", 3}}, "\n", + {"entity-description.nullius-kilowatt", tostring(20)}}}, + {"entity-description.nullius-megajoule", tostring(3)}}, "\n", {"equipment-description.nullius-coprocessor-tier-1"}}, order = "lpdb", sprite = { @@ -2806,24 +2804,24 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "10kJ" + energy_consumption = "10kJ" } } }, { type = "active-defense-equipment", name = "nullius-upgrade-coprocessor-productivity-2", - take_result = "nullius-coprocessor-productivity-2", - localised_name = {"", - {"equipment-name.nullius-upgrade-coprocessor-productivity"}, " ", 2}, - localised_description = {"", {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-coprocessor-productivity", 8, 15, 30, 30}, "\n", + take_result = "nullius-coprocessor-productivity-2", + localised_name = {"", + {"equipment-name.nullius-upgrade-coprocessor-productivity"}, " ", tostring(2)}, + localised_description = {"", {"equipment-description.nullius-buffer", {"", + {"equipment-description.nullius-coprocessor-productivity", tostring(8), tostring(15), tostring(30), tostring(30)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 40}}}, - {"entity-description.nullius-megajoule", 10}}, "\n", + {"entity-description.nullius-kilowatt", tostring(40)}}}, + {"entity-description.nullius-megajoule", tostring(10)}}, "\n", {"equipment-description.nullius-coprocessor-tier-2"}}, order = "lpdc", sprite = { @@ -2851,24 +2849,24 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "10kJ" + energy_consumption = "10kJ" } } }, { type = "active-defense-equipment", name = "nullius-upgrade-coprocessor-productivity-3", - take_result = "nullius-coprocessor-productivity-3", - localised_name = {"", - {"equipment-name.nullius-upgrade-coprocessor-productivity"}, " ", 3}, - localised_description = {"", {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-coprocessor-productivity", 10, 15, 40, 50}, "\n", + take_result = "nullius-coprocessor-productivity-3", + localised_name = {"", + {"equipment-name.nullius-upgrade-coprocessor-productivity"}, " ", tostring(3)}, + localised_description = {"", {"equipment-description.nullius-buffer", {"", + {"equipment-description.nullius-coprocessor-productivity", tostring(10), tostring(15), tostring(40), tostring(50)}, "\n", {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 60}}}, - {"entity-description.nullius-megajoule", 20}}, "\n", + {"entity-description.nullius-kilowatt", tostring(60)}}}, + {"entity-description.nullius-megajoule", tostring(20)}}, "\n", {"equipment-description.nullius-coprocessor-tier-3"}}, order = "lpdd", sprite = { @@ -2896,21 +2894,21 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "10kJ" + energy_consumption = "10kJ" } } }, { type = "active-defense-equipment", name = "nullius-upgrade-coprocessor-quantum", - take_result = "nullius-coprocessor-quantum", + take_result = "nullius-coprocessor-quantum", localised_description = {"", {"equipment-description.nullius-coprocessor-quantum"}, "\n", - {"equipment-description.nullius-energy", - {"entity-description.nullius-kilowatt", 25}}}, + {"equipment-description.nullius-energy", + {"entity-description.nullius-kilowatt", tostring(25)}}}, order = "lpe", sprite = { filename = EQUIPPATH.."coprocessor/quantum.png", @@ -2937,10 +2935,10 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "10kJ" + energy_consumption = "10kJ" } } }, @@ -2948,10 +2946,10 @@ data:extend({ { type = "active-defense-equipment", name = "nullius-deactivated-coprocessor-speed-1", - take_result = "nullius-coprocessor-speed-1", - localised_name = {"equipment-name.nullius-deactivated-coprocessor", - {"equipment-name.nullius-upgrade-coprocessor-speed"}, 1}, - localised_description = {"equipment-description.nullius-deactivated-coprocessor", 1}, + take_result = "nullius-coprocessor-speed-1", + localised_name = {"equipment-name.nullius-deactivated-coprocessor", + {"equipment-name.nullius-upgrade-coprocessor-speed"}, tostring(1)}, + localised_description = {"equipment-description.nullius-deactivated-coprocessor", tostring(1)}, order = "lqbb", sprite = { filename = EQUIPPATH.."coprocessor/disabled.png", @@ -2978,20 +2976,20 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "1kJ" + energy_consumption = "1kJ" } } }, { type = "active-defense-equipment", name = "nullius-deactivated-coprocessor-speed-2", - take_result = "nullius-coprocessor-speed-2", - localised_name = {"equipment-name.nullius-deactivated-coprocessor", - {"equipment-name.nullius-upgrade-coprocessor-speed"}, 2}, - localised_description = {"equipment-description.nullius-deactivated-coprocessor", 2}, + take_result = "nullius-coprocessor-speed-2", + localised_name = {"equipment-name.nullius-deactivated-coprocessor", + {"equipment-name.nullius-upgrade-coprocessor-speed"}, tostring(2)}, + localised_description = {"equipment-description.nullius-deactivated-coprocessor", tostring(2)}, order = "lqbc", sprite = { filename = EQUIPPATH.."coprocessor/disabled.png", @@ -3013,25 +3011,25 @@ data:extend({ usage_priority = "secondary-input" }, categories = {"android"}, - automatic = false, + automatic = false, attack_parameters = { type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "2kJ" + energy_consumption = "2kJ" } } }, { type = "active-defense-equipment", name = "nullius-deactivated-coprocessor-speed-3", - take_result = "nullius-coprocessor-speed-3", - localised_name = {"equipment-name.nullius-deactivated-coprocessor", - {"equipment-name.nullius-upgrade-coprocessor-speed"}, 3}, - localised_description = {"equipment-description.nullius-deactivated-coprocessor", 3}, + take_result = "nullius-coprocessor-speed-3", + localised_name = {"equipment-name.nullius-deactivated-coprocessor", + {"equipment-name.nullius-upgrade-coprocessor-speed"}, tostring(3)}, + localised_description = {"equipment-description.nullius-deactivated-coprocessor", tostring(3)}, order = "lqbd", sprite = { filename = EQUIPPATH.."coprocessor/disabled.png", @@ -3058,20 +3056,20 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "3kJ" + energy_consumption = "3kJ" } } }, { type = "active-defense-equipment", name = "nullius-deactivated-coprocessor-efficiency-1", - take_result = "nullius-coprocessor-efficiency-1", - localised_name = {"equipment-name.nullius-deactivated-coprocessor", - {"equipment-name.nullius-upgrade-coprocessor-efficiency"}, 1}, - localised_description = {"equipment-description.nullius-deactivated-coprocessor", 1}, + take_result = "nullius-coprocessor-efficiency-1", + localised_name = {"equipment-name.nullius-deactivated-coprocessor", + {"equipment-name.nullius-upgrade-coprocessor-efficiency"}, tostring(1)}, + localised_description = {"equipment-description.nullius-deactivated-coprocessor", tostring(1)}, order = "lqcb", sprite = { filename = EQUIPPATH.."coprocessor/disabled.png", @@ -3098,20 +3096,20 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "1kJ" + energy_consumption = "1kJ" } } }, { type = "active-defense-equipment", name = "nullius-deactivated-coprocessor-efficiency-2", - take_result = "nullius-coprocessor-efficiency-2", - localised_name = {"equipment-name.nullius-deactivated-coprocessor", - {"equipment-name.nullius-upgrade-coprocessor-efficiency"}, 2}, - localised_description = {"equipment-description.nullius-deactivated-coprocessor", 2}, + take_result = "nullius-coprocessor-efficiency-2", + localised_name = {"equipment-name.nullius-deactivated-coprocessor", + {"equipment-name.nullius-upgrade-coprocessor-efficiency"}, tostring(2)}, + localised_description = {"equipment-description.nullius-deactivated-coprocessor", tostring(2)}, order = "lqcc", sprite = { filename = EQUIPPATH.."coprocessor/disabled.png", @@ -3138,20 +3136,20 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "2kJ" + energy_consumption = "2kJ" } } }, { type = "active-defense-equipment", name = "nullius-deactivated-coprocessor-efficiency-3", - take_result = "nullius-coprocessor-efficiency-3", - localised_name = {"equipment-name.nullius-deactivated-coprocessor", - {"equipment-name.nullius-upgrade-coprocessor-efficiency"}, 3}, - localised_description = {"equipment-description.nullius-deactivated-coprocessor", 3}, + take_result = "nullius-coprocessor-efficiency-3", + localised_name = {"equipment-name.nullius-deactivated-coprocessor", + {"equipment-name.nullius-upgrade-coprocessor-efficiency"}, tostring(3)}, + localised_description = {"equipment-description.nullius-deactivated-coprocessor", tostring(3)}, order = "lqcd", sprite = { filename = EQUIPPATH.."coprocessor/disabled.png", @@ -3178,20 +3176,20 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "3kJ" + energy_consumption = "3kJ" } } }, { type = "active-defense-equipment", name = "nullius-deactivated-coprocessor-productivity-1", - take_result = "nullius-coprocessor-productivity-1", - localised_name = {"equipment-name.nullius-deactivated-coprocessor", - {"equipment-name.nullius-upgrade-coprocessor-productivity"}, 1}, - localised_description = {"equipment-description.nullius-deactivated-coprocessor", 1}, + take_result = "nullius-coprocessor-productivity-1", + localised_name = {"equipment-name.nullius-deactivated-coprocessor", + {"equipment-name.nullius-upgrade-coprocessor-productivity"}, tostring(1)}, + localised_description = {"equipment-description.nullius-deactivated-coprocessor", tostring(1)}, order = "lqdb", sprite = { filename = EQUIPPATH.."coprocessor/disabled.png", @@ -3218,20 +3216,20 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "1kJ" + energy_consumption = "1kJ" } } }, { type = "active-defense-equipment", name = "nullius-deactivated-coprocessor-productivity-2", - take_result = "nullius-coprocessor-productivity-2", - localised_name = {"equipment-name.nullius-deactivated-coprocessor", - {"equipment-name.nullius-upgrade-coprocessor-productivity"}, 2}, - localised_description = {"equipment-description.nullius-deactivated-coprocessor", 2}, + take_result = "nullius-coprocessor-productivity-2", + localised_name = {"equipment-name.nullius-deactivated-coprocessor", + {"equipment-name.nullius-upgrade-coprocessor-productivity"}, tostring(2)}, + localised_description = {"equipment-description.nullius-deactivated-coprocessor", tostring(2)}, order = "lqdc", sprite = { filename = EQUIPPATH.."coprocessor/disabled.png", @@ -3258,20 +3256,20 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "2kJ" + energy_consumption = "2kJ" } } }, { type = "active-defense-equipment", name = "nullius-deactivated-coprocessor-productivity-3", - take_result = "nullius-coprocessor-productivity-3", - localised_name = {"equipment-name.nullius-deactivated-coprocessor", - {"equipment-name.nullius-upgrade-coprocessor-productivity"}, 3}, - localised_description = {"equipment-description.nullius-deactivated-coprocessor", 3}, + take_result = "nullius-coprocessor-productivity-3", + localised_name = {"equipment-name.nullius-deactivated-coprocessor", + {"equipment-name.nullius-upgrade-coprocessor-productivity"}, tostring(3)}, + localised_description = {"equipment-description.nullius-deactivated-coprocessor", tostring(3)}, order = "lqdd", sprite = { filename = EQUIPPATH.."coprocessor/disabled.png", @@ -3298,10 +3296,10 @@ data:extend({ type = "projectile", cooldown = 60, range = 1, + ammo_category = "electric", ammo_type = { type = "projectile", - category = "electric", - energy_consumption = "3kJ" + energy_consumption = "3kJ" } } }, diff --git a/nullius/prototypes/entity/furnace.lua b/nullius/prototypes/entity/furnace.lua index 1c5b227..417626d 100644 --- a/nullius/prototypes/entity/furnace.lua +++ b/nullius/prototypes/entity/furnace.lua @@ -2,7 +2,78 @@ local ICONPATH = "__nullius__/graphics/icons/" local ENTITYPATH = "__nullius__/graphics/entity/" local BASEENTITY = "__base__/graphics/entity/" -local floatpipepics = data.raw["assembling-machine"]["ore-floatation-cell"].fluid_boxes[1].pipe_picture +local function scale_wire_position(wire_pos, scale) + for _, wire_type in pairs(wire_pos) do + if wire_type.x then + wire_type.x = wire_type.x*scale + wire_type.y = wire_type.y*scale + else + wire_type[1] = wire_type[1]*scale + wire_type[2] = wire_type[2]*scale + end + end +end + +local function offset_sprite(sprite, scale, only_shift) + if sprite == nil then return end + if sprite.shift ~= nil then + sprite.shift = {sprite.shift[1]*scale,sprite.shift[2]*scale} + else + --sprite.shift = {2,2} -- what value do we set if no shift ? + end + if sprite.scale and not only_shift then + sprite.scale = sprite.scale * scale + end +end + +function scale_connector_points(original, scale, only_shift) + local result = table.deepcopy(original) + for _, connector in pairs(result) do + scale_wire_position(connector.points.wire, scale) + scale_wire_position(connector.points.shadow, scale) + offset_sprite(connector.sprites.connector_main,scale, only_shift) + offset_sprite(connector.sprites.connector_shadow,scale, only_shift) + offset_sprite(connector.sprites.wire_pins,scale, only_shift) + offset_sprite(connector.sprites.wire_pins_shadow,scale, only_shift) + offset_sprite(connector.sprites.led_blue_off,scale, only_shift) + offset_sprite(connector.sprites.led_red,scale, only_shift) + offset_sprite(connector.sprites.led_green,scale, only_shift) + offset_sprite(connector.sprites.led_blue,scale, only_shift) + offset_sprite(connector.sprites.led_light,scale, only_shift) + end + return result +end + +local floatpipepics = { + north = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/pipe-north.png", + priority = "extra-high", + width = 48, + height = 48, + shift = { 0.01, 0.95 }, + }, + east = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/pipe-east.png", + priority = "extra-high", + width = 40, + height = 45, + shift = { -0.71875, 0.1 }, + }, + south = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/pipe-south.png", + priority = "extra-high", + width = 34, + height = 39, + shift = { 0, -0.75 }, + }, + west = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/pipe-west.png", + priority = "extra-high", + width = 40, + height = 45, + shift = { 0.78125, 0.01 }, + }, + } data:extend({ @@ -19,8 +90,8 @@ data:extend({ mined_sound = { filename = "__base__/sound/deconstruct-bricks.ogg" }, open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, - vehicle_impact_sound = { filename = "__base__/sound/car-stone-impact.ogg", volume = 1.0 }, - working_sound = data.raw["furnace"]["steel-furnace"].working_sound, + impact_category = "stone", + working_sound = data.raw["furnace"]["steel-furnace"].working_sound, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", decrease = 100, percent = 90 }, @@ -29,18 +100,19 @@ data:extend({ collision_box = {{-0.7, -0.7}, {0.7, 0.7}}, selection_box = {{-0.8, -1}, {0.8, 1}}, crafting_categories = {"dry-smelting"}, - result_inventory_size = 1, + --result_inventory_size = 1, + --source_inventory_size = 1, crafting_speed = 0.25, - source_inventory_size = 1, energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "6kW" }, + circuit_wire_max_distance = furnace_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["stone-furnace"], energy_usage = "69kW", - animation = data.raw["furnace"]["stone-furnace"].animation, - working_visualisations = data.raw["furnace"]["stone-furnace"].working_visualisations, + graphics_set = data.raw["furnace"]["stone-furnace"].graphics_set, fast_replaceable_group = "small-furnace", next_upgrade = "nullius-small-furnace-2" }, @@ -54,7 +126,7 @@ data:extend({ minable = {mining_time = 0.9, result = "nullius-small-furnace-2"}, max_health = 250, corpse = "steel-furnace-remnants", - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = data.raw["furnace"]["steel-furnace"].working_sound, resistances = { { type = "impact", decrease = 100, percent = 90 }, @@ -64,23 +136,21 @@ data:extend({ collision_box = {{-0.7, -0.7}, {0.7, 0.7}}, selection_box = {{-0.8, -1}, {0.8, 1}}, crafting_categories = {"dry-smelting"}, - result_inventory_size = 1, + --result_inventory_size = 1, + --source_inventory_size = 1, crafting_speed = 0.5, - source_inventory_size = 1, energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "12kW" }, + circuit_wire_max_distance = furnace_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["steel-furnace"], energy_usage = "138kW", - module_specification = { - module_slots = 1, - module_info_icon_shift = {0, 0.5} - }, + module_slots = 1, allowed_effects = {"consumption", "speed", "productivity", "pollution"}, - animation = data.raw["furnace"]["steel-furnace"].animation, - working_visualisations = data.raw["furnace"]["steel-furnace"].working_visualisations, + graphics_set = data.raw["furnace"]["steel-furnace"].graphics_set, fast_replaceable_group = "small-furnace", next_upgrade = "nullius-small-furnace-3" }, @@ -109,104 +179,106 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "20kW" }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = data.raw["furnace"]["electric-furnace"].working_sound, - module_specification = { - module_slots = 2, - module_info_icon_shift = {0, 0.5} - }, + module_slots = 2, allowed_effects = {"consumption", "speed", "productivity", "pollution"}, + circuit_wire_max_distance = furnace_circuit_wire_max_distance, + circuit_connector = scale_connector_points(circuit_connector_definitions["electric-furnace"],0.6666), - animation = { - layers = { + graphics_set = { + animation = { + layers = { + { + filename = BASEENTITY .. "electric-furnace/electric-furnace.png", + priority = "high", + width = 239, + height = 219, + frame_count = 1, + shift = util.by_pixel(0.75, 5.75), + scale = 0.5*0.6666, + tint = {0.7, 0.7, 0.85} + }, + { + filename = BASEENTITY .. "electric-furnace/electric-furnace-shadow.png", + priority = "high", + width = 227, + height = 171, + frame_count = 1, + draw_as_shadow = true, + shift = util.by_pixel(11.25, 7.75), + scale = 0.5*0.6666 + }, + } + }, + + working_visualisations = { { - filename = BASEENTITY .. "electric-furnace/electric-furnace-base.png", - priority = "high", - width = 129, - height = 100, - frame_count = 1, - shift = {0.2813, 0}, - scale = 0.6666, - tint = {0.7, 0.7, 0.85} + fadeout = true, + animation = { + layers = { + { + filename = BASEENTITY .. "electric-furnace/electric-furnace-heater.png", + priority = "high", + width = 60, + height = 56, + frame_count = 12, + animation_speed = 0.5, + draw_as_glow = true, + shift = util.by_pixel(1.75*0.6666, 35*0.6666), + scale = 0.6666*0.5 + }, + { + filename = BASEENTITY .. "electric-furnace/electric-furnace-light.png", + blend_mode = "additive", + width = 202, + height = 202, + repeat_count = 12, + draw_as_glow = true, + shift = util.by_pixel(1*0.6666, 0), + scale = 0.6666*0.5 + } + } + } }, { - filename = BASEENTITY .. "electric-furnace/electric-furnace-shadow.png", - priority = "high", - width = 129, - height = 100, - frame_count = 1, - shift = {0.2813, 0}, - draw_as_shadow = true, - scale = 0.6666 - } - } - }, - - working_visualisations = { - { - draw_as_light = true, - fadeout = true, - animation = { - layers = { - { - filename = BASEENTITY .. "electric-furnace/electric-furnace-heater.png", - priority = "high", - width = 25, - height = 15, - frame_count = 12, - animation_speed = 0.5, - shift = {0.01042, 0.5938}, - scale = 0.6666 - }, - { - filename = BASEENTITY .. "electric-furnace/electric-furnace-light.png", - blend_mode = "additive", - width = 104, - height = 102, - repeat_count = 12, - shift = util.by_pixel(0, 0), - scale = 0.6666 - } + fadeout = true, + animation = { + draw_as_light = true, + filename = BASEENTITY .. "electric-furnace/electric-furnace-ground-light.png", + blend_mode = "additive", + width = 166, + height = 124, + shift = util.by_pixel(3, 69), + scale = 0.5*0.6666, + } + }, + { + animation = { + filename = BASEENTITY .. "electric-furnace/electric-furnace-propeller-1.png", + priority = "high", + width = 37, + height = 25, + frame_count = 4, + animation_speed = 0.5, + shift = util.by_pixel(-20.5*0.6666, -16.5*0.6666), + scale = 0.6666*0.5 + } + }, + { + animation = { + filename = BASEENTITY .. "electric-furnace/electric-furnace-propeller-2.png", + priority = "high", + width = 23, + height = 15, + frame_count = 4, + animation_speed = 0.5, + shift = util.by_pixel(4*0.6666, -34*0.6666), + scale = 0.6666*0.5 } - } - }, - { - draw_as_light = true, - draw_as_sprite = false, - fadeout = true, - animation = { - filename = BASEENTITY .. "electric-furnace/electric-furnace-ground-light.png", - blend_mode = "additive", - width = 82, - height = 64, - shift = util.by_pixel(4*0.6666, 68*0.6666) - } - }, - { - animation = { - filename = BASEENTITY .. "electric-furnace/electric-furnace-propeller-1.png", - priority = "high", - width = 19, - height = 13, - frame_count = 4, - animation_speed = 0.5, - shift = {-0.4479, -0.4271}, - scale = 0.6666 - } - }, - { - animation = { - filename = BASEENTITY .. "electric-furnace/electric-furnace-propeller-2.png", - priority = "high", - width = 12, - height = 9, - frame_count = 4, - animation_speed = 0.5, - shift = {0.041666, -0.8229}, - scale = 0.6666 } } }, @@ -235,8 +307,8 @@ data:extend({ minable = {mining_time = 1.2, result = "nullius-medium-furnace-1"}, max_health = 300, corpse = "steel-furnace-remnants", - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["furnace"]["steel-furnace"].working_sound, + impact_category = "metal", + working_sound = data.raw["furnace"]["steel-furnace"].working_sound, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", decrease = 100, percent = 90 }, @@ -251,97 +323,129 @@ data:extend({ { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 3, - pipe_connections = {{ type="output", position = {0, -2} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {0, -1}, direction = defines.direction.north }} }, - off_when_no_fluid_recipe = true }, - result_inventory_size = 1, + fluid_boxes_off_when_no_fluid_recipe = true, + --result_inventory_size = 1, + --source_inventory_size = 1, crafting_speed = 1, - source_inventory_size = 1, energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "25kW" }, energy_usage = "270kW", - module_specification = { - module_slots = 1, - module_info_icon_shift = {0, 0.8} - }, + module_slots = 1, allowed_effects = {"consumption", "speed", "productivity", "pollution"}, - animation = { - layers = { + + circuit_wire_max_distance = furnace_circuit_wire_max_distance, + circuit_connector = scale_connector_points(circuit_connector_definitions["steel-furnace"],1.5), + + graphics_set = { + animation = { + layers = { + { + filename = BASEENTITY .. "steel-furnace/steel-furnace.png", + priority = "high", + width = 171, + height = 174, + frame_count = 1, + shift = util.by_pixel(-1.25*1.5, 2*1.5), + scale = 0.75 + }, + { + filename = BASEENTITY .. "steel-furnace/steel-furnace-shadow.png", + priority = "high", + width = 277, + height = 85, + frame_count = 1, + draw_as_shadow = true, + shift = util.by_pixel(39.25*1.5, 11.25*1.5), + scale = 0.75 + } + } + }, + working_visualisations = { { - filename = BASEENTITY .. "steel-furnace/hr-steel-furnace.png", - priority = "high", - width = 171, - height = 174, - frame_count = 1, - shift = util.by_pixel(-1.25*1.5, 2*1.5), - scale = 0.75 + fadeout = true, + effect = "flicker", + animation = { + draw_as_glow = true, + filename = BASEENTITY .. "steel-furnace/steel-furnace-fire.png", + priority = "high", + line_length = 8, + width = 57, + height = 81, + frame_count = 48, + shift = util.by_pixel(-0.75*1.5, 5.75*1.5), + scale = 0.75 + } }, { - filename = BASEENTITY .. "steel-furnace/hr-steel-furnace-shadow.png", - priority = "high", - width = 277, - height = 85, - frame_count = 1, - draw_as_shadow = true, - shift = util.by_pixel(39.25*1.5, 11.25*1.5), - scale = 0.75 - } - } - }, - working_visualisations = { - { - draw_as_light = true, - fadeout = true, - effect = "flicker", - animation = { - filename = BASEENTITY .. "steel-furnace/hr-steel-furnace-fire.png", + fadeout = true, + effect = "flicker", + animation = { + filename = BASEENTITY .. "steel-furnace/steel-furnace-glow.png", + draw_as_glow = true, priority = "high", - line_length = 8, - width = 57, - height = 81, - frame_count = 48, - direction_count = 1, - shift = util.by_pixel(-0.75*1.5, 5.75*1.5), + width = 60, + height = 43, + frame_count = 1, + shift = {0.03125*1.5, 0.640625*1.5}, + scale = 1.5, + blend_mode = "additive" + } + }, + { + fadeout = true, + effect = "flicker", + animation = { + filename = BASEENTITY .. "steel-furnace/steel-furnace-working.png", + draw_as_glow = true, + priority = "high", + line_length = 1, + width = 128, + height = 150, + frame_count = 1, + shift = util.by_pixel(0, -5*1.5), + blend_mode = "additive", scale = 0.75 - } - }, - { - fadeout = true, - draw_as_light = true, - effect = "flicker", - animation = { - filename = BASEENTITY .. "steel-furnace/steel-furnace-glow.png", - priority = "high", - width = 60, - height = 43, - frame_count = 1, - shift = {0.03125*1.5, 0.640625*1.5}, - scale = 1.5, - blend_mode = "additive" - } + } + }, + { + fadeout = true, + effect = "flicker", + animation = + { + filename = BASEENTITY .. "steel-furnace/steel-furnace-ground-light.png", + priority = "high", + line_length = 1, + width = 152, + height = 126, + draw_as_light = true, + shift = util.by_pixel(1, 48), + blend_mode = "additive", + scale = 0.75, + }, + }, }, + water_reflection = { - fadeout = true, - draw_as_light = true, - effect = "flicker", - animation = { - filename = BASEENTITY .. "steel-furnace/hr-steel-furnace-working.png", - priority = "high", - line_length = 1, - width = 128, - height = 150, - frame_count = 1, - direction_count = 1, - shift = util.by_pixel(0, -5*1.5), - blend_mode = "additive", - scale = 0.75 - } + pictures = + { + filename = BASEENTITY .. "steel-furnace/steel-furnace-reflection.png", + priority = "extra-high", + width = 20, + height = 24, + shift = util.by_pixel(0, 45), + variation_count = 1, + scale = 75 + }, + rotate = false, + orientation_to_variation = false } } }, @@ -369,78 +473,61 @@ data:extend({ { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -1, - pipe_connections = {{ type="input", position = {0, 2} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {0, 1}, direction = defines.direction.south }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 5, - pipe_connections = {{ type="output", position = {0, -2} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {0, -1}, direction = defines.direction.north }} }, - off_when_no_fluid_recipe = true }, + fluid_boxes_off_when_no_fluid_recipe = true, crafting_categories = {"dry-smelting", "vent-smelting", "wet-smelting"}, crafting_speed = 2, energy_usage = "520kW", energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "60kW" }, - working_visualisations = data.raw["furnace"]["electric-furnace"].working_visualisations, working_sound = data.raw["furnace"]["electric-furnace"].working_sound, - water_reflection = data.raw["furnace"]["electric-furnace"].water_reflection, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - module_specification = { - module_slots = 2, - module_info_icon_shift = {0, 0.8} - }, + impact_category = "metal", + module_slots = 2, allowed_effects = {"consumption", "speed", "productivity", "pollution"}, + + circuit_wire_max_distance = furnace_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["electric-furnace"], - animation = { - layers = { - { - filename = BASEENTITY .. "electric-furnace/electric-furnace-base.png", - priority = "high", - width = 129, - height = 100, - frame_count = 1, - shift = {0.421875, 0}, - tint = {0.7, 0.7, 0.85}, - hr_version = { - filename = BASEENTITY .. "electric-furnace/hr-electric-furnace.png", - priority = "high", - width = 239, - height = 219, - frame_count = 1, - shift = util.by_pixel(0.75, 5.75), - scale = 0.5, - tint = {0.7, 0.7, 0.85} - } - }, - { - filename = BASEENTITY .. "electric-furnace/electric-furnace-shadow.png", - priority = "high", - width = 129, - height = 100, - frame_count = 1, - shift = {0.421875, 0}, - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "electric-furnace/hr-electric-furnace-shadow.png", - priority = "high", - width = 227, - height = 171, - frame_count = 1, - draw_as_shadow = true, - shift = util.by_pixel(11.25, 7.75), - scale = 0.5 + graphics_set = { + animation = { + layers = { + { + filename = BASEENTITY .. "electric-furnace/electric-furnace.png", + priority = "high", + width = 239, + height = 219, + frame_count = 1, + shift = util.by_pixel(0.75, 5.75), + scale = 0.5, + tint = {0.7, 0.7, 0.85} + }, + { + filename = BASEENTITY .. "electric-furnace/electric-furnace-shadow.png", + priority = "high", + width = 227, + height = 171, + frame_count = 1, + draw_as_shadow = true, + shift = util.by_pixel(11.25, 7.75), + scale = 0.5 } } - } + }, + working_visualisations = data.raw["furnace"]["electric-furnace"].graphics_set.working_visualisations, + water_reflection = data.raw["furnace"]["electric-furnace"].graphics_set.water_reflection, } }, @@ -467,143 +554,157 @@ data:extend({ { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -1, - pipe_connections = {{ type="input", position = {0.5, 2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {0.5, 1.4}, direction = defines.direction.south }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 5, - pipe_connections = {{ type="output", position = {-0.5, -2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {-0.5, -1.4}, direction = defines.direction.north }} }, - off_when_no_fluid_recipe = true }, + fluid_boxes_off_when_no_fluid_recipe = true, crafting_categories = {"bulk-smelting"}, crafting_speed = 1, energy_usage = "1220kW", energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 2.5, + emissions_per_minute = {pollution = 2.5}, drain = "180kW" }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = data.raw["furnace"]["electric-furnace"].working_sound, - module_specification = { - module_slots = 2, - module_info_icon_shift = {0, 1} - }, + module_slots = 2, allowed_effects = {"consumption", "speed", "productivity", "pollution"}, + + circuit_wire_max_distance = furnace_circuit_wire_max_distance, + circuit_connector = scale_connector_points(circuit_connector_definitions["electric-furnace"],1.2), - animation = { - layers = { + graphics_set = { + animation = { + layers = { + { + filename = BASEENTITY .. "electric-furnace/electric-furnace.png", + priority = "high", + width = 239, + height = 219, + frame_count = 1, + shift = util.by_pixel(1, 7.666), + scale = 0.6666, + tint = {0.7, 0.7, 0.85} + }, + { + filename = BASEENTITY .. "electric-furnace/electric-furnace-shadow.png", + priority = "high", + width = 227, + height = 171, + frame_count = 1, + draw_as_shadow = true, + shift = util.by_pixel(15, 10.333), + scale = 0.6666 + } + } + }, + + working_visualisations = { { - filename = BASEENTITY .. "electric-furnace/hr-electric-furnace.png", - priority = "high", - width = 239, - height = 219, - frame_count = 1, - shift = util.by_pixel(1, 7.666), - scale = 0.6666, - tint = {0.7, 0.7, 0.85} + fadeout = true, + animation = { + layers = { + { + filename = BASEENTITY .. "electric-furnace/electric-furnace-heater.png", + draw_as_glow = true, + priority = "high", + width = 60, + height = 56, + frame_count = 12, + animation_speed = 0.5, + shift = util.by_pixel(2.333, 43.666), + scale = 0.6666 + }, + { + filename = BASEENTITY .. "electric-furnace/electric-furnace-light.png", + blend_mode = "additive", + width = 202, + height = 202, + repeat_count = 12, + shift = util.by_pixel(1.333, 0), + scale = 0.6666, + draw_as_glow = true, + } + } + } }, { - filename = BASEENTITY .. "electric-furnace/hr-electric-furnace-shadow.png", - priority = "high", - width = 227, - height = 171, - frame_count = 1, - draw_as_shadow = true, - shift = util.by_pixel(15, 10.333), - scale = 0.6666 - } - } - }, - - working_visualisations = { - { - draw_as_light = true, - fadeout = true, - animation = { - layers = { - { - filename = BASEENTITY .. "electric-furnace/hr-electric-furnace-heater.png", - priority = "high", - width = 60, - height = 56, - frame_count = 12, - animation_speed = 0.5, - shift = util.by_pixel(2.333, 43.666), - scale = 0.6666 - }, - { - filename = BASEENTITY .. "electric-furnace/hr-electric-furnace-light.png", - blend_mode = "additive", - width = 202, - height = 202, - repeat_count = 12, - shift = util.by_pixel(1.333, 0), - scale = 0.6666 - } + fadeout = true, + animation = { + filename = BASEENTITY .. "electric-furnace/electric-furnace-ground-light.png", + blend_mode = "additive", + width = 166, + height = 124, + shift = util.by_pixel(4, 92), + draw_as_light = true, + scale = 0.6666 + }, + }, + { + animation = { + filename = BASEENTITY .. "electric-furnace/electric-furnace-propeller-1.png", + priority = "high", + width = 37, + height = 25, + frame_count = 4, + animation_speed = 0.5, + shift = util.by_pixel(-27.333, -24.666), + scale = 0.6666 } - } - }, - { - draw_as_light = true, - draw_as_sprite = false, - fadeout = true, - animation = { - filename = BASEENTITY .. "electric-furnace/hr-electric-furnace-ground-light.png", - blend_mode = "additive", - width = 166, - height = 124, - shift = util.by_pixel(4, 92), - scale = 0.6666 }, - }, - { - animation = { - filename = BASEENTITY .. "electric-furnace/hr-electric-furnace-propeller-1.png", - priority = "high", - width = 37, - height = 25, - frame_count = 4, - animation_speed = 0.5, - shift = util.by_pixel(-27.333, -24.666), - scale = 0.6666 + { + animation = { + filename = BASEENTITY .. "electric-furnace/electric-furnace-propeller-2.png", + priority = "high", + width = 23, + height = 15, + frame_count = 4, + animation_speed = 0.5, + shift = util.by_pixel(4.666, -50.666), + scale = 0.6666 + } } }, - { - animation = { - filename = BASEENTITY .. "electric-furnace/hr-electric-furnace-propeller-2.png", - priority = "high", - width = 23, - height = 15, - frame_count = 4, - animation_speed = 0.5, - shift = util.by_pixel(4.666, -50.666), - scale = 0.6666 - } + water_reflection = { + pictures = { + filename = BASEENTITY .. "electric-furnace/electric-furnace-reflection.png", + priority = "extra-high", + width = 24, + height = 24, + shift = util.by_pixel(6.666, 53.333), + variation_count = 1, + scale = 6.6666, + }, + rotate = false, + orientation_to_variation = false } }, - - water_reflection = { - pictures = { - filename = BASEENTITY .. "electric-furnace/electric-furnace-reflection.png", - priority = "extra-high", - width = 24, - height = 24, - shift = util.by_pixel(6.666, 53.333), - variation_count = 1, - scale = 6.6666, - }, - rotate = false, - orientation_to_variation = false - } } }) +circuit_connector_definitions["nullius-foundry"] = circuit_connector_definitions.create_vector(universal_connector_template, { + { variation = 4, main_offset = util.by_pixel(-41.125, 35.125), shadow_offset = util.by_pixel(-41.125, 35.125), show_shadow = true }, + { variation = 4, main_offset = util.by_pixel(-41.125, 35.125), shadow_offset = util.by_pixel(-41.125, 35.125), show_shadow = true }, + { variation = 4, main_offset = util.by_pixel(-41.125, 35.125), shadow_offset = util.by_pixel(-41.125, 35.125), show_shadow = true }, + { variation = 4, main_offset = util.by_pixel(-41.125, 35.125), shadow_offset = util.by_pixel(-41.125, 35.125), show_shadow = true }, +}) + +circuit_connector_definitions["nullius-crusher"] = circuit_connector_definitions.create_vector(universal_connector_template, { + { variation = 30, main_offset = util.by_pixel( 35.875, -31.625), shadow_offset = util.by_pixel( 35.875, -31.625), show_shadow = true }, + { variation = 30, main_offset = util.by_pixel( 35.875, -31.625), shadow_offset = util.by_pixel( 35.875, -31.625), show_shadow = true }, + { variation = 30, main_offset = util.by_pixel( 35.875, -31.625), shadow_offset = util.by_pixel( 35.875, -31.625), show_shadow = true }, + { variation = 30, main_offset = util.by_pixel( 35.875, -31.625), shadow_offset = util.by_pixel( 35.875, -31.625), show_shadow = true }, +}) + data:extend({ { type = "assembling-machine", @@ -624,25 +725,23 @@ data:extend({ collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, fluid_boxes = data.raw["assembling-machine"]["nullius-medium-furnace-2"].fluid_boxes, + fluid_boxes_off_when_no_fluid_recipe = true, crafting_categories = {"dry-smelting", "vent-smelting", "wet-smelting"}, crafting_speed = 4, energy_usage = "1000kW", energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 2, + emissions_per_minute = {pollution = 2}, drain = "100kW" }, - module_specification = { - module_slots = 3, - module_info_icon_shift = {0, 0.8} - }, + module_slots = 3, allowed_effects = {"consumption", "speed", "productivity", "pollution"}, - animation = data.raw["furnace"]["electric-furnace"].animation, - working_visualisations = data.raw["furnace"]["electric-furnace"].working_visualisations, + graphics_set = data.raw["furnace"]["electric-furnace"].graphics_set, working_sound = data.raw["furnace"]["electric-furnace"].working_sound, - water_reflection = data.raw["furnace"]["electric-furnace"].water_reflection, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 } + impact_category = "metal", + circuit_wire_max_distance = furnace_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["electric-furnace"], }, { @@ -664,47 +763,50 @@ data:extend({ collision_box = {{-1.7, -1.7}, {1.7, 1.7}}, selection_box = {{-2.0, -2.0}, {2.0, 2.0}}, fluid_boxes = data.raw["assembling-machine"]["nullius-large-furnace-1"].fluid_boxes, + fluid_boxes_off_when_no_fluid_recipe = true, crafting_categories = {"bulk-smelting"}, crafting_speed = 2, energy_usage = "2200kW", energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 5, + emissions_per_minute = {pollution = 5}, drain = "400kW" }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = data.raw["furnace"]["electric-furnace"].working_sound, - working_visualisations = data.raw["assembling-machine"]["nullius-large-furnace-1"].working_visualisations, - water_reflection = data.raw["assembling-machine"]["nullius-large-furnace-1"].water_reflection, - module_specification = { - module_slots = 3, - module_info_icon_shift = {0, 1} - }, + module_slots = 3, allowed_effects = {"consumption", "speed", "productivity", "pollution"}, + + circuit_wire_max_distance = furnace_circuit_wire_max_distance, + circuit_connector = scale_connector_points(circuit_connector_definitions["electric-furnace"],1.2), - animation = { - layers = { - { - filename = BASEENTITY .. "electric-furnace/hr-electric-furnace.png", - priority = "high", - width = 239, - height = 219, - frame_count = 1, - shift = util.by_pixel(1, 7.666), - scale = 0.6666 - }, - { - filename = BASEENTITY .. "electric-furnace/hr-electric-furnace-shadow.png", - priority = "high", - width = 227, - height = 171, - frame_count = 1, - draw_as_shadow = true, - shift = util.by_pixel(15, 10.333), - scale = 0.6666 + graphics_set = { + animation = { + layers = { + { + filename = BASEENTITY .. "electric-furnace/electric-furnace.png", + priority = "high", + width = 239, + height = 219, + frame_count = 1, + shift = util.by_pixel(1, 7.666), + scale = 0.6666 + }, + { + filename = BASEENTITY .. "electric-furnace/electric-furnace-shadow.png", + priority = "high", + width = 227, + height = 171, + frame_count = 1, + draw_as_shadow = true, + shift = util.by_pixel(15, 10.333), + scale = 0.6666 + } } - } + }, + working_visualisations = data.raw["assembling-machine"]["nullius-large-furnace-1"].graphics_set.working_visualisations, + water_reflection = data.raw["assembling-machine"]["nullius-large-furnace-1"].graphics_set.water_reflection, } }, @@ -726,75 +828,78 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 0.5, + emissions_per_minute = {pollution = 0.5}, drain = "10kW" }, energy_usage = "150kW", - animation = { - layers = { + circuit_connector = circuit_connector_definitions["nullius-foundry"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + + graphics_set = { + animation = { + layers = { + { + filename = "__angelssmeltinggraphics__/graphics/entity/casting-machine/casting-machine-base.png", + priority = "high", + width = 205, + height = 244, + line_length = 7, + frame_count = 49, + animation_speed = 0.4, + shift = util.by_pixel(0, -2), + scale = 0.5, + tint = {0.6, 0.8, 0.7} + }, + { + filename = "__angelssmeltinggraphics__/graphics/entity/casting-machine/casting-machine-shadow.png", + priority = "high", + width = 248, + height = 206, + line_length = 7, + frame_count = 49, + animation_speed = 0.4, + draw_as_shadow = true, + shift = util.by_pixel(11.5, 8.5), + scale = 0.5 + } + } + }, + working_visualisations = { { - filename = "__angelssmelting__/graphics/entity/casting-machine/hr-casting-machine-base.png", - priority = "high", - width = 205, - height = 244, - line_length = 7, - frame_count = 49, - animation_speed = 0.4, - shift = util.by_pixel(0, -2), - scale = 0.5, - tint = {0.6, 0.8, 0.7} + always_draw = true, + animation = { + filename = "__angelssmeltinggraphics__/graphics/entity/casting-machine/casting-machine-light.png", + priority = "high", + width = 205, + height = 244, + shift = util.by_pixel(0, -2), + draw_as_light = true, + scale = 0.5, + }, }, - { - filename = "__angelssmelting__/graphics/entity/casting-machine/hr-casting-machine-shadow.png", - priority = "high", - width = 248, - height = 206, - line_length = 7, - frame_count = 49, - animation_speed = 0.4, - draw_as_shadow = true, - shift = util.by_pixel(11.5, 8.5), - scale = 0.5 - } - } - }, - working_visualisations = { - { - draw_as_sprite = false, - draw_as_light = true, - always_draw = true, - animation = { - filename = "__angelssmelting__/graphics/entity/casting-machine/hr-casting-machine-light.png", - priority = "high", - width = 205, - height = 244, - shift = util.by_pixel(0, -2), - scale = 0.5 - } } }, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", decrease = 50, percent = 80 } }, - module_specification = { module_slots = 1 }, + module_slots = 1, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -1, - pipe_connections = {{ type="input", position = {-2, 1} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, 1}, direction = defines.direction.west }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 3, - pipe_connections = {{ type="output", position = {2, -1} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1, -1}, direction = defines.direction.east }} }, }, - vehicle_impact_sound = data.raw["furnace"]["stone-furnace"].vehicle_impact_sound, + impact_category = data.raw["furnace"]["stone-furnace"].impact_category, working_sound = data.raw["furnace"]["stone-furnace"].working_sound } }) @@ -818,62 +923,65 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "25kW" }, energy_usage = "265kW", - animation = { - layers = { - { - filename = "__angelssmelting__/graphics/entity/casting-machine/hr-casting-machine-base.png", - priority = "high", - width = 205, - height = 244, - line_length = 7, - frame_count = 49, - animation_speed = 0.5, - shift = util.by_pixel(0, -2), - scale = 0.5, - tint = {0.7, 0.8, 1} - }, - { - filename = "__angelssmelting__/graphics/entity/casting-machine/hr-casting-machine-shadow.png", - priority = "high", - width = 248, - height = 206, - line_length = 7, - frame_count = 49, - animation_speed = 0.5, - draw_as_shadow = true, - shift = util.by_pixel(11.5, 8.5), - scale = 0.5 + circuit_connector = circuit_connector_definitions["nullius-foundry"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + + graphics_set = { + animation = { + layers = { + { + filename = "__angelssmeltinggraphics__/graphics/entity/casting-machine/casting-machine-base.png", + priority = "high", + width = 205, + height = 244, + line_length = 7, + frame_count = 49, + animation_speed = 0.5, + shift = util.by_pixel(0, -2), + scale = 0.5, + tint = {0.7, 0.8, 1} + }, + { + filename = "__angelssmeltinggraphics__/graphics/entity/casting-machine/casting-machine-shadow.png", + priority = "high", + width = 248, + height = 206, + line_length = 7, + frame_count = 49, + animation_speed = 0.5, + draw_as_shadow = true, + shift = util.by_pixel(11.5, 8.5), + scale = 0.5 + } } - } + }, + working_visualisations = data.raw["assembling-machine"]["nullius-foundry-1"].graphics_set.working_visualisations }, - working_visualisations = data.raw["assembling-machine"]["nullius-foundry-1"].working_visualisations, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", decrease = 50, percent = 80 } }, - module_specification = { module_slots = 2 }, + module_slots = 2, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -1.5, - pipe_connections = {{ type="input", position = {-2, 1} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, 1}, direction = defines.direction.west }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 4, - pipe_connections = {{ type="output", position = {2, -1} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1, -1}, direction = defines.direction.east }} }, }, - vehicle_impact_sound = data.raw["assembling-machine"]["nullius-foundry-1"].vehicle_impact_sound, + impact_category = data.raw["assembling-machine"]["nullius-foundry-1"].impact_category, working_sound = data.raw["assembling-machine"]["nullius-foundry-1"].working_sound }, @@ -894,61 +1002,64 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 2, + emissions_per_minute = {pollution = 2}, drain = "50kW" }, energy_usage = "525kW", - animation = { - layers = { - { - filename = "__angelssmelting__/graphics/entity/casting-machine/hr-casting-machine-base.png", - priority = "high", - width = 205, - height = 244, - line_length = 7, - frame_count = 49, - animation_speed = 0.6, - shift = util.by_pixel(0, -2), - scale = 0.5 - }, - { - filename = "__angelssmelting__/graphics/entity/casting-machine/hr-casting-machine-shadow.png", - priority = "high", - width = 248, - height = 206, - line_length = 7, - frame_count = 49, - animation_speed = 0.6, - draw_as_shadow = true, - shift = util.by_pixel(11.5, 8.5), - scale = 0.5 + circuit_connector = circuit_connector_definitions["nullius-foundry"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + + graphics_set = { + animation = { + layers = { + { + filename = "__angelssmeltinggraphics__/graphics/entity/casting-machine/casting-machine-base.png", + priority = "high", + width = 205, + height = 244, + line_length = 7, + frame_count = 49, + animation_speed = 0.6, + shift = util.by_pixel(0, -2), + scale = 0.5 + }, + { + filename = "__angelssmeltinggraphics__/graphics/entity/casting-machine/casting-machine-shadow.png", + priority = "high", + width = 248, + height = 206, + line_length = 7, + frame_count = 49, + animation_speed = 0.6, + draw_as_shadow = true, + shift = util.by_pixel(11.5, 8.5), + scale = 0.5 + } } - } + }, + working_visualisations = data.raw["assembling-machine"]["nullius-foundry-1"].graphics_set.working_visualisations, }, - working_visualisations = data.raw["assembling-machine"]["nullius-foundry-1"].working_visualisations, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", decrease = 50, percent = 80 } }, - module_specification = { module_slots = 3 }, + module_slots = 3, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {-2, 1} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1, 1}, direction = defines.direction.west }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = 5, - pipe_connections = {{ type="output", position = {2, -1} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1, -1}, direction = defines.direction.east }} }, }, - vehicle_impact_sound = data.raw["assembling-machine"]["nullius-foundry-1"].vehicle_impact_sound, + impact_category = data.raw["assembling-machine"]["nullius-foundry-1"].impact_category, working_sound = data.raw["assembling-machine"]["nullius-foundry-1"].working_sound }, @@ -967,12 +1078,12 @@ data:extend({ selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, crafting_categories = {"ore-crushing", "hand-crushing"}, crafting_speed = 1, - module_specification = { module_slots = 1 }, + module_slots = 1, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 0.5, + emissions_per_minute = {pollution = 0.5}, drain = "3kW" }, energy_usage = "97kW", @@ -980,28 +1091,57 @@ data:extend({ { type = "impact", decrease = 100, percent = 90 }, { type = "physical", decrease = 50, percent = 80 } }, + circuit_connector = circuit_connector_definitions["nullius-crusher"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -2, - height = 2, - pipe_connections = {{ type="input", position = {0, 2} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {0, 1}, direction = defines.direction.south }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 2, - base_area = 3, - height = 2, - pipe_connections = {{ type="output", position = {0, -2} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {0, -1}, direction = defines.direction.north }} + }, + }, + fluid_boxes_off_when_no_fluid_recipe = true, + graphics_set = { + animation = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/ore-crusher/ore-crusher-base.png", + priority = "extra-high", + width = 189, + height = 214, + frame_count = 16, + line_length = 4, + shift = util.by_pixel(-0.5, -5), + animation_speed = 0.5, + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/ore-crusher/ore-crusher-shadow.png", + priority = "extra-high", + width = 282, + height = 140, + repeat_count = 16, + shift = util.by_pixel(24, 17.5), + draw_as_shadow = true, + animation_speed = 0.5, + scale = 0.5, + }, + }, }, - off_when_no_fluid_recipe = true }, - animation = util.table.deepcopy(data.raw["assembling-machine"]["ore-crusher"].animation), - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["burner-ore-crusher"].working_sound, + impact_category = "metal", + working_sound = { + sound = { filename = "__angelsrefininggraphics__/sound/ore-crusher.ogg", volume = 0.6 }, + idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, + } }, { @@ -1022,7 +1162,7 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 0.75, + emissions_per_minute = {pollution = 0.75}, drain = "8kW" }, energy_usage = "172kW", @@ -1030,30 +1170,58 @@ data:extend({ { type = "impact", decrease = 100, percent = 90 }, { type = "physical", decrease = 50, percent = 80 } }, - module_specification = { module_slots = 2 }, + module_slots = 2, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["ore-crusher"].working_sound, + impact_category = "metal", + working_sound = { + sound = { filename = "__angelsrefininggraphics__/sound/ore-crusher.ogg", volume = 0.6 }, + idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, + }, + circuit_connector = circuit_connector_definitions["nullius-crusher"], + circuit_wire_max_distance = default_circuit_wire_max_distance, fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -2, - height = 2, - pipe_connections = {{ type="input", position = {0, 2} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {0, 1}, direction = defines.direction.south }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 4, - base_area = 4, - height = 2, - pipe_connections = {{ type="output", position = {0, -2} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {0, -1}, direction = defines.direction.north }} }, - off_when_no_fluid_recipe = true }, - animation = util.table.deepcopy(data.raw["assembling-machine"]["ore-crusher-2"].animation) + fluid_boxes_off_when_no_fluid_recipe = true, + graphics_set = { + animation = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/ore-crusher/ore-crusher-base.png", + priority = "extra-high", + width = 189, + height = 214, + frame_count = 16, + line_length = 4, + shift = util.by_pixel(-0.5, -5), + animation_speed = 0.5, + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/ore-crusher/ore-crusher-shadow.png", + priority = "extra-high", + width = 282, + height = 140, + repeat_count = 16, + shift = util.by_pixel(24, 17.5), + draw_as_shadow = true, + animation_speed = 0.5, + scale = 0.5, + }, + }, + }, + } }, { @@ -1073,7 +1241,7 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "20kW" }, energy_usage = "330kW", @@ -1081,40 +1249,70 @@ data:extend({ { type = "impact", decrease = 100, percent = 90 }, { type = "physical", decrease = 50, percent = 80 } }, - module_specification = { module_slots = 3 }, + module_slots = 3, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["ore-crusher"].working_sound, + impact_category = "metal", + working_sound = { + sound = { filename = "__angelsrefininggraphics__/sound/ore-crusher.ogg", volume = 0.6 }, + idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, + }, + circuit_connector = circuit_connector_definitions["nullius-crusher"], + circuit_wire_max_distance = default_circuit_wire_max_distance, fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -2, - height = 2, - pipe_connections = {{ type="input", position = {0, 2} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {0, 1}, direction = defines.direction.south }} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 5, - base_area = 5, - height = 2, - pipe_connections = {{ type="output", position = {0, -2} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {0, -1}, direction = defines.direction.north }} }, - off_when_no_fluid_recipe = true }, - animation = util.table.deepcopy(data.raw["assembling-machine"]["ore-crusher-3"].animation) + fluid_boxes_off_when_no_fluid_recipe = true, + graphics_set = { + animation = { + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/ore-crusher/ore-crusher-base.png", + priority = "extra-high", + width = 189, + height = 214, + frame_count = 16, + line_length = 4, + shift = util.by_pixel(-0.5, -5), + animation_speed = 0.5, + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/ore-crusher/ore-crusher-shadow.png", + priority = "extra-high", + width = 282, + height = 140, + repeat_count = 16, + shift = util.by_pixel(24, 17.5), + draw_as_shadow = true, + animation_speed = 0.5, + scale = 0.5, + }, + }, + }, + } } }) -data.raw["assembling-machine"]["nullius-crusher-1"].animation.layers[1].tint = {0.6, 0.6, 0.6} -data.raw["assembling-machine"]["nullius-crusher-2"].animation.layers[1].tint = {0.6, 0.65, 0.85} -if (data.raw["assembling-machine"]["nullius-crusher-1"].animation.layers[1].hr_version ~= nil) then -data.raw["assembling-machine"]["nullius-crusher-1"].animation.layers[1].hr_version.tint = {0.6, 0.6, 0.6} -data.raw["assembling-machine"]["nullius-crusher-2"].animation.layers[1].hr_version.tint = {0.6, 0.65, 0.85} -end +data.raw["assembling-machine"]["nullius-crusher-1"].graphics_set.animation.layers[1].tint = {0.6, 0.6, 0.6} +data.raw["assembling-machine"]["nullius-crusher-2"].graphics_set.animation.layers[1].tint = {0.6, 0.65, 0.85} +circuit_connector_definitions["nullius-flotation-cell"] = circuit_connector_definitions.create_vector(universal_connector_template, { + { variation = 27, main_offset = util.by_pixel(-25.375, 10.875), shadow_offset = util.by_pixel(-25.375, 10.875), show_shadow = true }, + { variation = 27, main_offset = util.by_pixel(-25.375, 10.875), shadow_offset = util.by_pixel(-25.375, 10.875), show_shadow = true }, + { variation = 27, main_offset = util.by_pixel(-25.375, 10.875), shadow_offset = util.by_pixel(-25.375, 10.875), show_shadow = true }, + { variation = 27, main_offset = util.by_pixel(-25.375, 10.875), shadow_offset = util.by_pixel(-25.375, 10.875), show_shadow = true }, +}) data:extend({ { @@ -1136,7 +1334,7 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 0.5, + emissions_per_minute = {pollution = 0.5}, drain = "7kW" }, energy_usage = "193kW", @@ -1144,45 +1342,188 @@ data:extend({ { type = "impact", decrease = 100, percent = 90 }, { type = "acid", decrease = 50, percent = 80 } }, - module_specification = { module_slots = 1 }, + circuit_connector = circuit_connector_definitions["nullius-flotation-cell"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + module_slots = 1, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, fluid_boxes = { { production_type = "input", pipe_picture = floatpipepics, pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -1, - pipe_connections = {{ type="input", position = {-0.5, 2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-0.5, 1.5}, direction = defines.direction.south }} }, { production_type = "input", pipe_picture = floatpipepics, pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -1, - pipe_connections = {{ type="input", position = {-2.5, -0.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1.5, -0.5}, direction = defines.direction.west }} }, { production_type = "output", pipe_picture = floatpipepics, pipe_covers = pipecoverspictures(), - base_level = 3, - pipe_connections = {{ type="output", position = {0.5, -2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {0.5, -1.5}, direction = defines.direction.north }} }, { production_type = "output", pipe_picture = floatpipepics, pipe_covers = pipecoverspictures(), - base_level = 3, - pipe_connections = {{ type="output", position = {2.5, 0.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1.5, 0.5}, direction = defines.direction.east }} } }, - animation = scale_image(data.raw["assembling-machine"]["ore-floatation-cell"].animation.east, 0.81), - working_visualisations = scale_image(data.raw["assembling-machine"]["ore-floatation-cell"].working_visualisations, 0.81), - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["ore-floatation-cell"].working_sound, - pipe_covers = pipecoverspictures() + forced_symmetry = "horizontal", + graphics_set = { + animation = scale_image({ + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-base.png", + priority = "extra-high", + width = 333, + height = 363, + x = 333, + shift = util.by_pixel_hr(-1, -1), + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-shadow.png", + priority = "extra-high", + width = 390, + height = 326, + x = 390, + shift = util.by_pixel_hr(29, 18), + draw_as_shadow = true, + scale = 0.5, + }, + }, + }, 0.81), + working_visualisations = scale_image({ + { + always_draw = true, + animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-animation-idle.png", + priority = "extra-high", + width = 166, + height = 117, + frame_count = 32, + line_length = 8, + shift = util.by_pixel_hr(62, 5), + scale = 0.5, + }, + }, + { + fadeout = true, + animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-animation-base.png", + priority = "extra-high", + width = 166, + height = 117, + frame_count = 64, + line_length = 8, + shift = util.by_pixel_hr(62, 5), + scale = 0.5, + }, + }, + { + fadeout = true, + apply_recipe_tint = "primary", + animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-animation-water-tintable.png", + priority = "extra-high", + width = 166, + height = 117, + frame_count = 64, + line_length = 8, + shift = util.by_pixel_hr(62, 5), + scale = 0.5, + }, + }, + { + fadeout = true, + apply_recipe_tint = "secondary", + animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-animation-froth-tintable.png", + priority = "extra-high", + width = 166, + height = 117, + frame_count = 64, + line_length = 8, + shift = util.by_pixel_hr(62, 5), + scale = 0.5, + }, + }, + { + always_draw = true, + render_layer = "higher-object-under", + north_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-pipe-cover-overlays.png", + priority = "extra-high", + width = 333, + height = 363, + shift = util.by_pixel_hr(-1, -1), + scale = 0.5, + }, + east_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-pipe-cover-overlays.png", + priority = "extra-high", + width = 333, + height = 363, + x = 333, + shift = util.by_pixel_hr(-1, -1), + scale = 0.5, + }, + south_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-pipe-cover-overlays.png", + priority = "extra-high", + width = 333, + height = 363, + shift = util.by_pixel_hr(-1, -1), + scale = 0.5, + }, + west_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-pipe-cover-overlays.png", + priority = "extra-high", + width = 333, + height = 363, + x = 333, + shift = util.by_pixel_hr(-1, -1), + scale = 0.5, + }, + }, + { + always_draw = true, + north_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/vertical-pipe-shadow-patch.png", + priority = "high", + width = 128, + height = 128, + repeat_count = 36, + draw_as_shadow = true, + shift = { 0, -2 }, + scale = 0.5, + }, + south_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/vertical-pipe-shadow-patch.png", + priority = "high", + width = 128, + height = 128, + repeat_count = 36, + draw_as_shadow = true, + shift = { 0, -2 }, + scale = 0.5, + }, + }, + }, 0.81), + }, + impact_category = "metal", + working_sound = { + sound = { filename = "__angelsrefininggraphics__/sound/ore-floatation-cell.ogg", volume = 1 }, + idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, + }, }, { @@ -1201,10 +1542,11 @@ data:extend({ selection_box = {{-2, -2}, {2, 2}}, crafting_categories = {"ore-flotation"}, crafting_speed = 2, + forced_symmetry = "horizontal", energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "15kW" }, energy_usage = "385kW", @@ -1212,49 +1554,187 @@ data:extend({ { type = "impact", decrease = 100, percent = 90 }, { type = "acid", decrease = 50, percent = 80 } }, - module_specification = { module_slots = 2 }, + circuit_connector = circuit_connector_definitions["nullius-flotation-cell"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + module_slots = 2, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, fluid_boxes = { { production_type = "input", pipe_picture = floatpipepics, pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {-0.5, 2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-0.5, 1.5}, direction = defines.direction.south }} }, { production_type = "input", pipe_picture = floatpipepics, pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {-2.5, -0.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1.5, -0.5}, direction = defines.direction.west }} }, { production_type = "output", pipe_picture = floatpipepics, pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 4, - height = 2, - pipe_connections = {{ type="output", position = {0.5, -2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {0.5, -1.5}, direction = defines.direction.north }} }, { production_type = "output", pipe_picture = floatpipepics, pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 4, - height = 2, - pipe_connections = {{ type="output", position = {2.5, 0.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1.5, 0.5}, direction = defines.direction.east }} } }, - animation = scale_image(data.raw["assembling-machine"]["ore-floatation-cell-2"].animation.east, 0.81), - working_visualisations = scale_image(data.raw["assembling-machine"]["ore-floatation-cell-2"].working_visualisations, 0.81), - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["ore-floatation-cell-2"].working_sound, - pipe_covers = pipecoverspictures() + graphics_set = { + animation = scale_image({ + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-base.png", + priority = "extra-high", + width = 333, + height = 363, + x = 333, + shift = util.by_pixel_hr(-1, -1), + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-shadow.png", + priority = "extra-high", + width = 390, + height = 326, + x = 390, + shift = util.by_pixel_hr(29, 18), + draw_as_shadow = true, + scale = 0.5, + }, + }, + }, 0.81), + working_visualisations = scale_image({ + { + always_draw = true, + animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-animation-idle.png", + priority = "extra-high", + width = 166, + height = 117, + frame_count = 32, + line_length = 8, + shift = util.by_pixel_hr(62, 5), + scale = 0.5, + }, + }, + { + fadeout = true, + animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-animation-base.png", + priority = "extra-high", + width = 166, + height = 117, + frame_count = 64, + line_length = 8, + shift = util.by_pixel_hr(62, 5), + scale = 0.5, + }, + }, + { + fadeout = true, + apply_recipe_tint = "primary", + animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-animation-water-tintable.png", + priority = "extra-high", + width = 166, + height = 117, + frame_count = 64, + line_length = 8, + shift = util.by_pixel_hr(62, 5), + scale = 0.5, + }, + }, + { + fadeout = true, + apply_recipe_tint = "secondary", + animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-animation-froth-tintable.png", + priority = "extra-high", + width = 166, + height = 117, + frame_count = 64, + line_length = 8, + shift = util.by_pixel_hr(62, 5), + scale = 0.5, + }, + }, + { + always_draw = true, + render_layer = "higher-object-under", + north_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-pipe-cover-overlays.png", + priority = "extra-high", + width = 333, + height = 363, + shift = util.by_pixel_hr(-1, -1), + scale = 0.5, + }, + east_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-pipe-cover-overlays.png", + priority = "extra-high", + width = 333, + height = 363, + x = 333, + shift = util.by_pixel_hr(-1, -1), + scale = 0.5, + }, + south_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-pipe-cover-overlays.png", + priority = "extra-high", + width = 333, + height = 363, + shift = util.by_pixel_hr(-1, -1), + scale = 0.5, + }, + west_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-pipe-cover-overlays.png", + priority = "extra-high", + width = 333, + height = 363, + x = 333, + shift = util.by_pixel_hr(-1, -1), + scale = 0.5, + }, + }, + { + always_draw = true, + north_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/vertical-pipe-shadow-patch.png", + priority = "high", + width = 128, + height = 128, + repeat_count = 36, + draw_as_shadow = true, + shift = { 0, -2 }, + scale = 0.5, + }, + south_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/vertical-pipe-shadow-patch.png", + priority = "high", + width = 128, + height = 128, + repeat_count = 36, + draw_as_shadow = true, + shift = { 0, -2 }, + scale = 0.5, + }, + }, + }, 0.81), + }, + impact_category = "metal", + working_sound = { + sound = { filename = "__angelsrefininggraphics__/sound/ore-floatation-cell.ogg", volume = 1 }, + idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, + } }, { @@ -1272,10 +1752,11 @@ data:extend({ selection_box = {{-2, -2}, {2, 2}}, crafting_categories = {"ore-flotation"}, crafting_speed = 4, + forced_symmetry = "horizontal", energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "30kW" }, energy_usage = "770kW", @@ -1283,274 +1764,232 @@ data:extend({ { type = "impact", decrease = 100, percent = 90 }, { type = "acid", decrease = 50, percent = 80 } }, - module_specification = { module_slots = 3 }, + circuit_connector = circuit_connector_definitions["nullius-flotation-cell"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + module_slots = 3, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, fluid_boxes = { { production_type = "input", pipe_picture = floatpipepics, pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {-0.5, 2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-0.5, 1.5}, direction = defines.direction.south }} }, { production_type = "input", pipe_picture = floatpipepics, pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {-2.5, -0.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input", position = {-1.5, -0.5}, direction = defines.direction.west }} }, { production_type = "output", pipe_picture = floatpipepics, pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 5, - height = 3, - pipe_connections = {{ type="output", position = {0.5, -2.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {0.5, -1.5}, direction = defines.direction.north }} }, { production_type = "output", pipe_picture = floatpipepics, pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 5, - height = 3, - pipe_connections = {{ type="output", position = {2.5, 0.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="output", position = {1.5, 0.5}, direction = defines.direction.east }} } }, - animation = scale_image(data.raw["assembling-machine"]["ore-floatation-cell-3"].animation.east, 0.81), - working_visualisations = scale_image(data.raw["assembling-machine"]["ore-floatation-cell-3"].working_visualisations, 0.81), - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["ore-floatation-cell-3"].working_sound, - pipe_covers = pipecoverspictures() + graphics_set = { + animation = scale_image({ + layers = { + { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-base.png", + priority = "extra-high", + width = 333, + height = 363, + x = 333, + shift = util.by_pixel_hr(-1, -1), + scale = 0.5, + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-shadow.png", + priority = "extra-high", + width = 390, + height = 326, + x = 390, + shift = util.by_pixel_hr(29, 18), + draw_as_shadow = true, + scale = 0.5, + }, + }, + }, 0.81), + working_visualisations = scale_image({ + { + always_draw = true, + animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-animation-idle.png", + priority = "extra-high", + width = 166, + height = 117, + frame_count = 32, + line_length = 8, + shift = util.by_pixel_hr(62, 5), + scale = 0.5, + }, + }, + { + fadeout = true, + animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-animation-base.png", + priority = "extra-high", + width = 166, + height = 117, + frame_count = 64, + line_length = 8, + shift = util.by_pixel_hr(62, 5), + scale = 0.5, + }, + }, + { + fadeout = true, + apply_recipe_tint = "primary", + animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-animation-water-tintable.png", + priority = "extra-high", + width = 166, + height = 117, + frame_count = 64, + line_length = 8, + shift = util.by_pixel_hr(62, 5), + scale = 0.5, + }, + }, + { + fadeout = true, + apply_recipe_tint = "secondary", + animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-animation-froth-tintable.png", + priority = "extra-high", + width = 166, + height = 117, + frame_count = 64, + line_length = 8, + shift = util.by_pixel_hr(62, 5), + scale = 0.5, + }, + }, + { + always_draw = true, + render_layer = "higher-object-under", + north_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-pipe-cover-overlays.png", + priority = "extra-high", + width = 333, + height = 363, + shift = util.by_pixel_hr(-1, -1), + scale = 0.5, + }, + east_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-pipe-cover-overlays.png", + priority = "extra-high", + width = 333, + height = 363, + x = 333, + shift = util.by_pixel_hr(-1, -1), + scale = 0.5, + }, + south_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-pipe-cover-overlays.png", + priority = "extra-high", + width = 333, + height = 363, + shift = util.by_pixel_hr(-1, -1), + scale = 0.5, + }, + west_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/ore-flotation-cell-pipe-cover-overlays.png", + priority = "extra-high", + width = 333, + height = 363, + x = 333, + shift = util.by_pixel_hr(-1, -1), + scale = 0.5, + }, + }, + { + always_draw = true, + north_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/vertical-pipe-shadow-patch.png", + priority = "high", + width = 128, + height = 128, + repeat_count = 36, + draw_as_shadow = true, + shift = { 0, -2 }, + scale = 0.5, + }, + south_animation = { + filename = "__angelsrefininggraphics__/graphics/entity/ore-floatation-cell/vertical-pipe-shadow-patch.png", + priority = "high", + width = 128, + height = 128, + repeat_count = 36, + draw_as_shadow = true, + shift = { 0, -2 }, + scale = 0.5, + }, + }, + }, 0.81), + }, + impact_category = "metal", + working_sound = { + sound = { filename = "__angelsrefininggraphics__/sound/ore-floatation-cell.ogg", volume = 1 }, + idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, + } } }) local function tint_flotation_dir(dir, speed, tint) dir.layers[1].animation_speed = speed if (tint ~= nil) then dir.layers[1].tint = tint end - if (dir.layers[1].hr_version ~= nil) then - dir.layers[1].hr_version.animation_speed = speed - if (tint ~= nil) then dir.layers[1].hr_version.tint = tint end - end end local function tint_flotation_cell(num, speed, tint) local machine = data.raw["assembling-machine"]["nullius-flotation-cell-"..num] - tint_flotation_dir(machine.animation, speed, tint) - machine.working_visualisations[5] = nil - machine.working_visualisations[6] = nil + tint_flotation_dir(machine.graphics_set.animation, speed, tint) + machine.graphics_set.working_visualisations[5] = nil + machine.graphics_set.working_visualisations[6] = nil end tint_flotation_cell(1, 0.4, {0.77, 0.77, 0.60}) tint_flotation_cell(2, 0.5, {0.8, 0.8, 1}) tint_flotation_cell(3, 0.6, nil) -local mfc1 = util.table.deepcopy( - data.raw["assembling-machine"]["nullius-flotation-cell-1"]) -mfc1.name = "nullius-mirror-flotation-cell-1" -mfc1.icons[2] = { icon = ICONPATH .. "flip1.png", icon_size = 64 } -mfc1.placeable_by = {item = "nullius-flotation-cell-1", count = 1} -mfc1.next_upgrade = "nullius-mirror-flotation-cell-2" -mfc1.localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-flotation-cell-1"}} -mfc1.fluid_boxes[1].pipe_connections[1].position = {-2.5, 0.5} -mfc1.fluid_boxes[2].pipe_connections[1].position = {0.5, 2.5} -mfc1.fluid_boxes[3].pipe_connections[1].position = {2.5, -0.5} -mfc1.fluid_boxes[4].pipe_connections[1].position = {-0.5, -2.5} - -data:extend({ - mfc1, - { - type = "assembling-machine", - name = "nullius-mirror-flotation-cell-2", - localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-flotation-cell-2"}}, - icons = { - data.raw.item["nullius-flotation-cell-2"].icons[1], - { icon = ICONPATH .. "flip1.png", icon_size = 64 } - }, - localised_description = {"entity-description.nullius-flotation-cell"}, - flags = {"placeable-neutral","player-creation"}, - minable = {mining_time = 1.5, result = "nullius-flotation-cell-2"}, - placeable_by = {item = "nullius-flotation-cell-2", count = 1}, - fast_replaceable_group = "flotation-cell", - next_upgrade = "nullius-mirror-flotation-cell-3", - max_health = 400, - corpse = "big-remnants", - dying_explosion = "medium-explosion", - collision_box = {{-1.75, -1.75}, {1.75, 1.75}}, - selection_box = {{-2, -2}, {2, 2}}, - crafting_categories = {"ore-flotation"}, - crafting_speed = 2, - energy_source = data.raw["assembling-machine"]["nullius-flotation-cell-2"].energy_source, - energy_usage = "385kW", - resistances = data.raw["assembling-machine"]["nullius-flotation-cell-2"].resistances, - module_specification = { module_slots = 2 }, - allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - animation = data.raw["assembling-machine"]["nullius-flotation-cell-2"].animation, - working_visualisations = data.raw["assembling-machine"]["nullius-flotation-cell-2"].working_visualisations, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["ore-floatation-cell"].working_sound, - - fluid_boxes = { - { - production_type = "input", - pipe_picture = floatpipepics, - pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {-2.5, 0.5} }} - }, - { - production_type = "input", - pipe_picture = floatpipepics, - pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -2, - pipe_connections = {{ type="input", position = {0.5, 2.5} }} - }, - { - production_type = "output", - pipe_picture = floatpipepics, - pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 4, - height = 2, - pipe_connections = {{ type="output", position = {2.5, -0.5} }} - }, - { - production_type = "output", - pipe_picture = floatpipepics, - pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 4, - height = 2, - pipe_connections = {{ type="output", position = {-0.5, -2.5} }} - } - } - }, - - { - type = "assembling-machine", - name = "nullius-mirror-flotation-cell-3", - localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-flotation-cell-3"}}, - icons = { - data.raw.item["nullius-flotation-cell-3"].icons[1], - { icon = ICONPATH .. "flip1.png", icon_size = 64 } - }, - localised_description = {"entity-description.nullius-flotation-cell"}, - flags = {"placeable-neutral","player-creation"}, - minable = {mining_time = 2, result = "nullius-flotation-cell-3"}, - placeable_by = {item = "nullius-flotation-cell-3", count = 1}, - fast_replaceable_group = "flotation-cell", - max_health = 500, - corpse = "big-remnants", - dying_explosion = "medium-explosion", - collision_box = {{-1.75, -1.75}, {1.75, 1.75}}, - selection_box = {{-2, -2}, {2, 2}}, - crafting_categories = {"ore-flotation"}, - crafting_speed = 4, - energy_usage = "770kW", - module_specification = { module_slots = 3 }, - allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - animation = data.raw["assembling-machine"]["nullius-flotation-cell-3"].animation, - working_visualisations = data.raw["assembling-machine"]["nullius-flotation-cell-3"].working_visualisations, - energy_source = data.raw["assembling-machine"]["nullius-flotation-cell-3"].energy_source, - resistances = data.raw["assembling-machine"]["nullius-flotation-cell-3"].resistances, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["assembling-machine"]["ore-floatation-cell"].working_sound, - - fluid_boxes = { - { - production_type = "input", - pipe_picture = floatpipepics, - pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {-2.5, 0.5} }} - }, - { - production_type = "input", - pipe_picture = floatpipepics, - pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -3, - height = 2, - pipe_connections = {{ type="input", position = {0.5, 2.5} }} - }, - { - production_type = "output", - pipe_picture = floatpipepics, - pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 5, - height = 3, - pipe_connections = {{ type="output", position = {2.5, -0.5} }} - }, - { - production_type = "output", - pipe_picture = floatpipepics, - pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 5, - height = 3, - pipe_connections = {{ type="output", position = {-0.5, -2.5} }} - } - } - } -}) - if mods["reskins-bobs"] then -local small_animation = data.raw["assembling-machine"]["nullius-small-furnace-3"].animation -local medium_animation = data.raw["assembling-machine"]["nullius-medium-furnace-2"].animation -local large_animation = data.raw["assembling-machine"]["nullius-large-furnace-1"].animation +local small_animation = data.raw["assembling-machine"]["nullius-small-furnace-3"].graphics_set.animation +local medium_animation = data.raw["assembling-machine"]["nullius-medium-furnace-2"].graphics_set.animation +local large_animation = data.raw["assembling-machine"]["nullius-large-furnace-1"].graphics_set.animation medium_animation.layers = { medium_animation.layers[1], { - filename = "__reskins-bobs__/graphics/entity/assembly/electric-furnace/electric-furnace-mask.png", - priority = "high", - width = 119, - height = 106, - shift = util.by_pixel(1, 1), - tint = tiercolor("red"), - hr_version = { - filename = "__reskins-bobs__/graphics/entity/assembly/electric-furnace/hr-electric-furnace-mask.png", + filename = "__reskins-bobs__/graphics/entity/assembly/electric-furnace/electric-furnace-mask.png", priority = "high", width = 238, height = 212, shift = util.by_pixel(1, 1), tint = tiercolor("red"), scale = 0.5 - } }, { - filename = "__reskins-bobs__/graphics/entity/assembly/electric-furnace/electric-furnace-highlights.png", - priority = "high", - width = 119, - height = 106, - shift = util.by_pixel(1, 1), - blend_mode = "additive", - hr_version = { - filename = "__reskins-bobs__/graphics/entity/assembly/electric-furnace/hr-electric-furnace-highlights.png", + filename = "__reskins-bobs__/graphics/entity/assembly/electric-furnace/electric-furnace-highlights.png", priority = "high", width = 238, height = 212, shift = util.by_pixel(1, 1), blend_mode = "additive", scale = 0.5 - } }, medium_animation.layers[2] } medium_animation.layers[1].tint = nil -medium_animation.layers[1].hr_version.tint = nil small_animation.layers = { small_animation.layers[1], { @@ -1577,7 +2016,7 @@ small_animation.layers[1].tint = nil large_animation.layers = { large_animation.layers[1], { - filename = "__reskins-bobs__/graphics/entity/assembly/electric-furnace/hr-electric-furnace-mask.png", + filename = "__reskins-bobs__/graphics/entity/assembly/electric-furnace/electric-furnace-mask.png", priority = "high", width = 238, height = 212, @@ -1586,7 +2025,7 @@ large_animation.layers = { scale = 0.6666 }, { - filename = "__reskins-bobs__/graphics/entity/assembly/electric-furnace/hr-electric-furnace-highlights.png", + filename = "__reskins-bobs__/graphics/entity/assembly/electric-furnace/electric-furnace-highlights.png", priority = "high", width = 238, height = 212, @@ -1598,11 +2037,10 @@ large_animation.layers = { } large_animation.layers[1].tint = nil -data.raw["assembling-machine"]["nullius-medium-furnace-3"].animation = - util.table.deepcopy(data.raw["assembling-machine"]["nullius-medium-furnace-2"].animation) -data.raw["assembling-machine"]["nullius-large-furnace-2"].animation = - util.table.deepcopy(data.raw["assembling-machine"]["nullius-large-furnace-1"].animation) -data.raw["assembling-machine"]["nullius-medium-furnace-3"].animation.layers[2].tint = tiercolor("deepblue") -data.raw["assembling-machine"]["nullius-medium-furnace-3"].animation.layers[2].hr_version.tint = tiercolor("deepblue") -data.raw["assembling-machine"]["nullius-large-furnace-2"].animation.layers[2].tint = tiercolor("deepblue") +data.raw["assembling-machine"]["nullius-medium-furnace-3"].graphics_set.animation = + util.table.deepcopy(data.raw["assembling-machine"]["nullius-medium-furnace-2"].graphics_set.animation) +data.raw["assembling-machine"]["nullius-large-furnace-2"].graphics_set.animation = + util.table.deepcopy(data.raw["assembling-machine"]["nullius-large-furnace-1"].graphics_set.animation) +data.raw["assembling-machine"]["nullius-medium-furnace-3"].graphics_set.animation.layers[2].tint = tiercolor("deepblue") +data.raw["assembling-machine"]["nullius-large-furnace-2"].graphics_set.animation.layers[2].tint = tiercolor("deepblue") end diff --git a/nullius/prototypes/entity/landing.lua b/nullius/prototypes/entity/landing.lua index ab4c2d6..586b1bb 100644 --- a/nullius/prototypes/entity/landing.lua +++ b/nullius/prototypes/entity/landing.lua @@ -6,7 +6,6 @@ local BASEENTITY = "__base__/graphics/entity/" local wreck_flags = { "placeable-player", "player-creation", - "hidden", "not-rotatable", "placeable-off-grid", "not-blueprintable", @@ -20,15 +19,15 @@ data:extend({ name = "nullius-landing-main", icon = "__base__/graphics/icons/crash-site-spaceship.png", icon_size = 64, - icon_mipmaps = 4, + flags = wreck_flags, + hidden = true, map_color = {r = 0, g = 0.365, b = 0.58, a = 1}, max_health = 600, alert_when_damaged = false, allow_copy_paste = false, inventory_size = 20, - enable_inventory_bar = false, - not_inventory_moveable = true, + inventory_type = "normal", minable = { mining_time = 4, results = { @@ -42,21 +41,21 @@ data:extend({ dying_explosion = "nuke-explosion", integration_patch_render_layer = "decals", integration_patch = { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-ground.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-ground.png", priority = "very-low", width = 1330, height = 786, shift = util.by_pixel(-50, 61), dice_x = 4, dice_y = 3, - frame_count = 1, + --frame_count = 1, line_length = 1, scale = 0.5, }, picture = { layers = { { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship.png", priority = "very-low", width = 1228, height = 790, @@ -66,7 +65,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-shadow.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-shadow.png", priority = "very-low", width = 1340, height = 842, @@ -85,13 +84,14 @@ data:extend({ name = "nullius-landing-tail", icon = "__base__/graphics/icons/crash-site-spaceship-wreck-big-1.png", icon_size = 64, - icon_mipmaps = 4, + flags = wreck_flags, + hidden = true, map_color = {r = 0, g = 0.365, b = 0.58, a = 1}, max_health = 200, alert_when_damaged = false, allow_copy_paste = false, - localised_description = {"entity-description.nullius-minable", + localised_description = {"entity-description.nullius-minable", "20x[item=small-lamp] 8x[item=nullius-solar-panel-1]"}, minable = { mining_time = 1, @@ -100,32 +100,32 @@ data:extend({ {type="item", name="nullius-solar-panel-1", amount=8} } }, - placeable_by = {item = "nullius-probe", count = 1}, + placeable_by = {item = "nullius-probe", count = 1}, collision_box = {{-0.9, -0.1}, {1.4, 1.2}}, selection_box = {{-0.9, -0.1}, {1.4, 1.2}}, dying_explosion = "big-explosion", integration_patch_render_layer = "decals", integration_patch = { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-big-1-ground.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-big-1-ground.png", priority="high", width = 348, height = 136, shift = util.by_pixel(-27, 31), - frame_count = 1, + --frame_count = 1, line_length = 1, scale = 0.5, }, picture = { layers = { { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-big-1.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-big-1.png", width = 234, height = 280, shift = util.by_pixel(-7, -8), scale = 0.5 }, { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-big-1-shadow.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-big-1-shadow.png", width = 256, height = 44, shift = util.by_pixel(37, 26), @@ -141,14 +141,15 @@ data:extend({ name = "nullius-landing-propulsion", icon = "__base__/graphics/icons/crash-site-spaceship-wreck-big-2.png", icon_size = 64, - icon_mipmaps = 4, + flags = wreck_flags, + hidden = true, map_color = {r = 0, g = 0.365, b = 0.58, a = 1}, max_health = 200, alert_when_damaged = false, allow_copy_paste = false, - localised_description = {"entity-description.nullius-minable", - "[item=nullius-small-furnace-2] 2x[item=nullius-chimney-1] " + localised_description = {"entity-description.nullius-minable", + "1x[item=nullius-small-furnace-2] 2x[item=nullius-chimney-1] " .. "2x[item=nullius-outfall-1] 2x[item=storage-tank]"}, minable = { mining_time = 1.5, @@ -159,32 +160,32 @@ data:extend({ {type="item", name="storage-tank", amount=2} } }, - placeable_by = {item = "nullius-probe", count = 1}, + placeable_by = {item = "nullius-probe", count = 1}, collision_box = {{-1.6, -1.6}, {1.3, 1.3}}, selection_box = {{-1.6, -1.6}, {1.3, 1.3}}, dying_explosion = "big-explosion", integration_patch_render_layer = "decals", integration_patch = { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-big-2-ground.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-big-2-ground.png", priority="high", width = 450, height = 296, shift = util.by_pixel(-52, 8), - frame_count = 1, + --frame_count = 1, line_length = 1, scale = 0.5, }, picture = { layers = { { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-big-2.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-big-2.png", width = 242, height = 258, shift = util.by_pixel(-13, -7), scale = 0.5 }, { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-big-2-shadow.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-big-2-shadow.png", width = 294, height = 228, shift = util.by_pixel(27, -12), @@ -200,13 +201,14 @@ data:extend({ name = "nullius-landing-vent", icon = "__base__/graphics/icons/crash-site-spaceship-wreck-medium-1.png", icon_size = 64, - icon_mipmaps = 4, + flags = wreck_flags, + hidden = true, map_color = {r = 0, g = 0.365, b = 0.58, a = 1}, max_health = 100, alert_when_damaged = false, allow_copy_paste = false, - localised_description = {"entity-description.nullius-minable", + localised_description = {"entity-description.nullius-minable", "3x[item=nullius-air-filter-1] 3x[item=nullius-broken-air-filter]"}, minable = { mining_time = 1, @@ -215,32 +217,32 @@ data:extend({ {type="item", name="nullius-broken-air-filter", amount=3} } }, - placeable_by = {item = "nullius-probe", count = 1}, + placeable_by = {item = "nullius-probe", count = 1}, collision_box = {{-1.2, -1.0}, {1.2, 0.7}}, selection_box = {{-1.2, -1.0}, {1.2, 0.7}}, dying_explosion = "big-explosion", integration_patch_render_layer = "decals", integration_patch = { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-medium-1-ground.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-medium-1-ground.png", priority="high", width = 352, height = 206, shift = util.by_pixel(-41, 13), - frame_count = 1, + --frame_count = 1, line_length = 1, scale = 0.5, }, picture = { layers = { { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-medium-1.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-medium-1.png", width = 228, height = 120, shift = util.by_pixel(-14, -4), scale = 0.5 }, { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-medium-1-shadow.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-medium-1-shadow.png", width = 206, height = 114, shift = util.by_pixel(16, -1), @@ -256,13 +258,14 @@ data:extend({ name = "nullius-landing-intake", icon = "__base__/graphics/icons/crash-site-spaceship-wreck-medium-2.png", icon_size = 64, - icon_mipmaps = 4, + flags = wreck_flags, + hidden = true, map_color = {r = 0, g = 0.365, b = 0.58, a = 1}, max_health = 100, alert_when_damaged = false, allow_copy_paste = false, - localised_description = {"entity-description.nullius-minable", + localised_description = {"entity-description.nullius-minable", "2x[item=nullius-seawater-intake-1] 4x[item=storage-tank]"}, minable = { mining_time = 1, @@ -271,18 +274,18 @@ data:extend({ {type="item", name="storage-tank", amount=4} } }, - placeable_by = {item = "nullius-probe", count = 1}, + placeable_by = {item = "nullius-probe", count = 1}, collision_box = {{-1.1, -0.6}, {1.0, 1.0}}, selection_box = {{-1.1, -0.6}, {1.0, 1.0}}, dying_explosion = "big-explosion", integration_patch_render_layer = "decals", integration_patch = { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-medium-2-ground.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-medium-2-ground.png", priority="high", width = 396, height = 214, shift = util.by_pixel(-56, -1), - frame_count = 1, + --frame_count = 1, line_length = 1, scale = 0.5 }, @@ -290,14 +293,14 @@ data:extend({ picture = { layers = { { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-medium-2.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-medium-2.png", width = 194, height = 150, shift = util.by_pixel(-15, 8), scale = 0.5 }, { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-medium-2-shadow.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-medium-2-shadow.png", width = 196, height = 114, shift = util.by_pixel(22, 15), @@ -313,13 +316,14 @@ data:extend({ name = "nullius-landing-wing", icon = "__base__/graphics/icons/crash-site-spaceship-wreck-medium-3.png", icon_size = 64, - icon_mipmaps = 4, + flags = wreck_flags, + hidden = true, map_color = {r = 0, g = 0.365, b = 0.58, a = 1}, max_health = 100, alert_when_damaged = false, allow_copy_paste = false, - localised_description = {"entity-description.nullius-minable", + localised_description = {"entity-description.nullius-minable", "18x[item=nullius-broken-solar-panel] 10x[item=nullius-aluminum-ingot]"}, minable = { mining_time = 1, @@ -328,18 +332,18 @@ data:extend({ {type="item", name="nullius-aluminum-ingot", amount=10} } }, - placeable_by = {item = "nullius-probe", count = 1}, + placeable_by = {item = "nullius-probe", count = 1}, collision_box = {{-0.8, -1.4}, {0.7, 1.4}}, selection_box = {{-0.8, -1.4}, {0.7, 1.4}}, dying_explosion = "big-explosion", integration_patch_render_layer = "decals", integration_patch = { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-medium-3-ground.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-medium-3-ground.png", priority="high", width = 350, height = 284, shift = util.by_pixel(-44, 10), - frame_count = 1, + --frame_count = 1, line_length = 1, scale = 0.5 }, @@ -347,14 +351,14 @@ data:extend({ picture = { layers = { { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-medium-3.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-medium-3.png", width = 224, height = 236, shift = util.by_pixel(-30, 4), scale = 0.5 }, { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-medium-3-shadow.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-medium-3-shadow.png", width = 104, height = 178, shift = util.by_pixel(6, 0), @@ -370,13 +374,14 @@ data:extend({ name = "nullius-landing-duct", icon = "__base__/graphics/icons/crash-site-spaceship-wreck-small-3.png", icon_size = 64, - icon_mipmaps = 4, + flags = wreck_flags, + hidden = true, map_color = {r = 0, g = 0.365, b = 0.58, a = 1}, max_health = 50, alert_when_damaged = false, allow_copy_paste = false, - localised_description = {"entity-description.nullius-minable", + localised_description = {"entity-description.nullius-minable", "40x[item=nullius-pipe-2] 24x[item=nullius-underground-pipe-2]" .. "3x[item=nullius-priority-valve] 3x[item=nullius-pump-1]"}, minable = { @@ -388,18 +393,18 @@ data:extend({ {type="item", name="nullius-pump-1", amount=3} } }, - placeable_by = {item = "nullius-probe", count = 1}, + placeable_by = {item = "nullius-probe", count = 1}, collision_box = {{-0.7, -0.8}, {1.2, 0.6}}, selection_box = {{-0.7, -0.8}, {1.2, 0.6}}, dying_explosion = "medium-explosion", integration_patch_render_layer = "decals", integration_patch = { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-small-3-ground.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-small-3-ground.png", priority="high", width = 274, height = 172, shift = util.by_pixel(-8, 3), - frame_count = 1, + --frame_count = 1, line_length = 1, scale = 0.5 }, @@ -407,14 +412,14 @@ data:extend({ picture = { layers = { { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-small-3.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-small-3.png", width = 164, height = 148, shift = util.by_pixel(5, -1), scale = 0.5 }, { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-small-3-shadow.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-small-3-shadow.png", width = 156, height = 114, shift = util.by_pixel(9, -1), @@ -430,30 +435,31 @@ data:extend({ name = "nullius-landing-shielding", icon = "__base__/graphics/icons/crash-site-spaceship-wreck-small-4.png", icon_size = 64, - icon_mipmaps = 4, + flags = wreck_flags, + hidden = true, map_color = {r = 0, g = 0.365, b = 0.58, a = 1}, max_health = 50, alert_when_damaged = false, allow_copy_paste = false, - localised_description = {"entity-description.nullius-minable", + localised_description = {"entity-description.nullius-minable", "20x[item=nullius-aluminum-ingot]"}, minable = { mining_time = 0.5, results = { {type="item", name="nullius-aluminum-ingot", amount=20} } }, - placeable_by = {item = "nullius-probe", count = 1}, + placeable_by = {item = "nullius-probe", count = 1}, collision_box = {{-0.9, -0.8}, {1.1, 0.6}}, selection_box = {{-0.9, -0.8}, {1.1, 0.6}}, dying_explosion = "medium-explosion", integration_patch_render_layer = "decals", integration_patch = { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-small-4-ground.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-small-4-ground.png", priority="high", width = 256, height = 150, shift = util.by_pixel(-12, -2), - frame_count = 1, + --frame_count = 1, line_length = 1, scale = 0.5 }, @@ -461,14 +467,14 @@ data:extend({ picture = { layers = { { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-small-4.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-small-4.png", width = 168, height = 142, shift = util.by_pixel(1, -3), scale = 0.5 }, { - filename = BASEENTITY .. "crash-site-spaceship/hr-spaceship-wreck-small-4-shadow.png", + filename = BASEENTITY .. "crash-site-spaceship/spaceship-wreck-small-4-shadow.png", width = 164, height = 100, shift = util.by_pixel(19, -5), @@ -485,32 +491,33 @@ data:extend({ icon = ENTICONPATH .. "crash-site-lab-broken.png", icon_size = 64, flags = wreck_flags, + hidden = true, map_color = {r = 0, g = 0.365, b = 0.58, a = 1}, max_health = 100, alert_when_damaged = false, allow_copy_paste = false, - localised_description = {"entity-description.nullius-minable", - "[item=nullius-lab-1] 20x[item=red-wire] 2x[item=nullius-broken-sensor-node]"}, + localised_description = {"entity-description.nullius-minable", + "1x[item=nullius-lab-1] 20x[item=nullius-red-wire] 2x[item=nullius-broken-sensor-node]"}, minable = { mining_time = 1, results = { {type="item", name="nullius-lab-1", amount=1}, - {type="item", name="red-wire", amount=20}, + {type="item", name="nullius-red-wire", amount=20}, {type="item", name="nullius-broken-sensor-node", amount=2} } }, - placeable_by = {item = "nullius-probe", count = 1}, + placeable_by = {item = "nullius-probe", count = 1}, collision_box = {{-2.2, -1.2}, {2.2, 1.2}}, selection_box = {{-2.5, -1.5}, {2.5, 1.5}}, dying_explosion = "medium-explosion", integration_patch_render_layer = "decals", integration_patch = { - filename = ENTITYPATH .. "crash/hr-crash-site-lab-ground.png", + filename = ENTITYPATH .. "crash/crash-site-lab-ground.png", priority = crash_site_sprite_priority, width = 700, height = 344, shift = util.by_pixel(-49, 11), - frame_count = 1, + --frame_count = 1, line_length = 1, scale = 0.5 }, @@ -518,14 +525,14 @@ data:extend({ picture = { layers = { { - filename = ENTITYPATH .. "crash/hr-crash-site-lab-repaired.png", + filename = ENTITYPATH .. "crash/crash-site-lab-repaired.png", width = 488, height = 252, shift = util.by_pixel(-18, 14), scale = 0.5 }, { - filename = ENTITYPATH .. "crash/hr-crash-site-lab-repaired-shadow.png", + filename = ENTITYPATH .. "crash/crash-site-lab-repaired-shadow.png", width = 696, height = 302, shift = util.by_pixel(-11, 12), @@ -542,11 +549,12 @@ data:extend({ icon = ENTICONPATH .. "crash-site-generator.png", icon_size = 64, flags = wreck_flags, + hidden = true, map_color = {r = 0, g = 0.365, b = 0.58, a = 1}, max_health = 50, alert_when_damaged = false, allow_copy_paste = false, - localised_description = {"entity-description.nullius-minable", + localised_description = {"entity-description.nullius-minable", "30x[item=small-electric-pole] 10x[item=big-electric-pole]" .. "30x[item=nullius-broken-pylon] 5x[item=programmable-speaker]"}, minable = { @@ -558,18 +566,18 @@ data:extend({ {type="item", name="programmable-speaker", amount=5} } }, - placeable_by = {item = "nullius-probe", count = 1}, + placeable_by = {item = "nullius-probe", count = 1}, collision_box = {{-1.5, -0.9}, {0.9, 0.9}}, selection_box = {{-1.5, -0.9}, {0.9, 0.9}}, dying_explosion = "medium-explosion", integration_patch_render_layer = "decals", integration_patch = { - filename = ENTITYPATH .. "crash/hr-crash-site-generator-ground.png", + filename = ENTITYPATH .. "crash/crash-site-generator-ground.png", priority = crash_site_sprite_priority, width = 384, height = 360, shift = util.by_pixel(-28, -38), - frame_count = 1, + --frame_count = 1, line_length = 1, scale = 0.5 }, @@ -577,14 +585,14 @@ data:extend({ picture = { layers = { { - filename = ENTITYPATH .. "crash/hr-crash-site-generator.png", + filename = ENTITYPATH .. "crash/crash-site-generator.png", width = 286, height = 252, shift = util.by_pixel(-11, -23), scale = 0.5 }, { - filename = ENTITYPATH .. "crash/hr-crash-site-generator-shadow.png", + filename = ENTITYPATH .. "crash/crash-site-generator-shadow.png", width = 474, height = 152, draw_as_shadow = true, @@ -600,38 +608,38 @@ data:extend({ name = "nullius-landing-pod-1", icon = "__base__/graphics/icons/crash-site-chest.png", icon_size = 64, - icon_mipmaps = 4, + flags = wreck_flags, + hidden = true, map_color = {r = 0, g = 0.365, b = 0.58, a = 1}, max_health = 200, alert_when_damaged = false, allow_copy_paste = false, inventory_size = 10, - enable_inventory_bar = false, - not_inventory_moveable = true, + inventory_type = "normal", minable = { mining_time = 0.5, results = { {type="item", name="nullius-large-chest-1", amount=1} } }, - placeable_by = {item = "nullius-probe", count = 1}, + placeable_by = {item = "nullius-probe", count = 1}, collision_box = {{-0.35, -0.35}, {0.35, 0.35}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, dying_explosion = "medium-explosion", integration_patch_render_layer = "decals", integration_patch = { - filename = BASEENTITY .. "crash-site-chests/hr-crash-site-chest-1-ground.png", + filename = BASEENTITY .. "crash-site-chests/crash-site-chest-1-ground.png", priority = crash_site_sprite_priority, width = 220, height = 148, shift = util.by_pixel(-6, 12), - frame_count = 1, + --frame_count = 1, line_length = 1, scale = 0.5 }, picture = { layers = { { - filename = BASEENTITY .. "crash-site-chests/hr-crash-site-chest-1.png", + filename = BASEENTITY .. "crash-site-chests/crash-site-chest-1.png", priority = "extra-high", width = 120, height = 76, @@ -639,7 +647,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "crash-site-chests/hr-crash-site-chest-1-shadow.png", + filename = BASEENTITY .. "crash-site-chests/crash-site-chest-1-shadow.png", priority = "extra-high", width = 210, height = 128, @@ -656,38 +664,38 @@ data:extend({ name = "nullius-landing-pod-2", icon = "__base__/graphics/icons/crash-site-chest.png", icon_size = 64, - icon_mipmaps = 4, + flags = wreck_flags, + hidden = true, map_color = {r = 0, g = 0.365, b = 0.58, a = 1}, max_health = 200, alert_when_damaged = false, allow_copy_paste = false, inventory_size = 10, - enable_inventory_bar = false, - not_inventory_moveable = true, + inventory_type = "normal", minable = { mining_time = 0.5, results = { {type="item", name="nullius-large-chest-1", amount=1} } }, - placeable_by = {item = "nullius-probe", count = 1}, + placeable_by = {item = "nullius-probe", count = 1}, collision_box = {{-0.35, -0.35}, {0.35, 0.35}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, dying_explosion = "medium-explosion", integration_patch_render_layer = "decals", integration_patch = { - filename = BASEENTITY .. "crash-site-chests/hr-crash-site-chest-2-ground.png", + filename = BASEENTITY .. "crash-site-chests/crash-site-chest-2-ground.png", priority = crash_site_sprite_priority, width = 218, height = 186, shift = util.by_pixel(-10, 5), - frame_count = 1, + --frame_count = 1, line_length = 1, scale = 0.5 }, picture = { layers = { { - filename = BASEENTITY .. "crash-site-chests/hr-crash-site-chest-2.png", + filename = BASEENTITY .. "crash-site-chests/crash-site-chest-2.png", priority = "extra-high", width = 116, height = 88, @@ -695,7 +703,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "crash-site-chests/hr-crash-site-chest-2-shadow.png", + filename = BASEENTITY .. "crash-site-chests/crash-site-chest-2-shadow.png", priority = "extra-high", width = 188, height = 126, @@ -713,11 +721,12 @@ data:extend({ icon = ENTICONPATH .. "crash-site-assembling-machine-1-repaired.png", icon_size = 64, flags = wreck_flags, + hidden = true, map_color = {r = 0, g = 0.365, b = 0.58, a = 1}, max_health = 100, alert_when_damaged = false, allow_copy_paste = false, - localised_description = {"entity-description.nullius-minable", + localised_description = {"entity-description.nullius-minable", "3x[item=nullius-small-miner-1] 12x[item=nullius-broken-grid-battery]"}, minable = { mining_time = 0.5, @@ -726,18 +735,18 @@ data:extend({ {type="item", name="nullius-broken-grid-battery", amount=12} } }, - placeable_by = {item = "nullius-probe", count = 1}, + placeable_by = {item = "nullius-probe", count = 1}, collision_box = {{-1.2, -0.7}, {1.2, 0.7}}, selection_box = {{-1.5, -1}, {1.5, 1}}, dying_explosion = "medium-explosion", integration_patch_render_layer = "decals", integration_patch = { - filename = ENTITYPATH .. "crash/hr-crash-site-assembling-machine-1-ground.png", + filename = ENTITYPATH .. "crash/crash-site-assembling-machine-1-ground.png", priority = crash_site_sprite_priority, width = 446, height = 234, shift = util.by_pixel(-31, 12), - frame_count = 1, + --frame_count = 1, line_length = 1, scale = 0.5 }, @@ -745,14 +754,14 @@ data:extend({ picture = { layers = { { - filename = ENTITYPATH .. "crash/hr-crash-site-assembling-machine-1-repaired.png", + filename = ENTITYPATH .. "crash/crash-site-assembling-machine-1-repaired.png", width = 282, height = 182, shift = util.by_pixel(-12, 3), scale = 0.5 }, { - filename = ENTITYPATH .. "crash/hr-crash-site-assembling-machine-1-repaired-shadow.png", + filename = ENTITYPATH .. "crash/crash-site-assembling-machine-1-repaired-shadow.png", width = 278, height = 168, draw_as_shadow = true, @@ -769,12 +778,13 @@ data:extend({ icon = ENTICONPATH .. "crash-site-assembling-machine-2-repaired.png", icon_size = 64, flags = wreck_flags, + hidden = true, map_color = {r = 0, g = 0.365, b = 0.58, a = 1}, max_health = 100, alert_when_damaged = false, allow_copy_paste = false, - localised_description = {"entity-description.nullius-minable", - "[item=nullius-medium-assembler-1] 3x[item=nullius-broken-assembler] " + localised_description = {"entity-description.nullius-minable", + "1x[item=nullius-medium-assembler-1] 3x[item=nullius-broken-assembler] " .. "6x[item=nullius-grid-battery-1]"}, minable = { mining_time = 0.5, @@ -784,18 +794,18 @@ data:extend({ {type="item", name="nullius-grid-battery-1", amount=6} } }, - placeable_by = {item = "nullius-probe", count = 1}, + placeable_by = {item = "nullius-probe", count = 1}, collision_box = {{-0.7, -1.2}, {0.7, 1.2}}, selection_box = {{-1, -1.5}, {1, 1.5}}, dying_explosion = "medium-explosion", integration_patch_render_layer = "decals", integration_patch ={ - filename = ENTITYPATH .. "crash/hr-crash-site-assembling-machine-2-ground.png", + filename = ENTITYPATH .. "crash/crash-site-assembling-machine-2-ground.png", priority = crash_site_sprite_priority, width = 290, height = 238, shift = util.by_pixel(-8, -10), - frame_count = 1, + --frame_count = 1, line_length = 1, scale = 0.5 }, @@ -803,14 +813,14 @@ data:extend({ picture = { layers = { { - filename = ENTITYPATH .. "crash/hr-crash-site-assembling-machine-2-repaired.png", + filename = ENTITYPATH .. "crash/crash-site-assembling-machine-2-repaired.png", width = 198, height = 200, shift = util.by_pixel(-4, -11), scale = 0.5 }, { - filename = ENTITYPATH .. "crash/hr-crash-site-assembling-machine-2-repaired-shadow.png", + filename = ENTITYPATH .. "crash/crash-site-assembling-machine-2-repaired-shadow.png", width = 208, height = 174, draw_as_shadow = true, diff --git a/nullius/prototypes/entity/logistics.lua b/nullius/prototypes/entity/logistics.lua index 4ba42c2..1dc08ec 100644 --- a/nullius/prototypes/entity/logistics.lua +++ b/nullius/prototypes/entity/logistics.lua @@ -26,26 +26,18 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input" }, energy_usage = "150kW", integration_patch = data.raw.radar["radar"].integration_patch, - vehicle_impact_sound = data.raw.radar["radar"].vehicle_impact_sound, + impact_category = data.raw.radar["radar"].impact_category, working_sound = data.raw.radar["radar"].working_sound, radius_minimap_visualisation_color = { r = 0.059, g = 0.092, b = 0.235, a = 0.275 }, rotation_speed = 0.008, water_reflection = data.raw.radar["radar"].water_reflection, + circuit_connector = circuit_connector_definitions["radar"], + circuit_wire_max_distance = default_circuit_wire_max_distance, pictures = { layers = { { - filename = BASEENTITY .. "radar/radar.png", - priority = "low", - width = 98, - height = 128, - apply_projection = false, - direction_count = 64, - line_length = 8, - shift = util.by_pixel(1, -16), - tint = {0.8, 0.8, 1}, - hr_version = { - filename = BASEENTITY .. "radar/hr-radar.png", + filename = BASEENTITY .. "radar/radar.png", priority = "low", width = 196, height = 254, @@ -55,30 +47,18 @@ data:extend({ shift = util.by_pixel(1, -16), tint = {0.8, 0.8, 1}, scale = 0.5 - } }, { filename = BASEENTITY .. "radar/radar-shadow.png", priority = "low", - width = 172, - height = 94, + width = 336, + height = 170, apply_projection = false, direction_count = 64, line_length = 8, - shift = util.by_pixel(39,3), + shift = util.by_pixel(39.0, 6.0), draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "radar/hr-radar-shadow.png", - priority = "low", - width = 343, - height = 186, - apply_projection = false, - direction_count = 64, - line_length = 8, - shift = util.by_pixel(39.25,3), - draw_as_shadow = true, - scale = 0.5 - } + scale = 0.5 } } }, @@ -105,25 +85,18 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input" }, energy_usage = "250kW", integration_patch = data.raw.radar["radar"].integration_patch, - vehicle_impact_sound = data.raw.radar["radar"].vehicle_impact_sound, + impact_category = data.raw.radar["radar"].impact_category, working_sound = data.raw.radar["radar"].working_sound, radius_minimap_visualisation_color = { r = 0.059, g = 0.092, b = 0.235, a = 0.275 }, rotation_speed = 0.01, water_reflection = data.raw.radar["radar"].water_reflection, + circuit_connector = circuit_connector_definitions["radar"], + circuit_wire_max_distance = default_circuit_wire_max_distance, pictures = { layers = { { - filename = BASEENTITY .. "radar/radar.png", - priority = "low", - width = 98, - height = 128, - apply_projection = false, - direction_count = 64, - line_length = 8, - shift = util.by_pixel(1, -16), - hr_version = { - filename = BASEENTITY .. "radar/hr-radar.png", + filename = BASEENTITY .. "radar/radar.png", priority = "low", width = 196, height = 254, @@ -132,35 +105,54 @@ data:extend({ line_length = 8, shift = util.by_pixel(1, -16), scale = 0.5 - } }, { filename = BASEENTITY .. "radar/radar-shadow.png", priority = "low", - width = 172, - height = 94, + width = 336, + height = 170, apply_projection = false, direction_count = 64, line_length = 8, - shift = util.by_pixel(39,3), + shift = util.by_pixel(39.0, 6.0), draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "radar/hr-radar-shadow.png", - priority = "low", - width = 343, - height = 186, - apply_projection = false, - direction_count = 64, - line_length = 8, - shift = util.by_pixel(39.25,3), - draw_as_shadow = true, - scale = 0.5 - } + scale = 0.5 } } }, }, - + { + -- special hidden lab that accepts all science packs (used to allow the checkpoints to work) + type = "lab", + name = "nullius-hidden-lab", + icons = data.raw.item["nullius-lab-1"].icons, + energy_usage = "95kW", + energy_source = { + type = "electric", + usage_priority = "secondary-input", + drain = "5kW" + }, + hidden = true, + inputs = { + "nullius-geology-pack", + "nullius-climatology-pack", + "nullius-mechanical-pack", + "nullius-electrical-pack", + "nullius-chemical-pack", + "nullius-physics-pack", + "nullius-astronomy-pack", + "nullius-checkpoint", + "nullius-requirement-build", + "nullius-requirement-consume", + "nullius-biochemistry-pack", + "nullius-microbiology-pack", + "nullius-botany-pack", + "nullius-dendrology-pack", + "nullius-nematology-pack", + "nullius-ichthyology-pack", + "nullius-zoology-pack", + }, + }, { type = "lab", name = "nullius-lab-1", @@ -177,7 +169,7 @@ data:extend({ light = {intensity = 0.75, size = 8, color = {r = 1.0, g = 1.0, b = 1.0}}, damaged_trigger_effect = data.raw.lab["lab"].damaged_trigger_effect, working_sound = data.raw.lab["lab"].working_sound, - vehicle_impact_sound = data.raw.lab["lab"].vehicle_impact_sound, + impact_category = data.raw.lab["lab"].impact_category, open_sound = data.raw.lab["lab"].open_sound, close_sound = data.raw.lab["lab"].close_sound, energy_source = { @@ -194,18 +186,15 @@ data:extend({ "nullius-electrical-pack", "nullius-chemical-pack", "nullius-physics-pack", - "nullius-astronomy-pack" - }, - module_specification = { - module_slots = 2, - module_info_icon_shift = {0, 0.9} + "nullius-astronomy-pack", }, + module_slots = 2, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, on_animation = { layers = { { - filename = BASEENTITY .. "lab/hr-lab.png", + filename = BASEENTITY .. "lab/lab.png", width = 194, height = 174, frame_count = 33, @@ -227,7 +216,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "lab/hr-lab-integration.png", + filename = BASEENTITY .. "lab/lab-integration.png", width = 242, height = 162, frame_count = 1, @@ -238,7 +227,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "lab/hr-lab-shadow.png", + filename = BASEENTITY .. "lab/lab-shadow.png", width = 242, height = 136, frame_count = 1, @@ -254,7 +243,7 @@ data:extend({ off_animation = { layers = { { - filename = BASEENTITY .. "lab/hr-lab.png", + filename = BASEENTITY .. "lab/lab.png", width = 194, height = 174, frame_count = 1, @@ -271,7 +260,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "lab/hr-lab-integration.png", + filename = BASEENTITY .. "lab/lab-integration.png", width = 242, height = 162, frame_count = 1, @@ -279,7 +268,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "lab/hr-lab-shadow.png", + filename = BASEENTITY .. "lab/lab-shadow.png", width = 242, height = 136, frame_count = 1, @@ -309,7 +298,7 @@ data:extend({ light = {intensity = 0.75, size = 8, color = {r = 1.0, g = 1.0, b = 1.0}}, damaged_trigger_effect = data.raw.lab["lab"].damaged_trigger_effect, working_sound = data.raw.lab["lab"].working_sound, - vehicle_impact_sound = data.raw.lab["lab"].vehicle_impact_sound, + impact_category = data.raw.lab["lab"].impact_category, open_sound = data.raw.lab["lab"].open_sound, close_sound = data.raw.lab["lab"].close_sound, energy_source = { @@ -320,16 +309,13 @@ data:extend({ energy_usage = "210kW", researching_speed = 2, inputs = data.raw.lab["nullius-lab-1"].inputs, - module_specification = { - module_slots = 3, - module_info_icon_shift = {0, 0.9} - }, + module_slots = 3, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, on_animation = { layers = { { - filename = BASEENTITY .. "lab/hr-lab.png", + filename = BASEENTITY .. "lab/lab.png", width = 194, height = 174, frame_count = 33, @@ -351,7 +337,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "lab/hr-lab-integration.png", + filename = BASEENTITY .. "lab/lab-integration.png", width = 242, height = 162, frame_count = 1, @@ -362,7 +348,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "lab/hr-lab-shadow.png", + filename = BASEENTITY .. "lab/lab-shadow.png", width = 242, height = 136, frame_count = 1, @@ -378,7 +364,7 @@ data:extend({ off_animation = { layers = { { - filename = BASEENTITY .. "lab/hr-lab.png", + filename = BASEENTITY .. "lab/lab.png", width = 194, height = 174, frame_count = 1, @@ -415,7 +401,7 @@ data:extend({ light = {intensity = 0.75, size = 8, color = {r = 1.0, g = 1.0, b = 1.0}}, damaged_trigger_effect = data.raw.lab["lab"].damaged_trigger_effect, working_sound = data.raw.lab["lab"].working_sound, - vehicle_impact_sound = data.raw.lab["lab"].vehicle_impact_sound, + impact_category = data.raw.lab["lab"].impact_category, open_sound = data.raw.lab["lab"].open_sound, close_sound = data.raw.lab["lab"].close_sound, energy_source = { @@ -426,16 +412,13 @@ data:extend({ energy_usage = "460kW", researching_speed = 4, inputs = data.raw.lab["nullius-lab-1"].inputs, - module_specification = { - module_slots = 4, - module_info_icon_shift = {0, 0.9} - }, + module_slots = 4, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, on_animation = { layers = { { - filename = BASEENTITY .. "lab/hr-lab.png", + filename = BASEENTITY .. "lab/lab.png", width = 194, height = 174, frame_count = 33, @@ -456,7 +439,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "lab/hr-lab-integration.png", + filename = BASEENTITY .. "lab/lab-integration.png", width = 242, height = 162, frame_count = 1, @@ -467,7 +450,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "lab/hr-lab-shadow.png", + filename = BASEENTITY .. "lab/lab-shadow.png", width = 242, height = 136, frame_count = 1, @@ -483,7 +466,7 @@ data:extend({ off_animation = { layers = { { - filename = BASEENTITY .. "lab/hr-lab.png", + filename = BASEENTITY .. "lab/lab.png", width = 194, height = 174, frame_count = 1, @@ -518,7 +501,7 @@ data:extend({ light = {intensity = 0.75, size = 8, color = {r = 1.0, g = 1.0, b = 1.0}}, damaged_trigger_effect = data.raw.lab["lab"].damaged_trigger_effect, working_sound = data.raw.lab["lab"].working_sound, - vehicle_impact_sound = data.raw.lab["lab"].vehicle_impact_sound, + impact_category = data.raw.lab["lab"].impact_category, open_sound = data.raw.lab["lab"].open_sound, close_sound = data.raw.lab["lab"].close_sound, energy_source = { @@ -535,18 +518,15 @@ data:extend({ "nullius-dendrology-pack", "nullius-nematology-pack", "nullius-ichthyology-pack", - "nullius-zoology-pack" - }, - module_specification = { - module_slots = 4, - module_info_icon_shift = {0, 0.9} + "nullius-zoology-pack", }, + module_slots = 4, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, on_animation = { layers = { { - filename = BASEENTITY .. "lab/hr-lab.png", + filename = BASEENTITY .. "lab/lab.png", width = 194, height = 174, frame_count = 33, @@ -567,7 +547,7 @@ data:extend({ scale = 0.5*1.3333 }, { - filename = BASEENTITY .. "lab/hr-lab-integration.png", + filename = BASEENTITY .. "lab/lab-integration.png", width = 242, height = 162, frame_count = 1, @@ -578,7 +558,7 @@ data:extend({ scale = 0.5*1.3333 }, { - filename = BASEENTITY .. "lab/hr-lab-shadow.png", + filename = BASEENTITY .. "lab/lab-shadow.png", width = 242, height = 136, frame_count = 1, @@ -594,7 +574,7 @@ data:extend({ off_animation = { layers = { { - filename = BASEENTITY .. "lab/hr-lab.png", + filename = BASEENTITY .. "lab/lab.png", width = 194, height = 174, frame_count = 1, @@ -610,7 +590,7 @@ data:extend({ scale = 0.5*1.3333 }, { - filename = BASEENTITY .. "lab/hr-lab-integration.png", + filename = BASEENTITY .. "lab/lab-integration.png", width = 242, height = 162, frame_count = 1, @@ -618,7 +598,7 @@ data:extend({ scale = 0.5*1.3333 }, { - filename = BASEENTITY .. "lab/hr-lab-shadow.png", + filename = BASEENTITY .. "lab/lab-shadow.png", width = 242, height = 136, frame_count = 1, @@ -645,17 +625,16 @@ data:extend({ collision_box = {{-0.15, -0.15}, {0.15, 0.15}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, damaged_trigger_effect = data.raw["lamp"]["small-lamp"].damaged_trigger_effect, - vehicle_impact_sound = data.raw["lamp"]["small-lamp"].vehicle_impact_sound, + impact_category = data.raw["lamp"]["small-lamp"].impact_category, open_sound = data.raw["lamp"]["small-lamp"].open_sound, close_sound = data.raw["lamp"]["small-lamp"].close_sound, working_sound = data.raw["lamp"]["small-lamp"].working_sound, energy_source = { type = "electric", usage_priority = "lamp" }, signal_to_color_mapping = data.raw["lamp"]["small-lamp"].signal_to_color_mapping, - circuit_wire_connection_point = circuit_connector_definitions["lamp"].points, - circuit_connector_sprites = circuit_connector_definitions["lamp"].sprites, + circuit_connector = circuit_connector_definitions["lamp"], circuit_wire_max_distance = default_circuit_wire_max_distance, - energy_usage_per_tick = "4KW", + energy_usage_per_tick = "4kW", darkness_for_all_lamps_on = 0.5, darkness_for_all_lamps_off = 0.3, light = {intensity = 0.85, size = 36, color = {r=1.0, g=1.0, b=1.0}}, @@ -666,74 +645,34 @@ data:extend({ picture_off = { layers = { { - filename = BASEENTITY .. "small-lamp/lamp.png", - priority = "high", - width = 42, - height = 36, - frame_count = 1, - axially_symmetrical = false, - direction_count = 1, - shift = util.by_pixel(0,2.4), - scale = 0.8, - hr_version = { - filename = BASEENTITY .. "small-lamp/hr-lamp.png", + filename = BASEENTITY .. "small-lamp/lamp.png", priority = "high", width = 83, height = 70, - frame_count = 1, - axially_symmetrical = false, - direction_count = 1, + --axially_symmetrical = false, shift = util.by_pixel(0.2,2.4), scale = 0.4 - } }, { - filename = BASEENTITY .. "small-lamp/lamp-shadow.png", - priority = "high", - width = 38, - height = 24, - frame_count = 1, - axially_symmetrical = false, - direction_count = 1, - shift = util.by_pixel(3.2,4), - draw_as_shadow = true, - scale = 0.8, - hr_version = { - filename = BASEENTITY .. "small-lamp/hr-lamp-shadow.png", + filename = BASEENTITY .. "small-lamp/lamp-shadow.png", priority = "high", width = 76, height = 47, - frame_count = 1, - axially_symmetrical = false, - direction_count = 1, + --axially_symmetrical = false, shift = util.by_pixel(3.2, 3.8), draw_as_shadow = true, scale = 0.4 - } } } }, picture_on = { - filename = BASEENTITY .. "small-lamp/lamp-light.png", - priority = "high", - width = 46, - height = 40, - frame_count = 1, - axially_symmetrical = false, - direction_count = 1, - shift = util.by_pixel(0, -5.6), - scale = 0.8, - hr_version = { - filename = BASEENTITY .. "small-lamp/hr-lamp-light.png", + filename = BASEENTITY .. "small-lamp/lamp-light.png", priority = "high", width = 90, height = 78, - frame_count = 1, - axially_symmetrical = false, - direction_count = 1, + --axially_symmetrical = false, shift = util.by_pixel(0, -5.6), scale = 0.4 - } } }, @@ -751,17 +690,16 @@ data:extend({ collision_box = {{-0.15, -0.15}, {0.15, 0.15}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, damaged_trigger_effect = data.raw["lamp"]["small-lamp"].damaged_trigger_effect, - vehicle_impact_sound = data.raw["lamp"]["small-lamp"].vehicle_impact_sound, + impact_category = data.raw["lamp"]["small-lamp"].impact_category, open_sound = data.raw["lamp"]["small-lamp"].open_sound, close_sound = data.raw["lamp"]["small-lamp"].close_sound, working_sound = data.raw["lamp"]["small-lamp"].working_sound, energy_source = { type = "electric", usage_priority = "lamp" }, signal_to_color_mapping = data.raw["lamp"]["small-lamp"].signal_to_color_mapping, - circuit_wire_connection_point = circuit_connector_definitions["lamp"].points, - circuit_connector_sprites = circuit_connector_definitions["lamp"].sprites, + circuit_connector = circuit_connector_definitions["lamp"], circuit_wire_max_distance = default_circuit_wire_max_distance, - energy_usage_per_tick = "8KW", + energy_usage_per_tick = "8kW", darkness_for_all_lamps_on = 0.4, darkness_for_all_lamps_off = 0.2, light = {intensity = 0.95, size = 64, color = {r=1.0, g=1.0, b=1.0}}, @@ -772,74 +710,34 @@ data:extend({ picture_off = { layers = { { - filename = BASEENTITY .. "small-lamp/lamp.png", - priority = "high", - width = 42, - height = 36, - frame_count = 1, - axially_symmetrical = false, - direction_count = 1, - shift = util.by_pixel(0,3.3), - scale = 1.1, - hr_version = { - filename = BASEENTITY .. "small-lamp/hr-lamp.png", + filename = BASEENTITY .. "small-lamp/lamp.png", priority = "high", width = 83, height = 70, - frame_count = 1, - axially_symmetrical = false, - direction_count = 1, + --axially_symmetrical = false, shift = util.by_pixel(0.275,3.3), scale = 0.55 - } }, { - filename = BASEENTITY .. "small-lamp/lamp-shadow.png", - priority = "high", - width = 38, - height = 24, - frame_count = 1, - axially_symmetrical = false, - direction_count = 1, - shift = util.by_pixel(4.4,5.5), - draw_as_shadow = true, - scale = 1.1, - hr_version = { - filename = BASEENTITY .. "small-lamp/hr-lamp-shadow.png", + filename = BASEENTITY .. "small-lamp/lamp-shadow.png", priority = "high", width = 76, height = 47, - frame_count = 1, - axially_symmetrical = false, - direction_count = 1, + --axially_symmetrical = false, shift = util.by_pixel(4.4, 5.225), draw_as_shadow = true, scale = 0.55 - } } } }, picture_on = { - filename = BASEENTITY .. "small-lamp/lamp-light.png", - priority = "high", - width = 46, - height = 40, - frame_count = 1, - axially_symmetrical = false, - direction_count = 1, - shift = util.by_pixel(0, -7.7), - scale = 1.1, - hr_version = { - filename = BASEENTITY .. "small-lamp/hr-lamp-light.png", + filename = BASEENTITY .. "small-lamp/lamp-light.png", priority = "high", width = 90, height = 78, - frame_count = 1, - axially_symmetrical = false, - direction_count = 1, + --axially_symmetrical = false, shift = util.by_pixel(0, -7.7), scale = 0.55 - } } }, @@ -848,7 +746,6 @@ data:extend({ name = "nullius-turret", icon = "__base__/graphics/icons/laser-turret.png", icon_size = 64, - icon_mipmaps = 4, flags = { "placeable-player", "placeable-enemy", "player-creation"}, minable = { mining_time = 0.6, result = "nullius-turret" }, max_health = 2000, @@ -880,11 +777,14 @@ data:extend({ preparing_animation = data.raw["electric-turret"]["laser-turret"].preparing_animation, prepared_animation = data.raw["electric-turret"]["laser-turret"].prepared_animation, energy_glow_animation = data.raw["electric-turret"]["laser-turret"].energy_glow_animation, - base_picture = data.raw["electric-turret"]["laser-turret"].base_picture, + -- base_picture = data.raw["electric-turret"]["laser-turret"].base_picture, + graphics_set = data.raw["electric-turret"]["laser-turret"].graphics_set, glow_light_intensity = 0.5, -- defaults to 0 - vehicle_impact_sound = data.raw["electric-turret"]["laser-turret"].vehicle_impact_sound, + impact_category = data.raw["electric-turret"]["laser-turret"].impact_category, water_reflection = data.raw["electric-turret"]["laser-turret"].water_reflection, call_for_help_radius = 40, + circuit_connector = circuit_connector_definitions["laser-turret"], + circuit_wire_max_distance = default_circuit_wire_max_distance, attack_parameters = { type = "beam", @@ -893,8 +793,8 @@ data:extend({ source_direction_count = 64, source_offset = {0, -3.423489 / 4}, damage_modifier = 10, + ammo_category = "laser", ammo_type = { - category = "laser", energy_consumption = "2MJ", action = { type = "direct", @@ -915,10 +815,10 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == false then data:extend({ { type = "inserter", - name = "turbo-inserter", + name = "bob-turbo-inserter", localised_name = {"entity-name.nullius-inserter-2"}, icon = "__base__/graphics/icons/fast-inserter.png", - icon_size = 64, icon_mipmaps = 4, + icon_size = 64, flags = {"placeable-neutral", "placeable-player", "player-creation"}, minable = { mining_time = 0.1, result = "fast-inserter" }, max_health = 150, @@ -932,16 +832,16 @@ data:extend({ insert_position = {0, 1.2}, rotation_speed = 0.0333333, extension_speed = 0.08, - energy_per_rotation = "10.25KJ", - energy_per_movement = "1.5625KJ", + energy_per_rotation = "10.25kJ", + energy_per_movement = "1.5625kJ", energy_source = { type = "electric", usage_priority = "secondary-input", drain = "2kW" }, fast_replaceable_group = "inserter", - next_upgrade = "stack-inserter", - vehicle_impact_sound = data.raw["inserter"]["fast-inserter"].vehicle_impact_sound, + next_upgrade = "bulk-inserter", + impact_category = data.raw["inserter"]["fast-inserter"].impact_category, open_sound = data.raw["inserter"]["fast-inserter"].open_sound, close_sound = data.raw["inserter"]["fast-inserter"].close_sound, working_sound = data.raw["inserter"]["fast-inserter"].working_sound, @@ -952,54 +852,53 @@ data:extend({ hand_closed_shadow = data.raw["inserter"]["fast-inserter"].hand_closed_shadow, hand_open_shadow = data.raw["inserter"]["fast-inserter"].hand_open_shadow, platform_picture = data.raw["inserter"]["fast-inserter"].platform_picture, - circuit_wire_connection_points = data.raw["inserter"]["fast-inserter"].circuit_wire_connection_points, - circuit_connector_sprites = data.raw["inserter"]["fast-inserter"].circuit_connector_sprites, + circuit_connector = data.raw["inserter"]["fast-inserter"].circuit_connector, circuit_wire_max_distance = data.raw["inserter"]["fast-inserter"].circuit_wire_max_distance, default_stack_control_input_signal = data.raw["inserter"]["fast-inserter"].default_stack_control_input_signal }, - { - type = "inserter", - name = "turbo-filter-inserter", - icon = "__base__/graphics/icons/filter-inserter.png", - icon_size = 64, icon_mipmaps = 4, - flags = {"placeable-neutral", "placeable-player", "player-creation"}, - minable = {mining_time = 0.1, result = "filter-inserter"}, - max_health = 150, - corpse = "filter-inserter-remnants", - dying_explosion = "filter-inserter-explosion", - resistances = {{ type = "impact", decrease = 100, percent = 90 }}, - collision_box = {{-0.15, -0.15}, {0.15, 0.15}}, - selection_box = {{-0.4, -0.35}, {0.4, 0.45}}, - damaged_trigger_effect = data.raw["inserter"]["filter-inserter"].damaged_trigger_effect, - pickup_position = {0, -1}, - insert_position = {0, 1.2}, - rotation_speed = 0.0333333, - extension_speed = 0.08, - energy_per_rotation = "10.25KJ", - energy_per_movement = "1.5625KJ", - energy_source = { - type = "electric", - usage_priority = "secondary-input", - drain = "2kW" - }, - fast_replaceable_group = "inserter", - filter_count = 5, - vehicle_impact_sound = data.raw["inserter"]["filter-inserter"].vehicle_impact_sound, - open_sound = data.raw["inserter"]["filter-inserter"].open_sound, - close_sound = data.raw["inserter"]["filter-inserter"].close_sound, - working_sound = data.raw["inserter"]["filter-inserter"].working_sound, - hand_base_picture = data.raw["inserter"]["filter-inserter"].hand_base_picture, - hand_closed_picture = data.raw["inserter"]["filter-inserter"].hand_closed_picture, - hand_open_picture = data.raw["inserter"]["filter-inserter"].hand_open_picture, - hand_base_shadow = data.raw["inserter"]["filter-inserter"].hand_base_shadow, - hand_closed_shadow = data.raw["inserter"]["filter-inserter"].hand_closed_shadow, - hand_open_shadow = data.raw["inserter"]["filter-inserter"].hand_open_shadow, - platform_picture = data.raw["inserter"]["filter-inserter"].platform_picture, - circuit_wire_connection_points = data.raw["inserter"]["filter-inserter"].circuit_wire_connection_points, - circuit_connector_sprites = data.raw["inserter"]["filter-inserter"].circuit_connector_sprites, - circuit_wire_max_distance = data.raw["inserter"]["filter-inserter"].circuit_wire_max_distance, - default_stack_control_input_signal = data.raw["inserter"]["filter-inserter"].default_stack_control_input_signal - } + -- { + -- type = "inserter", + -- name = "turbo-filter-inserter", + -- icon = "__base__/graphics/icons/filter-inserter.png", + -- icon_size = 64, + -- flags = {"placeable-neutral", "placeable-player", "player-creation"}, + -- minable = {mining_time = 0.1, result = "filter-inserter"}, + -- max_health = 150, + -- corpse = "filter-inserter-remnants", + -- dying_explosion = "filter-inserter-explosion", + -- resistances = {{ type = "impact", decrease = 100, percent = 90 }}, + -- collision_box = {{-0.15, -0.15}, {0.15, 0.15}}, + -- selection_box = {{-0.4, -0.35}, {0.4, 0.45}}, + -- damaged_trigger_effect = data.raw["inserter"]["filter-inserter"].damaged_trigger_effect, + -- pickup_position = {0, -1}, + -- insert_position = {0, 1.2}, + -- rotation_speed = 0.0333333, + -- extension_speed = 0.08, + -- energy_per_rotation = "10.25kJ", + -- energy_per_movement = "1.5625kJ", + -- energy_source = { + -- type = "electric", + -- usage_priority = "secondary-input", + -- drain = "2kW" + -- }, + -- fast_replaceable_group = "inserter", + -- filter_count = 5, + -- impact_category = data.raw["inserter"]["filter-inserter"].impact_category, + -- open_sound = data.raw["inserter"]["filter-inserter"].open_sound, + -- close_sound = data.raw["inserter"]["filter-inserter"].close_sound, + -- working_sound = data.raw["inserter"]["filter-inserter"].working_sound, + -- hand_base_picture = data.raw["inserter"]["filter-inserter"].hand_base_picture, + -- hand_closed_picture = data.raw["inserter"]["filter-inserter"].hand_closed_picture, + -- hand_open_picture = data.raw["inserter"]["filter-inserter"].hand_open_picture, + -- hand_base_shadow = data.raw["inserter"]["filter-inserter"].hand_base_shadow, + -- hand_closed_shadow = data.raw["inserter"]["filter-inserter"].hand_closed_shadow, + -- hand_open_shadow = data.raw["inserter"]["filter-inserter"].hand_open_shadow, + -- platform_picture = data.raw["inserter"]["filter-inserter"].platform_picture, + -- circuit_wire_connection_points = data.raw["inserter"]["filter-inserter"].circuit_wire_connection_points, + -- circuit_connector_sprites = data.raw["inserter"]["filter-inserter"].circuit_connector_sprites, + -- circuit_wire_max_distance = data.raw["inserter"]["filter-inserter"].circuit_wire_max_distance, + -- default_stack_control_input_signal = data.raw["inserter"]["filter-inserter"].default_stack_control_input_signal + -- } }) end @@ -1010,17 +909,7 @@ oldradar.name = "nullius-sensor-node-original" oldradar.pictures = { layers = { data.raw.radar["nullius-sensor-node-3"].pictures.layers[1], { - filename = "__reskins-bobs__/graphics/entity/warfare/radar/radar-mask.png", - priority = "low", - width = 98, - height = 128, - apply_projection = false, - direction_count = 64, - line_length = 8, - shift = util.by_pixel(1, -16), - tint = tiercolor("yellow"), - hr_version = { - filename = "__reskins-bobs__/graphics/entity/warfare/radar/hr-radar-mask.png", + filename = "__reskins-bobs__/graphics/entity/warfare/radar/radar-mask.png", priority = "low", width = 196, height = 254, @@ -1030,20 +919,9 @@ oldradar.pictures = { layers = { shift = util.by_pixel(1, -16), tint = tiercolor("yellow"), scale = 0.5 - } }, { - filename = "__reskins-bobs__/graphics/entity/warfare/radar/radar-highlights.png", - priority = "low", - width = 98, - height = 128, - apply_projection = false, - direction_count = 64, - line_length = 8, - shift = util.by_pixel(1, -16), - blend_mode = "additive", - hr_version = { - filename = "__reskins-bobs__/graphics/entity/warfare/radar/hr-radar-highlights.png", + filename = "__reskins-bobs__/graphics/entity/warfare/radar/radar-highlights.png", priority = "low", width = 196, height = 254, @@ -1053,7 +931,6 @@ oldradar.pictures = { layers = { shift = util.by_pixel(1, -16), blend_mode = "additive", scale = 0.5 - } }, data.raw.radar["nullius-sensor-node-3"].pictures.layers[2] }} @@ -1061,8 +938,6 @@ data:extend({ oldradar }) data.raw.radar["nullius-sensor-node-2"].pictures = util.table.deepcopy(oldradar.pictures) data.raw.radar["nullius-sensor-node-2"].pictures.layers[2].tint = tiercolor("red") -data.raw.radar["nullius-sensor-node-2"].pictures.layers[2].hr_version.tint = tiercolor("red") data.raw.radar["nullius-sensor-node-3"].pictures = util.table.deepcopy(oldradar.pictures) data.raw.radar["nullius-sensor-node-3"].pictures.layers[2].tint = tiercolor("blue") -data.raw.radar["nullius-sensor-node-3"].pictures.layers[2].hr_version.tint = tiercolor("blue") end diff --git a/nullius/prototypes/entity/miner.lua b/nullius/prototypes/entity/miner.lua index 1db1a2d..2466c82 100644 --- a/nullius/prototypes/entity/miner.lua +++ b/nullius/prototypes/entity/miner.lua @@ -43,6 +43,194 @@ local drill_animation_shadow_sequence = { 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 1, 1 } +function electric_mining_drill_smoke() + return + { + priority = "high", + filename = "__base__/graphics/entity/electric-mining-drill/electric-mining-drill-smoke.png", + line_length = 6, + width = 48, + height = 72, + frame_count = 30, + animation_speed = 0.4, + shift = util.by_pixel(0, 3*0.6666), + scale = 0.5*0.6666 + } +end + +function electric_mining_drill_smoke_front() + return + { + priority = "high", + filename = "__base__/graphics/entity/electric-mining-drill/electric-mining-drill-smoke-front.png", + line_length = 6, + width = 148, + height = 132, + frame_count = 30, + animation_speed = 0.4, + shift = util.by_pixel(-3*0.6666, 9*0.6666), + scale = 0.5*0.6666 + } +end + +function electric_mining_drill_animation(tint) + return + { + priority = "high", + filename = "__base__/graphics/entity/electric-mining-drill/electric-mining-drill.png", + line_length = 6, + width = 162, + height = 156, + frame_count = 30, + animation_speed = 0.4, + frame_sequence = drill_animation_sequence, + shift = util.by_pixel(1*0.6666, -11*0.6666), + scale = 0.5*0.6666, + tint = tint + } +end + +function electric_mining_drill_shadow_animation() + return + { + priority = "high", + filename = "__base__/graphics/entity/electric-mining-drill/electric-mining-drill-shadow.png", + line_length = 7, + width = 218, + height = 56, + frame_count = 21, + animation_speed = 0.4, + frame_sequence = drill_animation_shadow_sequence, + draw_as_shadow = true, + shift = util.by_pixel(21*0.6666, 5*0.6666), + scale = 0.5*0.6666, + } +end + +function electric_mining_drill_horizontal_animation(tint) + return + { + priority = "high", + filename = "__base__/graphics/entity/electric-mining-drill/electric-mining-drill-horizontal.png", + line_length = 6, + width = 80, + height = 160, + frame_count = 30, + animation_speed = 0.4, + frame_sequence = drill_animation_sequence, + shift = util.by_pixel(2*0.6666, -12*0.6666), + scale = 0.5*0.6666, + tint = tint + } +end + +function electric_mining_drill_horizontal_front_animation(tint) + return + { + priority = "high", + filename = "__base__/graphics/entity/electric-mining-drill/electric-mining-drill-horizontal-front.png", + line_length = 6, + width = 66, + height = 154, + frame_count = 30, + animation_speed = 0.4, + frame_sequence = drill_animation_sequence, + shift = util.by_pixel(-3*0.6666, 3*0.6666), + scale = 0.5*0.6666, + tint = tint + } +end + +function electric_mining_drill_horizontal_shadow_animation() + return + { + priority = "high", + filename = "__base__/graphics/entity/electric-mining-drill/electric-mining-drill-horizontal-shadow.png", + line_length = 7, + width = 180, + height = 164, + frame_count = 21, + animation_speed = 0.4, + frame_sequence = drill_animation_shadow_sequence, + draw_as_shadow = true, + shift = util.by_pixel(33, 1), + scale = 0.5 + } +end + +function electric_mining_drill_status_leds_working_visualisation(tint) + local led_blend_mode = nil -- "additive" + local led_tint = tint or {1, 1, 1} + return + { + apply_tint = "status", + always_draw = true, + north_animation = + { + filename = "__base__/graphics/entity/electric-mining-drill/electric-mining-drill-N-light.png", + width = 32, + height = 32, + blend_mode = led_blend_mode, + tint = led_tint, + draw_as_glow = true, + shift = util.by_pixel(26*0.6666, -48*0.6666), + scale = 0.5*0.6666 + }, + east_animation = + { + filename = "__base__/graphics/entity/electric-mining-drill/electric-mining-drill-E-light.png", + width = 32, + height = 34, + blend_mode = led_blend_mode, + tint = led_tint, + draw_as_glow = true, + shift = util.by_pixel(38*0.6666, -32*0.6666), + scale = 0.5*0.6666 + }, + south_animation = + { + filename = "__base__/graphics/entity/electric-mining-drill/electric-mining-drill-S-light.png", + width = 38, + height = 46, + blend_mode = led_blend_mode, + tint = led_tint, + draw_as_glow = true, + shift = util.by_pixel(26*0.6666, 26*0.6666), + scale = 0.5*0.6666 + }, + west_animation = + { + filename = "__base__/graphics/entity/electric-mining-drill/electric-mining-drill-W-light.png", + width = 32, + height = 34, + blend_mode = led_blend_mode, + tint = led_tint, + draw_as_glow = true, + shift = util.by_pixel(-39*0.6666, -32*0.6666), + scale = 0.5*0.6666 + } + } +end + +function electric_mining_drill_add_light_offsets(t) + t.north_position = {0.8*0.6666, -1.5*0.6666} + t.east_position = {1.2*0.6666, -1*0.6666} + t.south_position = {0.8*0.6666, 0.8*0.6666} + t.west_position = {-1.2*0.6666, -1*0.6666} + return t +end + +local function scale_animation_waypoints(waypoints, scale) + local scaled_waypoints = {} + for dir, dirPoints in pairs(waypoints) do + scaled_waypoints[dir] = {} + for _, points in pairs(dirPoints) do + table.insert(scaled_waypoints[dir], {points[1] * scale, points[2] * scale}) + end + end + return scaled_waypoints +end + data:extend({ { type = "mining-drill", @@ -57,15 +245,15 @@ data:extend({ collision_box = {{ -0.75, -0.75}, {0.75, 0.75}}, selection_box = {{ -1, -1}, {1, 1}}, mining_speed = 0.3, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", energy_source = { type = "electric", - emissions_per_minute = 3, + emissions_per_minute = {pollution = 3}, usage_priority = "secondary-input" }, energy_usage = "75kW", working_sound = data.raw["mining-drill"]["burner-mining-drill"].working_sound, - animations = data.raw["mining-drill"]["burner-mining-drill"].animations, + graphics_set = data.raw["mining-drill"]["burner-mining-drill"].graphics_set, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "physical", decrease = 20, percent = 50 } @@ -76,9 +264,8 @@ data:extend({ vector_to_place_result = {-0.5, -1.3}, fast_replaceable_group = "small-miner", next_upgrade = "nullius-small-miner-2", - - circuit_wire_connection_points = circuit_connector_definitions["electric-mining-drill"].points, - circuit_connector_sprites = circuit_connector_definitions["electric-mining-drill"].sprites, + + circuit_connector = circuit_connector_definitions["burner-mining-drill"], circuit_wire_max_distance = default_circuit_wire_max_distance }, @@ -95,10 +282,10 @@ data:extend({ collision_box = {{ -1.25, -1.25}, {1.25, 1.25}}, selection_box = {{ -1.5, -1.5}, {1.5, 1.5}}, mining_speed = 0.6, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", energy_source = { type = "electric", - emissions_per_minute = 6, + emissions_per_minute = {pollution = 6}, usage_priority = "secondary-input" }, energy_usage = "150kW", @@ -115,131 +302,132 @@ data:extend({ working_sound = { sound = { - filename = "__base__/sound/burner-mining-drill.ogg", + filename = "__base__/sound/burner-mining-drill-1.ogg", volume = 1.2 } }, - animations = { - north = { - layers = { - { - priority = "high", - width = 173, - height = 188, - line_length = 4, - shift = util.by_pixel(2.75*1.5, 0.75), - filename = BASEENTITY .. "burner-mining-drill/hr-burner-mining-drill-N.png", - frame_count = 32, - animation_speed = 0.5, - run_mode = "forward-then-backward", - scale = 0.75 - }, - { - priority = "high", - width = 217, - height = 150, - line_length = 4, - shift = util.by_pixel(23.75*1.5, -1.5), - filename = BASEENTITY .. "burner-mining-drill/hr-burner-mining-drill-N-shadow.png", - frame_count = 32, - animation_speed = 0.5, - run_mode = "forward-then-backward", - draw_as_shadow = true, - scale = 0.75 + graphics_set = { + animation = { + north = { + layers = { + { + priority = "high", + width = 173, + height = 188, + line_length = 4, + shift = util.by_pixel(2.75*1.5, 0.75), + filename = BASEENTITY .. "burner-mining-drill/burner-mining-drill-N.png", + frame_count = 32, + animation_speed = 0.5, + run_mode = "forward-then-backward", + scale = 0.75 + }, + { + priority = "high", + width = 217, + height = 150, + line_length = 4, + shift = util.by_pixel(23.75*1.5, -1.5), + filename = BASEENTITY .. "burner-mining-drill/burner-mining-drill-N-shadow.png", + frame_count = 32, + animation_speed = 0.5, + run_mode = "forward-then-backward", + draw_as_shadow = true, + scale = 0.75 + } } - } - }, - east = { - layers = { - { - priority = "high", - width = 185, - height = 168, - line_length = 4, - shift = util.by_pixel(2.75*1.5, 1.5), - filename = BASEENTITY .. "burner-mining-drill/hr-burner-mining-drill-E.png", - frame_count = 32, - animation_speed = 0.5, - run_mode = "forward-then-backward", - scale = 0.75 - }, - { - priority = "high", - width = 185, - height = 128, - line_length = 4, - shift = util.by_pixel(13.75*1.5, 0.75), - filename = BASEENTITY .. "burner-mining-drill/hr-burner-mining-drill-E-shadow.png", - frame_count = 32, - animation_speed = 0.5, - run_mode = "forward-then-backward", - draw_as_shadow = true, - scale = 0.75 + }, + east = { + layers = { + { + priority = "high", + width = 185, + height = 168, + line_length = 4, + shift = util.by_pixel(2.75*1.5, 1.5), + filename = BASEENTITY .. "burner-mining-drill/burner-mining-drill-E.png", + frame_count = 32, + animation_speed = 0.5, + run_mode = "forward-then-backward", + scale = 0.75 + }, + { + priority = "high", + width = 185, + height = 128, + line_length = 4, + shift = util.by_pixel(13.75*1.5, 0.75), + filename = BASEENTITY .. "burner-mining-drill/burner-mining-drill-E-shadow.png", + frame_count = 32, + animation_speed = 0.5, + run_mode = "forward-then-backward", + draw_as_shadow = true, + scale = 0.75 + } } - } - }, - south = { - layers = { - { - priority = "high", - width = 174, - height = 174, - line_length = 4, - shift = util.by_pixel(0.75, -0.75), - filename = BASEENTITY .. "burner-mining-drill/hr-burner-mining-drill-S.png", - frame_count = 32, - animation_speed = 0.5, - run_mode = "forward-then-backward", - scale = 0.75 - }, - { - priority = "high", - width = 174, - height = 137, - line_length = 4, - shift = util.by_pixel(16.5, 2.75*1.5), - filename = BASEENTITY .. "burner-mining-drill/hr-burner-mining-drill-S-shadow.png", - frame_count = 32, - animation_speed = 0.5, - run_mode = "forward-then-backward", - draw_as_shadow = true, - scale = 0.75 + }, + south = { + layers = { + { + priority = "high", + width = 174, + height = 174, + line_length = 4, + shift = util.by_pixel(0.75, -0.75), + filename = BASEENTITY .. "burner-mining-drill/burner-mining-drill-S.png", + frame_count = 32, + animation_speed = 0.5, + run_mode = "forward-then-backward", + scale = 0.75 + }, + { + priority = "high", + width = 174, + height = 137, + line_length = 4, + shift = util.by_pixel(16.5, 2.75*1.5), + filename = BASEENTITY .. "burner-mining-drill/burner-mining-drill-S-shadow.png", + frame_count = 32, + animation_speed = 0.5, + run_mode = "forward-then-backward", + draw_as_shadow = true, + scale = 0.75 + } } - } - }, - west = { - layers = { - { - priority = "high", - width = 180, - height = 176, - line_length = 4, - shift = util.by_pixel(-2.25, 0), - filename = BASEENTITY .. "burner-mining-drill/hr-burner-mining-drill-W.png", - frame_count = 32, - animation_speed = 0.5, - run_mode = "forward-then-backward", - scale = 0.75 - }, - { - priority = "high", - width = 176, - height = 130, - line_length = 4, - shift = util.by_pixel(7.5*1.5, 1.5), - filename = BASEENTITY .. "burner-mining-drill/hr-burner-mining-drill-W-shadow.png", - frame_count = 32, - animation_speed = 0.5, - run_mode = "forward-then-backward", - draw_as_shadow = true, - scale = 0.75 + }, + west = { + layers = { + { + priority = "high", + width = 180, + height = 176, + line_length = 4, + shift = util.by_pixel(-2.25, 0), + filename = BASEENTITY .. "burner-mining-drill/burner-mining-drill-W.png", + frame_count = 32, + animation_speed = 0.5, + run_mode = "forward-then-backward", + scale = 0.75 + }, + { + priority = "high", + width = 176, + height = 130, + line_length = 4, + shift = util.by_pixel(7.5*1.5, 1.5), + filename = BASEENTITY .. "burner-mining-drill/burner-mining-drill-W-shadow.png", + frame_count = 32, + animation_speed = 0.5, + run_mode = "forward-then-backward", + draw_as_shadow = true, + scale = 0.75 + } } } } }, - circuit_wire_connection_points = circuit_connector_definitions["electric-mining-drill"].points, - circuit_connector_sprites = circuit_connector_definitions["electric-mining-drill"].sprites, + circuit_connector = scale_connector_points(circuit_connector_definitions["burner-mining-drill"],1.5), circuit_wire_max_distance = default_circuit_wire_max_distance }, @@ -262,7 +450,7 @@ data:extend({ mining_speed = 0.6, energy_source = { type = "electric", - emissions_per_minute = 6, + emissions_per_minute = {pollution = 6}, usage_priority = "secondary-input" }, energy_usage = "180kW", @@ -272,7 +460,7 @@ data:extend({ damaged_trigger_effect = data.raw["mining-drill"]["electric-mining-drill"].damaged_trigger_effect, working_sound = data.raw["mining-drill"]["electric-mining-drill"].working_sound, - vehicle_impact_sound = data.raw["mining-drill"]["electric-mining-drill"].vehicle_impact_sound, + impact_category = data.raw["mining-drill"]["electric-mining-drill"].impact_category, open_sound = data.raw["mining-drill"]["electric-mining-drill"].open_sound, close_sound = data.raw["mining-drill"]["electric-mining-drill"].close_sound, radius_visualisation_picture = { @@ -280,17 +468,14 @@ data:extend({ width = 10, height = 10 }, - module_specification = { module_slots = 1 }, + module_slots = 1, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - circuit_wire_connection_points = circuit_connector_definitions["electric-mining-drill"].points, - circuit_connector_sprites = circuit_connector_definitions["electric-mining-drill"].sprites, + circuit_connector = scale_connector_points(circuit_connector_definitions["electric-mining-drill"],0.6666), circuit_wire_max_distance = default_circuit_wire_max_distance, graphics_set = { drilling_vertical_movement_duration = 10 / 0.4, animation_progress = 1, - min_animation_progress = 0, - max_animation_progress = 30, status_colors = data.raw["mining-drill"]["electric-mining-drill"].graphics_set.status_colors, circuit_connector_layer = "object", @@ -303,40 +488,40 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-N.png", line_length = 1, - width = 96, - height = 104, + width = 190, + height = 208, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(0, -4*0.6666), repeat_count = 5, - scale = 0.6666, + scale = 0.6666*0.5, tint = {0.6, 0.7, 0.8} }, { priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-N-output.png", line_length = 5, - width = 32, - height = 34, + width = 60, + height = 66, frame_count = 5, animation_speed = 0.4, - direction_count = 1, - shift = util.by_pixel(-4*0.6666, -44*0.6666), - scale = 0.6666 + + shift = util.by_pixel(-3*0.6666, -44*0.6666), + scale = 0.6666*0.5 }, { priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-N-shadow.png", line_length = 1, - width = 106, - height = 104, + width = 212, + height = 204, frame_count = 1, animation_speed = 0.4, draw_as_shadow = true, - shift = util.by_pixel(6*0.6666, -4*0.6666), + shift = util.by_pixel(6*0.6666, -3*0.6666), repeat_count = 5, - scale = 0.6666 + scale = 0.6666*0.5 } } }, @@ -346,40 +531,40 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E.png", line_length = 1, - width = 94, - height = 94, + width = 192, + height = 188, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(0, -4*0.6666), repeat_count = 5, - scale = 0.6666, + scale = 0.6666*0.5, tint = {0.6, 0.7, 0.8} }, { priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E-output.png", line_length = 5, - width = 26, - height = 38, + width = 50, + height = 74, frame_count = 5, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(30*0.6666, -8*0.6666), - scale = 0.6666 + scale = 0.6666*0.5 }, { priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E-shadow.png", line_length = 1, - width = 112, - height = 92, + width = 222, + height = 182, frame_count = 1, animation_speed = 0.4, draw_as_shadow = true, shift = util.by_pixel(10*0.6666, 2*0.6666), repeat_count = 5, - scale = 0.6666 + scale = 0.6666*0.5 } } }, @@ -389,28 +574,28 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S.png", line_length = 1, - width = 92, - height = 98, + width = 184, + height = 192, frame_count = 1, animation_speed = 0.4, - direction_count = 1, - shift = util.by_pixel(0, -2*0.6666), + + shift = util.by_pixel(0, -1*0.6666), repeat_count = 5, - scale = 0.6666, + scale = 0.6666*0.5, tint = {0.6, 0.7, 0.8} }, { priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S-shadow.png", line_length = 1, - width = 106, - height = 102, + width = 212, + height = 204, frame_count = 1, animation_speed = 0.4, draw_as_shadow = true, shift = util.by_pixel(6*0.6666, 2*0.6666), repeat_count = 5, - scale = 0.6666 + scale = 0.6666*0.5 } } }, @@ -420,46 +605,46 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W.png", line_length = 1, - width = 96, - height = 94, + width = 192, + height = 188, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(0, -4*0.6666), repeat_count = 5, - scale = 0.6666, + scale = 0.6666*0.5, tint = {0.6, 0.7, 0.8} }, { priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W-output.png", line_length = 5, - width = 24, - height = 28, + width = 50, + height = 60, frame_count = 5, animation_speed = 0.4, - direction_count = 1, - shift = util.by_pixel(-30*0.6666, -12*0.6666), - scale = 0.6666 + + shift = util.by_pixel(-31*0.6666, -13*0.6666), + scale = 0.6666*0.5 }, { priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W-shadow.png", line_length = 1, - width = 102, - height = 92, + width = 200, + height = 182, frame_count = 1, animation_speed = 0.4, draw_as_shadow = true, - shift = util.by_pixel(-6*0.6666, 2*0.6666), + shift = util.by_pixel(-5*0.6666, 2*0.6666), repeat_count = 5, - scale = 0.6666 + scale = 0.6666*0.5 } } }, }, - shift_animation_waypoints = data.raw["mining-drill"]["electric-mining-drill"].graphics_set.shift_animation_waypoints, + shift_animation_waypoints = scale_animation_waypoints(data.raw["mining-drill"]["electric-mining-drill"].graphics_set.shift_animation_waypoints, 0.6666), shift_animation_waypoint_stop_duration = 195 / 0.4, shift_animation_transition_duration = 30 / 0.4, @@ -469,18 +654,8 @@ data:extend({ synced_fadeout = true, align_to_waypoint = true, apply_tint = "resource-color", - animation = { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-smoke.png", - line_length = 6, - width = 24, - height = 38, - frame_count = 30, - animation_speed = 0.4, - direction_count = 1, - shift = util.by_pixel(0, 2*0.6666), - scale = 0.6666 - }, + animation = electric_mining_drill_smoke(), + north_position = { 0, 0.25*0.6666 }, east_position = { 0, 0 }, south_position = { 0, 0.25*0.6666 }, @@ -497,13 +672,12 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-N-smoke.png", line_length = 5, - width = 24, - height = 30, + width = 42, + height = 58, frame_count = 10, animation_speed = 0.4, - direction_count = 1, - shift = util.by_pixel(-2*0.6666, -44*0.6666), - scale = 0.6666 + shift = util.by_pixel(-1*0.6666, -44*0.6666), + scale = 0.6666*0.5 } } }, @@ -516,128 +690,36 @@ data:extend({ { animated_shift = true, always_draw = true, - north_animation = { - layers = { - { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill.png", - line_length = 6, - width = 84, - height = 80, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(0, -12*0.6666), - scale = 0.6666, - tint = {0.6, 0.7, 0.8} - }, - { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-shadow.png", - line_length = 7, - width = 112, - height = 26, - frame_count = 21, - animation_speed = 0.4, - frame_sequence = drill_animation_shadow_sequence, - draw_as_shadow = true, - shift = util.by_pixel(20*0.6666, 6*0.6666), - scale = 0.6666 - } + north_animation = + { + layers = + { + electric_mining_drill_animation({0.6, 0.7, 0.8}), + electric_mining_drill_shadow_animation() } }, - east_animation = { - layers = { - { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal.png", - line_length = 6, - width = 40, - height = 80, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(2*0.6666, -12*0.6666), - scale = 0.6666, - tint = {0.6, 0.7, 0.8} - }, - { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal-shadow.png", - line_length = 7, - width = 92, - height = 80, - frame_count = 21, - animation_speed = 0.4, - frame_sequence = drill_animation_shadow_sequence, - draw_as_shadow = true, - shift = util.by_pixel(32*0.6666, 2*0.6666), - scale = 0.6666 - } + east_animation = + { + layers = + { + electric_mining_drill_horizontal_animation({0.6, 0.7, 0.8}), + electric_mining_drill_horizontal_shadow_animation() } }, - south_animation = { - layers = { - { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill.png", - line_length = 6, - width = 84, - height = 80, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(0, -12*0.6666), - scale = 0.6666, - tint = {0.6, 0.7, 0.8} - }, - { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-shadow.png", - line_length = 7, - width = 112, - height = 26, - frame_count = 21, - animation_speed = 0.4, - frame_sequence = drill_animation_shadow_sequence, - draw_as_shadow = true, - shift = util.by_pixel(20*0.6666, 6*0.6666), - scale = 0.6666 - } + south_animation = + { + layers = + { + electric_mining_drill_animation({0.6, 0.7, 0.8}), + electric_mining_drill_shadow_animation() } }, - west_animation = { - layers = { - { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal.png", - line_length = 6, - width = 40, - height = 80, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(2*0.6666, -12*0.6666), - scale = 0.6666, - tint = {0.6, 0.7, 0.8} - }, - { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal-shadow.png", - line_length = 7, - width = 92, - height = 80, - frame_count = 21, - animation_speed = 0.4, - frame_sequence = drill_animation_shadow_sequence, - draw_as_shadow = true, - shift = util.by_pixel(32*0.6666, 2*0.6666), - scale = 0.6666 - } + west_animation = + { + layers = + { + electric_mining_drill_horizontal_animation({0.6, 0.7, 0.8}), + electric_mining_drill_horizontal_shadow_animation() } }, }, @@ -648,18 +730,8 @@ data:extend({ synced_fadeout = true, align_to_waypoint = true, apply_tint = "resource-color", - animation = { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-smoke-front.png", - line_length = 6, - width = 76, - height = 68, - frame_count = 30, - animation_speed = 0.4, - direction_count = 1, - shift = util.by_pixel(-4*0.6666, 8*0.6666), - scale = 0.6666 - }, + animation = electric_mining_drill_smoke_front(), + north_position = { 0, 0.25*0.6666 }, east_position = { 0, 0 }, south_position = { 0, 0.25*0.6666 }, @@ -678,13 +750,12 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E-smoke.png", line_length = 5, - width = 24, - height = 28, + width = 46, + height = 56, frame_count = 10, animation_speed = 0.4, - direction_count = 1, shift = util.by_pixel(24*0.6666, -12*0.6666), - scale = 0.6666 + scale = 0.6666*0.5 } } }, @@ -694,13 +765,12 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S-smoke.png", line_length = 5, - width = 24, - height = 18, + width = 48, + height = 36, frame_count = 10, animation_speed = 0.4, - direction_count = 1, shift = util.by_pixel(-2*0.6666, 20*0.6666), - scale = 0.6666 + scale = 0.6666*0.5 } } }, @@ -710,13 +780,12 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W-smoke.png", line_length = 5, - width = 26, - height = 30, + width = 46, + height = 54, frame_count = 10, animation_speed = 0.4, - direction_count = 1, - shift = util.by_pixel(-26*0.6666, -12*0.6666), - scale = 0.6666 + shift = util.by_pixel(-25*0.6666, -11*0.6666), + scale = 0.6666*0.5 } } } @@ -726,34 +795,8 @@ data:extend({ { animated_shift = true, always_draw = true, - east_animation = { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal-front.png", - line_length = 6, - width = 32, - height = 76, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(-2*0.6666, 4*0.6666), - scale = 0.6666, - tint = {0.6, 0.7, 0.8} - }, - west_animation = { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal-front.png", - line_length = 6, - width = 32, - height = 76, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(-2*0.6666, 4*0.6666), - scale = 0.6666, - tint = {0.6, 0.7, 0.8} - } + east_animation = electric_mining_drill_horizontal_front_animation({0.6, 0.7, 0.8}), + west_animation = electric_mining_drill_horizontal_front_animation({0.6, 0.7, 0.8}), }, -- front frame @@ -764,13 +807,13 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E-front.png", line_length = 1, - width = 66, - height = 74, + width = 136, + height = 148, frame_count = 1, animation_speed = 0.4, - direction_count = 1, - shift = util.by_pixel(22*0.6666, 10*0.6666), - scale = 0.6666, + + shift = util.by_pixel(21*0.6666, 10*0.6666), + scale = 0.5*0.6666, tint = {0.6, 0.7, 0.8} }, south_animation = { @@ -779,24 +822,24 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S-output.png", line_length = 5, - width = 44, - height = 28, + width = 84, + height = 56, frame_count = 5, animation_speed = 0.4, - shift = util.by_pixel(-2*0.6666, 34*0.6666), - scale = 0.6666 + shift = util.by_pixel(-1*0.6666, 34*0.6666), + scale = 0.6666*0.5 }, { priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S-front.png", line_length = 1, - width = 96, - height = 54, + width = 190, + height = 104, frame_count = 1, animation_speed = 0.4, repeat_count = 5, - shift = util.by_pixel(0, 26*0.6666), - scale = 0.6666, + shift = util.by_pixel(0, 27*0.6666), + scale = 0.6666*0.5, tint = {0.6, 0.7, 0.8} } } @@ -805,78 +848,38 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W-front.png", line_length = 1, - width = 68, - height = 70, + width = 134, + height = 140, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(-22*0.6666, 12*0.6666), - scale = 0.6666, + scale = 0.6666*0.5, tint = {0.6, 0.7, 0.8} } }, -- LEDs - { - apply_tint = "status", - always_draw = true, - draw_as_sprite = true, - draw_as_light = true, - north_animation = { - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-N-light.png", - width = 16, - height = 16, - blend_mode = nil, - tint = {1,1,1,0.5}, - shift = util.by_pixel(26*0.6666, -48*0.6666), - scale = 0.6666 - }, - east_animation = { - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E-light.png", - width = 16, - height = 18, - blend_mode = nil, - tint = {1,1,1,0.5}, - shift = util.by_pixel(38*0.6666, -32*0.6666), - scale = 0.6666 - }, - south_animation = { - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S-light.png", - width = 20, - height = 24, - blend_mode = nil, - tint = {1,1,1,0.5}, - shift = util.by_pixel(26*0.6666, 26*0.6666), - scale = 0.6666 - }, - west_animation = { - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W-light.png", - width = 18, - height = 18, - blend_mode = nil, - tint = {1,1,1,0.5}, - shift = util.by_pixel(-40*0.6666, -32*0.6666), - scale = 0.6666 - } - }, - - -- light - { - light = {intensity = 1, size = 3, color={r=1, g=1, b=1}, minimum_darkness = 0.1}, - north_position = {0.8*0.6666, -1.5*0.6666}, - east_position = {1.2*0.6666, -1*0.6666}, - south_position = {0.8*0.6666, 0.8*0.6666}, - west_position = {-1.2*0.6666, -1*0.6666} - }, - { - always_draw = true, - apply_tint = "status", - light = { intensity = 0.8, size = 1.5, color={r=1, g=1, b=1}, minimum_darkness = 0.1 }, - north_position = {0.8*0.6666, -1.5*0.6666}, - east_position = {1.2*0.6666, -1*0.6666}, - south_position = {0.8*0.6666, 0.8*0.6666}, - west_position = {-1.2*0.6666, -1*0.6666} - } + electric_mining_drill_status_leds_working_visualisation({1,1,1,0.5}), + + -- -- light + -- electric_mining_drill_add_light_offsets( + -- { + -- always_draw = true, + -- apply_tint = "status", + -- light = {intensity = 0.2, size = 2, color={1, 1, 1}, minimum_darkness = 0.1} + -- }) + --TODO: Below are the original lights in nullius code, above is a new one from the base game code in 2.0, if those two below don't work well, use the one above + electric_mining_drill_add_light_offsets( + { + light = {intensity = 1, size = 3, color={r=1, g=1, b=1}, minimum_darkness = 0.1}, + }), + electric_mining_drill_add_light_offsets( + { + always_draw = true, + apply_tint = "status", + light = { intensity = 0.8, size = 1.5, color={r=1, g=1, b=1}, minimum_darkness = 0.1 }, + }) } } } @@ -902,31 +905,30 @@ data:extend({ mining_speed = 1.2, energy_source = { type = "electric", - emissions_per_minute = 12, + emissions_per_minute = {pollution = 12}, usage_priority = "secondary-input" }, energy_usage = "400kW", monitor_visualization_tint = {r=78, g=173, b=255}, fast_replaceable_group = "small-miner", - base_productivity = 0.05, + effect_receiver = { + base_effect = {productivity = 0.05} + }, damaged_trigger_effect = data.raw["mining-drill"]["electric-mining-drill"].damaged_trigger_effect, working_sound = data.raw["mining-drill"]["electric-mining-drill"].working_sound, - vehicle_impact_sound = data.raw["mining-drill"]["electric-mining-drill"].vehicle_impact_sound, + impact_category = data.raw["mining-drill"]["electric-mining-drill"].impact_category, open_sound = data.raw["mining-drill"]["electric-mining-drill"].open_sound, close_sound = data.raw["mining-drill"]["electric-mining-drill"].close_sound, radius_visualisation_picture = data.raw["mining-drill"]["nullius-small-miner-2"].radius_visualisation_picture, - module_specification = { module_slots = 2 }, + module_slots = 2, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - circuit_wire_connection_points = circuit_connector_definitions["electric-mining-drill"].points, - circuit_connector_sprites = circuit_connector_definitions["electric-mining-drill"].sprites, + circuit_connector = scale_connector_points(circuit_connector_definitions["electric-mining-drill"],0.6666), circuit_wire_max_distance = default_circuit_wire_max_distance, graphics_set = { drilling_vertical_movement_duration = 10 / 0.4, animation_progress = 1, - min_animation_progress = 0, - max_animation_progress = 30, status_colors = data.raw["mining-drill"]["electric-mining-drill"].graphics_set.status_colors, circuit_connector_layer = "object", @@ -939,14 +941,13 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-N.png", line_length = 1, - width = 96, - height = 104, + width = 190, + height = 208, frame_count = 1, animation_speed = 0.4, - direction_count = 1, shift = util.by_pixel(0, -4*0.6666), repeat_count = 5, - scale = 0.6666 + scale = 0.6666*0.5 }, data.raw["mining-drill"]["nullius-small-miner-2"].graphics_set.animation.north.layers[2], data.raw["mining-drill"]["nullius-small-miner-2"].graphics_set.animation.north.layers[3] @@ -958,14 +959,13 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E.png", line_length = 1, - width = 94, - height = 94, + width = 192, + height = 188, frame_count = 1, animation_speed = 0.4, - direction_count = 1, shift = util.by_pixel(0, -4*0.6666), repeat_count = 5, - scale = 0.6666 + scale = 0.6666*0.5 }, data.raw["mining-drill"]["nullius-small-miner-2"].graphics_set.animation.east.layers[2], data.raw["mining-drill"]["nullius-small-miner-2"].graphics_set.animation.east.layers[3] @@ -977,16 +977,15 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S.png", line_length = 1, - width = 92, - height = 98, + width = 184, + height = 192, frame_count = 1, animation_speed = 0.4, - direction_count = 1, - shift = util.by_pixel(0, -2*0.6666), + shift = util.by_pixel(0, -1*0.6666), repeat_count = 5, - scale = 0.6666 + scale = 0.6666*0.5 }, - data.raw["mining-drill"]["nullius-small-miner-2"].graphics_set.animation.west.layers[2] + data.raw["mining-drill"]["nullius-small-miner-2"].graphics_set.animation.south.layers[2] } }, west = { @@ -995,14 +994,13 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W.png", line_length = 1, - width = 96, - height = 94, + width = 192, + height = 188, frame_count = 1, animation_speed = 0.4, - direction_count = 1, shift = util.by_pixel(0, -4*0.6666), repeat_count = 5, - scale = 0.6666 + scale = 0.6666*0.5 }, data.raw["mining-drill"]["nullius-small-miner-2"].graphics_set.animation.west.layers[2], data.raw["mining-drill"]["nullius-small-miner-2"].graphics_set.animation.west.layers[3] @@ -1010,7 +1008,7 @@ data:extend({ }, }, - shift_animation_waypoints = data.raw["mining-drill"]["electric-mining-drill"].graphics_set.shift_animation_waypoints, + shift_animation_waypoints = scale_animation_waypoints(data.raw["mining-drill"]["electric-mining-drill"].graphics_set.shift_animation_waypoints,0.6666), shift_animation_waypoint_stop_duration = 195 / 0.4, shift_animation_transition_duration = 30 / 0.4, @@ -1022,76 +1020,36 @@ data:extend({ { animated_shift = true, always_draw = true, - north_animation = { - layers = { - { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill.png", - line_length = 6, - width = 84, - height = 80, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(0, -12*0.6666), - scale = 0.6666 - }, - data.raw["mining-drill"]["nullius-small-miner-2"].graphics_set.working_visualisations[3].north_animation.layers[2] + north_animation = + { + layers = + { + electric_mining_drill_animation(), + electric_mining_drill_shadow_animation() } }, - east_animation = { - layers = { - { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal.png", - line_length = 6, - width = 40, - height = 80, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(2*0.6666, -12*0.6666), - scale = 0.6666 - }, - data.raw["mining-drill"]["nullius-small-miner-2"].graphics_set.working_visualisations[3].east_animation.layers[2] + east_animation = + { + layers = + { + electric_mining_drill_horizontal_animation(), + electric_mining_drill_horizontal_shadow_animation() } }, - south_animation = { - layers = { - { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill.png", - line_length = 6, - width = 84, - height = 80, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(0, -12*0.6666), - scale = 0.6666 - }, - data.raw["mining-drill"]["nullius-small-miner-2"].graphics_set.working_visualisations[3].south_animation.layers[2] + south_animation = + { + layers = + { + electric_mining_drill_animation(), + electric_mining_drill_shadow_animation() } }, - west_animation = { - layers = { - { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal.png", - line_length = 6, - width = 40, - height = 80, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(2*0.6666, -12*0.6666), - scale = 0.6666 - }, - data.raw["mining-drill"]["nullius-small-miner-2"].graphics_set.working_visualisations[3].west_animation.layers[2] + west_animation = + { + layers = + { + electric_mining_drill_horizontal_animation(), + electric_mining_drill_horizontal_shadow_animation() } }, }, @@ -1103,32 +1061,8 @@ data:extend({ { animated_shift = true, always_draw = true, - east_animation = { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal-front.png", - line_length = 6, - width = 32, - height = 76, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(-2*0.6666, 4*0.6666), - scale = 0.6666 - }, - west_animation = { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal-front.png", - line_length = 6, - width = 32, - height = 76, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(-2*0.6666, 4*0.6666), - scale = 0.6666 - } + east_animation = electric_mining_drill_horizontal_front_animation(), + west_animation = electric_mining_drill_horizontal_front_animation() }, -- front frame @@ -1139,13 +1073,12 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E-front.png", line_length = 1, - width = 66, - height = 74, + width = 136, + height = 148, frame_count = 1, animation_speed = 0.4, - direction_count = 1, - shift = util.by_pixel(22*0.6666, 10*0.6666), - scale = 0.6666 + shift = util.by_pixel(21*0.6666, 10*0.6666), + scale = 0.6666*0.5 }, south_animation = { layers = { @@ -1154,13 +1087,13 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S-front.png", line_length = 1, - width = 96, - height = 54, + width = 190, + height = 104, frame_count = 1, animation_speed = 0.4, repeat_count = 5, - shift = util.by_pixel(0, 26*0.6666), - scale = 0.6666 + shift = util.by_pixel(0, 27*0.6666), + scale = 0.6666*0.5 } } }, @@ -1168,13 +1101,12 @@ data:extend({ priority = "high", filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W-front.png", line_length = 1, - width = 68, - height = 70, + width = 134, + height = 140, frame_count = 1, animation_speed = 0.4, - direction_count = 1, shift = util.by_pixel(-22*0.6666, 12*0.6666), - scale = 0.6666 + scale = 0.6666*0.5 } }, @@ -1204,11 +1136,11 @@ data:extend({ mining_speed = 1, energy_source = { type = "electric", - emissions_per_minute = 10, + emissions_per_minute = {pollution = 10}, usage_priority = "secondary-input" }, energy_usage = "300kW", - module_specification = { module_slots = 1 }, + module_slots = 1, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, radius_visualisation_picture = data.raw["mining-drill"]["electric-mining-drill"].radius_visualisation_picture, @@ -1217,18 +1149,16 @@ data:extend({ next_upgrade = "nullius-medium-miner-3", damaged_trigger_effect = data.raw["mining-drill"]["electric-mining-drill"].damaged_trigger_effect, working_sound = data.raw["mining-drill"]["electric-mining-drill"].working_sound, - vehicle_impact_sound = data.raw["mining-drill"]["electric-mining-drill"].vehicle_impact_sound, + impact_category = data.raw["mining-drill"]["electric-mining-drill"].impact_category, open_sound = data.raw["mining-drill"]["electric-mining-drill"].open_sound, close_sound = data.raw["mining-drill"]["electric-mining-drill"].close_sound, - circuit_wire_connection_points = circuit_connector_definitions["electric-mining-drill"].points, - circuit_connector_sprites = circuit_connector_definitions["electric-mining-drill"].sprites, + circuit_connector = circuit_connector_definitions["electric-mining-drill"], circuit_wire_max_distance = default_circuit_wire_max_distance, graphics_set = { drilling_vertical_movement_duration = 10 / 0.4, animation_progress = 1, - min_animation_progress = 0, - max_animation_progress = 30, + status_colors = data.raw["mining-drill"]["electric-mining-drill"].graphics_set.status_colors, circuit_connector_layer = "object", circuit_connector_secondary_draw_order = { north = 14, east = 30, south = 30, west = 30 }, @@ -1237,31 +1167,18 @@ data:extend({ north = { layers = { { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-N.png", - line_length = 1, - width = 96, - height = 104, - frame_count = 1, - animation_speed = 0.4, - direction_count = 1, - shift = util.by_pixel(0, -4), - repeat_count = 5, - tint = {0.6, 0.7, 0.8}, - hr_version = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-N.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-N.png", line_length = 1, width = 190, height = 208, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(0, -4), repeat_count = 5, scale = 0.5, tint = {0.6, 0.7, 0.8} - } }, data.raw["mining-drill"]["electric-mining-drill"].graphics_set.animation.north.layers[2], data.raw["mining-drill"]["electric-mining-drill"].graphics_set.animation.north.layers[3] @@ -1270,64 +1187,38 @@ data:extend({ east = { layers = { { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E.png", - line_length = 1, - width = 96, - height = 94, - frame_count = 1, - animation_speed = 0.4, - direction_count = 1, - shift = util.by_pixel(0, -4), - repeat_count = 5, - tint = {0.6, 0.7, 0.8}, - hr_version = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-E.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E.png", line_length = 1, width = 192, height = 188, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(0, -4), repeat_count = 5, scale = 0.5, tint = {0.6, 0.7, 0.8} - } }, data.raw["mining-drill"]["electric-mining-drill"].graphics_set.animation.east.layers[2], data.raw["mining-drill"]["electric-mining-drill"].graphics_set.animation.east.layers[3] } }, south = { - layers = { - { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S.png", - line_length = 1, - width = 92, - height = 98, - frame_count = 1, - animation_speed = 0.4, - direction_count = 1, - shift = util.by_pixel(0, -2), - repeat_count = 5, - tint = {0.6, 0.7, 0.8}, - hr_version = { + layers = { + { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-S.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S.png", line_length = 1, width = 184, height = 192, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(0, -1), repeat_count = 5, scale = 0.5, tint = {0.6, 0.7, 0.8} - } }, data.raw["mining-drill"]["electric-mining-drill"].graphics_set.animation.south.layers[2] } @@ -1335,31 +1226,18 @@ data:extend({ west = { layers = { { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W.png", - line_length = 1, - width = 96, - height = 94, - frame_count = 1, - animation_speed = 0.4, - direction_count = 1, - shift = util.by_pixel(0, -4), - repeat_count = 5, - tint = {0.6, 0.7, 0.8}, - hr_version = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-W.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W.png", line_length = 1, width = 192, height = 188, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(0, -4), repeat_count = 5, scale = 0.5, tint = {0.6, 0.7, 0.8} - } }, data.raw["mining-drill"]["electric-mining-drill"].graphics_set.animation.west.layers[2], data.raw["mining-drill"]["electric-mining-drill"].graphics_set.animation.west.layers[3] @@ -1382,31 +1260,18 @@ data:extend({ north_animation = { layers = { { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill.png", - line_length = 6, - width = 84, - height = 80, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(0, -12), - tint = {0.6, 0.7, 0.8}, - hr_version = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill.png", line_length = 6, width = 162, height = 156, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(1, -11), scale = 0.5, tint = {0.6, 0.7, 0.8} - } }, data.raw["mining-drill"]["electric-mining-drill"].graphics_set.working_visualisations[3].north_animation.layers[2] } @@ -1414,31 +1279,18 @@ data:extend({ east_animation = { layers = { { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal.png", - line_length = 6, - width = 40, - height = 80, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(2, -12), - tint = {0.6, 0.7, 0.8}, - hr_version = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-horizontal.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal.png", line_length = 6, width = 80, height = 160, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(2, -12), scale = 0.5, tint = {0.6, 0.7, 0.8} - } }, data.raw["mining-drill"]["electric-mining-drill"].graphics_set.working_visualisations[3].east_animation.layers[2] } @@ -1446,31 +1298,18 @@ data:extend({ south_animation = { layers = { { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill.png", - line_length = 6, - width = 84, - height = 80, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(0, -12), - tint = {0.6, 0.7, 0.8}, - hr_version = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill.png", line_length = 6, width = 162, height = 156, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(1, -11), scale = 0.5, tint = {0.6, 0.7, 0.8} - } }, data.raw["mining-drill"]["electric-mining-drill"].graphics_set.working_visualisations[3].south_animation.layers[2] } @@ -1478,31 +1317,18 @@ data:extend({ west_animation = { layers = { { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal.png", - line_length = 6, - width = 40, - height = 80, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(2, -12), - tint = {0.6, 0.7, 0.8}, - hr_version = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-horizontal.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal.png", line_length = 6, width = 80, height = 160, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(2, -12), scale = 0.5, tint = {0.6, 0.7, 0.8} - } }, data.raw["mining-drill"]["electric-mining-drill"].graphics_set.working_visualisations[3].west_animation.layers[2] } @@ -1517,58 +1343,32 @@ data:extend({ animated_shift = true, always_draw = true, east_animation = { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal-front.png", - line_length = 6, - width = 32, - height = 76, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(-2, 4), - tint = {0.6, 0.7, 0.8}, - hr_version = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-horizontal-front.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal-front.png", line_length = 6, width = 66, height = 154, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(-3, 3), scale = 0.5, tint = {0.6, 0.7, 0.8} - } }, west_animation = { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal-front.png", - line_length = 6, - width = 32, - height = 76, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(-2, 4), - tint = {0.6, 0.7, 0.8}, - hr_version = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-horizontal-front.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal-front.png", line_length = 6, width = 66, height = 154, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(-3, 3), scale = 0.5, tint = {0.6, 0.7, 0.8} - } } }, @@ -1577,47 +1377,24 @@ data:extend({ always_draw = true, north_animation = nil, east_animation = { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E-front.png", - line_length = 1, - width = 66, - height = 74, - frame_count = 1, - animation_speed = 0.4, - direction_count = 1, - shift = util.by_pixel(22, 10), - tint = {0.6, 0.7, 0.8}, - hr_version = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-E-front.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E-front.png", line_length = 1, width = 136, height = 148, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(21, 10), scale = 0.5, tint = {0.6, 0.7, 0.8} - } }, south_animation = { layers = { data.raw["mining-drill"]["electric-mining-drill"].graphics_set.working_visualisations[7].south_animation.layers[1], { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S-front.png", - line_length = 1, - width = 96, - height = 54, - frame_count = 1, - animation_speed = 0.4, - repeat_count = 5, - shift = util.by_pixel(0, 26), - tint = {0.6, 0.7, 0.8}, - hr_version = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-S-front.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S-front.png", line_length = 1, width = 190, height = 104, @@ -1627,34 +1404,21 @@ data:extend({ shift = util.by_pixel(0, 27), scale = 0.5, tint = {0.6, 0.7, 0.8} - } }, } }, west_animation = { - priority = "high", - filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W-front.png", - line_length = 1, - width = 68, - height = 70, - frame_count = 1, - animation_speed = 0.4, - direction_count = 1, - shift = util.by_pixel(-22, 12), - tint = {0.6, 0.7, 0.8}, - hr_version = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-W-front.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W-front.png", line_length = 1, width = 134, height = 140, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(-22, 12), scale = 0.5, tint = {0.6, 0.7, 0.8} - } } }, @@ -1684,26 +1448,27 @@ data:extend({ mining_speed = 2, energy_source = { type = "electric", - emissions_per_minute = 20, + emissions_per_minute = {pollution = 20}, usage_priority = "secondary-input" }, energy_usage = "750kW", - module_specification = { module_slots = 2 }, + module_slots = 2, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - base_productivity = 0.05, + effect_receiver = { + base_effect = {productivity = 0.05} + }, radius_visualisation_picture = data.raw["mining-drill"]["electric-mining-drill"].radius_visualisation_picture, monitor_visualization_tint = {r=78, g=173, b=255}, fast_replaceable_group = "medium-miner", damaged_trigger_effect = data.raw["mining-drill"]["electric-mining-drill"].damaged_trigger_effect, working_sound = data.raw["mining-drill"]["electric-mining-drill"].working_sound, - vehicle_impact_sound = data.raw["mining-drill"]["electric-mining-drill"].vehicle_impact_sound, + impact_category = data.raw["mining-drill"]["electric-mining-drill"].impact_category, open_sound = data.raw["mining-drill"]["electric-mining-drill"].open_sound, close_sound = data.raw["mining-drill"]["electric-mining-drill"].close_sound, graphics_set = data.raw["mining-drill"]["electric-mining-drill"].graphics_set, - circuit_wire_connection_points = circuit_connector_definitions["electric-mining-drill"].points, - circuit_connector_sprites = circuit_connector_definitions["electric-mining-drill"].sprites, + circuit_connector = circuit_connector_definitions["electric-mining-drill"], circuit_wire_max_distance = default_circuit_wire_max_distance }, @@ -1726,7 +1491,7 @@ data:extend({ mining_speed = 1.5, energy_source = { type = "electric", - emissions_per_minute = 15, + emissions_per_minute = {pollution = 15}, usage_priority = "secondary-input" }, energy_usage = "450kW", @@ -1736,7 +1501,7 @@ data:extend({ damaged_trigger_effect = data.raw["mining-drill"]["electric-mining-drill"].damaged_trigger_effect, working_sound = data.raw["mining-drill"]["electric-mining-drill"].working_sound, - vehicle_impact_sound = data.raw["mining-drill"]["electric-mining-drill"].vehicle_impact_sound, + impact_category = data.raw["mining-drill"]["electric-mining-drill"].impact_category, open_sound = data.raw["mining-drill"]["electric-mining-drill"].open_sound, close_sound = data.raw["mining-drill"]["electric-mining-drill"].close_sound, radius_visualisation_picture = { @@ -1744,17 +1509,14 @@ data:extend({ width = 10, height = 10 }, - module_specification = { module_slots = 1 }, + module_slots = 1, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - circuit_wire_connection_points = circuit_connector_definitions["electric-mining-drill"].points, - circuit_connector_sprites = circuit_connector_definitions["electric-mining-drill"].sprites, + circuit_connector = scale_connector_points(circuit_connector_definitions["electric-mining-drill"],1.2), circuit_wire_max_distance = default_circuit_wire_max_distance, graphics_set = { drilling_vertical_movement_duration = 10 / 0.4, animation_progress = 1, - min_animation_progress = 0, - max_animation_progress = 30, status_colors = data.raw["mining-drill"]["electric-mining-drill"].graphics_set.status_colors, @@ -1766,13 +1528,12 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-N.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-N.png", line_length = 1, width = 190, height = 208, frame_count = 1, animation_speed = 0.4, - direction_count = 1, shift = util.by_pixel(0, -4*1.3333), repeat_count = 5, scale = 0.6666, @@ -1780,19 +1541,18 @@ data:extend({ }, { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-N-output.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-N-output.png", line_length = 5, width = 60, height = 66, frame_count = 5, animation_speed = 0.4, - direction_count = 1, shift = util.by_pixel(-3*1.3333, -44*1.3333), scale = 0.6666 }, { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-N-shadow.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-N-shadow.png", line_length = 1, width = 212, height = 204, @@ -1809,13 +1569,13 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-E.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E.png", line_length = 1, width = 192, height = 188, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(0, -4*1.3333), repeat_count = 5, scale = 0.6666, @@ -1823,19 +1583,19 @@ data:extend({ }, { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-E-output.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E-output.png", line_length = 5, width = 50, height = 74, frame_count = 5, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(30*1.3333, -8*1.3333), scale = 0.6666 }, { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-E-shadow.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E-shadow.png", line_length = 1, width = 222, height = 182, @@ -1852,13 +1612,13 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-S.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S.png", line_length = 1, width = 184, height = 192, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(0, -1*1.3333), repeat_count = 5, scale = 0.6666, @@ -1866,7 +1626,7 @@ data:extend({ }, { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-S-shadow.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S-shadow.png", line_length = 1, width = 212, height = 204, @@ -1883,13 +1643,13 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-W.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W.png", line_length = 1, width = 192, height = 188, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(0, -4*1.3333), repeat_count = 5, scale = 0.6666, @@ -1897,19 +1657,19 @@ data:extend({ }, { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-W-output.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W-output.png", line_length = 5, width = 50, height = 60, frame_count = 5, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(-31*1.3333, -13*1.3333), scale = 0.6666 }, { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-W-shadow.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W-shadow.png", line_length = 1, width = 200, height = 182, @@ -1937,13 +1697,13 @@ data:extend({ apply_tint = "resource-color", animation = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-smoke.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-smoke.png", line_length = 6, width = 48, height = 72, frame_count = 30, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(0, 3*1.3333), scale = 0.6666 }, @@ -1962,13 +1722,13 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-N-smoke.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-N-smoke.png", line_length = 5, width = 42, height = 58, frame_count = 10, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(-1*1.3333, -44*1.3333), scale = 0.6666 } @@ -1987,21 +1747,21 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill.png", line_length = 6, width = 162, height = 156, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(1*1.3333, -11*1.3333), scale = 0.6666, tint = {0.6, 0.7, 0.8} }, { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-shadow.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-shadow.png", line_length = 7, width = 218, height = 56, @@ -2018,21 +1778,21 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-horizontal.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal.png", line_length = 6, width = 80, height = 160, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(2*1.3333, -12*1.3333), scale = 0.6666, tint = {0.6, 0.7, 0.8} }, { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-horizontal-shadow.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal-shadow.png", line_length = 7, width = 180, height = 164, @@ -2049,21 +1809,21 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill.png", line_length = 6, width = 162, height = 156, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(1*1.3333, -11*1.3333), scale = 0.6666, tint = {0.6, 0.7, 0.8} }, { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-shadow.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-shadow.png", line_length = 7, width = 218, height = 56, @@ -2080,21 +1840,21 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-horizontal.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal.png", line_length = 6, width = 80, height = 160, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(2*1.3333, -12*1.3333), scale = 0.6666, tint = {0.6, 0.7, 0.8} }, { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-horizontal-shadow.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal-shadow.png", line_length = 7, width = 180, height = 164, @@ -2117,13 +1877,13 @@ data:extend({ apply_tint = "resource-color", animation = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-smoke-front.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-smoke-front.png", line_length = 6, width = 148, height = 132, frame_count = 30, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(-3*1.3333, 9*1.3333), scale = 0.6666 }, @@ -2143,13 +1903,13 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-E-smoke.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E-smoke.png", line_length = 5, width = 46, height = 56, frame_count = 10, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(24*1.3333, -12*1.3333), scale = 0.6666 } @@ -2159,13 +1919,13 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-S-smoke.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S-smoke.png", line_length = 5, width = 48, height = 36, frame_count = 10, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(-2*1.3333, 20*1.3333), scale = 0.6666 } @@ -2175,13 +1935,13 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-W-smoke.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W-smoke.png", line_length = 5, width = 46, height = 54, frame_count = 10, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(-25*1.3333, -11*1.3333), scale = 0.6666 } @@ -2195,28 +1955,28 @@ data:extend({ always_draw = true, east_animation = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-horizontal-front.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal-front.png", line_length = 6, width = 66, height = 154, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(-3*1.3333, 3*1.3333), scale = 0.6666, tint = {0.6, 0.7, 0.8} }, west_animation = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-horizontal-front.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal-front.png", line_length = 6, width = 66, height = 154, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(-3*1.3333, 3*1.3333), scale = 0.6666, tint = {0.6, 0.7, 0.8} @@ -2229,13 +1989,13 @@ data:extend({ north_animation = nil, east_animation = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-E-front.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E-front.png", line_length = 1, width = 136, height = 148, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(21*1.3333, 10*1.3333), scale = 0.6666, tint = {0.6, 0.7, 0.8} @@ -2244,7 +2004,7 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-S-output.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S-output.png", line_length = 5, width = 84, height = 56, @@ -2255,7 +2015,7 @@ data:extend({ }, { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-S-front.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S-front.png", line_length = 1, width = 190, height = 104, @@ -2270,13 +2030,13 @@ data:extend({ }, west_animation = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-W-front.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W-front.png", line_length = 1, width = 134, height = 140, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(-22*1.3333, 12*1.3333), scale = 0.6666, tint = {0.6, 0.7, 0.8} @@ -2287,10 +2047,10 @@ data:extend({ { apply_tint = "status", always_draw = true, - draw_as_sprite = true, + -- draw_as_sprite = true, -- draw_as_light = true, north_animation = { - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-N-light.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-N-light.png", width = 32, height = 32, blend_mode = nil, @@ -2299,7 +2059,7 @@ data:extend({ scale = 0.6666 }, east_animation = { - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-E-light.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E-light.png", width = 32, height = 34, blend_mode = nil, @@ -2308,7 +2068,7 @@ data:extend({ scale = 0.6666 }, south_animation = { - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-S-light.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S-light.png", width = 38, height = 46, blend_mode = nil, @@ -2317,7 +2077,7 @@ data:extend({ scale = 0.6666 }, west_animation = { - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-W-light.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W-light.png", width = 32, height = 34, blend_mode = nil, @@ -2369,31 +2129,30 @@ data:extend({ mining_speed = 3, energy_source = { type = "electric", - emissions_per_minute = 30, + emissions_per_minute = {pollution = 30}, usage_priority = "secondary-input" }, energy_usage = "1.2MW", monitor_visualization_tint = {r=78, g=173, b=255}, fast_replaceable_group = "large-miner", - base_productivity = 0.05, + effect_receiver = { + base_effect = {productivity = 0.05} + }, damaged_trigger_effect = data.raw["mining-drill"]["electric-mining-drill"].damaged_trigger_effect, working_sound = data.raw["mining-drill"]["electric-mining-drill"].working_sound, - vehicle_impact_sound = data.raw["mining-drill"]["electric-mining-drill"].vehicle_impact_sound, + impact_category = data.raw["mining-drill"]["electric-mining-drill"].impact_category, open_sound = data.raw["mining-drill"]["electric-mining-drill"].open_sound, close_sound = data.raw["mining-drill"]["electric-mining-drill"].close_sound, radius_visualisation_picture = data.raw["mining-drill"]["nullius-large-miner-1"].radius_visualisation_picture, - module_specification = { module_slots = 2 }, + module_slots = 2, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, - circuit_wire_connection_points = circuit_connector_definitions["electric-mining-drill"].points, - circuit_connector_sprites = circuit_connector_definitions["electric-mining-drill"].sprites, + circuit_connector = scale_connector_points(circuit_connector_definitions["electric-mining-drill"],1.2), circuit_wire_max_distance = default_circuit_wire_max_distance, graphics_set = { drilling_vertical_movement_duration = 10 / 0.4, animation_progress = 1, - min_animation_progress = 0, - max_animation_progress = 30, status_colors = data.raw["mining-drill"]["electric-mining-drill"].graphics_set.status_colors, circuit_connector_layer = "object", circuit_connector_secondary_draw_order = { north = 14, east = 30, south = 30, west = 30 }, @@ -2403,13 +2162,13 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-N.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-N.png", line_length = 1, width = 190, height = 208, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(0, -4*1.3333), repeat_count = 5, scale = 0.6666 @@ -2422,13 +2181,13 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-E.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E.png", line_length = 1, width = 192, height = 188, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(0, -4*1.3333), repeat_count = 5, scale = 0.6666 @@ -2441,13 +2200,13 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-S.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S.png", line_length = 1, width = 184, height = 192, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(0, -1*1.3333), repeat_count = 5, scale = 0.6666 @@ -2459,13 +2218,13 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-W.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W.png", line_length = 1, width = 192, height = 188, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(0, -4*1.3333), repeat_count = 5, scale = 0.6666 @@ -2492,14 +2251,14 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill.png", line_length = 6, width = 162, height = 156, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(1*1.3333, -11*1.3333), scale = 0.6666 }, @@ -2510,14 +2269,14 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-horizontal.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal.png", line_length = 6, width = 80, height = 160, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(2*1.3333, -12*1.3333), scale = 0.6666 }, @@ -2528,14 +2287,14 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill.png", line_length = 6, width = 162, height = 156, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(1*1.3333, -11*1.3333), scale = 0.6666 }, @@ -2546,14 +2305,14 @@ data:extend({ layers = { { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-horizontal.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal.png", line_length = 6, width = 80, height = 160, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(2*1.3333, -12*1.3333), scale = 0.6666 }, @@ -2571,27 +2330,27 @@ data:extend({ always_draw = true, east_animation = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-horizontal-front.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal-front.png", line_length = 6, width = 66, height = 154, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(-3*1.3333, 3*1.3333), scale = 0.6666 }, west_animation = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-horizontal-front.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-horizontal-front.png", line_length = 6, width = 66, height = 154, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(-3*1.3333, 3*1.3333), scale = 0.6666 } @@ -2603,13 +2362,13 @@ data:extend({ north_animation = nil, east_animation = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-E-front.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-E-front.png", line_length = 1, width = 136, height = 148, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(21*1.3333, 10*1.3333), scale = 0.6666 }, @@ -2618,7 +2377,7 @@ data:extend({ data.raw["mining-drill"]["nullius-large-miner-1"].graphics_set.working_visualisations[7].south_animation.layers[1], { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-S-front.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-S-front.png", line_length = 1, width = 190, height = 104, @@ -2632,13 +2391,13 @@ data:extend({ }, west_animation = { priority = "high", - filename = BASEENTITY .. "electric-mining-drill/hr-electric-mining-drill-W-front.png", + filename = BASEENTITY .. "electric-mining-drill/electric-mining-drill-W-front.png", line_length = 1, width = 134, height = 140, frame_count = 1, animation_speed = 0.4, - direction_count = 1, + shift = util.by_pixel(-22*1.3333, 12*1.3333), scale = 0.6666 } @@ -2654,8 +2413,8 @@ data:extend({ if mods["reskins-bobs"] then -local small_miner = util.table.deepcopy(data.raw["mining-drill"]["nullius-small-miner-3"].graphics_set) -small_miner.working_visualisations[3].north_animation.layers = { + local small_miner = util.table.deepcopy(data.raw["mining-drill"]["nullius-small-miner-3"].graphics_set) + small_miner.working_visualisations[3].north_animation.layers = { small_miner.working_visualisations[3].north_animation.layers[1], { priority = "high", @@ -2666,7 +2425,7 @@ small_miner.working_visualisations[3].north_animation.layers = { frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(0, -12*0.6666), tint = {240, 160, 0}, scale = 0.6666 @@ -2680,14 +2439,14 @@ small_miner.working_visualisations[3].north_animation.layers = { frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(0, -12*0.6666), blend_mode = "additive", scale = 0.6666 }, small_miner.working_visualisations[3].north_animation.layers[2] -} -small_miner.working_visualisations[3].east_animation.layers = { + } + small_miner.working_visualisations[3].east_animation.layers = { small_miner.working_visualisations[3].east_animation.layers[1], { priority = "high", @@ -2698,7 +2457,7 @@ small_miner.working_visualisations[3].east_animation.layers = { frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(2*0.6666, -12*0.6666), tint = {240, 160, 0}, scale = 0.6666 @@ -2712,7 +2471,7 @@ small_miner.working_visualisations[3].east_animation.layers = { frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(2*0.6666, -12*0.6666), blend_mode = "additive", scale = 0.6666 @@ -2730,7 +2489,7 @@ small_miner.working_visualisations[6].east_animation = { layers = { frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(-2*0.6666, 4*0.6666), tint = {240, 160, 0}, scale = 0.6666 @@ -2744,7 +2503,7 @@ small_miner.working_visualisations[6].east_animation = { layers = { frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(-2*0.6666, 4*0.6666), blend_mode = "additive", scale = 0.6666 @@ -2782,174 +2541,96 @@ local medium_miner = util.table.deepcopy(data.raw["mining-drill"]["nullius-mediu medium_miner.working_visualisations[3].north_animation.layers = { medium_miner.working_visualisations[3].north_animation.layers[1], { - priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-mask.png", - line_length = 6, - width = 84, - height = 80, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(0, -12), - tint = {240, 160, 0}, - hr_version = { priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/hr-electric-mining-drill-mask.png", + filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-mask.png", line_length = 6, width = 162, height = 156, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(1, -11), tint = {240, 160, 0}, scale = 0.5 - } }, { - priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-highlights.png", - line_length = 6, - width = 84, - height = 80, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(0, -12), - blend_mode = "additive", - hr_version = { priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/hr-electric-mining-drill-highlights.png", + filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-highlights.png", line_length = 6, width = 162, height = 156, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(1, -11), blend_mode = "additive", scale = 0.5 - } }, medium_miner.working_visualisations[3].north_animation.layers[2] } medium_miner.working_visualisations[3].east_animation.layers = { medium_miner.working_visualisations[3].east_animation.layers[1], { - priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-horizontal-mask.png", - line_length = 6, - width = 40, - height = 80, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(2, -12), - tint = {240, 160, 0}, - hr_version = { priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/hr-electric-mining-drill-horizontal-mask.png", + filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-horizontal-mask.png", line_length = 6, width = 80, height = 160, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(2, -12), tint = {240, 160, 0}, scale = 0.5 - } }, { - priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-horizontal-highlights.png", - line_length = 6, - width = 40, - height = 80, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(2, -12), - blend_mode = "additive", - hr_version = { priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/hr-electric-mining-drill-horizontal-highlights.png", + filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-horizontal-highlights.png", line_length = 6, width = 80, height = 160, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(2, -12), blend_mode = "additive", scale = 0.5 - } }, medium_miner.working_visualisations[3].east_animation.layers[2] } medium_miner.working_visualisations[6].east_animation = { layers = { medium_miner.working_visualisations[6].east_animation, { - priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-horizontal-front-mask.png", - line_length = 6, - width = 32, - height = 76, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(-2, 4), - tint = {240, 160, 0}, - hr_version = { priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/hr-electric-mining-drill-horizontal-front-mask.png", + filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-horizontal-front-mask.png", line_length = 6, width = 66, height = 154, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(-3, 3), tint = {240, 160, 0}, scale = 0.5 - } }, { - priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-horizontal-front-highlights.png", - line_length = 6, - width = 32, - height = 76, - frame_count = 30, - animation_speed = 0.4, - frame_sequence = drill_animation_sequence, - direction_count = 1, - shift = util.by_pixel(-2, 4), - blend_mode = "additive", - hr_version = { priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/hr-electric-mining-drill-horizontal-front-highlights.png", + filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-horizontal-front-highlights.png", line_length = 6, width = 66, height = 154, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(-3, 3), blend_mode = "additive", scale = 0.5 - } } }} medium_miner.working_visualisations[3].south_animation = @@ -2977,23 +2658,6 @@ medium_miner.working_visualisations[7].west_animation.filename = medium_miner.working_visualisations[3].north_animation.layers[2].tint = {118, 149, 235} medium_miner.working_visualisations[3].east_animation.layers[2].tint = {118, 149, 235} medium_miner.working_visualisations[6].east_animation.layers[2].tint = {118, 149, 235} -medium_miner.animation.north.layers[1].hr_version.filename = - "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/hr-electric-mining-drill-N.png" -medium_miner.animation.east.layers[1].hr_version.filename = - "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/hr-electric-mining-drill-E.png" -medium_miner.animation.west.layers[1].hr_version.filename = - "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/hr-electric-mining-drill-W.png" -medium_miner.working_visualisations[7].east_animation.hr_version.filename = - "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/hr-electric-mining-drill-E-front.png" -medium_miner.working_visualisations[7].south_animation.layers[1].hr_version.filename = - "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/hr-electric-mining-drill-S-output.png" -medium_miner.working_visualisations[7].south_animation.layers[2].hr_version.filename = - "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/hr-electric-mining-drill-S-front.png" -medium_miner.working_visualisations[7].west_animation.hr_version.filename = - "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/hr-electric-mining-drill-W-front.png" -medium_miner.working_visualisations[3].north_animation.layers[2].hr_version.tint = {118, 149, 235} -medium_miner.working_visualisations[3].east_animation.layers[2].hr_version.tint = {118, 149, 235} -medium_miner.working_visualisations[6].east_animation.layers[2].hr_version.tint = {118, 149, 235} data.raw["mining-drill"]["nullius-medium-miner-3"].graphics_set = medium_miner @@ -3002,28 +2666,28 @@ large_miner.working_visualisations[3].north_animation.layers = { large_miner.working_visualisations[3].north_animation.layers[1], { priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/hr-electric-mining-drill-mask.png", + filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-mask.png", line_length = 6, width = 162, height = 156, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(1*1.3333, -11*1.3333), tint = {240, 160, 0}, scale = 0.6666 }, { priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/hr-electric-mining-drill-highlights.png", + filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-highlights.png", line_length = 6, width = 162, height = 156, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(1*1.3333, -11*1.3333), blend_mode = "additive", scale = 0.6666 @@ -3034,28 +2698,28 @@ large_miner.working_visualisations[3].east_animation.layers = { large_miner.working_visualisations[3].east_animation.layers[1], { priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/hr-electric-mining-drill-horizontal-mask.png", + filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-horizontal-mask.png", line_length = 6, width = 80, height = 160, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(2*1.3333, -12*1.3333), tint = {240, 160, 0}, scale = 0.6666 }, { priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/hr-electric-mining-drill-horizontal-highlights.png", + filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-horizontal-highlights.png", line_length = 6, width = 80, height = 160, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(2*1.3333, -12*1.3333), blend_mode = "additive", scale = 0.6666 @@ -3066,28 +2730,28 @@ large_miner.working_visualisations[6].east_animation = { layers = { large_miner.working_visualisations[6].east_animation, { priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/hr-electric-mining-drill-horizontal-front-mask.png", + filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-horizontal-front-mask.png", line_length = 6, width = 66, height = 154, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(-3*1.3333, 3*1.3333), tint = {240, 160, 0}, scale = 0.6666 }, { priority = "high", - filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/hr-electric-mining-drill-horizontal-front-highlights.png", + filename = "__reskins-bobs__/graphics/entity/mining/mining-drill/drill/electric-mining-drill-horizontal-front-highlights.png", line_length = 6, width = 66, height = 154, frame_count = 30, animation_speed = 0.4, frame_sequence = drill_animation_sequence, - direction_count = 1, + shift = util.by_pixel(-3*1.3333, 3*1.3333), blend_mode = "additive", scale = 0.6666 @@ -3102,19 +2766,19 @@ large_miner.working_visualisations[6].west_animation = data.raw["mining-drill"]["nullius-large-miner-1"].graphics_set = util.table.deepcopy(large_miner) large_miner.animation.north.layers[1].filename = - "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/hr-electric-mining-drill-N.png" + "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/electric-mining-drill-N.png" large_miner.animation.east.layers[1].filename = - "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/hr-electric-mining-drill-E.png" + "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/electric-mining-drill-E.png" large_miner.animation.west.layers[1].filename = - "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/hr-electric-mining-drill-W.png" + "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/electric-mining-drill-W.png" large_miner.working_visualisations[7].east_animation.filename = - "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/hr-electric-mining-drill-E-front.png" + "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/electric-mining-drill-E-front.png" large_miner.working_visualisations[7].south_animation.layers[1].filename = - "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/hr-electric-mining-drill-S-output.png" + "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/electric-mining-drill-S-output.png" large_miner.working_visualisations[7].south_animation.layers[2].filename = - "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/hr-electric-mining-drill-S-front.png" + "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/electric-mining-drill-S-front.png" large_miner.working_visualisations[7].west_animation.filename = - "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/hr-electric-mining-drill-W-front.png" + "__reskins-bobs__/graphics/entity/mining/mining-drill/area-frame/electric-mining-drill-W-front.png" large_miner.working_visualisations[3].north_animation.layers[2].tint = {118, 149, 235} large_miner.working_visualisations[3].east_animation.layers[2].tint = {118, 149, 235} large_miner.working_visualisations[6].east_animation.layers[2].tint = {118, 149, 235} diff --git a/nullius/prototypes/entity/pipe_graphics.lua b/nullius/prototypes/entity/pipe_graphics.lua index 50b3ccf..8ba15cd 100644 --- a/nullius/prototypes/entity/pipe_graphics.lua +++ b/nullius/prototypes/entity/pipe_graphics.lua @@ -3,281 +3,217 @@ local ENTITYPATH = "__nullius__/graphics/entity/" local BASEENTITY = "__base__/graphics/entity/" +--- @param i integer +local function make_visualization(i) + return + { + filename = BASEENTITY.."pipe/visualization.png", + priority = "extra-high", + x = i * 64, + size = 64, + scale = 0.5, + flags = {"icon"}, + } +end + +--- @param i integer +local function make_disabled_visualization(i) + return + { + filename = BASEENTITY.."pipe/disabled-visualization.png", + priority = "extra-high", + x = i * 64, + size = 64, + scale = 0.5, + flags = {"icon"}, + } +end + function pipepics(dir) return { straight_vertical_single = { - filename = dir.."pipe-straight-vertical-single.png", - priority = "extra-high", - width = 80, - height = 80, - hr_version = { - filename = dir.."hr-pipe-straight-vertical-single.png", + filename = dir.."pipe-straight-vertical-single.png", priority = "extra-high", width = 160, height = 160, scale = 0.5 - } }, straight_vertical = { - filename = dir.."pipe-straight-vertical.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-straight-vertical.png", + filename = dir.."pipe-straight-vertical.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, straight_vertical_window = { - filename = dir.."pipe-straight-vertical-window.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-straight-vertical-window.png", + filename = dir.."pipe-straight-vertical-window.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, straight_horizontal_window = { - filename = dir.."pipe-straight-horizontal-window.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-straight-horizontal-window.png", + filename = dir.."pipe-straight-horizontal-window.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, straight_horizontal = { - filename = dir.."pipe-straight-horizontal.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-straight-horizontal.png", + filename = dir.."pipe-straight-horizontal.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, corner_up_right = { - filename = dir.."pipe-corner-up-right.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-corner-up-right.png", + filename = dir.."pipe-corner-up-right.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, corner_up_left = { - filename = dir.."pipe-corner-up-left.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-corner-up-left.png", + filename = dir.."pipe-corner-up-left.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, corner_down_right = { - filename = dir.."pipe-corner-down-right.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-corner-down-right.png", + filename = dir.."pipe-corner-down-right.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, corner_down_left = { - filename = dir.."pipe-corner-down-left.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-corner-down-left.png", + filename = dir.."pipe-corner-down-left.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, t_up = { - filename = dir.."pipe-t-up.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-t-up.png", + filename = dir.."pipe-t-up.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, t_down = { - filename = dir.."pipe-t-down.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-t-down.png", + filename = dir.."pipe-t-down.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, t_right = { - filename = dir.."pipe-t-right.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-t-right.png", + filename = dir.."pipe-t-right.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, t_left = { - filename = dir.."pipe-t-left.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-t-left.png", + filename = dir.."pipe-t-left.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, cross = { - filename = dir.."pipe-cross.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-cross.png", + filename = dir.."pipe-cross.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, ending_up = { - filename = dir.."pipe-ending-up.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-ending-up.png", + filename = dir.."pipe-ending-up.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, ending_down = { - filename = dir.."pipe-ending-down.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-ending-down.png", + filename = dir.."pipe-ending-down.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, ending_right = { - filename = dir.."pipe-ending-right.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-ending-right.png", + filename = dir.."pipe-ending-right.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, ending_left = { - filename = dir.."pipe-ending-left.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-ending-left.png", + filename = dir.."pipe-ending-left.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, + straight_vertical_single_visualization = make_visualization(0), + straight_vertical_visualization = make_visualization(5), + straight_vertical_window_visualization = make_visualization(5), + straight_horizontal_window_visualization = make_visualization(10), + straight_horizontal_visualization = make_visualization(10), + corner_up_right_visualization = make_visualization(3), + corner_up_left_visualization = make_visualization(9), + corner_down_right_visualization = make_visualization(6), + corner_down_left_visualization = make_visualization(12), + t_up_visualization = make_visualization(11), + t_down_visualization = make_visualization(14), + t_right_visualization = make_visualization(7), + t_left_visualization = make_visualization(13), + cross_visualization = make_visualization(15), + ending_up_visualization = make_visualization(1), + ending_down_visualization = make_visualization(4), + ending_right_visualization = make_visualization(2), + ending_left_visualization = make_visualization(8), + straight_vertical_single_disabled_visualization = make_disabled_visualization(0), + straight_vertical_disabled_visualization = make_disabled_visualization(5), + straight_vertical_window_disabled_visualization = make_disabled_visualization(5), + straight_horizontal_window_disabled_visualization = make_disabled_visualization(10), + straight_horizontal_disabled_visualization = make_disabled_visualization(10), + corner_up_right_disabled_visualization = make_disabled_visualization(3), + corner_up_left_disabled_visualization = make_disabled_visualization(9), + corner_down_right_disabled_visualization = make_disabled_visualization(6), + corner_down_left_disabled_visualization = make_disabled_visualization(12), + t_up_disabled_visualization = make_disabled_visualization(11), + t_down_disabled_visualization = make_disabled_visualization(14), + t_right_disabled_visualization = make_disabled_visualization(7), + t_left_disabled_visualization = make_disabled_visualization(13), + cross_disabled_visualization = make_disabled_visualization(15), + ending_up_disabled_visualization = make_disabled_visualization(1), + ending_down_disabled_visualization = make_disabled_visualization(4), + ending_right_disabled_visualization = make_disabled_visualization(2), + ending_left_disabled_visualization = make_disabled_visualization(8), horizontal_window_background = { - filename = dir.."pipe-horizontal-window-background.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-horizontal-window-background.png", + filename = dir.."pipe-horizontal-window-background.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, vertical_window_background = { - filename = dir.."pipe-vertical-window-background.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-vertical-window-background.png", + filename = dir.."pipe-vertical-window-background.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, fluid_background = { - filename = BASEENTITY .. "pipe/fluid-background.png", - priority = "extra-high", - width = 32, - height = 20, - hr_version = { - filename = BASEENTITY .. "pipe/hr-fluid-background.png", + filename = BASEENTITY .. "pipe/fluid-background.png", priority = "extra-high", width = 64, height = 40, scale = 0.5 - } }, low_temperature_flow = { filename = BASEENTITY .. "pipe/fluid-flow-low-temperature.png", @@ -298,24 +234,13 @@ function pipepics(dir) height = 18 }, gas_flow = { - filename = BASEENTITY .. "pipe/steam.png", - priority = "extra-high", - line_length = 10, - width = 24, - height = 15, - frame_count = 60, - axially_symmetrical = false, - direction_count = 1, - hr_version = { - filename = BASEENTITY .. "pipe/hr-steam.png", + filename = BASEENTITY .. "pipe/steam.png", priority = "extra-high", line_length = 10, width = 48, height = 30, frame_count = 60, - axially_symmetrical = false, - direction_count = 1 - } + --axially_symmetrical = false, } } end @@ -323,57 +248,33 @@ end function undergroundpipepics(dir) return { - up = { - filename = dir.."pipe-to-ground-up.png", - priority = "high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-to-ground-up.png", + north = { + filename = dir.."pipe-to-ground-up.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, - down = { - filename = dir.."pipe-to-ground-down.png", - priority = "high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-to-ground-down.png", + south = { + filename = dir.."pipe-to-ground-down.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, - left = { - filename = dir.."pipe-to-ground-left.png", - priority = "high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-to-ground-left.png", + west = { + filename = dir.."pipe-to-ground-left.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, - right = { - filename = dir.."pipe-to-ground-right.png", - priority = "high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-to-ground-right.png", + east = { + filename = dir.."pipe-to-ground-right.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } } } end @@ -384,130 +285,144 @@ function pipecoverspics(dir) north = { layers = { { - filename = dir.."pipe-cover-north.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-cover-north.png", + filename = dir.."pipe-cover-north.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, { - filename = BASEENTITY .. "pipe-covers/pipe-cover-north-shadow.png", - priority = "extra-high", - width = 64, - height = 64, - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "pipe-covers/hr-pipe-cover-north-shadow.png", + filename = BASEENTITY .. "pipe-covers/pipe-cover-north-shadow.png", priority = "extra-high", width = 128, height = 128, scale = 0.5, draw_as_shadow = true - } } } }, east = { layers = { { - filename = dir.."pipe-cover-east.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-cover-east.png", + filename = dir.."pipe-cover-east.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, { - filename = BASEENTITY .. "pipe-covers/pipe-cover-east-shadow.png", - priority = "extra-high", - width = 64, - height = 64, - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "pipe-covers/hr-pipe-cover-east-shadow.png", + filename = BASEENTITY .. "pipe-covers/pipe-cover-east-shadow.png", priority = "extra-high", width = 128, height = 128, scale = 0.5, draw_as_shadow = true - } } } }, south = { layers = { { - filename = dir.."pipe-cover-south.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-cover-south.png", + filename = dir.."pipe-cover-south.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, { - filename = BASEENTITY .. "pipe-covers/pipe-cover-south-shadow.png", - priority = "extra-high", - width = 64, - height = 64, - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "pipe-covers/hr-pipe-cover-south-shadow.png", + filename = BASEENTITY .. "pipe-covers/pipe-cover-south-shadow.png", priority = "extra-high", width = 128, height = 128, scale = 0.5, draw_as_shadow = true - } } } }, west = { layers = { { - filename = dir.."pipe-cover-west.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { - filename = dir.."hr-pipe-cover-west.png", + filename = dir.."pipe-cover-west.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, { - filename = BASEENTITY .. "pipe-covers/pipe-cover-west-shadow.png", - priority = "extra-high", - width = 64, - height = 64, - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "pipe-covers/hr-pipe-cover-west-shadow.png", + filename = BASEENTITY .. "pipe-covers/pipe-cover-west-shadow.png", priority = "extra-high", width = 128, height = 128, scale = 0.5, draw_as_shadow = true - } } } } } +end + +function hydropipepictures() + return { + north = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/pipe-north1.png", + priority = "extra-high", + width = 48, + height = 48, + shift = { -0.08, 0.45 }, + }, + east = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + south = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/pipe-south1.png", + priority = "extra-high", + width = 48, + height = 48, + shift = { 0.06, -0.6 }, + }, + west = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/pipe-east1.png", + priority = "extra-high", + width = 48, + height = 48, + shift = { 0.62, 0.05 }, + }, + } +end + +function hydropipepictures2() + return { + north = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/pipe-north2.png", + priority = "extra-high", + width = 48, + height = 48, + shift = { -0.08, 0.45 }, + }, + east = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + south = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/pipe-south1.png", + priority = "extra-high", + width = 48, + height = 48, + shift = { 0.06, -0.6 }, + }, + west = { + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/pipe-east2.png", + priority = "extra-high", + width = 48, + height = 48, + shift = { 0.62, 0.05 }, + }, + } end \ No newline at end of file diff --git a/nullius/prototypes/entity/plumbing.lua b/nullius/prototypes/entity/plumbing.lua index c1ee5ae..315c707 100644 --- a/nullius/prototypes/entity/plumbing.lua +++ b/nullius/prototypes/entity/plumbing.lua @@ -4,16 +4,32 @@ local ENTITYPATH = "__nullius__/graphics/entity/" local BASEENTITY = "__base__/graphics/entity/" require("pipe_graphics") +collision_mask_util = require("collision-mask-util") - -local op = data.raw["offshore-pump"]["offshore-pump"] +local op = table.deepcopy(data.raw["offshore-pump"]["offshore-pump"]) local si1 = { type = "assembling-machine", name = "nullius-seawater-intake-1", icons = data.raw.item["nullius-seawater-intake-1"].icons, minable = {mining_time = 0.5, result = "nullius-seawater-intake-1"}, flags = {"placeable-neutral", "player-creation"}, - collision_mask = {"object-layer", "ground-tile"}, + collision_mask = { layers = {object = true, ground_tile = true}}, + --collision_mask = {layers={object=true, train=true, is_object=true, is_lower_object=true}}, -- collide just with object-layer and train-layer which don't collide with water, this allows us to build on 1 tile wide ground + tile_buildability_rules = + { + {area = {{-0.6, 1.7}, {0.6, 2.3}}, required_tiles = {layers={ground_tile=true}}, colliding_tiles = {layers={water_tile=true}}, remove_on_collision = true}, + --{area = {{-0.6, -1.3}, {0.6, 0.4}}, required_tiles = {layers={water_tile=true}}, colliding_tiles = {layers={}}}, + }, + + placeable_position_visualization = + { + filename = "__core__/graphics/cursor-boxes-32x32.png", + priority = "extra-high-no-scale", + width = 64, + height = 64, + scale = 0.5, + x = 3*64 + }, crafting_categories = {"seawater-pumping"}, crafting_speed = 1, fixed_recipe = "nullius-seawater", @@ -21,9 +37,9 @@ local si1 = { show_recipe_icon_on_map = false, energy_source = { type = "electric", - usage_priority = "secondary-input", - emissions = 0.01, - drain = "10kW" + usage_priority = "secondary-input", + emissions_per_minute = {pollution = 0.01}, + drain = "10kW" }, energy_usage = "190kW", ingredient_count = 1, @@ -37,23 +53,21 @@ local si1 = { { type = "fire", decrease = 100, percent = 90 } }, fluid_boxes = {{ - production_type = "output", - base_area = 8, - base_level = 4, + production_type = "output", + volume = 500, pipe_covers = pipecoverspictures(), filter = "nullius-seawater", - pipe_connections = {{position = {0, 2}, type = "output"}} + pipe_connections = {{position = {0, 1}, flow_direction = "output", direction = defines.direction.south}} }}, - pipe_covers = pipecoverspictures(), - module_specification = { - module_slots = 1, - module_info_icon_shift = { 0, 0 } - }, + module_slots = 1, allowed_effects = {"speed", "consumption", "pollution"}, fast_replaceable_group = "seawater-intake", next_upgrade = "nullius-seawater-intake-2", working_sound = op.working_sound, - vehicle_impact_sound = op.vehicle_impact_sound + impact_category = op.impact_category, + -- circuit_connector = circuit_connector_definitions["offshore-pump"], + -- circuit_wire_max_distance = default_circuit_wire_max_distance, + graphics_set = {} } si2 = util.table.deepcopy(si1) @@ -65,11 +79,10 @@ si2.energy_source.drain = "50kW" si2.energy_usage = "750kW" si2.next_upgrade = nil si2.max_health = 300 -si2.fluid_boxes[1].base_level = 6 -si2.fluid_boxes[1].height = 2 -si2.module_specification.module_slots = 2 +si2.fluid_boxes[1].volume = 500 +si2.module_slots = 2 -si2.animation = { +si2.graphics_set.animation = { north = scale_image({ layers = { animate_frame(op.graphics_set.glass_pictures.north), animate_frame(op.graphics_set.base_pictures.north), @@ -100,7 +113,7 @@ si2.animation = { }}, 1.2, { x = 0.9, y = 0 }) } -si2.working_visualisations = {{ +si2.graphics_set.working_visualisations = {{ apply_recipe_tint = "primary", north_animation = scale_image(op.graphics_set.fluid_animation.north, 1.2, { x = 0, y = 0.9 }), @@ -112,15 +125,15 @@ si2.working_visualisations = {{ 1.2, { x = 0.9, y = 0 }) }} -si1.animation = { - north = scale_image(si2.animation.north, 0.75, { x = 0, y = 0.38 }), - east = scale_image(si2.animation.east, 0.75, { x = -0.38, y = 0 }), - south = scale_image(si2.animation.south, 0.75, { x = 0, y = -0.38 }), - west = scale_image(si2.animation.west, 0.75, { x = 0.38, y = 0 }) +si1.graphics_set.animation = { + north = scale_image(si2.graphics_set.animation.north, 0.75, { x = 0, y = 0.38 }), + east = scale_image(si2.graphics_set.animation.east, 0.75, { x = -0.38, y = 0 }), + south = scale_image(si2.graphics_set.animation.south, 0.75, { x = 0, y = -0.38 }), + west = scale_image(si2.graphics_set.animation.west, 0.75, { x = 0.38, y = 0 }) } -local si2wv = si2.working_visualisations[1] -si1.working_visualisations = {{ +local si2wv = si2.graphics_set.working_visualisations[1] +si1.graphics_set.working_visualisations = {{ apply_recipe_tint = "primary", north_animation = scale_image(si2wv.north_animation, 0.75, { x = 0, y = 0.38 }), east_animation = scale_image(si2wv.east_animation, 0.75, { x = -0.38, y = 0 }), @@ -135,64 +148,67 @@ data:extend({ { type = "offshore-pump", name = "nullius-legacy-seawater-intake-1", - localised_name = {"entity-name.nullius-legacy", + localised_name = {"entity-name.nullius-legacy", {"entity-name.nullius-seawater-intake-1"}}, localised_description = {"entity-description.nullius-seawater-intake-1"}, icons = data.raw.item["nullius-legacy-seawater-intake-1"].icons, flags = {"placeable-neutral", "player-creation", "filter-directions", - "hidden", "not-upgradable", "not-blueprintable"}, - collision_mask = { "object-layer", "train-layer" }, - center_collision_mask = { "water-tile", "object-layer", "player-layer" }, - fluid_box_tile_collision_test = { "ground-tile" }, - adjacent_tile_collision_test = { "water-tile" }, - adjacent_tile_collision_mask = { "ground-tile" }, - adjacent_tile_collision_box = { { -1, -2 }, { 1, -1 } }, + "not-upgradable", "not-blueprintable"}, + hidden = true, + energy_source = { + type = "void" + }, + energy_usage = "60kW", + fluid_source_offset = op.fluid_source_offset, + collision_mask = { layers = {object = true, train = true}}, minable = {mining_time = 0.5, result = "nullius-seawater-intake-1"}, - placeable_by = {item = "nullius-legacy-seawater-intake-1", count = 1}, + placeable_by = {item = "nullius-legacy-seawater-intake-1", count = 1}, max_health = 150, corpse = "small-remnants", dying_explosion = "offshore-pump-explosion", - fluid = "nullius-seawater", + --fluid = "nullius-seawater", collision_box = {{-0.6, -1.05}, {0.6, 0.3}}, selection_box = {{-1, -1.49}, {1, 0.49}}, pumping_speed = 2, fluid_box = { - base_area = 8, - base_level = 4, + volume = 500, pipe_covers = pipecoverspictures(), production_type = "output", filter = "nullius-seawater", - pipe_connections = {{position = {0, 1}, type = "output"}} + pipe_connections = {{position = {0, 0}, flow_direction = "output", direction = defines.direction.south}} }, tile_width = 1, tile_height = 1, - vehicle_impact_sound = data.raw["offshore-pump"]["offshore-pump"].vehicle_impact_sound, - working_sound = data.raw["offshore-pump"]["offshore-pump"].working_sound, - placeable_position_visualization = data.raw["offshore-pump"]["offshore-pump"].placeable_position_visualization, - circuit_wire_connection_points = circuit_connector_definitions["offshore-pump"].points, - circuit_connector_sprites = circuit_connector_definitions["offshore-pump"].sprites, - circuit_wire_max_distance = default_circuit_wire_max_distance, + impact_category = op.impact_category, + working_sound = op.working_sound, + placeable_position_visualization = op.placeable_position_visualization, + -- circuit_connector = circuit_connector_definitions["offshore-pump"], + -- circuit_wire_max_distance = default_circuit_wire_max_distance, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } }, - graphics_set = { - underwater_layer_offset = 30, + graphics_set = + { + underwater_layer_offset = 15, base_render_layer = "ground-patch", - animation = { - north = { - layers = { + animation = + { + north = + { + layers = + { { filename = BASEENTITY .. "offshore-pump/offshore-pump_North.png", priority = "high", line_length = 8, frame_count = 32, animation_speed = 0.25, - width = 48, - height = 84, - shift = util.by_pixel(-2*0.75, -16*0.75), - scale = 0.75 + width = 90, + height = 162, + shift = util.by_pixel(-1*0.75, -15*0.75), + scale = 0.5*0.75 }, { filename = BASEENTITY .. "offshore-pump/offshore-pump_North-shadow.png", @@ -200,26 +216,28 @@ data:extend({ line_length = 8, frame_count = 32, animation_speed = 0.25, - width = 78, - height = 70, - shift = util.by_pixel(12*0.75, -8*0.75), + width = 150, + height = 134, + shift = util.by_pixel(13*0.75, -7*0.75), draw_as_shadow = true, - scale = 0.75 + scale = 0.5*0.75 } } }, - east = { - layers = { + east = + { + layers = + { { filename = BASEENTITY .. "offshore-pump/offshore-pump_East.png", priority = "high", line_length = 8, frame_count = 32, animation_speed = 0.25, - width = 64, - height = 52, - shift = util.by_pixel(14*0.75-4, -2*0.75), - scale = 0.75 + width = 124, + height = 102, + shift = util.by_pixel(15*0.75, -2*0.75), + scale = 0.5*0.75 }, { filename = BASEENTITY .. "offshore-pump/offshore-pump_East-shadow.png", @@ -227,26 +245,28 @@ data:extend({ line_length = 8, frame_count = 32, animation_speed = 0.25, - width = 88, - height = 34, - shift = util.by_pixel(28*0.75-4, 8*0.75), + width = 180, + height = 66, + shift = util.by_pixel(27*0.75, 8*0.75), draw_as_shadow = true, - scale = 0.75 + scale = 0.5*0.75 } } }, - south = { - layers = { + south = + { + layers = + { { filename = BASEENTITY .. "offshore-pump/offshore-pump_South.png", priority = "high", line_length = 8, frame_count = 32, animation_speed = 0.25, - width = 48, - height = 96, - shift = util.by_pixel(-2*0.75, 0), - scale = 0.75 + width = 92, + height = 192, + shift = util.by_pixel(-1*0.75, 0), + scale = 0.5*0.75 }, { filename = BASEENTITY .. "offshore-pump/offshore-pump_South-shadow.png", @@ -254,26 +274,28 @@ data:extend({ line_length = 8, frame_count = 32, animation_speed = 0.25, - width = 80, - height = 66, - shift = util.by_pixel(16*0.75, 22*0.75), + width = 164, + height = 128, + shift = util.by_pixel(15*0.75, 23*0.75), draw_as_shadow = true, - scale = 0.75 + scale = 0.5*0.75 } } }, - west = { - layers = { + west = + { + layers = + { { filename = BASEENTITY .. "offshore-pump/offshore-pump_West.png", priority = "high", line_length = 8, frame_count = 32, animation_speed = 0.25, - width = 64, - height = 52, - shift = util.by_pixel(-16*0.75+4, -2*0.75), - scale = 0.75 + width = 124, + height = 102, + shift = util.by_pixel(-15*0.75, -2*0.75), + scale = 0.5*0.75 }, { filename = BASEENTITY .. "offshore-pump/offshore-pump_West-shadow.png", @@ -281,152 +303,173 @@ data:extend({ line_length = 8, frame_count = 32, animation_speed = 0.25, - width = 88, - height = 34, - shift = util.by_pixel(-4*0.75+4, 8*0.75), + width = 172, + height = 66, + shift = util.by_pixel(-3*0.75, 8*0.75), draw_as_shadow = true, - scale = 0.75 + scale = 0.5*0.75 } } } }, - fluid_animation = { - north = { + fluid_animation = + { + north = + { filename = BASEENTITY .. "offshore-pump/offshore-pump_North-fluid.png", apply_runtime_tint = true, line_length = 8, frame_count = 32, animation_speed = 0.25, - width = 22, - height = 20, - shift = util.by_pixel(-2*0.75, -22*0.75), - scale = 0.75 + width = 40, + height = 40, + shift = util.by_pixel(-1*0.75, -22*0.75), + scale = 0.5*0.75 }, - east = { + east = + { filename = BASEENTITY .. "offshore-pump/offshore-pump_East-fluid.png", apply_runtime_tint = true, line_length = 8, frame_count = 32, animation_speed = 0.25, - width = 20, - height = 24, - shift = util.by_pixel(6*0.75-4, -10*0.75), - scale = 0.75 + width = 38, + height = 50, + shift = util.by_pixel(6*0.75, -11*0.75), + scale = 0.5*0.75 }, - south = { + south = + { filename = BASEENTITY .. "offshore-pump/offshore-pump_South-fluid.png", apply_runtime_tint = true, line_length = 8, frame_count = 32, animation_speed = 0.25, - width = 20, - height = 8, - shift = util.by_pixel(-2*0.75, -4*0.75), - scale = 0.75 + width = 36, + height = 14, + shift = util.by_pixel(-1*0.75, -4*0.75), + scale = 0.5*0.75 }, - west = { + west = + { filename = BASEENTITY .. "offshore-pump/offshore-pump_West-fluid.png", apply_runtime_tint = true, line_length = 8, frame_count = 32, animation_speed = 0.25, - width = 20, - height = 24, - shift = util.by_pixel(-8*0.75+4, -10*0.75), - scale = 0.75 + width = 36, + height = 50, + shift = util.by_pixel(-7*0.75, -11*0.75), + scale = 0.5*0.75 } }, - glass_pictures = { - north = { + glass_pictures = + { + north = + { filename = BASEENTITY .. "offshore-pump/offshore-pump_North-glass.png", - width = 18, - height = 20, + width = 36, + height = 40, shift = util.by_pixel(-2*0.75, -22*0.75), - scale = 0.75 + scale = 0.5*0.75 }, - east = { + east = + { filename = BASEENTITY .. "offshore-pump/offshore-pump_East-glass.png", - width = 18, - height = 18, - shift = util.by_pixel(4*0.75-4, -14*0.75), - scale = 0.75 + width = 30, + height = 32, + shift = util.by_pixel(5*0.75, -13*0.75), + scale = 0.5*0.75 }, - south = { + south = + { filename = BASEENTITY .. "offshore-pump/offshore-pump_South-glass.png", - width = 22, - height = 12, - shift = util.by_pixel(-2*0.75, -6*0.75), - scale = 0.75 + width = 40, + height = 24, + shift = util.by_pixel(-1*0.75, -6*0.75), + scale = 0.5*0.75 }, - west = { + west = + { filename = BASEENTITY .. "offshore-pump/offshore-pump_West-glass.png", - width = 16, - height = 16, - shift = util.by_pixel(-6*0.75+4, -14*0.75), - scale = 0.75 + width = 30, + height = 32, + shift = util.by_pixel(-6*0.75, -14*0.75), + scale = 0.5*0.75 } }, - base_pictures = { - north = { + base_pictures = + { + north = + { filename = BASEENTITY .. "offshore-pump/offshore-pump_North-legs.png", - width = 60, - height = 52, - shift = util.by_pixel(-2*0.75, -4*0.75), - scale = 0.75 + width = 114, + height = 106, + shift = util.by_pixel(-1*0.75, -5*0.75), + scale = 0.5*0.75 }, - east = { + east = + { filename = BASEENTITY .. "offshore-pump/offshore-pump_East-legs.png", - width = 54, - height = 32, - shift = util.by_pixel(4*0.75-4, 12*0.75), - scale = 0.75 + width = 106, + height = 60, + shift = util.by_pixel(4*0.75, 13*0.75), + scale = 0.5*0.75 }, - south = { + south = + { filename = BASEENTITY .. "offshore-pump/offshore-pump_South-legs.png", - width = 56, - height = 54, + width = 110, + height = 108, shift = util.by_pixel(-2*0.75, 6*0.75), - scale = 0.75 + scale = 0.5*0.75 }, - west = { + west = + { filename = BASEENTITY .. "offshore-pump/offshore-pump_West-legs.png", - width = 54, - height = 32, - shift = util.by_pixel(-6*0.75+4, 12*0.75), - scale = 0.75 + width = 108, + height = 64, + shift = util.by_pixel(-6*0.75, 12*0.75), + scale = 0.5*0.75 } }, - underwater_pictures = { - north = { + underwater_pictures = + { + north = + { filename = BASEENTITY .. "offshore-pump/offshore-pump_North-underwater.png", - width = 52, - height = 16, - shift = util.by_pixel(-2*0.75, -34*0.75), - scale = 0.75 + width = 98, + height = 36, + shift = util.by_pixel(-1*0.75, -32*0.75), + scale = 0.5*0.75 }, - east = { + east = + { filename = BASEENTITY .. "offshore-pump/offshore-pump_East-underwater.png", - width = 18, - height = 38, - shift = util.by_pixel(40*0.75-4, 16*0.75), - scale = 0.75 + width = 40, + height = 72, + shift = util.by_pixel(39*0.75, 17*0.75), + scale = 0.5*0.75 }, - south = { + south = + { filename = BASEENTITY .. "offshore-pump/offshore-pump_South-underwater.png", - width = 52, - height = 26, - shift = util.by_pixel(-2*0.75, 48*0.75), - scale = 0.75 + width = 98, + height = 48, + shift = util.by_pixel(-1*0.75, 49*0.75), + scale = 0.5*0.75 }, - west = { + west = + { filename = BASEENTITY .. "offshore-pump/offshore-pump_West-underwater.png", - width = 20, - height = 34, - shift = util.by_pixel(-40*0.75+4, 18*0.75), - scale = 0.75 + width = 40, + height = 72, + shift = util.by_pixel(-40*0.75, 17*0.75), + scale = 0.5*0.75 } } }, + water_reflection = { pictures = { filename = BASEENTITY .. "offshore-pump/offshore-pump-reflection.png", @@ -445,46 +488,44 @@ data:extend({ { type = "offshore-pump", name = "nullius-legacy-seawater-intake-2", - localised_name = {"entity-name.nullius-legacy", + localised_name = {"entity-name.nullius-legacy", {"entity-name.nullius-seawater-intake-2"}}, localised_description = {"entity-description.nullius-seawater-intake-2"}, - icons = data.raw.item["nullius-legacy-seawater-intake-2"].icons, + icons = data.raw.item["nullius-legacy-seawater-intake-2"].icons, flags = {"placeable-neutral", "player-creation", "filter-directions", - "hidden", "not-upgradable", "not-blueprintable"}, - collision_mask = { "object-layer", "train-layer" }, - center_collision_mask = { "water-tile", "object-layer", "player-layer" }, - fluid_box_tile_collision_test = { "ground-tile" }, - adjacent_tile_collision_test = { "water-tile" }, - adjacent_tile_collision_mask = { "ground-tile" }, - adjacent_tile_collision_box = { { -1, -2 }, { 1, -1 } }, + "not-upgradable", "not-blueprintable"}, + hidden = true, + energy_source = { + type = "void" + }, + energy_usage = "60kW", + fluid_source_offset = op.fluid_source_offset, + collision_mask = { layers = {object = true, train = true}}, minable = {mining_time = 0.8, result = "nullius-seawater-intake-2"}, - placeable_by = {item = "nullius-legacy-seawater-intake-2", count = 1}, + placeable_by = {item = "nullius-legacy-seawater-intake-2", count = 1}, max_health = 300, corpse = "small-remnants", dying_explosion = "offshore-pump-explosion", - fluid = "nullius-seawater", + --fluid = "nullius-seawater", collision_box = {{-0.6, -1.05}, {0.6, 0.3}}, selection_box = {{-1, -1.49}, {1, 0.49}}, pumping_speed = 10, fluid_box = { - base_area = 6, - base_level = 5, - height = 2, + volume = 500, pipe_covers = pipecoverspictures(), production_type = "output", filter = "nullius-seawater", - pipe_connections = {{position = {0, 1}, type = "output"}} + pipe_connections = {{position = {0, 0}, flow_direction = "output", direction = defines.direction.south}} }, tile_width = 1, tile_height = 1, - graphics_set = data.raw["offshore-pump"]["offshore-pump"].graphics_set, - vehicle_impact_sound = data.raw["offshore-pump"]["offshore-pump"].vehicle_impact_sound, - working_sound = data.raw["offshore-pump"]["offshore-pump"].working_sound, - placeable_position_visualization = data.raw["offshore-pump"]["offshore-pump"].placeable_position_visualization, - circuit_wire_connection_points = circuit_connector_definitions["offshore-pump"].points, - circuit_connector_sprites = circuit_connector_definitions["offshore-pump"].sprites, - circuit_wire_max_distance = default_circuit_wire_max_distance, - water_reflection = data.raw["offshore-pump"]["offshore-pump"].water_reflection, + graphics_set = op.graphics_set, + impact_category = op.impact_category, + working_sound = op.working_sound, + placeable_position_visualization = op.placeable_position_visualization, + -- circuit_connector = circuit_connector_definitions["offshore-pump"], + -- circuit_wire_max_distance = default_circuit_wire_max_distance, + water_reflection = op.water_reflection, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } @@ -500,11 +541,11 @@ data:extend({ crafting_speed = 1, fixed_recipe = "nullius-freshwater", energy_source = { - type = "electric", - usage_priority = "secondary-input", - emissions = 0.02, - drain = "20kW" - }, + type = "electric", + usage_priority = "secondary-input", + emissions_per_minute = {pollution = 0.02}, + drain = "20kW" + }, energy_usage = "280kW", ingredient_count = 1, minable = {mining_time = 1, result = "nullius-well-1"}, @@ -518,225 +559,227 @@ data:extend({ { type = "fire", decrease = 100, percent = 90 } }, working_sound = data.raw["offshore-pump"]["offshore-pump"].working_sound, - vehicle_impact_sound = data.raw["offshore-pump"]["offshore-pump"].vehicle_impact_sound, + impact_category = data.raw["offshore-pump"]["offshore-pump"].impact_category, fluid_boxes = { { production_type = "output", - base_area = 10, - base_level = 0, - height = 4, + volume = 500, pipe_covers = pipecoverspictures(), pipe_connections = { - { positions = { {1, -2}, {2, -1}, {-1, 2}, {-2, 1} } } + { positions = { {1, -1}, {1, -1}, {-1, 1}, {-1, 1} }, direction = defines.direction.north } } } }, - pipe_covers = pipecoverspictures(), - module_specification = { module_slots = 1 }, + module_slots = 1, allowed_effects = {"speed", "consumption", "pollution"}, fast_replaceable_group = "well", next_upgrade = "nullius-well-2", + + circuit_connector = circuit_connector_definitions["pumpjack"], + circuit_wire_max_distance = default_circuit_wire_max_distance, - animation = { - north = { - layers = { - { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base.png", - priority = "extra-high", - width = 261, - height = 273, - repeat_count = 40, - animation_speed = 0.4, - shift = util.by_pixel(-2.25, -4.75), - scale = 0.5 - }, - { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base-shadow.png", - priority = "extra-high", - width = 220, - height = 220, - scale = 0.5, - draw_as_shadow = true, - repeat_count = 40, - animation_speed = 0.4, - shift = util.by_pixel(6, 0.5) - }, - { - priority = "high", - filename = ENTITYPATH .. "wells/hr-pumpjack-decolorized.png", - animation_speed = 0.4, - scale = 0.5, - tint = {0.48, 0.84, 1}, - line_length = 8, - width = 206, - height = 202, - frame_count = 40, - shift = util.by_pixel(-4, -24) - }, - { - priority = "high", - filename = BASEENTITY .. "pumpjack/hr-pumpjack-horsehead-shadow.png", - animation_speed = 0.4, - draw_as_shadow = true, - line_length = 8, - width = 309, - height = 82, - frame_count = 40, - scale = 0.5, - shift = util.by_pixel(17.75, 14.5) + graphics_set = { + animation = { + north = { + layers = { + { + filename = BASEENTITY .. "pumpjack/pumpjack-base.png", + priority = "extra-high", + width = 261, + height = 273, + repeat_count = 40, + animation_speed = 0.4, + shift = util.by_pixel(-2.25, -4.75), + scale = 0.5 + }, + { + filename = BASEENTITY .. "pumpjack/pumpjack-base-shadow.png", + priority = "extra-high", + width = 220, + height = 220, + scale = 0.5, + draw_as_shadow = true, + repeat_count = 40, + animation_speed = 0.4, + shift = util.by_pixel(6, 0.5) + }, + { + priority = "high", + filename = ENTITYPATH .. "wells/pumpjack-decolorized.png", + animation_speed = 0.4, + scale = 0.5, + tint = {0.48, 0.84, 1}, + line_length = 8, + width = 206, + height = 202, + frame_count = 40, + shift = util.by_pixel(-4, -24) + }, + { + priority = "high", + filename = BASEENTITY .. "pumpjack/pumpjack-horsehead-shadow.png", + animation_speed = 0.4, + draw_as_shadow = true, + line_length = 8, + width = 309, + height = 82, + frame_count = 40, + scale = 0.5, + shift = util.by_pixel(17.75, 14.5) + } } - } - }, - east = { - layers = { - { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base.png", - priority = "extra-high", - width = 261, - height = 273, - x = 261, - repeat_count = 40, - animation_speed = 0.4, - shift = util.by_pixel(-2.25, -4.75), - scale = 0.5 - }, - { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base-shadow.png", - priority = "extra-high", - width = 220, - height = 220, - x = 220, - scale = 0.5, - draw_as_shadow = true, - repeat_count = 40, - animation_speed = 0.4, - shift = util.by_pixel(6, 0.5) - }, - { - priority = "high", - filename = ENTITYPATH .. "wells/hr-pumpjack-decolorized.png", - animation_speed = 0.4, - scale = 0.5, - tint = {0.48, 0.84, 1}, - line_length = 8, - width = 206, - height = 202, - frame_count = 40, - shift = util.by_pixel(-4, -24) - }, - { - priority = "high", - filename = BASEENTITY .. "pumpjack/hr-pumpjack-horsehead-shadow.png", - animation_speed = 0.4, - draw_as_shadow = true, - line_length = 8, - width = 309, - height = 82, - frame_count = 40, - scale = 0.5, - shift = util.by_pixel(17.75, 14.5) + }, + east = { + layers = { + { + filename = BASEENTITY .. "pumpjack/pumpjack-base.png", + priority = "extra-high", + width = 261, + height = 273, + x = 261, + repeat_count = 40, + animation_speed = 0.4, + shift = util.by_pixel(-2.25, -4.75), + scale = 0.5 + }, + { + filename = BASEENTITY .. "pumpjack/pumpjack-base-shadow.png", + priority = "extra-high", + width = 220, + height = 220, + x = 220, + scale = 0.5, + draw_as_shadow = true, + repeat_count = 40, + animation_speed = 0.4, + shift = util.by_pixel(6, 0.5) + }, + { + priority = "high", + filename = ENTITYPATH .. "wells/pumpjack-decolorized.png", + animation_speed = 0.4, + scale = 0.5, + tint = {0.48, 0.84, 1}, + line_length = 8, + width = 206, + height = 202, + frame_count = 40, + shift = util.by_pixel(-4, -24) + }, + { + priority = "high", + filename = BASEENTITY .. "pumpjack/pumpjack-horsehead-shadow.png", + animation_speed = 0.4, + draw_as_shadow = true, + line_length = 8, + width = 309, + height = 82, + frame_count = 40, + scale = 0.5, + shift = util.by_pixel(17.75, 14.5) + } } - } - }, - south = { - layers = { - { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base.png", - priority = "extra-high", - width = 261, - height = 273, - x = 522, - repeat_count = 40, - animation_speed = 0.4, - shift = util.by_pixel(-2.25, -4.75), - scale = 0.5 - }, - { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base-shadow.png", - priority = "extra-high", - width = 220, - height = 220, - x = 440, - scale = 0.5, - draw_as_shadow = true, - repeat_count = 40, - animation_speed = 0.4, - shift = util.by_pixel(6, 0.5) - }, - { - priority = "high", - filename = ENTITYPATH .. "wells/hr-pumpjack-decolorized.png", - animation_speed = 0.4, - scale = 0.5, - tint = {0.48, 0.84, 1}, - line_length = 8, - width = 206, - height = 202, - frame_count = 40, - shift = util.by_pixel(-4, -24) - }, - { - priority = "high", - filename = BASEENTITY .. "pumpjack/hr-pumpjack-horsehead-shadow.png", - animation_speed = 0.4, - draw_as_shadow = true, - line_length = 8, - width = 309, - height = 82, - frame_count = 40, - scale = 0.5, - shift = util.by_pixel(17.75, 14.5) - } - } - }, - west = { - layers = { - { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base.png", - priority = "extra-high", - width = 261, - height = 273, - x = 783, - repeat_count = 40, - animation_speed = 0.4, - shift = util.by_pixel(-2.25, -4.75), - scale = 0.5 - }, - { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base-shadow.png", - priority = "extra-high", - width = 220, - height = 220, - x = 660, - scale = 0.5, - draw_as_shadow = true, - repeat_count = 40, - animation_speed = 0.4, - shift = util.by_pixel(6, 0.5) - }, - { - priority = "high", - filename = ENTITYPATH .. "wells/hr-pumpjack-decolorized.png", - animation_speed = 0.4, - scale = 0.5, - tint = {0.48, 0.84, 1}, - line_length = 8, - width = 206, - height = 202, - frame_count = 40, - shift = util.by_pixel(-4, -24) - }, - { - priority = "high", - filename = BASEENTITY .. "pumpjack/hr-pumpjack-horsehead-shadow.png", - animation_speed = 0.4, - draw_as_shadow = true, - line_length = 8, - width = 309, - height = 82, - frame_count = 40, - scale = 0.5, - shift = util.by_pixel(17.75, 14.5) + }, + south = { + layers = { + { + filename = BASEENTITY .. "pumpjack/pumpjack-base.png", + priority = "extra-high", + width = 261, + height = 273, + x = 522, + repeat_count = 40, + animation_speed = 0.4, + shift = util.by_pixel(-2.25, -4.75), + scale = 0.5 + }, + { + filename = BASEENTITY .. "pumpjack/pumpjack-base-shadow.png", + priority = "extra-high", + width = 220, + height = 220, + x = 440, + scale = 0.5, + draw_as_shadow = true, + repeat_count = 40, + animation_speed = 0.4, + shift = util.by_pixel(6, 0.5) + }, + { + priority = "high", + filename = ENTITYPATH .. "wells/pumpjack-decolorized.png", + animation_speed = 0.4, + scale = 0.5, + tint = {0.48, 0.84, 1}, + line_length = 8, + width = 206, + height = 202, + frame_count = 40, + shift = util.by_pixel(-4, -24) + }, + { + priority = "high", + filename = BASEENTITY .. "pumpjack/pumpjack-horsehead-shadow.png", + animation_speed = 0.4, + draw_as_shadow = true, + line_length = 8, + width = 309, + height = 82, + frame_count = 40, + scale = 0.5, + shift = util.by_pixel(17.75, 14.5) + } + } + }, + west = { + layers = { + { + filename = BASEENTITY .. "pumpjack/pumpjack-base.png", + priority = "extra-high", + width = 261, + height = 273, + x = 783, + repeat_count = 40, + animation_speed = 0.4, + shift = util.by_pixel(-2.25, -4.75), + scale = 0.5 + }, + { + filename = BASEENTITY .. "pumpjack/pumpjack-base-shadow.png", + priority = "extra-high", + width = 220, + height = 220, + x = 660, + scale = 0.5, + draw_as_shadow = true, + repeat_count = 40, + animation_speed = 0.4, + shift = util.by_pixel(6, 0.5) + }, + { + priority = "high", + filename = ENTITYPATH .. "wells/pumpjack-decolorized.png", + animation_speed = 0.4, + scale = 0.5, + tint = {0.48, 0.84, 1}, + line_length = 8, + width = 206, + height = 202, + frame_count = 40, + shift = util.by_pixel(-4, -24) + }, + { + priority = "high", + filename = BASEENTITY .. "pumpjack/pumpjack-horsehead-shadow.png", + animation_speed = 0.4, + draw_as_shadow = true, + line_length = 8, + width = 309, + height = 82, + frame_count = 40, + scale = 0.5, + shift = util.by_pixel(17.75, 14.5) + } } } } @@ -754,7 +797,7 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input", - emissions = 0.05, + emissions_per_minute = {pollution = 0.05}, drain = "100kW" }, energy_usage = "1100kW", @@ -770,224 +813,226 @@ data:extend({ { type = "fire", decrease = 100, percent = 90 } }, working_sound = data.raw["offshore-pump"]["offshore-pump"].working_sound, - vehicle_impact_sound = data.raw["offshore-pump"]["offshore-pump"].vehicle_impact_sound, + impact_category = data.raw["offshore-pump"]["offshore-pump"].impact_category, fluid_boxes = { { production_type = "output", - base_area = 10, - base_level = 0, - height = 6, + volume = 500, pipe_covers = pipecoverspictures(), pipe_connections = { - { positions = { {1, -2}, {2, -1}, {-1, 2}, {-2, 1} } } + { positions = { {1, -1}, {1, -1}, {-1, 1}, {-1, 1} }, direction = defines.direction.north } } } }, - pipe_covers = pipecoverspictures(), - module_specification = { module_slots = 2 }, + module_slots = 2, allowed_effects = {"speed", "consumption", "pollution"}, fast_replaceable_group = "well", - - animation = { - north = { - layers = { - { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base.png", - priority = "extra-high", - width = 261, - height = 273, - repeat_count = 40, - animation_speed = 0.6, - shift = util.by_pixel(-2.25, -4.75), - scale = 0.5 - }, - { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base-shadow.png", - priority = "extra-high", - width = 220, - height = 220, - scale = 0.5, - draw_as_shadow = true, - repeat_count = 40, - animation_speed = 0.6, - shift = util.by_pixel(6, 0.5) - }, - { - priority = "high", - filename = ENTITYPATH .. "wells/hr-pumpjack-decolorized.png", - animation_speed = 0.6, - tint = {0.45, 0.45, 1}, - scale = 0.5, - line_length = 8, - width = 206, - height = 202, - frame_count = 40, - shift = util.by_pixel(-4, -24) - }, - { - priority = "high", - filename = BASEENTITY .. "pumpjack/hr-pumpjack-horsehead-shadow.png", - animation_speed = 0.6, - draw_as_shadow = true, - line_length = 8, - width = 309, - height = 82, - frame_count = 40, - scale = 0.5, - shift = util.by_pixel(17.75, 14.5) + + circuit_connector = circuit_connector_definitions["pumpjack"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + + graphics_set = { + animation = { + north = { + layers = { + { + filename = BASEENTITY .. "pumpjack/pumpjack-base.png", + priority = "extra-high", + width = 261, + height = 273, + repeat_count = 40, + animation_speed = 0.6, + shift = util.by_pixel(-2.25, -4.75), + scale = 0.5 + }, + { + filename = BASEENTITY .. "pumpjack/pumpjack-base-shadow.png", + priority = "extra-high", + width = 220, + height = 220, + scale = 0.5, + draw_as_shadow = true, + repeat_count = 40, + animation_speed = 0.6, + shift = util.by_pixel(6, 0.5) + }, + { + priority = "high", + filename = ENTITYPATH .. "wells/pumpjack-decolorized.png", + animation_speed = 0.6, + tint = {0.45, 0.45, 1}, + scale = 0.5, + line_length = 8, + width = 206, + height = 202, + frame_count = 40, + shift = util.by_pixel(-4, -24) + }, + { + priority = "high", + filename = BASEENTITY .. "pumpjack/pumpjack-horsehead-shadow.png", + animation_speed = 0.6, + draw_as_shadow = true, + line_length = 8, + width = 309, + height = 82, + frame_count = 40, + scale = 0.5, + shift = util.by_pixel(17.75, 14.5) + } } - } - }, - east = { - layers = { - { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base.png", - priority = "extra-high", - width = 261, - height = 273, - x = 261, - repeat_count = 40, - animation_speed = 0.6, - shift = util.by_pixel(-2.25, -4.75), - scale = 0.5 - }, - { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base-shadow.png", - priority = "extra-high", - width = 220, - height = 220, - x = 220, - scale = 0.5, - draw_as_shadow = true, - repeat_count = 40, - animation_speed = 0.6, - shift = util.by_pixel(6, 0.5) - }, - { - priority = "high", - filename = ENTITYPATH .. "wells/hr-pumpjack-decolorized.png", - animation_speed = 0.6, - scale = 0.5, - tint = {0.45, 0.45, 1}, - line_length = 8, - width = 206, - height = 202, - frame_count = 40, - shift = util.by_pixel(-4, -24) - }, - { - priority = "high", - filename = BASEENTITY .. "pumpjack/hr-pumpjack-horsehead-shadow.png", - animation_speed = 0.6, - draw_as_shadow = true, - line_length = 8, - width = 309, - height = 82, - frame_count = 40, - scale = 0.5, - shift = util.by_pixel(17.75, 14.5) + }, + east = { + layers = { + { + filename = BASEENTITY .. "pumpjack/pumpjack-base.png", + priority = "extra-high", + width = 261, + height = 273, + x = 261, + repeat_count = 40, + animation_speed = 0.6, + shift = util.by_pixel(-2.25, -4.75), + scale = 0.5 + }, + { + filename = BASEENTITY .. "pumpjack/pumpjack-base-shadow.png", + priority = "extra-high", + width = 220, + height = 220, + x = 220, + scale = 0.5, + draw_as_shadow = true, + repeat_count = 40, + animation_speed = 0.6, + shift = util.by_pixel(6, 0.5) + }, + { + priority = "high", + filename = ENTITYPATH .. "wells/pumpjack-decolorized.png", + animation_speed = 0.6, + scale = 0.5, + tint = {0.45, 0.45, 1}, + line_length = 8, + width = 206, + height = 202, + frame_count = 40, + shift = util.by_pixel(-4, -24) + }, + { + priority = "high", + filename = BASEENTITY .. "pumpjack/pumpjack-horsehead-shadow.png", + animation_speed = 0.6, + draw_as_shadow = true, + line_length = 8, + width = 309, + height = 82, + frame_count = 40, + scale = 0.5, + shift = util.by_pixel(17.75, 14.5) + } } - } - }, - south = { - layers = { - { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base.png", - priority = "extra-high", - width = 261, - height = 273, - x = 522, - repeat_count = 40, - animation_speed = 0.6, - shift = util.by_pixel(-2.25, -4.75), - scale = 0.5 - }, - { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base-shadow.png", - priority = "extra-high", - width = 220, - height = 220, - x = 440, - scale = 0.5, - draw_as_shadow = true, - repeat_count = 40, - animation_speed = 0.6, - shift = util.by_pixel(6, 0.5) - }, - { - priority = "high", - filename = ENTITYPATH .. "wells/hr-pumpjack-decolorized.png", - animation_speed = 0.6, - scale = 0.5, - tint = {0.45, 0.45, 1}, - line_length = 8, - width = 206, - height = 202, - frame_count = 40, - shift = util.by_pixel(-4, -24) - }, - { - priority = "high", - filename = BASEENTITY .. "pumpjack/hr-pumpjack-horsehead-shadow.png", - animation_speed = 0.6, - draw_as_shadow = true, - line_length = 8, - width = 309, - height = 82, - frame_count = 40, - scale = 0.5, - shift = util.by_pixel(17.75, 14.5) + }, + south = { + layers = { + { + filename = BASEENTITY .. "pumpjack/pumpjack-base.png", + priority = "extra-high", + width = 261, + height = 273, + x = 522, + repeat_count = 40, + animation_speed = 0.6, + shift = util.by_pixel(-2.25, -4.75), + scale = 0.5 + }, + { + filename = BASEENTITY .. "pumpjack/pumpjack-base-shadow.png", + priority = "extra-high", + width = 220, + height = 220, + x = 440, + scale = 0.5, + draw_as_shadow = true, + repeat_count = 40, + animation_speed = 0.6, + shift = util.by_pixel(6, 0.5) + }, + { + priority = "high", + filename = ENTITYPATH .. "wells/pumpjack-decolorized.png", + animation_speed = 0.6, + scale = 0.5, + tint = {0.45, 0.45, 1}, + line_length = 8, + width = 206, + height = 202, + frame_count = 40, + shift = util.by_pixel(-4, -24) + }, + { + priority = "high", + filename = BASEENTITY .. "pumpjack/pumpjack-horsehead-shadow.png", + animation_speed = 0.6, + draw_as_shadow = true, + line_length = 8, + width = 309, + height = 82, + frame_count = 40, + scale = 0.5, + shift = util.by_pixel(17.75, 14.5) + } } - } - }, - west = { - layers = { - { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base.png", - priority = "extra-high", - width = 261, - height = 273, - x = 783, - repeat_count = 40, - animation_speed = 0.6, - shift = util.by_pixel(-2.25, -4.75), - scale = 0.5 - }, - { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base-shadow.png", - priority = "extra-high", - width = 220, - height = 220, - x = 660, - scale = 0.5, - draw_as_shadow = true, - repeat_count = 40, - animation_speed = 0.6, - shift = util.by_pixel(6, 0.5) - }, - { - priority = "high", - filename = ENTITYPATH .. "wells/hr-pumpjack-decolorized.png", - animation_speed = 0.6, - scale = 0.5, - tint = {0.45, 0.45, 1}, - line_length = 8, - width = 206, - height = 202, - frame_count = 40, - shift = util.by_pixel(-4, -24) - }, - { - priority = "high", - filename = BASEENTITY .. "pumpjack/hr-pumpjack-horsehead-shadow.png", - animation_speed = 0.6, - draw_as_shadow = true, - line_length = 8, - width = 309, - height = 82, - frame_count = 40, - scale = 0.5, - shift = util.by_pixel(17.75, 14.5) + }, + west = { + layers = { + { + filename = BASEENTITY .. "pumpjack/pumpjack-base.png", + priority = "extra-high", + width = 261, + height = 273, + x = 783, + repeat_count = 40, + animation_speed = 0.6, + shift = util.by_pixel(-2.25, -4.75), + scale = 0.5 + }, + { + filename = BASEENTITY .. "pumpjack/pumpjack-base-shadow.png", + priority = "extra-high", + width = 220, + height = 220, + x = 660, + scale = 0.5, + draw_as_shadow = true, + repeat_count = 40, + animation_speed = 0.6, + shift = util.by_pixel(6, 0.5) + }, + { + priority = "high", + filename = ENTITYPATH .. "wells/pumpjack-decolorized.png", + animation_speed = 0.6, + scale = 0.5, + tint = {0.45, 0.45, 1}, + line_length = 8, + width = 206, + height = 202, + frame_count = 40, + shift = util.by_pixel(-4, -24) + }, + { + priority = "high", + filename = BASEENTITY .. "pumpjack/pumpjack-horsehead-shadow.png", + animation_speed = 0.6, + draw_as_shadow = true, + line_length = 8, + width = 309, + height = 82, + frame_count = 40, + scale = 0.5, + shift = util.by_pixel(17.75, 14.5) + } } } } @@ -999,11 +1044,12 @@ local lw1 = util.table.deepcopy(data.raw["assembling-machine"]["nullius-well-1"] lw1.name = "nullius-legacy-well-1" lw1.localised_name = {"entity-name.nullius-legacy", {"entity-name.nullius-well-1"}} lw1.icons = data.raw.item["nullius-legacy-well-1"].icons -lw1.flags = {"placeable-neutral", "player-creation", "hidden", "not-upgradable", "not-blueprintable"} +lw1.flags = {"placeable-neutral", "player-creation", "not-upgradable", "not-blueprintable"} +lw1.hidden = true lw1.placeable_by = {item = "nullius-legacy-well-1", count = 1} lw1.fast_replaceable_group = nil lw1.next_upgrade = nil -lw1.energy_source = {type="electric", usage_priority="secondary-input", emissions=0.01, drain="1kW"} +lw1.energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute = {pollution = 0.01}, drain="1kW"} lw1.energy_usage = "49kW" lw1.crafting_speed = 1.25 @@ -1011,13 +1057,21 @@ local lw2 = util.table.deepcopy(data.raw["assembling-machine"]["nullius-well-2"] lw2.name = "nullius-legacy-well-2" lw2.localised_name = {"entity-name.nullius-legacy", {"entity-name.nullius-well-2"}} lw2.icons = data.raw.item["nullius-legacy-well-2"].icons -lw2.flags = {"placeable-neutral", "player-creation", "hidden", "not-upgradable", "not-blueprintable"} +lw2.flags = {"placeable-neutral", "player-creation", "not-upgradable", "not-blueprintable"} +lw2.hidden = true lw2.placeable_by = {item = "nullius-legacy-well-2", count = 1} lw2.fast_replaceable_group = nil -lw2.energy_source = {type="electric", usage_priority="secondary-input", emissions=0.02, drain="5kW"} +lw2.energy_source = {type="electric", usage_priority="secondary-input", emissions_per_minute = {pollution = 0.02}, drain="5kW"} lw2.energy_usage = "175kW" lw2.crafting_speed = 5 +circuit_connector_definitions["nullius-air-filter"] = circuit_connector_definitions.create_vector(universal_connector_template, { + { variation = 4, main_offset = util.by_pixel(-4.375, -20), shadow_offset = util.by_pixel(-4.375, -20), show_shadow = true }, + { variation = 4, main_offset = util.by_pixel(-4.375, -20), shadow_offset = util.by_pixel(-4.375, -20), show_shadow = true }, + { variation = 4, main_offset = util.by_pixel(-4.375, -20), shadow_offset = util.by_pixel(-4.375, -20), show_shadow = true }, + { variation = 4, main_offset = util.by_pixel(-4.375, -20), shadow_offset = util.by_pixel(-4.375, 62.625), show_shadow = true }, +}) + data:extend({ lw1, lw2, @@ -1030,11 +1084,11 @@ data:extend({ crafting_speed = 1, fixed_recipe = "nullius-air-filtration", energy_source = { - type = "electric", - usage_priority = "secondary-input", - emissions = 0.01, - drain = "5kW" - }, + type = "electric", + usage_priority = "secondary-input", + emissions_per_minute = {pollution = 0.01}, + drain = "5kW" + }, energy_usage = "115kW", ingredient_count = 1, minable = {mining_time = 0.6, result = "nullius-air-filter-1"}, @@ -1045,67 +1099,73 @@ data:extend({ selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, fast_replaceable_group = "air-filter", next_upgrade = "nullius-air-filter-2", - animation = { - north = { - filename = "__angelspetrochem__/graphics/entity/air-filter/air-filter.png", - width = 256, - height = 256, - frame_count = 36, - line_length = 6, - shift = {0.2, -0.4+0.25}, - animation_speed = 0.5, - scale = 0.5 - }, - east = { - filename = "__angelspetrochem__/graphics/entity/air-filter/air-filter.png", - width = 256, - height = 256, - frame_count = 36, - line_length = 6, - shift = {0.2-0.25, -0.4}, - animation_speed = 0.5, - scale = 0.5 - }, - south = { - filename = "__angelspetrochem__/graphics/entity/air-filter/air-filter.png", - width = 256, - height = 256, - frame_count = 36, - line_length = 6, - shift = {0.2, -0.4-0.25}, - animation_speed = 0.5, - scale = 0.5 - }, - west = { - filename = "__angelspetrochem__/graphics/entity/air-filter/air-filter.png", - width = 256, - height = 256, - frame_count = 36, - line_length = 6, - shift = {0.2+0.25, -0.4}, - animation_speed = 0.5, - scale = 0.5 + circuit_connector = circuit_connector_definitions["nullius-air-filter"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + graphics_set = { + animation = { + north = { + filename = "__angelspetrochemgraphics__/graphics/entity/air-filter/air-filter.png", + width = 256, + height = 256, + frame_count = 36, + line_length = 6, + shift = {0.2, -0.4+0.25}, + animation_speed = 0.5, + scale = 0.5 + }, + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/air-filter/air-filter.png", + width = 256, + height = 256, + frame_count = 36, + line_length = 6, + shift = {0.2-0.25, -0.4}, + animation_speed = 0.5, + scale = 0.5 + }, + south = { + filename = "__angelspetrochemgraphics__/graphics/entity/air-filter/air-filter.png", + width = 256, + height = 256, + frame_count = 36, + line_length = 6, + shift = {0.2, -0.4-0.25}, + animation_speed = 0.5, + scale = 0.5 + }, + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/air-filter/air-filter.png", + width = 256, + height = 256, + frame_count = 36, + line_length = 6, + shift = {0.2+0.25, -0.4}, + animation_speed = 0.5, + scale = 0.5 + } } }, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } }, - working_sound = data.raw["assembling-machine"]["angels-air-filter"].working_sound, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + working_sound = { + sound = { filename = "__base__/sound/idle1.ogg", volume = 1 }, + idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, + }, + impact_category = "metal", fluid_boxes = { { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 2, - base_level = 3, - height = 2, - pipe_connections = {{ position = {0, 2}, type = "output" }} + volume = 500, + pipe_connections = {{ position = {0, 1}, flow_direction = "output", direction = defines.direction.south }} }, - }, - pipe_covers = pipecoverspictures() - }, + } + } +}) +data:extend({ { type = "assembling-machine", name = "nullius-air-filter-2", @@ -1115,11 +1175,11 @@ data:extend({ crafting_speed = 3, fixed_recipe = "nullius-air-filtration", energy_source = { - type = "electric", - usage_priority = "secondary-input", - emissions = 0.03, - drain = "25kW" - }, + type = "electric", + usage_priority = "secondary-input", + emissions_per_minute = {pollution = 0.03}, + drain = "25kW" + }, energy_usage = "375kW", ingredient_count = 1, minable = {mining_time = 0.8, result = "nullius-air-filter-2"}, @@ -1130,67 +1190,68 @@ data:extend({ selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, fast_replaceable_group = "air-filter", next_upgrade = "nullius-air-filter-3", - animation = { - north = { - filename = "__angelspetrochem__/graphics/entity/air-filter/air-filter.png", - width = 256, - height = 256, - frame_count = 36, - line_length = 6, - shift = {0.2, -0.4+0.125}, - animation_speed = 0.5, - scale = 0.55 - }, - east = { - filename = "__angelspetrochem__/graphics/entity/air-filter/air-filter.png", - width = 256, - height = 256, - frame_count = 36, - line_length = 6, - shift = {0.2-0.125, -0.4}, - animation_speed = 0.5, - scale = 0.55 - }, - south = { - filename = "__angelspetrochem__/graphics/entity/air-filter/air-filter.png", - width = 256, - height = 256, - frame_count = 36, - line_length = 6, - shift = {0.2, -0.4-0.125}, - animation_speed = 0.5, - scale = 0.55 - }, - west = { - filename = "__angelspetrochem__/graphics/entity/air-filter/air-filter.png", - width = 256, - height = 256, - frame_count = 36, - line_length = 6, - shift = {0.2+0.125, -0.4}, - animation_speed = 0.5, - scale = 0.55 + circuit_connector = circuit_connector_definitions["nullius-air-filter"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + graphics_set = { + animation = { + north = { + filename = "__angelspetrochemgraphics__/graphics/entity/air-filter/air-filter.png", + width = 256, + height = 256, + frame_count = 36, + line_length = 6, + shift = {0.2, -0.4+0.125}, + animation_speed = 0.5, + scale = 0.55 + }, + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/air-filter/air-filter.png", + width = 256, + height = 256, + frame_count = 36, + line_length = 6, + shift = {0.2-0.125, -0.4}, + animation_speed = 0.5, + scale = 0.55 + }, + south = { + filename = "__angelspetrochemgraphics__/graphics/entity/air-filter/air-filter.png", + width = 256, + height = 256, + frame_count = 36, + line_length = 6, + shift = {0.2, -0.4-0.125}, + animation_speed = 0.5, + scale = 0.55 + }, + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/air-filter/air-filter.png", + width = 256, + height = 256, + frame_count = 36, + line_length = 6, + shift = {0.2+0.125, -0.4}, + animation_speed = 0.5, + scale = 0.55 + } } }, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } }, - module_specification = { module_slots = 1 }, + module_slots = 1, allowed_effects = {"speed", "consumption", "pollution"}, - working_sound = data.raw["assembling-machine"]["angels-air-filter"].working_sound, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + working_sound = data.raw["assembling-machine"]["nullius-air-filter-1"].working_sound, + impact_category = "metal", fluid_boxes = { { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 4, - height = 2, - pipe_connections = {{ position = {0, 2}, type = "output" }} + volume = 500, + pipe_connections = {{ position = {0, 1}, flow_direction = "output", direction = defines.direction.south }} }, - }, - pipe_covers = pipecoverspictures() + } }, { @@ -1202,11 +1263,11 @@ data:extend({ crafting_speed = 8, fixed_recipe = "nullius-air-filtration", energy_source = { - type = "electric", - usage_priority = "secondary-input", - emissions = 0.1, - drain = "100kW" - }, + type = "electric", + usage_priority = "secondary-input", + emissions_per_minute = {pollution = 0.1}, + drain = "100kW" + }, energy_usage = "1100kW", ingredient_count = 1, minable = {mining_time = 1, result = "nullius-air-filter-3"}, @@ -1216,44 +1277,46 @@ data:extend({ collision_box = {{-1.1, -1.1}, {1.1, 1.1}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, fast_replaceable_group = "air-filter", - animation = { - filename = "__angelspetrochem__/graphics/entity/air-filter/air-filter.png", - width = 256, - height = 256, - frame_count = 36, - line_length = 6, - shift = {0.3, -0.4}, - animation_speed = 0.6, - scale = 0.6 + circuit_connector = circuit_connector_definitions["nullius-air-filter"], + circuit_wire_max_distance = default_circuit_wire_max_distance, + graphics_set = { + animation = { + filename = "__angelspetrochemgraphics__/graphics/entity/air-filter/air-filter.png", + width = 256, + height = 256, + frame_count = 36, + line_length = 6, + shift = {0.3, -0.4}, + animation_speed = 0.6, + scale = 0.6 + } }, resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } }, - module_specification = { module_slots = 2 }, + module_slots = 2, allowed_effects = {"speed", "consumption", "pollution"}, - working_sound = data.raw["assembling-machine"]["angels-air-filter"].working_sound, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + working_sound = data.raw["assembling-machine"]["nullius-air-filter-1"].working_sound, + impact_category = "metal", fluid_boxes = { { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = 5, - height = 3, - pipe_connections = {{ position = {0, 2}, type = "output" }} + volume = 500, + pipe_connections = {{ position = {0, 1}, flow_direction = "output", direction = defines.direction.south }} }, - }, - pipe_covers = pipecoverspictures() + } }, - + + ---------------------------------------- VALVES ----------------------------------------------- { - type = "storage-tank", + type = "valve", name = "nullius-priority-valve", - icon = "__angelspetrochem__/graphics/icons/valve-inspector.png", + icon = "__angelspetrochemgraphics__/graphics/icons/valve-inspector.png", icon_size = 32, flags = {"placeable-player", "player-creation"}, - minable = {hardness = 0.6, mining_time = 0.2, result = "nullius-priority-valve"}, + minable = {mining_time = 0.2, result = "nullius-priority-valve"}, max_health = 80, corpse = "small-remnants", resistances = { @@ -1261,101 +1324,92 @@ data:extend({ { type = "fire", percent = 75 } }, fast_replaceable_group = "pipe", - two_direction_only = false, collision_box = {{-0.29, -0.29}, {0.29, 0.29}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, fluid_box = { - base_area = 1, - base_level = 1.25, - height = 5, + volume = 100, pipe_connections = { - { position = {0, 1}, type="output"}, - { position = {0, -1} } + {flow_direction = "output", position = {0, 0}, direction = defines.direction.south}, + {flow_direction = "input-output", position = {0, -0}, direction = defines.direction.north } }, - pipe_covers = pipecoverspictures() + pipe_covers = pipecoverspictures() }, - flow_length_in_ticks = 360, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - circuit_wire_connection_points = circuit_connector_definitions["offshore-pump"].points, - circuit_connector_sprites = circuit_connector_definitions["offshore-pump"].sprites, - circuit_wire_max_distance = default_circuit_wire_max_distance, - window_bounding_box = {{-0.125, 0.6875}, {0.1875, 1.1875}}, - pictures = { - picture = { - north = { - layers = { - { - filename = "__boblogistics__/graphics/entity/pipe/steel/hr-pipe-straight-vertical.png", - frames = 1, - width = 128, - height = 64, - scale = 0.5, - shift = {0, -0.5} - }, - { - filename = "__angelspetrochem__/graphics/entity/valve/valve-inspector.png", - priority = "extra-high", - frames = 1, - width = 64, - height = 64 - } - } - }, - east = { - filename = "__angelspetrochem__/graphics/entity/valve/valve-inspector.png", + impact_category = "metal", + + mode = "overflow", + threshold = 0.25, + flow_rate = 50, + + animations = { + north = { + layers = { + { + filename = "__boblogistics__/graphics/entity/pipe/steel/pipe-straight-vertical.png", + frame_count = 1, + width = 128, + height = 64, + scale = 0.5, + shift = {0, -0.5} + }, + { + filename = "__angelspetrochemgraphics__/graphics/entity/valve/valve-inspector.png", + priority = "extra-high", + frame_count = 1, + width = 64, + height = 64 + } + } + }, + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/valve/valve-inspector.png", priority = "extra-high", x = 64, - frames = 1, - width = 64, - height = 64, - shift = {0, 0} - }, - south = { - layers = { - { - filename = "__boblogistics__/graphics/entity/pipe/steel/hr-pipe-straight-vertical.png", - frames = 1, - width = 128, - height = 64, - scale = 0.5, - shift = {0, -0.5} - }, - { - filename = "__angelspetrochem__/graphics/entity/valve/valve-inspector.png", - priority = "extra-high", - x = 128, - frames = 1, - width = 64, - height = 64, - shift = {0, -0.05} - } - } - }, - west = { - filename = "__angelspetrochem__/graphics/entity/valve/valve-inspector.png", - priority = "extra-high", - x = 192, - frames = 1, + frame_count = 1, width = 64, height = 64, shift = {0, 0} - } }, - fluid_background = data.raw["storage-tank"]["valve-return"].pictures.fluid_background, - window_background = data.raw["storage-tank"]["valve-return"].pictures.window_background, - flow_sprite = data.raw["storage-tank"]["valve-return"].pictures.flow_sprite, - gas_flow = data.raw["storage-tank"]["valve-return"].pictures.gas_flow + south = { + layers = { + { + filename = "__boblogistics__/graphics/entity/pipe/steel/pipe-straight-vertical.png", + frame_count = 1, + width = 128, + height = 64, + scale = 0.5, + shift = {0, -0.5} + }, + { + filename = "__angelspetrochemgraphics__/graphics/entity/valve/valve-inspector.png", + priority = "extra-high", + x = 128, + frame_count = 1, + width = 64, + height = 64, + shift = {0, -0.05} + } + } + }, + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/valve/valve-inspector.png", + priority = "extra-high", + x = 192, + frame_count = 1, + width = 64, + height = 64, + shift = {0, 0} + } } }, - + { - type = "storage-tank", + type = "valve", name = "nullius-one-way-valve", - icon = "__angelspetrochem__/graphics/icons/valve-overflow.png", + icon = "__angelspetrochemgraphics__/graphics/icons/valve-overflow.png", icon_size = 32, flags = {"placeable-player", "player-creation"}, - minable = {hardness = 0.5, mining_time = 0.2, result = "nullius-one-way-valve"}, + minable = {mining_time = 0.2, result = "nullius-one-way-valve"}, max_health = 80, corpse = "small-remnants", resistances = { @@ -1363,100 +1417,91 @@ data:extend({ { type = "fire", percent = 75 } }, fast_replaceable_group = "pipe", - two_direction_only = false, collision_box = {{-0.29, -0.29}, {0.29, 0.29}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, fluid_box = { - base_area = 1, - height = 6.25, + volume = 100, pipe_connections = { - { position = {0, 1}, type="output"}, - { position = {0, -1} } + {flow_direction = "output", position = {0, 0}, direction = defines.direction.south}, + {flow_direction = "input-output", position = {0, 0}, direction = defines.direction.north } }, - pipe_covers = pipecoverspictures() + pipe_covers = pipecoverspictures() }, - flow_length_in_ticks = 360, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - circuit_wire_connection_points = circuit_connector_definitions["offshore-pump"].points, - circuit_connector_sprites = circuit_connector_definitions["offshore-pump"].sprites, - circuit_wire_max_distance = default_circuit_wire_max_distance, - window_bounding_box = {{-0.125, 0.6875}, {0.1875, 1.1875}}, - pictures = { - picture = { - north = { - layers = { - { - filename = "__boblogistics__/graphics/entity/pipe/steel/hr-pipe-straight-vertical.png", - frames = 1, - width = 128, - height = 64, - scale = 0.5, - shift = {0, -0.5} - }, - { - filename = "__angelspetrochem__/graphics/entity/valve/valve-overflow.png", - priority = "extra-high", - frames = 1, - width = 64, - height = 64 - } - } - }, - east = { - filename = "__angelspetrochem__/graphics/entity/valve/valve-overflow.png", + impact_category = "metal", + + mode = "one-way", + flow_rate = 50, + + animations = { + north = { + layers = { + { + filename = "__boblogistics__/graphics/entity/pipe/steel/pipe-straight-vertical.png", + frame_count = 1, + width = 128, + height = 64, + scale = 0.5, + shift = {0, -0.5} + }, + { + filename = "__angelspetrochemgraphics__/graphics/entity/valve/valve-overflow.png", + priority = "extra-high", + frame_count = 1, + width = 64, + height = 64 + } + } + }, + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/valve/valve-overflow.png", priority = "extra-high", x = 64, - frames = 1, + frame_count = 1, width = 64, height = 64, shift = {0, 0} - }, - south = { - layers = { - { - filename = "__boblogistics__/graphics/entity/pipe/steel/hr-pipe-straight-vertical.png", - frames = 1, - width = 128, - height = 64, - scale = 0.5, - shift = {0, -0.5} - }, - { - filename = "__angelspetrochem__/graphics/entity/valve/valve-overflow.png", - priority = "extra-high", - x = 128, - frames = 1, - width = 64, - height = 64, - shift = {0, -0.05} - } - } - }, - west = { - filename = "__angelspetrochem__/graphics/entity/valve/valve-overflow.png", - priority = "extra-high", - x = 192, - frames = 1, - width = 64, - height = 64, - shift = {0, 0} - } }, - fluid_background = data.raw["storage-tank"]["valve-return"].pictures.fluid_background, - window_background = data.raw["storage-tank"]["valve-return"].pictures.window_background, - flow_sprite = data.raw["storage-tank"]["valve-return"].pictures.flow_sprite, - gas_flow = data.raw["storage-tank"]["valve-return"].pictures.gas_flow + south = { + layers = { + { + filename = "__boblogistics__/graphics/entity/pipe/steel/pipe-straight-vertical.png", + frame_count = 1, + width = 128, + height = 64, + scale = 0.5, + shift = {0, -0.5} + }, + { + filename = "__angelspetrochemgraphics__/graphics/entity/valve/valve-overflow.png", + priority = "extra-high", + x = 128, + frame_count = 1, + width = 64, + height = 64, + shift = {0, -0.05} + } + } + }, + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/valve/valve-overflow.png", + priority = "extra-high", + x = 192, + frame_count = 1, + width = 64, + height = 64, + shift = {0, 0} + } } }, { - type = "storage-tank", + type = "valve", name = "nullius-top-up-valve", - icon = "__angelspetrochem__/graphics/icons/valve-converter.png", + icon = "__angelspetrochemgraphics__/graphics/icons/valve-underflow.png", icon_size = 32, flags = {"placeable-player", "player-creation"}, - minable = {hardness = 0.6, mining_time = 0.2, result = "nullius-top-up-valve"}, + minable = {mining_time = 0.2, result = "nullius-top-up-valve"}, max_health = 80, corpse = "small-remnants", resistances = { @@ -1464,100 +1509,92 @@ data:extend({ { type = "fire", percent = 75 } }, fast_replaceable_group = "pipe", - two_direction_only = false, collision_box = {{-0.29, -0.29}, {0.29, 0.29}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, fluid_box = { - base_area = 1, - height = 2.5, + volume = 100, pipe_connections = { - { position = {0, 1}, type="output"}, - { position = {0, -1} } + {flow_direction = "output", position = {0, 0}, direction = defines.direction.south}, + {flow_direction = "input-output", position = {0, 0}, direction = defines.direction.north } }, - pipe_covers = pipecoverspictures() + pipe_covers = pipecoverspictures() }, - flow_length_in_ticks = 360, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - circuit_wire_connection_points = circuit_connector_definitions["offshore-pump"].points, - circuit_connector_sprites = circuit_connector_definitions["offshore-pump"].sprites, - circuit_wire_max_distance = default_circuit_wire_max_distance, - window_bounding_box = {{-0.125, 0.6875}, {0.1875, 1.1875}}, - pictures = { - picture = { - north = { - layers = { - { - filename = "__boblogistics__/graphics/entity/pipe/steel/hr-pipe-straight-vertical.png", - frames = 1, - width = 128, - height = 64, - scale = 0.5, - shift = {0, -0.5} - }, - { - filename = "__angelspetrochem__/graphics/entity/valve/valve-converter.png", - priority = "extra-high", - frames = 1, - width = 64, - height = 64 - } - } - }, - east = { - filename = "__angelspetrochem__/graphics/entity/valve/valve-converter.png", - priority = "extra-high", - x = 64, - frames = 1, - width = 64, - height = 64, - shift = {0, 0} - }, - south = { - layers = { - { - filename = "__boblogistics__/graphics/entity/pipe/steel/hr-pipe-straight-vertical.png", - frames = 1, - width = 128, - height = 64, - scale = 0.5, - shift = {0, -0.5} - }, - { - filename = "__angelspetrochem__/graphics/entity/valve/valve-converter.png", - priority = "extra-high", - x = 128, - frames = 1, - width = 64, - height = 64, - shift = {0, -0.05} - } - } - }, - west = { - filename = "__angelspetrochem__/graphics/entity/valve/valve-converter.png", - priority = "extra-high", - x = 192, - frames = 1, - width = 64, - height = 64, - shift = {0, 0} - } + impact_category = "metal", + + mode = "top-up", + threshold = 0.5, + flow_rate = 50, + + animations = { + north = { + layers = { + { + filename = "__boblogistics__/graphics/entity/pipe/steel/pipe-straight-vertical.png", + frame_count = 1, + width = 128, + height = 64, + scale = 0.5, + shift = {0, -0.5} + }, + { + filename = "__angelspetrochemgraphics__/graphics/entity/valve/valve-underflow.png", + priority = "extra-high", + frame_count = 1, + width = 64, + height = 64 + } + } }, - fluid_background = data.raw["storage-tank"]["valve-return"].pictures.fluid_background, - window_background = data.raw["storage-tank"]["valve-return"].pictures.window_background, - flow_sprite = data.raw["storage-tank"]["valve-return"].pictures.flow_sprite, - gas_flow = data.raw["storage-tank"]["valve-return"].pictures.gas_flow + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/valve/valve-underflow.png", + priority = "extra-high", + x = 64, + frame_count = 1, + width = 64, + height = 64, + shift = {0, 0} + }, + south = { + layers = { + { + filename = "__boblogistics__/graphics/entity/pipe/steel/pipe-straight-vertical.png", + frame_count = 1, + width = 128, + height = 64, + scale = 0.5, + shift = {0, -0.5} + }, + { + filename = "__angelspetrochemgraphics__/graphics/entity/valve/valve-underflow.png", + priority = "extra-high", + x = 128, + frame_count = 1, + width = 64, + height = 64, + shift = {0, -0.05} + } + } + }, + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/valve/valve-underflow.png", + priority = "extra-high", + x = 192, + frame_count = 1, + width = 64, + height = 64, + shift = {0, 0} + } } }, { - type = "storage-tank", + type = "valve", name = "nullius-relief-valve", - icon = "__angelspetrochem__/graphics/icons/valve-return.png", + icon = "__angelspetrochemgraphics__/graphics/icons/valve-return.png", icon_size = 32, flags = {"placeable-player", "player-creation"}, - minable = {hardness = 0.6, mining_time = 0.2, result = "nullius-relief-valve"}, + minable = {mining_time = 0.2, result = "nullius-relief-valve"}, max_health = 80, corpse = "small-remnants", resistances = { @@ -1565,94 +1602,94 @@ data:extend({ { type = "fire", percent = 75 } }, fast_replaceable_group = "pipe", - two_direction_only = false, collision_box = {{-0.29, -0.29}, {0.29, 0.29}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, fluid_box = { - base_area = 1, - base_level = 3.75, - height = 2.5, + volume = 100, pipe_connections = { - { position = {0, 1}, type="output"}, - { position = {0, -1} } + {flow_direction = "output", position = {0, 0}, direction = defines.direction.south}, + {flow_direction = "input-output", position = {0, 0}, direction = defines.direction.north } + }, + pipe_covers = pipecoverspictures() + }, + + impact_category = "metal", + + mode = "overflow", + threshold = 0.75, + flow_rate = 50, + + animations = { + north = { + layers = { + { + filename = "__boblogistics__/graphics/entity/pipe/steel/pipe-straight-vertical.png", + frame_count = 1, + width = 128, + height = 64, + scale = 0.5, + shift = {0, -0.5} + }, + { + filename = "__angelspetrochemgraphics__/graphics/entity/valve/valve-return.png", + priority = "extra-high", + frame_count = 1, + width = 64, + height = 64 + } + } + }, + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/valve/valve-return.png", + priority = "extra-high", + x = 64, + frame_count = 1, + width = 64, + height = 64, + shift = {0, 0} }, - pipe_covers = pipecoverspictures() - }, - flow_length_in_ticks = 360, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - circuit_wire_connection_points = circuit_connector_definitions["offshore-pump"].points, - circuit_connector_sprites = circuit_connector_definitions["offshore-pump"].sprites, - circuit_wire_max_distance = default_circuit_wire_max_distance, - window_bounding_box = {{-0.125, 0.6875}, {0.1875, 1.1875}}, - - pictures = { - picture = { - north = { - layers = { - { - filename = "__boblogistics__/graphics/entity/pipe/steel/hr-pipe-straight-vertical.png", - frames = 1, - width = 128, - height = 64, - scale = 0.5, - shift = {0, -0.5} - }, - { - filename = "__angelspetrochem__/graphics/entity/valve/valve-return.png", - priority = "extra-high", - frames = 1, - width = 64, - height = 64 - } - } - }, - east = { - filename = "__angelspetrochem__/graphics/entity/valve/valve-return.png", - priority = "extra-high", - x = 64, - frames = 1, - width = 64, - height = 64, - shift = {0, 0} - }, - south = { - layers = { - { - filename = "__boblogistics__/graphics/entity/pipe/steel/hr-pipe-straight-vertical.png", - frames = 1, - width = 128, - height = 64, - scale = 0.5, - shift = {0, -0.5} - }, - { - filename = "__angelspetrochem__/graphics/entity/valve/valve-return.png", - priority = "extra-high", - x = 128, - frames = 1, - width = 64, - height = 64, - shift = {0, -0.05} - } - } - }, - west = { - filename = "__angelspetrochem__/graphics/entity/valve/valve-return.png", - priority = "extra-high", - x = 192, - frames = 1, - width = 64, - height = 64, - shift = {0, 0} - } + south = { + layers = { + { + filename = "__boblogistics__/graphics/entity/pipe/steel/pipe-straight-vertical.png", + frame_count = 1, + width = 128, + height = 64, + scale = 0.5, + shift = {0, -0.5} + }, + { + filename = "__angelspetrochemgraphics__/graphics/entity/valve/valve-return.png", + priority = "extra-high", + x = 128, + frame_count = 1, + width = 64, + height = 64, + shift = {0, -0.05} + } + } }, - fluid_background = data.raw["storage-tank"]["valve-return"].pictures.fluid_background, - window_background = data.raw["storage-tank"]["valve-return"].pictures.window_background, - flow_sprite = data.raw["storage-tank"]["valve-return"].pictures.flow_sprite, - gas_flow = data.raw["storage-tank"]["valve-return"].pictures.gas_flow + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/valve/valve-return.png", + priority = "extra-high", + x = 192, + frame_count = 1, + width = 64, + height = 64, + shift = {0, 0} + } } - }, + } +}) +circuit_connector_definitions["nullius-small-tank"] = circuit_connector_definitions.create_vector(universal_connector_template, { + { variation = 25, main_offset = util.by_pixel(-25.125, -23), shadow_offset = util.by_pixel(-25.125, -23), show_shadow = true }, + { variation = 25, main_offset = util.by_pixel(-25.125, -23), shadow_offset = util.by_pixel(-25.125, -23), show_shadow = true }, + { variation = 25, main_offset = util.by_pixel(-25.125, -23), shadow_offset = util.by_pixel(-25.125, -23), show_shadow = true }, + { variation = 25, main_offset = util.by_pixel(-25.125, -23), shadow_offset = util.by_pixel(-25.125, -23), show_shadow = true }, +}) + +data:extend({ { type = "storage-tank", name = "nullius-medium-tank-2", @@ -1661,20 +1698,18 @@ data:extend({ minable = {mining_time=1.2, result="nullius-medium-tank-2"}, max_health = 500, next_upgrade = "nullius-medium-tank-3", - fast_replaceable_group = "medium-tank", corpse = "storage-tank-remnants", fast_replaceable_group = "medium-tank", collision_box = {{-1.3, -1.3}, {1.3, 1.3}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, fluid_box = { - height = 4.5, - base_area = 66.6666667, + volume = 30000, pipe_covers = pipecoverspictures(), pipe_connections = { - { position = {-1, -2} }, - { position = {2, 1} }, - { position = {1, 2} }, - { position = {-2, -1} } + { position = {-1, -1}, direction = defines.direction.north }, + { position = {1, 1}, direction = defines.direction.east }, + { position = {1, 1}, direction = defines.direction.south }, + { position = {-1, -1}, direction = defines.direction.west } } }, two_direction_only = true, @@ -1684,10 +1719,9 @@ data:extend({ }, window_bounding_box = {{-0.125, 0.6875}, {0.1875, 1.1875}}, flow_length_in_ticks = 360, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = data.raw["storage-tank"]["storage-tank"].working_sound, - circuit_wire_connection_points = circuit_connector_definitions["storage-tank"].points, - circuit_connector_sprites = circuit_connector_definitions["storage-tank"].sprites, + circuit_connector = circuit_connector_definitions["storage-tank"], circuit_wire_max_distance = default_circuit_wire_max_distance, water_reflection = data.raw["storage-tank"]["storage-tank"].water_reflection, @@ -1705,15 +1739,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "storage-tank/storage-tank-shadow.png", - priority = "extra-high", - frames = 2, - width = 146, - height = 77, - shift = util.by_pixel(30, 22.5), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "storage-tank/hr-storage-tank-shadow.png", + filename = BASEENTITY .. "storage-tank/storage-tank-shadow.png", priority = "extra-high", frames = 2, width = 291, @@ -1721,7 +1747,6 @@ data:extend({ shift = util.by_pixel(29.75, 22.25), scale = 0.5, draw_as_shadow = true - } } } }, @@ -1745,14 +1770,13 @@ data:extend({ collision_box = {{-1.3, -1.3}, {1.3, 1.3}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, fluid_box = { - height = 5, - base_area = 120, + volume = 60000, pipe_covers = pipecoverspictures(), pipe_connections = { - { position = {-1, -2} }, - { position = {2, 1} }, - { position = {1, 2} }, - { position = {-2, -1} } + { position = {-1, -1}, direction = defines.direction.north }, + { position = {1, 1}, direction = defines.direction.east }, + { position = {1, 1}, direction = defines.direction.south }, + { position = {-1, -1}, direction = defines.direction.west } } }, two_direction_only = true, @@ -1762,10 +1786,9 @@ data:extend({ }, window_bounding_box = {{-0.125, 0.6875}, {0.1875, 1.1875}}, flow_length_in_ticks = 360, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = data.raw["storage-tank"]["storage-tank"].working_sound, - circuit_wire_connection_points = circuit_connector_definitions["storage-tank"].points, - circuit_connector_sprites = circuit_connector_definitions["storage-tank"].sprites, + circuit_connector = circuit_connector_definitions["storage-tank"], circuit_wire_max_distance = default_circuit_wire_max_distance, pictures = { @@ -1781,15 +1804,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "storage-tank/storage-tank-shadow.png", - priority = "extra-high", - frames = 2, - width = 146, - height = 77, - shift = util.by_pixel(30, 22.5), - draw_as_shadow = true, - hr_version = { - filename = BASEENTITY .. "storage-tank/hr-storage-tank-shadow.png", + filename = BASEENTITY .. "storage-tank/storage-tank-shadow.png", priority = "extra-high", frames = 2, width = 291, @@ -1797,7 +1812,6 @@ data:extend({ shift = util.by_pixel(29.75, 22.25), scale = 0.5, draw_as_shadow = true - } } } }, @@ -1813,20 +1827,19 @@ data:extend({ name = "nullius-small-tank-1", icons = data.raw.item["nullius-small-tank-1"].icons, flags = {"placeable-player", "player-creation"}, - minable = {hardness = 0.7, mining_time = 0.3, result = "nullius-small-tank-1"}, + minable = {mining_time = 0.3, result = "nullius-small-tank-1"}, max_health = 200, corpse = "medium-remnants", collision_box = {{-0.9, -0.9}, {0.9, 0.9}}, selection_box = {{-1, -1}, {1, 1}}, two_direction_only = false, fluid_box = { - height = 4.5, - base_area = 22.2222223, + volume = 10000, pipe_covers = pipecoverspictures(), pipe_connections = { - { position = {0.5, -1.5} }, - { position = {0.5, 1.5} }, - { position = {-1.5, 0.5} } + { position = {0.5, -0.5}, direction = defines.direction.north }, + { position = {0.5, 0.5}, direction = defines.direction.south }, + { position = {-0.5, 0.5}, direction = defines.direction.west } } }, resistances = { @@ -1841,7 +1854,7 @@ data:extend({ north = { layers = { { - filename = "__angelspetrochem__/graphics/entity/petrochem-inline-tank/hr-petrochem-inline-tank.png", + filename = "__angelspetrochemgraphics__/graphics/entity/petrochem-inline-tank/petrochem-inline-tank.png", priority = "extra-high", x = 0, width = 142, @@ -1851,7 +1864,7 @@ data:extend({ tint = {0.8, 0.8, 0.4} }, { - filename = "__angelspetrochem__/graphics/entity/petrochem-inline-tank/hr-petrochem-inline-tank.png", + filename = "__angelspetrochemgraphics__/graphics/entity/petrochem-inline-tank/petrochem-inline-tank.png", priority = "extra-high", x = 142, y = 117, @@ -1862,7 +1875,7 @@ data:extend({ tint = {0.8, 0.8, 0.4} }, { - filename = "__angelspetrochem__/graphics/entity/petrochem-inline-tank/hr-petrochem-inline-tank.png", + filename = "__angelspetrochemgraphics__/graphics/entity/petrochem-inline-tank/petrochem-inline-tank.png", priority = "extra-high", x = 171, y = 141, @@ -1873,7 +1886,7 @@ data:extend({ tint = {0.8, 0.8, 0.4} }, { - filename = "__angelspetrochem__/graphics/entity/petrochem-inline-tank/hr-petrochem-inline-tank-shadow.png", + filename = "__angelspetrochemgraphics__/graphics/entity/petrochem-inline-tank/petrochem-inline-tank-shadow.png", priority = "extra-high", x = 0, width = 207, @@ -1887,7 +1900,7 @@ data:extend({ east = { layers = { { - filename = "__angelspetrochem__/graphics/entity/petrochem-inline-tank/hr-petrochem-inline-tank.png", + filename = "__angelspetrochemgraphics__/graphics/entity/petrochem-inline-tank/petrochem-inline-tank.png", priority = "extra-high", x = 142, width = 142, @@ -1897,7 +1910,7 @@ data:extend({ tint = {0.8, 0.8, 0.4} }, { - filename = "__angelspetrochem__/graphics/entity/petrochem-inline-tank/hr-petrochem-inline-tank-shadow.png", + filename = "__angelspetrochemgraphics__/graphics/entity/petrochem-inline-tank/petrochem-inline-tank-shadow.png", priority = "extra-high", x = 207, width = 207, @@ -1911,7 +1924,7 @@ data:extend({ south = { layers = { { - filename = "__angelspetrochem__/graphics/entity/petrochem-inline-tank/hr-petrochem-inline-tank.png", + filename = "__angelspetrochemgraphics__/graphics/entity/petrochem-inline-tank/petrochem-inline-tank.png", priority = "extra-high", x = 284, width = 142, @@ -1921,7 +1934,7 @@ data:extend({ tint = {0.8, 0.8, 0.4} }, { - filename = "__angelspetrochem__/graphics/entity/petrochem-inline-tank/hr-petrochem-inline-tank.png", + filename = "__angelspetrochemgraphics__/graphics/entity/petrochem-inline-tank/petrochem-inline-tank.png", priority = "extra-high", x = 559, y = 48, @@ -1932,7 +1945,7 @@ data:extend({ tint = {0.8, 0.8, 0.4} }, { - filename = "__angelspetrochem__/graphics/entity/petrochem-inline-tank/hr-petrochem-inline-tank-shadow.png", + filename = "__angelspetrochemgraphics__/graphics/entity/petrochem-inline-tank/petrochem-inline-tank-shadow.png", priority = "extra-high", x = 414, width = 207, @@ -1946,7 +1959,7 @@ data:extend({ west = { layers = { { - filename = "__angelspetrochem__/graphics/entity/petrochem-inline-tank/hr-petrochem-inline-tank.png", + filename = "__angelspetrochemgraphics__/graphics/entity/petrochem-inline-tank/petrochem-inline-tank.png", priority = "extra-high", x = 426, width = 142, @@ -1956,7 +1969,7 @@ data:extend({ tint = {0.8, 0.8, 0.4} }, { - filename = "__angelspetrochem__/graphics/entity/petrochem-inline-tank/hr-petrochem-inline-tank.png", + filename = "__angelspetrochemgraphics__/graphics/entity/petrochem-inline-tank/petrochem-inline-tank.png", priority = "extra-high", x = 74, y = 136, @@ -1967,7 +1980,7 @@ data:extend({ tint = {0.8, 0.8, 0.4} }, { - filename = "__angelspetrochem__/graphics/entity/petrochem-inline-tank/hr-petrochem-inline-tank-shadow.png", + filename = "__angelspetrochemgraphics__/graphics/entity/petrochem-inline-tank/petrochem-inline-tank-shadow.png", priority = "extra-high", x = 621, width = 207, @@ -1979,16 +1992,37 @@ data:extend({ } } }, - fluid_background = data.raw["storage-tank"]["angels-storage-tank-3"].pictures.fluid_background, - window_background = data.raw["storage-tank"]["angels-storage-tank-3"].pictures.window_background, - flow_sprite = data.raw["storage-tank"]["angels-storage-tank-3"].pictures.flow_sprite, - gas_flow = data.raw["storage-tank"]["angels-storage-tank-3"].pictures.gas_flow + fluid_background = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/blank.png", + priority = "extra-high", + width = 1, + height = 1, + }, + window_background = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/blank.png", + priority = "extra-high", + width = 1, + height = 1, + }, + flow_sprite = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/blank.png", + priority = "extra-high", + width = 1, + height = 1, + }, + gas_flow = { + filename = "__angelspetrochemgraphics__/graphics/entity/electrolyser/blank.png", + priority = "extra-high", + width = 1, + height = 1, + frame_count = 1, + animation_speed = 0.25, + } }, flow_length_in_ticks = 360, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = data.raw["storage-tank"]["storage-tank"].working_sound, - circuit_wire_connection_points = circuit_connector_definitions["storage-tank"].points, - circuit_connector_sprites = circuit_connector_definitions["storage-tank"].sprites, + circuit_connector = circuit_connector_definitions["nullius-small-tank"], circuit_wire_max_distance = default_circuit_wire_max_distance } }) @@ -2000,20 +2034,19 @@ data:extend({ name = "nullius-small-tank-2", icons = data.raw.item["nullius-small-tank-2"].icons, flags = {"placeable-player", "player-creation"}, - minable = {hardness = 1, mining_time = 0.3, result = "nullius-small-tank-2"}, + minable = {mining_time = 0.3, result = "nullius-small-tank-2"}, max_health = 250, corpse = "medium-remnants", collision_box = {{-0.9, -0.9}, {0.9, 0.9}}, selection_box = {{-1, -1}, {1, 1}}, two_direction_only = false, fluid_box = { - height = 5, - base_area = 40, + volume = 20000, pipe_covers = pipecoverspictures(), pipe_connections = { - { position = {0.5, -1.5} }, - { position = {0.5, 1.5} }, - { position = {-1.5, 0.5} } + { position = {0.5, -0.5}, direction = defines.direction.north }, + { position = {0.5, 0.5}, direction = defines.direction.south}, + { position = {-0.5, 0.5}, direction = defines.direction.west } } }, resistances = { @@ -2024,10 +2057,9 @@ data:extend({ fast_replaceable_group = "small-tank", pictures = util.table.deepcopy(data.raw["storage-tank"]["nullius-small-tank-1"].pictures), flow_length_in_ticks = 360, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", working_sound = data.raw["storage-tank"]["storage-tank"].working_sound, - circuit_wire_connection_points = circuit_connector_definitions["storage-tank"].points, - circuit_connector_sprites = circuit_connector_definitions["storage-tank"].sprites, + circuit_connector = circuit_connector_definitions["nullius-small-tank"], circuit_wire_max_distance = default_circuit_wire_max_distance } }) @@ -2047,101 +2079,160 @@ data:extend({ type = "storage-tank", name = "nullius-large-tank-1", icons = data.raw.item["nullius-large-tank-1"].icons, - flags = {"placeable-player", "player-creation", "not-rotatable"}, - minable = {hardness = 2, mining_time = 3, result = "nullius-large-tank-1"}, + flags = {"placeable-player", "player-creation"}, -- , "not-rotatable" + minable = {mining_time = 3, result = "nullius-large-tank-1"}, + collision_mask = collision_mask_util.get_default_mask("rocket-silo"), -- generic tall building max_health = 1000, corpse = "medium-remnants", collision_box = {{-2.2, -2.2}, {2.2, 2.2}}, selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, two_direction_only = false, fluid_box = { - height = 5, - base_area = 250, + volume = 125000, pipe_covers = pipecoverspictures(), pipe_connections = { - { position = {0, -3} }, - { position = {3, 0} }, - { position = {-3, 0} }, - { position = {0, 3} }, + { position = {0, -2}, direction = defines.direction.north }, + { position = {2, 0}, direction = defines.direction.east }, + { position = {-2, 0}, direction = defines.direction.west }, + { position = {0, 2}, direction = defines.direction.south }, }, }, fast_replaceable_group = "large-tank", next_upgrade = "nullius-large-tank-2", window_bounding_box = {{-0.125, 0.6875}, {0.1875, 1.1875}}, flow_length_in_ticks = 360, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["storage-tank"]["angels-storage-tank-1"].working_sound, - circuit_wire_connection_points = circuit_connector_definitions["storage-tank"].points, - circuit_connector_sprites = circuit_connector_definitions["storage-tank"].sprites, + impact_category = "metal", + working_sound = { + sound = { + filename = "__base__/sound/storage-tank.ogg", + volume = 0.6, + }, + match_volume_to_activity = true, + max_sounds_per_prototype = 3, + }, + circuit_connector = circuit_connector_definitions["storage-tank"], circuit_wire_max_distance = default_circuit_wire_max_distance, - pictures = util.table.deepcopy(data.raw["storage-tank"]["angels-storage-tank-1"].pictures) - }, + pictures = { + picture = { + sheets = { + { + filename = "__angelspetrochemgraphics__/graphics/entity/petrochem-gas-tank/petrochem-gas-tank.png", + priority = "extra-high", + frames = 1, + width = 334, + height = 387, + shift = util.by_pixel(-0.5, -6), + scale = 0.5, + }, + { + filename = "__angelspetrochemgraphics__/graphics/entity/petrochem-gas-tank/petrochem-gas-tank-shadow.png", + priority = "extra-high", + frames = 1, + width = 437, + height = 237, + shift = util.by_pixel(26, 32), + draw_as_shadow = true, + scale = 0.5, + }, + }, + }, + fluid_background = { + filename = "__base__/graphics/entity/storage-tank/fluid-background.png", + priority = "extra-high", + width = 32, + height = 15, + }, + window_background = { + filename = "__base__/graphics/entity/storage-tank/window-background.png", + priority = "extra-high", + width = 34, + height = 48, + scale = 0.5, + }, + flow_sprite = { + filename = "__base__/graphics/entity/pipe/fluid-flow-low-temperature.png", + priority = "extra-high", + width = 160, + height = 20, + }, + gas_flow = { + filename = "__base__/graphics/entity/pipe/steam.png", + priority = "extra-high", + line_length = 10, + width = 48, + height = 30, + frame_count = 60, + animation_speed = 0.25, + scale = 0.5, + }, + } + } +}) +data:extend({ { type = "storage-tank", name = "nullius-large-tank-2", icons = data.raw.item["nullius-large-tank-2"].icons, - flags = {"placeable-player", "player-creation", "not-rotatable"}, - minable = {hardness = 2.5, mining_time = 3, result = "nullius-large-tank-2"}, + flags = {"placeable-player", "player-creation"}, -- "not-rotatable" + minable = {mining_time = 3, result = "nullius-large-tank-2"}, + collision_mask = collision_mask_util.get_default_mask("rocket-silo"), max_health = 1200, corpse = "medium-remnants", collision_box = {{-2.2, -2.2}, {2.2, 2.2}}, selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, two_direction_only = false, fluid_box = { - height = 5.5, - base_area = 454.545454546, + volume = 250000, pipe_covers = pipecoverspictures(), pipe_connections = { - { position = {0, -3} }, - { position = {3, 0} }, - { position = {-3, 0} }, - { position = {0, 3} }, + { position = {0, -2}, direction = defines.direction.north }, + { position = {2, 0}, direction = defines.direction.east }, + { position = {-2, 0}, direction = defines.direction.west }, + { position = {0, 2}, direction = defines.direction.south }, }, }, fast_replaceable_group = "large-tank", next_upgrade = "nullius-large-tank-3", window_bounding_box = {{-0.125, 0.6875}, {0.1875, 1.1875}}, flow_length_in_ticks = 360, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["storage-tank"]["angels-storage-tank-1"].working_sound, - circuit_wire_connection_points = circuit_connector_definitions["storage-tank"].points, - circuit_connector_sprites = circuit_connector_definitions["storage-tank"].sprites, + impact_category = "metal", + working_sound = data.raw["storage-tank"]["nullius-large-tank-1"].working_sound, + circuit_connector = circuit_connector_definitions["storage-tank"], circuit_wire_max_distance = default_circuit_wire_max_distance, - pictures = util.table.deepcopy(data.raw["storage-tank"]["angels-storage-tank-1"].pictures) + pictures = table.deepcopy(data.raw["storage-tank"]["nullius-large-tank-1"].pictures) }, { type = "storage-tank", name = "nullius-large-tank-3", icons = data.raw.item["nullius-large-tank-3"].icons, - flags = {"placeable-player", "player-creation", "not-rotatable"}, - minable = {hardness = 3, mining_time = 3, result = "nullius-large-tank-3"}, + flags = {"placeable-player", "player-creation"}, -- , "not-rotatable" + minable = {mining_time = 3, result = "nullius-large-tank-3"}, + collision_mask = collision_mask_util.get_default_mask("rocket-silo"), max_health = 1500, corpse = "medium-remnants", collision_box = {{-2.2, -2.2}, {2.2, 2.2}}, selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, two_direction_only = false, fluid_box = { - height = 6.25, - base_area = 800, + volume = 500000, pipe_covers = pipecoverspictures(), pipe_connections = { - { position = {0, -3} }, - { position = {3, 0} }, - { position = {-3, 0} }, - { position = {0, 3} }, + { position = {0, -2}, direction = defines.direction.north }, + { position = {2, 0}, direction = defines.direction.east }, + { position = {-2, 0}, direction = defines.direction.west }, + { position = {0, 2}, direction = defines.direction.south }, }, }, fast_replaceable_group = "large-tank", window_bounding_box = {{-0.125, 0.6875}, {0.1875, 1.1875}}, flow_length_in_ticks = 360, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = data.raw["storage-tank"]["angels-storage-tank-1"].working_sound, - circuit_wire_connection_points = circuit_connector_definitions["storage-tank"].points, - circuit_connector_sprites = circuit_connector_definitions["storage-tank"].sprites, + impact_category = "metal", + working_sound = data.raw["storage-tank"]["nullius-large-tank-1"].working_sound, + circuit_connector = circuit_connector_definitions["storage-tank"], circuit_wire_max_distance = default_circuit_wire_max_distance, - pictures = data.raw["storage-tank"]["angels-storage-tank-1"].pictures + pictures = table.deepcopy(data.raw["storage-tank"]["nullius-large-tank-1"].pictures) } }) @@ -2149,14 +2240,13 @@ data.raw["storage-tank"]["nullius-large-tank-1"].pictures. picture.sheets[1].tint = {0.75, 0.75, 0.6} data.raw["storage-tank"]["nullius-large-tank-2"].pictures. picture.sheets[1].tint = {0.85, 0.85, 0.95} -if (data.raw["storage-tank"]["nullius-large-tank-1"].pictures. - picture.sheets[1].hr_version ~= nil) then - data.raw["storage-tank"]["nullius-large-tank-1"].pictures. - picture.sheets[1].hr_version.tint = {0.75, 0.75, 0.6} - data.raw["storage-tank"]["nullius-large-tank-2"].pictures. - picture.sheets[1].hr_version.tint = {0.85, 0.85, 0.95} -end +circuit_connector_definitions["nullius-barreling-pump"] = circuit_connector_definitions.create_vector(universal_connector_template, { + { variation = 6, main_offset = util.by_pixel( 0.125, 32.125), shadow_offset = util.by_pixel( 0.125, 32.125), show_shadow = true }, + { variation = 0, main_offset = util.by_pixel( 41.25, -5.5), shadow_offset = util.by_pixel( 41.25, -5.5), show_shadow = true }, + { variation = 10, main_offset = util.by_pixel( 0.5, -46.875), shadow_offset = util.by_pixel( 0.5, -46.875), show_shadow = true }, + { variation = 4, main_offset = util.by_pixel(-38.75, -6.875), shadow_offset = util.by_pixel(-38.75, -6.875), show_shadow = true }, +}) data:extend({ { @@ -2168,24 +2258,24 @@ data:extend({ fast_replaceable_group = "extractor", next_upgrade = "nullius-extractor-2", resource_categories = {"basic-fluid"}, + drawing_box_vertical_extension = 1, max_health = 300, corpse = "pumpjack-remnants", dying_explosion = "pumpjack-explosion", collision_box = {{ -1.7, -1.7}, {1.7, 1.7}}, selection_box = {{ -2, -2}, {2, 2}}, - drawing_box = {{-2.67, -4.2}, {2.5, 2.67}}, + energy_source = { type = "electric", - emissions_per_minute = 5, + emissions_per_minute = {pollution = 5}, usage_priority = "secondary-input", drain = "10kW" }, output_fluid_box = { - base_area = 5, - base_level = 4, + volume = 500, pipe_covers = pipecoverspictures(), pipe_connections = { - { positions = { {1.5, -2.5}, {2.5, -1.5}, {-1.5, 2.5}, {-2.5, 1.5} } } + { positions = { {1.5, -1.5}, {1.5, -1.5}, {-1.5, 1.5}, {-1.5, 1.5} }, direction = defines.direction.north } } }, energy_usage = "390kW", @@ -2197,12 +2287,12 @@ data:extend({ { type = "fire", decrease = 100, percent = 90 } }, damaged_trigger_effect = data.raw["mining-drill"]["pumpjack"].damaged_trigger_effect, - vehicle_impact_sound = data.raw["mining-drill"]["pumpjack"].vehicle_impact_sound, + impact_category = data.raw["mining-drill"]["pumpjack"].impact_category, open_sound = data.raw["mining-drill"]["pumpjack"].open_sound, close_sound = data.raw["mining-drill"]["pumpjack"].close_sound, working_sound = data.raw["mining-drill"]["pumpjack"].working_sound, fast_replaceable_group = "geothermal-pump", - module_specification = { module_slots = 1 }, + module_slots = 1, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, radius_visualisation_picture = { filename = BASEENTITY .. "pumpjack/pumpjack-radius-visualization.png", @@ -2210,14 +2300,13 @@ data:extend({ height = 12 }, monitor_visualization_tint = {r=78, g=173, b=255}, - circuit_wire_connection_points = circuit_connector_definitions["pumpjack"].points, - circuit_connector_sprites = circuit_connector_definitions["pumpjack"].sprites, + circuit_connector = circuit_connector_definitions["pumpjack"], circuit_wire_max_distance = default_circuit_wire_max_distance, base_render_layer = "lower-object-above-shadow", base_picture = { sheets = { { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base.png", + filename = BASEENTITY .. "pumpjack/pumpjack-base.png", priority = "extra-high", width = 261, height = 273, @@ -2225,7 +2314,7 @@ data:extend({ scale = 0.66667 }, { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base-shadow.png", + filename = BASEENTITY .. "pumpjack/pumpjack-base-shadow.png", width = 220, height = 220, scale = 0.66667, @@ -2234,32 +2323,34 @@ data:extend({ } } }, - animations = { - north = { - layers = { - { - priority = "high", - filename = ENTITYPATH .. "wells/hr-pumpjack-decolorized.png", - animation_speed = 0.4, - scale = 0.66667, - tint = {0.98, 0.58, 0.24}, - line_length = 8, - width = 206, - height = 202, - frame_count = 40, - shift = util.by_pixel(-6.66667, -40) - }, - { - priority = "high", - filename = BASEENTITY .. "pumpjack/hr-pumpjack-horsehead-shadow.png", - animation_speed = 0.66667, - draw_as_shadow = true, - line_length = 8, - width = 309, - height = 82, - frame_count = 40, - scale = 0.4, - shift = util.by_pixel(29.5833, 24.1666) + graphics_set = { + animation = { + north = { + layers = { + { + priority = "high", + filename = ENTITYPATH .. "wells/pumpjack-decolorized.png", + animation_speed = 0.4, + scale = 0.66667, + tint = {0.98, 0.58, 0.24}, + line_length = 8, + width = 206, + height = 202, + frame_count = 40, + shift = util.by_pixel(-6.66667, -40) + }, + { + priority = "high", + filename = BASEENTITY .. "pumpjack/pumpjack-horsehead-shadow.png", + animation_speed = 0.66667, + draw_as_shadow = true, + line_length = 8, + width = 309, + height = 82, + frame_count = 40, + scale = 0.4, + shift = util.by_pixel(29.5833, 24.1666) + } } } } @@ -2274,25 +2365,24 @@ data:extend({ minable = { mining_time = 2, result = "nullius-extractor-2" }, fast_replaceable_group = "extractor", resource_categories = {"basic-fluid"}, + drawing_box_vertical_extension = 1, max_health = 400, corpse = "pumpjack-remnants", dying_explosion = "pumpjack-explosion", collision_box = {{ -1.7, -1.7}, {1.7, 1.7}}, selection_box = {{ -2, -2}, {2, 2}}, - drawing_box = {{-2.67, -4.2}, {2.5, 2.67}}, + energy_source = { type = "electric", - emissions_per_minute = 10, + emissions_per_minute = {pollution = 10}, usage_priority = "secondary-input", drain = "25kW" }, output_fluid_box = { - base_area = 10, - base_level = 5, - height = 2, + volume = 500, pipe_covers = pipecoverspictures(), pipe_connections = { - { positions = { {1.5, -2.5}, {2.5, -1.5}, {-1.5, 2.5}, {-2.5, 1.5} } } + { positions = { {1.5, -1.5}, {1.5, -1.5}, {-1.5, 1.5}, {-1.5, 1.5} }, direction = defines.direction.north } } }, energy_usage = "775kW", @@ -2304,12 +2394,12 @@ data:extend({ { type = "fire", decrease = 100, percent = 90 } }, damaged_trigger_effect = data.raw["mining-drill"]["pumpjack"].damaged_trigger_effect, - vehicle_impact_sound = data.raw["mining-drill"]["pumpjack"].vehicle_impact_sound, + impact_category = data.raw["mining-drill"]["pumpjack"].impact_category, open_sound = data.raw["mining-drill"]["pumpjack"].open_sound, close_sound = data.raw["mining-drill"]["pumpjack"].close_sound, working_sound = data.raw["mining-drill"]["pumpjack"].working_sound, fast_replaceable_group = "geothermal-pump", - module_specification = { module_slots = 2 }, + module_slots = 2, allowed_effects = {"speed", "productivity", "consumption", "pollution"}, radius_visualisation_picture = { filename = BASEENTITY .. "pumpjack/pumpjack-radius-visualization.png", @@ -2317,14 +2407,13 @@ data:extend({ height = 12 }, monitor_visualization_tint = {r=78, g=173, b=255}, - circuit_wire_connection_points = circuit_connector_definitions["pumpjack"].points, - circuit_connector_sprites = circuit_connector_definitions["pumpjack"].sprites, + circuit_connector = circuit_connector_definitions["pumpjack"], circuit_wire_max_distance = default_circuit_wire_max_distance, base_render_layer = "lower-object-above-shadow", base_picture = { sheets = { { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base.png", + filename = BASEENTITY .. "pumpjack/pumpjack-base.png", priority = "extra-high", width = 261, height = 273, @@ -2332,7 +2421,7 @@ data:extend({ scale = 0.66667 }, { - filename = BASEENTITY .. "pumpjack/hr-pumpjack-base-shadow.png", + filename = BASEENTITY .. "pumpjack/pumpjack-base-shadow.png", width = 220, height = 220, scale = 0.66667, @@ -2341,32 +2430,34 @@ data:extend({ } } }, - animations = { - north = { - layers = { - { - priority = "high", - filename = ENTITYPATH .. "wells/hr-pumpjack-decolorized.png", - animation_speed = 0.6, - scale = 0.66667, - tint = {0.99,0.25,0.39}, - line_length = 8, - width = 206, - height = 202, - frame_count = 40, - shift = util.by_pixel(-6.66667, -40) - }, - { - priority = "high", - filename = BASEENTITY .. "pumpjack/hr-pumpjack-horsehead-shadow.png", - animation_speed = 0.66667, - draw_as_shadow = true, - line_length = 8, - width = 309, - height = 82, - frame_count = 40, - scale = 0.6, - shift = util.by_pixel(29.5833, 24.1666) + graphics_set = { + animation = { + north = { + layers = { + { + priority = "high", + filename = ENTITYPATH .. "wells/pumpjack-decolorized.png", + animation_speed = 0.6, + scale = 0.66667, + tint = {0.99,0.25,0.39}, + line_length = 8, + width = 206, + height = 202, + frame_count = 40, + shift = util.by_pixel(-6.66667, -40) + }, + { + priority = "high", + filename = BASEENTITY .. "pumpjack/pumpjack-horsehead-shadow.png", + animation_speed = 0.66667, + draw_as_shadow = true, + line_length = 8, + width = 309, + height = 82, + frame_count = 40, + scale = 0.6, + shift = util.by_pixel(29.5833, 24.1666) + } } } } @@ -2391,11 +2482,11 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 0.5, + emissions_per_minute = {pollution = 0.5}, drain = "1kW" }, energy_usage = "24kW", - module_specification = { module_slots = 1 }, + module_slots = 1, allowed_effects = {"speed", "consumption", "pollution"}, resistances = { { type = "impact", decrease = 100, percent = 90 }, @@ -2404,79 +2495,80 @@ data:extend({ }, ingredient_count = 2, working_sound = { - sound = {filename = "__base__/sound/oil-refinery.ogg"}, + sound = {filename = "__base__/sound/oil-refinery.ogg", volume = 2.5}, idle_sound = {filename = "__base__/sound/idle1.ogg", volume = 0.6}, - apparent_volume = 2.5 + --apparent_volume = 2.5 }, - vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, + impact_category = "metal", + circuit_connector = circuit_connector_definitions["nullius-barreling-pump"], + circuit_wire_max_distance = default_circuit_wire_max_distance, fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -2, - pipe_connections = {{type = "input", position = {0, 2}}} + volume = 500, + pipe_connections = {{flow_direction = "input", position = {0, 1}, direction = defines.direction.south}} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 5, - pipe_connections = {{type="output", position = {0, -2}}} + volume = 500, + pipe_connections = {{flow_direction ="output", position = {0, -1}, direction = defines.direction.north}} } }, - pipe_covers = pipecoverspictures(), - animation = { - north = { - filename = "__angelsrefining__/graphics/entity/barreling-pump/barreling-pump.png", - width = 160, - height = 160, - frame_count = 1, - tint = {0.6, 0.8, 0.8} - }, - east = { - filename = "__angelsrefining__/graphics/entity/barreling-pump/barreling-pump.png", - x = 480, - width = 160, - height = 160, - frame_count = 1, - tint = {0.6, 0.8, 0.8} - }, - south = { - filename = "__angelsrefining__/graphics/entity/barreling-pump/barreling-pump.png", - x = 320, - width = 160, - height = 160, - frame_count = 1, - tint = {0.6, 0.8, 0.8} - }, - west = { - filename = "__angelsrefining__/graphics/entity/barreling-pump/barreling-pump.png", - x = 160, - width = 160, - height = 160, - frame_count = 1, - tint = {0.6, 0.8, 0.8} - } - }, - working_visualisations = { - { - north_position = {0, 0}, - east_position = {0, -0.1}, - south_position = {0, -0.25}, - west_position = {0, -0.15}, - animation = { - filename = "__angelsrefining__/graphics/entity/barreling-pump/barreling-pump-animation.png", - frame_count = 36, - line_length = 6, - width = 64, - height = 64, - animation_speed = 0.2, - run_mode = "forward", + graphics_set = { + animation = { + north = { + filename = "__angelsrefininggraphics__/graphics/entity/barreling-pump/barreling-pump.png", + width = 160, + height = 160, + frame_count = 1, + tint = {0.6, 0.8, 0.8} + }, + east = { + filename = "__angelsrefininggraphics__/graphics/entity/barreling-pump/barreling-pump.png", + x = 480, + width = 160, + height = 160, + frame_count = 1, + tint = {0.6, 0.8, 0.8} + }, + south = { + filename = "__angelsrefininggraphics__/graphics/entity/barreling-pump/barreling-pump.png", + x = 320, + width = 160, + height = 160, + frame_count = 1, tint = {0.6, 0.8, 0.8} }, - light = {intensity = 0.4, size = 6} + west = { + filename = "__angelsrefininggraphics__/graphics/entity/barreling-pump/barreling-pump.png", + x = 160, + width = 160, + height = 160, + frame_count = 1, + tint = {0.6, 0.8, 0.8} + } + }, + working_visualisations = { + { + north_position = {0, 0}, + east_position = {0, -0.1}, + south_position = {0, -0.25}, + west_position = {0, -0.15}, + animation = { + filename = "__angelsrefininggraphics__/graphics/entity/barreling-pump/barreling-pump-animation.png", + frame_count = 36, + line_length = 6, + width = 64, + height = 64, + animation_speed = 0.2, + run_mode = "forward", + tint = {0.6, 0.8, 0.8} + }, + light = {intensity = 0.4, size = 6} + } } } }, @@ -2498,11 +2590,11 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 1, + emissions_per_minute = {pollution = 1}, drain = "2kW" }, energy_usage = "58kW", - module_specification = { module_slots = 2 }, + module_slots = 2, allowed_effects = {"speed", "consumption", "pollution"}, resistances = { { type = "impact", decrease = 100, percent = 90 }, @@ -2510,81 +2602,80 @@ data:extend({ { type = "explosion", decrease = 20, percent = 50 } }, ingredient_count = 2, + circuit_connector = circuit_connector_definitions["nullius-barreling-pump"], + circuit_wire_max_distance = default_circuit_wire_max_distance, working_sound = { - sound = {filename = "__base__/sound/oil-refinery.ogg"}, + sound = {filename = "__base__/sound/oil-refinery.ogg", volume = 2.5}, idle_sound = {filename = "__base__/sound/idle1.ogg", volume = 0.6}, - apparent_volume = 2.5 + --apparent_volume = 2.5 }, - vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, + impact_category = "metal", fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -3, - height = 2, - pipe_connections = {{type = "input", position = {0, 2}}} + volume = 500, + pipe_connections = {{flow_direction = "input", position = {0, 1}, direction = defines.direction.south}} }, { production_type = "output", pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = 6, - height = 2, - pipe_connections = {{type="output", position = {0, -2}}} - } - }, - pipe_covers = pipecoverspictures(), - animation = { - north = { - filename = "__angelsrefining__/graphics/entity/barreling-pump/barreling-pump.png", - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} - }, - east = { - filename = "__angelsrefining__/graphics/entity/barreling-pump/barreling-pump.png", - x = 480, - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} - }, - south = { - filename = "__angelsrefining__/graphics/entity/barreling-pump/barreling-pump.png", - x = 320, - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} - }, - west = { - filename = "__angelsrefining__/graphics/entity/barreling-pump/barreling-pump.png", - x = 160, - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} + volume = 500, + pipe_connections = {{flow_direction ="output", position = {0, -1}, direction = defines.direction.north}} } }, - working_visualisations = { - { - north_position = {0, 0}, - east_position = {0, -0.1}, - south_position = {0, -0.25}, - west_position = {0, -0.15}, - animation = { - filename = "__angelsrefining__/graphics/entity/barreling-pump/barreling-pump-animation.png", - frame_count = 36, - line_length = 6, - width = 64, - height = 64, - shift = {0, 0}, - animation_speed = 0.25, - run_mode = "forward" + graphics_set = { + animation = { + north = { + filename = "__angelsrefininggraphics__/graphics/entity/barreling-pump/barreling-pump.png", + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + }, + east = { + filename = "__angelsrefininggraphics__/graphics/entity/barreling-pump/barreling-pump.png", + x = 480, + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + }, + south = { + filename = "__angelsrefininggraphics__/graphics/entity/barreling-pump/barreling-pump.png", + x = 320, + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} }, - light = {intensity = 0.4, size = 6} + west = { + filename = "__angelsrefininggraphics__/graphics/entity/barreling-pump/barreling-pump.png", + x = 160, + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + } + }, + working_visualisations = { + { + north_position = {0, 0}, + east_position = {0, -0.1}, + south_position = {0, -0.25}, + west_position = {0, -0.15}, + animation = { + filename = "__angelsrefininggraphics__/graphics/entity/barreling-pump/barreling-pump-animation.png", + frame_count = 36, + line_length = 6, + width = 64, + height = 64, + shift = {0, 0}, + animation_speed = 0.25, + run_mode = "forward" + }, + light = {intensity = 0.4, size = 6} + } } } }, @@ -2610,13 +2701,12 @@ data:extend({ { type = "fire", decrease = 20, percent = 50 } }, fluid_box = { - base_area = 1, - height = 7, + volume = 500, pipe_covers = pipecoverspictures(), pipe_connections = { - { position = {0, -1.5}, type = "output" }, - { position = {0, 1.5}, type = "input" } + { position = {0, -0.5}, flow_direction = "output", direction = defines.direction.north }, + { position = {0, 0.5}, flow_direction = "input", direction = defines.direction.south } } }, energy_source = { @@ -2625,7 +2715,7 @@ data:extend({ }, energy_usage = "15kW", pumping_speed = 50, - vehicle_impact_sound = data.raw.pump["pump"].vehicle_impact_sound, + impact_category = data.raw.pump["pump"].impact_category, open_sound = data.raw.pump["pump"].open_sound, close_sound = data.raw.pump["pump"].close_sound, fluid_wagon_connector_frame_count = 35, @@ -2633,15 +2723,14 @@ data:extend({ fluid_wagon_connector_graphics = data.raw.pump["pump"].fluid_wagon_connector_graphics, fluid_animation = data.raw.pump["pump"].fluid_animation, glass_pictures = data.raw.pump["pump"].glass_pictures, - circuit_wire_connection_points = circuit_connector_definitions["pump"].points, - circuit_connector_sprites = circuit_connector_definitions["pump"].sprites, + circuit_connector = circuit_connector_definitions["pump"], circuit_wire_max_distance = default_circuit_wire_max_distance, animations = { north = { layers = { { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-north.png", + filename = "__base__/graphics/entity/pipe-covers/pipe-cover-north.png", width = 128, height = 128, scale = 0.5, @@ -2651,7 +2740,7 @@ data:extend({ shift = {0, -1.46} }, { - filename = BASEENTITY .. "pump/hr-pump-north.png", + filename = BASEENTITY .. "pump/pump-north.png", width = 103, height = 164, scale = 0.5, @@ -2675,7 +2764,7 @@ data:extend({ east = { layers = { { - filename = BASEENTITY .. "pump/hr-pump-east.png", + filename = BASEENTITY .. "pump/pump-east.png", width = 130, height = 109, scale = 0.5, @@ -2699,7 +2788,7 @@ data:extend({ south = { layers = { { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-north.png", + filename = "__base__/graphics/entity/pipe-covers/pipe-cover-north.png", width = 128, height = 128, scale = 0.5, @@ -2709,7 +2798,7 @@ data:extend({ shift = {0, -1.5} }, { - filename = BASEENTITY .. "pump/hr-pump-south.png", + filename = BASEENTITY .. "pump/pump-south.png", width = 114, height = 160, scale = 0.5, @@ -2733,7 +2822,7 @@ data:extend({ west = { layers = { { - filename = BASEENTITY .. "pump/hr-pump-west.png", + filename = BASEENTITY .. "pump/pump-west.png", width = 131, height = 111, scale = 0.5, @@ -2778,13 +2867,12 @@ data:extend({ { type = "fire", decrease = 20, percent = 50 } }, fluid_box = { - base_area = 1, - height = 8, + volume = 500, pipe_covers = pipecoverspictures(), pipe_connections = { - { position = {0, -1.5}, type = "output" }, - { position = {0, 1.5}, type = "input" } + { position = {0, -0.5}, flow_direction = "output", direction = defines.direction.north }, + { position = {0, 0.5}, flow_direction = "input", direction = defines.direction.south } } }, energy_source = { @@ -2793,7 +2881,7 @@ data:extend({ }, energy_usage = "20kW", pumping_speed = 100, - vehicle_impact_sound = data.raw.pump["pump"].vehicle_impact_sound, + impact_category = data.raw.pump["pump"].impact_category, open_sound = data.raw.pump["pump"].open_sound, close_sound = data.raw.pump["pump"].close_sound, fluid_wagon_connector_frame_count = 35, @@ -2801,15 +2889,14 @@ data:extend({ fluid_wagon_connector_graphics = data.raw.pump["pump"].fluid_wagon_connector_graphics, fluid_animation = data.raw.pump["pump"].fluid_animation, glass_pictures = data.raw.pump["pump"].glass_pictures, - circuit_wire_connection_points = circuit_connector_definitions["pump"].points, - circuit_connector_sprites = circuit_connector_definitions["pump"].sprites, + circuit_connector = circuit_connector_definitions["pump"], circuit_wire_max_distance = default_circuit_wire_max_distance, animations = { north = { layers = { { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-north.png", + filename = "__base__/graphics/entity/pipe-covers/pipe-cover-north.png", width = 128, height = 128, scale = 0.5, @@ -2819,7 +2906,7 @@ data:extend({ shift = {0, -1.46} }, { - filename = BASEENTITY .. "pump/hr-pump-north.png", + filename = BASEENTITY .. "pump/pump-north.png", width = 103, height = 164, scale = 0.5, @@ -2843,7 +2930,7 @@ data:extend({ east = { layers = { { - filename = BASEENTITY .. "pump/hr-pump-east.png", + filename = BASEENTITY .. "pump/pump-east.png", width = 130, height = 109, scale = 0.5, @@ -2867,7 +2954,7 @@ data:extend({ south = { layers = { { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-north.png", + filename = "__base__/graphics/entity/pipe-covers/pipe-cover-north.png", width = 128, height = 128, scale = 0.5, @@ -2877,7 +2964,7 @@ data:extend({ shift = {0, -1.5} }, { - filename = BASEENTITY .. "pump/hr-pump-south.png", + filename = BASEENTITY .. "pump/pump-south.png", width = 114, height = 160, scale = 0.5, @@ -2901,7 +2988,7 @@ data:extend({ west = { layers = { { - filename = BASEENTITY .. "pump/hr-pump-west.png", + filename = BASEENTITY .. "pump/pump-west.png", width = 131, height = 111, scale = 0.5, @@ -2945,11 +3032,10 @@ data:extend({ { type = "fire", decrease = 20, percent = 50 } }, fluid_box = { - base_area = 1, - height = 6.5, + volume = 500, pipe_connections = { - { position = {0, 1}, type = "output" }, - { position = {0, -1}, type = "input" } + { position = {0, 0}, flow_direction = "output", direction = defines.direction.south }, + { position = {0, 0}, flow_direction = "input", direction = defines.direction.north } }, pipe_covers = pipecoverspictures() }, @@ -2959,80 +3045,79 @@ data:extend({ }, energy_usage = "10kW", pumping_speed = 40, - vehicle_impact_sound = data.raw["pump"]["pump"].vehicle_impact_sound, + impact_category = data.raw["pump"]["pump"].impact_category, open_sound = data.raw["pump"]["pump"].open_sound, close_sound = data.raw["pump"]["pump"].close_sound, - circuit_wire_connection_points = data.raw["pump"]["pump"].circuit_wire_connection_points, - circuit_connector_sprites = data.raw["pump"]["pump"].circuit_connector_sprites, + circuit_connector = circuit_connector_definitions["pump"], circuit_wire_max_distance = data.raw["pump"]["pump"].circuit_wire_max_distance, animations = { north = { - layers = { - { - filename = "__boblogistics__/graphics/entity/pipe/steel/hr-pipe-straight-vertical.png", + layers = { + { + filename = "__boblogistics__/graphics/entity/pipe/steel/pipe-straight-vertical.png", repeat_count = 16, width = 128, height = 64, - scale = 0.5, - animation_speed = 0.5, - shift = {0, -0.5} - }, - { - filename = "__angelsrefining__/graphics/entity/water-pump/pump-north.png", + scale = 0.5, + animation_speed = 0.5, + shift = {0, -0.5} + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/water-pump/pump-north.png", priority = "extra-high", frame_count = 16, - line_length = 4, + line_length = 4, width = 64, height = 64, - animation_speed = 0.5, + animation_speed = 0.5, tint = {0.75, 0.85, 0.95}, shift = {0, -0.05} - } - } + } + } }, east = { - filename = "__angelsrefining__/graphics/entity/water-pump/pump-east.png", + filename = "__angelsrefininggraphics__/graphics/entity/water-pump/pump-east.png", priority = "extra-high", - frame_count = 16, - line_length = 4, + frame_count = 16, + line_length = 4, width = 64, height = 64, - animation_speed = 0.5, + animation_speed = 0.5, tint = {0.75, 0.85, 0.95} }, south = { - layers = { - { - filename = "__boblogistics__/graphics/entity/pipe/steel/hr-pipe-straight-vertical.png", + layers = { + { + filename = "__boblogistics__/graphics/entity/pipe/steel/pipe-straight-vertical.png", repeat_count = 16, width = 128, height = 64, - scale = 0.5, - animation_speed = 0.5, - shift = {0, -0.5} - }, - { - filename = "__angelsrefining__/graphics/entity/water-pump/pump-south.png", + scale = 0.5, + animation_speed = 0.5, + shift = {0, -0.5} + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/water-pump/pump-south.png", priority = "extra-high", - frame_count = 16, - line_length = 4, + frame_count = 16, + line_length = 4, width = 64, height = 64, - animation_speed = 0.5, + animation_speed = 0.5, tint = {0.75, 0.85, 0.95}, shift = {0, -0.05} - } - } + } + } }, west = { - filename = "__angelsrefining__/graphics/entity/water-pump/pump-west.png", + filename = "__angelsrefininggraphics__/graphics/entity/water-pump/pump-west.png", priority = "extra-high", - frame_count = 16, - line_length = 4, + frame_count = 16, + line_length = 4, width = 64, height = 64, - animation_speed = 0.5, + animation_speed = 0.5, tint = {0.75, 0.85, 0.95} } } @@ -3057,11 +3142,10 @@ data:extend({ { type = "fire", decrease = 20, percent = 50 } }, fluid_box = { - base_area = 1, - height = 7.5, + volume = 500, pipe_connections = { - { position = {0, 1}, type = "output" }, - { position = {0, -1}, type = "input" } + { position = {0, 0}, flow_direction = "output", direction = defines.direction.south }, + { position = {0, 0}, flow_direction = "input", direction = defines.direction.north } }, pipe_covers = pipecoverspictures() }, @@ -3071,80 +3155,79 @@ data:extend({ }, energy_usage = "15kW", pumping_speed = 80, - vehicle_impact_sound = data.raw["pump"]["pump"].vehicle_impact_sound, + impact_category = data.raw["pump"]["pump"].impact_category, open_sound = data.raw["pump"]["pump"].open_sound, close_sound = data.raw["pump"]["pump"].close_sound, - circuit_wire_connection_points = data.raw["pump"]["pump"].circuit_wire_connection_points, - circuit_connector_sprites = data.raw["pump"]["pump"].circuit_connector_sprites, + circuit_connector = circuit_connector_definitions["pump"], circuit_wire_max_distance = data.raw["pump"]["pump"].circuit_wire_max_distance, animations = { north = { - layers = { - { - filename = "__boblogistics__/graphics/entity/pipe/steel/hr-pipe-straight-vertical.png", + layers = { + { + filename = "__boblogistics__/graphics/entity/pipe/steel/pipe-straight-vertical.png", repeat_count = 16, width = 128, height = 64, - scale = 0.5, - animation_speed = 0.667, - shift = {0, -0.5} - }, - { - filename = "__angelsrefining__/graphics/entity/water-pump/pump-north.png", + scale = 0.5, + animation_speed = 0.667, + shift = {0, -0.5} + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/water-pump/pump-north.png", priority = "extra-high", frame_count = 16, - line_length = 4, + line_length = 4, width = 64, height = 64, - animation_speed = 0.667, + animation_speed = 0.667, tint = {1, 1, 0.85}, shift = {0, -0.05} - } - } + } + } }, east = { - filename = "__angelsrefining__/graphics/entity/water-pump/pump-east.png", + filename = "__angelsrefininggraphics__/graphics/entity/water-pump/pump-east.png", priority = "extra-high", - frame_count = 16, - line_length = 4, + frame_count = 16, + line_length = 4, width = 64, height = 64, - animation_speed = 0.667, + animation_speed = 0.667, tint = {1, 1, 0.85} }, south = { - layers = { - { - filename = "__boblogistics__/graphics/entity/pipe/steel/hr-pipe-straight-vertical.png", + layers = { + { + filename = "__boblogistics__/graphics/entity/pipe/steel/pipe-straight-vertical.png", repeat_count = 16, width = 128, height = 64, - scale = 0.5, - animation_speed = 0.667, - shift = {0, -0.5} - }, - { - filename = "__angelsrefining__/graphics/entity/water-pump/pump-south.png", + scale = 0.5, + animation_speed = 0.667, + shift = {0, -0.5} + }, + { + filename = "__angelsrefininggraphics__/graphics/entity/water-pump/pump-south.png", priority = "extra-high", - frame_count = 16, - line_length = 4, + frame_count = 16, + line_length = 4, width = 64, height = 64, - animation_speed = 0.667, + animation_speed = 0.667, tint = {1, 1, 0.85}, shift = {0, -0.05} - } - } + } + } }, west = { - filename = "__angelsrefining__/graphics/entity/water-pump/pump-west.png", + filename = "__angelsrefininggraphics__/graphics/entity/water-pump/pump-west.png", priority = "extra-high", - frame_count = 16, - line_length = 4, + frame_count = 16, + line_length = 4, width = 64, height = 64, - animation_speed = 0.667, + animation_speed = 0.667, tint = {1, 1, 0.85} } } @@ -3153,9 +3236,10 @@ data:extend({ { type = "pipe", name = "nullius-pipe-2", - localised_description = {"entity-description.nullius-pipe", 60, 4360, 1260}, + localised_description = {"entity-description.nullius-pipe"}, icons = data.raw.item["nullius-pipe-2"].icons, - flags = {"placeable-neutral", "player-creation", "fast-replaceable-no-build-while-moving"}, + flags = {"placeable-neutral", "player-creation"}, + icon_draw_specification = {scale = 0.5}, minable = {mining_time = 0.3, result = "nullius-pipe-2"}, max_health = 150, corpse = "pipe-remnants", @@ -3170,16 +3254,17 @@ data:extend({ selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, damaged_trigger_effect = data.raw["pipe"]["pipe"].damaged_trigger_effect, fluid_box = { - height = 3, - base_area = 1.333334, + volume = 400, + pipe_covers = pipecoverspictures(), -- in case a real pipe is connected to a ghost pipe_connections = { - { position = {0, -1} }, - { position = {1, 0} }, - { position = {0, 1} }, - { position = {-1, 0} } - } + { position = {0, 0}, direction = defines.direction.north }, + { position = {0, 0}, direction = defines.direction.east }, + { position = {0, 0}, direction = defines.direction.south }, + { position = {0, 0}, direction = defines.direction.west } + }, + hide_connection_info = true }, - vehicle_impact_sound = data.raw["pipe"]["pipe"].vehicle_impact_sound, + impact_category = data.raw["pipe"]["pipe"].impact_category, working_sound = data.raw["pipe"]["pipe"].working_sound, horizontal_window_bounding_box = {{-0.25, -0.25}, {0.25, 0.15625}}, vertical_window_bounding_box = {{-0.28125, -0.40625}, {0.03125, 0.125}}, @@ -3189,9 +3274,10 @@ data:extend({ { type = "pipe", name = "nullius-pipe-3", - localised_description = {"entity-description.nullius-pipe", 80, 5370, 4260}, + localised_description = {"entity-description.nullius-pipe"}, icons = data.raw.item["nullius-pipe-3"].icons, - flags = {"placeable-neutral", "player-creation", "fast-replaceable-no-build-while-moving"}, + flags = {"placeable-neutral", "player-creation"}, + icon_draw_specification = {scale = 0.5}, minable = {mining_time = 0.4, result = "nullius-pipe-3"}, max_health = 200, corpse = "pipe-remnants", @@ -3206,28 +3292,30 @@ data:extend({ selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, damaged_trigger_effect = data.raw["pipe"]["pipe"].damaged_trigger_effect, fluid_box = { - height = 4, - base_area = 1, + volume = 400, + pipe_covers = pipecoverspictures(), -- in case a real pipe is connected to a ghost pipe_connections = { - { position = {0, -1} }, - { position = {1, 0} }, - { position = {0, 1} }, - { position = {-1, 0} } - } + { position = {0, 0}, direction = defines.direction.north }, + { position = {0, 0}, direction = defines.direction.east }, + { position = {0, 0}, direction = defines.direction.south }, + { position = {0, 0}, direction = defines.direction.west } + }, + hide_connection_info = true }, - vehicle_impact_sound = data.raw["pipe"]["pipe"].vehicle_impact_sound, + impact_category = data.raw["pipe"]["pipe"].impact_category, working_sound = data.raw["pipe"]["pipe"].working_sound, horizontal_window_bounding_box = {{-0.25, -0.25}, {0.25, 0.15625}}, vertical_window_bounding_box = {{-0.28125, -0.40625}, {0.03125, 0.125}}, - pictures = data.raw["pipe"]["plastic-pipe"].pictures + pictures = pipepics("__boblogistics__/graphics/entity/pipe/plastic/") }, { type = "pipe", name = "nullius-pipe-4", - localised_description = {"entity-description.nullius-pipe", 100, 6720, 5180}, + localised_description = {"entity-description.nullius-pipe"}, icons = data.raw.item["nullius-pipe-4"].icons, - flags = {"placeable-neutral", "player-creation", "fast-replaceable-no-build-while-moving"}, + flags = {"placeable-neutral", "player-creation"}, + icon_draw_specification = {scale = 0.5}, minable = {mining_time = 0.5, result = "nullius-pipe-4"}, max_health = 250, corpse = "pipe-remnants", @@ -3241,16 +3329,17 @@ data:extend({ selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, damaged_trigger_effect = data.raw["pipe"]["pipe"].damaged_trigger_effect, fluid_box = { - height = 5, - base_area = 0.8, + volume = 400, + pipe_covers = pipecoverspictures(), -- in case a real pipe is connected to a ghost pipe_connections = { - { position = {0, -1} }, - { position = {1, 0} }, - { position = {0, 1} }, - { position = {-1, 0} } - } + { position = {0, 0}, direction = defines.direction.north }, + { position = {0, 0}, direction = defines.direction.east }, + { position = {0, 0}, direction = defines.direction.south }, + { position = {0, 0}, direction = defines.direction.west } + }, + hide_connection_info = true }, - vehicle_impact_sound = data.raw["pipe"]["pipe"].vehicle_impact_sound, + impact_category = data.raw["pipe"]["pipe"].impact_category, working_sound = data.raw["pipe"]["pipe"].working_sound, horizontal_window_bounding_box = {{-0.25, -0.25}, {0.25, 0.15625}}, vertical_window_bounding_box = {{-0.28125, -0.40625}, {0.03125, 0.125}}, @@ -3260,9 +3349,10 @@ data:extend({ { type = "pipe-to-ground", name = "nullius-underground-pipe-2", - localised_description = {"entity-description.nullius-underground-pipe", 60}, + localised_description = {"entity-description.nullius-underground-pipe"}, icons = data.raw.item["nullius-underground-pipe-2"].icons, flags = {"placeable-neutral", "player-creation"}, + icon_draw_specification = {scale = 0.5}, minable = {mining_time = 0.6, result = "nullius-underground-pipe-2"}, max_health = 200, corpse = "pipe-to-ground-remnants", @@ -3277,27 +3367,32 @@ data:extend({ selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, damaged_trigger_effect = data.raw["pipe-to-ground"]["pipe-to-ground"].damaged_trigger_effect, fluid_box = { - height = 3, - base_area = 1.333334, + volume = 400, pipe_covers = pipecoverspictures(), pipe_connections = { - { position = {0, -1} }, + { position = {0, 0}, direction = defines.direction.north }, { - position = {0, 1}, - max_underground_distance = 15 + connection_type = "underground", + position = {0, 0}, + max_underground_distance = 15, + direction = defines.direction.south } - } + }, + hide_connection_info = true }, - vehicle_impact_sound = data.raw["pipe-to-ground"]["pipe-to-ground"].vehicle_impact_sound, - pictures = undergroundpipepics("__boblogistics__/graphics/entity/pipe/copper-tungsten/") + impact_category = data.raw["pipe-to-ground"]["pipe-to-ground"].impact_category, + pictures = undergroundpipepics("__boblogistics__/graphics/entity/pipe/copper-tungsten/"), + visualization = data.raw["pipe-to-ground"]["pipe-to-ground"].visualization, + disabled_visualization = data.raw["pipe-to-ground"]["pipe-to-ground"].disabled_visualization, }, { type = "pipe-to-ground", name = "nullius-underground-pipe-3", - localised_description = {"entity-description.nullius-underground-pipe", 80}, + localised_description = {"entity-description.nullius-underground-pipe"}, icons = data.raw.item["nullius-underground-pipe-3"].icons, flags = {"placeable-neutral", "player-creation"}, + icon_draw_specification = {scale = 0.5}, minable = {mining_time = 0.8, result = "nullius-underground-pipe-3"}, max_health = 250, corpse = "pipe-to-ground-remnants", @@ -3312,27 +3407,32 @@ data:extend({ selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, damaged_trigger_effect = data.raw["pipe-to-ground"]["pipe-to-ground"].damaged_trigger_effect, fluid_box = { - height = 4, - base_area = 1, + volume = 400, pipe_covers = pipecoverspictures(), pipe_connections = { - { position = {0, -1} }, + { position = {0, 0}, direction = defines.direction.north }, { - position = {0, 1}, - max_underground_distance = 19 + connection_type = "underground", + position = {0, 0}, + max_underground_distance = 19, + direction = defines.direction.south } - } + }, + hide_connection_info = true }, - vehicle_impact_sound = data.raw["pipe-to-ground"]["pipe-to-ground"].vehicle_impact_sound, - pictures = data.raw["pipe-to-ground"]["plastic-pipe-to-ground"].pictures + impact_category = data.raw["pipe-to-ground"]["pipe-to-ground"].impact_category, + pictures = data.raw["pipe-to-ground"]["bob-plastic-pipe-to-ground"].pictures, + visualization = data.raw["pipe-to-ground"]["pipe-to-ground"].visualization, + disabled_visualization = data.raw["pipe-to-ground"]["pipe-to-ground"].disabled_visualization, }, { type = "pipe-to-ground", name = "nullius-underground-pipe-4", - localised_description = {"entity-description.nullius-underground-pipe", 100}, + localised_description = {"entity-description.nullius-underground-pipe"}, icons = data.raw.item["nullius-underground-pipe-4"].icons, flags = {"placeable-neutral", "player-creation"}, + icon_draw_specification = {scale = 0.5}, minable = {mining_time = 1, result = "nullius-underground-pipe-4"}, max_health = 300, corpse = "pipe-to-ground-remnants", @@ -3346,18 +3446,22 @@ data:extend({ selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, damaged_trigger_effect = data.raw["pipe-to-ground"]["pipe-to-ground"].damaged_trigger_effect, fluid_box = { - height = 5, - base_area = 0.8, + volume = 400, pipe_covers = pipecoverspictures(), pipe_connections = { - { position = {0, -1} }, + { position = {0, 0}, direction = defines.direction.north }, { - position = {0, 1}, - max_underground_distance = 23 + position = {0, 0}, + connection_type = "underground", + max_underground_distance = 23, + direction = defines.direction.south } - } + }, + hide_connection_info = true }, - vehicle_impact_sound = data.raw["pipe-to-ground"]["pipe-to-ground"].vehicle_impact_sound, - pictures = undergroundpipepics("__boblogistics__/graphics/entity/pipe/tungsten/") + impact_category = data.raw["pipe-to-ground"]["pipe-to-ground"].impact_category, + pictures = undergroundpipepics("__boblogistics__/graphics/entity/pipe/tungsten/"), + visualization = data.raw["pipe-to-ground"]["pipe-to-ground"].visualization, + disabled_visualization = data.raw["pipe-to-ground"]["pipe-to-ground"].disabled_visualization, } }) diff --git a/nullius/prototypes/entity/power_pole.lua b/nullius/prototypes/entity/power_pole.lua index 28565f0..ce638ab 100644 --- a/nullius/prototypes/entity/power_pole.lua +++ b/nullius/prototypes/entity/power_pole.lua @@ -8,7 +8,7 @@ data:extend({ type = "electric-pole", name = "nullius-power-pole-3", icons = data.raw.item["nullius-power-pole-3"].icons, - flags = {"placeable-neutral", "player-creation", "fast-replaceable-no-build-while-moving"}, + flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1.2, result = "nullius-power-pole-3"}, max_health = 125, maximum_wire_distance = 14.5, @@ -18,12 +18,12 @@ data:extend({ resistances = {{ type = "impact", decrease = 100, percent = 90 }}, corpse = "medium-electric-pole-remnants", dying_explosion = "medium-electric-pole-explosion", - track_coverage_during_build_by_moving = true, + --track_coverage_during_build_by_moving = true, -- todo: why is this still in the documentation ? The game tells me it's "unused" collision_box = {{-0.15, -0.15}, {0.15, 0.15}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, damaged_trigger_effect = data.raw["electric-pole"]["medium-electric-pole"].damaged_trigger_effect, - drawing_box = {{-0.5, -2.8}, {0.5, 0.5}}, - vehicle_impact_sound = data.raw["electric-pole"]["medium-electric-pole"].vehicle_impact_sound, + + impact_category = data.raw["electric-pole"]["medium-electric-pole"].impact_category, open_sound = data.raw["electric-pole"]["medium-electric-pole"].open_sound, close_sound = data.raw["electric-pole"]["medium-electric-pole"].close_sound, connection_points = data.raw["electric-pole"]["medium-electric-pole"].connection_points, @@ -33,7 +33,7 @@ data:extend({ pictures = { layers = { { - filename = ENTITYPATH .. "poles/hr-pole3.png", + filename = ENTITYPATH .. "poles/pole3.png", priority = "extra-high", width = 84, height = 252, @@ -50,7 +50,7 @@ data:extend({ type = "electric-pole", name = "nullius-power-pole-4", icons = data.raw.item["nullius-power-pole-4"].icons, - flags = {"placeable-neutral", "player-creation", "fast-replaceable-no-build-while-moving"}, + flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1.5, result = "nullius-power-pole-4"}, max_health = 150, maximum_wire_distance = 17.5, @@ -59,12 +59,12 @@ data:extend({ resistances = {{ type = "impact", decrease = 100, percent = 90 }}, corpse = "medium-electric-pole-remnants", dying_explosion = "medium-electric-pole-explosion", - track_coverage_during_build_by_moving = true, + --track_coverage_during_build_by_moving = true, collision_box = {{-0.15, -0.15}, {0.15, 0.15}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, damaged_trigger_effect = data.raw["electric-pole"]["medium-electric-pole"].damaged_trigger_effect, - drawing_box = {{-0.5, -2.8}, {0.5, 0.5}}, - vehicle_impact_sound = data.raw["electric-pole"]["medium-electric-pole"].vehicle_impact_sound, + + impact_category = data.raw["electric-pole"]["medium-electric-pole"].impact_category, open_sound = data.raw["electric-pole"]["medium-electric-pole"].open_sound, close_sound = data.raw["electric-pole"]["medium-electric-pole"].close_sound, connection_points = data.raw["electric-pole"]["medium-electric-pole"].connection_points, @@ -77,7 +77,7 @@ data:extend({ type = "electric-pole", name = "nullius-pylon-2", icons = data.raw.item["nullius-pylon-2"].icons, - flags = {"placeable-neutral", "player-creation", "fast-replaceable-no-build-while-moving"}, + flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1.6, result = "nullius-pylon-2"}, max_health = 200, maximum_wire_distance = 48.5, @@ -90,9 +90,9 @@ data:extend({ collision_box = {{-0.65, -0.65}, {0.65, 0.65}}, selection_box = {{-1, -1}, {1, 1}}, damaged_trigger_effect = data.raw["electric-pole"]["big-electric-pole"].damaged_trigger_effect, - drawing_box = {{-1, -3}, {1, 0.5}}, + - vehicle_impact_sound = data.raw["electric-pole"]["big-electric-pole"].vehicle_impact_sound, + impact_category = data.raw["electric-pole"]["big-electric-pole"].impact_category, open_sound = data.raw["electric-pole"]["big-electric-pole"].open_sound, close_sound = data.raw["electric-pole"]["big-electric-pole"].close_sound, connection_points = data.raw["electric-pole"]["big-electric-pole"].connection_points, @@ -101,7 +101,7 @@ data:extend({ pictures = { layers = { { - filename = BASEENTITY .. "big-electric-pole/hr-big-electric-pole.png", + filename = BASEENTITY .. "big-electric-pole/big-electric-pole.png", priority = "extra-high", width = 148, height = 312, @@ -110,7 +110,7 @@ data:extend({ scale = 0.5 }, { - filename = BASEENTITY .. "big-electric-pole/hr-big-electric-pole-shadow.png", + filename = BASEENTITY .. "big-electric-pole/big-electric-pole-shadow.png", priority = "extra-high", width = 374, height = 94, @@ -127,7 +127,7 @@ data:extend({ type = "electric-pole", name = "nullius-pylon-3", icons = data.raw.item["nullius-pylon-3"].icons, - flags = {"placeable-neutral", "player-creation", "fast-replaceable-no-build-while-moving"}, + flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 2, result = "nullius-pylon-3"}, max_health = 250, maximum_wire_distance = 64, @@ -139,8 +139,8 @@ data:extend({ collision_box = {{-0.65, -0.65}, {0.65, 0.65}}, selection_box = {{-1, -1}, {1, 1}}, damaged_trigger_effect = data.raw["electric-pole"]["big-electric-pole"].damaged_trigger_effect, - drawing_box = {{-1, -3}, {1, 0.5}}, - vehicle_impact_sound = data.raw["electric-pole"]["big-electric-pole"].vehicle_impact_sound, + + impact_category = data.raw["electric-pole"]["big-electric-pole"].impact_category, open_sound = data.raw["electric-pole"]["big-electric-pole"].open_sound, close_sound = data.raw["electric-pole"]["big-electric-pole"].close_sound, connection_points = data.raw["electric-pole"]["big-electric-pole"].connection_points, @@ -176,13 +176,13 @@ data:extend({ next_upgrade = "nullius-substation-3", corpse = "substation-remnants", dying_explosion = "substation-explosion", - track_coverage_during_build_by_moving = true, + --track_coverage_during_build_by_moving = true, resistances = {{ type = "impact", decrease = 100, percent = 90 }}, collision_box = {{-0.65, -0.65}, {0.65, 0.65}}, selection_box = {{-1, -1}, {1, 1}}, - drawing_box = {{-1, -3}, {1, 1}}, + damaged_trigger_effect = data.raw["electric-pole"]["substation"].damaged_trigger_effect, - vehicle_impact_sound = data.raw["electric-pole"]["substation"].vehicle_impact_sound, + impact_category = data.raw["electric-pole"]["substation"].impact_category, open_sound = data.raw["electric-pole"]["substation"].open_sound, close_sound = data.raw["electric-pole"]["substation"].close_sound, working_sound = data.raw["electric-pole"]["substation"].working_sound, @@ -204,13 +204,13 @@ data:extend({ fast_replaceable_group = "pylon", corpse = "substation-remnants", dying_explosion = "substation-explosion", - track_coverage_during_build_by_moving = true, + --track_coverage_during_build_by_moving = true, resistances = {{ type = "impact", decrease = 100, percent = 90 }}, collision_box = {{-0.65, -0.65}, {0.65, 0.65}}, selection_box = {{-1, -1}, {1, 1}}, - drawing_box = {{-1, -3}, {1, 1}}, + damaged_trigger_effect = data.raw["electric-pole"]["substation"].damaged_trigger_effect, - vehicle_impact_sound = data.raw["electric-pole"]["substation"].vehicle_impact_sound, + impact_category = data.raw["electric-pole"]["substation"].impact_category, open_sound = data.raw["electric-pole"]["substation"].open_sound, close_sound = data.raw["electric-pole"]["substation"].close_sound, working_sound = data.raw["electric-pole"]["substation"].working_sound, diff --git a/nullius/prototypes/entity/robot.lua b/nullius/prototypes/entity/robot.lua index aa0517e..d23fb86 100644 --- a/nullius/prototypes/entity/robot.lua +++ b/nullius/prototypes/entity/robot.lua @@ -1,23 +1,22 @@ local ICONPATH = "__nullius__/graphics/icons/" local ENTITYPATH = "__nullius__/graphics/entity/" -circuit_connector_definitions["nullius-hangar-4"] = - circuit_connector_definitions.create( +circuit_connector_definitions["nullius-hangar-4"] = circuit_connector_definitions.create_single( universal_connector_template, - {{ + { variation = 26, - main_offset = util.by_pixel(6, 20), - shadow_offset = util.by_pixel(7, 36) - }} + main_offset = util.by_pixel(6, 20), + shadow_offset = util.by_pixel(7, 36) + } ) circuit_connector_definitions["nullius-relay"] = - circuit_connector_definitions.create( + circuit_connector_definitions.create_single( universal_connector_template, - {{ + { variation = 26, main_offset = util.by_pixel(-1, 1), shadow_offset = util.by_pixel(0, 6) - }} + } ) @@ -25,11 +24,12 @@ data:extend({ { type = "construction-robot", name = "nullius-construction-bot-1", - localised_description = {"equipment-description.nullius-buffer", + localised_description = {"equipment-description.nullius-buffer", {"entity-description.construction-robot"}, - {"entity-description.nullius-kilojoule", 800}}, + {"entity-description.nullius-kilojoule", tostring(800)}}, icons = data.raw.item["nullius-construction-bot-1"].icons, flags = {"placeable-player", "player-creation", "placeable-off-grid", "not-on-map"}, + icon_draw_specification = {shift = {0, -0.3}, scale = 0.4, render_layer = "air-entity-info-icon"}, minable = {mining_time = 0.1, result = "nullius-construction-bot-1"}, max_health = 100, collision_box = {{0, 0}, {0, 0}}, @@ -51,7 +51,7 @@ data:extend({ repairing_sound = data.raw["construction-robot"]["construction-robot"].repairing_sound, working_sound = data.raw["construction-robot"]["construction-robot"].working_sound, water_reflection = data.raw["construction-robot"]["construction-robot"].water_reflection, - cargo_centered = {0.0, 0.2}, + --cargo_centered = {0.0, 0.2}, construction_vector = {0.30, 0.22}, idle = data.raw["construction-robot"]["construction-robot"].idle, idle_with_cargo = data.raw["construction-robot"]["construction-robot"].idle_with_cargo, @@ -68,11 +68,12 @@ data:extend({ { type = "construction-robot", name = "nullius-construction-bot-2", - localised_description = {"equipment-description.nullius-buffer", + localised_description = {"equipment-description.nullius-buffer", {"entity-description.construction-robot"}, - {"entity-description.nullius-megajoule", 3}}, + {"entity-description.nullius-megajoule", tostring(3)}}, icons = data.raw.item["nullius-construction-bot-2"].icons, flags = {"placeable-player", "player-creation", "placeable-off-grid", "not-on-map"}, + icon_draw_specification = {shift = {0, -0.3}, scale = 0.4, render_layer = "air-entity-info-icon"}, minable = {mining_time = 0.1, result = "nullius-construction-bot-2"}, max_health = 200, collision_box = {{0, 0}, {0, 0}}, @@ -94,7 +95,7 @@ data:extend({ repairing_sound = data.raw["construction-robot"]["construction-robot"].repairing_sound, working_sound = data.raw["construction-robot"]["construction-robot"].working_sound, water_reflection = data.raw["construction-robot"]["construction-robot"].water_reflection, - cargo_centered = {0.0, 0.2}, + --cargo_centered = {0.0, 0.2}, construction_vector = {0.30, 0.22}, idle = data.raw["construction-robot"]["bob-construction-robot-2"].idle, idle_with_cargo = data.raw["construction-robot"]["bob-construction-robot-2"].idle_with_cargo, @@ -111,11 +112,12 @@ data:extend({ { type = "construction-robot", name = "nullius-construction-bot-3", - localised_description = {"equipment-description.nullius-buffer", + localised_description = {"equipment-description.nullius-buffer", {"entity-description.construction-robot"}, - {"entity-description.nullius-megajoule", 8}}, + {"entity-description.nullius-megajoule", tostring(8)}}, icons = data.raw.item["nullius-construction-bot-3"].icons, flags = {"placeable-player", "player-creation", "placeable-off-grid", "not-on-map"}, + icon_draw_specification = {shift = {0, -0.3}, scale = 0.4, render_layer = "air-entity-info-icon"}, minable = {mining_time = 0.1, result = "nullius-construction-bot-3"}, max_health = 300, collision_box = {{0, 0}, {0, 0}}, @@ -124,7 +126,7 @@ data:extend({ damaged_trigger_effect = data.raw["construction-robot"]["construction-robot"].damaged_trigger_effect, dying_explosion = "construction-robot-explosion", max_payload_size = 3, - speed = 0.2777777778, + speed = 0.2777777778, energy_per_tick = "0.25kJ", energy_per_move = "2.4kJ", max_energy = "8MJ", @@ -137,7 +139,7 @@ data:extend({ repairing_sound = data.raw["construction-robot"]["construction-robot"].repairing_sound, working_sound = data.raw["construction-robot"]["construction-robot"].working_sound, water_reflection = data.raw["construction-robot"]["construction-robot"].water_reflection, - cargo_centered = {0.0, 0.2}, + --cargo_centered = {0.0, 0.2}, construction_vector = {0.30, 0.22}, idle = data.raw["construction-robot"]["bob-construction-robot-3"].idle, idle_with_cargo = data.raw["construction-robot"]["bob-construction-robot-3"].idle_with_cargo, @@ -154,11 +156,12 @@ data:extend({ { type = "construction-robot", name = "nullius-construction-bot-4", - localised_description = {"equipment-description.nullius-buffer", + localised_description = {"equipment-description.nullius-buffer", {"entity-description.construction-robot"}, - {"entity-description.nullius-megajoule", 15}}, + {"entity-description.nullius-megajoule", tostring(15)}}, icons = data.raw.item["nullius-construction-bot-4"].icons, flags = {"placeable-player", "player-creation", "placeable-off-grid", "not-on-map"}, + icon_draw_specification = {shift = {0, -0.3}, scale = 0.4, render_layer = "air-entity-info-icon"}, minable = {mining_time = 0.1, result = "nullius-construction-bot-4"}, max_health = 400, collision_box = {{0, 0}, {0, 0}}, @@ -167,7 +170,7 @@ data:extend({ damaged_trigger_effect = data.raw["construction-robot"]["construction-robot"].damaged_trigger_effect, dying_explosion = "construction-robot-explosion", max_payload_size = 4, - speed = 0.34722222222222, + speed = 0.34722222222222, energy_per_tick = "0.333333333333kJ", energy_per_move = "2.16kJ", max_energy = "15MJ", @@ -180,7 +183,7 @@ data:extend({ repairing_sound = data.raw["construction-robot"]["construction-robot"].repairing_sound, working_sound = data.raw["construction-robot"]["construction-robot"].working_sound, water_reflection = data.raw["construction-robot"]["construction-robot"].water_reflection, - cargo_centered = {0.0, 0.2}, + --cargo_centered = {0.0, 0.2}, construction_vector = {0.30, 0.22}, idle = data.raw["construction-robot"]["bob-construction-robot-5"].idle, idle_with_cargo = data.raw["construction-robot"]["bob-construction-robot-5"].idle_with_cargo, @@ -197,11 +200,12 @@ data:extend({ { type = "logistic-robot", name = "nullius-logistic-bot-1", - localised_description = {"equipment-description.nullius-buffer", + localised_description = {"equipment-description.nullius-buffer", {"entity-description.logistic-robot"}, - {"entity-description.nullius-megajoule", 1.2}}, + {"entity-description.nullius-megajoule", tostring(1.2)}}, icons = data.raw.item["nullius-logistic-bot-1"].icons, flags = {"placeable-player", "player-creation", "placeable-off-grid", "not-on-map"}, + icon_draw_specification = {shift = {0, -0.2}, scale = 0.3, render_layer = "air-entity-info-icon"}, minable = {mining_time = 0.1, result = "nullius-logistic-bot-1"}, max_health = 100, collision_box = {{0, 0}, {0, 0}}, @@ -219,7 +223,7 @@ data:extend({ max_to_charge = 0.9, working_sound = data.raw["logistic-robot"]["logistic-robot"].working_sound, water_reflection = data.raw["logistic-robot"]["logistic-robot"].water_reflection, - cargo_centered = {0.0, 0.2}, + --cargo_centered = {0.0, 0.2}, idle = data.raw["logistic-robot"]["logistic-robot"].idle, idle_with_cargo = data.raw["logistic-robot"]["logistic-robot"].idle_with_cargo, in_motion = data.raw["logistic-robot"]["logistic-robot"].in_motion, @@ -233,11 +237,12 @@ data:extend({ { type = "logistic-robot", name = "nullius-logistic-bot-2", - localised_description = {"equipment-description.nullius-buffer", + localised_description = {"equipment-description.nullius-buffer", {"entity-description.logistic-robot"}, - {"entity-description.nullius-megajoule", 2.5}}, + {"entity-description.nullius-megajoule", tostring(2.5)}}, icons = data.raw.item["nullius-logistic-bot-2"].icons, flags = {"placeable-player", "player-creation", "placeable-off-grid", "not-on-map"}, + icon_draw_specification = {shift = {0, -0.2}, scale = 0.3, render_layer = "air-entity-info-icon"}, minable = {mining_time = 0.1, result = "nullius-logistic-bot-2"}, max_health = 150, collision_box = {{0, 0}, {0, 0}}, @@ -255,7 +260,7 @@ data:extend({ max_to_charge = 0.95, working_sound = data.raw["logistic-robot"]["logistic-robot"].working_sound, water_reflection = data.raw["logistic-robot"]["logistic-robot"].water_reflection, - cargo_centered = {0.0, 0.2}, + --cargo_centered = {0.0, 0.2}, idle = data.raw["logistic-robot"]["bob-logistic-robot-2"].idle, idle_with_cargo = data.raw["logistic-robot"]["bob-logistic-robot-2"].idle_with_cargo, in_motion = data.raw["logistic-robot"]["bob-logistic-robot-2"].in_motion, @@ -269,11 +274,12 @@ data:extend({ { type = "logistic-robot", name = "nullius-logistic-bot-3", - localised_description = {"equipment-description.nullius-buffer", + localised_description = {"equipment-description.nullius-buffer", {"entity-description.logistic-robot"}, - {"entity-description.nullius-megajoule", 6}}, + {"entity-description.nullius-megajoule", tostring(6)}}, icons = data.raw.item["nullius-logistic-bot-3"].icons, flags = {"placeable-player", "player-creation", "placeable-off-grid", "not-on-map"}, + icon_draw_specification = {shift = {0, -0.2}, scale = 0.3, render_layer = "air-entity-info-icon"}, minable = {mining_time = 0.1, result = "nullius-logistic-bot-3"}, max_health = 200, collision_box = {{0, 0}, {0, 0}}, @@ -291,7 +297,7 @@ data:extend({ max_to_charge = 0.95, working_sound = data.raw["logistic-robot"]["logistic-robot"].working_sound, water_reflection = data.raw["logistic-robot"]["logistic-robot"].water_reflection, - cargo_centered = {0.0, 0.2}, + --cargo_centered = {0.0, 0.2}, idle = data.raw["logistic-robot"]["bob-logistic-robot-3"].idle, idle_with_cargo = data.raw["logistic-robot"]["bob-logistic-robot-3"].idle_with_cargo, in_motion = data.raw["logistic-robot"]["bob-logistic-robot-3"].in_motion, @@ -305,11 +311,12 @@ data:extend({ { type = "logistic-robot", name = "nullius-logistic-bot-4", - localised_description = {"equipment-description.nullius-buffer", + localised_description = {"equipment-description.nullius-buffer", {"entity-description.logistic-robot"}, - {"entity-description.nullius-megajoule", 12}}, + {"entity-description.nullius-megajoule", tostring(12)}}, icons = data.raw.item["nullius-logistic-bot-4"].icons, flags = {"placeable-player", "player-creation", "placeable-off-grid", "not-on-map"}, + icon_draw_specification = {shift = {0, -0.2}, scale = 0.3, render_layer = "air-entity-info-icon"}, minable = {mining_time = 0.1, result = "nullius-logistic-bot-4"}, max_health = 250, collision_box = {{0, 0}, {0, 0}}, @@ -327,7 +334,7 @@ data:extend({ max_to_charge = 0.95, working_sound = data.raw["logistic-robot"]["logistic-robot"].working_sound, water_reflection = data.raw["logistic-robot"]["logistic-robot"].water_reflection, - cargo_centered = {0.0, 0.2}, + --cargo_centered = {0.0, 0.2}, idle = data.raw["logistic-robot"]["bob-logistic-robot-5"].idle, idle_with_cargo = data.raw["logistic-robot"]["bob-logistic-robot-5"].idle_with_cargo, in_motion = data.raw["logistic-robot"]["bob-logistic-robot-5"].in_motion, @@ -344,10 +351,11 @@ data:extend({ localised_name = {"equipment-name.nullius-hangar-1"}, localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-hangar"}, - {"entity-description.nullius-megajoule", 20}}, + {"entity-description.nullius-megajoule", tostring(20)}}, icons = data.raw.item["nullius-hangar-1"].icons, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 0.8, result = "nullius-hangar-1"}, + collision_mask = {layers={item=true, meltable=true, object=true, player=true, water_tile=true, is_object=true, is_lower_object=true}}, fast_replaceable_group = "nullius-hangar", next_upgrade = "nullius-hangar-2", max_health = 400, @@ -378,7 +386,7 @@ data:extend({ }, recharging_animation = data.raw["roboport"]["roboport"].recharging_animation, - vehicle_impact_sound = data.raw["roboport"]["roboport"].vehicle_impact_sound, + impact_category = data.raw["roboport"]["roboport"].impact_category, open_sound = data.raw["roboport"]["roboport"].open_sound, close_sound = data.raw["roboport"]["roboport"].close_sound, working_sound = data.raw["roboport"]["roboport"].working_sound, @@ -390,8 +398,7 @@ data:extend({ open_door_trigger_effect = data.raw["roboport"]["roboport"].open_door_trigger_effect, close_door_trigger_effect = data.raw["roboport"]["roboport"].close_door_trigger_effect, water_reflection = data.raw["roboport"]["roboport"].water_reflection, - circuit_wire_connection_point = circuit_connector_definitions["roboport"].points, - circuit_connector_sprites = circuit_connector_definitions["roboport"].sprites, + circuit_connector = circuit_connector_definitions["roboport"], circuit_wire_max_distance = default_circuit_wire_max_distance, default_available_logistic_output_signal = {type = "virtual", name = "signal-X"}, default_total_logistic_output_signal = {type = "virtual", name = "signal-Y"}, @@ -401,59 +408,32 @@ data:extend({ base = { layers = { { - filename = "__boblogistics__/graphics/entity/roboport/roboport-base-1.png", - width = 143, - height = 135, - shift = {0.5*0.75, 0.25*0.75}, - scale = 0.75, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-base-1.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-base-1.png", width = 228, height = 277, shift = util.by_pixel(2*0.75, 7.75*0.75), scale = 0.5*0.75 - } }, { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-shadow.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-shadow.png", width = 294, height = 201, draw_as_shadow = true, - force_hr_shadow = true, shift = util.by_pixel(28.5*0.75, 19.25*0.75), scale = 0.5*0.75 } } }, base_patch = { - filename = "__boblogistics__/graphics/entity/roboport/roboport-base-patch-1.png", - priority = "medium", - width = 69, - height = 50, - frame_count = 1, - shift = {0.03125*0.75, 0.203125*0.75}, - scale = 0.75, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-base-patch-1.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-base-patch-1.png", priority = "medium", width = 138, height = 100, - frame_count = 1, shift = util.by_pixel(1.5*0.75, 5*0.75), scale = 0.5*0.75 - } }, base_animation = { - filename = "__boblogistics__/graphics/entity/roboport/roboport-base-animation.png", - priority = "medium", - width = 42, - height = 31, - frame_count = 8, - animation_speed = 0.5, - shift = {-0.5315*0.75, -1.9375*0.75}, - scale = 0.75, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-base-animation.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-base-animation.png", priority = "medium", width = 83, height = 59, @@ -461,43 +441,24 @@ data:extend({ animation_speed = 0.5, shift = util.by_pixel(-17.75*0.75, -61.25*0.75), scale = 0.5*0.75 - } }, door_animation_up = { - filename = "__boblogistics__/graphics/entity/roboport/roboport-door-up.png", - priority = "medium", - width = 52, - height = 20, - frame_count = 16, - shift = {0.015625*0.75, -0.890625*0.75}, - scale = 0.75, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-door-up.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-door-up.png", priority = "medium", width = 97, height = 38, frame_count = 16, shift = util.by_pixel(-0.25*0.75, -29.5*0.75), scale = 0.5*0.75 - } }, door_animation_down = { - filename = "__boblogistics__/graphics/entity/roboport/roboport-door-down.png", - priority = "medium", - width = 52, - height = 22, - frame_count = 16, - shift = {0.015625*0.75, -0.234375*0.75}, - scale = 0.75, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-door-down.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-door-down.png", priority = "medium", width = 97, height = 41, frame_count = 16, shift = util.by_pixel(-0.25*0.75,-9.75*0.75), scale = 0.5*0.75 - } } }, @@ -505,12 +466,13 @@ data:extend({ type = "roboport", name = "nullius-hangar-2", localised_name = {"equipment-name.nullius-hangar-2"}, - localised_description = {"equipment-description.nullius-buffer", + localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-hangar"}, - {"entity-description.nullius-megajoule", 50}}, + {"entity-description.nullius-megajoule", tostring(50)}}, icons = data.raw.item["nullius-hangar-2"].icons, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 1.2, result = "nullius-hangar-2"}, + collision_mask = {layers={item=true, meltable=true, object=true, player=true, water_tile=true, is_object=true, is_lower_object=true}}, fast_replaceable_group = "nullius-hangar", next_upgrade = "nullius-hangar-3", max_health = 500, @@ -541,7 +503,7 @@ data:extend({ }, recharging_animation = data.raw["roboport"]["roboport"].recharging_animation, - vehicle_impact_sound = data.raw["roboport"]["roboport"].vehicle_impact_sound, + impact_category = data.raw["roboport"]["roboport"].impact_category, open_sound = data.raw["roboport"]["roboport"].open_sound, close_sound = data.raw["roboport"]["roboport"].close_sound, working_sound = data.raw["roboport"]["roboport"].working_sound, @@ -553,8 +515,7 @@ data:extend({ open_door_trigger_effect = data.raw["roboport"]["roboport"].open_door_trigger_effect, close_door_trigger_effect = data.raw["roboport"]["roboport"].close_door_trigger_effect, water_reflection = data.raw["roboport"]["roboport"].water_reflection, - circuit_wire_connection_point = circuit_connector_definitions["roboport"].points, - circuit_connector_sprites = circuit_connector_definitions["roboport"].sprites, + circuit_connector = circuit_connector_definitions["roboport"], circuit_wire_max_distance = default_circuit_wire_max_distance, default_available_logistic_output_signal = {type = "virtual", name = "signal-X"}, default_total_logistic_output_signal = {type = "virtual", name = "signal-Y"}, @@ -564,59 +525,32 @@ data:extend({ base = { layers = { { - filename = "__boblogistics__/graphics/entity/roboport/roboport-base-2.png", - width = 143, - height = 135, - shift = {0.5*0.75, 0.25*0.75}, - scale = 0.75, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-base-2.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-base-2.png", width = 228, height = 277, shift = util.by_pixel(2*0.75, 7.75*0.75), scale = 0.5*0.75 - } }, { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-shadow.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-shadow.png", width = 294, height = 201, draw_as_shadow = true, - force_hr_shadow = true, shift = util.by_pixel(28.5*0.75, 19.25*0.75), scale = 0.5*0.75 } } }, base_patch = { - filename = "__boblogistics__/graphics/entity/roboport/roboport-base-patch-2.png", - priority = "medium", - width = 69, - height = 50, - frame_count = 1, - shift = {0.03125*0.75, 0.203125*0.75}, - scale = 0.75, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-base-patch-2.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-base-patch-2.png", priority = "medium", width = 138, height = 100, - frame_count = 1, shift = util.by_pixel(1.5*0.75, 5*0.75), scale = 0.5*0.75 - } }, base_animation = { - filename = "__boblogistics__/graphics/entity/roboport/roboport-base-animation-2.png", - priority = "medium", - width = 42, - height = 31, - frame_count = 8, - animation_speed = 0.5, - shift = {-0.5315*0.75, -1.9375*0.75}, - scale = 0.75, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-base-animation-2.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-base-animation-2.png", priority = "medium", width = 83, height = 59, @@ -624,43 +558,24 @@ data:extend({ animation_speed = 0.5, shift = util.by_pixel(-17.75*0.75, -61.25*0.75), scale = 0.5*0.75 - } }, door_animation_up = { - filename = "__boblogistics__/graphics/entity/roboport/roboport-door-up-2.png", - priority = "medium", - width = 52, - height = 20, - frame_count = 16, - shift = {0.015625*0.75, -0.890625*0.75}, - scale = 0.75, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-door-up-2.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-door-up-2.png", priority = "medium", width = 97, height = 38, frame_count = 16, shift = util.by_pixel(-0.25*0.75, -29.5*0.75), scale = 0.5*0.75 - } }, door_animation_down = { - filename = "__boblogistics__/graphics/entity/roboport/roboport-door-down-2.png", - priority = "medium", - width = 52, - height = 22, - frame_count = 16, - shift = {0.015625*0.75, -0.234375*0.75}, - scale = 0.75, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-door-down-2.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-door-down-2.png", priority = "medium", width = 97, height = 41, frame_count = 16, shift = util.by_pixel(-0.25*0.75,-9.75*0.75), scale = 0.5*0.75 - } } }, @@ -668,12 +583,13 @@ data:extend({ type = "roboport", name = "nullius-hangar-3", localised_name = {"equipment-name.nullius-hangar-3"}, - localised_description = {"equipment-description.nullius-buffer", + localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-hangar"}, - {"entity-description.nullius-megajoule", 150}}, + {"entity-description.nullius-megajoule", tostring(150)}}, icons = data.raw.item["nullius-hangar-3"].icons, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 1.6, result = "nullius-hangar-3"}, + collision_mask = {layers={item=true, meltable=true, object=true, player=true, water_tile=true, is_object=true, is_lower_object=true}}, fast_replaceable_group = "nullius-hangar", max_health = 600, corpse = "roboport-remnants", @@ -703,7 +619,7 @@ data:extend({ }, recharging_animation = data.raw["roboport"]["roboport"].recharging_animation, - vehicle_impact_sound = data.raw["roboport"]["roboport"].vehicle_impact_sound, + impact_category = data.raw["roboport"]["roboport"].impact_category, open_sound = data.raw["roboport"]["roboport"].open_sound, close_sound = data.raw["roboport"]["roboport"].close_sound, working_sound = data.raw["roboport"]["roboport"].working_sound, @@ -715,8 +631,7 @@ data:extend({ open_door_trigger_effect = data.raw["roboport"]["roboport"].open_door_trigger_effect, close_door_trigger_effect = data.raw["roboport"]["roboport"].close_door_trigger_effect, water_reflection = data.raw["roboport"]["roboport"].water_reflection, - circuit_wire_connection_point = circuit_connector_definitions["roboport"].points, - circuit_connector_sprites = circuit_connector_definitions["roboport"].sprites, + circuit_connector = circuit_connector_definitions["roboport"], circuit_wire_max_distance = default_circuit_wire_max_distance, default_available_logistic_output_signal = {type = "virtual", name = "signal-X"}, default_total_logistic_output_signal = {type = "virtual", name = "signal-Y"}, @@ -726,59 +641,32 @@ data:extend({ base = { layers = { { - filename = "__boblogistics__/graphics/entity/roboport/roboport-base-4.png", - width = 143, - height = 135, - shift = {0.5*0.75, 0.25*0.75}, - scale = 0.75, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-base-4.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-base-4.png", width = 228, height = 277, shift = util.by_pixel(2*0.75, 7.75*0.75), scale = 0.5*0.75 - } }, { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-shadow.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-shadow.png", width = 294, height = 201, draw_as_shadow = true, - force_hr_shadow = true, shift = util.by_pixel(28.5*0.75, 19.25*0.75), scale = 0.5*0.75 } } }, base_patch = { - filename = "__boblogistics__/graphics/entity/roboport/roboport-base-patch-4.png", - priority = "medium", - width = 69, - height = 50, - frame_count = 1, - shift = {0.03125*0.75, 0.203125*0.75}, - scale = 0.75, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-base-patch-4.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-base-patch-4.png", priority = "medium", width = 138, height = 100, - frame_count = 1, shift = util.by_pixel(1.5*0.75, 5*0.75), scale = 0.5*0.75 - } }, base_animation = { - filename = "__boblogistics__/graphics/entity/roboport/roboport-base-animation-4.png", - priority = "medium", - width = 42, - height = 31, - frame_count = 8, - animation_speed = 0.5, - shift = {-0.5315*0.75, -1.9375*0.75}, - scale = 0.75, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-base-animation-4.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-base-animation-4.png", priority = "medium", width = 83, height = 59, @@ -786,43 +674,24 @@ data:extend({ animation_speed = 0.5, shift = util.by_pixel(-17.75*0.75, -61.25*0.75), scale = 0.5*0.75 - } }, door_animation_up = { - filename = "__boblogistics__/graphics/entity/roboport/roboport-door-up-4.png", - priority = "medium", - width = 52, - height = 20, - frame_count = 16, - shift = {0.015625*0.75, -0.890625*0.75}, - scale = 0.75, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-door-up-4.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-door-up-4.png", priority = "medium", width = 97, height = 38, frame_count = 16, shift = util.by_pixel(-0.25*0.75, -29.5*0.75), scale = 0.5*0.75 - } }, door_animation_down = { - filename = "__boblogistics__/graphics/entity/roboport/roboport-door-down-4.png", - priority = "medium", - width = 52, - height = 22, - frame_count = 16, - shift = {0.015625*0.75, -0.234375*0.75}, - scale = 0.75, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-door-down-4.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-door-down-4.png", priority = "medium", width = 97, height = 41, frame_count = 16, shift = util.by_pixel(-0.25*0.75,-9.75*0.75), scale = 0.5*0.75 - } } }, @@ -830,12 +699,13 @@ data:extend({ type = "roboport", name = "nullius-hangar-4", localised_name = {"equipment-name.nullius-hangar-4"}, - localised_description = {"equipment-description.nullius-buffer", + localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-hangar"}, - {"entity-description.nullius-megajoule", 150}}, + {"entity-description.nullius-megajoule", tostring(150)}}, icons = data.raw.item["nullius-hangar-4"].icons, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 1.5, result = "nullius-hangar-4"}, + collision_mask = {layers={item=true, meltable=true, object=true, player=true, water_tile=true, is_object=true, is_lower_object=true}}, fast_replaceable_group = "nullius-charger", max_health = 600, corpse = "roboport-remnants", @@ -865,7 +735,7 @@ data:extend({ }, recharging_animation = data.raw["roboport"]["roboport"].recharging_animation, - vehicle_impact_sound = data.raw["roboport"]["roboport"].vehicle_impact_sound, + impact_category = data.raw["roboport"]["roboport"].impact_category, open_sound = data.raw["roboport"]["roboport"].open_sound, close_sound = data.raw["roboport"]["roboport"].close_sound, working_sound = data.raw["roboport"]["roboport"].working_sound, @@ -877,8 +747,7 @@ data:extend({ open_door_trigger_effect = data.raw["roboport"]["roboport"].open_door_trigger_effect, close_door_trigger_effect = data.raw["roboport"]["roboport"].close_door_trigger_effect, water_reflection = data.raw["roboport"]["roboport"].water_reflection, - circuit_wire_connection_point = circuit_connector_definitions["nullius-hangar-4"].points, - circuit_connector_sprites = circuit_connector_definitions["nullius-hangar-4"].sprites, + circuit_connector = circuit_connector_definitions["nullius-hangar-4"], circuit_wire_max_distance = default_circuit_wire_max_distance, default_available_logistic_output_signal = {type = "virtual", name = "signal-X"}, default_total_logistic_output_signal = {type = "virtual", name = "signal-Y"}, @@ -888,59 +757,32 @@ data:extend({ base = { layers = { { - filename = "__boblogistics__/graphics/entity/roboport/roboport-base-4.png", - width = 143, - height = 135, - shift = {0.5*0.5, 0.25*0.5}, - scale = 0.5, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-base-4.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-base-4.png", width = 228, height = 277, shift = util.by_pixel(2*0.5, 7.75*0.5), scale = 0.5*0.5 - } }, { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-shadow.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-shadow.png", width = 294, height = 201, draw_as_shadow = true, - force_hr_shadow = true, shift = util.by_pixel(28.5*0.5, 19.25*0.5), scale = 0.5*0.5 } } }, base_patch = { - filename = "__boblogistics__/graphics/entity/roboport/roboport-base-patch-4.png", - priority = "medium", - width = 69, - height = 50, - frame_count = 1, - shift = {0.03125*0.5, 0.203125*0.5}, - scale = 0.5, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-base-patch-4.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-base-patch-4.png", priority = "medium", width = 138, height = 100, - frame_count = 1, shift = util.by_pixel(1.5*0.5, 5*0.5), scale = 0.5*0.5 - } }, base_animation = { - filename = "__boblogistics__/graphics/entity/roboport/roboport-base-animation-4.png", - priority = "medium", - width = 42, - height = 31, - frame_count = 8, - animation_speed = 0.5, - shift = {-0.5315*0.5, -1.9375*0.5}, - scale = 0.5, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-base-animation-4.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-base-animation-4.png", priority = "medium", width = 83, height = 59, @@ -948,43 +790,24 @@ data:extend({ animation_speed = 0.5, shift = util.by_pixel(-17.75*0.5, -61.25*0.5), scale = 0.5*0.5 - } }, door_animation_up = { - filename = "__boblogistics__/graphics/entity/roboport/roboport-door-up-4.png", - priority = "medium", - width = 52, - height = 20, - frame_count = 16, - shift = {0.015625*0.5, -0.890625*0.5}, - scale = 0.5, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-door-up-4.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-door-up-4.png", priority = "medium", width = 97, height = 38, frame_count = 16, shift = util.by_pixel(-0.25*0.5, -29.5*0.5), scale = 0.5*0.5 - } }, door_animation_down = { - filename = "__boblogistics__/graphics/entity/roboport/roboport-door-down-4.png", - priority = "medium", - width = 52, - height = 22, - frame_count = 16, - shift = {0.015625*0.5, -0.234375*0.5}, - scale = 0.5, - hr_version = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-door-down-4.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-door-down-4.png", priority = "medium", width = 97, height = 41, frame_count = 16, shift = util.by_pixel(-0.25*0.5,-9.75*0.5), scale = 0.5*0.5 - } } }, @@ -992,9 +815,9 @@ data:extend({ type = "roboport", name = "nullius-relay-1", localised_name = {"equipment-name.nullius-relay-1"}, - localised_description = {"equipment-description.nullius-buffer", + localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-relay"}, - {"entity-description.nullius-megajoule", 6}}, + {"entity-description.nullius-megajoule", tostring(6)}}, icons = data.raw.item["nullius-relay-1"].icons, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 0.4, result = "nullius-relay-1"}, @@ -1031,8 +854,7 @@ data:extend({ base_patch = data.raw["roboport"]["bob-logistic-zone-expander"].base_patch, door_animation_up = data.raw["roboport"]["bob-logistic-zone-expander"].door_animation_up, door_animation_down = data.raw["roboport"]["bob-logistic-zone-expander"].door_animation_down, - circuit_wire_connection_point = circuit_connector_definitions["nullius-relay"].points, - circuit_connector_sprites = circuit_connector_definitions["nullius-relay"].sprites, + circuit_connector = circuit_connector_definitions["nullius-relay"], circuit_wire_max_distance = default_circuit_wire_max_distance, base = { @@ -1043,7 +865,7 @@ data:extend({ scale = 0.6 }, base_animation = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-base-animation.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-base-animation.png", priority = "medium", width = 83, height = 59, @@ -1060,7 +882,7 @@ data:extend({ localised_name = {"equipment-name.nullius-relay-2"}, localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-relay"}, - {"entity-description.nullius-megajoule", 15}}, + {"entity-description.nullius-megajoule", tostring(15)}}, icons = data.raw.item["nullius-relay-2"].icons, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 0.6, result = "nullius-relay-2"}, @@ -1097,8 +919,7 @@ data:extend({ base_patch = data.raw["roboport"]["bob-logistic-zone-expander"].base_patch, door_animation_up = data.raw["roboport"]["bob-logistic-zone-expander"].door_animation_up, door_animation_down = data.raw["roboport"]["bob-logistic-zone-expander"].door_animation_down, - circuit_wire_connection_point = circuit_connector_definitions["nullius-relay"].points, - circuit_connector_sprites = circuit_connector_definitions["nullius-relay"].sprites, + circuit_connector = circuit_connector_definitions["nullius-relay"], circuit_wire_max_distance = default_circuit_wire_max_distance, base = { @@ -1109,7 +930,7 @@ data:extend({ scale = 0.6 }, base_animation = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-base-animation-2.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-base-animation-2.png", priority = "medium", width = 83, height = 59, @@ -1126,7 +947,7 @@ data:extend({ localised_name = {"equipment-name.nullius-relay-3"}, localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-relay"}, - {"entity-description.nullius-megajoule", 40}}, + {"entity-description.nullius-megajoule", tostring(40)}}, icons = data.raw.item["nullius-relay-3"].icons, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 0.8, result = "nullius-relay-3"}, @@ -1163,8 +984,7 @@ data:extend({ base_patch = data.raw["roboport"]["bob-logistic-zone-expander"].base_patch, door_animation_up = data.raw["roboport"]["bob-logistic-zone-expander"].door_animation_up, door_animation_down = data.raw["roboport"]["bob-logistic-zone-expander"].door_animation_down, - circuit_wire_connection_point = circuit_connector_definitions["nullius-relay"].points, - circuit_connector_sprites = circuit_connector_definitions["nullius-relay"].sprites, + circuit_connector = circuit_connector_definitions["nullius-relay"], circuit_wire_max_distance = default_circuit_wire_max_distance, base = { @@ -1175,7 +995,7 @@ data:extend({ scale = 0.6 }, base_animation = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-base-animation-4.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-base-animation-4.png", priority = "medium", width = 83, height = 59, @@ -1192,7 +1012,7 @@ data:extend({ localised_name = {"equipment-name.nullius-relay-4"}, localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-relay"}, - {"entity-description.nullius-megajoule", 100}}, + {"entity-description.nullius-megajoule", tostring(100)}}, icons = data.raw.item["nullius-relay-4"].icons, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 1, result = "nullius-relay-4"}, @@ -1228,8 +1048,7 @@ data:extend({ base_patch = data.raw["roboport"]["bob-logistic-zone-expander"].base_patch, door_animation_up = data.raw["roboport"]["bob-logistic-zone-expander"].door_animation_up, door_animation_down = data.raw["roboport"]["bob-logistic-zone-expander"].door_animation_down, - circuit_wire_connection_point = circuit_connector_definitions["nullius-relay"].points, - circuit_connector_sprites = circuit_connector_definitions["nullius-relay"].sprites, + circuit_connector = circuit_connector_definitions["nullius-relay"], circuit_wire_max_distance = default_circuit_wire_max_distance, base = { @@ -1241,7 +1060,7 @@ data:extend({ tint = {0.85, 1, 0.9} }, base_animation = { - filename = "__boblogistics__/graphics/entity/roboport/hr-roboport-base-animation-3.png", + filename = "__boblogistics__/graphics/entity/roboport/roboport-base-animation-3.png", priority = "medium", width = 83, height = 59, @@ -1259,7 +1078,7 @@ data:extend({ localised_name = {"equipment-name.nullius-charger-1"}, localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-charger"}, - {"entity-description.nullius-megajoule", 15}}, + {"entity-description.nullius-megajoule", tostring(15)}}, icons = data.raw.item["nullius-charger-1"].icons, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 0.6, result = "nullius-charger-1"}, @@ -1342,7 +1161,7 @@ data:extend({ localised_name = {"equipment-name.nullius-charger-2"}, localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-charger"}, - {"entity-description.nullius-megajoule", 40}}, + {"entity-description.nullius-megajoule", tostring(40)}}, icons = data.raw.item["nullius-charger-2"].icons, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 0.8, result = "nullius-charger-2"}, @@ -1425,7 +1244,7 @@ data:extend({ localised_name = {"equipment-name.nullius-charger-3"}, localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-charger"}, - {"entity-description.nullius-megajoule", 100}}, + {"entity-description.nullius-megajoule", tostring(100)}}, icons = data.raw.item["nullius-charger-3"].icons, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 1, result = "nullius-charger-3"}, @@ -1507,7 +1326,7 @@ data:extend({ localised_name = {"equipment-name.nullius-charger-4"}, localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-charger"}, - {"entity-description.nullius-megajoule", 100}}, + {"entity-description.nullius-megajoule", tostring(100)}}, icons = data.raw.item["nullius-charger-4"].icons, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 1, result = "nullius-charger-4"}, @@ -1591,7 +1410,8 @@ local android1 = data.raw.character["character"] android1.order = "nullius-akb" local android2 = util.table.deepcopy(android1) android2.name = "nullius-android-2" -android2.localised_name = {"", {"item-name.nullius-android"}, " ", 2} +android2.localised_name = {"", {"item-name.nullius-android"}, " ", tostring(2)} +android2.icon = nil android2.icons = data.raw.item["nullius-android-2"].icons android2.order = "nullius-akc" android2.selection_box = {{-0.4, -1.55}, {0.4, 0.2}} @@ -1656,31 +1476,29 @@ data.raw.roboport["nullius-relay-construction-4"].construction_radius = 200.5 data.raw.roboport["nullius-hangar-construction-1"].base_animation.filename = "__boblogistics__/graphics/entity/roboport/roboport-base-animation-4.png" data.raw.roboport["nullius-hangar-construction-1"].base_animation.tint = {0.9, 0.8, 0.7} -data.raw.roboport["nullius-hangar-construction-1"].base_animation.hr_version.filename = - "__boblogistics__/graphics/entity/roboport/hr-roboport-base-animation-4.png" -data.raw.roboport["nullius-hangar-construction-1"].base_animation.hr_version.tint = {0.9, 0.8, 0.7} +data.raw.roboport["nullius-hangar-construction-1"].base_animation.filename = + "__boblogistics__/graphics/entity/roboport/roboport-base-animation-4.png" data.raw.roboport["nullius-relay-construction-1"].base_animation.filename = - data.raw.roboport["nullius-hangar-construction-1"].base_animation.hr_version.filename + data.raw.roboport["nullius-hangar-construction-1"].base_animation.filename data.raw.roboport["nullius-relay-construction-1"].base_animation.tint = {0.9, 0.8, 0.7} data.raw.roboport["nullius-hangar-construction-2"].base_animation.filename = "__boblogistics__/graphics/entity/roboport/roboport-base-animation-3.png" -data.raw.roboport["nullius-hangar-construction-2"].base_animation.hr_version.filename = - "__boblogistics__/graphics/entity/roboport/hr-roboport-base-animation-3.png" +data.raw.roboport["nullius-hangar-construction-2"].base_animation.filename = + "__boblogistics__/graphics/entity/roboport/roboport-base-animation-3.png" data.raw.roboport["nullius-hangar-construction-2"].base_animation.tint = {0.85, 1, 0.9} -data.raw.roboport["nullius-hangar-construction-2"].base_animation.hr_version.tint = {0.85, 1, 0.9} data.raw.roboport["nullius-relay-construction-2"].base_animation.filename = - data.raw.roboport["nullius-hangar-construction-2"].base_animation.hr_version.filename + data.raw.roboport["nullius-hangar-construction-2"].base_animation.filename +data.raw.roboport["nullius-hangar-construction-3"].base_animation.filename = + "__boblogistics__/graphics/entity/roboport/roboport-base-animation-3.png" data.raw.roboport["nullius-hangar-construction-3"].base_animation.filename = "__boblogistics__/graphics/entity/roboport/roboport-base-animation-3.png" -data.raw.roboport["nullius-hangar-construction-3"].base_animation.hr_version.filename = - "__boblogistics__/graphics/entity/roboport/hr-roboport-base-animation-3.png" data.raw.roboport["nullius-relay-construction-3"].base_animation.filename = - data.raw.roboport["nullius-hangar-construction-3"].base_animation.hr_version.filename + data.raw.roboport["nullius-hangar-construction-3"].base_animation.filename data.raw.roboport["nullius-relay-construction-3"].base_animation.tint = {1, 1, 0.75} data.raw.roboport["nullius-hangar-construction-4"].base_animation.filename = data.raw.roboport["nullius-hangar-construction-3"].base_animation.filename -data.raw.roboport["nullius-hangar-construction-4"].base_animation.hr_version.filename = - data.raw.roboport["nullius-hangar-construction-3"].base_animation.hr_version.filename +data.raw.roboport["nullius-hangar-construction-4"].base_animation.filename = + data.raw.roboport["nullius-hangar-construction-3"].base_animation.filename data.raw.roboport["nullius-relay-construction-4"].base_animation.filename = - "__boblogistics__/graphics/entity/roboport/hr-roboport-base-animation.png" + "__boblogistics__/graphics/entity/roboport/roboport-base-animation.png" data.raw.roboport["nullius-relay-construction-4"].base_animation.tint = {0.7, 0.7, 0.7} diff --git a/nullius/prototypes/entity/train.lua b/nullius/prototypes/entity/train.lua index 8c85dd2..ff57e17 100644 --- a/nullius/prototypes/entity/train.lua +++ b/nullius/prototypes/entity/train.lua @@ -18,7 +18,6 @@ data:extend({ collision_box = {{-0.6, -2.6}, {0.6, 2.6}}, selection_box = {{-1, -3}, {1, 3}}, damaged_trigger_effect = data.raw.locomotive["locomotive"].damaged_trigger_effect, - drawing_box = {{-1, -4}, {1, 3}}, alert_icon_shift = util.by_pixel(0, -24), weight = 1200, max_speed = 0.5555556, @@ -38,14 +37,16 @@ data:extend({ { type = "physical", decrease = 20, percent = 30 }, { type = "explosion", decrease = 20, percent = 30 } }, - burner = { - fuel_category = "vehicle", + energy_source = { + type = "burner", + fuel_categories = {"vehicle"}, effectivity = 0.9, fuel_inventory_size = 1, burnt_inventory_size = 2, - smoke = data.raw.locomotive["locomotive"].burner.smoke + smoke = data.raw.locomotive["locomotive"].energy_source.smoke }, front_light = data.raw.locomotive["locomotive"].front_light, + front_light_pictures = data.raw.locomotive["locomotive"].front_light_pictures, back_light = data.raw.locomotive["locomotive"].back_light, stand_by_light = data.raw.locomotive["locomotive"].stand_by_light, color = {r = 0.9, g = 0.85, b = 0, a = 0.5}, @@ -55,147 +56,56 @@ data:extend({ wheels = data.raw.locomotive["locomotive"].wheels, stop_trigger = data.raw.locomotive["locomotive"].stop_trigger, drive_over_tie_trigger = data.raw.locomotive["locomotive"].drive_over_tie_trigger, - vehicle_impact_sound = data.raw.locomotive["locomotive"].vehicle_impact_sound, + impact_category = data.raw.locomotive["locomotive"].impact_category, working_sound = data.raw.locomotive["locomotive"].working_sound, open_sound = data.raw.locomotive["locomotive"].open_sound, close_sound = data.raw.locomotive["locomotive"].close_sound, water_reflection = data.raw.locomotive["locomotive"].water_reflection, tie_distance = 50, - sound_minimum_speed = 0.5, - sound_scaling_ratio = 0.35, + --sound_minimum_speed = 0.5, + --sound_scaling_ratio = 0.35, pictures = { - layers = { - { - slice = 4, - priority = "very-low", - width = 238, - height = 230, - direction_count = 256, - allow_low_quality_rotation = true, - filenames = { - BASEENTITY .. "diesel-locomotive/diesel-locomotive-01.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-02.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-03.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-04.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-05.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-06.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-07.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-08.png" - }, - line_length = 4, - lines_per_file = 8, - shift = {0.0, -0.5}, - tint = {0.7, 0.7, 0.6}, - hr_version = { - priority = "very-low", - slice = 4, - width = 474, - height = 458, - direction_count = 256, - allow_low_quality_rotation = true, - filenames = { - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-1.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-2.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-3.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-4.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-5.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-6.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-7.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-8.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-9.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-10.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-11.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-12.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-13.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-14.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-15.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-16.png" - }, - line_length = 4, - lines_per_file = 4, - shift = {0.0, -0.5}, - tint = {0.62, 0.6, 0.5}, - scale = 0.5 - } - }, - { - priority = "very-low", - flags = { "mask" }, - slice = 4, - width = 236, - height = 228, - direction_count = 256, - allow_low_quality_rotation = true, - filenames = { - BASEENTITY .. "diesel-locomotive/diesel-locomotive-mask-01.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-mask-02.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-mask-03.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-mask-04.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-mask-05.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-mask-06.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-mask-07.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-mask-08.png" - }, - line_length = 4, - lines_per_file = 8, - shift = {0.0, -0.5}, - apply_runtime_tint = true, - hr_version = { - priority = "very-low", - flags = { "mask" }, - slice = 4, - width = 472, - height = 456, - direction_count = 256, - allow_low_quality_rotation = true, - filenames = { - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-mask-1.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-mask-2.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-mask-3.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-mask-4.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-mask-5.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-mask-6.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-mask-7.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-mask-8.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-mask-9.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-mask-10.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-mask-11.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-mask-12.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-mask-13.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-mask-14.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-mask-15.png", - BASEENTITY .. "diesel-locomotive/hr-diesel-locomotive-mask-16.png" - }, - line_length = 4, - lines_per_file = 4, - shift = {0.0, -0.5}, - apply_runtime_tint = true, - scale = 0.5 - } - }, - { - priority = "very-low", - slice = 4, - flags = { "shadow" }, - width = 253, - height = 212, - direction_count = 256, - draw_as_shadow = true, - allow_low_quality_rotation = true, - filenames = { - BASEENTITY .. "diesel-locomotive/diesel-locomotive-shadow-01.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-shadow-02.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-shadow-03.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-shadow-04.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-shadow-05.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-shadow-06.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-shadow-07.png", - BASEENTITY .. "diesel-locomotive/diesel-locomotive-shadow-08.png" - }, - line_length = 4, - lines_per_file = 8, - shift = {1, 0.3} + slope_angle_between_frames = data.raw.locomotive["locomotive"].pictures.slope_angle_between_frames, + slope_back_equals_front = data.raw.locomotive["locomotive"].pictures.slope_back_equals_front, + rotated = { + layers = { + util.sprite_load("__base__/graphics/entity/locomotive/locomotive", + { + dice = 4, + priority = "very-low", + allow_low_quality_rotation = true, + direction_count = 256, + scale = 0.5, + usage = "train", + tint = {0.62, 0.6, 0.5}, + } + ), + util.sprite_load("__base__/graphics/entity/locomotive/locomotive-mask", + { + dice = 4, + priority = "very-low", + flags = { "mask" }, + apply_runtime_tint = true, + tint_as_overlay = true, + allow_low_quality_rotation = true, + direction_count = 256, + scale = 0.5, + usage = "train", + } + ), + util.sprite_load("__base__/graphics/entity/locomotive/locomotive-shadow", + { + dice = 4, + priority = "very-low", + flags = { "shadow" }, + draw_as_shadow = true, + allow_low_quality_rotation = true, + direction_count = 256, + scale = 0.5, + usage = "train", + } + ) } } } @@ -217,7 +127,6 @@ data:extend({ collision_box = {{-0.6, -2.6}, {0.6, 2.6}}, selection_box = {{-1, -3}, {1, 3}}, damaged_trigger_effect = data.raw.locomotive["locomotive"].damaged_trigger_effect, - drawing_box = {{-1, -4}, {1, 3}}, alert_icon_shift = util.by_pixel(0, -24), weight = 2000, max_speed = 1.11111111, @@ -231,14 +140,16 @@ data:extend({ joint_distance = 4, energy_per_hit_point = 5, resistances = data.raw.locomotive["nullius-locomotive-1"].resistances, - burner = { - fuel_category = "vehicle", + energy_source = { + type = "burner", + fuel_categories = {"vehicle"}, effectivity = 0.95, fuel_inventory_size = 2, burnt_inventory_size = 2, - smoke = data.raw.locomotive["locomotive"].burner.smoke + smoke = data.raw.locomotive["locomotive"].energy_source.smoke }, front_light = data.raw.locomotive["locomotive"].front_light, + front_light_pictures = data.raw.locomotive["locomotive"].front_light_pictures, back_light = data.raw.locomotive["locomotive"].back_light, stand_by_light = data.raw.locomotive["locomotive"].stand_by_light, color = {r = 0.95, g = 0.1, b = 0, a = 0.5}, @@ -248,46 +159,32 @@ data:extend({ wheels = data.raw.locomotive["locomotive"].wheels, stop_trigger = data.raw.locomotive["locomotive"].stop_trigger, drive_over_tie_trigger = data.raw.locomotive["locomotive"].drive_over_tie_trigger, - vehicle_impact_sound = data.raw.locomotive["locomotive"].vehicle_impact_sound, + impact_category = data.raw.locomotive["locomotive"].impact_category, working_sound = data.raw.locomotive["locomotive"].working_sound, open_sound = data.raw.locomotive["locomotive"].open_sound, close_sound = data.raw.locomotive["locomotive"].close_sound, water_reflection = data.raw.locomotive["locomotive"].water_reflection, tie_distance = 50, - sound_minimum_speed = 0.5, - sound_scaling_ratio = 0.35, + --sound_minimum_speed = 0.5, + --sound_scaling_ratio = 0.35, pictures = { - layers = { - { - slice = 4, - priority = "very-low", - width = 238, - height = 230, - direction_count = 256, - allow_low_quality_rotation = true, - filenames = data.raw.locomotive["nullius-locomotive-1"].pictures.layers[1].filenames, - line_length = 4, - lines_per_file = 8, - shift = {0.0, -0.5}, - tint = {1, 0.9, 0.8}, - hr_version = { - priority = "very-low", - slice = 4, - width = 474, - height = 458, - direction_count = 256, - allow_low_quality_rotation = true, - filenames = data.raw.locomotive["nullius-locomotive-1"].pictures.layers[1].hr_version.filenames, - line_length = 4, - lines_per_file = 4, - shift = {0.0, -0.5}, - tint = {1, 0.9, 0.8}, - scale = 0.5 - } - }, - data.raw.locomotive["nullius-locomotive-1"].pictures.layers[2], - data.raw.locomotive["nullius-locomotive-1"].pictures.layers[3] + rotated = { + layers = { + util.sprite_load("__base__/graphics/entity/locomotive/locomotive", + { + dice = 4, + priority = "very-low", + allow_low_quality_rotation = true, + direction_count = 256, + scale = 0.5, + usage = "train", + tint = {1, 0.9, 0.8}, + } + ), + data.raw.locomotive["nullius-locomotive-1"].pictures.rotated.layers[2], + data.raw.locomotive["nullius-locomotive-1"].pictures.rotated.layers[3] + } } } }, @@ -306,7 +203,6 @@ data:extend({ collision_box = {{-0.6, -2.6}, {0.6, 2.6}}, selection_box = {{-1, -3}, {1, 3}}, damaged_trigger_effect = data.raw.locomotive["locomotive"].damaged_trigger_effect, - drawing_box = {{-1, -4}, {1, 3}}, alert_icon_shift = util.by_pixel(0, -24), weight = 3000, max_speed = 1.85185185, @@ -320,14 +216,16 @@ data:extend({ joint_distance = 4, energy_per_hit_point = 5, resistances = data.raw.locomotive["nullius-locomotive-1"].resistances, - burner = { - fuel_categories = {"nullius-nuclear", "vehicle"}, + energy_source = { + type = "burner", + fuel_categories = {"nullius-nuclear", "vehicle"}, effectivity = 1, fuel_inventory_size = 2, burnt_inventory_size = 2, - smoke = data.raw.locomotive["locomotive"].burner.smoke + smoke = data.raw.locomotive["locomotive"].energy_source.smoke }, front_light = data.raw.locomotive["locomotive"].front_light, + front_light_pictures = data.raw.locomotive["locomotive"].front_light_pictures, back_light = data.raw.locomotive["locomotive"].back_light, stand_by_light = data.raw.locomotive["locomotive"].stand_by_light, color = {r = 0.2, g = 0.3, b = 0.8, a = 0.5}, @@ -337,46 +235,32 @@ data:extend({ wheels = data.raw.locomotive["locomotive"].wheels, stop_trigger = data.raw.locomotive["locomotive"].stop_trigger, drive_over_tie_trigger = data.raw.locomotive["locomotive"].drive_over_tie_trigger, - vehicle_impact_sound = data.raw.locomotive["locomotive"].vehicle_impact_sound, + impact_category = data.raw.locomotive["locomotive"].impact_category, working_sound = data.raw.locomotive["locomotive"].working_sound, open_sound = data.raw.locomotive["locomotive"].open_sound, close_sound = data.raw.locomotive["locomotive"].close_sound, water_reflection = data.raw.locomotive["locomotive"].water_reflection, tie_distance = 50, - sound_minimum_speed = 0.5, - sound_scaling_ratio = 0.35, + --sound_minimum_speed = 0.5, + --sound_scaling_ratio = 0.35, pictures = { - layers = { - { - slice = 4, - priority = "very-low", - width = 238, - height = 230, - direction_count = 256, - allow_low_quality_rotation = true, - filenames = data.raw.locomotive["nullius-locomotive-1"].pictures.layers[1].filenames, - line_length = 4, - lines_per_file = 8, - shift = {0.0, -0.5}, - tint = {0.9, 0.95, 1}, - hr_version = { - priority = "very-low", - slice = 4, - width = 474, - height = 458, - direction_count = 256, - allow_low_quality_rotation = true, - filenames = data.raw.locomotive["nullius-locomotive-1"].pictures.layers[1].hr_version.filenames, - line_length = 4, - lines_per_file = 4, - shift = {0.0, -0.5}, - scale = 0.5, - tint = {0.9, 0.95, 1} - } - }, - data.raw.locomotive["nullius-locomotive-1"].pictures.layers[2], - data.raw.locomotive["nullius-locomotive-1"].pictures.layers[3] + rotated = { + layers = { + util.sprite_load("__base__/graphics/entity/locomotive/locomotive", + { + dice = 4, + priority = "very-low", + allow_low_quality_rotation = true, + direction_count = 256, + scale = 0.5, + usage = "train", + tint = {0.9, 0.95, 1} + } + ), + data.raw.locomotive["nullius-locomotive-1"].pictures.rotated.layers[2], + data.raw.locomotive["nullius-locomotive-1"].pictures.rotated.layers[3] + } } } }, @@ -395,7 +279,6 @@ data:extend({ collision_box = {{-0.6, -2.6}, {0.6, 2.6}}, selection_box = {{-1, -3}, {1, 3}}, damaged_trigger_effect = data.raw.locomotive["locomotive"].damaged_trigger_effect, - drawing_box = {{-1, -4}, {1, 3}}, alert_icon_shift = util.by_pixel(0, -24), weight = 3000, max_speed = 1.11111111, @@ -411,6 +294,7 @@ data:extend({ resistances = data.raw.locomotive["nullius-locomotive-1"].resistances, energy_source = {type = "void"}, front_light = data.raw.locomotive["locomotive"].front_light, + front_light_pictures = data.raw.locomotive["locomotive"].front_light_pictures, back_light = data.raw.locomotive["locomotive"].back_light, stand_by_light = data.raw.locomotive["locomotive"].stand_by_light, color = {r = 0.2, g = 0.8, b = 0.3, a = 0.5}, @@ -420,46 +304,32 @@ data:extend({ wheels = data.raw.locomotive["locomotive"].wheels, stop_trigger = data.raw.locomotive["locomotive"].stop_trigger, drive_over_tie_trigger = data.raw.locomotive["locomotive"].drive_over_tie_trigger, - vehicle_impact_sound = data.raw.locomotive["locomotive"].vehicle_impact_sound, + impact_category = data.raw.locomotive["locomotive"].impact_category, working_sound = data.raw.locomotive["locomotive"].working_sound, open_sound = data.raw.locomotive["locomotive"].open_sound, close_sound = data.raw.locomotive["locomotive"].close_sound, water_reflection = data.raw.locomotive["locomotive"].water_reflection, tie_distance = 50, - sound_minimum_speed = 0.5, - sound_scaling_ratio = 0.35, + --sound_minimum_speed = 0.5, + --sound_scaling_ratio = 0.35, pictures = { - layers = { - { - slice = 4, - priority = "very-low", - width = 238, - height = 230, - direction_count = 256, - allow_low_quality_rotation = true, - filenames = data.raw.locomotive["nullius-locomotive-1"].pictures.layers[1].filenames, - line_length = 4, - lines_per_file = 8, - shift = {0.0, -0.5}, - tint = {0.9, 1, 0.95}, - hr_version = { - priority = "very-low", - slice = 4, - width = 474, - height = 458, - direction_count = 256, - allow_low_quality_rotation = true, - filenames = data.raw.locomotive["nullius-locomotive-1"].pictures.layers[1].hr_version.filenames, - line_length = 4, - lines_per_file = 4, - shift = {0.0, -0.5}, - scale = 0.5, - tint = {0.9, 1, 0.95} - } - }, - data.raw.locomotive["nullius-locomotive-1"].pictures.layers[2], - data.raw.locomotive["nullius-locomotive-1"].pictures.layers[3] + rotated = { + layers = { + util.sprite_load("__base__/graphics/entity/locomotive/locomotive", + { + dice = 4, + priority = "very-low", + allow_low_quality_rotation = true, + direction_count = 256, + scale = 0.5, + usage = "train", + tint = {0.9, 1, 0.95} + } + ), + data.raw.locomotive["nullius-locomotive-1"].pictures.rotated.layers[2], + data.raw.locomotive["nullius-locomotive-1"].pictures.rotated.layers[3] + } } } }, @@ -507,9 +377,9 @@ data:extend({ crash_trigger = data.raw["cargo-wagon"]["cargo-wagon"].crash_trigger, open_sound = data.raw["cargo-wagon"]["cargo-wagon"].open_sound, close_sound = data.raw["cargo-wagon"]["cargo-wagon"].close_sound, - vehicle_impact_sound = data.raw["cargo-wagon"]["cargo-wagon"].vehicle_impact_sound, + impact_category = data.raw["cargo-wagon"]["cargo-wagon"].impact_category, water_reflection = data.raw["cargo-wagon"]["cargo-wagon"].water_reflection, - sound_minimum_speed = 1, + --sound_minimum_speed = 1, pictures = data.raw["cargo-wagon"]["cargo-wagon"].pictures, horizontal_doors = data.raw["cargo-wagon"]["cargo-wagon"].horizontal_doors, vertical_doors = data.raw["cargo-wagon"]["cargo-wagon"].vertical_doors @@ -558,9 +428,9 @@ data:extend({ crash_trigger = data.raw["cargo-wagon"]["cargo-wagon"].crash_trigger, open_sound = data.raw["cargo-wagon"]["cargo-wagon"].open_sound, close_sound = data.raw["cargo-wagon"]["cargo-wagon"].close_sound, - vehicle_impact_sound = data.raw["cargo-wagon"]["cargo-wagon"].vehicle_impact_sound, + impact_category = data.raw["cargo-wagon"]["cargo-wagon"].impact_category, water_reflection = data.raw["cargo-wagon"]["cargo-wagon"].water_reflection, - sound_minimum_speed = 1, + --sound_minimum_speed = 1, pictures = data.raw["cargo-wagon"]["cargo-wagon"].pictures, horizontal_doors = data.raw["cargo-wagon"]["cargo-wagon"].horizontal_doors, vertical_doors = data.raw["cargo-wagon"]["cargo-wagon"].vertical_doors @@ -609,9 +479,9 @@ data:extend({ crash_trigger = data.raw["cargo-wagon"]["cargo-wagon"].crash_trigger, open_sound = data.raw["cargo-wagon"]["cargo-wagon"].open_sound, close_sound = data.raw["cargo-wagon"]["cargo-wagon"].close_sound, - vehicle_impact_sound = data.raw["cargo-wagon"]["cargo-wagon"].vehicle_impact_sound, + impact_category = data.raw["cargo-wagon"]["cargo-wagon"].impact_category, water_reflection = data.raw["cargo-wagon"]["cargo-wagon"].water_reflection, - sound_minimum_speed = 1, + --sound_minimum_speed = 1, pictures = data.raw["cargo-wagon"]["cargo-wagon"].pictures, horizontal_doors = data.raw["cargo-wagon"]["cargo-wagon"].horizontal_doors, vertical_doors = data.raw["cargo-wagon"]["cargo-wagon"].vertical_doors @@ -634,7 +504,7 @@ data:extend({ damaged_trigger_effect = data.raw["fluid-wagon"]["fluid-wagon"].damaged_trigger_effect, vertical_selection_shift = -0.796875, weight = 750, - max_speed = 1.48148148, + max_speed = 1.48148148, braking_force = 1, friction_force = 0.25, air_resistance = 0.006, @@ -657,98 +527,37 @@ data:extend({ tie_distance = 50, working_sound = data.raw["fluid-wagon"]["fluid-wagon"].working_sound, crash_trigger = data.raw["fluid-wagon"]["fluid-wagon"].crash_trigger, - vehicle_impact_sound = data.raw["fluid-wagon"]["fluid-wagon"].vehicle_impact_sound, + impact_category = data.raw["fluid-wagon"]["fluid-wagon"].impact_category, water_reflection = data.raw["fluid-wagon"]["fluid-wagon"].water_reflection, - sound_minimum_speed = 0.1, - + --sound_minimum_speed = 0.1, + pictures = { - layers = { - { - priority = "very-low", - slice = 4, - width = 208, - height = 210, - back_equals_front = true, - direction_count = 128, - allow_low_quality_rotation = true, - filenames = { - BASEENTITY .. "fluid-wagon/fluid-wagon-1.png", - BASEENTITY .. "fluid-wagon/fluid-wagon-2.png", - BASEENTITY .. "fluid-wagon/fluid-wagon-3.png", - BASEENTITY .. "fluid-wagon/fluid-wagon-4.png" - }, - line_length = 4, - lines_per_file = 8, - shift = {0 + 0.013, -1 + 0.077}, - apply_runtime_tint = true, - hr_version = { - priority = "very-low", - slice = 4, - width = 416, - height = 419, - back_equals_front = true, - direction_count = 128, - allow_low_quality_rotation = true, - filenames = { - BASEENTITY .. "fluid-wagon/hr-fluid-wagon-1.png", - BASEENTITY .. "fluid-wagon/hr-fluid-wagon-2.png", - BASEENTITY .. "fluid-wagon/hr-fluid-wagon-3.png", - BASEENTITY .. "fluid-wagon/hr-fluid-wagon-4.png", - BASEENTITY .. "fluid-wagon/hr-fluid-wagon-5.png", - BASEENTITY .. "fluid-wagon/hr-fluid-wagon-6.png", - BASEENTITY .. "fluid-wagon/hr-fluid-wagon-7.png", - BASEENTITY .. "fluid-wagon/hr-fluid-wagon-8.png" - }, - line_length = 4, - lines_per_file = 4, - shift = {0 + 0.013, -1 + 0.077}, - apply_runtime_tint = true, - scale = 0.5 - } - }, - { - flags = { "shadow" }, - priority = "very-low", - slice = 4, - width = 251, - height = 188, - back_equals_front = true, - draw_as_shadow = true, - direction_count = 128, - allow_low_quality_rotation = true, - filenames = { - BASEENTITY .. "fluid-wagon/fluid-wagon-shadow-1.png", - BASEENTITY .. "fluid-wagon/fluid-wagon-shadow-2.png", - BASEENTITY .. "fluid-wagon/fluid-wagon-shadow-3.png", - BASEENTITY .. "fluid-wagon/fluid-wagon-shadow-4.png" - }, - line_length = 4, - lines_per_file = 8, - shift = {0.875 + 0.013, 0.3125 + 0.077}, - hr_version = { - flags = { "shadow" }, - priority = "very-low", - slice = 4, - width = 501, - height = 375, - back_equals_front = true, - draw_as_shadow = true, - direction_count = 128, - allow_low_quality_rotation = true, - filenames = { - BASEENTITY .. "fluid-wagon/hr-fluid-wagon-shadow-1.png", - BASEENTITY .. "fluid-wagon/hr-fluid-wagon-shadow-2.png", - BASEENTITY .. "fluid-wagon/hr-fluid-wagon-shadow-3.png", - BASEENTITY .. "fluid-wagon/hr-fluid-wagon-shadow-4.png", - BASEENTITY .. "fluid-wagon/hr-fluid-wagon-shadow-5.png", - BASEENTITY .. "fluid-wagon/hr-fluid-wagon-shadow-6.png", - BASEENTITY .. "fluid-wagon/hr-fluid-wagon-shadow-7.png" - }, - line_length = 4, - lines_per_file = 5, - shift = {0.875 + 0.013, 0.3125 + 0.077}, - scale = 0.5 - } + rotated = { + layers = { + util.sprite_load("__base__/graphics/entity/fluid-wagon/fluid-wagon", + { + dice = 4, + priority = "very-low", + allow_low_quality_rotation = true, + back_equals_front = true, + direction_count = 128, + scale = 0.5, + usage = "train", + apply_runtime_tint = true, + } + ), + util.sprite_load("__base__/graphics/entity/fluid-wagon/fluid-wagon-shadow", + { + dice = 4, + priority = "very-low", + allow_low_quality_rotation = true, + back_equals_front = true, + draw_as_shadow = true, + direction_count = 128, + scale = 0.5, + usage = "train", + } + ) } } } @@ -797,9 +606,9 @@ data:extend({ tie_distance = 50, working_sound = data.raw["fluid-wagon"]["fluid-wagon"].working_sound, crash_trigger = data.raw["fluid-wagon"]["fluid-wagon"].crash_trigger, - vehicle_impact_sound = data.raw["fluid-wagon"]["fluid-wagon"].vehicle_impact_sound, + impact_category = data.raw["fluid-wagon"]["fluid-wagon"].impact_category, water_reflection = data.raw["fluid-wagon"]["fluid-wagon"].water_reflection, - sound_minimum_speed = 0.1, + --sound_minimum_speed = 0.1, pictures = data.raw["fluid-wagon"]["nullius-fluid-wagon-1"].pictures }, @@ -844,9 +653,9 @@ data:extend({ tie_distance = 50, working_sound = data.raw["fluid-wagon"]["fluid-wagon"].working_sound, crash_trigger = data.raw["fluid-wagon"]["fluid-wagon"].crash_trigger, - vehicle_impact_sound = data.raw["fluid-wagon"]["fluid-wagon"].vehicle_impact_sound, + impact_category = data.raw["fluid-wagon"]["fluid-wagon"].impact_category, water_reflection = data.raw["fluid-wagon"]["fluid-wagon"].water_reflection, - sound_minimum_speed = 0.1, + --sound_minimum_speed = 0.1, pictures = data.raw["fluid-wagon"]["nullius-fluid-wagon-1"].pictures }, @@ -890,11 +699,14 @@ data:extend({ back_light = data.raw["artillery-wagon"]["artillery-wagon"].back_light, stand_by_light = data.raw["artillery-wagon"]["artillery-wagon"].stand_by_light, color = {r = 0.43, g = 0.23, b = 0, a = 0.5}, + cannon_barrel_pictures = data.raw["artillery-wagon"]["artillery-wagon"].cannon_barrel_pictures, cannon_base_pictures = data.raw["artillery-wagon"]["artillery-wagon"].cannon_base_pictures, - cannon_base_shiftings = data.raw["artillery-wagon"]["artillery-wagon"].cannon_base_shiftings, cannon_barrel_recoil_shiftings = data.raw["artillery-wagon"]["artillery-wagon"].cannon_barrel_recoil_shiftings, - cannon_barrel_recoil_shiftings_load_correction_matrix = data.raw["artillery-wagon"]["artillery-wagon"].cannon_barrel_recoil_shiftings_load_correction_matrix, + cannon_base_height = data.raw["artillery-wagon"]["artillery-wagon"].cannon_base_height, + cannon_base_shift_when_vertical = data.raw["artillery-wagon"]["artillery-wagon"].cannon_base_shift_when_vertical, + cannon_base_shift_when_horizontal = data.raw["artillery-wagon"]["artillery-wagon"].cannon_base_shift_when_horizontal, + minimap_representation = data.raw["artillery-wagon"]["artillery-wagon"].minimap_representation, selected_minimap_representation = data.raw["artillery-wagon"]["artillery-wagon"].selected_minimap_representation, wheels = data.raw["artillery-wagon"]["artillery-wagon"].wheels, @@ -905,42 +717,39 @@ data:extend({ crash_trigger = data.raw["artillery-wagon"]["artillery-wagon"].crash_trigger, open_sound = data.raw["artillery-wagon"]["artillery-wagon"].open_sound, close_sound = data.raw["artillery-wagon"]["artillery-wagon"].close_sound, - vehicle_impact_sound = data.raw["artillery-wagon"]["artillery-wagon"].vehicle_impact_sound, + impact_category = data.raw["artillery-wagon"]["artillery-wagon"].impact_category, water_reflection = data.raw["artillery-wagon"]["artillery-wagon"].water_reflection, - rotating_sound = { sound = { filename = "__base__/sound/fight/artillery-rotation-loop.ogg", volume = 0.2 }}, - rotating_stopped_sound = { filename = "__base__/sound/fight/artillery-rotation-stop.ogg" }, - sound_minimum_speed = 0.1, + rotating_sound = { sound = { filename = "__base__/sound/fight/artillery-rotation-loop.ogg", volume = 0.2}, stopped_sound = { filename = "__base__/sound/fight/artillery-rotation-stop.ogg" }}, + --sound_minimum_speed = 0.1, pictures = { - layers = { - { - priority = "very-low", - width = 238, - height = 206, - direction_count = 256, - allow_low_quality_rotation = true, - line_length = 4, - lines_per_file = 4, - shift = util.by_pixel(0, -27), - dice = 4, - filenames = data.raw["artillery-wagon"]["artillery-wagon"].pictures.layers[1].filenames, - tint = { 0.7, 0.7, 0.9 }, - hr_version = { - priority = "very-low", - width = 476, - height = 410, - direction_count = 256, - allow_low_quality_rotation = true, - line_length = 4, - lines_per_file = 4, - shift = util.by_pixel(0.5, -27.5), - scale = 0.5, - dice = 4, - filenames = data.raw["artillery-wagon"]["artillery-wagon"].pictures.layers[1].hr_version.filenames, - tint = { 0.7, 0.7, 0.9 } - } - }, - data.raw["artillery-wagon"]["artillery-wagon"].pictures.layers[2] + rotated = { + layers = { + util.sprite_load("__base__/graphics/entity/artillery-wagon/artillery-wagon-base", + { + dice = 4, + priority = "very-low", + allow_low_quality_rotation = true, + direction_count = 256, + scale = 0.5, + usage = "train", + tint = { 0.7, 0.7, 0.9 }, + } + ), + util.sprite_load("__base__/graphics/entity/artillery-wagon/artillery-wagon-base", + { + dice = 4, + priority = "very-low", + allow_low_quality_rotation = true, + draw_as_shadow = true, + direction_count = 256, + scale = 0.5, + usage = "train", + tint = { 0.7, 0.7, 0.9 } + } + ), + data.raw["artillery-wagon"]["artillery-wagon"].pictures.rotated.layers[2] + } } } }, @@ -985,12 +794,15 @@ data:extend({ back_light = data.raw["artillery-wagon"]["artillery-wagon"].back_light, stand_by_light = data.raw["artillery-wagon"]["artillery-wagon"].stand_by_light, color = {r = 0.43, g = 0.23, b = 0, a = 0.5}, + pictures = data.raw["artillery-wagon"]["artillery-wagon"].pictures, cannon_barrel_pictures = data.raw["artillery-wagon"]["artillery-wagon"].cannon_barrel_pictures, cannon_base_pictures = data.raw["artillery-wagon"]["artillery-wagon"].cannon_base_pictures, - cannon_base_shiftings = data.raw["artillery-wagon"]["artillery-wagon"].cannon_base_shiftings, cannon_barrel_recoil_shiftings = data.raw["artillery-wagon"]["artillery-wagon"].cannon_barrel_recoil_shiftings, - cannon_barrel_recoil_shiftings_load_correction_matrix = data.raw["artillery-wagon"]["artillery-wagon"].cannon_barrel_recoil_shiftings_load_correction_matrix, + cannon_base_height = data.raw["artillery-wagon"]["artillery-wagon"].cannon_base_height, + cannon_base_shift_when_vertical = data.raw["artillery-wagon"]["artillery-wagon"].cannon_base_shift_when_vertical, + cannon_base_shift_when_horizontal = data.raw["artillery-wagon"]["artillery-wagon"].cannon_base_shift_when_horizontal, + minimap_representation = data.raw["artillery-wagon"]["artillery-wagon"].minimap_representation, selected_minimap_representation = data.raw["artillery-wagon"]["artillery-wagon"].selected_minimap_representation, wheels = data.raw["artillery-wagon"]["artillery-wagon"].wheels, @@ -1001,10 +813,9 @@ data:extend({ crash_trigger = data.raw["artillery-wagon"]["artillery-wagon"].crash_trigger, open_sound = data.raw["artillery-wagon"]["artillery-wagon"].open_sound, close_sound = data.raw["artillery-wagon"]["artillery-wagon"].close_sound, - vehicle_impact_sound = data.raw["artillery-wagon"]["artillery-wagon"].vehicle_impact_sound, + impact_category = data.raw["artillery-wagon"]["artillery-wagon"].impact_category, water_reflection = data.raw["artillery-wagon"]["artillery-wagon"].water_reflection, - rotating_sound = { sound = { filename = "__base__/sound/fight/artillery-rotation-loop.ogg", volume = 0.2 }}, - rotating_stopped_sound = { filename = "__base__/sound/fight/artillery-rotation-stop.ogg" }, - sound_minimum_speed = 0.1 + rotating_sound = { sound = { filename = "__base__/sound/fight/artillery-rotation-loop.ogg", volume = 0.2 },stopped_sound = { filename = "__base__/sound/fight/artillery-rotation-stop.ogg" }}, + --sound_minimum_speed = 0.1 } }) diff --git a/nullius/prototypes/entity/turbine.lua b/nullius/prototypes/entity/turbine.lua index 64afa82..ca3679b 100644 --- a/nullius/prototypes/entity/turbine.lua +++ b/nullius/prototypes/entity/turbine.lua @@ -2,14 +2,14 @@ local invisible = { filename = "__nullius__/graphics/icons/blank.png", width = 32, height = 32, - frame_count = 1, + --frame_count = 1, line_length = 1 } local turbine_graphics = { [false] = { layers = { { - filename = "__base__/graphics/entity/steam-turbine/hr-steam-turbine-H.png", + filename = "__base__/graphics/entity/steam-turbine/steam-turbine-H.png", width = 320, height = 245, frame_count = 1, @@ -24,7 +24,7 @@ local turbine_graphics = { shift = util.by_pixel(0, -2.75), scale = 0.5 }, { - filename = "__base__/graphics/entity/steam-turbine/hr-steam-turbine-H-shadow.png", + filename = "__base__/graphics/entity/steam-turbine/steam-turbine-H-shadow.png", width = 435, height = 150, frame_count = 1, @@ -36,14 +36,15 @@ local turbine_graphics = { }}, [true] = { layers = { { - filename = "__base__/graphics/entity/steam-turbine/hr-steam-turbine-V.png", + filename = "__base__/graphics/entity/steam-turbine/steam-turbine-V.png", width = 217, - height = 347, + height = 374, frame_count = 1, line_length = 1, - shift = util.by_pixel(4.75, 6.75), + shift = util.by_pixel(4.75, 0.0), scale = 0.5 - }, { + }, + { width = 217, height = 347, frame_count = 1, @@ -51,7 +52,7 @@ local turbine_graphics = { shift = util.by_pixel(4.75, 6.75), scale = 0.5 }, { - filename = "__base__/graphics/entity/steam-turbine/hr-steam-turbine-V-shadow.png", + filename = "__base__/graphics/entity/steam-turbine/steam-turbine-V-shadow.png", width = 302, height = 260, frame_count = 1, @@ -85,12 +86,25 @@ end local function set_furnace_idle(proto, overlay, tint) local vertical = turbine_frame(true, overlay, tint) local horizontal = turbine_frame(false, overlay, tint) - proto.idle_animation = { - north = vertical, - east = horizontal, - south = vertical, - west = horizontal + proto.graphics_set = { + always_draw_idle_animation = true, + idle_animation = { + north = vertical, + east = horizontal, + south = vertical, + west = horizontal + } } + -- proto.graphics_set.working_visualisations = { + -- { + -- always_draw = true, + -- render_layer = "object-under", -- draw under the generator animation (only used for the preview) + -- north_animation = vertical, + -- east_animation = horizontal, + -- south_animation = vertical, + -- west_animation = horizontal + -- } + -- } end local function set_generator_animation(proto, overlay, tint) @@ -103,13 +117,14 @@ local function finish_furnace(furnace, generator, overlay, local midfix = openness .. "-" .. priority local suffix = midfix .. "-" .. tier furnace.name = "nullius-turbine-" .. suffix - furnace.localised_name = {"", {"entity-name.nullius-turbine-" .. midfix}, " ", tier} + furnace.localised_name = {"", {"entity-name.nullius-turbine-" .. midfix}, " ", tostring(tier)} furnace.localised_description = {"entity-description.nullius-turbine-info", - power, (generator.effectivity * 100), + tostring(power), tostring(generator.effectivity * 100), {"entity-description.nullius-turbine-entity", {"entity-description.nullius-turbine-" .. openness}, {"entity-description.nullius-turbine-" .. priority}}} furnace.order = data.raw.item[furnace.minable.result].order .. suborder + furnace.subgroup = "energy-backup-mode-" .. priority generator.name = "nullius-turbine-generator-" .. suffix generator.localised_name = furnace.localised_name generator.localised_description = furnace.localised_description @@ -137,10 +152,10 @@ local function turbine_variants(tier, furnacecb, generatorob, furnaceob.placeable_by.item = "nullius-turbine-open-" .. tier furnaceob.crafting_categories = {"turbine-open"} furnaceob.fluid_boxes[3] = nil - furnaceob.fluid_boxes[1].height = (furnacecb.fluid_boxes[1].height * 2) + furnaceob.fluid_boxes[1].volume = 1000 furnaceob.fluid_boxes[1].pipe_connections = { - { type = "input-output", position = {0, 3} }, - { type = "input-output", position = {0, -3} } + { flow_direction = "input-output", position = {0, 2}, direction = defines.direction.south }, + { flow_direction = "input-output", position = {0, -2}, direction = defines.direction.north } } local furnacecs = util.table.deepcopy(furnacecb) @@ -201,7 +216,7 @@ local furnace1cb = { fast_replaceable_group = "nullius-turbine", selection_box = {{-1.4, -2.4}, {1.4, 2.4}}, collision_box = {{-1.25, -2.05}, {1.25, 2.05}}, - drawing_box = {{-1.5, -3}, {1.5, 4}}, + alert_icon_shift = util.by_pixel(0, -12), energy_source = { type = "void" }, energy_usage = "1W", @@ -212,12 +227,10 @@ local furnace1cb = { damaged_trigger_effect = data.raw.generator["steam-turbine"].damaged_trigger_effect, open_sound = data.raw.generator["steam-turbine"].open_sound, close_sound = data.raw.generator["steam-turbine"].close_sound, - vehicle_impact_sound = data.raw.generator["steam-turbine"].vehicle_impact_sound, + impact_category = data.raw.generator["steam-turbine"].impact_category, water_reflection = data.raw.generator["steam-turbine"].water_reflection, - bottleneck_ignore = true, show_recipe_icon = false, show_recipe_icon_on_map = false, - always_draw_idle_animation = true, additional_pastable_entities = { "nullius-turbine-open-backup-1", "nullius-turbine-closed-backup-1", "nullius-turbine-open-standard-1", "nullius-turbine-closed-standard-1", @@ -232,29 +245,25 @@ local furnace1cb = { fluid_boxes = { { production_type = "input", - pipe_connections = {{ type = "input", position = {0, -3} }}, + pipe_connections = {{ flow_direction = "input-output", position = {0, -2}, direction = defines.direction.north }}, pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -2, - height = 2, + volume = 1000, secondary_draw_orders = { north = -1 } }, { - filter = "nullius-energy", + filter = "nullius-energy", production_type = "output", - pipe_connections = {{ type = "output", position = {1, -2.1} }}, - base_area = 2, - base_level = 2, - height = 2, - hide_connection_info = true + pipe_connections = { + { flow_direction = "output", position = {1, -1.1}, direction = defines.direction.north }, + { flow_direction = "output", position = {-1, 1.1}, direction = defines.direction.south }}, + volume = 500, + hide_connection_info = true }, { production_type = "output", - pipe_connections = {{ type = "output", position = {0, 3} }}, + pipe_connections = {{ flow_direction = "output", position = {0, 2}, direction = defines.direction.south }}, pipe_covers = pipecoverspictures(), - base_area = 6, - base_level = 5, - height = 4, + volume = 2000, secondary_draw_orders = { north = -1 } } } @@ -265,37 +274,26 @@ furnace2cb.minable = {mining_time = 1.2, result = "nullius-turbine-closed-2"} furnace2cb.placeable_by = {item = "nullius-turbine-closed-2", count = 1} furnace2cb.max_health = 400 furnace2cb.crafting_speed = 2.4 -furnace2cb.fluid_boxes[1].base_area = 8 -furnace2cb.fluid_boxes[1].base_level = -4 -furnace2cb.fluid_boxes[1].height = 4 -furnace2cb.fluid_boxes[2].base_area = 4 -furnace2cb.fluid_boxes[2].base_level = 3 -furnace2cb.fluid_boxes[2].height = 3 -furnace2cb.fluid_boxes[3].base_area = 10 -furnace2cb.fluid_boxes[3].base_level = 8 -furnace2cb.fluid_boxes[3].height = 8 +furnace2cb.fluid_boxes[1].volume = 1000 +furnace2cb.fluid_boxes[2].volume = 500 +furnace2cb.fluid_boxes[3].volume = 2000 local furnace3cb = util.table.deepcopy(furnace1cb) furnace3cb.minable = {mining_time = 1.6, result = "nullius-turbine-closed-3"} furnace3cb.placeable_by = {item = "nullius-turbine-closed-3", count = 1} furnace3cb.max_health = 500 furnace3cb.crafting_speed = 5.4 -furnace3cb.fluid_boxes[1].base_area = 10 -furnace3cb.fluid_boxes[1].base_level = -8 -furnace3cb.fluid_boxes[1].height = 8 -furnace3cb.fluid_boxes[2].base_area = 6 -furnace3cb.fluid_boxes[2].base_level = 5 -furnace3cb.fluid_boxes[2].height = 5 -furnace3cb.fluid_boxes[3].base_area = 15 -furnace3cb.fluid_boxes[3].base_level = 10 -furnace3cb.fluid_boxes[3].height = 15 +furnace3cb.fluid_boxes[1].volume = 1000 +furnace3cb.fluid_boxes[2].volume = 500 +furnace3cb.fluid_boxes[3].volume = 2000 local generator1ob = { type = "generator", flags = { "placeable-neutral", "player-creation", "not-on-map", - "not-blueprintable", "not-deconstructable", - "hidden", "hide-alt-info", "not-upgradable" }, + "not-blueprintable", "not-deconstructable", "hide-alt-info", + "not-upgradable" }, + hidden = true, max_power_output = "1MW", effectivity = 0.9, fluid_usage_per_tick = 2, @@ -307,26 +305,27 @@ local generator1ob = { allow_copy_paste = false, selection_box = {{-1.4, -2.4}, {1.4, 2.4}}, collision_box = {{-1.25, -2.05}, {1.25, 2.05}}, - collision_mask = { "not-colliding-with-itself" }, + collision_mask = { layers = {}, not_colliding_with_itself = true}, alert_icon_shift = util.by_pixel(0, -12), energy_source = { type = "electric", usage_priority = "tertiary" }, smoke = data.raw.generator["steam-turbine"].smoke, working_sound = data.raw.generator["steam-turbine"].working_sound, - min_perceived_performance = 0.25, - performance_to_sound_speedup = 0.5, + perceived_performance = { + minimum = 0.25, + performance_to_activity_rate = 0.5 + }, + horizontal_animation = generator_horizontal, vertical_animation = generator_vertical, fluid_box = { filter = "nullius-energy", production_type = "input", - pipe_connections = { - { type = "input-output", position = {-1, -2.1} }, - { type = "input-output", position = {1, 2.1} } - }, - base_area = 1, - base_level = -2, - height = 4, - hide_connection_info = true + pipe_connections = { + { flow_direction = "input-output", position = {-1, -1.1}, direction = defines.direction.north }, + { flow_direction = "input-output", position = {1, 1.1}, direction = defines.direction.south } + }, + volume = 500, + hide_connection_info = true } } @@ -335,18 +334,14 @@ generator2ob.max_power_output = "2.5MW" generator2ob.effectivity = 0.95 generator2ob.fluid_usage_per_tick = 5 generator2ob.maximum_temperature = 1800 -generator2ob.fluid_box.base_area = 1.5 -generator2ob.fluid_box.base_level = -5 -generator2ob.fluid_box.height = 8 +generator2ob.fluid_box.volume = 500 local generator3ob = util.table.deepcopy(generator1ob) generator3ob.max_power_output = "6MW" generator3ob.effectivity = 1 generator3ob.fluid_usage_per_tick = 11 generator3ob.maximum_temperature = 2000 -generator3ob.fluid_box.base_area = 2 -generator3ob.fluid_box.base_level = -11 -generator3ob.fluid_box.height = 16 +generator3ob.fluid_box.volume = 500 local connector = { @@ -355,16 +350,16 @@ local connector = { icons = {{ icon = "__base__/graphics/icons/steam-turbine.png", icon_size = 64, - icon_mipmaps = 4 }}, flags = { "placeable-neutral", "player-creation", "not-on-map", - "not-blueprintable", "not-deconstructable", "hidden", - "hide-alt-info", "not-upgradable", "placeable-off-grid" }, + "not-blueprintable", "not-deconstructable", "hide-alt-info", + "not-upgradable", "placeable-off-grid" }, + hidden = true, selectable_in_game = false, allow_copy_paste = false, selection_box = {{-1.4, -0.3}, {1.4, 0.3}}, collision_box = {{-1.25, -0.05}, {1.25, 0.05}}, - collision_mask = {"not-colliding-with-itself"}, + collision_mask = { layers = {}, not_colliding_with_itself = true}, window_bounding_box = {{0, 0}, {0, 0}}, flow_length_in_ticks = 360, pictures = { @@ -376,13 +371,11 @@ local connector = { }, fluid_box = { filter = "nullius-energy", - base_area = 2, - base_level = 0, - height = 2, - hide_connection_info = true, + volume = 500, + hide_connection_info = true, pipe_connections = { - { position = {1, 0.7} }, - { position = {-1, 0.7} } + { position = {1, 0.04}, direction = defines.direction.south }, + { position = {-1, 0.04}, direction = defines.direction.south } } } } @@ -394,10 +387,10 @@ local vent1 = { flags = connector.flags, collision_box = connector.collision_box, selection_box = connector.selection_box, - collision_mask = { "not-colliding-with-itself" }, + collision_mask = { layers = {}, not_colliding_with_itself = true}, + hidden = true, selectable_in_game = false, allow_copy_paste = false, - bottleneck_ignore = true, show_recipe_icon = false, show_recipe_icon_on_map = false, crafting_categories = {"nullius-power-sink"}, @@ -405,13 +398,11 @@ local vent1 = { crafting_speed = 1, source_inventory_size = 0, fluid_boxes = {{ - filter = "nullius-energy", + filter = "nullius-energy", production_type = "input", - base_area = 3, - base_level = 1, - height = 1, - hide_connection_info = true, - pipe_connections = {{ type="input-output", position = {-1, 0.7} }} + volume = 500, + hide_connection_info = true, + pipe_connections = {{ flow_direction ="input-output", position = {-1, 0.04}, direction = defines.direction.south }} }}, energy_source = {type = "void"}, energy_usage = "1W" @@ -420,13 +411,11 @@ local vent1 = { local vent2 = util.table.deepcopy(vent1) vent2.name = "nullius-turbine-vent-2" vent2.crafting_speed = 2.5 -vent2.fluid_boxes[1].base_area = 4 -vent2.fluid_boxes[1].height = 2 +vent2.fluid_boxes[1].volume = 500 local vent3 = util.table.deepcopy(vent1) vent3.name = "nullius-turbine-vent-3" vent3.crafting_speed = 6 -vent3.fluid_boxes[1].base_area = 5 -vent3.fluid_boxes[1].height = 4 +vent3.fluid_boxes[1].volume = 500 turbine_variants(1, furnace1cb, generator1ob, 1, 0.25, 0.4, 0.6) diff --git a/nullius/prototypes/entity/vehicle.lua b/nullius/prototypes/entity/vehicle.lua index c3ff608..15ab216 100644 --- a/nullius/prototypes/entity/vehicle.lua +++ b/nullius/prototypes/entity/vehicle.lua @@ -35,12 +35,13 @@ data:extend({ effectivity = 0.6, consumption = "15kW", - burner = { - fuel_category = "vehicle", + energy_source = { + type = "burner", + fuel_categories = {"vehicle"}, effectivity = 1, fuel_inventory_size = 1, burnt_inventory_size = 1, - smoke = data.raw["car"]["car"].smoke + smoke = data.raw["car"]["car"].energy_source.smoke }, light = data.raw["car"]["car"].light, render_layer = "object", @@ -48,9 +49,9 @@ data:extend({ sound_no_fuel = data.raw["car"]["car"].sound_no_fuel, stop_trigger_speed = 0.15, stop_trigger = data.raw["car"]["car"].stop_trigger, - sound_minimum_speed = 0.25, - sound_scaling_ratio = 0.8, - vehicle_impact_sound = data.raw["car"]["car"].vehicle_impact_sound, + -- sound_minimum_speed = 0.25, + -- sound_scaling_ratio = 0.8, + impact_category = data.raw["car"]["car"].impact_category, working_sound = data.raw["car"]["car"].working_sound, open_sound = data.raw["car"]["car"].open_sound, close_sound = data.raw["car"]["car"].close_sound, @@ -70,9 +71,9 @@ data:extend({ animation_speed = 8, max_advance = 0.2, tint = {0.65, 0.65, 0.5}, - stripes = data.raw["car"]["car"].animation.layers[1].hr_version.stripes + stripes = data.raw["car"]["car"].animation.layers[1].stripes }, - data.raw["car"]["car"].animation.layers[2].hr_version, + data.raw["car"]["car"].animation.layers[2], data.raw["car"]["car"].animation.layers[3] } } @@ -111,12 +112,13 @@ data:extend({ effectivity = 0.8, consumption = "50kW", - burner = { - fuel_category = "vehicle", + energy_source = { + type = "burner", + fuel_categories = {"vehicle"}, effectivity = 1, fuel_inventory_size = 1, burnt_inventory_size = 1, - smoke = data.raw["car"]["car"].smoke + smoke = data.raw["car"]["car"].energy_source.smoke }, light = data.raw["car"]["car"].light, render_layer = "object", @@ -124,9 +126,9 @@ data:extend({ sound_no_fuel = data.raw["car"]["car"].sound_no_fuel, stop_trigger_speed = 0.15, stop_trigger = data.raw["car"]["car"].stop_trigger, - sound_minimum_speed = 0.25, - sound_scaling_ratio = 0.8, - vehicle_impact_sound = data.raw["car"]["car"].vehicle_impact_sound, + -- sound_minimum_speed = 0.25, + -- sound_scaling_ratio = 0.8, + impact_category = data.raw["car"]["car"].impact_category, working_sound = data.raw["car"]["car"].working_sound, open_sound = data.raw["car"]["car"].open_sound, close_sound = data.raw["car"]["car"].close_sound, @@ -146,9 +148,9 @@ data:extend({ animation_speed = 8, max_advance = 0.2, tint = {0.5, 0.35, 0.35}, - stripes = data.raw["car"]["car"].animation.layers[1].hr_version.stripes + stripes = data.raw["car"]["car"].animation.layers[1].stripes }, - data.raw["car"]["car"].animation.layers[2].hr_version, + data.raw["car"]["car"].animation.layers[2], data.raw["car"]["car"].animation.layers[3] } } @@ -193,9 +195,9 @@ data:extend({ sound_no_fuel = data.raw["car"]["car"].sound_no_fuel, stop_trigger_speed = 0.15, stop_trigger = data.raw["car"]["car"].stop_trigger, - sound_minimum_speed = 0.25, - sound_scaling_ratio = 0.8, - vehicle_impact_sound = data.raw["car"]["car"].vehicle_impact_sound, + -- sound_minimum_speed = 0.25, + -- sound_scaling_ratio = 0.8, + impact_category = data.raw["car"]["car"].impact_category, working_sound = data.raw["car"]["car"].working_sound, open_sound = data.raw["car"]["car"].open_sound, close_sound = data.raw["car"]["car"].close_sound, @@ -215,9 +217,9 @@ data:extend({ animation_speed = 8, max_advance = 0.2, tint = {0.55, 0.55, 0.7}, - stripes = data.raw["car"]["car"].animation.layers[1].hr_version.stripes + stripes = data.raw["car"]["car"].animation.layers[1].stripes }, - data.raw["car"]["car"].animation.layers[2].hr_version, + data.raw["car"]["car"].animation.layers[2], data.raw["car"]["car"].animation.layers[3] } } @@ -236,7 +238,7 @@ data:extend({ collision_box = {{-0.9, -1.3}, {0.9, 1.3}}, selection_box = {{-0.9, -1.3}, {0.9, 1.3}}, damaged_trigger_effect = data.raw["car"]["tank"].damaged_trigger_effect, - drawing_box = {{-1.8, -1.8}, {1.8, 1.5}}, + immune_to_tree_impacts = true, immune_to_rock_impacts = true, resistances = { @@ -263,19 +265,20 @@ data:extend({ effectivity = 0.8, consumption = "500kW", - burner = { - fuel_category = "vehicle", + energy_source = { + type = "burner", + fuel_categories = {"vehicle"}, effectivity = 1, fuel_inventory_size = 2, burnt_inventory_size = 2, - smoke = data.raw["car"]["tank"].smoke + smoke = data.raw["car"]["tank"].energy_source.smoke }, light = data.raw["car"]["tank"].light, turret_animation = data.raw["car"]["tank"].turret_animation, sound_no_fuel = data.raw["car"]["tank"].sound_no_fuel, - sound_minimum_speed = 0.2, - sound_scaling_ratio = 0.8, - vehicle_impact_sound = data.raw["car"]["tank"].vehicle_impact_sound, + -- sound_minimum_speed = 0.2, + -- sound_scaling_ratio = 0.8, + impact_category = data.raw["car"]["tank"].impact_category, working_sound = data.raw["car"]["tank"].working_sound, stop_trigger_speed = 0.1, stop_trigger = data.raw["car"]["tank"].stop_trigger, @@ -300,7 +303,7 @@ data:extend({ collision_box = {{-0.9, -1.3}, {0.9, 1.3}}, selection_box = {{-0.9, -1.3}, {0.9, 1.3}}, damaged_trigger_effect = data.raw["car"]["tank"].damaged_trigger_effect, - drawing_box = {{-1.8, -1.8}, {1.8, 1.5}}, + immune_to_tree_impacts = true, immune_to_rock_impacts = true, resistances = { @@ -327,19 +330,20 @@ data:extend({ effectivity = 1, consumption = "1MW", - burner = { + energy_source = { + type = "burner", fuel_categories = {"nullius-nuclear", "vehicle"}, effectivity = 1, fuel_inventory_size = 1, burnt_inventory_size = 1, - smoke = data.raw["car"]["tank"].smoke + smoke = data.raw["car"]["tank"].energy_source.smoke }, light = data.raw["car"]["tank"].light, turret_animation = data.raw["car"]["tank"].turret_animation, sound_no_fuel = data.raw["car"]["tank"].sound_no_fuel, - sound_minimum_speed = 0.2, - sound_scaling_ratio = 0.8, - vehicle_impact_sound = data.raw["car"]["tank"].vehicle_impact_sound, + -- sound_minimum_speed = 0.2, + -- sound_scaling_ratio = 0.8, + impact_category = data.raw["car"]["tank"].impact_category, working_sound = data.raw["car"]["tank"].working_sound, stop_trigger_speed = 0.1, stop_trigger = data.raw["car"]["tank"].stop_trigger, @@ -362,9 +366,9 @@ data:extend({ max_advance = 1, scale = 0.5, tint = {0.45, 0.5, 0.55}, - stripes = data.raw["car"]["tank"].animation.layers[1].hr_version.stripes + stripes = data.raw["car"]["tank"].animation.layers[1].stripes }, - data.raw["car"]["tank"].animation.layers[2].hr_version, + data.raw["car"]["tank"].animation.layers[2], data.raw["car"]["tank"].animation.layers[3] } } @@ -373,20 +377,20 @@ data:extend({ { type = "spider-vehicle", name = "nullius-mecha", - localised_name = {"", {"entity-name.nullius-mecha"}, " ", 1}, + localised_name = {"", {"entity-name.nullius-mecha"}, " ", tostring(1)}, icons = data.raw["item-with-entity-data"]["nullius-mecha"].icons, minable = {mining_time = 1.5, result = "nullius-mecha"}, collision_box = {{-1 * 1, -1 * 1}, {1 * 1, 1 * 1}}, sticker_box = {{-1.5 * 1, -1.5 * 1}, {1.5 * 1, 1.5 * 1}}, selection_box = {{-1 * 1, -1 * 1}, {1 * 1, 1 * 1}}, - drawing_box = {{-3 * 1, -4 * 1}, {3 * 1, 2 * 1}}, - sound_minimum_speed = 0.1, - sound_scaling_ratio = 0.6, + + -- sound_minimum_speed = 0.1, + -- sound_scaling_ratio = 0.6, weight = 5000, braking_force = 1, friction_force = 1, flags = {"placeable-neutral", "player-creation", "placeable-off-grid"}, - collision_mask = {}, + collision_mask = { layers = {}}, max_health = 2000, resistances = { { type = "impact", decrease = 100, percent = 90 }, @@ -426,20 +430,20 @@ data:extend({ { type = "spider-vehicle", name = "nullius-mecha-2", - localised_name = {"", {"entity-name.nullius-mecha"}, " ", 2}, + localised_name = {"", {"entity-name.nullius-mecha"}, " ", tostring(2)}, icons = data.raw["item-with-entity-data"]["nullius-mecha-2"].icons, minable = {mining_time = 2, result = "nullius-mecha-2"}, collision_box = {{-1 * 1, -1 * 1}, {1 * 1, 1 * 1}}, sticker_box = {{-1.5 * 1, -1.5 * 1}, {1.5 * 1, 1.5 * 1}}, selection_box = {{-1 * 1, -1 * 1}, {1 * 1, 1 * 1}}, - drawing_box = {{-3 * 1, -4 * 1}, {3 * 1, 2 * 1}}, - sound_minimum_speed = 0.1, - sound_scaling_ratio = 0.6, + + --sound_minimum_speed = 0.1, + --sound_scaling_ratio = 0.6, weight = 5000, braking_force = 1, friction_force = 1, flags = {"placeable-neutral", "player-creation", "placeable-off-grid"}, - collision_mask = {}, + collision_mask = { layers = {}}, max_health = 3000, resistances = { { type = "impact", decrease = 200, percent = 90 }, @@ -481,18 +485,18 @@ data:extend({ name = "nullius-silo", icon = "__base__/graphics/icons/rocket-silo.png", icon_size = 64, - icon_mipmaps = 4, flags = {"placeable-player", "player-creation"}, crafting_categories = {"rocketry"}, rocket_parts_required = 1, crafting_speed = 1, - rocket_result_inventory_size = 12, - module_specification = { - module_slots = 4, - module_info_icon_shift = {0, 3.3} - }, + module_slots = 4, fixed_recipe = "nullius-rocket", show_recipe_icon = false, + icon_draw_specification = {shift = {0, 2}}, + icons_positioning = + { + {inventory_index = defines.inventory.crafter_modules, shift = {0, 3.3}} + }, allowed_effects = {"consumption", "speed", "productivity", "pollution"}, minable = {mining_time = 8, result = "nullius-silo"}, max_health = 5000, @@ -508,20 +512,24 @@ data:extend({ { type = "physical", decrease = 20, percent = 50 } }, damaged_trigger_effect = data.raw["rocket-silo"]["rocket-silo"].damaged_trigger_effect, - vehicle_impact_sound = data.raw["rocket-silo"]["rocket-silo"].vehicle_impact_sound, + impact_category = data.raw["rocket-silo"]["rocket-silo"].impact_category, energy_source = { type = "electric", usage_priority = "primary-input", drain = "200kW" }, energy_usage = "800kW", - idle_energy_usage = "200KW", - lamp_energy_usage = "200KW", - active_energy_usage = "2600KW", + --idle_energy_usage = "200kW", + lamp_energy_usage = "200kW", + active_energy_usage = "2600kW", rocket_entity = "rocket-silo-rocket", times_to_blink = 3, light_blinking_speed = 1 / (3 * 60), door_opening_speed = 1 / (4.25 * 60), + can_launch_without_landing_pads = true, + to_be_inserted_to_rocket_inventory_size = 1, + circuit_connector = circuit_connector_definitions["rocket-silo"], + circuit_wire_max_distance = default_circuit_wire_max_distance, base_engine_light = data.raw["rocket-silo"]["rocket-silo"].base_engine_light, shadow_sprite = data.raw["rocket-silo"]["rocket-silo"].shadow_sprite, @@ -551,6 +559,9 @@ data:extend({ open_sound = data.raw["rocket-silo"]["rocket-silo"].open_sound, close_sound = data.raw["rocket-silo"]["rocket-silo"].close_sound, working_sound = data.raw["rocket-silo"]["rocket-silo"].working_sound, - flying_sound = data.raw["rocket-silo"]["rocket-silo"].flying_sound + flying_sound = data.raw["rocket-silo"]["rocket-silo"].flying_sound, + + rocket_quick_relaunch_start_offset = data.raw["rocket-silo"]["rocket-silo"].rocket_quick_relaunch_start_offset, + cargo_station_parameters = data.raw["rocket-silo"]["rocket-silo"].cargo_station_parameters } }) diff --git a/nullius/prototypes/entity/vent.lua b/nullius/prototypes/entity/vent.lua index b6df86a..cf3272a 100644 --- a/nullius/prototypes/entity/vent.lua +++ b/nullius/prototypes/entity/vent.lua @@ -4,9 +4,10 @@ data:extend({ { type = "furnace", name = "nullius-chimney-1", - icons = data.raw.item["nullius-chimney-1"].icons, + icons = data.raw.item["nullius-chimney-1"].icons, flags = {"placeable-neutral", "placeable-player", "player-creation"}, minable = {mining_time = 0.6, result = "nullius-chimney-1"}, + collision_mask = collision_mask_util.get_default_mask("rocket-silo"), max_health = 100, fast_replaceable_group = "nullius-chimney", next_upgrade = "nullius-chimney-2", @@ -17,6 +18,7 @@ data:extend({ result_inventory_size = 1, crafting_speed = 1, source_inventory_size = 0, + forced_symmetry = "horizontal", resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } @@ -25,145 +27,260 @@ data:extend({ { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = 0.2, - pipe_connections = {{ type="input-output", position = {0.5, 1.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input-output", position = {0.5, 0.5}, direction = defines.direction.south }} } }, energy_source = {type = "void"}, energy_usage = "1kW", - - animation = { - north = { - layers = { - { - filename = "__angelspetrochem__/graphics/entity/flare-stack/hr-flare-stack.png", - priority = "extra-high", - frame_count = 1, - width = 142, - height = 429, - shift = {0.06, -1.62}, - scale = 0.5 * 0.85 - }, - { - draw_as_shadow = true, - filename = "__angelspetrochem__/graphics/entity/flare-stack/hr-flare-stack-shadow.png", - priority = "extra-high", - width = 382, - height = 135, - frame_count = 1, - shift = {1.68, 0.37}, - scale = 0.5 * 0.85 + + graphics_set = { + animation = { + north = { + layers = { + { + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack.png", + priority = "extra-high", + frame_count = 1, + width = 142, + height = 429, + shift = {0.06, -1.62}, + scale = 0.5 * 0.85 + }, + { + draw_as_shadow = true, + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack-shadow.png", + priority = "extra-high", + width = 382, + height = 135, + frame_count = 1, + shift = {1.68, 0.37}, + scale = 0.5 * 0.85 + } } - } - }, - east = { - layers = { - { - filename = "__angelspetrochem__/graphics/entity/flare-stack/hr-flare-stack.png", - priority = "extra-high", - width = 142, - height = 429, - x = 142, - frame_count = 1, - shift = {-0.1, -1.67}, - scale = 0.5 * 0.85 - }, - { - draw_as_shadow = true, - filename = "__angelspetrochem__/graphics/entity/flare-stack/hr-flare-stack-shadow.png", - priority = "extra-high", - width = 382, - height = 135, - x = 382, - frame_count = 1, - shift = {1.52, 0.32}, - scale = 0.5 * 0.85 + }, + east = { + layers = { + { + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack.png", + priority = "extra-high", + width = 142, + height = 429, + x = 142, + frame_count = 1, + shift = {-0.1, -1.67}, + scale = 0.5 * 0.85 + }, + { + draw_as_shadow = true, + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack-shadow.png", + priority = "extra-high", + width = 382, + height = 135, + x = 382, + frame_count = 1, + shift = {1.52, 0.32}, + scale = 0.5 * 0.85 + } } - } - }, - south = { - layers = { - { - filename = "__angelspetrochem__/graphics/entity/flare-stack/hr-flare-stack.png", - priority = "extra-high", - width = 142, - height = 429, - x = 284, - frame_count = 1, - shift = {-0.06, -1.83}, - scale = 0.5 * 0.85 - }, - { - draw_as_shadow = true, - filename = "__angelspetrochem__/graphics/entity/flare-stack/hr-flare-stack-shadow.png", - priority = "extra-high", - width = 382, - height = 135, - x = 764, - frame_count = 1, - shift = {1.56, 0.16}, - scale = 0.5 * 0.85 + }, + south = { + layers = { + { + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack.png", + priority = "extra-high", + width = 142, + height = 429, + x = 284, + frame_count = 1, + shift = {-0.06, -1.83}, + scale = 0.5 * 0.85 + }, + { + draw_as_shadow = true, + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack-shadow.png", + priority = "extra-high", + width = 382, + height = 135, + x = 764, + frame_count = 1, + shift = {1.56, 0.16}, + scale = 0.5 * 0.85 + } + } + }, + west = { + layers = { + { + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack.png", + priority = "extra-high", + width = 142, + height = 429, + x = 426, + frame_count = 1, + shift = {0.1, -1.78}, + scale = 0.5 * 0.85 + }, + { + draw_as_shadow = true, + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack-shadow.png", + priority = "extra-high", + width = 382, + height = 135, + x = 1146, + frame_count = 1, + shift = {1.72, 0.21}, + scale = 0.5 * 0.85 + } } } }, - west = { - layers = { - { - filename = "__angelspetrochem__/graphics/entity/flare-stack/hr-flare-stack.png", - priority = "extra-high", - width = 142, - height = 429, - x = 426, - frame_count = 1, - shift = {0.1, -1.78}, - scale = 0.5 * 0.85 + + working_visualisations = { + { + apply_recipe_tint = "primary", + constant_speed = true, + render_layer = "wires-above", + north_position = {-0.09, -5.45}, + east_position = {-0.29, -5.59}, + south_position = {-0.1, -5.8}, + west_position = {0.09, -5.61}, + animation = { + filename = BASEENTITY .. "chemical-plant/chemical-plant-smoke-outer.png", + frame_count = 47, + line_length = 16, + width = 90, + height = 188, + scale = 0.6, + animation_speed = 0.25 }, - { - draw_as_shadow = true, - filename = "__angelspetrochem__/graphics/entity/flare-stack/hr-flare-stack-shadow.png", - priority = "extra-high", - width = 382, - height = 135, - x = 1146, - frame_count = 1, - shift = {1.72, 0.21}, - scale = 0.5 * 0.85 - } } } }, - - working_visualisations = { - { - apply_recipe_tint = "primary", - constant_speed = true, - render_layer = "wires", - north_position = {-0.09, -5.45}, - east_position = {-0.29, -5.59}, - south_position = {-0.1, -5.8}, - west_position = {0.09, -5.61}, - animation = { - filename = BASEENTITY .. "chemical-plant/chemical-plant-smoke-outer.png", - frame_count = 47, - line_length = 16, - width = 46, - height = 94, - scale = 1.2, - animation_speed = 0.25, - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant-smoke-outer.png", - frame_count = 47, - line_length = 16, - width = 90, - height = 188, - scale = 0.6, - animation_speed = 0.25 + graphics_set_flipped = { + animation = { + north = { + layers = { + { + filename = "__nullius__/graphics/entity/chimney/flare-stack-flipped.png", + priority = "extra-high", + frame_count = 1, + width = 142, + height = 429, + shift = {0.06, -1.62}, + scale = 0.5 * 0.85 + }, + { + draw_as_shadow = true, + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack-shadow.png", + priority = "extra-high", + width = 382, + height = 135, + frame_count = 1, + shift = {1.68, 0.37}, + scale = 0.5 * 0.85 + } } }, + east = { + layers = { + { + filename = "__nullius__/graphics/entity/chimney/flare-stack-flipped.png", + priority = "extra-high", + width = 142, + height = 429, + x = 142, + frame_count = 1, + shift = {-0.1, -1.67}, + scale = 0.5 * 0.85 + }, + { + draw_as_shadow = true, + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack-shadow.png", + priority = "extra-high", + width = 382, + height = 135, + x = 382, + frame_count = 1, + shift = {1.52, 0.32}, + scale = 0.5 * 0.85 + } + } + }, + south = { + layers = { + { + filename = "__nullius__/graphics/entity/chimney/flare-stack-flipped.png", + priority = "extra-high", + width = 142, + height = 429, + x = 284, + frame_count = 1, + shift = {-0.06, -1.83}, + scale = 0.5 * 0.85 + }, + { + draw_as_shadow = true, + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack-shadow.png", + priority = "extra-high", + width = 382, + height = 135, + x = 764, + frame_count = 1, + shift = {1.56, 0.16}, + scale = 0.5 * 0.85 + } + } + }, + west = { + layers = { + { + filename = "__nullius__/graphics/entity/chimney/flare-stack-flipped.png", + priority = "extra-high", + width = 142, + height = 429, + x = 426, + frame_count = 1, + shift = {0.1, -1.78}, + scale = 0.5 * 0.85 + }, + { + draw_as_shadow = true, + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack-shadow.png", + priority = "extra-high", + width = 382, + height = 135, + x = 1146, + frame_count = 1, + shift = {1.72, 0.21}, + scale = 0.5 * 0.85 + } + } + } + }, + + working_visualisations = { + { + apply_recipe_tint = "primary", + constant_speed = true, + render_layer = "wires", + north_position = {-0.09, -5.45}, + east_position = {-0.29, -5.59}, + south_position = {-0.1, -5.8}, + west_position = {0.09, -5.61}, + animation = { + filename = BASEENTITY .. "chemical-plant/chemical-plant-smoke-outer.png", + frame_count = 47, + line_length = 16, + width = 90, + height = 188, + scale = 0.6, + animation_speed = 0.25 + }, + } } }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "metal", repair_sound = { filename = "__base__/sound/manual-repair-simple.ogg" }, open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, @@ -171,9 +288,10 @@ data:extend({ { type = "furnace", name = "nullius-chimney-2", - icons = data.raw.item["nullius-chimney-2"].icons, + icons = data.raw.item["nullius-chimney-2"].icons, flags = {"placeable-neutral", "placeable-player", "player-creation"}, minable = {mining_time = 0.9, result = "nullius-chimney-2"}, + collision_mask = collision_mask_util.get_default_mask("rocket-silo"), max_health = 200, fast_replaceable_group = "nullius-chimney", corpse = "small-remnants", @@ -183,6 +301,7 @@ data:extend({ result_inventory_size = 1, crafting_speed = 5, source_inventory_size = 0, + forced_symmetry = "horizontal", resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", percent = 75 } @@ -191,85 +310,379 @@ data:extend({ { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -1, - height = 6, - pipe_connections = {{ type="input-output", position = {0.5, 1.5} }} + volume = 500, + pipe_connections = {{ flow_direction ="input-output", position = {0.5, 0.5}, direction = defines.direction.south }} }, }, energy_source = {type = "void"}, energy_usage = "1kW", - animation = data.raw["furnace"]["angels-flare-stack"].animation, - working_visualisations = { - { - apply_recipe_tint = "primary", - constant_speed = true, - render_layer = "wires", - north_position = {-0.22, -6.82}, - east_position = {-0.22, -6.95}, - south_position = {-0.03, -6.95}, - west_position = {-0.03, -6.82}, - animation = { - filename = BASEENTITY .. "chemical-plant/chemical-plant-smoke-outer.png", - frame_count = 47, - line_length = 16, - width = 46, - height = 94, - scale = 1.6, - hr_version = { - filename = BASEENTITY .. "chemical-plant/hr-chemical-plant-smoke-outer.png", - frame_count = 47, - line_length = 16, - width = 90, - height = 188, - scale = 0.8 + graphics_set = { + animation = { + north = { + layers = { + { + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack.png", + priority = "extra-high", + frame_count = 1, + width = 142, + height = 429, + shift = util.by_pixel(0, -65), + scale = 0.5, + }, + { + draw_as_shadow = true, + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack-shadow.png", + priority = "extra-high", + width = 382, + height = 135, + frame_count = 1, + shift = util.by_pixel(61, 10), + scale = 0.5, + }, + }, + }, + east = { + layers = { + { + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack.png", + priority = "extra-high", + width = 142, + height = 429, + x = 142, + frame_count = 1, + shift = util.by_pixel(0, -65), + scale = 0.5, + }, + { + draw_as_shadow = true, + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack-shadow.png", + priority = "extra-high", + width = 382, + height = 135, + x = 382, + frame_count = 1, + shift = util.by_pixel(61, 10), + scale = 0.5, + }, + }, + }, + south = { + layers = { + { + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack.png", + priority = "extra-high", + width = 142, + height = 429, + x = 284, + frame_count = 1, + shift = util.by_pixel(0, -65), + scale = 0.5, + }, + { + draw_as_shadow = true, + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack-shadow.png", + priority = "extra-high", + width = 382, + height = 135, + x = 764, + frame_count = 1, + shift = util.by_pixel(61, 10), + scale = 0.5, + }, + }, + }, + west = { + layers = { + { + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack.png", + priority = "extra-high", + width = 142, + height = 429, + x = 426, + frame_count = 1, + shift = util.by_pixel(0, -65), + scale = 0.5, + }, + { + draw_as_shadow = true, + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack-shadow.png", + priority = "extra-high", + width = 382, + height = 135, + x = 1146, + frame_count = 1, + shift = util.by_pixel(61, 10), + scale = 0.5, + }, + }, + }, + }, + working_visualisations = { + { + apply_recipe_tint = "primary", + constant_speed = true, + render_layer = "wires-above", + north_position = {-0.22, -6.82}, + east_position = {-0.22, -6.95}, + south_position = {-0.03, -6.95}, + west_position = {-0.03, -6.82}, + animation = { + filename = BASEENTITY .. "chemical-plant/chemical-plant-smoke-outer.png", + frame_count = 47, + line_length = 16, + width = 90, + height = 188, + scale = 0.8 + } + }, + { + render_layer = "elevated-higher-object", + always_draw = true, + north_animation = { + layers = { + { + filename = "__nullius__/graphics/entity/chimney/flare-stack-chimney.png", + priority = "extra-high", + frame_count = 1, + width = 142, + height = 429, + shift = util.by_pixel(0, -65), + scale = 0.5, + } + }, + }, + east_animation = { + layers = { + { + filename = "__nullius__/graphics/entity/chimney/flare-stack-chimney.png", + priority = "extra-high", + width = 142, + height = 429, + x = 142, + frame_count = 1, + shift = util.by_pixel(0, -65), + scale = 0.5, + } + }, + }, + south_animation = { + layers = { + { + filename = "__nullius__/graphics/entity/chimney/flare-stack-chimney.png", + priority = "extra-high", + width = 142, + height = 429, + x = 284, + frame_count = 1, + shift = util.by_pixel(0, -65), + scale = 0.5, + } + }, + }, + west_animation = { + layers = { + { + filename = "__nullius__/graphics/entity/chimney/flare-stack-chimney.png", + priority = "extra-high", + width = 142, + height = 429, + x = 426, + frame_count = 1, + shift = util.by_pixel(0, -65), + scale = 0.5, + } + }, } } } }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + graphics_set_flipped = { + animation = { + north = { + layers = { + { + filename = "__nullius__/graphics/entity/chimney/flare-stack-flipped.png", + priority = "extra-high", + frame_count = 1, + width = 142, + height = 429, + shift = util.by_pixel(0, -65), + scale = 0.5, + }, + { + draw_as_shadow = true, + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack-shadow.png", + priority = "extra-high", + width = 382, + height = 135, + frame_count = 1, + shift = util.by_pixel(61, 10), + scale = 0.5, + }, + }, + }, + east = { + layers = { + { + filename = "__nullius__/graphics/entity/chimney/flare-stack-flipped.png", + priority = "extra-high", + width = 142, + height = 429, + x = 142, + frame_count = 1, + shift = util.by_pixel(0, -65), + scale = 0.5, + }, + { + draw_as_shadow = true, + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack-shadow.png", + priority = "extra-high", + width = 382, + height = 135, + x = 382, + frame_count = 1, + shift = util.by_pixel(61, 10), + scale = 0.5, + }, + }, + }, + south = { + layers = { + { + filename = "__nullius__/graphics/entity/chimney/flare-stack-flipped.png", + priority = "extra-high", + width = 142, + height = 429, + x = 284, + frame_count = 1, + shift = util.by_pixel(0, -65), + scale = 0.5, + }, + { + draw_as_shadow = true, + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack-shadow.png", + priority = "extra-high", + width = 382, + height = 135, + x = 764, + frame_count = 1, + shift = util.by_pixel(61, 10), + scale = 0.5, + }, + }, + }, + west = { + layers = { + { + filename = "__nullius__/graphics/entity/chimney/flare-stack-flipped.png", + priority = "extra-high", + width = 142, + height = 429, + x = 426, + frame_count = 1, + shift = util.by_pixel(0, -65), + scale = 0.5, + }, + { + draw_as_shadow = true, + filename = "__angelspetrochemgraphics__/graphics/entity/flare-stack/flare-stack-shadow.png", + priority = "extra-high", + width = 382, + height = 135, + x = 1146, + frame_count = 1, + shift = util.by_pixel(61, 10), + scale = 0.5, + }, + }, + }, + }, + working_visualisations = { + { + apply_recipe_tint = "primary", + constant_speed = true, + render_layer = "wires-above", + north_position = {-0.22, -6.82}, + east_position = {-0.22, -6.95}, + south_position = {-0.03, -6.95}, + west_position = {-0.03, -6.82}, + animation = { + filename = BASEENTITY .. "chemical-plant/chemical-plant-smoke-outer.png", + frame_count = 47, + line_length = 16, + width = 90, + height = 188, + scale = 0.8 + } + }, + { + render_layer = "elevated-higher-object", + always_draw = true, + north_animation = { + layers = { + { + filename = "__nullius__/graphics/entity/chimney/flare-stack-flipped-chimney.png", + priority = "extra-high", + frame_count = 1, + width = 142, + height = 429, + shift = util.by_pixel(0, -65), + scale = 0.5, + }, + } + }, + east_animation = { + layers = { + { + filename = "__nullius__/graphics/entity/chimney/flare-stack-flipped-chimney.png", + priority = "extra-high", + width = 142, + height = 429, + x = 142, + frame_count = 1, + shift = util.by_pixel(0, -65), + scale = 0.5, + } + } + }, + south_animation = { + layers = { + { + filename = "__nullius__/graphics/entity/chimney/flare-stack-flipped-chimney.png", + priority = "extra-high", + width = 142, + height = 429, + x = 284, + frame_count = 1, + shift = util.by_pixel(0, -65), + scale = 0.5, + } + } + }, + west_animation = { + layers = { + { + filename = "__nullius__/graphics/entity/chimney/flare-stack-flipped-chimney.png", + priority = "extra-high", + width = 142, + height = 429, + x = 426, + frame_count = 1, + shift = util.by_pixel(0, -65), + scale = 0.5, + } + } + } + } + } + }, + impact_category = "metal", repair_sound = { filename = "__base__/sound/manual-repair-simple.ogg" }, open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, } }) -local nmc1 = util.table.deepcopy(data.raw.furnace["nullius-chimney-1"]) -nmc1.name = "nullius-mirror-chimney-1" -nmc1.icons[3] = { icon = "__nullius__/graphics/icons/flip1.png", icon_size = 64 } -nmc1.placeable_by = {item = "nullius-chimney-1", count = 1} -nmc1.next_upgrade = "nullius-mirror-chimney-2" -nmc1.localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-chimney-1"}} -nmc1.fluid_boxes[1].pipe_connections[1].position = {-0.5, 1.5} -nmc1.animation.north = util.table.deepcopy(nmc1.animation.south) -nmc1.animation.north.layers[1].shift = {-0.06, -1.57} -nmc1.animation.north.layers[2].shift = {1.56, 0.42} -nmc1.animation.east = util.table.deepcopy(nmc1.animation.south) -nmc1.animation.east.layers[1].shift = {-0.2, -1.88} -nmc1.animation.east.layers[2].shift = {1.42, 0.11} -nmc1.animation.west = util.table.deepcopy(nmc1.animation.south) -nmc1.animation.west.layers[1].shift = {0.2, -1.63} -nmc1.animation.west.layers[2].shift = {1.82, 0.36} -nmc1.animation.south.layers[1].shift = {0.09, -1.98} -nmc1.animation.south.layers[2].shift = {1.71, 0.01} -nmc1.working_visualisations[1].north_position = {-0.1, -5.54} -nmc1.working_visualisations[1].east_position = {-0.24, -5.85} -nmc1.working_visualisations[1].south_position = {0.05, -5.95} -nmc1.working_visualisations[1].west_position = {0.16, -5.6} - -local nmc2 = util.table.deepcopy(data.raw.furnace["nullius-chimney-2"]) -nmc2.name = "nullius-mirror-chimney-2" -nmc2.icons[2] = nmc1.icons[3] -nmc2.placeable_by = {item = "nullius-chimney-2", count = 1} -nmc2.localised_name = {"entity-name.nullius-mirrored", - {"entity-name.nullius-chimney-2"}} -nmc2.fluid_boxes[1].pipe_connections[1].position = {-0.5, 1.5} -nmc2.animation = nmc2.animation.south -nmc2.working_visualisations[1].north_position = nmc2.working_visualisations[1].south_position -nmc2.working_visualisations[1].east_position = nmc2.working_visualisations[1].south_position -nmc2.working_visualisations[1].west_position = nmc2.working_visualisations[1].south_position - local nc3 = util.table.deepcopy(data.raw.furnace["nullius-chimney-2"]) nc3.name = "nullius-chimney-3" nc3.icons = data.raw.item["nullius-chimney-3"].icons @@ -282,35 +695,38 @@ nc3.crafting_speed = 20 nc3.fluid_boxes = {{ production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -5, - height = 15, - pipe_connections = {{ type="input-output", position = {0, 2} }} + volume = 500, + pipe_connections = {{ flow_direction ="input-output", position = {0, 1}, direction = defines.direction.south }} }} nc3.energy_source = { type = "electric", usage_priority = "secondary-input", - emissions = 0.1, + emissions_per_minute = {pollution = 0.1}, drain = "5kW" } nc3.energy_usage = "295kW" -nc3.module_specification = { module_slots = 1 } +nc3.module_slots = 1 nc3.allowed_effects = {"speed", "consumption", "pollution"} -nc3.animation = scale_image(nc3.animation.south, 1.5) -nc3.working_visualisations[1] = scale_image(nc3.working_visualisations[1], 1.5) -nc3.working_visualisations[1].north_position = nc3.working_visualisations[1].south_position -nc3.working_visualisations[1].east_position = nc3.working_visualisations[1].south_position -nc3.working_visualisations[1].west_position = nc3.working_visualisations[1].south_position +nc3.graphics_set.animation = scale_image(nc3.graphics_set.animation.south, 1.5) +nc3.graphics_set.working_visualisations[1] = scale_image(nc3.graphics_set.working_visualisations[1], 1.5) +nc3.graphics_set.working_visualisations[1].north_position = nc3.graphics_set.working_visualisations[1].south_position +nc3.graphics_set.working_visualisations[1].east_position = nc3.graphics_set.working_visualisations[1].south_position +nc3.graphics_set.working_visualisations[1].west_position = nc3.graphics_set.working_visualisations[1].south_position +nc3.graphics_set.working_visualisations[2] = { + animation = scale_image(nc3.graphics_set.working_visualisations[2].south_animation, 1.5), + render_layer = "elevated-higher-object", + always_draw = true +} +nc3.graphics_set_flipped = nil +--nc3.forced_symmetry = nil data:extend({ - nmc1, - nmc2, nc3, { type = "furnace", name = "nullius-outfall-1", - icons = data.raw.item["nullius-outfall-1"].icons, - collision_mask = {"object-layer", "ground-tile"}, + icons = data.raw.item["nullius-outfall-1"].icons, + collision_mask = {layers = {object = true, ground_tile = true}}, flags = {"placeable-neutral", "placeable-player", "player-creation"}, minable = {mining_time = 0.5, result = "nullius-outfall-1"}, max_health = 200, @@ -331,56 +747,64 @@ data:extend({ { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = 0.2, - pipe_connections = {{ type="input-output", position = {0, 1} }} + volume = 500, + pipe_connections = {{ flow_direction ="input-output", position = {0, 0}, direction = defines.direction.south }} }, }, energy_source = {type = "void"}, energy_usage = "1kW", - animation = { - north = { - filename = "__angelsrefining__/graphics/entity/seafloor-pump/seafloor-pump.png", - priority = "high", - shift = {-0.02, -0.8}, - width = 160, - height = 160, - frame_count = 1, - scale = 0.85 - }, - east = { - filename = "__angelsrefining__/graphics/entity/seafloor-pump/seafloor-pump.png", - priority = "high", - shift = {0.8, -0.05}, - x = 160, - width = 160, - height = 160, - frame_count = 1, - scale = 0.85 - }, - south = { - filename = "__angelsrefining__/graphics/entity/seafloor-pump/seafloor-pump.png", - priority = "high", - shift = {0, 0.85}, - x = 320, - width = 160, - height = 160, - frame_count = 1, - scale = 0.85 - }, - west = { - filename = "__angelsrefining__/graphics/entity/seafloor-pump/seafloor-pump.png", - priority = "high", - shift = {-0.75, 0}, - x = 480, - width = 160, - height = 160, - frame_count = 1, - scale = 0.85 + graphics_set = { + animation = { + north = { + filename = "__angelsrefininggraphics__/graphics/entity/seafloor-pump/seafloor-pump.png", + priority = "high", + shift = {-0.02, -0.8}, + width = 160, + height = 160, + frame_count = 1, + scale = 0.85 + }, + east = { + filename = "__angelsrefininggraphics__/graphics/entity/seafloor-pump/seafloor-pump.png", + priority = "high", + shift = {0.8, -0.05}, + x = 160, + width = 160, + height = 160, + frame_count = 1, + scale = 0.85 + }, + south = { + filename = "__angelsrefininggraphics__/graphics/entity/seafloor-pump/seafloor-pump.png", + priority = "high", + shift = {0, 0.85}, + x = 320, + width = 160, + height = 160, + frame_count = 1, + scale = 0.85 + }, + west = { + filename = "__angelsrefininggraphics__/graphics/entity/seafloor-pump/seafloor-pump.png", + priority = "high", + shift = {-0.75, 0}, + x = 480, + width = 160, + height = 160, + frame_count = 1, + scale = 0.85 + } } }, - placeable_position_visualization = data.raw["offshore-pump"]["seafloor-pump"].placeable_position_visualization, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + placeable_position_visualization = { + filename = "__core__/graphics/cursor-boxes-32x32.png", + priority = "extra-high-no-scale", + width = 64, + height = 64, + scale = 0.5, + x = 3 * 64, + }, + impact_category = "metal", repair_sound = { filename = "__base__/sound/manual-repair-simple.ogg" }, open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, @@ -388,13 +812,13 @@ data:extend({ { type = "furnace", name = "nullius-outfall-2", - icons = data.raw.item["nullius-outfall-2"].icons, - collision_mask = {"object-layer", "ground-tile"}, + icons = data.raw.item["nullius-outfall-2"].icons, + collision_mask = {layers = {object = true, ground_tile = true}}, flags = {"placeable-neutral", "placeable-player", "player-creation"}, minable = {mining_time = 0.8, result = "nullius-outfall-2"}, max_health = 300, fast_replaceable_group = "nullius-outfall", - next_upgrade = "nullius-outfall-3", + next_upgrade = "nullius-outfall-3", corpse = "small-remnants", collision_box = {{-1.4, -2.45}, {1.4, 0.3}}, selection_box = {{-1.6, -2.49}, {1.6, 0.49}}, @@ -410,53 +834,60 @@ data:extend({ { production_type = "input", pipe_covers = pipecoverspictures(), - base_area = 5, - base_level = -1, - height = 6, - pipe_connections = {{ type="input-output", position = {0, 1} }} + volume = 500, + pipe_connections = {{ flow_direction ="input-output", position = {0, 0}, direction = defines.direction.south }} }, }, energy_source = {type = "void"}, energy_usage = "1kW", - animation = { - north = { - filename = "__angelsrefining__/graphics/entity/seafloor-pump/seafloor-pump.png", - priority = "high", - shift = {0, -1}, - width = 160, - height = 160, - frame_count = 1 - }, - east = { - filename = "__angelsrefining__/graphics/entity/seafloor-pump/seafloor-pump.png", - priority = "high", - shift = {1, 0}, - x = 160, - width = 160, - height = 160, - frame_count = 1 - }, - south = { - filename = "__angelsrefining__/graphics/entity/seafloor-pump/seafloor-pump.png", - priority = "high", - shift = {0, 1}, - x = 320, - width = 160, - height = 160, - frame_count = 1 - }, - west = { - filename = "__angelsrefining__/graphics/entity/seafloor-pump/seafloor-pump.png", - priority = "high", - shift = {-1, 0}, - x = 480, - width = 160, - height = 160, - frame_count = 1 + graphics_set = { + animation = { + north = { + filename = "__angelsrefininggraphics__/graphics/entity/seafloor-pump/seafloor-pump.png", + priority = "high", + shift = {0, -1}, + width = 160, + height = 160, + frame_count = 1 + }, + east = { + filename = "__angelsrefininggraphics__/graphics/entity/seafloor-pump/seafloor-pump.png", + priority = "high", + shift = {1, 0}, + x = 160, + width = 160, + height = 160, + frame_count = 1 + }, + south = { + filename = "__angelsrefininggraphics__/graphics/entity/seafloor-pump/seafloor-pump.png", + priority = "high", + shift = {0, 1}, + x = 320, + width = 160, + height = 160, + frame_count = 1 + }, + west = { + filename = "__angelsrefininggraphics__/graphics/entity/seafloor-pump/seafloor-pump.png", + priority = "high", + shift = {-1, 0}, + x = 480, + width = 160, + height = 160, + frame_count = 1 + } } }, - placeable_position_visualization = data.raw["offshore-pump"]["seafloor-pump"].placeable_position_visualization, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + placeable_position_visualization = { + filename = "__core__/graphics/cursor-boxes-32x32.png", + priority = "extra-high-no-scale", + width = 64, + height = 64, + scale = 0.5, + x = 3 * 64, + }, + impact_category = "metal", repair_sound = { filename = "__base__/sound/manual-repair-simple.ogg" }, open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, @@ -473,20 +904,17 @@ no3.crafting_speed = 10 no3.energy_source = { type = "electric", usage_priority = "secondary-input", - emissions = 0.1, + emissions_per_minute = {pollution = 0.1}, drain = "5kW" } no3.energy_usage = "195kW" -no3.module_specification = { - module_slots = 1, - module_info_icon_shift = {0, 0} -} +no3.module_slots = 1 no3.allowed_effects = {"speed", "consumption", "pollution"} no3.next_upgrade = nil -no3.animation.north.filename = "__angelsrefining__/graphics/entity/sea-pump/sea-pump.png" -no3.animation.east.filename = no3.animation.north.filename -no3.animation.south.filename = no3.animation.north.filename -no3.animation.west.filename = no3.animation.north.filename +no3.graphics_set.animation.north.filename = "__angelsrefininggraphics__/graphics/entity/sea-pump/sea-pump.png" +no3.graphics_set.animation.east.filename = no3.graphics_set.animation.north.filename +no3.graphics_set.animation.south.filename = no3.graphics_set.animation.north.filename +no3.graphics_set.animation.west.filename = no3.graphics_set.animation.north.filename data:extend({ no3 }) diff --git a/nullius/prototypes/entity/wind.lua b/nullius/prototypes/entity/wind.lua index 5c5f358..8799574 100644 --- a/nullius/prototypes/entity/wind.lua +++ b/nullius/prototypes/entity/wind.lua @@ -8,6 +8,8 @@ local TURBINEP = ENTITYPATH .. "windturbine/" -- no longer expected to be updated for 1.1+ compatibility, after Nullius was designed -- to rely on it, so the graphics are replicated here. +data:extend({{ type = "collision-layer", name = "layer_43" }}) + for i=0,7 do for j=1,3 do local k = i + 1 @@ -16,15 +18,6 @@ for i=0,7 do { type = "animation", name = "nullius-wind-shadow-"..j.."-"..i, - filename = TURBINEP .. "lds/angle"..k..".png", - width = 400, - height = 200, - frame_count = 24, - line_length = 5, - shift = {3.5*scale, -2.6*scale}, - scale = 4*scale, - draw_as_shadow = true, - hr_version = { filename = TURBINEP .. "hds/angle"..k..".png", width = 800, height = 400, @@ -33,19 +26,10 @@ for i=0,7 do shift = {3.5*scale,-2.6*scale}, scale = 2*scale, draw_as_shadow = true, - } }, { type = "animation", name = "nullius-wind-blade-"..j.."-"..i, - filename = TURBINEP .. "ld"..j.."/angle"..k..".png", - width = 300, - height = 400, - frame_count = 24, - line_length = 6, - shift = {0.15*scale, -1*scale}, - scale = 2*scale, - hr_version = { filename = TURBINEP .. "hd"..j.."/angle"..k..".png", width = 600, height = 800, @@ -53,7 +37,6 @@ for i=0,7 do line_length = 6, scale = scale, shift = {0.15*scale, -1*scale} - } } }) end @@ -70,7 +53,8 @@ for i=1,3 do type = "electric-energy-interface", name = "nullius-wind-build-"..i, icons = data.raw.item["nullius-wind-turbine-"..i].icons, - flags = {"placeable-neutral", "player-creation", "hidden", "not-upgradable", "not-deconstructable"}, + flags = {"placeable-neutral", "player-creation", "not-upgradable", "not-deconstructable"}, + hidden = true, minable = {mining_time = (i + 1), result = "nullius-wind-turbine-"..i}, max_health = 800*scale, corpse = "medium-remnants", @@ -79,7 +63,7 @@ for i=1,3 do }, collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.4, -1.4}, {1.4, 1.4}}, - collision_mask = {"layer-43", "item-layer", "object-layer", "player-layer", "water-tile"}, + collision_mask = { layers = {layer_43 = true, item = true, object = true, player = true, water_tile = true, elevated_rail = true}}, energy_source = { type = "electric", usage_priority = "primary-output", @@ -94,15 +78,6 @@ for i=1,3 do animations = { layers = { { - filename = TURBINEP .. "ld"..i.."/build.png", - width = 300, - height = 400, - frame_count = 1, - line_length = 1, - shift = {0.15*scale, -11*scale}, - animation_speed = 0.2, - scale = 2*scale, - hr_version = { filename = TURBINEP .. "hd"..i.."/build.png", width = 600, height = 800, @@ -111,19 +86,8 @@ for i=1,3 do scale = scale, shift = {0.15*scale, -11*scale}, animation_speed = 0.2 - } }, { - filename = TURBINEP .. "lds/build.png", - width = 400, - height = 200, - frame_count = 1, - line_length = 1, - shift = {9.5*scale,-3.6*scale}, - animation_speed = 0.2, - draw_as_shadow = true, - scale = 4*scale, - hr_version = { filename = TURBINEP .. "hds/build.png", width = 800, height = 400, @@ -133,16 +97,15 @@ for i=1,3 do shift = {9.5*scale,-3.6*scale}, animation_speed = 0.2, draw_as_shadow = true - } } } }, working_sound = { sound = { filename = "__base__/sound/train-wheels.ogg", - volume = scale + volume = scale * settings.startup["nullius-wind-turbine-volume"].value }, - match_speed_to_activity = true + match_speed_to_activity = settings.startup["nullius-match-wind-turbine-activity-sound"].value } }, @@ -161,7 +124,7 @@ for i=1,3 do }, collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.4, -1.4}, {1.4, 1.4}}, - collision_mask = {"layer-43", "item-layer", "object-layer", "player-layer", "water-tile"}, + collision_mask = { layers = {layer_43 = true, item = true, object = true, player = true, water_tile = true, elevated_rail = true}}, energy_source = { type = "electric", usage_priority = "primary-output", @@ -174,31 +137,20 @@ for i=1,3 do energy_usage = "0kW", fast_replaceable_group = "wind-turbine", picture = { - filename = TURBINEP .. "ld"..i.."/base.png", - width = 300, - height = 400, - frame_count = 1, - line_length = 1, - shift = {0.15*scale, -11*scale}, - animation_speed = 0.2, - scale = 2*scale, - hr_version = { filename = TURBINEP .. "hd"..i.."/base.png", width = 600, height = 800, - frame_count = 1, line_length = 1, shift = {0.15*scale, -11*scale}, scale = scale, - animation_speed = 0.2 - } + --animation_speed = 0.2 }, working_sound = { sound = { filename = "__base__/sound/train-wheels.ogg", - volume = scale + volume = scale * settings.startup["nullius-wind-turbine-volume"].value }, - match_speed_to_activity = true, + match_speed_to_activity = settings.startup["nullius-match-wind-turbine-activity-sound"].value } } }) @@ -208,13 +160,14 @@ data:extend({ { type = "simple-entity-with-force", name = "nullius-wind-collision", - render_layer = "object", + --render_layer = "object", icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, order = "bb", flags = {"placeable-neutral", "player-creation", "not-on-map"}, + hidden_in_factoriopedia = true, collision_box = {{-30.5, -30.5}, {30.5, 30.5}}, - collision_mask = {"layer-43"}, + collision_mask = { layers = {layer_43 = true}}, selection_box = {{-0.9, -0.9}, {0.9, 0.9}}, selectable_in_game = false, render_layer = "wires-above", @@ -233,9 +186,10 @@ data:extend({ icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, order = "bc", - flags = {"placeable-neutral", "player-creation", "not-on-map", "hidden"}, + flags = {"placeable-neutral", "player-creation", "not-on-map"}, + hidden = true, collision_box = {{-16, -13.5}, {16, 13.5}}, - collision_mask = {"layer-43"}, + collision_mask = { layers = {layer_43 = true}}, render_layer = "wires-above", selectable_in_game = false, random_animation_offset = false, @@ -253,9 +207,10 @@ data:extend({ icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, order = "bd", - flags = {"placeable-neutral", "player-creation", "not-on-map", "hidden"}, + flags = {"placeable-neutral", "player-creation", "not-on-map"}, + hidden = true, collision_box = {{-13.5, -16}, {13.5, 16}}, - collision_mask = {"layer-43"}, + collision_mask = { layers = {layer_43 = true}}, render_layer = "wires-above", selectable_in_game = false, random_animation_offset = false, diff --git a/nullius/prototypes/hidden.lua b/nullius/prototypes/hidden.lua index 04dee8b..cb278e7 100644 --- a/nullius/prototypes/hidden.lua +++ b/nullius/prototypes/hidden.lua @@ -45,7 +45,8 @@ building_types_list = { "heat-pipe", "artillery-turret", "electric-turret", - "fluid-turret" + "fluid-turret", + "valve" } hide_entity_list = { @@ -72,7 +73,6 @@ item_types_list = { "tool", "armor", "item-with-entity-data", - "mining-tool", "repair-tool", "item-with-inventory", "spidertron-remote" @@ -105,11 +105,11 @@ local function remove_table(lst, target) end for _,type in pairs(item_types_list) do - for _,item in pairs(data.raw[type]) do + for _,item in pairs(data.raw[type] or {}) do if ((string.sub(item.name, 1, 8) ~= "nullius-") and ((item.order == nil) or (string.sub(item.order, 1, 8) ~= "nullius-"))) then - if (table_contains(item.flags, "hidden")) then + if item.hidden then item.subgroup = "hidden" else if (item.flags == nil) then @@ -130,14 +130,6 @@ for _, recipe in pairs(data.raw.recipe) do (string.sub(recipe.name, 1, 5) ~= "bpsb-")) then recipe.hidden = true recipe.enabled = false - if (recipe.normal ~= nil) then - recipe.normal.enabled = true - recipe.normal.hidden = true - end - if (recipe.expensive ~= nil) then - recipe.expensive.enabled = true - recipe.expensive.hidden = true - end else if (recipe.results) then for _, product in pairs(recipe.results) do @@ -151,23 +143,15 @@ for _, recipe in pairs(data.raw.recipe) do end end end - if (recipe.result ~= nil) then - for _,type in pairs(item_types_list) do - local item = data.raw[type][recipe.result] - if (item ~= nil) then - remove_table(item.flags, "temphidden") - end - end - end end end for _,type in pairs(item_types_list) do - for _,item in pairs(data.raw[type]) do + for _,item in pairs(data.raw[type] or {}) do if remove_table(item.flags, "temphidden") then item.flags["temphidden"] = nil - table.insert(item.flags,"hidden") - item.subgroup = "hidden" + item.hidden = true + item.subgroup = "hidden" end end end @@ -186,20 +170,16 @@ for _,type in pairs(building_types_list) do local next_entity = data.raw[type][entity.next_upgrade] if (next_entity ~= nil) and next_entity.minable ~= nil then local item = data.raw.item[next_entity.minable.result] - if (item ~= nil) and table_contains(item.flags, "hidden") then + if (item ~= nil) and item.hidden then entity.next_upgrade = nil end end end if entity.minable ~= nil then local item = data.raw.item[entity.minable.result] - if (item ~= nil) and table_contains(item.flags, "hidden") then + if (item ~= nil) and item.hidden then entity.next_upgrade = nil - if (entity.flags == nil) then - entity.flags = {"hidden"} - elseif (not table_contains(entity.flags, "hidden")) then - table.insert(entity.flags, "hidden") - end + entity.hidden = true end end end @@ -213,17 +193,17 @@ for _,type in pairs(hide_entity_list) do if (entity.flags == nil) then entity.flags = {} end - table.insert(entity.flags,"hidden") + entity.hidden = true end end end -remove_table(data.raw.item["iron-ore"].flags, "hidden") -remove_table(data.raw.item["copper-ore"].flags, "hidden") -remove_table(data.raw.item["uranium-ore"].flags, "hidden") +data.raw.item["iron-ore"].hidden = false +data.raw.item["copper-ore"].hidden = false +data.raw.item["uranium-ore"].hidden = false if (mods["rec-blue-plus"] or mods["recursive-blueprints"]) then -remove_table(data.raw.item["construction-robot"].flags, "hidden") +data.raw.item["construction-robot"].hidden = false end data.raw["active-defense-equipment"]["personal-laser-defense-equipment"].attack_parameters = @@ -241,7 +221,7 @@ end for _, recipe in pairs(data.raw.recipe) do if (string.sub(recipe.name, 1, 8) ~= "nullius-") then - if ((string.sub(recipe.name, 1, 13) == "fill-nullius-") or + if ((string.sub(recipe.name, 1, 13) == "fill-nullius-") or (string.sub(recipe.name, 1, 14) == "empty-nullius-")) then recipe.GCKI_ignore = true elseif (((recipe.order == nil) or @@ -256,8 +236,7 @@ for _, recipe in pairs(data.raw.recipe) do end end -data.raw.recipe["pipe"].normal.result = "stone-pipe" -data.raw.recipe["pipe"].expensive.result = "stone-pipe" +data.raw.recipe["pipe"].results[1].name = "bob-stone-pipe" data.raw.fish.fish.subgroup = "biology-fish" data.raw.fish.fish.order = "z" @@ -265,6 +244,10 @@ data.raw.item["rocket-part"].subgroup = "space" data.raw.item["rocket-part"].order = "z" data.raw.item["nullius-energy-barrel"] = nil -data.raw.recipe["fill-nullius-energy-barrel"] = nil +data.raw.recipe["nullius-energy-barrel"] = nil data.raw.recipe["empty-nullius-energy-barrel"] = nil data.raw.technology["fluid-handling"].effects = { } + +data.raw["spider-vehicle"]["spidertron"].hidden_in_factoriopedia = true +data.raw["car"]["car"].hidden_in_factoriopedia = true +data.raw["car"]["tank"].hidden_in_factoriopedia = true \ No newline at end of file diff --git a/nullius/prototypes/inputs.lua b/nullius/prototypes/inputs.lua index 1576587..fda921e 100644 --- a/nullius/prototypes/inputs.lua +++ b/nullius/prototypes/inputs.lua @@ -9,13 +9,6 @@ data:extend({ key_sequence = "PAD +", include_selected_prototype = true }, - { - type = "custom-input", - name = "nullius-mirror", - order = "nullius-ibc", - key_sequence = "PAD *", - include_selected_prototype = true - }, { type = "custom-input", name = "nullius-upload-mind", diff --git a/nullius/prototypes/item/alignment.lua b/nullius/prototypes/item/alignment.lua index af29888..3435bfd 100644 --- a/nullius/prototypes/item/alignment.lua +++ b/nullius/prototypes/item/alignment.lua @@ -23,7 +23,6 @@ data:extend({ projectile_creation_distance = 0.5, range = 16, ammo_type = { - category = "grenade", target_type = "position", action = { { @@ -71,7 +70,6 @@ data:extend({ projectile_creation_distance = 0.25, range = 16, ammo_type = { - category = "grenade", target_type = "position", action = { { @@ -102,10 +100,9 @@ data:extend({ { type = "capsule", name = "nullius-align-transponder", - icons = {{ + icons = {{ icon = "__base__/graphics/icons/rocket-part.png", icon_size = 64, - icon_mipmaps = 4 }}, subgroup = "alignment", order = "nullius-db", @@ -119,7 +116,6 @@ data:extend({ cooldown = 600, range = 0, ammo_type = { - category = "capsule", target_type = "position", action = { type = "direct", @@ -128,7 +124,7 @@ data:extend({ target_effects = { { type = "camera-effect", - effect = "screen-burn", + --effect = "screen-burn", duration = 20, ease_in_duration = 10, ease_out_duration = 10, @@ -137,9 +133,9 @@ data:extend({ full_strength_max_distance = 500, max_distance = 2000 }, - { + { type = "script", - effect_id = "nullius-align-transponder" + effect_id = "nullius-align-transponder" } } } @@ -151,17 +147,16 @@ data:extend({ { type = "ammo", name = "nullius-align-conscription-charge", - icons = {{ + icons = {{ icon = "__base__/graphics/icons/piercing-shotgun-shell.png", icon_size = 64, - icon_mipmaps = 4 }}, subgroup = "alignment", order = "nullius-e", magazine_size = 100, stack_size = 20, + ammo_category = "nullius-conscription", ammo_type = { - category = "nullius-conscription", target_type = "position", action = { { @@ -172,7 +167,7 @@ data:extend({ starting_speed = 0.6, source_effects = { type = "create-explosion", - entity_name = "spark-explosion" + entity_name = "spark-explosion" } } } @@ -185,7 +180,6 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/combat-shotgun.png", icon_size = 64, - icon_mipmaps = 4 }}, subgroup = "alignment", order = "nullius-f", @@ -209,7 +203,6 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/gun-turret.png", icon_size = 64, - icon_mipmaps = 4 }}, subgroup = "alignment", order = "nullius-g", @@ -226,7 +219,7 @@ data:extend({ subgroup = "alignment", order = "nullius-h", stack_size = 5, - place_result = "nullius-align-concordance-transmitter" + place_result = "nullius-align-concordance-transmitter" }, { type = "item", @@ -238,7 +231,11 @@ data:extend({ subgroup = "alignment", order = "nullius-i", stack_size = 1, - rocket_launch_product = {"nullius-astronomy-pack", 42} + weight = 1000000, + send_to_orbit_mode = "automated", + rocket_launch_products = { + {type = "item", name = "nullius-astronomy-pack", amount = 42} + } }, { @@ -249,7 +246,6 @@ data:extend({ { icon = "__base__/graphics/icons/rocket-part.png", icon_size = 64, - icon_mipmaps = 4 }, { icon = "__nullius__/graphics/icons/broken.png", @@ -280,10 +276,12 @@ data:extend({ order = "nullius-dc", energy_required = 3, ingredients = { - {"nullius-broken-align-transponder", 1}, - {"nullius-iron-wire", 1} + {type = "item", name = "nullius-broken-align-transponder", amount = 1}, + {type = "item", name = "nullius-iron-wire", amount = 1} }, - result = "nullius-align-transponder" + results = { + {type="item", name="nullius-align-transponder", amount = 1} + } }, { @@ -295,10 +293,12 @@ data:extend({ category = "tiny-crafting", energy_required = 8, ingredients = { - {"nullius-steel-sheet", 1}, - {"nullius-plastic", 1} + {type = "item", name = "nullius-steel-sheet", amount = 1}, + {type = "item", name = "nullius-plastic", amount = 1} }, - result = "nullius-align-identification-card" + results = { + {type="item", name="nullius-align-identification-card", amount = 1} + } }, { type = "recipe", @@ -309,11 +309,13 @@ data:extend({ category = "tiny-crafting", energy_required = 10, ingredients = { - {"nullius-align-identification-card", 1}, - {"nullius-glass", 1}, - {"nullius-aluminum-sheet", 1} + {type = "item", name = "nullius-align-identification-card", amount = 1}, + {type = "item", name = "nullius-glass", amount = 1}, + {type = "item", name = "nullius-aluminum-sheet", amount = 1} }, - result = "nullius-align-invitation-card" + results = { + {type="item", name="nullius-align-invitation-card", amount = 1} + } }, { type = "recipe", @@ -324,11 +326,13 @@ data:extend({ category = "small-crafting", energy_required = 12, ingredients = { - {"nullius-align-identification-card", 1}, - {"constant-combinator", 1}, - {"nullius-capacitor", 2} + {type = "item", name = "nullius-align-identification-card", amount = 1}, + {type = "item", name = "constant-combinator", amount = 1}, + {type = "item", name = "nullius-capacitor", amount = 2} }, - result = "nullius-align-transponder" + results = { + {type="item", name="nullius-align-transponder", amount = 1} + } }, { type = "recipe", @@ -341,12 +345,13 @@ data:extend({ category = "nullius-electrolysis", energy_required = 10, ingredients = { - {"nullius-align-invitation-card", 1}, - {"nullius-align-transponder", 1}, - {"nullius-capacitor", 4} + {type = "item", name = "nullius-align-invitation-card", amount = 1}, + {type = "item", name = "nullius-align-transponder", amount = 1}, + {type = "item", name = "nullius-capacitor", amount = 4} }, - result = "nullius-align-conscription-charge", - result_count = 3 + results = { + {type="item", name="nullius-align-conscription-charge", amount = 3} + } }, { type = "recipe", @@ -357,11 +362,13 @@ data:extend({ category = "small-crafting", energy_required = 20, ingredients = { - {"power-switch", 1}, - {"nullius-multi-tool-1", 1}, - {"nullius-relay-1", 1} + {type = "item", name = "power-switch", amount = 1}, + {type = "item", name = "nullius-multi-tool-1", amount = 1}, + {type = "item", name = "nullius-relay-1", amount = 1} }, - result = "nullius-align-conscription-ray" + results = { + {type="item", name="nullius-align-conscription-ray", amount = 1} + } }, { type = "recipe", @@ -372,14 +379,16 @@ data:extend({ category = "medium-crafting", energy_required = 30, ingredients = { - {"nullius-align-conscription-ray", 2}, - {"nullius-night-vision-1", 1}, - {"nullius-transformer", 1}, - {"nullius-bearing", 1}, - {"nullius-missile-launcher", 2}, - {"nullius-steel-beam", 6} + {type = "item", name = "nullius-align-conscription-ray", amount = 2}, + {type = "item", name = "nullius-night-vision-1", amount = 1}, + {type = "item", name = "nullius-transformer", amount = 1}, + {type = "item", name = "nullius-bearing", amount = 1}, + {type = "item", name = "nullius-missile-launcher", amount = 2}, + {type = "item", name = "nullius-steel-beam", amount = 6} }, - result = "nullius-align-conscription-turret" + results = { + {type="item", name="nullius-align-conscription-turret", amount = 1} + } }, { type = "recipe", @@ -390,11 +399,13 @@ data:extend({ category = "large-crafting", energy_required = 60, ingredients = { - {"nullius-align-conscription-turret", 3}, - {"nullius-large-beacon-1", 2}, - {"nullius-align-conscription-charge", 10} + {type = "item", name = "nullius-align-conscription-turret", amount = 3}, + {type = "item", name = "nullius-large-beacon-1", amount = 2}, + {type = "item", name = "nullius-align-conscription-charge", amount = 10} }, - result = "nullius-align-concordance-transmitter" + results = { + {type="item", name="nullius-align-concordance-transmitter", amount = 1} + } }, { type = "recipe", @@ -405,11 +416,13 @@ data:extend({ category = "huge-crafting", energy_required = 300, ingredients = { - {"nullius-align-concordance-transmitter", 3}, - {"nullius-large-beacon-2", 2}, - {"nullius-satellite", 1} + {type = "item", name = "nullius-align-concordance-transmitter", amount = 3}, + {type = "item", name = "nullius-large-beacon-2", amount = 2}, + {type = "item", name = "nullius-satellite", amount = 1} }, - result = "nullius-align-concordance-satellite" + results = { + {type="item", name="nullius-align-concordance-satellite", amount = 1} + } } }) diff --git a/nullius/prototypes/item/biology.lua b/nullius/prototypes/item/biology.lua index 4aaa604..225beb8 100644 --- a/nullius/prototypes/item/biology.lua +++ b/nullius/prototypes/item/biology.lua @@ -18,7 +18,7 @@ data:extend({ type = "item", name = "nullius-cellulose", icons = {{ - icon = "__base__/graphics/decorative/brown-asterisk/hr-brown-asterisk-11.png", + icon = "__base__/graphics/decorative/brown-asterisk/brown-asterisk-11.png", icon_size = 54 }}, subgroup = "biology-material", @@ -29,7 +29,7 @@ data:extend({ type = "item", name = "nullius-fertilizer", icons = {{ - icon = "__angelsrefining__/graphics/icons/solid-mud.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-mud.png", icon_size = 32 }}, subgroup = "biology-material", @@ -42,7 +42,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/coal-1.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.5, 0.5, 0.5} }}, subgroup = "biology-material", @@ -56,14 +56,14 @@ data:extend({ { type = "recipe", name = "nullius-sugar-1", - localised_name = {"", {"item-name.nullius-sugar"}, " ", 1}, + localised_name = {"", {"item-name.nullius-sugar"}, " ", tostring(1)}, icons = { { icon = ICONPATH .. "sugar.png", icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/glycerol.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/glycerol.png", icon_size = 72, scale = 0.3, shift = {7, -9} @@ -88,7 +88,7 @@ data:extend({ { type = "recipe", name = "nullius-sugar-2", - localised_name = {"", {"item-name.nullius-sugar"}, " ", 2}, + localised_name = {"", {"item-name.nullius-sugar"}, " ", tostring(2)}, enabled = false, show_amount_in_title = false, always_show_products = true, @@ -142,7 +142,7 @@ data:extend({ show_amount_in_title = false, always_show_products = true, category = "nanotechnology", - order = "nullius-cb", + order = "nullius-cb", energy_required = 15, ingredients = { {type="item", name="nullius-sugar", amount=5}, @@ -231,7 +231,8 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, - allow_decomposition = false, + allow_decomposition = false, + --hide_from_signal_gui = false, category = "distillation", subgroup = "biology-oil", order = "nullius-bc", @@ -252,14 +253,12 @@ data:extend({ localised_name = {"recipe-name.nullius-biolubricant"}, icons = { { - icon = "__base__/graphics/icons/fluid/lubricant.png", - icon_size = 64, - icon_mipmaps = 4 + icon = "__base__/graphics/icons/fluid/lubricant.png", + icon_size = 64, }, { icon = "__base__/graphics/icons/fluid/light-oil.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.2, shift = {-12, -10} } @@ -267,7 +266,8 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, - allow_decomposition = false, + allow_decomposition = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "biology-oil", order = "nullius-bd", @@ -327,7 +327,7 @@ data:extend({ { type = "recipe", name = "nullius-protocell-1", - localised_name = {"", {"fluid-name.nullius-protocell"}, " ", 1}, + localised_name = {"", {"fluid-name.nullius-protocell"}, " ", tostring(1)}, enabled = false, category = "nanotechnology", order = "nullius-fb", @@ -348,7 +348,7 @@ data:extend({ { type = "recipe", name = "nullius-protocell-2", - localised_name = {"", {"fluid-name.nullius-protocell"}, " ", 2}, + localised_name = {"", {"fluid-name.nullius-protocell"}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "protocell.png", @@ -362,6 +362,7 @@ data:extend({ } }, enabled = false, + hide_from_signal_gui = false, category = "nanotechnology", order = "nullius-fc", energy_required = 8, @@ -378,14 +379,14 @@ data:extend({ { type = "recipe", name = "nullius-fertilizer", - localised_name = {"", {"item-name.nullius-fertilizer"}, " ", 1}, - icons = { - { - icon = "__angelsrefining__/graphics/icons/solid-mud.png", + localised_name = {"", {"item-name.nullius-fertilizer"}, " ", tostring(1)}, + icons = { + { + icon = "__angelsrefininggraphics__/graphics/icons/solid-mud.png", icon_size = 32 }, { - icon = ICONPATH .. "algae.png", + icon = ICONPATH .. "algae.png", icon_size = 64, scale = 0.33, shift = {-8, -4} @@ -394,7 +395,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, - order = "nullius-db", + order = "nullius-db", category = "basic-chemistry", crafting_machine_tint = { primary = data.raw.fluid["nullius-ammonia"].flow_color, @@ -408,20 +409,21 @@ data:extend({ {type="item", name="nullius-algae", amount=4}, {type="item", name="nullius-cellulose", amount=5} }, - result = "nullius-fertilizer", - result_count = 6 + results = { + {type = "item", name = "nullius-fertilizer", amount = 6} + } }, { type = "recipe", name = "nullius-fertilizer-2", - localised_name = {"", {"item-name.nullius-fertilizer"}, " ", 2}, - icons = { - { - icon = "__angelsrefining__/graphics/icons/solid-mud.png", + localised_name = {"", {"item-name.nullius-fertilizer"}, " ", tostring(2)}, + icons = { + { + icon = "__angelsrefininggraphics__/graphics/icons/solid-mud.png", icon_size = 32 }, { - icon = ICONPATH .. "wood-chip.png", + icon = ICONPATH .. "wood-chip.png", icon_size = 64, scale = 0.33, shift = {-8, -6} @@ -430,7 +432,8 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, - order = "nullius-dc", + hide_from_signal_gui = false, + order = "nullius-dc", category = "basic-chemistry", crafting_machine_tint = { primary = data.raw.fluid["nullius-bacteria"].flow_color, @@ -444,21 +447,22 @@ data:extend({ {type="item", name="nullius-wood-chip", amount=12}, {type="item", name="nullius-fish", amount=1} }, - result = "nullius-fertilizer", - result_count = 16 + results = { + {type = "item", name = "nullius-fertilizer", amount = 16} + } }, { type = "recipe", name = "nullius-fatty-acid-pyrolysis", localised_name = {"recipe-name.nullius-pyrolysis", {"fluid-name.nullius-fatty-acids"}}, - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/ethylene.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/benzene.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/propene.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/ethylene.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/benzene.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/propene.png", 72}}, {element_tint["carbon"], element_tint["carbon"], element_tint["hydrogen"]} ), enabled = false, - allow_decomposition = false, + allow_decomposition = false, allow_as_intermediate = false, category = "distillation", subgroup = "biology-oil", @@ -490,7 +494,7 @@ data:extend({ data.raw.fluid["nullius-fatty-acids"].icons[4] }, enabled = false, - allow_decomposition = false, + allow_decomposition = false, allow_as_intermediate = false, category = "distillation", subgroup = "boxed-biology", @@ -512,14 +516,15 @@ data:extend({ type = "recipe", name = "nullius-glycerol-reforming", localised_name = {"recipe-name.nullius-reforming", {"fluid-name.nullius-glycerol"}}, - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/hydrogen.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", 72}}, {element_tint["carbon"], element_tint["hydrogen"], element_tint["oxygen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/glycerol.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/glycerol.png", 72}} ), enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "biology-oil", order = "nullius-h", @@ -543,7 +548,7 @@ data:extend({ { icon = ICONPATH .. "bacteria.png", icon_size = 64, - scale = 0.5 + scale = 0.5 }, { icon = ICONPATH .. "genome.png", @@ -558,10 +563,10 @@ data:extend({ { type = "recipe", name = "nullius-bacteria-genome", - localised_name = {"", {"item-name.nullius-bacteria-genome"}, " ", 1}, + localised_name = {"", {"item-name.nullius-bacteria-genome"}, " ", tostring(1)}, enabled = false, category = "nanotechnology", - order = "nullius-bb", + order = "nullius-bb", energy_required = 30, ingredients = { {type="fluid", name="nullius-nucleotides", amount=18, fluidbox_index=1}, @@ -578,12 +583,12 @@ data:extend({ { type = "recipe", name = "nullius-bacteria-genome-2", - localised_name = {"", {"item-name.nullius-bacteria-genome"}, " ", 2}, - icons = { + localised_name = {"", {"item-name.nullius-bacteria-genome"}, " ", tostring(2)}, + icons = { { icon = ICONPATH .. "bacteria.png", icon_size = 64, - scale = 0.5 + scale = 0.5 }, { icon = ICONPATH .. "genome.png", @@ -591,20 +596,20 @@ data:extend({ scale = 0.4, shift = {-3, 2} }, - { + { icon = "__base__/graphics/icons/military-science-pack.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.3, + scale = 0.3, shift = {9, -8}, tint = {0.75, 0.72, 0.78} } }, enabled = false, - show_amount_in_title = false, + show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "nanotechnology", - order = "nullius-bc", + order = "nullius-bc", energy_required = 45, ingredients = { {type="fluid", name="nullius-nucleotides", amount=25, fluidbox_index=1}, @@ -623,7 +628,7 @@ data:extend({ { type = "recipe", name = "nullius-bacteria-1", - localised_name = {"", {"fluid-name.nullius-bacteria"}, " ", 1}, + localised_name = {"", {"fluid-name.nullius-bacteria"}, " ", tostring(1)}, icons = { { icon = ICONPATH .. "bacteria.png", @@ -638,7 +643,7 @@ data:extend({ }, enabled = false, allow_decomposition = false, - show_amount_in_title = false, + show_amount_in_title = false, always_show_products = true, category = "nanotechnology", subgroup = "biology-bacteria", @@ -660,7 +665,7 @@ data:extend({ { type = "recipe", name = "nullius-bacteria-2", - localised_name = {"", {"fluid-name.nullius-bacteria"}, " ", 2}, + localised_name = {"", {"fluid-name.nullius-bacteria"}, " ", tostring(2)}, enabled = false, allow_decomposition = false, category = "ore-flotation", @@ -683,21 +688,22 @@ data:extend({ { type = "recipe", name = "nullius-bacteria-3", - localised_name = {"", {"fluid-name.nullius-bacteria"}, " ", 3}, - icons = { - { + localised_name = {"", {"fluid-name.nullius-bacteria"}, " ", tostring(3)}, + icons = { + { icon = ICONPATH .. "bacteria.png", icon_size = 64 }, - { + { icon = ICONPATH .. "genome.png", icon_size = 64, - scale = 0.3, + scale = 0.3, shift = {-10, -9} } - }, + }, enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "ore-flotation", subgroup = "biology-bacteria", order = "nullius-cd", @@ -735,6 +741,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "distillation", subgroup = "biology-bacteria", order = "nullius-f", @@ -807,16 +814,17 @@ data:extend({ shift = {-9, -11} }, { - icon = "__angelspetrochem__/graphics/icons/molecules/glycerol.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/glycerol.png", icon_size = 72, - scale = 0.23, - shift = {-8, 12} + scale = 0.23, + shift = {-8, 12} } }, enabled = false, always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "distillation", subgroup = "biology-bacteria", order = "nullius-fg", @@ -853,7 +861,7 @@ data:extend({ shift = {-8, -10} }, { - icon = "__angelspetrochem__/graphics/icons/molecules/glycerol.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/glycerol.png", icon_size = 72, scale = 0.21, shift = {-7, 11} @@ -934,6 +942,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "distillation", subgroup = "biology-bacteria", order = "nullius-g", @@ -959,7 +968,7 @@ data:extend({ { icon = ICONPATH .. "algae.png", icon_size = 64, - scale = 0.5 + scale = 0.5 }, { icon = ICONPATH .. "genome.png", @@ -1015,9 +1024,9 @@ data:extend({ { type = "recipe", name = "nullius-algae-genome", - localised_name = {"", {"item-name.nullius-algae-genome"}, " ", 1}, + localised_name = {"", {"item-name.nullius-algae-genome"}, " ", tostring(1)}, enabled = false, - show_amount_in_title = false, + show_amount_in_title = false, always_show_products = true, category = "nanotechnology", energy_required = 20, @@ -1035,12 +1044,12 @@ data:extend({ { type = "recipe", name = "nullius-algae-genome-2", - localised_name = {"", {"item-name.nullius-algae-genome"}, " ", 2}, - icons = { + localised_name = {"", {"item-name.nullius-algae-genome"}, " ", tostring(2)}, + icons = { { icon = ICONPATH .. "algae.png", icon_size = 64, - scale = 0.5 + scale = 0.5 }, { icon = ICONPATH .. "genome.png", @@ -1048,20 +1057,20 @@ data:extend({ scale = 0.4, shift = {-3, 2} }, - { + { icon = "__base__/graphics/icons/military-science-pack.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.3, + scale = 0.3, shift = {9, -8}, tint = {0.75, 0.72, 0.78} } }, enabled = false, - show_amount_in_title = false, + show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "nanotechnology", - order = "nullius-bc", + order = "nullius-bc", energy_required = 30, ingredients = { {type="item", name="nullius-bacteria-genome", amount=1}, @@ -1078,10 +1087,10 @@ data:extend({ { type = "recipe", name = "nullius-algae-progenitor", - localised_name = {"", {"item-name.nullius-algae-progenitor"}, " ", 1}, + localised_name = {"", {"item-name.nullius-algae-progenitor"}, " ", tostring(1)}, enabled = false, category = "nanotechnology", - order = "nullius-cb", + order = "nullius-cb", energy_required = 150, ingredients = { {type="item", name="nullius-algae-genome", amount=1}, @@ -1100,22 +1109,23 @@ data:extend({ { type = "recipe", name = "nullius-algae-progenitor-2", - localised_name = {"", {"item-name.nullius-algae-progenitor"}, " ", 2}, - icons = { - { + localised_name = {"", {"item-name.nullius-algae-progenitor"}, " ", tostring(2)}, + icons = { + { icon = ICONPATH .. "algae-progenitor.png", icon_size = 64 }, - { + { icon = ICONPATH .. "algae.png", icon_size = 64, - scale = 0.36, + scale = 0.36, shift = {-8, -8} } - }, + }, enabled = false, + hide_from_signal_gui = false, category = "nanotechnology", - order = "nullius-cc", + order = "nullius-cc", energy_required = 250, ingredients = { {type="item", name="nullius-algae-genome", amount=1}, @@ -1135,7 +1145,7 @@ data:extend({ { type = "recipe", name = "nullius-algae-1", - localised_name = {"", {"item-name.nullius-algae"}, " ", 1}, + localised_name = {"", {"item-name.nullius-algae"}, " ", tostring(1)}, icons = { { icon = ICONPATH .. "algae.png", @@ -1169,9 +1179,10 @@ data:extend({ { type = "recipe", name = "nullius-algae-2", - localised_name = {"", {"item-name.nullius-algae"}, " ", 2}, + localised_name = {"", {"item-name.nullius-algae"}, " ", tostring(2)}, enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "ore-flotation", order = "nullius-dc", energy_required = 26, @@ -1191,21 +1202,22 @@ data:extend({ { type = "recipe", name = "nullius-algae-3", - localised_name = {"", {"item-name.nullius-algae"}, " ", 3}, - icons = { - { + localised_name = {"", {"item-name.nullius-algae"}, " ", tostring(3)}, + icons = { + { icon = ICONPATH .. "algae.png", icon_size = 64 }, - { + { icon = ICONPATH .. "genome.png", icon_size = 64, - scale = 0.3, + scale = 0.3, shift = {-10, -9} } - }, + }, enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "ore-flotation", order = "nullius-dd", energy_required = 24, @@ -1230,7 +1242,7 @@ data:extend({ show_amount_in_title = false, always_show_products = true, category = "bio-harvesting", - order = "nullius-eb", + order = "nullius-eb", energy_required = 8, ingredients = { {type="item", name="nullius-algae", amount=5} @@ -1245,7 +1257,7 @@ data:extend({ { type = "recipe", name = "nullius-algae-harvest", - localised_name = {"recipe-name.nullius-harvest", {"item-name.nullius-algae"}}, + localised_name = {"recipe-name.nullius-harvest", {"item-name.nullius-algae"}}, icons = { { icon = ICONPATH .. "protocell.png", @@ -1257,36 +1269,37 @@ data:extend({ icon_size = 64, scale = 0.4 }, - { - icon = "__angelsrefining__/graphics/icons/solid-limestone.png", + { + icon = "__angelsrefininggraphics__/graphics/icons/solid-limestone.png", icon_size = 32, - scale = 0.48, - shift = {11, 10} - }, - { - icon = "__angelspetrochem__/graphics/icons/molecules/sulfur-dioxide.png", + scale = 0.48, + shift = {11, 10} + }, + { + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/sulfur-dioxide.png", icon_size = 72, - scale = 0.2, - shift = {-10, 10} - } + scale = 0.2, + shift = {-10, 10} + } }, enabled = false, always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "distillation", crafting_machine_tint = { primary = data.raw.fluid["nullius-fatty-acids"].flow_color }, - order = "nullius-ec", + order = "nullius-ec", energy_required = 40, ingredients = { {type="item", name="nullius-algae", amount=18}, - {type="fluid", name="nullius-saline", amount=100} + {type="fluid", name="nullius-saline", amount=100} }, results = { {type="item", name="nullius-algae-spore", amount=33}, {type="fluid", name="nullius-wastewater", amount=120}, - {type="fluid", name="nullius-sulfur-dioxide", amount=65}, - {type="fluid", name="nullius-fatty-acids", amount=40}, + {type="fluid", name="nullius-sulfur-dioxide", amount=65}, + {type="fluid", name="nullius-fatty-acids", amount=40}, {type="item", name="nullius-cellulose", amount=7}, {type="item", name="nullius-crushed-limestone", amount=5} }, @@ -1319,13 +1332,14 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "bio-harvesting", - subgroup = "biology-disposal", + subgroup = "biology-disposal", order = "nullius-c", energy_required = 1, ingredients = { {type="item", name="nullius-algae-spore", amount=4}, - {type="fluid", name="nullius-seawater", amount=12} + {type="fluid", name="nullius-seawater", amount=12} }, results = { {type="fluid", name="nullius-wastewater", amount=18} @@ -1340,7 +1354,6 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/light-oil.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.5 }, { @@ -1354,8 +1367,9 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - allow_decomposition = false, + allow_decomposition = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "ore-flotation", subgroup = "biology-algae", order = "nullius-f", @@ -1385,7 +1399,7 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/light-oil.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { @@ -1399,7 +1413,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - allow_decomposition = false, + allow_decomposition = false, allow_as_intermediate = false, category = "ore-flotation", subgroup = "boxed-biology", @@ -1426,7 +1440,7 @@ data:extend({ { icon = ICONPATH .. "grass.png", icon_size = 64, - scale = 0.5 + scale = 0.5 }, { icon = ICONPATH .. "genome.png", @@ -1482,7 +1496,7 @@ data:extend({ { type = "recipe", name = "nullius-grass-genome", - localised_name = {"", {"item-name.nullius-grass-genome"}, " ", 1}, + localised_name = {"", {"item-name.nullius-grass-genome"}, " ", tostring(1)}, enabled = false, category = "nanotechnology", energy_required = 30, @@ -1501,12 +1515,12 @@ data:extend({ { type = "recipe", name = "nullius-grass-genome-2", - localised_name = {"", {"item-name.nullius-grass-genome"}, " ", 2}, - icons = { + localised_name = {"", {"item-name.nullius-grass-genome"}, " ", tostring(2)}, + icons = { { icon = ICONPATH .. "grass.png", icon_size = 64, - scale = 0.5 + scale = 0.5 }, { icon = ICONPATH .. "genome.png", @@ -1514,20 +1528,20 @@ data:extend({ scale = 0.4, shift = {-3, 2} }, - { + { icon = "__base__/graphics/icons/military-science-pack.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.3, + scale = 0.3, shift = {9, -8}, tint = {0.75, 0.72, 0.78} } }, enabled = false, - show_amount_in_title = false, + show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "nanotechnology", - order = "nullius-bc", + order = "nullius-bc", energy_required = 45, ingredients = { {type="fluid", name="nullius-nucleotides", amount=20, fluidbox_index=1}, @@ -1545,10 +1559,10 @@ data:extend({ { type = "recipe", name = "nullius-grass-progenitor", - localised_name = {"", {"item-name.nullius-grass-progenitor"}, " ", 1}, + localised_name = {"", {"item-name.nullius-grass-progenitor"}, " ", tostring(1)}, enabled = false, category = "nanotechnology", - order = "nullius-cb", + order = "nullius-cb", energy_required = 200, ingredients = { {type="item", name="nullius-grass-genome", amount=1}, @@ -1567,22 +1581,23 @@ data:extend({ { type = "recipe", name = "nullius-grass-progenitor-2", - localised_name = {"", {"item-name.nullius-grass-progenitor"}, " ", 2}, - icons = { - { + localised_name = {"", {"item-name.nullius-grass-progenitor"}, " ", tostring(2)}, + icons = { + { icon = ICONPATH .. "grass-progenitor.png", icon_size = 64 }, - { + { icon = ICONPATH .. "grass.png", icon_size = 64, - scale = 0.36, + scale = 0.36, shift = {-8, -8} } - }, + }, enabled = false, + hide_from_signal_gui = false, category = "nanotechnology", - order = "nullius-cc", + order = "nullius-cc", energy_required = 350, ingredients = { {type="item", name="nullius-grass-genome", amount=1}, @@ -1591,7 +1606,7 @@ data:extend({ {type="fluid", name="nullius-fatty-acids", amount=5}, {type="item", name="nullius-sugar", amount=3}, {type="item", name="nullius-grass", amount=10}, - {type="item", name="nullius-grass-seed", amount=25} + {type="item", name="nullius-grass-seed", amount=25} }, results = { {type="item", name="nullius-grass-progenitor", amount=2}, @@ -1602,7 +1617,7 @@ data:extend({ { type = "recipe", name = "nullius-grass-1", - localised_name = {"", {"item-name.nullius-grass"}, " ", 1}, + localised_name = {"", {"item-name.nullius-grass"}, " ", tostring(1)}, icons = { { icon = ICONPATH .. "grass.png", @@ -1636,9 +1651,10 @@ data:extend({ { type = "recipe", name = "nullius-grass-2", - localised_name = {"", {"item-name.nullius-grass"}, " ", 2}, + localised_name = {"", {"item-name.nullius-grass"}, " ", tostring(2)}, enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "nullius-water-treatment", order = "nullius-dc", energy_required = 40, @@ -1659,21 +1675,22 @@ data:extend({ { type = "recipe", name = "nullius-grass-3", - localised_name = {"", {"item-name.nullius-grass"}, " ", 3}, - icons = { - { + localised_name = {"", {"item-name.nullius-grass"}, " ", tostring(3)}, + icons = { + { icon = ICONPATH .. "grass.png", icon_size = 64 }, - { + { icon = ICONPATH .. "genome.png", icon_size = 64, - scale = 0.3, + scale = 0.3, shift = {-10, -9} } - }, + }, enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "nullius-water-treatment", order = "nullius-dd", energy_required = 36, @@ -1739,7 +1756,7 @@ data:extend({ localised_name = {"recipe-name.nullius-grass-seed-milling"}, icons = { { - icon = "__base__/graphics/decorative/brown-asterisk/hr-brown-asterisk-11.png", + icon = "__base__/graphics/decorative/brown-asterisk/brown-asterisk-11.png", icon_size = 54 }, { @@ -1760,6 +1777,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "bio-harvesting", subgroup = "biology-grass", order = "nullius-g", @@ -1783,7 +1801,7 @@ data:extend({ icon_size = 64 }, { - icon = "__base__/graphics/decorative/brown-asterisk/hr-brown-asterisk-11.png", + icon = "__base__/graphics/decorative/brown-asterisk/brown-asterisk-11.png", icon_size = 54, scale = 0.5333 }, @@ -1828,13 +1846,14 @@ data:extend({ data.raw.fluid["nullius-carbon-dioxide"].icons[3], data.raw.fluid["nullius-carbon-dioxide"].icons[4], { - icon = "__base__/graphics/decorative/brown-asterisk/hr-brown-asterisk-11.png", + icon = "__base__/graphics/decorative/brown-asterisk/brown-asterisk-11.png", icon_size = 54, scale = 0.32, shift = {-8, -8} } }, enabled = false, + hide_from_signal_gui = false, category = "combustion", subgroup = "biology-burning", order = "nullius-d", @@ -1862,7 +1881,7 @@ data:extend({ data.raw.fluid["nullius-carbon-dioxide"].icons[3], data.raw.fluid["nullius-carbon-dioxide"].icons[4], { - icon = "__base__/graphics/decorative/brown-asterisk/hr-brown-asterisk-11.png", + icon = "__base__/graphics/decorative/brown-asterisk/brown-asterisk-11.png", icon_size = 54, scale = 0.29, shift = {-7, -7} @@ -1886,21 +1905,21 @@ data:extend({ type = "recipe", name = "nullius-cellulose-pyrolysis", localised_name = {"", {"recipe-name.nullius-pyrolysis", - {"item-name.nullius-cellulose"}}, " ", 1}, + {"item-name.nullius-cellulose"}}, " ", tostring(1)}, icons = { { icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4 }, { - icon = "__base__/graphics/decorative/brown-asterisk/hr-brown-asterisk-11.png", + icon = "__base__/graphics/decorative/brown-asterisk/brown-asterisk-11.png", icon_size = 54, scale = 0.32, shift = {-8, -8} } }, enabled = false, + hide_from_signal_gui = false, category = "wet-smelting", subgroup = "biology-burning", order = "nullius-e", @@ -1918,7 +1937,7 @@ data:extend({ type = "recipe", name = "nullius-boxed-cellulose-pyrolysis", localised_name = {"recipe-name.nullius-boxed", {"", {"recipe-name.nullius-pyrolysis", - {"item-name.nullius-cellulose"}}, " ", 1}}, + {"item-name.nullius-cellulose"}}, " ", tostring(1)}}, icons = { { icon = ICONPATH .. "crate.png", @@ -1927,11 +1946,11 @@ data:extend({ { icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { - icon = "__base__/graphics/decorative/brown-asterisk/hr-brown-asterisk-11.png", + icon = "__base__/graphics/decorative/brown-asterisk/brown-asterisk-11.png", icon_size = 54, scale = 0.29, shift = {-7, -7} @@ -1955,20 +1974,21 @@ data:extend({ type = "recipe", name = "nullius-cellulose-pyrolysis-2", localised_name = {"", {"recipe-name.nullius-pyrolysis", - {"item-name.nullius-cellulose"}}, " ", 2}, + {"item-name.nullius-cellulose"}}, " ", tostring(2)}, icons = { - { + { icon = ICONPATH .. "carbon-fiber.png", icon_size = 128 }, { - icon = "__base__/graphics/decorative/brown-asterisk/hr-brown-asterisk-11.png", + icon = "__base__/graphics/decorative/brown-asterisk/brown-asterisk-11.png", icon_size = 54, scale = 0.37, shift = {-7, -7} } - }, + }, enabled = false, + hide_from_signal_gui = false, category = "wet-smelting", subgroup = "biology-burning", order = "nullius-f", @@ -1987,7 +2007,7 @@ data:extend({ type = "recipe", name = "nullius-boxed-cellulose-pyrolysis-2", localised_name = {"recipe-name.nullius-boxed", {"", {"recipe-name.nullius-pyrolysis", - {"item-name.nullius-cellulose"}}, " ", 2}}, + {"item-name.nullius-cellulose"}}, " ", tostring(2)}}, icons = { { icon = ICONPATH .. "boxing.png", @@ -1999,7 +2019,7 @@ data:extend({ scale = 0.225 }, { - icon = "__base__/graphics/decorative/brown-asterisk/hr-brown-asterisk-11.png", + icon = "__base__/graphics/decorative/brown-asterisk/brown-asterisk-11.png", icon_size = 54, scale = 0.33, shift = {-6, -6} @@ -2028,17 +2048,16 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4 }, { icon = "__base__/graphics/icons/wood.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.3, shift = {-8, -7} } }, enabled = false, + hide_from_signal_gui = false, category = "combustion", subgroup = "biology-burning", order = "nullius-ca", @@ -2068,13 +2087,13 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { icon = "__base__/graphics/icons/wood.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.27, shift = {-7, -6} } @@ -2104,16 +2123,16 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4 }, { - icon = ICONPATH .. "wood-chip.png", + icon = ICONPATH .. "wood-chip.png", icon_size = 64, scale = 0.3, shift = {-8, -9} } }, enabled = false, + hide_from_signal_gui = false, category = "combustion", subgroup = "biology-burning", order = "nullius-cb", @@ -2143,7 +2162,7 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { @@ -2176,18 +2195,18 @@ data:extend({ localised_name = {"recipe-name.nullius-pyrolysis", {"item-name.nullius-wood-chip"}}, icons = { { - icon = "__base__/graphics/icons/coal-dark-background.png", + icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4 }, { - icon = ICONPATH .. "wood-chip.png", + icon = ICONPATH .. "wood-chip.png", icon_size = 64, scale = 0.3, shift = {-8, -9} } }, enabled = false, + hide_from_signal_gui = false, category = "wet-smelting", subgroup = "biology-burning", order = "nullius-cc", @@ -2212,13 +2231,12 @@ data:extend({ icon_size = 64 }, { - icon = "__base__/graphics/icons/coal-dark-background.png", + icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.45 }, { - icon = ICONPATH .. "wood-chip.png", + icon = ICONPATH .. "wood-chip.png", icon_size = 64, scale = 0.27, shift = {-7, -8} @@ -2229,7 +2247,7 @@ data:extend({ subgroup = "boxed-biology-burning", order = "nullius-cc", energy_required = 5, - ingredients = { + ingredients = { {type="item", name="nullius-box-wood-chip", amount=4}, {type="fluid", name="nullius-nitrogen", amount=175} }, @@ -2244,15 +2262,15 @@ data:extend({ enabled = false, category = "distillation", subgroup = "biology-burning", - order = "nullius-b", - crafting_machine_tint = { + order = "nullius-b", + crafting_machine_tint = { primary = data.raw.fluid["nullius-petroleum"].flow_color, secondary = data.raw.fluid["nullius-petroleum"].flow_color }, - energy_required = 15, + energy_required = 15, ingredients = { {type="item", name="nullius-graphite", amount=12}, - {type="item", name="nullius-rubber", amount=1}, + {type="item", name="nullius-rubber", amount=1}, {type="fluid", name="nullius-biodiesel", amount=10}, {type="fluid", name="nullius-compressed-nitrogen", amount=50} }, @@ -2269,15 +2287,15 @@ data:extend({ enabled = false, category = "distillation", subgroup = "boxed-biology-burning", - order = "nullius-b", - crafting_machine_tint = { + order = "nullius-b", + crafting_machine_tint = { primary = data.raw.fluid["nullius-petroleum"].flow_color, secondary = data.raw.fluid["nullius-petroleum"].flow_color }, energy_required = 75, ingredients = { {type="item", name="nullius-box-graphite", amount=12}, - {type="item", name="nullius-box-rubber", amount=1}, + {type="item", name="nullius-box-rubber", amount=1}, {type="fluid", name="nullius-biodiesel", amount=50}, {type="fluid", name="nullius-compressed-nitrogen", amount=250} }, @@ -2293,9 +2311,9 @@ data:extend({ name = "nullius-petroleum", enabled = false, category = "basic-chemistry", - subgroup = "biology-oil", + subgroup = "biology-oil", order = "nullius-e", - crafting_machine_tint = { + crafting_machine_tint = { primary = data.raw.fluid["nullius-petroleum"].flow_color, secondary = data.raw.fluid["nullius-petroleum"].flow_color }, @@ -2319,13 +2337,15 @@ data:extend({ category = "huge-assembly", energy_required = 300, ingredients = { - {"nullius-terraforming-drone-grey", 1}, - {"nullius-box-rocket-fuel", 20}, - {"nullius-box-coal", 30000}, - {"nullius-large-dispatch-chest-2", 1}, - {"nullius-large-miner-2", 4} + {type = "item", name = "nullius-terraforming-drone-grey", amount = 1}, + {type = "item", name = "nullius-box-rocket-fuel", amount = 20}, + {type = "item", name = "nullius-box-coal", amount = 30000}, + {type = "item", name = "nullius-large-dispatch-chest-2", amount = 1}, + {type = "item", name = "nullius-large-miner-2", amount = 4} }, - result = "nullius-sequestration-coal-drone" + results = { + {type = "item", name = "nullius-sequestration-coal-drone", amount = 1} + } }, { type = "recipe", @@ -2336,10 +2356,12 @@ data:extend({ category = "small-crafting", energy_required = 10, ingredients = { - {"nullius-terraforming-remote-grey", 1}, - {"nullius-yield-module-3", 1} + {type = "item", name = "nullius-terraforming-remote-grey", amount = 1}, + {type = "item", name = "nullius-yield-module-3", amount = 1} }, - result = "nullius-sequestration-coal-remote" + results = { + {type = "item", name = "nullius-sequestration-coal-remote", amount = 1} + } }, { type = "recipe", @@ -2354,7 +2376,7 @@ data:extend({ {type="item", name="nullius-petroleum-barrel", amount=10000}, {type="item", name="nullius-extractor-2", amount=3} }, - results = { + results = { {type="item", name="nullius-sequestration-petroleum-drone", amount=1}, {type="item", name="nullius-box-barrel", amount=1500} }, @@ -2369,10 +2391,12 @@ data:extend({ category = "small-crafting", energy_required = 10, ingredients = { - {"nullius-terraforming-remote-tan", 1}, - {"nullius-yield-module-3", 1} + {type = "item", name = "nullius-terraforming-remote-tan", amount = 1}, + {type = "item", name = "nullius-yield-module-3", amount = 1} }, - result = "nullius-sequestration-petroleum-remote" + results = { + {type = "item", name = "nullius-sequestration-petroleum-remote", amount = 1} + } }, { @@ -2382,7 +2406,7 @@ data:extend({ { icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.5 }, { @@ -2401,7 +2425,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/big-worm.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "biology-worm", order = "nullius-c", @@ -2413,7 +2437,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "biology-worm", order = "nullius-d", @@ -2431,7 +2455,7 @@ data:extend({ { icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.4 } }, @@ -2442,7 +2466,7 @@ data:extend({ { type = "recipe", name = "nullius-worm-genome", - localised_name = {"", {"item-name.nullius-worm-genome"}, " ", 1}, + localised_name = {"", {"item-name.nullius-worm-genome"}, " ", tostring(1)}, enabled = false, category = "nanotechnology", energy_required = 40, @@ -2461,13 +2485,12 @@ data:extend({ { type = "recipe", name = "nullius-worm-genome-2", - localised_name = {"", {"item-name.nullius-worm-genome"}, " ", 2}, - icons = { + localised_name = {"", {"item-name.nullius-worm-genome"}, " ", tostring(2)}, + icons = { { - icon = "__base__/graphics/icons/small-worm.png", + icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.5 + scale = 0.5 }, { icon = ICONPATH .. "genome.png", @@ -2475,20 +2498,20 @@ data:extend({ scale = 0.4, shift = {-3, 2} }, - { + { icon = "__base__/graphics/icons/military-science-pack.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.3, + scale = 0.3, shift = {9, -8}, tint = {0.75, 0.72, 0.78} } }, enabled = false, - show_amount_in_title = false, + show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "nanotechnology", - order = "nullius-bc", + order = "nullius-bc", energy_required = 60, ingredients = { {type="fluid", name="nullius-nucleotides", amount=25, fluidbox_index=1}, @@ -2506,10 +2529,10 @@ data:extend({ { type = "recipe", name = "nullius-worm-progenitor", - localised_name = {"", {"item-name.nullius-worm-progenitor"}, " ", 1}, + localised_name = {"", {"item-name.nullius-worm-progenitor"}, " ", tostring(1)}, enabled = false, category = "nanotechnology", - order = "nullius-cb", + order = "nullius-cb", energy_required = 240, ingredients = { {type="item", name="nullius-worm-genome", amount=1}, @@ -2527,24 +2550,23 @@ data:extend({ { type = "recipe", name = "nullius-worm-progenitor-2", - localised_name = {"", {"item-name.nullius-worm-progenitor"}, " ", 2}, - icons = { - { - icon = "__base__/graphics/icons/big-worm.png", + localised_name = {"", {"item-name.nullius-worm-progenitor"}, " ", tostring(2)}, + icons = { + { + icon = "__base__/graphics/icons/big-worm.png", icon_size = 64, - icon_mipmaps = 4 }, - { - icon = "__base__/graphics/icons/small-worm.png", + { + icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.3, + scale = 0.3, shift = {-10, -9} } - }, + }, enabled = false, + hide_from_signal_gui = false, category = "nanotechnology", - order = "nullius-cc", + order = "nullius-cc", energy_required = 420, ingredients = { {type="item", name="nullius-worm-genome", amount=1}, @@ -2564,12 +2586,11 @@ data:extend({ { type = "recipe", name = "nullius-worm-1", - localised_name = {"", {"item-name.nullius-worm"}, " ", 1}, + localised_name = {"", {"item-name.nullius-worm"}, " ", tostring(1)}, icons = { { icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4 }, { icon = ICONPATH .. "protocell.png", @@ -2593,7 +2614,7 @@ data:extend({ results = { {type="item", name="nullius-worm", amount=1}, {type="item", name="nullius-worm-egg", amount=2}, - {type="item", name="nullius-mineral-dust", amount=1}, + {type="item", name="nullius-mineral-dust", amount=1}, {type="fluid", name="nullius-carbon-dioxide", amount=125, fluidbox_index=1} }, main_product = "nullius-worm" @@ -2601,9 +2622,10 @@ data:extend({ { type = "recipe", name = "nullius-worm-2", - localised_name = {"", {"item-name.nullius-worm"}, " ", 2}, + localised_name = {"", {"item-name.nullius-worm"}, " ", tostring(2)}, enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "ore-flotation", order = "nullius-dc", energy_required = 60, @@ -2617,7 +2639,7 @@ data:extend({ results = { {type="item", name="nullius-worm", amount=8}, {type="item", name="nullius-worm-egg", amount=12}, - {type="item", name="nullius-mineral-dust", amount=5}, + {type="item", name="nullius-mineral-dust", amount=5}, {type="fluid", name="nullius-carbon-dioxide", amount=400, fluidbox_index=1} }, main_product = "nullius-worm" @@ -2625,22 +2647,22 @@ data:extend({ { type = "recipe", name = "nullius-worm-3", - localised_name = {"", {"item-name.nullius-worm"}, " ", 3}, - icons = { - { - icon = "__base__/graphics/icons/small-worm.png", + localised_name = {"", {"item-name.nullius-worm"}, " ", tostring(3)}, + icons = { + { + icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4 }, - { + { icon = ICONPATH .. "genome.png", icon_size = 64, - scale = 0.3, + scale = 0.3, shift = {-10, -9} } - }, + }, enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "ore-flotation", order = "nullius-dd", energy_required = 55, @@ -2654,7 +2676,7 @@ data:extend({ results = { {type="item", name="nullius-worm", amount=9}, {type="item", name="nullius-worm-egg", amount=13}, - {type="item", name="nullius-mineral-dust", amount=6}, + {type="item", name="nullius-mineral-dust", amount=6}, {type="fluid", name="nullius-carbon-dioxide", amount=450, fluidbox_index=1} }, main_product = "nullius-worm" @@ -2662,10 +2684,9 @@ data:extend({ { type = "recipe", name = "nullius-legacy-worm-2", - localised_name = {"", {"item-name.nullius-worm"}, " ", 2}, + localised_name = {"", {"item-name.nullius-worm"}, " ", tostring(2)}, enabled = false, - allow_decomposition = false, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, category = "ore-flotation", @@ -2688,23 +2709,22 @@ data:extend({ { type = "recipe", name = "nullius-legacy-worm-3", - localised_name = {"", {"item-name.nullius-worm"}, " ", 3}, - icons = { - { - icon = "__base__/graphics/icons/small-worm.png", + localised_name = {"", {"item-name.nullius-worm"}, " ", tostring(3)}, + icons = { + { + icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4 }, - { + { icon = ICONPATH .. "genome.png", icon_size = 64, - scale = 0.3, + scale = 0.3, shift = {-10, -9} } - }, + }, enabled = false, allow_decomposition = false, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, category = "ore-flotation", @@ -2735,7 +2755,6 @@ data:extend({ { icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.4, shift = {-8, -4} } @@ -2744,6 +2763,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "distillation", subgroup = "biology-worm", order = "nullius-fb", @@ -2767,14 +2787,12 @@ data:extend({ localised_name = {"recipe-name.nullius-disposal", {"item-name.nullius-worm"}}, icons = { { - icon = "__base__/graphics/icons/small-worm-corpse.png", + icon = "__base__/graphics/icons/small-worm-corpse.png", icon_size = 64, - icon_mipmaps = 4 }, { icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.3, shift = {-9, -6} } @@ -2784,7 +2802,7 @@ data:extend({ show_amount_in_title = false, always_show_products = true, category = "bio-harvesting", - subgroup = "biology-disposal", + subgroup = "biology-disposal", order = "nullius-db", energy_required = 1, ingredients = { @@ -2813,7 +2831,6 @@ data:extend({ { icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.32, shift = {-8, -7} } @@ -2822,6 +2839,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "distillation", subgroup = "biology-worm", order = "nullius-gb", @@ -2857,7 +2875,7 @@ data:extend({ { icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.32, shift = {-8, -7} } @@ -2866,7 +2884,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, category = "distillation", @@ -2904,7 +2922,6 @@ data:extend({ { icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.32, shift = {-8, -7} } @@ -2913,8 +2930,9 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "bio-harvesting", - subgroup = "biology-disposal", + subgroup = "biology-disposal", order = "nullius-dc", energy_required = 1, ingredients = { @@ -2933,7 +2951,7 @@ data:extend({ { icon = "__base__/graphics/icons/tree-08.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.5 }, { @@ -2952,7 +2970,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/tree-08-red.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "biology-tree", order = "nullius-c", @@ -2964,7 +2982,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/tree-08.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "biology-tree", order = "nullius-d", @@ -2982,7 +3000,7 @@ data:extend({ { icon = "__base__/graphics/icons/tree-08.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.35, } }, @@ -2996,7 +3014,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/wood.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "biology-tree", order = "nullius-fb", @@ -3016,7 +3034,7 @@ data:extend({ { type = "recipe", name = "nullius-tree-genome", - localised_name = {"", {"item-name.nullius-tree-genome"}, " ", 1}, + localised_name = {"", {"item-name.nullius-tree-genome"}, " ", tostring(1)}, enabled = false, category = "nanotechnology", energy_required = 60, @@ -3034,13 +3052,12 @@ data:extend({ { type = "recipe", name = "nullius-tree-genome-2", - localised_name = {"", {"item-name.nullius-tree-genome"}, " ", 2}, - icons = { + localised_name = {"", {"item-name.nullius-tree-genome"}, " ", tostring(2)}, + icons = { { - icon = "__base__/graphics/icons/tree-08.png", + icon = "__base__/graphics/icons/tree-08.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.5 + scale = 0.5 }, { icon = ICONPATH .. "genome.png", @@ -3048,21 +3065,21 @@ data:extend({ scale = 0.4, shift = {-3, 2} }, - { + { icon = "__base__/graphics/icons/military-science-pack.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.3, + scale = 0.3, shift = {9, -8}, tint = {0.75, 0.72, 0.78} } }, enabled = false, - show_amount_in_title = false, + show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "nanotechnology", - order = "nullius-bc", - energy_required = 40, + order = "nullius-bc", + energy_required = 40, ingredients = { {type="fluid", name="nullius-nucleotides", amount=5, fluidbox_index=1}, {type="item", name="nullius-grass-genome", amount=1}, @@ -3078,10 +3095,10 @@ data:extend({ { type = "recipe", name = "nullius-tree-progenitor", - localised_name = {"", {"item-name.nullius-tree-progenitor"}, " ", 1}, + localised_name = {"", {"item-name.nullius-tree-progenitor"}, " ", tostring(1)}, enabled = false, category = "nanotechnology", - order = "nullius-cb", + order = "nullius-cb", energy_required = 270, ingredients = { {type="item", name="nullius-tree-genome", amount=1}, @@ -3101,24 +3118,23 @@ data:extend({ { type = "recipe", name = "nullius-tree-progenitor-2", - localised_name = {"", {"item-name.nullius-tree-progenitor"}, " ", 2}, - icons = { - { - icon = "__base__/graphics/icons/tree-08-red.png", + localised_name = {"", {"item-name.nullius-tree-progenitor"}, " ", tostring(2)}, + icons = { + { + icon = "__base__/graphics/icons/tree-08-red.png", icon_size = 64, - icon_mipmaps = 4 }, - { - icon = "__base__/graphics/icons/tree-08.png", + { + icon = "__base__/graphics/icons/tree-08.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.3, + scale = 0.3, shift = {-10, -10} } - }, + }, enabled = false, + hide_from_signal_gui = false, category = "nanotechnology", - order = "nullius-cc", + order = "nullius-cc", energy_required = 420, ingredients = { {type="item", name="nullius-tree-genome", amount=1}, @@ -3127,7 +3143,7 @@ data:extend({ {type="fluid", name="nullius-oil", amount=15}, {type="item", name="nullius-rubber", amount=3}, {type="item", name="nullius-cellulose", amount=25}, - {type="item", name="nullius-tree", amount=4}, + {type="item", name="nullius-tree", amount=4}, {type="item", name="nullius-tree-seed", amount=6} }, results = { @@ -3139,12 +3155,12 @@ data:extend({ { type = "recipe", name = "nullius-tree-1", - localised_name = {"", {"item-name.nullius-tree"}, " ", 1}, + localised_name = {"", {"item-name.nullius-tree"}, " ", tostring(1)}, icons = { { icon = "__base__/graphics/icons/tree-08.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "protocell.png", @@ -3175,9 +3191,10 @@ data:extend({ { type = "recipe", name = "nullius-tree-2", - localised_name = {"", {"item-name.nullius-tree"}, " ", 2}, + localised_name = {"", {"item-name.nullius-tree"}, " ", tostring(2)}, enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "nullius-water-treatment", order = "nullius-dc", energy_required = 110, @@ -3199,22 +3216,22 @@ data:extend({ { type = "recipe", name = "nullius-tree-3", - localised_name = {"", {"item-name.nullius-tree"}, " ", 3}, - icons = { - { - icon = "__base__/graphics/icons/tree-08.png", + localised_name = {"", {"item-name.nullius-tree"}, " ", tostring(3)}, + icons = { + { + icon = "__base__/graphics/icons/tree-08.png", icon_size = 64, - icon_mipmaps = 4 }, - { + { icon = ICONPATH .. "genome.png", icon_size = 64, - scale = 0.3, + scale = 0.3, shift = {-10, -9} } - }, + }, enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "nullius-water-treatment", order = "nullius-dd", energy_required = 100, @@ -3289,12 +3306,12 @@ data:extend({ { icon = "__base__/graphics/icons/tree-08.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.3, shift = {-8, -8} } }, enabled = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "biology-tree", order = "nullius-fc", @@ -3332,7 +3349,7 @@ data:extend({ { icon = "__base__/graphics/icons/tree-08.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.27, shift = {-7, -7} } @@ -3370,7 +3387,6 @@ data:extend({ { icon = "__base__/graphics/icons/wood.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.33, shift = {-8, -4} } @@ -3380,19 +3396,20 @@ data:extend({ show_amount_in_title = false, always_show_products = true, category = "bio-harvesting", - subgroup = "biology-material", + subgroup = "biology-material", order = "nullius-cd", energy_required = 1, ingredients = { {type="item", name="nullius-wood", amount=2} }, - result = "nullius-wood-chip", - result_count = 3 + results = { + {type = "item", name = "nullius-wood-chip", amount = 3} + } }, { type = "recipe", name = "nullius-boxed-wood-chipping", - localised_name = {"recipe-name.nullius-boxed", {"recipe-name.nullius-wood-chipping"}}, + localised_name = {"recipe-name.nullius-boxed", {"recipe-name.nullius-wood-chipping"}}, icons = { { icon = ICONPATH .. "crate.png", @@ -3401,12 +3418,11 @@ data:extend({ { icon = ICONPATH .. "wood-chip.png", icon_size = 64, - scale = 0.45 + scale = 0.45 }, { icon = "__base__/graphics/icons/wood.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.3, shift = {-7, -4} } @@ -3422,8 +3438,9 @@ data:extend({ ingredients = { {type="item", name="nullius-box-wood", amount=2} }, - result = "nullius-box-wood-chip", - result_count = 3 + results = { + {type = "item", name = "nullius-box-wood-chip", amount = 3} + } }, { type = "recipe", @@ -3445,16 +3462,17 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - allow_decomposition = false, + allow_decomposition = false, allow_as_intermediate = false, - no_productivity = true, + no_productivity = true, + hide_from_signal_gui = false, category = "machine-casting", - subgroup = "woodworking", + subgroup = "woodworking", order = "nullius-p", energy_required = 10, ingredients = { {type="item", name="nullius-wood-chip", amount=26}, - {type="fluid", name="nullius-epoxy", amount=5} + {type="fluid", name="nullius-epoxy", amount=5} }, results = { {type="item", name="nullius-wood", amount=20}, @@ -3475,7 +3493,7 @@ data:extend({ { icon = "__nullius__/graphics/icons/wood-panel.png", icon_size = 128, - scale = 0.23 + scale = 0.23 }, { icon = ICONPATH .. "wood-chip.png", @@ -3488,11 +3506,11 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - allow_decomposition = false, + allow_decomposition = false, allow_as_intermediate = false, - no_productivity = true, + no_productivity = true, category = "machine-casting", - subgroup = "boxed-wood", + subgroup = "boxed-wood", order = "nullius-wp", energy_required = 50, ingredients = { @@ -3511,7 +3529,7 @@ data:extend({ localised_name = {"recipe-name.nullius-wood-pulping"}, icons = { { - icon = "__base__/graphics/decorative/brown-asterisk/hr-brown-asterisk-11.png", + icon = "__base__/graphics/decorative/brown-asterisk/brown-asterisk-11.png", icon_size = 54 }, { @@ -3525,6 +3543,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "distillation", subgroup = "biology-material", order = "nullius-cc", @@ -3551,7 +3570,7 @@ data:extend({ icon_size = 64 }, { - icon = "__base__/graphics/decorative/brown-asterisk/hr-brown-asterisk-11.png", + icon = "__base__/graphics/decorative/brown-asterisk/brown-asterisk-11.png", icon_size = 54, scale = 0.53 }, @@ -3588,7 +3607,7 @@ data:extend({ localised_name = {"recipe-name.nullius-harvest", {"item-name.nullius-tree-seed"}}, icons = { { - icon = "__base__/graphics/decorative/brown-asterisk/hr-brown-asterisk-11.png", + icon = "__base__/graphics/decorative/brown-asterisk/brown-asterisk-11.png", icon_size = 54 }, { @@ -3601,7 +3620,6 @@ data:extend({ { icon = "__base__/graphics/icons/tree-08.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.28, shift = {-8, -7} } @@ -3610,6 +3628,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "bio-harvesting", subgroup = "biology-tree", order = "nullius-i", @@ -3631,7 +3650,7 @@ data:extend({ { icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.5 }, { @@ -3650,7 +3669,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.75, 0.9, 1} }}, subgroup = "biology-fish", @@ -3663,7 +3682,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "biology-fish", order = "nullius-d", @@ -3681,7 +3700,7 @@ data:extend({ { icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.32, tint = {1, 1, 1, 0.9} } @@ -3693,7 +3712,7 @@ data:extend({ { type = "recipe", name = "nullius-fish-genome", - localised_name = {"", {"item-name.nullius-fish-genome"}, " ", 1}, + localised_name = {"", {"item-name.nullius-fish-genome"}, " ", tostring(1)}, enabled = false, category = "nanotechnology", energy_required = 60, @@ -3711,13 +3730,12 @@ data:extend({ { type = "recipe", name = "nullius-fish-genome-2", - localised_name = {"", {"item-name.nullius-fish-genome"}, " ", 2}, - icons = { + localised_name = {"", {"item-name.nullius-fish-genome"}, " ", tostring(2)}, + icons = { { - icon = "__base__/graphics/icons/fish.png", + icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.5 + scale = 0.5 }, { icon = ICONPATH .. "genome.png", @@ -3725,21 +3743,21 @@ data:extend({ scale = 0.4, shift = {-3, 2} }, - { + { icon = "__base__/graphics/icons/military-science-pack.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.3, + scale = 0.3, shift = {9, -8}, tint = {0.75, 0.72, 0.78} } }, enabled = false, - show_amount_in_title = false, + show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "nanotechnology", - order = "nullius-bc", - energy_required = 40, + order = "nullius-bc", + energy_required = 40, ingredients = { {type="fluid", name="nullius-nucleotides", amount=6, fluidbox_index=1}, {type="item", name="nullius-worm-genome", amount=1}, @@ -3755,10 +3773,10 @@ data:extend({ { type = "recipe", name = "nullius-fish-progenitor", - localised_name = {"", {"item-name.nullius-fish-progenitor"}, " ", 1}, + localised_name = {"", {"item-name.nullius-fish-progenitor"}, " ", tostring(1)}, enabled = false, category = "nanotechnology", - order = "nullius-cb", + order = "nullius-cb", energy_required = 300, ingredients = { {type="item", name="nullius-fish-genome", amount=1}, @@ -3777,25 +3795,24 @@ data:extend({ { type = "recipe", name = "nullius-fish-progenitor-2", - localised_name = {"", {"item-name.nullius-fish-progenitor"}, " ", 2}, - icons = { - { - icon = "__base__/graphics/icons/fish.png", + localised_name = {"", {"item-name.nullius-fish-progenitor"}, " ", tostring(2)}, + icons = { + { + icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4, tint = {0.75, 0.9, 1} }, - { - icon = "__base__/graphics/icons/fish.png", + { + icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.3, + scale = 0.3, shift = {-10, -10} } - }, + }, enabled = false, + hide_from_signal_gui = false, category = "nanotechnology", - order = "nullius-cc", + order = "nullius-cc", energy_required = 540, ingredients = { {type="item", name="nullius-fish-genome", amount=1}, @@ -3804,7 +3821,7 @@ data:extend({ {type="fluid", name="nullius-oil", amount=50}, {type="item", name="nullius-calcium", amount=2}, {type="item", name="nullius-sugar", amount=10}, - {type="item", name="nullius-fish", amount=5}, + {type="item", name="nullius-fish", amount=5}, {type="item", name="nullius-fish-egg", amount=12} }, results = { @@ -3816,12 +3833,12 @@ data:extend({ { type = "recipe", name = "nullius-fish-1", - localised_name = {"", {"item-name.nullius-fish"}, " ", 1}, + localised_name = {"", {"item-name.nullius-fish"}, " ", tostring(1)}, icons = { { icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "protocell.png", @@ -3853,9 +3870,10 @@ data:extend({ { type = "recipe", name = "nullius-fish-2", - localised_name = {"", {"item-name.nullius-fish"}, " ", 2}, + localised_name = {"", {"item-name.nullius-fish"}, " ", tostring(2)}, enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "ore-flotation", order = "nullius-dc", energy_required = 90, @@ -3877,22 +3895,22 @@ data:extend({ { type = "recipe", name = "nullius-fish-3", - localised_name = {"", {"item-name.nullius-fish"}, " ", 3}, - icons = { - { - icon = "__base__/graphics/icons/fish.png", + localised_name = {"", {"item-name.nullius-fish"}, " ", tostring(3)}, + icons = { + { + icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4 }, - { + { icon = ICONPATH .. "genome.png", icon_size = 64, - scale = 0.3, + scale = 0.3, shift = {-10, -9} } - }, + }, enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "ore-flotation", order = "nullius-dd", energy_required = 80, @@ -3920,7 +3938,7 @@ data:extend({ { icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.3, shift = {-8, -8} } @@ -3929,6 +3947,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "distillation", subgroup = "biology-fish", order = "nullius-fb", @@ -3958,7 +3977,7 @@ data:extend({ { icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.3, shift = {-8, -8} } @@ -3967,8 +3986,9 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "bio-harvesting", - subgroup = "biology-disposal", + subgroup = "biology-disposal", order = "nullius-eb", energy_required = 1, ingredients = { @@ -3995,7 +4015,6 @@ data:extend({ { icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.25, tint = {1, 1, 1, 0.9}, shift = {-8, -7} @@ -4005,6 +4024,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "distillation", subgroup = "biology-fish", order = "nullius-gb", @@ -4038,7 +4058,7 @@ data:extend({ { icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.25, tint = {1, 1, 1, 0.9}, shift = {-8, -7} @@ -4048,7 +4068,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, category = "distillation", @@ -4086,7 +4106,6 @@ data:extend({ { icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.25, tint = {1, 1, 1, 0.9}, shift = {-8, -7} @@ -4096,8 +4115,9 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "bio-harvesting", - subgroup = "biology-disposal", + subgroup = "biology-disposal", order = "nullius-ec", energy_required = 1, ingredients = { @@ -4129,8 +4149,9 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "nullius-water-treatment", - subgroup = "biology-disposal", + subgroup = "biology-disposal", order = "nullius-b", energy_required = 2, ingredients = { @@ -4151,7 +4172,7 @@ data:extend({ { icon = "__base__/graphics/icons/small-biter.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.5 }, { @@ -4170,7 +4191,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/big-biter.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "biology-arthropod", order = "nullius-c", @@ -4182,7 +4203,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/small-biter.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "biology-arthropod", order = "nullius-d", @@ -4200,7 +4221,7 @@ data:extend({ { icon = "__base__/graphics/icons/small-biter.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.35, tint = {1, 1, 1, 0.9} } @@ -4231,10 +4252,10 @@ data:extend({ { type = "recipe", name = "nullius-arthropod-progenitor", - localised_name = {"", {"item-name.nullius-arthropod-progenitor"}, " ", 1}, + localised_name = {"", {"item-name.nullius-arthropod-progenitor"}, " ", tostring(1)}, enabled = false, category = "nanotechnology", - order = "nullius-cb", + order = "nullius-cb", energy_required = 360, ingredients = { {type="item", name="nullius-arthropod-genome", amount=1}, @@ -4255,24 +4276,23 @@ data:extend({ { type = "recipe", name = "nullius-arthropod-progenitor-2", - localised_name = {"", {"item-name.nullius-arthropod-progenitor"}, " ", 2}, - icons = { - { - icon = "__base__/graphics/icons/big-biter.png", + localised_name = {"", {"item-name.nullius-arthropod-progenitor"}, " ", tostring(2)}, + icons = { + { + icon = "__base__/graphics/icons/big-biter.png", icon_size = 64, - icon_mipmaps = 4 }, - { - icon = "__base__/graphics/icons/small-biter.png", + { + icon = "__base__/graphics/icons/small-biter.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.3, + scale = 0.3, shift = {-9, -10} } - }, + }, enabled = false, + hide_from_signal_gui = false, category = "nanotechnology", - order = "nullius-cc", + order = "nullius-cc", energy_required = 640, ingredients = { {type="item", name="nullius-arthropod-genome", amount=1}, @@ -4282,7 +4302,7 @@ data:extend({ {type="item", name="nullius-plastic", amount=3}, {type="item", name="nullius-graphene", amount=1}, {type="item", name="nullius-sugar", amount=8}, - {type="item", name="nullius-arthropod", amount=6}, + {type="item", name="nullius-arthropod", amount=6}, {type="item", name="nullius-arthropod-egg", amount=15} }, results = { @@ -4294,12 +4314,11 @@ data:extend({ { type = "recipe", name = "nullius-arthropod-1", - localised_name = {"", {"item-name.nullius-arthropod"}, " ", 1}, + localised_name = {"", {"item-name.nullius-arthropod"}, " ", tostring(1)}, icons = { { icon = "__base__/graphics/icons/small-biter.png", icon_size = 64, - icon_mipmaps = 4 }, { icon = ICONPATH .. "protocell.png", @@ -4334,9 +4353,10 @@ data:extend({ { type = "recipe", name = "nullius-arthropod-2", - localised_name = {"", {"item-name.nullius-arthropod"}, " ", 2}, + localised_name = {"", {"item-name.nullius-arthropod"}, " ", tostring(2)}, enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "nullius-water-treatment", order = "nullius-dc", energy_required = 100, @@ -4361,22 +4381,22 @@ data:extend({ { type = "recipe", name = "nullius-arthropod-3", - localised_name = {"", {"item-name.nullius-arthropod"}, " ", 3}, - icons = { - { - icon = "__base__/graphics/icons/small-biter.png", + localised_name = {"", {"item-name.nullius-arthropod"}, " ", tostring(3)}, + icons = { + { + icon = "__base__/graphics/icons/small-biter.png", icon_size = 64, - icon_mipmaps = 4 }, - { + { icon = ICONPATH .. "genome.png", icon_size = 64, - scale = 0.3, + scale = 0.3, shift = {-10, -9} } - }, + }, enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "nullius-water-treatment", order = "nullius-dd", energy_required = 95, @@ -4411,7 +4431,7 @@ data:extend({ { icon = "__base__/graphics/icons/small-biter.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.3, shift = {-8, -8} } @@ -4420,6 +4440,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "distillation", subgroup = "biology-arthropod", order = "nullius-fb", @@ -4457,7 +4478,7 @@ data:extend({ { icon = "__base__/graphics/icons/small-biter.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.27, shift = {-7, -7} } @@ -4493,12 +4514,12 @@ data:extend({ { icon = "__base__/graphics/icons/small-biter-corpse.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/small-biter.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.3, shift = {-9, -9} } @@ -4508,7 +4529,7 @@ data:extend({ show_amount_in_title = false, always_show_products = true, category = "bio-harvesting", - subgroup = "biology-disposal", + subgroup = "biology-disposal", order = "nullius-fb", energy_required = 4, ingredients = { @@ -4534,13 +4555,13 @@ data:extend({ { icon = "__base__/graphics/icons/small-biter-corpse.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { icon = "__base__/graphics/icons/small-biter.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.27, shift = {-8, -8} } @@ -4582,7 +4603,6 @@ data:extend({ { icon = "__base__/graphics/icons/small-biter.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.28, tint = {1, 1, 1, 0.9}, shift = {-8, -7} @@ -4592,6 +4612,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "distillation", subgroup = "biology-arthropod", order = "nullius-gb", @@ -4628,7 +4649,7 @@ data:extend({ { icon = "__base__/graphics/icons/small-biter.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.28, tint = {1, 1, 1, 0.9}, shift = {-8, -7} @@ -4638,7 +4659,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, category = "distillation", @@ -4677,7 +4698,7 @@ data:extend({ { icon = "__base__/graphics/icons/small-biter.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.28, tint = {1, 1, 1, 0.9}, shift = {-8, -7} @@ -4687,8 +4708,9 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "bio-harvesting", - subgroup = "biology-disposal", + subgroup = "biology-disposal", order = "nullius-fc", energy_required = 1, ingredients = { @@ -4708,17 +4730,16 @@ data:extend({ { icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4 }, { icon = "__base__/graphics/icons/plastic-bar.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.3, shift = {-8, -8} } }, enabled = false, + hide_from_signal_gui = false, category = "wet-smelting", subgroup = "biology-burning", order = "nullius-pb", @@ -4740,7 +4761,7 @@ data:extend({ { icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "rubber.png", @@ -4750,6 +4771,7 @@ data:extend({ } }, enabled = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "biology-burning", order = "nullius-pc", @@ -4778,20 +4800,20 @@ data:extend({ { icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { icon = "__base__/graphics/icons/plastic-bar.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.27, shift = {-7, -7} } }, enabled = false, category = "bulk-smelting", - subgroup = "boxed-biology-burning", + subgroup = "boxed-biology-burning", order = "nullius-p", energy_required = 1, ingredients = { @@ -4815,13 +4837,13 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/light-oil.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.25, shift = {-8, -8} } }, enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "combustion", subgroup = "biology-oil", order = "nullius-ib", @@ -4833,11 +4855,11 @@ data:extend({ results = { {type="fluid", name="nullius-compressed-carbon-monoxide", amount=100}, {type="fluid", name="nullius-compressed-carbon-dioxide", amount=75}, - {type="item", name="nullius-graphite", amount=1} + {type="item", name="nullius-graphite", amount=1} }, main_product = "nullius-compressed-carbon-monoxide" }, - { + { -- todo: wtf same recipe twice type = "recipe", name = "nullius-oil-incineration", localised_name = {"recipe-name.nullius-incineration", {"fluid-name.nullius-oil"}}, @@ -4849,13 +4871,14 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/light-oil.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.25, shift = {-8, -8} } }, enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "combustion", subgroup = "biology-oil", order = "nullius-i", @@ -4867,7 +4890,7 @@ data:extend({ results = { {type="fluid", name="nullius-compressed-carbon-monoxide", amount=100}, {type="fluid", name="nullius-compressed-carbon-dioxide", amount=75}, - {type="item", name="nullius-graphite", amount=1} + {type="item", name="nullius-graphite", amount=1} }, main_product = "nullius-compressed-carbon-monoxide" }, @@ -4880,8 +4903,7 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.6 + scale = 0.6 }, data.raw.fluid["nullius-fatty-acids"].icons[2], data.raw.fluid["nullius-fatty-acids"].icons[3], @@ -4889,6 +4911,7 @@ data:extend({ }, enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "combustion", subgroup = "biology-oil", order = "nullius-ic", @@ -4898,7 +4921,7 @@ data:extend({ {type="fluid", name="nullius-compressed-oxygen", amount=60} }, results = { - {type="fluid", name="nullius-steam", amount=300}, + {type="fluid", name="nullius-steam", amount=300}, {type="fluid", name="nullius-compressed-carbon-dioxide", amount=60} } }, @@ -4910,7 +4933,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/wooden-chest.png", icon_size = 64, - icon_mipmaps = 4 + }}, enabled = false, always_show_made_in = true, @@ -4940,7 +4963,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/small-electric-pole.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.75, 0.75, 0.9} }}, enabled = false, @@ -4953,11 +4976,12 @@ data:extend({ order = "nullius-cb", energy_required = 3, ingredients = { - {"nullius-aluminum-wire", 2}, - {"nullius-wood", 1} + {type = "item", name = "nullius-aluminum-wire", amount = 2}, + {type = "item", name = "nullius-wood", amount = 1} }, - result = "small-electric-pole", - result_count = 2 + results = { + {type = "item", name = "small-electric-pole", amount = 2} + } }, { type = "recipe", @@ -4971,7 +4995,7 @@ data:extend({ { icon = "__base__/graphics/icons/small-electric-pole.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.75, 0.75, 0.9}, scale = 0.45 } @@ -4985,11 +5009,12 @@ data:extend({ order = "nullius-wbb", energy_required = 15, ingredients = { - {"nullius-box-aluminum-wire", 2}, - {"nullius-box-wood", 1} + {type = "item", name = "nullius-box-aluminum-wire", amount = 2}, + {type = "item", name = "nullius-box-wood", amount = 1} }, - result = "nullius-box-power-pole-1", - result_count = 2 + results = { + {type = "item", name = "nullius-box-power-pole-1", amount = 2} + } }, { type = "recipe", @@ -4998,7 +5023,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/small-electric-pole.png", icon_size = 64, - icon_mipmaps = 4, + tint = {1, 0.85, 0.85} }}, enabled = false, @@ -5006,6 +5031,7 @@ data:extend({ show_amount_in_title = false, always_show_products = true, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "large-fluid-assembly", subgroup = "woodworking", order = "nullius-cc", @@ -5034,7 +5060,7 @@ data:extend({ { icon = "__base__/graphics/icons/small-electric-pole.png", icon_size = 64, - icon_mipmaps = 4, + tint = {1, 0.85, 0.85}, scale = 0.45 } @@ -5068,12 +5094,10 @@ data:extend({ { icon = "__base__/graphics/icons/rail.png", icon_size = 64, - icon_mipmaps = 4 }, { icon = "__base__/graphics/icons/wood.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.3, shift = {-8, -8} } @@ -5083,6 +5107,7 @@ data:extend({ show_amount_in_title = false, always_show_products = true, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "large-crafting", subgroup = "woodworking", order = "nullius-d", @@ -5094,8 +5119,9 @@ data:extend({ {type="item", name="nullius-gravel", amount=6}, {type="fluid", name="nullius-epoxy", amount=1} }, - result = "rail", - result_count = 5 + results = { + {type = "item", name = "rail", amount = 5} + } }, { type = "recipe", @@ -5109,13 +5135,13 @@ data:extend({ { icon = "__base__/graphics/icons/rail.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { icon = "__base__/graphics/icons/wood.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.27, shift = {-7, -7} } @@ -5135,8 +5161,9 @@ data:extend({ {type="item", name="nullius-box-gravel", amount=6}, {type="fluid", name="nullius-epoxy", amount=5} }, - result = "nullius-box-rail", - result_count = 5 + results = { + {type = "item", name = "nullius-box-rail", amount = 5} + } }, { type = "recipe", @@ -5146,12 +5173,12 @@ data:extend({ { icon = "__base__/graphics/icons/wall.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/wood.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.3, shift = {-8, -8} } @@ -5161,6 +5188,7 @@ data:extend({ show_amount_in_title = false, always_show_products = true, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "large-crafting", subgroup = "woodworking", order = "nullius-ec", @@ -5192,13 +5220,13 @@ data:extend({ { icon = "__base__/graphics/icons/wall.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { icon = "__base__/graphics/icons/wood.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.27, shift = {-7, -7} } @@ -5240,14 +5268,14 @@ data:extend({ show_amount_in_title = false, always_show_products = true, category = "medium-assembly", - subgroup = "woodworking", + subgroup = "woodworking", order = "nullius-eb", energy_required = 8, ingredients = { - {"nullius-steel-wire", 1}, - {"nullius-gypsum", 2}, - {"nullius-wood", 4}, - {"nullius-textile", 1} + {type = "item", name = "nullius-steel-wire", amount = 1}, + {type = "item", name = "nullius-gypsum", amount = 2}, + {type = "item", name = "nullius-wood", amount = 4}, + {type = "item", name = "nullius-textile", amount = 1} }, results = { {type="item", name="nullius-insulation", amount=3}, @@ -5274,14 +5302,14 @@ data:extend({ show_amount_in_title = false, always_show_products = true, category = "huge-assembly", - subgroup = "boxed-wood", + subgroup = "boxed-wood", order = "nullius-wdb", energy_required = 40, ingredients = { - {"nullius-box-steel-wire", 1}, - {"nullius-box-gypsum", 2}, - {"nullius-box-wood", 4}, - {"nullius-box-textile", 1} + {type = "item", name = "nullius-box-steel-wire", amount = 1}, + {type = "item", name = "nullius-box-gypsum", amount = 2}, + {type = "item", name = "nullius-box-wood", amount = 4}, + {type = "item", name = "nullius-box-textile", amount = 1} }, results = { {type="item", name="nullius-box-insulation", amount=3}, @@ -5298,7 +5326,6 @@ data:extend({ { icon = "__base__/graphics/icons/wood.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.3, shift = {-8, -8} } @@ -5308,13 +5335,14 @@ data:extend({ show_amount_in_title = false, always_show_products = true, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "large-crafting", subgroup = "woodworking", order = "nullius-f", energy_required = 15, ingredients = { - {"nullius-small-assembler-1", 5}, - {"nullius-wood", 4} + {type = "item", name = "nullius-small-assembler-1", amount = 5}, + {type = "item", name = "nullius-wood", amount = 4} }, results = { {type="item", name="nullius-medium-assembler-1", amount=3}, @@ -5331,7 +5359,7 @@ data:extend({ { icon = "__base__/graphics/icons/wood.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.3, shift = {-8, -8} } @@ -5341,13 +5369,14 @@ data:extend({ show_amount_in_title = false, always_show_products = true, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "large-crafting", subgroup = "woodworking", order = "nullius-g", energy_required = 12, ingredients = { - {"nullius-small-miner-1", 3}, - {"nullius-box-wood", 1} + {type = "item", name = "nullius-small-miner-1", amount = 3}, + {type = "item", name = "nullius-box-wood", amount = 1} }, results = { {type="item", name="nullius-medium-miner-1", amount=2}, @@ -5366,7 +5395,7 @@ data:extend({ icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/glycerol.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/glycerol.png", icon_size = 72, scale = 0.28, shift = {0, 6} @@ -5449,7 +5478,7 @@ data:extend({ { icon = "__base__/graphics/icons/tree-08.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.28, shift = {0, 5} }, @@ -5477,7 +5506,7 @@ data:extend({ { icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.33, shift = {1, 5} }, @@ -5505,7 +5534,7 @@ data:extend({ { icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.28, shift = {-1, 5} }, @@ -5567,7 +5596,9 @@ data:extend({ {type="fluid", name="nullius-fatty-acids", amount=500}, {type="fluid", name="nullius-nucleotides", amount=200} }, - result = "nullius-biochemistry-pack" + results = { + {type = "item", name = "nullius-biochemistry-pack", amount = 1} + } }, { type = "recipe", @@ -5580,7 +5611,9 @@ data:extend({ {type="item", name="nullius-algae", amount=100}, {type="fluid", name="nullius-bacteria", amount=200} }, - result = "nullius-microbiology-pack" + results = { + {type = "item", name = "nullius-microbiology-pack", amount = 1} + } }, { type = "recipe", @@ -5594,7 +5627,9 @@ data:extend({ {type="item", name="nullius-grass", amount=120}, {type="item", name="nullius-box-cellulose", amount=120} }, - result = "nullius-botany-pack" + results = { + {type = "item", name = "nullius-botany-pack", amount = 1} + } }, { type = "recipe", @@ -5608,7 +5643,9 @@ data:extend({ {type="item", name="nullius-tree", amount=80}, {type="item", name="nullius-box-wood", amount=200} }, - result = "nullius-dendrology-pack" + results = { + {type = "item", name = "nullius-dendrology-pack", amount = 1} + } }, { type = "recipe", @@ -5621,13 +5658,15 @@ data:extend({ {type="item", name="nullius-worm", amount=150}, {type="fluid", name="nullius-carbon-dioxide", amount=7500} }, - result = "nullius-nematology-pack" + results = { + {type = "item", name = "nullius-nematology-pack", amount = 1} + } }, { type = "recipe", name = "nullius-ichthyology-pack", enabled = false, - allow_decomposition = false, + allow_decomposition = false, category = "small-fluid-assembly", energy_required = 120, ingredients = { @@ -5635,7 +5674,9 @@ data:extend({ {type="item", name="nullius-fish", amount=120}, {type="fluid", name="nullius-wastewater", amount=10000} }, - result = "nullius-ichthyology-pack" + results = { + {type = "item", name = "nullius-ichthyology-pack", amount = 1} + } }, { type = "recipe", @@ -5649,6 +5690,8 @@ data:extend({ {type="item", name="nullius-arthropod", amount=80}, {type="item", name="nullius-box-plastic", amount=50} }, - result = "nullius-zoology-pack" + results = { + {type = "item", name = "nullius-zoology-pack", amount = 1} + } } }) diff --git a/nullius/prototypes/item/box_icons.lua b/nullius/prototypes/item/box_icons.lua index 7f951b9..bdf4bd7 100644 --- a/nullius/prototypes/item/box_icons.lua +++ b/nullius/prototypes/item/box_icons.lua @@ -22,7 +22,7 @@ local function boxed_icons(itemname, suffix) if (base_item == nil) then return nil end local base_icon = base_item.icon - local base_size = base_item.icon_size + local base_size = base_item.icon_size or 64 local base_tint = nil local icons = base_item.icons if ((icons ~= nil) and (icons[1] ~= nil)) then @@ -96,7 +96,7 @@ end for _,recipe in pairs(data.raw.recipe) do if (string.sub(recipe.name, 1, 14) == "nullius-unbox-") then local suffix = string.sub(recipe.name, 15, -1) - local icons = boxed_icons(recipe.result, suffix) + local icons = boxed_icons(recipe.results[1].name, suffix) if (icons ~= nil) then data.raw.item["nullius-box-"..suffix].icons = icons.boxed recipe.icons = icons.unboxed @@ -105,9 +105,9 @@ for _,recipe in pairs(data.raw.recipe) do end end elseif ((string.sub(recipe.name, 1, 14) == "nullius-boxed-") and - (recipe.result ~= nil) and - (string.sub(recipe.result, 1, 12) ~= "nullius-box-")) then - local icons = boxed_icons(recipe.result) + (recipe.results ~= nil) and + (string.sub(recipe.results[1].name, 1, 12) ~= "nullius-box-")) then + local icons = boxed_icons(recipe.results[1].name) if (icons ~= nil) then recipe.icons = icons.boxed if (data.raw["virtual-signal"][recipe.name] ~= nil) then @@ -116,3 +116,28 @@ for _,recipe in pairs(data.raw.recipe) do end end end + +-- Set the localised names for boxed recipes +for _,recipe in pairs(data.raw.recipe) do + if string.sub(recipe.name, 1, 14) == "nullius-boxed-" then + local main_product = nil + if recipe.main_product ~= nil then + main_product = recipe.main_product + elseif recipe.results and recipe.results[1] then + main_product = recipe.results[1].name + end + + if main_product ~= nil and (string.sub(main_product, 1, 12) == "nullius-box-") then + if recipe.localised_name == nil then + --First version + --recipe.localised_name = data.raw.item[main_product].localised_name + + -- Second version + recipe.localised_name = table.deepcopy(data.raw.item[main_product].localised_name) + if recipe.localised_name[1] == "item-name.nullius-box" then + recipe.localised_name[1] = "recipe-name.nullius-boxed" + end + end + end + end +end \ No newline at end of file diff --git a/nullius/prototypes/item/boxing.lua b/nullius/prototypes/item/boxing.lua index 3587b34..741ee4e 100644 --- a/nullius/prototypes/item/boxing.lua +++ b/nullius/prototypes/item/boxing.lua @@ -42,8 +42,8 @@ local function create_boxed_item(base_name, group, box_order, localname = item.localised_name elseif (item.place_result ~= nil) then localname = {"entity-name."..item.place_result} - elseif (item.placed_as_equipment_result ~= nil) then - localname = {"equipment-name."..item.placed_as_equipment_result} + elseif (item.place_as_equipment_result ~= nil) then + localname = {"equipment-name."..item.place_as_equipment_result} end data:extend({ @@ -66,14 +66,15 @@ local function create_boxed_item(base_name, group, box_order, always_show_products = true, allow_as_intermediate = false, no_productivity = true, - hide_from_stats = true, - requester_paste_multiplier = 5, + hide_from_stats = true, + requester_paste_multiplier = 5, energy_required = 1, ingredients = { - {full_name, 4*ratio} + {type="item", name= full_name, amount = 4*ratio} }, - result = "nullius-box-"..base_name, - result_count = 4 + results = { + {type="item", name="nullius-box-"..base_name, amount = 4} + } }, { type = "recipe", @@ -88,15 +89,17 @@ local function create_boxed_item(base_name, group, box_order, always_show_products = true, allow_decomposition = false, allow_as_intermediate = false, + hide_from_signal_gui = false, no_productivity = true, - hide_from_stats = true, - requester_paste_multiplier = 4, + hide_from_stats = true, + requester_paste_multiplier = 4, energy_required = 0.2, ingredients = { - {"nullius-box-"..base_name, 1} + {type="item", name="nullius-box-"..base_name, amount = 1} }, - result = full_name, - result_count = ratio + results = { + {type="item", name=full_name, amount = ratio} + } } }) end @@ -114,15 +117,15 @@ data.raw.item["fast-transport-belt"].localised_name = {"entity-name.nullius-belt data.raw.item["fast-underground-belt"].localised_name = {"entity-name.nullius-underground-belt-2"} data.raw.item["express-transport-belt"].localised_name = {"entity-name.nullius-belt-3"} data.raw.item["express-underground-belt"].localised_name = {"entity-name.nullius-underground-belt-3"} -data.raw.item["ultimate-transport-belt"].localised_name = {"entity-name.nullius-belt-4"} -data.raw.item["ultimate-underground-belt"].localised_name = {"entity-name.nullius-underground-belt-4"} +data.raw.item["bob-ultimate-transport-belt"].localised_name = {"entity-name.nullius-belt-4"} +data.raw.item["bob-ultimate-underground-belt"].localised_name = {"entity-name.nullius-underground-belt-4"} data.raw.item["inserter"].localised_name = {"entity-name.nullius-inserter-1"} -data.raw.item["turbo-inserter"].localised_name = {"entity-name.nullius-inserter-2"} -data.raw.item["turbo-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-2"} -data.raw.item["stack-inserter"].localised_name = {"entity-name.nullius-inserter-3"} -data.raw.item["stack-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-3"} -data.raw.item["express-stack-inserter"].localised_name = {"entity-name.nullius-inserter-4"} -data.raw.item["express-stack-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-4"} +data.raw.item["bob-turbo-inserter"].localised_name = {"entity-name.nullius-inserter-2"} +-- data.raw.item["turbo-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-2"} +data.raw.item["bulk-inserter"].localised_name = {"entity-name.nullius-inserter-3"} +-- data.raw.item["stack-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-3"} +data.raw.item["bob-express-bulk-inserter"].localised_name = {"entity-name.nullius-inserter-4"} +-- data.raw.item["express-stack-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-4"} data.raw.item["storage-tank"].localised_name = {"entity-name.nullius-medium-tank-1"} data.raw.item["small-electric-pole"].localised_name = {"entity-name.nullius-power-pole-1"} data.raw.item["medium-electric-pole"].localised_name = {"entity-name.nullius-power-pole-2"} @@ -134,10 +137,13 @@ data.raw.item["refined-hazard-concrete"].stack_size = 500 data.raw.item["copper-cable"].localised_name = {"item-name.nullius-insulated-wire"} data.raw.item["copper-cable"].stack_size = 200 data.raw.item["big-electric-pole"].stack_size = 50 +data.raw.item["programmable-speaker"].stack_size = 50 +data.raw.item["power-switch"].stack_size = 50 data.raw.item["constant-combinator"].localised_name = {"entity-name.nullius-memory-circuit"} data.raw.item["arithmetic-combinator"].localised_name = {"entity-name.nullius-arithmetic-circuit"} data.raw.item["decider-combinator"].localised_name = {"entity-name.nullius-logic-circuit"} +data.raw.item["selector-combinator"].localised_name = {"entity-name.nullius-selector-circuit"} data.raw.item["programmable-speaker"].localised_name = {"entity-name.nullius-antenna"} data.raw.item["small-lamp"].localised_name = {"entity-name.nullius-lamp-1"} data.raw.item["big-electric-pole"].localised_name = {"entity-name.nullius-pylon-1"} @@ -145,7 +151,7 @@ data.raw.item["pipe"].localised_name = {"entity-name.nullius-pipe-1"} data.raw.item["pipe-to-ground"].localised_name = {"entity-name.nullius-underground-pipe-1"} data.raw.item["pump"].localised_name = {"entity-name.nullius-pump-3"} -data.raw.item["empty-barrel"].stack_size = 20 +data.raw.item["barrel"].stack_size = 20 data.raw.item["iron-ore"].stack_size = 50 data.raw.item["copper-ore"].stack_size = 50 data.raw.item["uranium-ore"].stack_size = 50 @@ -161,16 +167,16 @@ data.raw.item["fast-transport-belt"].stack_size = 200 data.raw.item["fast-underground-belt"].stack_size = 100 data.raw.item["express-transport-belt"].stack_size = 200 data.raw.item["express-underground-belt"].stack_size = 100 -data.raw.item["ultimate-transport-belt"].stack_size = 200 -data.raw.item["ultimate-underground-belt"].stack_size = 100 +data.raw.item["bob-ultimate-transport-belt"].stack_size = 200 +data.raw.item["bob-ultimate-underground-belt"].stack_size = 100 data.raw.item["inserter"].stack_size = 100 -data.raw.item["turbo-inserter"].stack_size = 100 -data.raw.item["turbo-filter-inserter"].stack_size = 100 -data.raw.item["stack-inserter"].stack_size = 100 -data.raw.item["stack-filter-inserter"].stack_size = 100 -data.raw.item["express-stack-inserter"].stack_size = 100 -data.raw.item["express-stack-filter-inserter"].stack_size = 100 +data.raw.item["bob-turbo-inserter"].stack_size = 100 +-- data.raw.item["turbo-filter-inserter"].stack_size = 100 +data.raw.item["bulk-inserter"].stack_size = 100 +-- data.raw.item["stack-filter-inserter"].stack_size = 100 +data.raw.item["bob-express-bulk-inserter"].stack_size = 100 +-- data.raw.item["express-stack-filter-inserter"].stack_size = 100 create_boxed_item("graphite", "organic", "b") create_boxed_item("iron-ore", "iron", "b", "iron-ore") @@ -246,8 +252,10 @@ create_boxed_item("filter-1", "mechanical", "bb") create_boxed_item("logic-circuit", "circuit", "d", "decider-combinator") create_boxed_item("memory-circuit", "circuit", "f", "constant-combinator") create_boxed_item("arithmetic-circuit", "circuit", "e", "arithmetic-combinator") -create_boxed_item("red-wire", "circuit", "b", "red-wire") -create_boxed_item("green-wire", "circuit", "c", "green-wire") +create_boxed_item("selector-circuit", "circuit", "gb", "selector-combinator") +create_boxed_item("display-panel", "circuit", "ga", "display-panel") +create_boxed_item("red-wire", "circuit", "b") +create_boxed_item("green-wire", "circuit", "c") create_boxed_item("bpa", "organic", "c") create_boxed_item("acrylic-fiber", "organic", "f") create_boxed_item("carbon-fiber", "organic", "g") @@ -284,7 +292,6 @@ create_boxed_item("night-vision-1", "demolition", "bc") create_boxed_item("levitation-field-1", "demolition", "bd") create_boxed_item("transformer", "electrical", "c") create_boxed_item("power-switch", "circuit", "g", "power-switch") -create_boxed_item("one-way-valve", "plumbing", "b") create_boxed_item("heat-pipe-1", "heat-energy", "db") create_boxed_item("heat-pipe-2", "heat-energy", "dc") @@ -301,7 +308,8 @@ create_boxed_item("hazard-concrete", "concrete", "k", "refined-hazard-concrete") create_boxed_item("priority-valve", "plumbing", "c") create_boxed_item("top-up-valve", "plumbing", "d") create_boxed_item("relief-valve", "plumbing", "e") -create_boxed_item("barrel", "canister", "b", "empty-barrel") +create_boxed_item("one-way-valve", "plumbing", "b") +create_boxed_item("barrel", "canister", "b", "barrel") create_boxed_item("canister", "canister", "c") create_boxed_item("hydrogen-canister", "canister", "d") create_boxed_item("methanol-canister", "canister", "e", "processed-fuel") @@ -310,10 +318,10 @@ create_boxed_item("water-canister", "canister", "g") create_boxed_item("chain-signal", "rail", "g", "rail-chain-signal") create_boxed_item("rail-signal", "rail", "f", "rail-signal") create_boxed_item("inserter-1", "inserter", "b", "inserter") -create_boxed_item("inserter-2", "inserter", "c", "turbo-inserter") -create_boxed_item("filter-inserter-2", "inserter", "d", "turbo-filter-inserter") -create_boxed_item("inserter-3", "inserter", "e", "stack-inserter") -create_boxed_item("filter-inserter-3", "inserter", "f", "stack-filter-inserter") +create_boxed_item("inserter-2", "inserter", "c", "bob-turbo-inserter") +-- create_boxed_item("filter-inserter-2", "inserter", "d", "turbo-filter-inserter") +create_boxed_item("inserter-3", "inserter", "e", "bulk-inserter") +-- create_boxed_item("filter-inserter-3", "inserter", "f", "stack-filter-inserter") create_boxed_item("belt-1", "belt", "bb", "transport-belt") create_boxed_item("belt-2", "belt", "bc", "fast-transport-belt") create_boxed_item("belt-3", "belt", "bd", "express-transport-belt") @@ -382,10 +390,10 @@ create_boxed_item("graphene", "organic", "j") create_boxed_item("filter-2", "mechanical", "bc") create_boxed_item("pipe-4", "pipe", "h") create_boxed_item("underground-pipe-4", "pipe", "i") -create_boxed_item("inserter-4", "inserter", "g", "express-stack-inserter") -create_boxed_item("filter-inserter-4", "inserter", "h", "express-stack-filter-inserter") -create_boxed_item("belt-4", "belt", "be", "ultimate-transport-belt") -create_boxed_item("underground-belt-4", "belt", "ce", "ultimate-underground-belt") +create_boxed_item("inserter-4", "inserter", "g", "bob-express-bulk-inserter") +-- create_boxed_item("filter-inserter-4", "inserter", "h", "express-stack-filter-inserter") +create_boxed_item("belt-4", "belt", "be", "bob-ultimate-transport-belt") +create_boxed_item("underground-belt-4", "belt", "ce", "bob-ultimate-underground-belt") create_boxed_item("pump-3", "plumbing", "fd", "pump") create_boxed_item("small-pump-2", "plumbing", "hc") create_boxed_item("turbine-open-3", "fluid-energy", "ed") diff --git a/nullius/prototypes/item/broken.lua b/nullius/prototypes/item/broken.lua index 0e3a595..3c28b86 100644 --- a/nullius/prototypes/item/broken.lua +++ b/nullius/prototypes/item/broken.lua @@ -14,7 +14,7 @@ data:extend({ localised_name = {"item-name.nullius-broken", {"entity-name.nullius-air-filter-1"}}, icons = { { - icon = "__angelspetrochem__/graphics/icons/air-filter.png", + icon = "__angelspetrochemgraphics__/graphics/icons/air-filter.png", icon_size = 32, scale = 0.8 }, @@ -39,7 +39,7 @@ data:extend({ { type = "item", name = "nullius-broken-electrolyzer", - localised_name = {"item-name.nullius-broken", {"", {"entity-name.nullius-electrolyzer"}, " ", 1}}, + localised_name = {"item-name.nullius-broken", {"", {"entity-name.nullius-electrolyzer"}, " ", tostring(1)}}, icons = { data.raw.item["nullius-electrolyzer-1"].icons[1], broken_overlay @@ -130,7 +130,7 @@ data:extend({ icons = { { icon = "__base__/graphics/icons/radar.png", - icon_size = 64, icon_mipmaps = 4, + icon_size = 64, tint = {0.9, 0.9, 0.65} }, broken_overlay @@ -176,10 +176,12 @@ data:extend({ order = "nullius-c", energy_required = 3, ingredients = { - {"nullius-broken-air-filter", 1}, - {"nullius-iron-sheet", 2} + {type = "item", name = "nullius-broken-air-filter", amount = 1}, + {type = "item", name = "nullius-iron-sheet", amount = 2} }, - result = "nullius-air-filter-1" + results = { + {type="item", name="nullius-air-filter-1", amount = 1} + } }, { type = "recipe", @@ -198,10 +200,12 @@ data:extend({ order = "nullius-e", energy_required = 4, ingredients = { - {"nullius-broken-hydro-plant", 1}, - {"pipe", 4} + {type = "item", name = "nullius-broken-hydro-plant", amount = 1}, + {type = "item", name = "pipe", amount = 4} }, - result = "nullius-hydro-plant-1" + results = { + {type="item", name="nullius-hydro-plant-1", amount = 1} + } }, { type = "recipe", @@ -220,10 +224,12 @@ data:extend({ order = "nullius-g", energy_required = 6, ingredients = { - {"nullius-broken-electrolyzer", 1}, - {"nullius-iron-wire", 5} + {type = "item", name = "nullius-broken-electrolyzer", amount = 1}, + {type = "item", name = "nullius-iron-wire", amount = 5} }, - result = "nullius-electrolyzer-1" + results = { + {type="item", name="nullius-electrolyzer-1", amount = 1} + } }, { type = "recipe", @@ -242,10 +248,12 @@ data:extend({ order = "nullius-i", energy_required = 5, ingredients = { - {"nullius-broken-chemical-plant", 1}, - {"nullius-one-way-valve", 2} + {type = "item", name = "nullius-broken-chemical-plant", amount = 1}, + {type = "item", name = "nullius-one-way-valve", amount = 2} }, - result = "nullius-chemical-plant-1" + results = { + {type="item", name="nullius-chemical-plant-1", amount = 1} + } }, { type = "recipe", @@ -264,10 +272,12 @@ data:extend({ order = "nullius-k", energy_required = 4, ingredients = { - {"nullius-broken-foundry", 1}, - {"stone-brick", 5} + {type = "item", name = "nullius-broken-foundry", amount = 1}, + {type = "item", name = "stone-brick", amount = 5} }, - result = "nullius-foundry-1" + results = { + {type="item", name="nullius-foundry-1", amount = 1} + } }, { type = "recipe", @@ -286,10 +296,12 @@ data:extend({ order = "nullius-m", energy_required = 3, ingredients = { - {"nullius-broken-assembler", 1}, - {"nullius-iron-gear", 2} + {type = "item", name = "nullius-broken-assembler", amount = 1}, + {type = "item", name = "nullius-iron-gear", amount = 2} }, - result = "nullius-medium-assembler-1" + results = { + {type="item", name="nullius-medium-assembler-1", amount = 1} + } }, { type = "recipe", @@ -308,10 +320,12 @@ data:extend({ order = "nullius-o", energy_required = 2, ingredients = { - {"nullius-broken-pylon", 1}, - {"nullius-iron-rod", 3} + {type = "item", name = "nullius-broken-pylon", amount = 1}, + {type = "item", name = "nullius-iron-rod", amount = 3} }, - result = "big-electric-pole" + results = { + {type="item", name="big-electric-pole", amount = 1} + } }, { type = "recipe", @@ -330,10 +344,12 @@ data:extend({ order = "nullius-q", energy_required = 8, ingredients = { - {"nullius-broken-solar-panel", 1}, - {"nullius-sand", 1} + {type = "item", name = "nullius-broken-solar-panel", amount = 1}, + {type = "item", name = "nullius-sand", amount = 1} }, - result = "nullius-solar-panel-1" + results = { + {type="item", name="nullius-solar-panel-1", amount = 1} + } }, { type = "recipe", @@ -352,10 +368,12 @@ data:extend({ order = "nullius-s", energy_required = 6, ingredients = { - {"nullius-broken-grid-battery", 1}, - {"nullius-graphite", 1} + {type = "item", name = "nullius-broken-grid-battery", amount = 1}, + {type = "item", name = "nullius-graphite", amount = 1} }, - result = "nullius-grid-battery-1" + results = { + {type="item", name="nullius-grid-battery-1", amount = 1} + } }, { type = "recipe", @@ -374,10 +392,12 @@ data:extend({ order = "nullius-u", energy_required = 10, ingredients = { - {"nullius-broken-sensor-node", 1}, - {"nullius-glass", 2}, - {"small-lamp", 2} + {type = "item", name = "nullius-broken-sensor-node", amount = 1}, + {type = "item", name = "nullius-glass", amount = 2}, + {type = "item", name = "small-lamp", amount = 2} }, - result = "radar" + results = { + {type="item", name="radar", amount = 1} + } } }) diff --git a/nullius/prototypes/item/buildings.lua b/nullius/prototypes/item/buildings.lua index c7f772a..92a4859 100644 --- a/nullius/prototypes/item/buildings.lua +++ b/nullius/prototypes/item/buildings.lua @@ -9,7 +9,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/stone-furnace.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "furnace", order = "nullius-bbb", @@ -24,11 +24,13 @@ data:extend({ always_show_made_in = true, energy_required = 8, ingredients = { - {"stone-brick", 4}, - {"nullius-iron-wire", 2}, - {"nullius-iron-plate", 1} + {type = "item", name = "stone-brick", amount = 4}, + {type = "item", name = "nullius-iron-wire", amount = 2}, + {type = "item", name = "nullius-iron-plate", amount = 1} }, - result = "nullius-small-furnace-1" + results = { + {type = "item", name = "nullius-small-furnace-1", amount = 1} + } }, { @@ -51,12 +53,14 @@ data:extend({ always_show_made_in = true, energy_required = 12, ingredients = { - {"nullius-small-furnace-1", 1}, - {"nullius-refractory-brick", 8}, - {"nullius-crucible", 1}, - {"nullius-steel-plate", 1} + {type = "item", name = "nullius-small-furnace-1", amount = 1}, + {type = "item", name = "nullius-refractory-brick", amount = 8}, + {type = "item", name = "nullius-crucible", amount = 1}, + {type = "item", name = "nullius-steel-plate", amount = 1} }, - result = "nullius-small-furnace-2" + results = { + {type = "item", name = "nullius-small-furnace-2", amount = 1} + } }, { @@ -80,14 +84,16 @@ data:extend({ always_show_made_in = true, energy_required = 25, ingredients = { - {"nullius-small-furnace-2", 1}, - {"nullius-refractory-brick", 15}, - {"nullius-mortar", 8}, - {"nullius-iron-wire", 6}, - {"nullius-aluminum-wire", 6}, - {"nullius-sensor-1", 1} + {type = "item", name = "nullius-small-furnace-2", amount = 1}, + {type = "item", name = "nullius-refractory-brick", amount = 15}, + {type = "item", name = "nullius-mortar", amount = 8}, + {type = "item", name = "nullius-iron-wire", amount = 6}, + {type = "item", name = "nullius-aluminum-wire", amount = 6}, + {type = "item", name = "nullius-sensor-1", amount = 1} }, - result = "nullius-small-furnace-3" + results = { + {type = "item", name = "nullius-small-furnace-3", amount = 1} + } }, { @@ -96,7 +102,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/steel-furnace.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "furnace", order = "nullius-bcb", @@ -111,10 +117,12 @@ data:extend({ always_show_made_in = true, energy_required = 15, ingredients = { - {"nullius-small-furnace-2", 2}, - {"nullius-chimney-1", 1} + {type = "item", name = "nullius-small-furnace-2", amount = 2}, + {type = "item", name = "nullius-chimney-1", amount = 1} }, - result = "nullius-medium-furnace-1" + results = { + {type = "item", name = "nullius-medium-furnace-1", amount = 1} + } }, { @@ -138,12 +146,14 @@ data:extend({ always_show_made_in = true, energy_required = 30, ingredients = { - {"nullius-medium-furnace-1", 1}, - {"nullius-small-furnace-3", 1}, - {"nullius-combustion-chamber-2", 1}, - {"nullius-heat-pipe-1", 3} + {type = "item", name = "nullius-medium-furnace-1", amount = 1}, + {type = "item", name = "nullius-small-furnace-3", amount = 1}, + {type = "item", name = "nullius-combustion-chamber-2", amount = 1}, + {type = "item", name = "nullius-heat-pipe-1", amount = 3} }, - result = "nullius-medium-furnace-2" + results = { + {type = "item", name = "nullius-medium-furnace-2", amount = 1} + } }, { @@ -166,15 +176,17 @@ data:extend({ category = "large-crafting", energy_required = 60, ingredients = { - {"nullius-medium-furnace-2", 1}, - {"nullius-air-filter-2", 1}, - {"nullius-combustion-chamber-3", 1}, - {"nullius-box-heat-pipe-2", 1}, - {"nullius-transformer", 1}, - {"nullius-box-titanium-plate", 1}, - {"nullius-box-wall", 1} + {type = "item", name = "nullius-medium-furnace-2", amount = 1}, + {type = "item", name = "nullius-air-filter-2", amount = 1}, + {type = "item", name = "nullius-combustion-chamber-3", amount = 1}, + {type = "item", name = "nullius-box-heat-pipe-2", amount = 1}, + {type = "item", name = "nullius-transformer", amount = 1}, + {type = "item", name = "nullius-box-titanium-plate", amount = 1}, + {type = "item", name = "nullius-box-wall", amount = 1} }, - result = "nullius-medium-furnace-3" + results = { + {type = "item", name = "nullius-medium-furnace-3", amount = 1} + } }, { @@ -183,7 +195,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/electric-furnace.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.65, 0.65, 0.8} }}, subgroup = "furnace", @@ -199,11 +211,13 @@ data:extend({ always_show_made_in = true, energy_required = 30, ingredients = { - {"nullius-medium-furnace-2", 2}, - {"nullius-steel-beam", 8}, - {"concrete", 20} + {type = "item", name = "nullius-medium-furnace-2", amount = 2}, + {type = "item", name = "nullius-steel-beam", amount = 8}, + {type = "item", name = "concrete", amount = 20} }, - result = "nullius-large-furnace-1" + results = { + {type = "item", name = "nullius-large-furnace-1", amount = 1} + } }, { @@ -212,7 +226,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/electric-furnace.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "furnace", order = "nullius-bdc", @@ -227,13 +241,15 @@ data:extend({ category = "huge-crafting", energy_required = 75, ingredients = { - {"nullius-large-furnace-1", 1}, - {"nullius-medium-furnace-3", 1}, - {"nullius-substation-2", 1}, - {"nullius-box-insulation", 2}, - {"nullius-box-belt-4", 1} + {type = "item", name = "nullius-large-furnace-1", amount = 1}, + {type = "item", name = "nullius-medium-furnace-3", amount = 1}, + {type = "item", name = "nullius-substation-2", amount = 1}, + {type = "item", name = "nullius-box-insulation", amount = 2}, + {type = "item", name = "nullius-box-belt-4", amount = 1} }, - result = "nullius-large-furnace-2" + results = { + {type = "item", name = "nullius-large-furnace-2", amount = 1} + } }, { @@ -280,12 +296,14 @@ data:extend({ always_show_made_in = true, energy_required = 5, ingredients = { - {"inserter", 1}, - {"transport-belt", 1}, - {"wooden-chest", 1}, - {"nullius-fabrication-tool-1", 1} + {type = "item", name = "inserter", amount = 1}, + {type = "item", name = "transport-belt", amount = 1}, + {type = "item", name = "wooden-chest", amount = 1}, + {type = "item", name = "nullius-fabrication-tool-1", amount = 1} }, - result = "nullius-small-assembler-1" + results = { + {type = "item", name = "nullius-small-assembler-1", amount = 1} + } }, { type = "recipe", @@ -298,11 +316,13 @@ data:extend({ category = "medium-crafting", energy_required = 6, ingredients = { - {"inserter", 1}, - {"transport-belt", 1}, - {"wooden-chest", 1} + {type = "item", name = "inserter", amount = 1}, + {type = "item", name = "transport-belt", amount = 1}, + {type = "item", name = "wooden-chest", amount = 1} }, - result = "nullius-small-assembler-1" + results = { + {type = "item", name = "nullius-small-assembler-1", amount = 1} + } }, { type = "recipe", @@ -312,12 +332,14 @@ data:extend({ category = "medium-crafting", energy_required = 12, ingredients = { - {"nullius-small-assembler-1", 1}, - {"nullius-fabrication-tool-2", 1}, - {"splitter", 1}, - {"iron-chest", 1} + {type = "item", name = "nullius-small-assembler-1", amount = 1}, + {type = "item", name = "nullius-fabrication-tool-2", amount = 1}, + {type = "item", name = "splitter", amount = 1}, + {type = "item", name = "iron-chest", amount = 1} }, - result = "nullius-small-assembler-2" + results = { + {type = "item", name = "nullius-small-assembler-2", amount = 1} + } }, { type = "recipe", @@ -330,12 +352,14 @@ data:extend({ category = "medium-crafting", energy_required = 12, ingredients = { - {"nullius-small-assembler-1", 1}, - {"repair-pack", 2}, - {"splitter", 1}, - {"iron-chest", 2} + {type = "item", name = "nullius-small-assembler-1", amount = 1}, + {type = "item", name = "repair-pack", amount = 2}, + {type = "item", name = "splitter", amount = 1}, + {type = "item", name = "iron-chest", amount = 2} }, - result = "nullius-small-assembler-2" + results = { + {type = "item", name = "nullius-small-assembler-2", amount = 1} + } }, { type = "recipe", @@ -347,14 +371,15 @@ data:extend({ category = "tiny-crafting", energy_required = 40, ingredients = { - {"nullius-small-assembler-2", 4}, - {"nullius-hangar-1", 1}, - {"nullius-construction-bot-2", 1}, - {"nullius-large-buffer-chest-1", 1}, - {"express-stack-filter-inserter", 1} + {type = "item", name = "nullius-small-assembler-2", amount = 4}, + {type = "item", name = "nullius-hangar-1", amount = 1}, + {type = "item", name = "nullius-construction-bot-2", amount = 1}, + {type = "item", name = "nullius-large-buffer-chest-1", amount = 1}, + {type = "item", name = "bob-express-bulk-inserter", amount = 1} }, - result = "nullius-small-assembler-3", - result_count = 3 + results = { + {type = "item", name = "nullius-small-assembler-3", amount = 3} + } }, { @@ -401,10 +426,12 @@ data:extend({ always_show_made_in = true, energy_required = 10, ingredients = { - {"nullius-small-assembler-1", 2}, - {"nullius-steel-beam", 1} + {type = "item", name = "nullius-small-assembler-1", amount = 2}, + {type = "item", name = "nullius-steel-beam", amount = 1} }, - result = "nullius-medium-assembler-1" + results = { + {type = "item", name = "nullius-medium-assembler-1", amount = 1} + } }, { type = "recipe", @@ -414,12 +441,14 @@ data:extend({ always_show_made_in = true, energy_required = 20, ingredients = { - {"nullius-medium-assembler-1", 1}, - {"nullius-small-assembler-2", 1}, - {"nullius-aluminum-sheet", 6}, - {"red-wire", 4} + {type = "item", name = "nullius-medium-assembler-1", amount = 1}, + {type = "item", name = "nullius-small-assembler-2", amount = 1}, + {type = "item", name = "nullius-aluminum-sheet", amount = 6}, + {type = "item", name = "nullius-red-wire", amount = 4} }, - result = "nullius-medium-assembler-2" + results = { + {type = "item", name = "nullius-medium-assembler-2", amount = 1} + } }, { type = "recipe", @@ -431,15 +460,16 @@ data:extend({ always_show_products = true, energy_required = 60, ingredients = { - {"nullius-medium-assembler-2", 3}, - {"nullius-small-assembler-3", 2}, - {"nullius-charger-2", 1}, - {"nullius-logistic-bot-2", 1}, - {"express-transport-belt", 4}, - {"stone-wall", 6} + {type = "item", name = "nullius-medium-assembler-2", amount = 3}, + {type = "item", name = "nullius-small-assembler-3", amount = 2}, + {type = "item", name = "nullius-charger-2", amount = 1}, + {type = "item", name = "nullius-logistic-bot-2", amount = 1}, + {type = "item", name = "express-transport-belt", amount = 4}, + {type = "item", name = "stone-wall", amount = 6} }, - result = "nullius-medium-assembler-3", - result_count = 2 + results = { + {type = "item", name = "nullius-medium-assembler-3", amount = 2} + } }, { @@ -448,7 +478,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/assembling-machine-2.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "assembler", order = "nullius-db", @@ -461,7 +491,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/assembling-machine-3.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "assembler", order = "nullius-dc", @@ -476,12 +506,14 @@ data:extend({ always_show_made_in = true, energy_required = 40, ingredients = { - {"nullius-medium-assembler-2", 2}, - {"stone-brick", 12}, - {"nullius-mortar", 3}, - {"fast-transport-belt", 6} + {type = "item", name = "nullius-medium-assembler-2", amount = 2}, + {type = "item", name = "stone-brick", amount = 12}, + {type = "item", name = "nullius-mortar", amount = 3}, + {type = "item", name = "fast-transport-belt", amount = 6} }, - result = "nullius-large-assembler-1" + results = { + {type = "item", name = "nullius-large-assembler-1", amount = 1} + } }, { type = "recipe", @@ -491,21 +523,23 @@ data:extend({ always_show_made_in = true, energy_required = 80, ingredients = { - {"nullius-large-assembler-1", 1}, - {"nullius-medium-assembler-3", 2}, - {"nullius-relay-2", 1}, - {"gate", 2}, - {"nullius-substation-2", 1} + {type = "item", name = "nullius-large-assembler-1", amount = 1}, + {type = "item", name = "nullius-medium-assembler-3", amount = 2}, + {type = "item", name = "nullius-relay-2", amount = 1}, + {type = "item", name = "gate", amount = 2}, + {type = "item", name = "nullius-substation-2", amount = 1} }, - result = "nullius-large-assembler-2" + results = { + {type = "item", name = "nullius-large-assembler-2", amount = 1} + } }, { type = "item", name = "nullius-boxer", icons = {{ - icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", - icon_size = 64, icon_mipmaps = 4, + icon = "__angelssmeltinggraphics__/graphics/icons/powder-mixer-ico.png", + icon_size = 64, scale = 0.5 }}, subgroup = "assembler", @@ -521,11 +555,13 @@ data:extend({ category = "medium-crafting", energy_required = 8, ingredients = { - {"nullius-small-assembler-2", 1}, - {"stack-inserter", 1}, - {"nullius-speed-module-1", 1} + {type = "item", name = "nullius-small-assembler-2", amount = 1}, + {type = "item", name = "bulk-inserter", amount = 1}, + {type = "item", name = "nullius-speed-module-1", amount = 1} }, - result = "nullius-boxer" + results = { + {type = "item", name = "nullius-boxer", amount = 1} + } }, { @@ -575,11 +611,13 @@ data:extend({ category = "medium-crafting", energy_required = 4, ingredients = { - {"nullius-motor-1", 1}, - {"nullius-iron-gear", 1}, - {"nullius-mining-tool-1", 1} + {type = "item", name = "nullius-motor-1", amount = 1}, + {type = "item", name = "nullius-iron-gear", amount = 1}, + {type = "item", name = "nullius-mining-tool-1", amount = 1} }, - result = "nullius-small-miner-1" + results = { + {type = "item", name = "nullius-small-miner-1", amount = 1} + } }, { type = "recipe", @@ -594,12 +632,13 @@ data:extend({ category = "medium-crafting", energy_required = 6, ingredients = { - {"nullius-motor-1", 2}, - {"nullius-iron-gear", 2}, - {"nullius-iron-plate", 3} + {type = "item", name = "nullius-motor-1", amount = 2}, + {type = "item", name = "nullius-iron-gear", amount = 2}, + {type = "item", name = "nullius-iron-plate", amount = 3} }, - result = "nullius-small-miner-1", - result_count = 2 + results = { + {type = "item", name = "nullius-small-miner-1", amount = 2} + } }, { type = "recipe", @@ -609,12 +648,14 @@ data:extend({ category = "medium-crafting", energy_required = 12, ingredients = { - {"nullius-small-miner-1", 1}, - {"nullius-motor-2", 1}, - {"nullius-steel-plate", 5}, - {"nullius-aluminum-carbide", 2} + {type = "item", name = "nullius-small-miner-1", amount = 1}, + {type = "item", name = "nullius-motor-2", amount = 1}, + {type = "item", name = "nullius-steel-plate", amount = 5}, + {type = "item", name = "nullius-aluminum-carbide", amount = 2} }, - result = "nullius-small-miner-2" + results = { + {type = "item", name = "nullius-small-miner-2", amount = 1} + } }, { type = "recipe", @@ -632,8 +673,9 @@ data:extend({ {type="item", name="nullius-box-ceramic-powder", amount=3}, {type="item", name="express-splitter", amount=1} }, - result = "nullius-small-miner-3", - result_count = 2 + results = { + {type = "item", name = "nullius-small-miner-3", amount = 2} + } }, { @@ -642,7 +684,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/burner-mining-drill.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "miner", order = "nullius-cb", @@ -682,10 +724,12 @@ data:extend({ always_show_made_in = true, energy_required = 10, ingredients = { - {"nullius-small-miner-1", 2}, - {"nullius-steel-beam", 1} + {type = "item", name = "nullius-small-miner-1", amount = 2}, + {type = "item", name = "nullius-steel-beam", amount = 1} }, - result = "nullius-medium-miner-1" + results = { + {type = "item", name = "nullius-medium-miner-1", amount = 1} + } }, { type = "recipe", @@ -695,12 +739,14 @@ data:extend({ always_show_made_in = true, energy_required = 25, ingredients = { - {"nullius-medium-miner-1", 1}, - {"nullius-small-miner-2", 1}, - {"nullius-steel-gear", 4}, - {"nullius-aluminum-plate", 2} + {type = "item", name = "nullius-medium-miner-1", amount = 1}, + {type = "item", name = "nullius-small-miner-2", amount = 1}, + {type = "item", name = "nullius-steel-gear", amount = 4}, + {type = "item", name = "nullius-aluminum-plate", amount = 2} }, - result = "nullius-medium-miner-2" + results = { + {type = "item", name = "nullius-medium-miner-2", amount = 1} + } }, { type = "recipe", @@ -717,7 +763,9 @@ data:extend({ {type="item", name="nullius-transformer", amount=1}, {type="fluid", name="nullius-lubricant", amount=50} }, - result = "nullius-medium-miner-3" + results = { + {type = "item", name = "nullius-medium-miner-3", amount = 1} + } }, { @@ -726,7 +774,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/electric-mining-drill.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.7, 0.8} }}, subgroup = "miner", @@ -740,7 +788,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/electric-mining-drill.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "miner", order = "nullius-dc", @@ -755,11 +803,13 @@ data:extend({ always_show_made_in = true, energy_required = 30, ingredients = { - {"nullius-medium-miner-2", 2}, - {"nullius-steel-cable", 6}, - {"nullius-steel-sheet", 4} + {type = "item", name = "nullius-medium-miner-2", amount = 2}, + {type = "item", name = "nullius-steel-cable", amount = 6}, + {type = "item", name = "nullius-steel-sheet", amount = 4} }, - result = "nullius-large-miner-1" + results = { + {type = "item", name = "nullius-large-miner-1", amount = 1} + } }, { type = "recipe", @@ -769,13 +819,15 @@ data:extend({ always_show_made_in = true, energy_required = 60, ingredients = { - {"nullius-large-miner-1", 1}, - {"nullius-medium-miner-3", 2}, - {"nullius-box-rail", 4}, - {"nullius-cargo-wagon-1", 1}, - {"nullius-locomotive-1", 1} + {type = "item", name = "nullius-large-miner-1", amount = 1}, + {type = "item", name = "nullius-medium-miner-3", amount = 2}, + {type = "item", name = "nullius-box-rail", amount = 4}, + {type = "item", name = "nullius-cargo-wagon-1", amount = 1}, + {type = "item", name = "nullius-locomotive-1", amount = 1} }, - result = "nullius-large-miner-2" + results = { + {type = "item", name = "nullius-large-miner-2", amount = 1} + } }, { @@ -822,10 +874,12 @@ data:extend({ always_show_made_in = true, energy_required = 5, ingredients = { - {"nullius-turbine-open-1", 2}, - {"small-electric-pole", 2} + {type = "item", name = "nullius-turbine-open-1", amount = 2}, + {type = "item", name = "small-electric-pole", amount = 2} }, - result = "nullius-wind-turbine-1" + results = { + {type = "item", name = "nullius-wind-turbine-1", amount = 1} + } }, { type = "recipe", @@ -836,10 +890,12 @@ data:extend({ always_show_made_in = true, energy_required = 25, ingredients = { - {"nullius-box-turbine-open-1", 2}, - {"nullius-box-power-pole-1", 2} + {type = "item", name = "nullius-box-turbine-open-1", amount = 2}, + {type = "item", name = "nullius-box-power-pole-1", amount = 2} }, - result = "nullius-box-wind-turbine-1" + results = { + {type = "item", name = "nullius-box-wind-turbine-1", amount = 1} + } }, { type = "recipe", @@ -849,13 +905,15 @@ data:extend({ always_show_made_in = true, energy_required = 20, ingredients = { - {"nullius-wind-turbine-1", 1}, - {"nullius-turbine-open-2", 1}, - {"big-electric-pole", 2}, - {"nullius-steel-cable", 5}, - {"concrete", 10} + {type = "item", name = "nullius-wind-turbine-1", amount = 1}, + {type = "item", name = "nullius-turbine-open-2", amount = 1}, + {type = "item", name = "big-electric-pole", amount = 2}, + {type = "item", name = "nullius-steel-cable", amount = 5}, + {type = "item", name = "concrete", amount = 10} }, - result = "nullius-wind-turbine-2" + results = { + {type = "item", name = "nullius-wind-turbine-2", amount = 1} + } }, { type = "recipe", @@ -866,13 +924,15 @@ data:extend({ always_show_made_in = true, energy_required = 100, ingredients = { - {"nullius-box-wind-turbine-1", 1}, - {"nullius-box-turbine-open-2", 1}, - {"nullius-box-pylon-1", 2}, - {"nullius-box-steel-cable", 5}, - {"nullius-box-concrete", 5} + {type = "item", name = "nullius-box-wind-turbine-1", amount = 1}, + {type = "item", name = "nullius-box-turbine-open-2", amount = 1}, + {type = "item", name = "nullius-box-pylon-1", amount = 2}, + {type = "item", name = "nullius-box-steel-cable", amount = 5}, + {type = "item", name = "nullius-box-concrete", amount = 5} }, - result = "nullius-box-wind-turbine-2" + results = { + {type = "item", name = "nullius-box-wind-turbine-2", amount = 1} + } }, { type = "recipe", @@ -882,13 +942,15 @@ data:extend({ category = "huge-crafting", energy_required = 40, ingredients = { - {"nullius-wind-turbine-2", 2}, - {"nullius-turbine-open-3", 2}, - {"nullius-pylon-2", 2}, - {"nullius-carbon-composite", 10}, - {"refined-concrete", 16} + {type = "item", name = "nullius-wind-turbine-2", amount = 2}, + {type = "item", name = "nullius-turbine-open-3", amount = 2}, + {type = "item", name = "nullius-pylon-2", amount = 2}, + {type = "item", name = "nullius-carbon-composite", amount = 10}, + {type = "item", name = "refined-concrete", amount = 16} }, - result = "nullius-wind-turbine-3" + results = { + {type = "item", name = "nullius-wind-turbine-3", amount = 1} + } }, { type = "recipe", @@ -899,20 +961,22 @@ data:extend({ subgroup = "boxed-fluid-energy", energy_required = 200, ingredients = { - {"nullius-box-wind-turbine-2", 2}, - {"nullius-box-turbine-open-3", 2}, - {"nullius-box-pylon-2", 2}, - {"nullius-box-carbon-composite", 10}, - {"nullius-box-reinforced-concrete", 8} + {type = "item", name = "nullius-box-wind-turbine-2", amount = 2}, + {type = "item", name = "nullius-box-turbine-open-3", amount = 2}, + {type = "item", name = "nullius-box-pylon-2", amount = 2}, + {type = "item", name = "nullius-box-carbon-composite", amount = 10}, + {type = "item", name = "nullius-box-reinforced-concrete", amount = 8} }, - result = "nullius-box-wind-turbine-3" + results = { + {type = "item", name = "nullius-box-wind-turbine-3", amount = 1} + } }, { type = "item", name = "nullius-foundry-1", icons = {{ - icon = "__angelssmelting__/graphics/icons/casting-machine.png", + icon = "__angelssmeltinggraphics__/graphics/icons/casting-machine.png", icon_size = 64, tint = {0.6, 0.8, 0.7} }}, @@ -925,7 +989,7 @@ data:extend({ type = "item", name = "nullius-foundry-2", icons = {{ - icon = "__angelssmelting__/graphics/icons/casting-machine.png", + icon = "__angelssmeltinggraphics__/graphics/icons/casting-machine.png", icon_size = 64, tint = {0.7, 0.8, 1} }}, @@ -938,7 +1002,7 @@ data:extend({ type = "item", name = "nullius-foundry-3", icons = {{ - icon = "__angelssmelting__/graphics/icons/casting-machine.png", + icon = "__angelssmeltinggraphics__/graphics/icons/casting-machine.png", icon_size = 64 }}, subgroup = "ore-processing", @@ -954,11 +1018,13 @@ data:extend({ always_show_made_in = true, energy_required = 8, ingredients = { - {"nullius-small-furnace-1", 1}, - {"inserter", 2}, - {"nullius-iron-plate", 3} + {type = "item", name = "nullius-small-furnace-1", amount = 1}, + {type = "item", name = "inserter", amount = 2}, + {type = "item", name = "nullius-iron-plate", amount = 3} }, - result = "nullius-foundry-1" + results = { + {type = "item", name = "nullius-foundry-1", amount = 1} + } }, { type = "recipe", @@ -968,13 +1034,15 @@ data:extend({ always_show_made_in = true, energy_required = 15, ingredients = { - {"nullius-foundry-1", 1}, - {"nullius-medium-furnace-1", 1}, - {"nullius-crucible", 2}, - {"turbo-filter-inserter", 2}, - {"fast-transport-belt", 3} + {type = "item", name = "nullius-foundry-1", amount = 1}, + {type = "item", name = "nullius-medium-furnace-1", amount = 1}, + {type = "item", name = "nullius-crucible", amount = 2}, + {type = "item", name = "bob-turbo-inserter", amount = 2}, + {type = "item", name = "fast-transport-belt", amount = 3} }, - result = "nullius-foundry-2" + results = { + {type = "item", name = "nullius-foundry-2", amount = 1} + } }, { type = "recipe", @@ -984,20 +1052,22 @@ data:extend({ category = "large-crafting", energy_required = 40, ingredients = { - {"nullius-foundry-2", 2}, - {"nullius-medium-furnace-3", 1}, - {"nullius-medium-assembler-3", 1}, - {"nullius-thermal-tank-2", 1} + {type = "item", name = "nullius-foundry-2", amount = 2}, + {type = "item", name = "nullius-medium-furnace-3", amount = 1}, + {type = "item", name = "nullius-medium-assembler-3", amount = 1}, + {type = "item", name = "nullius-thermal-tank-2", amount = 1} }, - result = "nullius-foundry-3" + results = { + {type = "item", name = "nullius-foundry-3", amount = 1} + } }, { type = "item", name = "nullius-crusher-1", icons = {{ - icon = "__angelsrefining__/graphics/icons/ore-crusher.png", - icon_size = 64, icon_mipmaps = 4, + icon = "__angelsrefininggraphics__/graphics/icons/ore-crusher.png", + icon_size = 64, tint = {0.6, 0.6, 0.6} }}, subgroup = "ore-processing", @@ -1009,8 +1079,8 @@ data:extend({ type = "item", name = "nullius-crusher-2", icons = {{ - icon = "__angelsrefining__/graphics/icons/ore-crusher.png", - icon_size = 64, icon_mipmaps = 4, + icon = "__angelsrefininggraphics__/graphics/icons/ore-crusher.png", + icon_size = 64, tint = {0.6, 0.65, 0.85} }}, subgroup = "ore-processing", @@ -1022,8 +1092,8 @@ data:extend({ type = "item", name = "nullius-crusher-3", icons = {{ - icon = "__angelsrefining__/graphics/icons/ore-crusher.png", - icon_size = 64, icon_mipmaps = 4 + icon = "__angelsrefininggraphics__/graphics/icons/ore-crusher.png", + icon_size = 64, }}, subgroup = "ore-processing", order = "nullius-bd", @@ -1038,12 +1108,14 @@ data:extend({ always_show_made_in = true, energy_required = 5, ingredients = { - {"nullius-small-miner-1", 1}, - {"transport-belt", 2}, - {"nullius-iron-wire", 3}, - {"stone-brick", 8} + {type = "item", name = "nullius-small-miner-1", amount = 1}, + {type = "item", name = "transport-belt", amount = 2}, + {type = "item", name = "nullius-iron-wire", amount = 3}, + {type = "item", name = "stone-brick", amount = 8} }, - result = "nullius-crusher-1" + results = { + {type = "item", name = "nullius-crusher-1", amount = 1} + } }, { type = "recipe", @@ -1055,13 +1127,14 @@ data:extend({ always_show_products = true, energy_required = 25, ingredients = { - {"nullius-crusher-1", 3}, - {"nullius-medium-miner-2", 1}, - {"copper-cable", 8}, - {"fast-splitter", 1} + {type = "item", name = "nullius-crusher-1", amount = 3}, + {type = "item", name = "nullius-medium-miner-2", amount = 1}, + {type = "item", name = "copper-cable", amount = 8}, + {type = "item", name = "fast-splitter", amount = 1} }, - result = "nullius-crusher-2", - result_count = 2 + results = { + {type = "item", name = "nullius-crusher-2", amount = 2} + } }, { type = "recipe", @@ -1071,13 +1144,15 @@ data:extend({ always_show_made_in = true, energy_required = 30, ingredients = { - {"nullius-crusher-2", 1}, - {"nullius-medium-miner-3", 1}, - {"ultimate-splitter", 1}, - {"nullius-box-wall", 2}, - {"nullius-trash-compactor", 1} + {type = "item", name = "nullius-crusher-2", amount = 1}, + {type = "item", name = "nullius-medium-miner-3", amount = 1}, + {type = "item", name = "bob-ultimate-splitter", amount = 1}, + {type = "item", name = "nullius-box-wall", amount = 2}, + {type = "item", name = "nullius-trash-compactor", amount = 1} }, - result = "nullius-crusher-3" + results = { + {type = "item", name = "nullius-crusher-3", amount = 1} + } }, { type = "recipe", @@ -1090,45 +1165,54 @@ data:extend({ always_show_made_in = true, energy_required = 30, ingredients = { - {"nullius-crusher-2", 2}, - {"nullius-medium-miner-3", 1}, - {"ultimate-splitter", 1}, - {"nullius-box-wall", 2} + {type = "item", name = "nullius-crusher-2", amount = 2}, + {type = "item", name = "nullius-medium-miner-3", amount = 1}, + {type = "item", name = "bob-ultimate-splitter", amount = 1}, + {type = "item", name = "nullius-box-wall", amount = 2} }, - result = "nullius-crusher-3" + results = { + {type = "item", name = "nullius-crusher-3", amount = 1} + } }, { type = "recipe", name = "nullius-small-chest-1", + localised_name = {"entity-name.nullius-small-chest-1"}, enabled = false, category = "medium-crafting", always_show_made_in = true, energy_required = 2, ingredients = { - {"nullius-iron-sheet", 2}, - {"nullius-iron-rod", 1} + {type = "item", name = "nullius-iron-sheet", amount = 2}, + {type = "item", name = "nullius-iron-rod", amount = 1} }, - result = "wooden-chest" + results = { + {type = "item", name = "wooden-chest", amount = 1} + } }, { type = "recipe", name = "nullius-small-chest-2", + localised_name = {"entity-name.nullius-small-chest-2"}, enabled = false, category = "medium-crafting", always_show_made_in = true, energy_required = 3, ingredients = { - {"wooden-chest", 1}, - {"nullius-steel-sheet", 4}, - {"nullius-steel-rod", 2}, - {"nullius-rubber", 1} + {type = "item", name = "wooden-chest", amount = 1}, + {type = "item", name = "nullius-steel-sheet", amount = 4}, + {type = "item", name = "nullius-steel-rod", amount = 2}, + {type = "item", name = "nullius-rubber", amount = 1} }, - result = "iron-chest" + results = { + {type = "item", name = "iron-chest", amount = 1} + } }, { type = "recipe", name = "nullius-small-chest-3", + localised_name = {"entity-name.nullius-small-chest-3"}, enabled = false, category = "large-fluid-assembly", always_show_made_in = true, @@ -1139,7 +1223,9 @@ data:extend({ {type="item", name="nullius-titanium-rod", amount=2}, {type="fluid", name="nullius-epoxy", amount=4, fluidbox_index=1} }, - result = "steel-chest" + results = { + {type = "item", name = "steel-chest", amount = 1} + } }, { @@ -1148,7 +1234,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/steel-chest.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "storage", order = "nullius-cb", @@ -1175,10 +1261,12 @@ data:extend({ always_show_made_in = true, energy_required = 8, ingredients = { - {"iron-chest", 4}, - {"nullius-aluminum-plate", 3} + {type = "item", name = "iron-chest", amount = 4}, + {type = "item", name = "nullius-aluminum-plate", amount = 3} }, - result = "nullius-large-chest-1" + results = { + {type = "item", name = "nullius-large-chest-1", amount = 1} + } }, { type = "recipe", @@ -1188,11 +1276,13 @@ data:extend({ always_show_made_in = true, energy_required = 15, ingredients = { - {"nullius-large-chest-1", 1}, - {"steel-chest", 2}, - {"nullius-titanium-plate", 2} + {type = "item", name = "nullius-large-chest-1", amount = 1}, + {type = "item", name = "steel-chest", amount = 2}, + {type = "item", name = "nullius-titanium-plate", amount = 2} }, - result = "nullius-large-chest-2" + results = { + {type = "item", name = "nullius-large-chest-2", amount = 1} + } }, { @@ -1249,9 +1339,9 @@ data:extend({ type = "item", name = "nullius-large-storage-chest-2", icons = {{ - icon = "__base__/graphics/icons/logistic-chest-storage.png", + icon = "__base__/graphics/icons/storage-chest.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "large-logistic-storage", order = "nullius-bc", @@ -1266,11 +1356,13 @@ data:extend({ always_show_made_in = true, energy_required = 4, ingredients = { - {"iron-chest", 1}, - {"programmable-speaker", 1}, - {"arithmetic-combinator", 1} + {type = "item", name = "iron-chest", amount = 1}, + {type = "item", name = "programmable-speaker", amount = 1}, + {type = "item", name = "arithmetic-combinator", amount = 1} }, - result = "nullius-small-storage-chest-1" + results = { + {type = "item", name = "nullius-small-storage-chest-1", amount = 1} + } }, { type = "recipe", @@ -1280,27 +1372,32 @@ data:extend({ always_show_made_in = true, energy_required = 6, ingredients = { - {"nullius-small-storage-chest-1", 1}, - {"nullius-large-chest-1", 1}, - {"nullius-sensor-1", 1}, - {"red-wire", 4} + {type = "item", name = "nullius-small-storage-chest-1", amount = 1}, + {type = "item", name = "nullius-large-chest-1", amount = 1}, + {type = "item", name = "nullius-sensor-1", amount = 1}, + {type = "item", name = "nullius-red-wire", amount = 4} }, - result = "nullius-large-storage-chest-1" + results = { + {type = "item", name = "nullius-large-storage-chest-1", amount = 1} + } }, { type = "recipe", name = "nullius-small-storage-chest-2", + localised_name = {"entity-name.nullius-small-storage-chest-2"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 8, ingredients = { - {"nullius-small-storage-chest-1", 1}, - {"steel-chest", 1}, - {"nullius-relay-2", 1}, - {"nullius-processor-2", 1} + {type = "item", name = "nullius-small-storage-chest-1", amount = 1}, + {type = "item", name = "steel-chest", amount = 1}, + {type = "item", name = "nullius-relay-2", amount = 1}, + {type = "item", name = "nullius-processor-2", amount = 1} }, - result = "logistic-chest-storage" + results = { + {type = "item", name = "storage-chest", amount = 1} + } }, { type = "recipe", @@ -1312,13 +1409,14 @@ data:extend({ category = "medium-crafting", energy_required = 20, ingredients = { - {"nullius-large-storage-chest-1", 1}, - {"logistic-chest-storage", 1}, - {"nullius-large-chest-2", 1}, - {"express-stack-filter-inserter", 1} + {type = "item", name = "nullius-large-storage-chest-1", amount = 1}, + {type = "item", name = "storage-chest", amount = 1}, + {type = "item", name = "nullius-large-chest-2", amount = 1}, + {type = "item", name = "bob-express-bulk-inserter", amount = 1} }, - result = "nullius-large-storage-chest-2", - result_count = 2 + results = { + {type = "item", name = "nullius-large-storage-chest-2", amount = 2} + } }, { @@ -1375,9 +1473,9 @@ data:extend({ type = "item", name = "nullius-large-supply-chest-2", icons = {{ - icon = "__base__/graphics/icons/logistic-chest-passive-provider.png", + icon = "__base__/graphics/icons/passive-provider-chest.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "large-logistic-storage", order = "nullius-cc", @@ -1392,10 +1490,12 @@ data:extend({ always_show_made_in = true, energy_required = 2, ingredients = { - {"nullius-small-storage-chest-1", 1}, - {"red-wire", 1} + {type = "item", name = "nullius-small-storage-chest-1", amount = 1}, + {type = "item", name = "nullius-red-wire", amount = 1} }, - result = "nullius-small-supply-chest-1" + results = { + {type = "item", name = "nullius-small-supply-chest-1", amount = 1} + } }, { type = "recipe", @@ -1405,23 +1505,28 @@ data:extend({ always_show_made_in = true, energy_required = 3, ingredients = { - {"nullius-large-storage-chest-1", 1}, - {"nullius-small-supply-chest-1", 1} + {type = "item", name = "nullius-large-storage-chest-1", amount = 1}, + {type = "item", name = "nullius-small-supply-chest-1", amount = 1} }, - result = "nullius-large-supply-chest-1" + results = { + {type = "item", name = "nullius-large-supply-chest-1", amount = 1} + } }, { type = "recipe", name = "nullius-small-supply-chest-2", + localised_name = {"entity-name.nullius-small-supply-chest-2"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 4, ingredients = { - {"nullius-small-supply-chest-1", 1}, - {"logistic-chest-storage", 1} + {type = "item", name = "nullius-small-supply-chest-1", amount = 1}, + {type = "item", name = "storage-chest", amount = 1} }, - result = "logistic-chest-passive-provider" + results = { + {type = "item", name = "passive-provider-chest", amount = 1} + } }, { type = "recipe", @@ -1431,10 +1536,12 @@ data:extend({ category = "medium-crafting", energy_required = 6, ingredients = { - {"nullius-large-supply-chest-1", 1}, - {"nullius-large-storage-chest-2", 1} + {type = "item", name = "nullius-large-supply-chest-1", amount = 1}, + {type = "item", name = "nullius-large-storage-chest-2", amount = 1} }, - result = "nullius-large-supply-chest-2" + results = { + {type = "item", name = "nullius-large-supply-chest-2", amount = 1} + } }, { @@ -1491,9 +1598,9 @@ data:extend({ type = "item", name = "nullius-large-demand-chest-2", icons = {{ - icon = "__base__/graphics/icons/logistic-chest-requester.png", + icon = "__base__/graphics/icons/requester-chest.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "large-logistic-storage", order = "nullius-dc", @@ -1508,10 +1615,12 @@ data:extend({ always_show_made_in = true, energy_required = 2, ingredients = { - {"nullius-small-storage-chest-1", 1}, - {"nullius-sensor-1", 1} + {type = "item", name = "nullius-small-storage-chest-1", amount = 1}, + {type = "item", name = "nullius-sensor-1", amount = 1} }, - result = "nullius-small-demand-chest-1" + results = { + {type = "item", name = "nullius-small-demand-chest-1", amount = 1} + } }, { type = "recipe", @@ -1521,23 +1630,28 @@ data:extend({ always_show_made_in = true, energy_required = 3, ingredients = { - {"nullius-large-storage-chest-1", 1}, - {"nullius-small-demand-chest-1", 1} + {type = "item", name = "nullius-large-storage-chest-1", amount = 1}, + {type = "item", name = "nullius-small-demand-chest-1", amount = 1} }, - result = "nullius-large-demand-chest-1" + results = { + {type = "item", name = "nullius-large-demand-chest-1", amount = 1} + } }, { type = "recipe", name = "nullius-small-demand-chest-2", + localised_name = {"entity-name.nullius-small-demand-chest-2"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 4, ingredients = { - {"nullius-small-demand-chest-1", 1}, - {"logistic-chest-storage", 1} + {type = "item", name = "nullius-small-demand-chest-1", amount = 1}, + {type = "item", name = "storage-chest", amount = 1} }, - result = "logistic-chest-requester" + results = { + {type = "item", name = "requester-chest", amount = 1} + } }, { type = "recipe", @@ -1547,10 +1661,12 @@ data:extend({ category = "medium-crafting", energy_required = 6, ingredients = { - {"nullius-large-demand-chest-1", 1}, - {"nullius-large-storage-chest-2", 1} + {type = "item", name = "nullius-large-demand-chest-1", amount = 1}, + {type = "item", name = "nullius-large-storage-chest-2", amount = 1} }, - result = "nullius-large-demand-chest-2" + results = { + {type = "item", name = "nullius-large-demand-chest-2", amount = 1} + } }, { @@ -1607,9 +1723,9 @@ data:extend({ type = "item", name = "nullius-large-buffer-chest-2", icons = {{ - icon = "__base__/graphics/icons/logistic-chest-buffer.png", + icon = "__base__/graphics/icons/buffer-chest.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "large-logistic-storage", order = "nullius-ec", @@ -1624,10 +1740,12 @@ data:extend({ always_show_made_in = true, energy_required = 2, ingredients = { - {"nullius-small-demand-chest-1", 1}, - {"green-wire", 2} + {type = "item", name = "nullius-small-demand-chest-1", amount = 1}, + {type = "item", name = "nullius-green-wire", amount = 2} }, - result = "nullius-small-buffer-chest-1" + results = { + {type = "item", name = "nullius-small-buffer-chest-1", amount = 1} + } }, { type = "recipe", @@ -1637,23 +1755,28 @@ data:extend({ always_show_made_in = true, energy_required = 3, ingredients = { - {"nullius-large-storage-chest-1", 1}, - {"nullius-small-buffer-chest-1", 1} + {type = "item", name = "nullius-large-storage-chest-1", amount = 1}, + {type = "item", name = "nullius-small-buffer-chest-1", amount = 1} }, - result = "nullius-large-buffer-chest-1" + results = { + {type = "item", name = "nullius-large-buffer-chest-1", amount = 1} + } }, { type = "recipe", name = "nullius-small-buffer-chest-2", + localised_name = {"entity-name.nullius-small-buffer-chest-2"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 4, ingredients = { - {"nullius-small-buffer-chest-1", 1}, - {"logistic-chest-storage", 1} + {type = "item", name = "nullius-small-buffer-chest-1", amount = 1}, + {type = "item", name = "storage-chest", amount = 1} }, - result = "logistic-chest-buffer" + results = { + {type = "item", name = "buffer-chest", amount = 1} + } }, { type = "recipe", @@ -1663,10 +1786,12 @@ data:extend({ category = "medium-crafting", energy_required = 6, ingredients = { - {"nullius-large-buffer-chest-1", 1}, - {"nullius-large-storage-chest-2", 1} + {type = "item", name = "nullius-large-buffer-chest-1", amount = 1}, + {type = "item", name = "nullius-large-storage-chest-2", amount = 1} }, - result = "nullius-large-buffer-chest-2" + results = { + {type = "item", name = "nullius-large-buffer-chest-2", amount = 1} + } }, { @@ -1723,9 +1848,9 @@ data:extend({ type = "item", name = "nullius-large-dispatch-chest-2", icons = {{ - icon = "__base__/graphics/icons/logistic-chest-active-provider.png", + icon = "__base__/graphics/icons/active-provider-chest.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "large-logistic-storage", order = "nullius-fc", @@ -1740,10 +1865,12 @@ data:extend({ always_show_made_in = true, energy_required = 2, ingredients = { - {"nullius-small-supply-chest-1", 1}, - {"green-wire", 1} + {type = "item", name = "nullius-small-supply-chest-1", amount = 1}, + {type = "item", name = "nullius-green-wire", amount = 1} }, - result = "nullius-small-dispatch-chest-1" + results = { + {type = "item", name = "nullius-small-dispatch-chest-1", amount = 1} + } }, { type = "recipe", @@ -1753,23 +1880,28 @@ data:extend({ always_show_made_in = true, energy_required = 3, ingredients = { - {"nullius-large-storage-chest-1", 1}, - {"nullius-small-dispatch-chest-1", 1} + {type = "item", name = "nullius-large-storage-chest-1", amount = 1}, + {type = "item", name = "nullius-small-dispatch-chest-1", amount = 1} }, - result = "nullius-large-dispatch-chest-1" + results = { + {type = "item", name = "nullius-large-dispatch-chest-1", amount = 1} + } }, { type = "recipe", name = "nullius-small-dispatch-chest-2", + localised_name = {"entity-name.nullius-small-dispatch-chest-2"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 4, ingredients = { - {"nullius-small-dispatch-chest-1", 1}, - {"logistic-chest-storage", 1} + {type = "item", name = "nullius-small-dispatch-chest-1", amount = 1}, + {type = "item", name = "storage-chest", amount = 1} }, - result = "logistic-chest-active-provider" + results = { + {type = "item", name = "active-provider-chest", amount = 1} + } }, { type = "recipe", @@ -1779,10 +1911,12 @@ data:extend({ category = "medium-crafting", energy_required = 6, ingredients = { - {"nullius-large-dispatch-chest-1", 1}, - {"nullius-large-storage-chest-2", 1} + {type = "item", name = "nullius-large-dispatch-chest-1", amount = 1}, + {type = "item", name = "nullius-large-storage-chest-2", amount = 1} }, - result = "nullius-large-dispatch-chest-2" + results = { + {type = "item", name = "nullius-large-dispatch-chest-2", amount = 1} + } }, { @@ -1791,7 +1925,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/accumulator.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.9, 0.85, 0.7} }}, subgroup = "energy", @@ -1805,7 +1939,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/accumulator.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "energy", order = "nullius-fc", @@ -1818,7 +1952,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/accumulator.png", icon_size = 64, - icon_mipmaps = 4, + tint = {1, 0.85, 1} }}, subgroup = "energy", @@ -1834,14 +1968,16 @@ data:extend({ always_show_made_in = true, energy_required = 6, ingredients = { - {"nullius-steel-sheet", 2}, - {"nullius-battery-1", 3}, - {"power-switch", 1}, - {"nullius-sensor-1", 1}, - {"nullius-capacitor", 3}, - {"nullius-transformer", 1} + {type = "item", name = "nullius-steel-sheet", amount = 2}, + {type = "item", name = "nullius-battery-1", amount = 3}, + {type = "item", name = "power-switch", amount = 1}, + {type = "item", name = "nullius-sensor-1", amount = 1}, + {type = "item", name = "nullius-capacitor", amount = 3}, + {type = "item", name = "nullius-transformer", amount = 1} }, - result = "nullius-grid-battery-1" + results = { + {type = "item", name = "nullius-grid-battery-1", amount = 1} + } }, { type = "recipe", @@ -1852,14 +1988,16 @@ data:extend({ always_show_made_in = true, energy_required = 30, ingredients = { - {"nullius-box-steel-sheet", 2}, - {"nullius-box-battery-1", 3}, - {"nullius-box-power-switch", 1}, - {"nullius-box-sensor-1", 1}, - {"nullius-box-capacitor", 3}, - {"nullius-box-transformer", 1} + {type = "item", name = "nullius-box-steel-sheet", amount = 2}, + {type = "item", name = "nullius-box-battery-1", amount = 3}, + {type = "item", name = "nullius-box-power-switch", amount = 1}, + {type = "item", name = "nullius-box-sensor-1", amount = 1}, + {type = "item", name = "nullius-box-capacitor", amount = 3}, + {type = "item", name = "nullius-box-transformer", amount = 1} }, - result = "nullius-box-grid-battery-1" + results = { + {type = "item", name = "nullius-box-grid-battery-1", amount = 1} + } }, { type = "recipe", @@ -1869,14 +2007,16 @@ data:extend({ category = "large-crafting", energy_required = 15, ingredients = { - {"nullius-grid-battery-1", 2}, - {"nullius-fiberglass", 3}, - {"nullius-battery-2", 4}, - {"nullius-sensor-2", 1}, - {"nullius-power-pole-4", 1}, - {"nullius-heat-pipe-2", 2} + {type = "item", name = "nullius-grid-battery-1", amount = 2}, + {type = "item", name = "nullius-fiberglass", amount = 3}, + {type = "item", name = "nullius-battery-2", amount = 4}, + {type = "item", name = "nullius-sensor-2", amount = 1}, + {type = "item", name = "nullius-power-pole-4", amount = 1}, + {type = "item", name = "nullius-heat-pipe-2", amount = 2} }, - result = "nullius-grid-battery-2" + results = { + {type = "item", name = "nullius-grid-battery-2", amount = 1} + } }, { type = "recipe", @@ -1887,14 +2027,16 @@ data:extend({ subgroup = "boxed-renewable", energy_required = 75, ingredients = { - {"nullius-box-grid-battery-1", 2}, - {"nullius-box-fiberglass", 3}, - {"nullius-box-battery-2", 4}, - {"nullius-box-sensor-2", 1}, - {"nullius-box-power-pole-4", 1}, - {"nullius-box-heat-pipe-2", 2} + {type = "item", name = "nullius-box-grid-battery-1", amount = 2}, + {type = "item", name = "nullius-box-fiberglass", amount = 3}, + {type = "item", name = "nullius-box-battery-2", amount = 4}, + {type = "item", name = "nullius-box-sensor-2", amount = 1}, + {type = "item", name = "nullius-box-power-pole-4", amount = 1}, + {type = "item", name = "nullius-box-heat-pipe-2", amount = 2} }, - result = "nullius-box-grid-battery-2" + results = { + {type = "item", name = "nullius-box-grid-battery-2", amount = 1} + } }, { type = "recipe", @@ -1904,10 +2046,12 @@ data:extend({ category = "large-crafting", energy_required = 50, ingredients = { - {"nullius-box-grid-battery-2", 1}, - {"nullius-battery-3", 3} + {type = "item", name = "nullius-box-grid-battery-2", amount = 1}, + {type = "item", name = "nullius-battery-3", amount = 3} }, - result = "nullius-grid-battery-3" + results = { + {type = "item", name = "nullius-grid-battery-3", amount = 1} + } }, { @@ -1930,13 +2074,15 @@ data:extend({ always_show_made_in = true, energy_required = 20, ingredients = { - {"nullius-aluminum-sheet", 4}, - {"nullius-glass", 5}, - {"decider-combinator", 6}, - {"inserter", 3}, - {"small-lamp", 2} + {type = "item", name = "nullius-aluminum-sheet", amount = 4}, + {type = "item", name = "nullius-glass", amount = 5}, + {type = "item", name = "decider-combinator", amount = 6}, + {type = "item", name = "inserter", amount = 3}, + {type = "item", name = "small-lamp", amount = 2} }, - result = "nullius-lab-1" + results = { + {type = "item", name = "nullius-lab-1", amount = 1} + } }, { @@ -1959,15 +2105,17 @@ data:extend({ always_show_made_in = true, energy_required = 45, ingredients = { - {"nullius-chemical-plant-2", 1}, - {"radar", 1}, - {"nullius-beacon-1", 1}, - {"nullius-processor-1", 8}, - {"stack-filter-inserter", 2}, - {"stone-wall", 6}, - {"gate", 2} + {type = "item", name = "nullius-chemical-plant-2", amount = 1}, + {type = "item", name = "radar", amount = 1}, + {type = "item", name = "nullius-beacon-1", amount = 1}, + {type = "item", name = "nullius-processor-1", amount = 8}, + {type = "item", name = "bulk-inserter", amount = 2}, + {type = "item", name = "stone-wall", amount = 6}, + {type = "item", name = "gate", amount = 2} }, - result = "nullius-lab-2" + results = { + {type = "item", name = "nullius-lab-2", amount = 1} + } }, { @@ -1990,13 +2138,15 @@ data:extend({ always_show_made_in = true, energy_required = 90, ingredients = { - {"nullius-lab-2", 2}, - {"nullius-nanofabricator-2", 1}, - {"nullius-sensor-node-3", 1}, - {"nullius-box-processor-2", 2}, - {"nullius-logistic-bot-3", 2} + {type = "item", name = "nullius-lab-2", amount = 2}, + {type = "item", name = "nullius-nanofabricator-2", amount = 1}, + {type = "item", name = "nullius-sensor-node-3", amount = 1}, + {type = "item", name = "nullius-box-processor-2", amount = 2}, + {type = "item", name = "nullius-logistic-bot-3", amount = 2} }, - result = "nullius-lab-3" + results = { + {type = "item", name = "nullius-lab-3", amount = 1} + } }, { @@ -2019,13 +2169,15 @@ data:extend({ category = "huge-crafting", energy_required = 150, ingredients = { - {"nullius-lab-2", 3}, - {"nullius-sensor-node-2", 1}, - {"nullius-nanofabricator-1", 1}, - {"nullius-logistic-bot-2", 2}, - {"nullius-box-insulation", 10} + {type = "item", name = "nullius-lab-2", amount = 3}, + {type = "item", name = "nullius-sensor-node-2", amount = 1}, + {type = "item", name = "nullius-nanofabricator-1", amount = 1}, + {type = "item", name = "nullius-logistic-bot-2", amount = 2}, + {type = "item", name = "nullius-box-insulation", amount = 10} }, - result = "nullius-biology-lab" + results = { + {type = "item", name = "nullius-biology-lab", amount = 1} + } }, { @@ -2049,13 +2201,15 @@ data:extend({ always_show_made_in = true, energy_required = 20, ingredients = { - {"programmable-speaker", 1}, - {"constant-combinator", 2}, - {"medium-electric-pole", 1}, - {"nullius-iron-sheet", 2}, - {"nullius-capacitor", 1} + {type = "item", name = "programmable-speaker", amount = 1}, + {type = "item", name = "constant-combinator", amount = 2}, + {type = "item", name = "medium-electric-pole", amount = 1}, + {type = "item", name = "nullius-iron-sheet", amount = 2}, + {type = "item", name = "nullius-capacitor", amount = 1} }, - result = "nullius-beacon-1" + results = { + {type = "item", name = "nullius-beacon-1", amount = 1} + } }, { type = "recipe", @@ -2082,14 +2236,15 @@ data:extend({ order = "nullius-bb", energy_required = 90, ingredients = { - {"nullius-box-antenna", 1}, - {"nullius-box-memory-circuit", 2}, - {"nullius-box-power-pole-2", 1}, - {"nullius-box-iron-sheet", 2}, - {"nullius-box-capacitor", 1} + {type = "item", name = "nullius-box-antenna", amount = 1}, + {type = "item", name = "nullius-box-memory-circuit", amount = 2}, + {type = "item", name = "nullius-box-power-pole-2", amount = 1}, + {type = "item", name = "nullius-box-iron-sheet", amount = 2}, + {type = "item", name = "nullius-box-capacitor", amount = 1} }, - result = "nullius-beacon-1", - result_count = 5 + results = { + {type = "item", name = "nullius-beacon-1", amount = 5} + } }, { @@ -2113,13 +2268,15 @@ data:extend({ always_show_made_in = true, energy_required = 30, ingredients = { - {"nullius-beacon-1", 1}, - {"nullius-sensor-2", 1}, - {"nullius-optical-cable", 3}, - {"nullius-relay-1", 1}, - {"substation", 1} + {type = "item", name = "nullius-beacon-1", amount = 1}, + {type = "item", name = "nullius-sensor-2", amount = 1}, + {type = "item", name = "nullius-optical-cable", amount = 3}, + {type = "item", name = "nullius-relay-1", amount = 1}, + {type = "item", name = "substation", amount = 1} }, - result = "nullius-beacon-2" + results = { + {type = "item", name = "nullius-beacon-2", amount = 1} + } }, { type = "recipe", @@ -2146,14 +2303,15 @@ data:extend({ order = "nullius-bc", energy_required = 150, ingredients = { - {"nullius-beacon-1", 5}, - {"nullius-box-sensor-2", 1}, - {"nullius-box-optical-cable", 3}, - {"nullius-box-relay-1", 1}, - {"substation", 5} + {type = "item", name = "nullius-beacon-1", amount = 5}, + {type = "item", name = "nullius-box-sensor-2", amount = 1}, + {type = "item", name = "nullius-box-optical-cable", amount = 3}, + {type = "item", name = "nullius-box-relay-1", amount = 1}, + {type = "item", name = "substation", amount = 5} }, - result = "nullius-beacon-2", - result_count = 5 + results = { + {type = "item", name = "nullius-beacon-2", amount = 5} + } }, { @@ -2178,13 +2336,14 @@ data:extend({ category = "large-crafting", energy_required = 100, ingredients = { - {"nullius-beacon-2", 2}, - {"nullius-processor-2", 2}, - {"nullius-relay-3", 1}, - {"nullius-substation-2", 1} + {type = "item", name = "nullius-beacon-2", amount = 2}, + {type = "item", name = "nullius-processor-2", amount = 2}, + {type = "item", name = "nullius-relay-3", amount = 1}, + {type = "item", name = "nullius-substation-2", amount = 1} }, - result = "nullius-beacon-3", - result_count = 2 + results = { + {type = "item", name = "nullius-beacon-3", amount = 2} + } }, { type = "recipe", @@ -2210,13 +2369,14 @@ data:extend({ order = "nullius-bd", energy_required = 500, ingredients = { - {"nullius-beacon-2", 10}, - {"nullius-box-processor-2", 2}, - {"nullius-box-relay-3", 1}, - {"nullius-substation-2", 5} + {type = "item", name = "nullius-beacon-2", amount = 10}, + {type = "item", name = "nullius-box-processor-2", amount = 2}, + {type = "item", name = "nullius-box-relay-3", amount = 1}, + {type = "item", name = "nullius-substation-2", amount = 5} }, - result = "nullius-beacon-3", - result_count = 10 + results = { + {type = "item", name = "nullius-beacon-3", amount = 10} + } }, { @@ -2238,7 +2398,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/beacon.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "beacon", order = "nullius-cc", @@ -2255,13 +2415,14 @@ data:extend({ category = "large-crafting", energy_required = 120, ingredients = { - {"nullius-beacon-2", 3}, - {"nullius-sensor-node-2", 1}, - {"nullius-relay-2", 1}, - {"nullius-productivity-module-1", 1} + {type = "item", name = "nullius-beacon-2", amount = 3}, + {type = "item", name = "nullius-sensor-node-2", amount = 1}, + {type = "item", name = "nullius-relay-2", amount = 1}, + {type = "item", name = "nullius-productivity-module-1", amount = 1} }, - result = "nullius-large-beacon-1", - result_count = 2 + results = { + {type = "item", name = "nullius-large-beacon-1", amount = 2} + } }, { type = "recipe", @@ -2273,14 +2434,15 @@ data:extend({ category = "large-crafting", energy_required = 180, ingredients = { - {"nullius-large-beacon-1", 3}, - {"nullius-beacon-3", 5}, - {"nullius-telekinesis-field-2", 1}, - {"nullius-sensor-node-3", 1}, - {"nullius-productivity-module-2", 1} + {type = "item", name = "nullius-large-beacon-1", amount = 3}, + {type = "item", name = "nullius-beacon-3", amount = 5}, + {type = "item", name = "nullius-telekinesis-field-2", amount = 1}, + {type = "item", name = "nullius-sensor-node-3", amount = 1}, + {type = "item", name = "nullius-productivity-module-2", amount = 1} }, - result = "nullius-large-beacon-2", - result_count = 3 + results = { + {type = "item", name = "nullius-large-beacon-2", amount = 3} + } }, { type = "recipe", @@ -2293,29 +2455,34 @@ data:extend({ category = "large-crafting", energy_required = 120, ingredients = { - {"nullius-large-beacon-1", 1}, - {"nullius-beacon-3", 3}, - {"nullius-sensor-node-3", 1}, - {"nullius-productivity-module-2", 1} + {type = "item", name = "nullius-large-beacon-1", amount = 1}, + {type = "item", name = "nullius-beacon-3", amount = 3}, + {type = "item", name = "nullius-sensor-node-3", amount = 1}, + {type = "item", name = "nullius-productivity-module-2", amount = 1} }, - result = "nullius-large-beacon-2" + results = { + {type = "item", name = "nullius-large-beacon-2", amount = 1} + } }, { type = "recipe", name = "nullius-sensor-node-1", + localised_name = {"entity-name.nullius-sensor-node-1"}, enabled = false, category = "large-crafting", always_show_made_in = true, energy_required = 10, ingredients = { - {"nullius-sensor-1", 2}, - {"programmable-speaker", 1}, - {"nullius-glass", 3}, - {"nullius-iron-sheet", 3}, - {"nullius-motor-2", 1} + {type = "item", name = "nullius-sensor-1", amount = 2}, + {type = "item", name = "programmable-speaker", amount = 1}, + {type = "item", name = "nullius-glass", amount = 3}, + {type = "item", name = "nullius-iron-sheet", amount = 3}, + {type = "item", name = "nullius-motor-2", amount = 1} }, - result = "radar" + results = { + {type = "item", name = "radar", amount = 1} + } }, { type = "recipe", @@ -2342,14 +2509,15 @@ data:extend({ order = "nullius-sb", energy_required = 45, ingredients = { - {"nullius-box-sensor-1", 2}, - {"nullius-box-antenna", 1}, - {"nullius-box-glass", 3}, - {"nullius-box-iron-sheet", 3}, - {"nullius-box-motor-2", 1} + {type = "item", name = "nullius-box-sensor-1", amount = 2}, + {type = "item", name = "nullius-box-antenna", amount = 1}, + {type = "item", name = "nullius-box-glass", amount = 3}, + {type = "item", name = "nullius-box-iron-sheet", amount = 3}, + {type = "item", name = "nullius-box-motor-2", amount = 1} }, - result = "radar", - result_count = 5 + results = { + {type = "item", name = "radar", amount = 5} + } }, { @@ -2358,7 +2526,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/radar.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.8, 0.8, 1} }}, subgroup = "laboratory", @@ -2374,13 +2542,15 @@ data:extend({ always_show_made_in = true, energy_required = 20, ingredients = { - {"radar", 1}, - {"nullius-sensor-2", 2}, - {"nullius-hard-glass", 4}, - {"nullius-fiberglass", 4}, - {"nullius-optical-cable", 6} + {type = "item", name = "radar", amount = 1}, + {type = "item", name = "nullius-sensor-2", amount = 2}, + {type = "item", name = "nullius-hard-glass", amount = 4}, + {type = "item", name = "nullius-fiberglass", amount = 4}, + {type = "item", name = "nullius-optical-cable", amount = 6} }, - result = "nullius-sensor-node-2" + results = { + {type = "item", name = "nullius-sensor-node-2", amount = 1} + } }, { type = "recipe", @@ -2407,14 +2577,15 @@ data:extend({ order = "nullius-sc", energy_required = 100, ingredients = { - {"radar", 5}, - {"nullius-box-sensor-2", 3}, - {"nullius-box-hard-glass", 4}, - {"nullius-box-fiberglass", 4}, - {"nullius-box-optical-cable", 6} + {type = "item", name = "radar", amount = 5}, + {type = "item", name = "nullius-box-sensor-2", amount = 3}, + {type = "item", name = "nullius-box-hard-glass", amount = 4}, + {type = "item", name = "nullius-box-fiberglass", amount = 4}, + {type = "item", name = "nullius-box-optical-cable", amount = 6} }, - result = "nullius-sensor-node-2", - result_count = 5 + results = { + {type = "item", name = "nullius-sensor-node-2", amount = 5} + } }, { @@ -2423,7 +2594,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/radar.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "laboratory", order = "nullius-dd", @@ -2438,31 +2609,35 @@ data:extend({ always_show_made_in = true, energy_required = 40, ingredients = { - {"nullius-sensor-node-2", 2}, - {"nullius-beacon-2", 1}, - {"nullius-bearing", 2}, - {"nullius-yield-module-3", 1}, - {"nullius-box-reinforced-concrete", 1} + {type = "item", name = "nullius-sensor-node-2", amount = 2}, + {type = "item", name = "nullius-beacon-2", amount = 1}, + {type = "item", name = "nullius-bearing", amount = 2}, + {type = "item", name = "nullius-yield-module-3", amount = 1}, + {type = "item", name = "nullius-box-reinforced-concrete", amount = 1} }, - result = "nullius-sensor-node-3" + results = { + {type = "item", name = "nullius-sensor-node-3", amount = 1} + } }, { type = "recipe", name = "nullius-logic-circuit", + localised_name = {"entity-name.nullius-logic-circuit"}, enabled = false, show_amount_in_title = false, always_show_products = true, category = "tiny-assembly", energy_required = 5, ingredients = { - {"nullius-plastic", 3}, - {"nullius-aluminum-wire", 4}, - {"nullius-polycrystalline-silicon", 2}, - {"nullius-graphite", 1} + {type = "item", name = "nullius-plastic", amount = 3}, + {type = "item", name = "nullius-aluminum-wire", amount = 4}, + {type = "item", name = "nullius-polycrystalline-silicon", amount = 2}, + {type = "item", name = "nullius-graphite", amount = 1} }, - result = "decider-combinator", - result_count = 3 + results = { + {type = "item", name = "decider-combinator", amount = 3} + } }, { type = "recipe", @@ -2475,18 +2650,19 @@ data:extend({ order = "nullius-db", energy_required = 25, ingredients = { - {"nullius-box-plastic", 3}, - {"nullius-box-aluminum-wire", 4}, - {"nullius-box-polycrystalline-silicon", 2}, - {"nullius-box-graphite", 1} + {type = "item", name = "nullius-box-plastic", amount = 3}, + {type = "item", name = "nullius-box-aluminum-wire", amount = 4}, + {type = "item", name = "nullius-box-polycrystalline-silicon", amount = 2}, + {type = "item", name = "nullius-box-graphite", amount = 1} }, - result = "nullius-box-logic-circuit", - result_count = 3 + results = { + {type = "item", name = "nullius-box-logic-circuit", amount = 3} + } }, { type = "recipe", name = "nullius-logic-circuit-2", - localised_name = {"", {"item-name.nullius-box", {"entity-name.nullius-logic-circuit"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"entity-name.nullius-logic-circuit"}}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "crate.png", @@ -2512,12 +2688,14 @@ data:extend({ {type="item", name="nullius-box-graphite", amount=1}, {type="fluid", name="nullius-argon", amount=2, fluidbox_index=1} }, - result = "nullius-box-logic-circuit", - result_count = 5 + results = { + {type = "item", name = "nullius-box-logic-circuit", amount = 5} + } }, { type = "recipe", name = "nullius-memory-circuit", + localised_name = {"entity-name.nullius-memory-circuit"}, enabled = false, category = "tiny-crafting", always_show_made_in = true, @@ -2525,11 +2703,12 @@ data:extend({ always_show_products = true, energy_required = 7, ingredients = { - {"decider-combinator", 2}, - {"nullius-capacitor", 3} + {type = "item", name = "decider-combinator", amount = 2}, + {type = "item", name = "nullius-capacitor", amount = 3} }, - result = "constant-combinator", - result_count = 4 + results = { + {type = "item", name = "constant-combinator", amount = 4} + } }, { type = "recipe", @@ -2543,16 +2722,17 @@ data:extend({ always_show_products = true, energy_required = 35, ingredients = { - {"nullius-box-logic-circuit", 2}, - {"nullius-box-capacitor", 3} + {type = "item", name = "nullius-box-logic-circuit", amount = 2}, + {type = "item", name = "nullius-box-capacitor", amount = 3} }, - result = "nullius-box-memory-circuit", - result_count = 4 + results = { + {type = "item", name = "nullius-box-memory-circuit", amount = 4} + } }, { type = "recipe", name = "nullius-memory-circuit-2", - localised_name = {"", {"item-name.nullius-box", {"entity-name.nullius-memory-circuit"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"entity-name.nullius-memory-circuit"}}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "crate.png", @@ -2577,22 +2757,26 @@ data:extend({ {type="item", name="nullius-box-capacitor", amount=3}, {type="fluid", name="nullius-argon", amount=1, fluidbox_index=1} }, - result = "nullius-box-memory-circuit", - result_count = 5 + results = { + {type = "item", name = "nullius-box-memory-circuit", amount = 5} + } }, { type = "recipe", name = "nullius-arithmetic-circuit", + localised_name = {"entity-name.nullius-arithmetic-circuit"}, enabled = false, category = "tiny-crafting", always_show_made_in = true, energy_required = 3, ingredients = { - {"decider-combinator", 1}, - {"constant-combinator", 1}, - {"nullius-aluminum-wire", 1} + {type = "item", name = "decider-combinator", amount = 1}, + {type = "item", name = "constant-combinator", amount = 1}, + {type = "item", name = "nullius-aluminum-wire", amount = 1} }, - result = "arithmetic-combinator" + results = { + {type = "item", name = "arithmetic-combinator", amount = 1} + } }, { type = "recipe", @@ -2603,26 +2787,103 @@ data:extend({ always_show_made_in = true, energy_required = 15, ingredients = { - {"nullius-box-logic-circuit", 1}, - {"nullius-box-memory-circuit", 1}, - {"nullius-box-aluminum-wire", 1} + {type = "item", name = "nullius-box-logic-circuit", amount = 1}, + {type = "item", name = "nullius-box-memory-circuit", amount = 1}, + {type = "item", name = "nullius-box-aluminum-wire", amount = 1} }, - result = "nullius-box-arithmetic-circuit" + results = { + {type = "item", name = "nullius-box-arithmetic-circuit", amount = 1} + } + }, + { + type = "recipe", + name = "nullius-selector-circuit", + localised_name = {"entity-name.nullius-selector-circuit"}, + enabled = false, + category = "tiny-crafting", + always_show_made_in = true, + energy_required = 3, + ingredients = { + {type = "item", name = "arithmetic-combinator", amount = 1}, + {type = "item", name = "display-panel", amount = 1}, + {type = "item", name = "nullius-aluminum-wire", amount = 1}, + {type = "item", name = "nullius-polycrystalline-silicon", amount = 2}, + }, + results = { + {type = "item", name = "selector-combinator", amount = 1} + } + }, + { + type = "recipe", + name = "nullius-boxed-selector-circuit", + enabled = false, + category = "medium-only-assembly", + subgroup = "boxed-circuit", + always_show_made_in = true, + energy_required = 15, + ingredients = { + {type = "item", name = "nullius-box-arithmetic-circuit", amount = 1}, + {type = "item", name = "nullius-box-display-panel", amount = 1}, + {type = "item", name = "nullius-box-aluminum-wire", amount = 1}, + {type = "item", name = "nullius-box-polycrystalline-silicon", amount = 2}, + }, + results = { + {type = "item", name = "nullius-box-selector-circuit", amount = 1} + } + }, + { + type = "recipe", + name = "nullius-display-panel", + localised_name = {"entity-name.display-panel"}, + enabled = false, + category = "tiny-crafting", + always_show_made_in = true, + energy_required = 3, + ingredients = { + {type = "item", name = "decider-combinator", amount = 1}, + {type = "item", name = "nullius-glass", amount = 1}, + {type = "item", name = "nullius-plastic", amount = 1}, + {type = "item", name = "nullius-aluminum-wire", amount = 1} + }, + results = { + {type = "item", name = "display-panel", amount = 1} + } + }, + { + type = "recipe", + name = "nullius-boxed-display-panel", + enabled = false, + category = "medium-only-assembly", + subgroup = "boxed-circuit", + always_show_made_in = true, + energy_required = 15, + ingredients = { + {type = "item", name = "nullius-box-logic-circuit", amount = 1}, + {type = "item", name = "nullius-box-glass", amount = 1}, + {type = "item", name = "nullius-box-plastic", amount = 1}, + {type = "item", name = "nullius-box-aluminum-wire", amount = 1} + }, + results = { + {type = "item", name = "nullius-box-display-panel", amount = 1} + } }, { type = "recipe", name = "nullius-antenna", + localised_name = {"entity-name.nullius-antenna"}, enabled = false, category = "small-crafting", always_show_made_in = true, energy_required = 6, ingredients = { - {"nullius-aluminum-rod", 2}, - {"red-wire", 1}, - {"nullius-rubber", 1}, - {"nullius-capacitor", 1} + {type = "item", name = "nullius-aluminum-rod", amount = 2}, + {type = "item", name = "nullius-red-wire", amount = 1}, + {type = "item", name = "nullius-rubber", amount = 1}, + {type = "item", name = "nullius-capacitor", amount = 1} }, - result = "programmable-speaker" + results = { + {type = "item", name = "programmable-speaker", amount = 1} + } }, { type = "recipe", @@ -2633,12 +2894,14 @@ data:extend({ always_show_made_in = true, energy_required = 30, ingredients = { - {"nullius-box-aluminum-rod", 2}, - {"nullius-box-red-wire", 1}, - {"nullius-box-rubber", 1}, - {"nullius-box-capacitor", 1} + {type = "item", name = "nullius-box-aluminum-rod", amount = 2}, + {type = "item", name = "nullius-box-red-wire", amount = 1}, + {type = "item", name = "nullius-box-rubber", amount = 1}, + {type = "item", name = "nullius-box-capacitor", amount = 1} }, - result = "nullius-box-antenna" + results = { + {type = "item", name = "nullius-box-antenna", amount = 1} + } }, { @@ -2653,6 +2916,7 @@ data:extend({ { type = "recipe", name = "nullius-lamp-1a", + localised_name = {"entity-name.nullius-lamp-1"}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -2660,11 +2924,13 @@ data:extend({ category = "small-crafting", energy_required = 5, ingredients = { - {"nullius-graphite", 2}, - {"nullius-glass", 1}, - {"nullius-iron-sheet", 1} + {type = "item", name = "nullius-graphite", amount = 2}, + {type = "item", name = "nullius-glass", amount = 1}, + {type = "item", name = "nullius-iron-sheet", amount = 1} }, - result = "small-lamp" + results = { + {type = "item", name = "small-lamp", amount = 1} + } }, { type = "recipe", @@ -2689,12 +2955,13 @@ data:extend({ category = "medium-crafting", energy_required = 12, ingredients = { - {"nullius-carbon-fiber", 1}, - {"nullius-glass", 2}, - {"nullius-aluminum-sheet", 2} + {type = "item", name = "nullius-carbon-fiber", amount = 1}, + {type = "item", name = "nullius-glass", amount = 2}, + {type = "item", name = "nullius-aluminum-sheet", amount = 2} }, - result = "small-lamp", - result_count = 5 + results = { + {type = "item", name = "small-lamp", amount = 5} + } }, { type = "recipe", @@ -2707,12 +2974,13 @@ data:extend({ subgroup = "boxed-rail", energy_required = 60, ingredients = { - {"nullius-box-carbon-fiber", 1}, - {"nullius-box-glass", 2}, - {"nullius-box-aluminum-sheet", 2} + {type = "item", name = "nullius-box-carbon-fiber", amount = 1}, + {type = "item", name = "nullius-box-glass", amount = 2}, + {type = "item", name = "nullius-box-aluminum-sheet", amount = 2} }, - result = "nullius-box-lamp-1", - result_count = 5 + results = { + {type = "item", name = "nullius-box-lamp-1", amount = 5} + } }, { type = "recipe", @@ -2728,11 +2996,12 @@ data:extend({ {type="item", name="nullius-hard-glass", amount=2}, {type="item", name="nullius-sodium", amount=1}, {type="item", name="nullius-ceramic-powder", amount=1}, - {type="item", name="green-wire", amount=2}, + {type="item", name="nullius-green-wire", amount=2}, {type="fluid", name="nullius-compressed-argon", amount=10, fluidbox_index=1} }, - result = "nullius-lamp-2", - result_count = 2 + results = { + {type = "item", name = "nullius-lamp-2", amount = 2} + } }, { type = "recipe", @@ -2752,8 +3021,9 @@ data:extend({ {type="item", name="nullius-box-green-wire", amount=2}, {type="fluid", name="nullius-compressed-argon", amount=50, fluidbox_index=1} }, - result = "nullius-box-lamp-2", - result_count = 2 + results = { + {type = "item", name = "nullius-box-lamp-2", amount = 2} + } }, { @@ -2773,7 +3043,7 @@ data:extend({ name = "nullius-power-pole-4", icons = {{ icon = "__base__/graphics/icons/medium-electric-pole.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }}, subgroup = "electric-pole", order = "nullius-be", @@ -2785,7 +3055,7 @@ data:extend({ name = "nullius-pylon-2", icons = {{ icon = "__base__/graphics/icons/big-electric-pole.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }}, subgroup = "electric-pole", order = "nullius-cc", @@ -2809,7 +3079,7 @@ data:extend({ name = "nullius-substation-2", icons = {{ icon = "__base__/graphics/icons/substation.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }}, subgroup = "electric-pole", order = "nullius-dc", @@ -2832,16 +3102,19 @@ data:extend({ { type = "recipe", name = "nullius-power-pole-1", + localised_name = {"entity-name.nullius-power-pole-1"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 2, ingredients = { - {"nullius-iron-wire", 2}, - {"nullius-iron-rod", 1}, - {"nullius-plastic", 1} + {type = "item", name = "nullius-iron-wire", amount = 2}, + {type = "item", name = "nullius-iron-rod", amount = 1}, + {type = "item", name = "nullius-plastic", amount = 1} }, - result = "small-electric-pole" + results = { + {type = "item", name = "small-electric-pole", amount = 1} + } }, { type = "recipe", @@ -2854,25 +3127,29 @@ data:extend({ subgroup = "boxed-power-pole", energy_required = 5, ingredients = { - {"nullius-box-insulated-wire", 2}, - {"nullius-box-steel-rod", 1} + {type = "item", name = "nullius-box-insulated-wire", amount = 2}, + {type = "item", name = "nullius-box-steel-rod", amount = 1} }, - result = "nullius-box-power-pole-1", - result_count = 2 + results = { + {type = "item", name = "nullius-box-power-pole-1", amount = 2} + } }, { type = "recipe", name = "nullius-power-pole-2", + localised_name = {"entity-name.nullius-power-pole-2"}, enabled = false, category = "medium-crafting", always_show_made_in = true, energy_required = 3, ingredients = { - {"small-electric-pole", 1}, - {"copper-cable", 2}, - {"nullius-aluminum-rod", 1} + {type = "item", name = "small-electric-pole", amount = 1}, + {type = "item", name = "copper-cable", amount = 2}, + {type = "item", name = "nullius-aluminum-rod", amount = 1} }, - result = "medium-electric-pole" + results = { + {type = "item", name = "medium-electric-pole", amount = 1} + } }, { type = "recipe", @@ -2883,11 +3160,13 @@ data:extend({ always_show_made_in = true, energy_required = 15, ingredients = { - {"nullius-box-power-pole-1", 1}, - {"nullius-box-insulated-wire", 2}, - {"nullius-box-aluminum-rod", 1} + {type = "item", name = "nullius-box-power-pole-1", amount = 1}, + {type = "item", name = "nullius-box-insulated-wire", amount = 2}, + {type = "item", name = "nullius-box-aluminum-rod", amount = 1} }, - result = "nullius-box-power-pole-2" + results = { + {type = "item", name = "nullius-box-power-pole-2", amount = 1} + } }, { type = "recipe", @@ -2897,12 +3176,14 @@ data:extend({ always_show_made_in = true, energy_required = 5, ingredients = { - {"medium-electric-pole", 1}, - {"red-wire", 3}, - {"nullius-fiberglass", 2}, - {"nullius-ceramic-powder", 1} + {type = "item", name = "medium-electric-pole", amount = 1}, + {type = "item", name = "nullius-red-wire", amount = 3}, + {type = "item", name = "nullius-fiberglass", amount = 2}, + {type = "item", name = "nullius-ceramic-powder", amount = 1} }, - result = "nullius-power-pole-3" + results = { + {type = "item", name = "nullius-power-pole-3", amount = 1} + } }, { type = "recipe", @@ -2913,12 +3194,14 @@ data:extend({ always_show_made_in = true, energy_required = 25, ingredients = { - {"nullius-box-power-pole-2", 1}, - {"nullius-box-red-wire", 3}, - {"nullius-box-fiberglass", 2}, - {"nullius-box-ceramic-powder", 1} + {type = "item", name = "nullius-box-power-pole-2", amount = 1}, + {type = "item", name = "nullius-box-red-wire", amount = 3}, + {type = "item", name = "nullius-box-fiberglass", amount = 2}, + {type = "item", name = "nullius-box-ceramic-powder", amount = 1} }, - result = "nullius-box-power-pole-3" + results = { + {type = "item", name = "nullius-box-power-pole-3", amount = 1} + } }, { type = "recipe", @@ -2928,14 +3211,16 @@ data:extend({ category = "medium-crafting", energy_required = 8, ingredients = { - {"nullius-power-pole-3", 1}, - {"nullius-optical-cable", 2}, - {"nullius-sensor-1", 1}, - {"nullius-transformer", 1}, - {"power-switch", 1}, - {"concrete", 2} + {type = "item", name = "nullius-power-pole-3", amount = 1}, + {type = "item", name = "nullius-optical-cable", amount = 2}, + {type = "item", name = "nullius-sensor-1", amount = 1}, + {type = "item", name = "nullius-transformer", amount = 1}, + {type = "item", name = "power-switch", amount = 1}, + {type = "item", name = "concrete", amount = 2} }, - result = "nullius-power-pole-4" + results = { + {type = "item", name = "nullius-power-pole-4", amount = 1} + } }, { type = "recipe", @@ -2946,29 +3231,34 @@ data:extend({ subgroup = "boxed-power-pole", energy_required = 40, ingredients = { - {"nullius-box-power-pole-3", 1}, - {"nullius-box-optical-cable", 2}, - {"nullius-box-sensor-1", 1}, - {"nullius-box-transformer", 1}, - {"nullius-box-power-switch", 1}, - {"nullius-box-concrete", 1} + {type = "item", name = "nullius-box-power-pole-3", amount = 1}, + {type = "item", name = "nullius-box-optical-cable", amount = 2}, + {type = "item", name = "nullius-box-sensor-1", amount = 1}, + {type = "item", name = "nullius-box-transformer", amount = 1}, + {type = "item", name = "nullius-box-power-switch", amount = 1}, + {type = "item", name = "nullius-box-concrete", amount = 1} }, - result = "nullius-box-power-pole-4" + results = { + {type = "item", name = "nullius-box-power-pole-4", amount = 1} + } }, { type = "recipe", name = "nullius-pylon-1", + localised_name = {"entity-name.nullius-pylon-1"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 4, ingredients = { - {"medium-electric-pole", 1}, - {"copper-cable", 3}, - {"nullius-steel-beam", 2} + {type = "item", name = "medium-electric-pole", amount = 1}, + {type = "item", name = "copper-cable", amount = 3}, + {type = "item", name = "nullius-steel-beam", amount = 2} }, - result = "big-electric-pole" + results = { + {type = "item", name = "big-electric-pole", amount = 1} + } }, { type = "recipe", @@ -2979,11 +3269,13 @@ data:extend({ subgroup = "boxed-power-pole", energy_required = 20, ingredients = { - {"nullius-box-power-pole-2", 1}, - {"nullius-box-insulated-wire", 3}, - {"nullius-box-steel-beam", 2} + {type = "item", name = "nullius-box-power-pole-2", amount = 1}, + {type = "item", name = "nullius-box-insulated-wire", amount = 3}, + {type = "item", name = "nullius-box-steel-beam", amount = 2} }, - result = "nullius-box-pylon-1" + results = { + {type = "item", name = "nullius-box-pylon-1", amount = 1} + } }, { type = "recipe", @@ -2993,14 +3285,16 @@ data:extend({ category = "large-crafting", energy_required = 6, ingredients = { - {"big-electric-pole", 1}, - {"nullius-power-pole-3", 1}, - {"nullius-aluminum-wire", 3}, - {"nullius-steel-cable", 2}, - {"nullius-transformer", 1}, - {"concrete", 4} + {type = "item", name = "big-electric-pole", amount = 1}, + {type = "item", name = "nullius-power-pole-3", amount = 1}, + {type = "item", name = "nullius-aluminum-wire", amount = 3}, + {type = "item", name = "nullius-steel-cable", amount = 2}, + {type = "item", name = "nullius-transformer", amount = 1}, + {type = "item", name = "concrete", amount = 4} }, - result = "nullius-pylon-2" + results = { + {type = "item", name = "nullius-pylon-2", amount = 1} + } }, { type = "recipe", @@ -3011,14 +3305,16 @@ data:extend({ subgroup = "boxed-power-pole", energy_required = 30, ingredients = { - {"nullius-box-pylon-1", 1}, - {"nullius-box-power-pole-3", 1}, - {"nullius-box-aluminum-wire", 3}, - {"nullius-box-steel-cable", 2}, - {"nullius-box-transformer", 1}, - {"nullius-box-concrete", 2} + {type = "item", name = "nullius-box-pylon-1", amount = 1}, + {type = "item", name = "nullius-box-power-pole-3", amount = 1}, + {type = "item", name = "nullius-box-aluminum-wire", amount = 3}, + {type = "item", name = "nullius-box-steel-cable", amount = 2}, + {type = "item", name = "nullius-box-transformer", amount = 1}, + {type = "item", name = "nullius-box-concrete", amount = 2} }, - result = "nullius-box-pylon-2" + results = { + {type = "item", name = "nullius-box-pylon-2", amount = 1} + } }, { type = "recipe", @@ -3028,13 +3324,15 @@ data:extend({ category = "large-crafting", energy_required = 10, ingredients = { - {"nullius-pylon-2", 1}, - {"nullius-power-pole-4", 1}, - {"nullius-calcium", 10}, - {"nullius-efficiency-module-1", 1}, - {"refined-concrete", 6} + {type = "item", name = "nullius-pylon-2", amount = 1}, + {type = "item", name = "nullius-power-pole-4", amount = 1}, + {type = "item", name = "nullius-calcium", amount = 10}, + {type = "item", name = "nullius-efficiency-module-1", amount = 1}, + {type = "item", name = "refined-concrete", amount = 6} }, - result = "nullius-pylon-3" + results = { + {type = "item", name = "nullius-pylon-3", amount = 1} + } }, { type = "recipe", @@ -3045,30 +3343,35 @@ data:extend({ subgroup = "boxed-power-pole", energy_required = 50, ingredients = { - {"nullius-box-pylon-2", 1}, - {"nullius-box-power-pole-4", 1}, - {"nullius-box-calcium", 10}, - {"nullius-box-efficiency-module-1", 1}, - {"nullius-box-reinforced-concrete", 3} + {type = "item", name = "nullius-box-pylon-2", amount = 1}, + {type = "item", name = "nullius-box-power-pole-4", amount = 1}, + {type = "item", name = "nullius-box-calcium", amount = 10}, + {type = "item", name = "nullius-box-efficiency-module-1", amount = 1}, + {type = "item", name = "nullius-box-reinforced-concrete", amount = 3} }, - result = "nullius-box-pylon-3" + results = { + {type = "item", name = "nullius-box-pylon-3", amount = 1} + } }, { type = "recipe", name = "nullius-substation-1", + localised_name = {"entity-name.nullius-substation-1"}, enabled = false, category = "large-crafting", always_show_made_in = true, energy_required = 10, ingredients = { - {"big-electric-pole", 1}, - {"medium-electric-pole", 1}, - {"power-switch", 1}, - {"concrete", 6}, - {"nullius-transformer", 1} + {type = "item", name = "big-electric-pole", amount = 1}, + {type = "item", name = "medium-electric-pole", amount = 1}, + {type = "item", name = "power-switch", amount = 1}, + {type = "item", name = "concrete", amount = 6}, + {type = "item", name = "nullius-transformer", amount = 1} }, - result = "substation" + results = { + {type = "item", name = "substation", amount = 1} + } }, { type = "recipe", @@ -3094,14 +3397,15 @@ data:extend({ always_show_products = true, energy_required = 50, ingredients = { - {"nullius-box-pylon-1", 1}, - {"nullius-box-power-pole-2", 1}, - {"nullius-box-power-switch", 1}, - {"nullius-box-concrete", 3}, - {"nullius-box-transformer", 1} + {type = "item", name = "nullius-box-pylon-1", amount = 1}, + {type = "item", name = "nullius-box-power-pole-2", amount = 1}, + {type = "item", name = "nullius-box-power-switch", amount = 1}, + {type = "item", name = "nullius-box-concrete", amount = 3}, + {type = "item", name = "nullius-box-transformer", amount = 1} }, - result = "substation", - result_count = 5 + results = { + {type = "item", name = "substation", amount = 5} + } }, { type = "recipe", @@ -3111,13 +3415,15 @@ data:extend({ always_show_made_in = true, energy_required = 18, ingredients = { - {"substation", 1}, - {"nullius-pylon-2", 1}, - {"nullius-power-pole-3", 1}, - {"nullius-sensor-1", 2}, - {"nullius-battery-1", 2} + {type = "item", name = "substation", amount = 1}, + {type = "item", name = "nullius-pylon-2", amount = 1}, + {type = "item", name = "nullius-power-pole-3", amount = 1}, + {type = "item", name = "nullius-sensor-1", amount = 2}, + {type = "item", name = "nullius-battery-1", amount = 2} }, - result = "nullius-substation-2" + results = { + {type = "item", name = "nullius-substation-2", amount = 1} + } }, { type = "recipe", @@ -3143,14 +3449,15 @@ data:extend({ always_show_products = true, energy_required = 90, ingredients = { - {"substation", 5}, - {"nullius-box-pylon-2", 1}, - {"nullius-box-power-pole-3", 1}, - {"nullius-box-sensor-1", 2}, - {"nullius-box-battery-1", 2} + {type = "item", name = "substation", amount = 5}, + {type = "item", name = "nullius-box-pylon-2", amount = 1}, + {type = "item", name = "nullius-box-power-pole-3", amount = 1}, + {type = "item", name = "nullius-box-sensor-1", amount = 2}, + {type = "item", name = "nullius-box-battery-1", amount = 2} }, - result = "nullius-substation-2", - result_count = 5 + results = { + {type = "item", name = "nullius-substation-2", amount = 5} + } }, { type = "recipe", @@ -3160,14 +3467,16 @@ data:extend({ category = "large-crafting", energy_required = 40, ingredients = { - {"nullius-substation-2", 2}, - {"nullius-pylon-3", 1}, - {"nullius-power-pole-4", 2}, - {"nullius-sensor-2", 2}, - {"nullius-grid-battery-1", 1}, - {"refined-concrete", 20} + {type = "item", name = "nullius-substation-2", amount = 2}, + {type = "item", name = "nullius-pylon-3", amount = 1}, + {type = "item", name = "nullius-power-pole-4", amount = 2}, + {type = "item", name = "nullius-sensor-2", amount = 2}, + {type = "item", name = "nullius-grid-battery-1", amount = 1}, + {type = "item", name = "refined-concrete", amount = 20} }, - result = "nullius-substation-3" + results = { + {type = "item", name = "nullius-substation-3", amount = 1} + } }, { type = "recipe", @@ -3193,15 +3502,16 @@ data:extend({ order = "nullius-fd", energy_required = 200, ingredients = { - {"nullius-substation-2", 10}, - {"nullius-box-pylon-3", 1}, - {"nullius-box-power-pole-4", 2}, - {"nullius-box-sensor-2", 2}, - {"nullius-box-grid-battery-1", 1}, - {"nullius-box-reinforced-concrete", 10} + {type = "item", name = "nullius-substation-2", amount = 10}, + {type = "item", name = "nullius-box-pylon-3", amount = 1}, + {type = "item", name = "nullius-box-power-pole-4", amount = 2}, + {type = "item", name = "nullius-box-sensor-2", amount = 2}, + {type = "item", name = "nullius-box-grid-battery-1", amount = 1}, + {type = "item", name = "nullius-box-reinforced-concrete", amount = 10} }, - result = "nullius-substation-3", - result_count = 5 + results = { + {type = "item", name = "nullius-substation-3", amount = 5} + } }, { @@ -3209,7 +3519,7 @@ data:extend({ name = "nullius-reactor", icon = "__base__/graphics/icons/nuclear-reactor.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "nuclear", order = "nullius-b", place_result = "nullius-reactor", @@ -3230,7 +3540,9 @@ data:extend({ {type="item", name="nullius-large-furnace-2", amount=1}, {type="item", name="nullius-box-processor-2", amount=1} }, - result = "nullius-reactor" + results = { + {type = "item", name = "nullius-reactor", amount = 1} + } }, { @@ -3238,7 +3550,7 @@ data:extend({ name = "nullius-silo", icon = "__base__/graphics/icons/rocket-silo.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "space", order = "nullius-b", place_result = "nullius-silo", @@ -3248,7 +3560,7 @@ data:extend({ type = "recipe", name = "nullius-silo", enabled = false, - always_show_made_in = true, + always_show_made_in = true, category = "huge-crafting", energy_required = 180, ingredients = { @@ -3261,13 +3573,57 @@ data:extend({ {type="item", name="nullius-box-productivity-module-2", amount=1}, {type="item", name="nullius-lab-3", amount=1} }, - result = "nullius-silo" + results = { + {type = "item", name = "nullius-silo", amount = 1} + } + }, + + -- { + -- type = "item", -- removed, using base game item instead + -- name = "nullius-landing-pad", + -- icon = "__base__/graphics/icons/cargo-landing-pad.png", + -- icon_size = 64, + + -- subgroup = "space", + -- order = "nullius-c", + -- place_result = "cargo-landing-pad", + -- stack_size = 1 + -- }, + { + type = "recipe", + name = "nullius-landing-pad", + localised_name = {"item-name.nullius-landing-pad"}, + enabled = false, + always_show_made_in = true, + category = "huge-crafting", + energy_required = 180, + ingredients = { + {type="item", name="nullius-hangar-3", amount=2}, + {type="item", name="nullius-beacon-3", amount=4}, + {type="item", name="nullius-box-wall", amount=10}, + {type="item", name="nullius-box-steel-beam", amount=10}, + {type="item", name="nullius-box-plastic", amount=25}, + {type="item", name="nullius-box-rubber", amount=25}, + {type="item", name="nullius-box-textile", amount=25}, + {type="item", name="nullius-box-heat-pipe-3", amount=4}, + {type="item", name="nullius-box-hazard-concrete", amount=30}, + {type="item", name="nullius-large-supply-chest-2", amount=8}, + {type="item", name="nullius-box-sensor-2", amount=4}, + {type="item", name="nullius-box-logistic-bot-3", amount=5}, + --{type="item", name="nullius-box-productivity-module-2", amount=1}, + --{type="item", name="nullius-multi-tool-2", amount=15}, + --{type="item", name="nullius-armor-plate", amount=50}, --unlocked too late + }, + results = { + --{type = "item", name = "nullius-landing-pad", amount = 1} + {type = "item", name = "cargo-landing-pad", amount = 1} + } }, { type = "item", name = "nullius-solar-collector-1", - localised_name = {"", {"entity-name.nullius-solar-collector"}, " ", 1}, + localised_name = {"", {"entity-name.nullius-solar-collector"}, " ", tostring(1)}, icons = {{ icon = ENTICONPATH .. "collector1.png", icon_size = 64 @@ -3280,7 +3636,7 @@ data:extend({ { type = "item", name = "nullius-solar-collector-2", - localised_name = {"", {"entity-name.nullius-solar-collector"}, " ", 2}, + localised_name = {"", {"entity-name.nullius-solar-collector"}, " ", tostring(2)}, icons = {{ icon = ENTICONPATH .. "collector2.png", icon_size = 64 @@ -3293,7 +3649,7 @@ data:extend({ { type = "item", name = "nullius-solar-collector-3", - localised_name = {"", {"entity-name.nullius-solar-collector"}, " ", 3}, + localised_name = {"", {"entity-name.nullius-solar-collector"}, " ", tostring(3)}, icons = {{ icon = ENTICONPATH .. "collector3.png", icon_size = 64 @@ -3311,12 +3667,14 @@ data:extend({ category = "large-crafting", energy_required = 8, ingredients = { - {"nullius-glass", 6}, - {"nullius-aluminum-sheet", 5}, - {"nullius-steel-rod", 3}, - {"nullius-heat-pipe-1", 4} + {type = "item", name = "nullius-glass", amount = 6}, + {type = "item", name = "nullius-aluminum-sheet", amount = 5}, + {type = "item", name = "nullius-steel-rod", amount = 3}, + {type = "item", name = "nullius-heat-pipe-1", amount = 4} }, - result = "nullius-solar-collector-1" + results = { + {type = "item", name = "nullius-solar-collector-1", amount = 1} + } }, { type = "recipe", @@ -3327,12 +3685,14 @@ data:extend({ subgroup = "boxed-heat-energy", energy_required = 40, ingredients = { - {"nullius-box-glass", 6}, - {"nullius-box-aluminum-sheet", 5}, - {"nullius-box-steel-rod", 3}, - {"nullius-box-heat-pipe-1", 4} + {type = "item", name = "nullius-box-glass", amount = 6}, + {type = "item", name = "nullius-box-aluminum-sheet", amount = 5}, + {type = "item", name = "nullius-box-steel-rod", amount = 3}, + {type = "item", name = "nullius-box-heat-pipe-1", amount = 4} }, - result = "nullius-box-solar-collector-1" + results = { + {type = "item", name = "nullius-box-solar-collector-1", amount = 1} + } }, { type = "recipe", @@ -3342,13 +3702,15 @@ data:extend({ category = "large-crafting", energy_required = 15, ingredients = { - {"nullius-solar-collector-1", 2}, - {"nullius-heat-pipe-2", 8}, - {"nullius-motor-2", 1}, - {"nullius-steel-cable", 4}, - {"nullius-titanium-sheet", 5} + {type = "item", name = "nullius-solar-collector-1", amount = 2}, + {type = "item", name = "nullius-heat-pipe-2", amount = 8}, + {type = "item", name = "nullius-motor-2", amount = 1}, + {type = "item", name = "nullius-steel-cable", amount = 4}, + {type = "item", name = "nullius-titanium-sheet", amount = 5} }, - result = "nullius-solar-collector-2" + results = { + {type = "item", name = "nullius-solar-collector-2", amount = 1} + } }, { type = "recipe", @@ -3359,13 +3721,15 @@ data:extend({ subgroup = "boxed-heat-energy", energy_required = 75, ingredients = { - {"nullius-box-solar-collector-1", 2}, - {"nullius-box-heat-pipe-2", 8}, - {"nullius-box-motor-2", 1}, - {"nullius-box-steel-cable", 4}, - {"nullius-box-titanium-sheet", 5} + {type = "item", name = "nullius-box-solar-collector-1", amount = 2}, + {type = "item", name = "nullius-box-heat-pipe-2", amount = 8}, + {type = "item", name = "nullius-box-motor-2", amount = 1}, + {type = "item", name = "nullius-box-steel-cable", amount = 4}, + {type = "item", name = "nullius-box-titanium-sheet", amount = 5} }, - result = "nullius-box-solar-collector-2" + results = { + {type = "item", name = "nullius-box-solar-collector-2", amount = 1} + } }, { type = "recipe", @@ -3375,14 +3739,16 @@ data:extend({ category = "large-crafting", energy_required = 30, ingredients = { - {"nullius-solar-collector-2", 3}, - {"nullius-hard-glass", 10}, - {"nullius-heat-pipe-3", 8}, - {"nullius-titanium-rod", 4}, - {"nullius-sensor-1", 1}, - {"nullius-monocrystalline-silicon", 12} + {type = "item", name = "nullius-solar-collector-2", amount = 3}, + {type = "item", name = "nullius-hard-glass", amount = 10}, + {type = "item", name = "nullius-heat-pipe-3", amount = 8}, + {type = "item", name = "nullius-titanium-rod", amount = 4}, + {type = "item", name = "nullius-sensor-1", amount = 1}, + {type = "item", name = "nullius-monocrystalline-silicon", amount = 12} }, - result = "nullius-solar-collector-3" + results = { + {type = "item", name = "nullius-solar-collector-3", amount = 1} + } }, { type = "recipe", @@ -3393,14 +3759,16 @@ data:extend({ subgroup = "boxed-heat-energy", energy_required = 150, ingredients = { - {"nullius-box-solar-collector-2", 3}, - {"nullius-box-hard-glass", 10}, - {"nullius-box-heat-pipe-3", 8}, - {"nullius-box-titanium-rod", 4}, - {"nullius-box-sensor-1", 1}, - {"nullius-box-monocrystalline-silicon", 12} + {type = "item", name = "nullius-box-solar-collector-2", amount = 3}, + {type = "item", name = "nullius-box-hard-glass", amount = 10}, + {type = "item", name = "nullius-box-heat-pipe-3", amount = 8}, + {type = "item", name = "nullius-box-titanium-rod", amount = 4}, + {type = "item", name = "nullius-box-sensor-1", amount = 1}, + {type = "item", name = "nullius-box-monocrystalline-silicon", amount = 12} }, - result = "nullius-box-solar-collector-3" + results = { + {type = "item", name = "nullius-box-solar-collector-3", amount = 1} + } } }) @@ -3409,15 +3777,15 @@ if mods["reskins-bobs"] then data.raw.item["nullius-grid-battery-1"].icons = { { icon = "__reskins-bobs__/graphics/icons/power/accumulator/accumulator-3-icon-base.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }, { icon = "__reskins-bobs__/graphics/icons/power/accumulator/accumulator-icon-mask.png", - icon_size = 64, icon_mipmaps = 4, tint = tiercolor("red") + icon_size = 64, tint = tiercolor("red") }, { icon = "__reskins-bobs__/graphics/icons/power/accumulator/accumulator-icon-highlights.png", - icon_size = 64, icon_mipmaps = 4, tint = {1, 1, 1, 0} + icon_size = 64, tint = {1, 1, 1, 0} } } data.raw.item["nullius-grid-battery-2"].icons = @@ -3551,15 +3919,15 @@ data.raw.item["nullius-large-beacon-2"].icons = { data.raw.item["radar"].icons = { { icon = "__reskins-bobs__/graphics/icons/warfare/radar/radar-icon-base.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }, { icon = "__reskins-bobs__/graphics/icons/warfare/radar/radar-icon-mask.png", - icon_size = 64, icon_mipmaps = 4, tint = tiercolor("yellow") + icon_size = 64, tint = tiercolor("yellow") }, { icon = "__reskins-bobs__/graphics/icons/warfare/radar/radar-icon-highlights.png", - icon_size = 64, icon_mipmaps = 4, tint = {1, 1, 1, 0} + icon_size = 64, tint = {1, 1, 1, 0} } } data.raw.item["nullius-sensor-node-2"].icons = diff --git a/nullius/prototypes/item/drone.lua b/nullius/prototypes/item/drone.lua index aa9f33d..05f9bb3 100644 --- a/nullius/prototypes/item/drone.lua +++ b/nullius/prototypes/item/drone.lua @@ -36,6 +36,7 @@ local function create_drone(base_name, group, suborder, base_suffix, stack, flar type = "capsule", name = prefix.."-remote"..suffix, icons = remote_icons, + flags = {"spawnable"}, --"only-in-cursor", "not-stackable", capsule_action = { type = "artillery-remote", flare = prefix.."-flare"..suffix @@ -49,7 +50,7 @@ local function create_drone(base_name, group, suborder, base_suffix, stack, flar local lname = nil if (number ~= nil) then - lname = {"", {"item-name."..prefix.."-drone"..suffix1}, " ", number} + lname = {"", {"item-name."..prefix.."-drone"..suffix1}, " ", tostring(number)} end data:extend({ @@ -61,8 +62,8 @@ local function create_drone(base_name, group, suborder, base_suffix, stack, flar subgroup = group, order = "nullius-"..suborder, stack_size = stack, + ammo_category = flare, ammo_type = { - category = flare, target_type = "position", action = { type = "direct", @@ -95,12 +96,14 @@ local function create_terraform(suffix, tile, suborder) category = "huge-crafting", energy_required = 60, ingredients = { - {"nullius-shallow-excavation-drone", 1}, - {"nullius-construction-bot-3", 2}, - {"rocket-fuel", 2}, - {"nullius-box-land-fill-"..tile, 200} + {type = "item", name = "nullius-shallow-excavation-drone", amount = 1}, + {type = "item", name = "nullius-construction-bot-3", amount = 2}, + {type = "item", name = "rocket-fuel", amount = 2}, + {type = "item", name = "nullius-box-land-fill-"..tile, amount = 200} }, - result = "nullius-terraforming-drone-"..suffix + results = { + {type="item", name="nullius-terraforming-drone-"..suffix, amount = 1} + } }, { type = "recipe", @@ -111,10 +114,12 @@ local function create_terraform(suffix, tile, suborder) category = "small-crafting", energy_required = 10, ingredients = { - {"nullius-shallow-excavation-remote", 1}, - {"nullius-productivity-module-1", 1} + {type = "item", name = "nullius-shallow-excavation-remote", amount = 1}, + {type = "item", name = "nullius-productivity-module-1", amount = 1} }, - result = "nullius-terraforming-remote-"..suffix + results = { + {type="item", name="nullius-terraforming-remote-"..suffix, amount = 1} + } } }) end @@ -133,12 +138,14 @@ local function create_paving(suffix, landfill, suborder, tile) category = "huge-crafting", energy_required = 25, ingredients = { - {"nullius-terraforming-drone-"..landfill, 1}, - {"nullius-logistic-bot-3", 1}, - {"rocket-fuel", 1}, - {"nullius-box-"..tile.."-concrete", 300} + {type = "item", name = "nullius-terraforming-drone-"..landfill, amount = 1}, + {type = "item", name = "nullius-logistic-bot-3", amount = 1}, + {type = "item", name = "rocket-fuel", amount = 1}, + {type = "item", name = "nullius-box-"..tile.."-concrete", amount = 300} }, - result = "nullius-paving-drone-"..suffix + results = { + {type="item", name="nullius-paving-drone-"..suffix, amount = 1} + } }, { type = "recipe", @@ -149,10 +156,12 @@ local function create_paving(suffix, landfill, suborder, tile) category = "small-crafting", energy_required = 5, ingredients = { - {"nullius-terraforming-remote-"..landfill, 1}, - {"nullius-productivity-module-2", 1} + {type = "item", name = "nullius-terraforming-remote-"..landfill, amount = 1}, + {type = "item", name = "nullius-productivity-module-2", amount = 1} }, - result = "nullius-paving-remote-"..suffix + results = { + {type="item", name="nullius-paving-remote-"..suffix, amount = 1} + } } }) end @@ -205,6 +214,7 @@ local function create_miner(mineral, suborder, group, landfill, iname, isize, it type = "capsule", name = "nullius-guide-remote-"..mineral, icons = remote_icons, + flags = {"spawnable"}, --"only-in-cursor","not-stackable", capsule_action = { type = "artillery-remote", flare = "nullius-guide-flare-"..mineral @@ -222,10 +232,12 @@ local function create_miner(mineral, suborder, group, landfill, iname, isize, it category = "small-crafting", energy_required = 10, ingredients = { - {"nullius-terraforming-remote-"..landfill, 1}, - {"nullius-yield-module-3", 1} + {type = "item", name = "nullius-terraforming-remote-"..landfill, amount = 1}, + {type = "item", name = "nullius-yield-module-3", amount = 1} }, - result = "nullius-guide-remote-"..mineral + results = { + {type="item", name="nullius-guide-remote-"..mineral, amount = 1} + } }, { type = "recipe", @@ -255,10 +267,12 @@ local function create_miner(mineral, suborder, group, landfill, iname, isize, it order = "nullius-"..suborder.."d", energy_required = 20, ingredients = { - {"nullius-guide-drone-"..mineral.."-1", 2}, - {"nullius-box-astronomy-pack", 1} + {type = "item", name = "nullius-guide-drone-"..mineral.."-1", amount = 2}, + {type = "item", name = "nullius-box-astronomy-pack", amount = 1} }, - result = "nullius-asteroid-miner-1" + results = { + {type="item", name="nullius-asteroid-miner-1", amount = 1} + } }, { type = "recipe", @@ -269,10 +283,12 @@ local function create_miner(mineral, suborder, group, landfill, iname, isize, it category = "huge-crafting", energy_required = 30, ingredients = { - {"nullius-guide-drone-"..mineral.."-1", 40}, - {"nullius-relay-3", 1} + {type = "item", name = "nullius-guide-drone-"..mineral.."-1", amount = 40}, + {type = "item", name = "nullius-relay-3", amount = 1} }, - result = "nullius-guide-drone-"..mineral.."-2" + results = { + {type="item", name="nullius-guide-drone-"..mineral.."-2", amount = 1} + } } }) end @@ -283,7 +299,7 @@ local function create_bio_drone(base, suborder, iname) { icon = "__base__/graphics/icons/defender.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = iname, @@ -319,13 +335,15 @@ local function create_farmer(base, suborder, species, spore, spore_count, category = "huge-crafting", energy_required = 60, ingredients = { - {"nullius-scout-drone-" .. drone_tier, 1}, - {"nullius-construction-bot-" .. bot_tier, 1}, - {"nullius-"..species.."-progenitor", 1}, - {"nullius-"..spore, spore_count}, + {type = "item", name = "nullius-scout-drone-" .. drone_tier, amount = 1}, + {type = "item", name = "nullius-construction-bot-" .. bot_tier, amount = 1}, + {type = "item", name = "nullius-"..species.."-progenitor", amount = 1}, + {type = "item", name = "nullius-"..spore, amount = spore_count}, cost1, cost2, cost3, cost4 }, - result = "nullius-"..base.."-drone" + results = { + {type="item", name="nullius-"..base.."-drone", amount = 1} + } }, { type = "recipe", @@ -336,10 +354,12 @@ local function create_farmer(base, suborder, species, spore, spore_count, category = "small-crafting", energy_required = 10, ingredients = { - {"nullius-"..remote, 1}, - {"nullius-"..modtype, 1} + {type = "item", name = "nullius-"..remote, amount = 1}, + {type = "item", name = "nullius-"..modtype, amount = 1} }, - result = "nullius-"..base.."-remote" + results = { + {type="item", name="nullius-"..base.."-remote", amount = 1} + } } }) end @@ -370,31 +390,42 @@ create_paving("hazard", "tan", "k") create_miner("iron", "b", 1, "red", "__base__/graphics/icons/iron-ore.png", 64) create_miner("sandstone", "c", 1, "tan", - "__angelsrefining__/graphics/icons/angels-ore6/angels-ore6-2.png", 64, {184, 125, 73}) -create_miner("bauxite", "d", 1, "brown", "__angelssmelting__/graphics/icons/ore-bauxite.png", 32) + "__angelsrefininggraphics__/graphics/icons/angels-ore6/angels-ore6-2.png", 64, {184, 125, 73}) +create_miner("bauxite", "d", 1, "brown", "__angelssmeltinggraphics__/graphics/icons/ore-bauxite.png", 32) create_miner("limestone", "e", 2, "beige", - "__angelsrefining__/graphics/icons/angels-ore6/angels-ore6-3.png", 64, {0.898, 0.773, 0.688}) + "__angelsrefininggraphics__/graphics/icons/angels-ore6/angels-ore6-3.png", 64, {0.898, 0.773, 0.688}) create_miner("copper", "f", 2, "grey", "__base__/graphics/icons/copper-ore.png", 64) create_miner("uranium", "g", 2, "grey", "__base__/graphics/icons/uranium-ore.png", 64) create_farmer("algaculture", "b", "algae", "algae-spore", 60, "scout-remote", "productivity-module-1", ICONPATH .. "algae.png", 1, 1, - {"nullius-box-mineral-dust", 10}, {"nullius-bacteria-barrel", 1}) + {type = "item", name = "nullius-box-mineral-dust", amount = 10}, + {type = "item", name = "nullius-bacteria-barrel", amount = 1}) create_farmer("horticulture", "c", "grass", "box-grass-seed", 20, "algaculture-remote", "productivity-module-1", ICONPATH .. "grass.png", 1, 1, - {"nullius-fertilizer", 20}, {"nullius-water-barrel", 10}, {"nullius-bacteria-barrel", 1}) + {type = "item", name = "nullius-fertilizer", amount = 20}, + {type = "item", name = "nullius-water-barrel", amount = 10}, + {type = "item", name = "nullius-bacteria-barrel", amount = 1}) create_farmer("arboriculture", "d", "tree", "tree-seed", 40, "horticulture-remote", "productivity-module-2", "__base__/graphics/icons/tree-08.png", 2, 1, - {"nullius-fertilizer", 30}, {"nullius-water-barrel", 15}, {"nullius-worm", 10}) + {type = "item", name = "nullius-fertilizer", amount = 30}, + {type = "item", name = "nullius-water-barrel", amount = 15}, + {type = "item", name = "nullius-worm", amount = 10}) create_farmer("entomology", "e", "worm", "worm-egg", 40, "algaculture-remote", "productivity-module-2", "__base__/graphics/icons/small-worm.png", 1, 2, - {"nullius-grass", 30}, {"nullius-sludge-barrel", 5}, {"nullius-bacteria-barrel", 2}) + {type = "item", name = "nullius-grass", amount = 30}, + {type = "item", name = "nullius-sludge-barrel", amount = 5}, + {type = "item", name = "nullius-bacteria-barrel", amount = 2}) create_farmer("aquaculture", "f", "fish", "fish-egg", 50, "entomology-remote", "productivity-module-2", "__base__/graphics/icons/fish.png", 2, 2, - {"nullius-algae", 40}, {"nullius-worm", 20}) + {type = "item", name = "nullius-algae", amount = 40}, + {type = "item", name = "nullius-worm", amount = 20}) create_farmer("husbandry", "g", "arthropod", "arthropod-egg", 30, "aquaculture-remote", "productivity-module-3", "__base__/graphics/icons/small-biter.png", 2, 3, - {"nullius-box-wood", 15}, {"nullius-fish", 40}, {"nullius-arthropod", 5}, {"nullius-shackle", 6}) + {type = "item", name = "nullius-box-wood", amount = 15}, + {type = "item", name = "nullius-fish", amount = 40}, + {type = "item", name = "nullius-arthropod", amount = 5}, + {type = "item", name = "nullius-shackle", amount = 6}) create_bio_drone("sequestration-coal", "cb", "__base__/graphics/icons/coal-1.png") create_bio_drone("sequestration-petroleum", "cc", "__base__/graphics/icons/fluid/crude-oil.png") @@ -409,12 +440,14 @@ data:extend({ category = "small-crafting", energy_required = 4, ingredients = { - {"nullius-robot-frame-1", 1}, - {"nullius-haste-module-1", 1}, - {"nullius-sensor-2", 1}, - {"nullius-missile-1", 1} - }, - result = "nullius-scout-drone-1" + {type = "item", name = "nullius-robot-frame-1", amount = 1}, + {type = "item", name = "nullius-haste-module-1", amount = 1}, + {type = "item", name = "nullius-sensor-2", amount = 1}, + {type = "item", name = "nullius-missile-1", amount = 1} + }, + results = { + {type="item", name="nullius-scout-drone-1", amount = 1} + } }, { type = "recipe", @@ -424,11 +457,13 @@ data:extend({ category = "small-crafting", energy_required = 5, ingredients = { - {"nullius-scout-drone-1", 2}, - {"nullius-robot-frame-2", 1}, - {"nullius-processor-2", 2} + {type = "item", name = "nullius-scout-drone-1", amount = 2}, + {type = "item", name = "nullius-robot-frame-2", amount = 1}, + {type = "item", name = "nullius-processor-2", amount = 2} }, - result = "nullius-scout-drone-2" + results = { + {type="item", name="nullius-scout-drone-2", amount = 1} + } }, { @@ -436,6 +471,7 @@ data:extend({ name = "nullius-scout-remote", icon = ICONPATH .. "scout-remote.png", icon_size = 64, + flags = {"spawnable"}, --"only-in-cursor", "not-stackable", capsule_action = { type = "artillery-remote", flare = "nullius-scout-flare" @@ -452,10 +488,12 @@ data:extend({ always_show_made_in = true, energy_required = 10, ingredients = { - {"nullius-sensor-2", 1}, - {"programmable-speaker", 1} + {type = "item", name = "nullius-sensor-2", amount = 1}, + {type = "item", name = "programmable-speaker", amount = 1} }, - result = "nullius-scout-remote" + results = { + {type="item", name="nullius-scout-remote", amount = 1} + } }, { @@ -466,12 +504,14 @@ data:extend({ category = "small-crafting", energy_required = 10, ingredients = { - {"nullius-scout-drone-2", 1}, - {"nullius-missile-launcher", 1}, - {"nullius-box-missile-1", 2}, - {"nullius-rock-picker", 1} - }, - result = "nullius-demolition-drone" + {type = "item", name = "nullius-scout-drone-2", amount = 1}, + {type = "item", name = "nullius-missile-launcher", amount = 1}, + {type = "item", name = "nullius-box-missile-1", amount = 2}, + {type = "item", name = "nullius-rock-picker", amount = 1} + }, + results = { + {type="item", name="nullius-demolition-drone", amount = 1} + } }, { type = "recipe", @@ -484,11 +524,13 @@ data:extend({ category = "small-crafting", energy_required = 10, ingredients = { - {"nullius-scout-drone-2", 1}, - {"nullius-missile-launcher", 1}, - {"nullius-box-missile-1", 2} + {type = "item", name = "nullius-scout-drone-2", amount = 1}, + {type = "item", name = "nullius-missile-launcher", amount = 1}, + {type = "item", name = "nullius-box-missile-1", amount = 2} }, - result = "nullius-demolition-drone" + results = { + {type="item", name="nullius-demolition-drone", amount = 1} + } }, { type = "recipe", @@ -499,10 +541,12 @@ data:extend({ category = "small-crafting", energy_required = 10, ingredients = { - {"nullius-scout-remote", 1}, - {"nullius-processor-1", 1} + {type = "item", name = "nullius-scout-remote", amount = 1}, + {type = "item", name = "nullius-processor-1", amount = 1} }, - result = "nullius-demolition-remote" + results = { + {type="item", name="nullius-demolition-remote", amount = 1} + } }, { @@ -513,12 +557,14 @@ data:extend({ category = "small-crafting", energy_required = 10, ingredients = { - {"nullius-demolition-drone", 1}, - {"nullius-missile-2", 3}, - {"nullius-trash-compactor", 1}, - {"nullius-large-cargo-pod-2", 2} - }, - result = "nullius-shallow-excavation-drone" + {type = "item", name = "nullius-demolition-drone", amount = 1}, + {type = "item", name = "nullius-missile-2", amount = 3}, + {type = "item", name = "nullius-trash-compactor", amount = 1}, + {type = "item", name = "nullius-large-cargo-pod-2", amount = 2} + }, + results = { + {type="item", name="nullius-shallow-excavation-drone", amount = 1} + } }, { type = "recipe", @@ -529,10 +575,12 @@ data:extend({ category = "small-crafting", energy_required = 4, ingredients = { - {"nullius-shallow-excavation-drone", 1}, - {"nullius-missile-2", 2} + {type = "item", name = "nullius-shallow-excavation-drone", amount = 1}, + {type = "item", name = "nullius-missile-2", amount = 2} }, - result = "nullius-excavation-drone" + results = { + {type="item", name="nullius-excavation-drone", amount = 1} + } }, { type = "recipe", @@ -545,10 +593,12 @@ data:extend({ category = "small-crafting", energy_required = 10, ingredients = { - {"nullius-demolition-drone", 1}, - {"nullius-box-missile-2", 1} + {type = "item", name = "nullius-demolition-drone", amount = 1}, + {type = "item", name = "nullius-box-missile-2", amount = 1} }, - result = "nullius-excavation-drone" + results = { + {type="item", name="nullius-excavation-drone", amount = 1} + } }, { type = "recipe", @@ -559,10 +609,12 @@ data:extend({ category = "small-crafting", energy_required = 5, ingredients = { - {"nullius-demolition-remote", 1}, - {"nullius-processor-2", 1} + {type = "item", name = "nullius-demolition-remote", amount = 1}, + {type = "item", name = "nullius-processor-2", amount = 1} }, - result = "nullius-shallow-excavation-remote" + results = { + {type="item", name="nullius-shallow-excavation-remote", amount = 1} + } }, { type = "recipe", @@ -573,10 +625,12 @@ data:extend({ category = "small-crafting", energy_required = 3, ingredients = { - {"nullius-shallow-excavation-remote", 1}, - {"red-wire", 1} + {type = "item", name = "nullius-shallow-excavation-remote", amount = 1}, + {type = "item", name = "nullius-red-wire", amount = 1} }, - result = "nullius-excavation-remote" + results = { + {type="item", name="nullius-excavation-remote", amount = 1} + } }, { @@ -585,7 +639,6 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/artillery-turret.png", icon_size = 64, - icon_mipmaps = 4, tint = {0.7, 0.7, 0.9} }}, subgroup = "drone-launcher", @@ -601,14 +654,16 @@ data:extend({ always_show_made_in = true, energy_required = 20, ingredients = { - {"radar", 1}, - {"nullius-beacon-1", 1}, - {"nullius-hangar-1", 1}, - {"nullius-missile-launcher", 4}, - {"nullius-motor-2", 2}, - {"nullius-bearing", 3} - }, - result = "nullius-drone-launcher-1" + {type = "item", name = "radar", amount = 1}, + {type = "item", name = "nullius-beacon-1", amount = 1}, + {type = "item", name = "nullius-hangar-1", amount = 1}, + {type = "item", name = "nullius-missile-launcher", amount = 4}, + {type = "item", name = "nullius-motor-2", amount = 2}, + {type = "item", name = "nullius-bearing", amount = 3} + }, + results = { + {type="item", name="nullius-drone-launcher-1", amount = 1} + } }, { @@ -617,7 +672,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/artillery-turret.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "drone-launcher", order = "nullius-ec", @@ -632,12 +687,14 @@ data:extend({ category = "huge-crafting", energy_required = 30, ingredients = { - {"nullius-drone-launcher-1", 2}, - {"nullius-sensor-node-3", 1}, - {"nullius-hangar-2", 1}, - {"nullius-productivity-module-1", 1} - }, - result = "nullius-drone-launcher-2" + {type = "item", name = "nullius-drone-launcher-1", amount = 2}, + {type = "item", name = "nullius-sensor-node-3", amount = 1}, + {type = "item", name = "nullius-hangar-2", amount = 1}, + {type = "item", name = "nullius-productivity-module-1", amount = 1} + }, + results = { + {type="item", name="nullius-drone-launcher-2", amount = 1} + } }, { @@ -646,7 +703,6 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/artillery-wagon.png", icon_size = 64, - icon_mipmaps = 4, tint = {0.7, 0.7, 0.9} }}, subgroup = "drone-launcher", @@ -662,10 +718,12 @@ data:extend({ always_show_made_in = true, energy_required = 12, ingredients = { - {"nullius-cargo-wagon-2", 1}, - {"nullius-drone-launcher-1", 1} + {type = "item", name = "nullius-cargo-wagon-2", amount = 1}, + {type = "item", name = "nullius-drone-launcher-1", amount = 1} }, - result = "nullius-drone-carrier-1" + results = { + {type="item", name="nullius-drone-carrier-1", amount = 1} + } }, { @@ -674,7 +732,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/artillery-wagon.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "drone-launcher", order = "nullius-fc", @@ -689,11 +747,13 @@ data:extend({ category = "huge-crafting", energy_required = 20, ingredients = { - {"nullius-drone-carrier-1", 1}, - {"nullius-cargo-wagon-3", 1}, - {"nullius-drone-launcher-2", 1} + {type = "item", name = "nullius-drone-carrier-1", amount = 1}, + {type = "item", name = "nullius-cargo-wagon-3", amount = 1}, + {type = "item", name = "nullius-drone-launcher-2", amount = 1} }, - result = "nullius-drone-carrier-2" + results = { + {type="item", name="nullius-drone-carrier-2", amount = 1} + } }, { @@ -706,13 +766,15 @@ data:extend({ subgroup = "space", order = "nullius-eb", stack_size = 1, + weight = 1000000, + send_to_orbit_mode = "automated", rocket_launch_products = { - {name="nullius-guide-drone-iron-1", amount=1, probability=0.3}, - {name="nullius-guide-drone-sandstone-1", amount=1, probability=0.2}, - {name="nullius-guide-drone-bauxite-1", amount=1, probability=0.2}, - {name="nullius-guide-drone-limestone-1", amount=1, probability=0.1}, - {name="nullius-guide-drone-copper-1", amount=1, probability=0.1}, - {name="nullius-guide-drone-uranium-1", amount=1, probability=0.1} + {type = "item", name="nullius-guide-drone-iron-1", amount=1, probability=0.3}, + {type = "item", name="nullius-guide-drone-sandstone-1", amount=1, probability=0.2}, + {type = "item", name="nullius-guide-drone-bauxite-1", amount=1, probability=0.2}, + {type = "item", name="nullius-guide-drone-limestone-1", amount=1, probability=0.1}, + {type = "item", name="nullius-guide-drone-copper-1", amount=1, probability=0.1}, + {type = "item", name="nullius-guide-drone-uranium-1", amount=1, probability=0.1} } }, { @@ -723,16 +785,18 @@ data:extend({ category = "huge-crafting", energy_required = 120, ingredients = { - {"nullius-satellite", 1}, - {"nullius-box-rocket-fuel", 25}, - {"nullius-excavation-drone", 3}, - {"nullius-medium-miner-3", 5}, - {"nullius-drone-launcher-2", 1}, - {"nullius-construction-bot-3", 3}, - {"nullius-box-astronomy-pack", 6}, - {"nullius-large-buffer-chest-2", 4} - }, - result = "nullius-asteroid-miner-1" + {type = "item", name = "nullius-satellite", amount = 1}, + {type = "item", name = "nullius-box-rocket-fuel", amount = 25}, + {type = "item", name = "nullius-excavation-drone", amount = 3}, + {type = "item", name = "nullius-medium-miner-3", amount = 5}, + {type = "item", name = "nullius-drone-launcher-2", amount = 1}, + {type = "item", name = "nullius-construction-bot-3", amount = 3}, + {type = "item", name = "nullius-box-astronomy-pack", amount = 6}, + {type = "item", name = "nullius-large-buffer-chest-2", amount = 4} + }, + results = { + {type="item", name="nullius-asteroid-miner-1", amount = 1} + } }, { @@ -745,13 +809,15 @@ data:extend({ subgroup = "space", order = "nullius-ec", stack_size = 1, + weight = 1000000, + send_to_orbit_mode = "automated", rocket_launch_products = { - {name="nullius-guide-drone-iron-1", amount=1, probability=0.9}, - {name="nullius-guide-drone-sandstone-1", amount=1, probability=0.8}, - {name="nullius-guide-drone-bauxite-1", amount=1, probability=0.7}, - {name="nullius-guide-drone-limestone-1", amount=1, probability=0.5}, - {name="nullius-guide-drone-copper-1", amount=1, probability=0.4}, - {name="nullius-guide-drone-uranium-1", amount=1, probability=0.3} + {type = "item", name="nullius-guide-drone-iron-1", amount=1, probability=0.9}, + {type = "item", name="nullius-guide-drone-sandstone-1", amount=1, probability=0.8}, + {type = "item", name="nullius-guide-drone-bauxite-1", amount=1, probability=0.7}, + {type = "item", name="nullius-guide-drone-limestone-1", amount=1, probability=0.5}, + {type = "item", name="nullius-guide-drone-copper-1", amount=1, probability=0.4}, + {type = "item", name="nullius-guide-drone-uranium-1", amount=1, probability=0.3} } }, { @@ -762,20 +828,22 @@ data:extend({ category = "huge-crafting", energy_required = 240, ingredients = { - {"nullius-asteroid-miner-1", 2}, - {"nullius-antimatter", 8}, - {"nullius-turret", 4}, - {"nullius-hangar-3", 1}, - {"nullius-sensor-node-3", 1}, - {"nullius-construction-bot-4", 3}, - {"nullius-trash-compactor-2", 2} - }, - result = "nullius-asteroid-miner-2" + {type = "item", name = "nullius-asteroid-miner-1", amount = 2}, + {type = "item", name = "nullius-antimatter", amount = 8}, + {type = "item", name = "nullius-turret", amount = 4}, + {type = "item", name = "nullius-hangar-3", amount = 1}, + {type = "item", name = "nullius-sensor-node-3", amount = 1}, + {type = "item", name = "nullius-construction-bot-4", amount = 3}, + {type = "item", name = "nullius-trash-compactor-2", amount = 2} + }, + results = { + {type="item", name="nullius-asteroid-miner-2", amount = 1} + } }, { type = "item", name = "nullius-android-1", - localised_name = {"", {"item-name.nullius-android"}, " ", 1}, + localised_name = {"", {"item-name.nullius-android"}, " ", tostring(1)}, localised_description = {"item-description.nullius-android"}, icons = {{ icon = ICONPATH .. "android1.png", @@ -789,7 +857,7 @@ data:extend({ { type = "item", name = "nullius-android-2", - localised_name = {"", {"item-name.nullius-android"}, " ", 2}, + localised_name = {"", {"item-name.nullius-android"}, " ", tostring(2)}, localised_description = {"item-description.nullius-android"}, icons = {{ icon = ICONPATH .. "android2.png", @@ -808,16 +876,18 @@ data:extend({ category = "nanotechnology", energy_required = 250, ingredients = { - {"nullius-chassis-3", 1}, - {"nullius-construction-bot-2", 3}, - {"nullius-leg-augmentation-1", 2}, - {"nullius-coprocessor-productivity-2", 1}, - {"nullius-battery-1", 4}, - {"nullius-solar-panel-2", 3}, - {"nullius-night-vision-2", 2}, - {"nullius-large-cargo-pod-2", 2} - }, - result = "nullius-android-1" + {type = "item", name = "nullius-chassis-3", amount = 1}, + {type = "item", name = "nullius-construction-bot-2", amount = 3}, + {type = "item", name = "nullius-leg-augmentation-1", amount = 2}, + {type = "item", name = "nullius-coprocessor-productivity-2", amount = 1}, + {type = "item", name = "nullius-battery-1", amount = 4}, + {type = "item", name = "nullius-solar-panel-2", amount = 3}, + {type = "item", name = "nullius-night-vision-2", amount = 2}, + {type = "item", name = "nullius-large-cargo-pod-2", amount = 2} + }, + results = { + {type="item", name="nullius-android-1", amount = 1} + } }, { type = "recipe", @@ -830,17 +900,19 @@ data:extend({ category = "nanotechnology", energy_required = 250, ingredients = { - {"nullius-chassis-3", 1}, - {"nullius-construction-bot-2", 3}, - {"nullius-leg-augmentation-1", 2}, - {"nullius-productivity-module-1", 4}, - {"nullius-battery-1", 4}, - {"nullius-solar-panel-2", 3}, - {"nullius-night-vision-2", 2}, - {"nullius-hangar-2", 1}, - {"express-stack-filter-inserter", 4} - }, - result = "nullius-android-1" + {type = "item", name = "nullius-chassis-3", amount = 1}, + {type = "item", name = "nullius-construction-bot-2", amount = 3}, + {type = "item", name = "nullius-leg-augmentation-1", amount = 2}, + {type = "item", name = "nullius-productivity-module-1", amount = 4}, + {type = "item", name = "nullius-battery-1", amount = 4}, + {type = "item", name = "nullius-solar-panel-2", amount = 3}, + {type = "item", name = "nullius-night-vision-2", amount = 2}, + {type = "item", name = "nullius-hangar-2", amount = 1}, + {type = "item", name = "bob-express-bulk-inserter", amount = 4} + }, + results = { + {type="item", name="nullius-android-1", amount = 1} + } }, { type = "recipe", @@ -850,15 +922,17 @@ data:extend({ category = "nanotechnology", energy_required = 400, ingredients = { - {"nullius-android-1", 1}, - {"nullius-chassis-5", 1}, - {"nullius-construction-bot-4", 2}, - {"nullius-leg-augmentation-3", 1}, - {"nullius-coprocessor-quantum", 1}, - {"nullius-battery-2", 4}, - {"nullius-solar-panel-3", 3} - }, - result = "nullius-android-2" + {type = "item", name = "nullius-android-1", amount = 1}, + {type = "item", name = "nullius-chassis-5", amount = 1}, + {type = "item", name = "nullius-construction-bot-4", amount = 2}, + {type = "item", name = "nullius-leg-augmentation-3", amount = 1}, + {type = "item", name = "nullius-coprocessor-quantum", amount = 1}, + {type = "item", name = "nullius-battery-2", amount = 4}, + {type = "item", name = "nullius-solar-panel-3", amount = 3} + }, + results = { + {type="item", name="nullius-android-2", amount = 1} + } }, { type = "recipe", @@ -871,18 +945,20 @@ data:extend({ category = "nanotechnology", energy_required = 400, ingredients = { - {"nullius-android-1", 1}, - {"nullius-chassis-5", 1}, - {"nullius-construction-bot-4", 2}, - {"nullius-leg-augmentation-3", 1}, - {"nullius-box-processor-3", 1}, - {"nullius-efficiency-module-3", 2}, - {"nullius-battery-2", 4}, - {"nullius-solar-panel-3", 3}, - {"nullius-heat-pipe-3", 2}, - {"nullius-hangar-3", 1} - }, - result = "nullius-android-2" + {type = "item", name = "nullius-android-1", amount = 1}, + {type = "item", name = "nullius-chassis-5", amount = 1}, + {type = "item", name = "nullius-construction-bot-4", amount = 2}, + {type = "item", name = "nullius-leg-augmentation-3", amount = 1}, + {type = "item", name = "nullius-box-processor-3", amount = 1}, + {type = "item", name = "nullius-efficiency-module-3", amount = 2}, + {type = "item", name = "nullius-battery-2", amount = 4}, + {type = "item", name = "nullius-solar-panel-3", amount = 3}, + {type = "item", name = "nullius-heat-pipe-3", amount = 2}, + {type = "item", name = "nullius-hangar-3", amount = 1} + }, + results = { + {type="item", name="nullius-android-2", amount = 1} + } } }) diff --git a/nullius/prototypes/item/equipment.lua b/nullius/prototypes/item/equipment.lua index a8492d4..0fe9738 100644 --- a/nullius/prototypes/item/equipment.lua +++ b/nullius/prototypes/item/equipment.lua @@ -8,7 +8,7 @@ data:extend({ name = "nullius-chassis-1", icon = "__base__/graphics/icons/light-armor.png", icon_size = 64, - icon_mipmaps = 4, + resistances = { { type = "explosion", decrease = 2, percent = 20 }, { type = "impact", decrease = 2, percent = 20 }, @@ -25,7 +25,7 @@ data:extend({ name = "nullius-chassis-2", icon = "__base__/graphics/icons/heavy-armor.png", icon_size = 64, - icon_mipmaps = 4, + resistances = { { type = "explosion", decrease = 10, percent = 40 }, { type = "impact", decrease = 5, percent = 30 }, @@ -45,7 +45,7 @@ data:extend({ name = "nullius-chassis-3", icon = "__base__/graphics/icons/modular-armor.png", icon_size = 64, - icon_mipmaps = 4, + resistances = { { type = "explosion", decrease = 20, percent = 50 }, { type = "impact", decrease = 10, percent = 40 }, @@ -66,7 +66,7 @@ data:extend({ name = "nullius-chassis-4", icon = "__base__/graphics/icons/power-armor.png", icon_size = 64, - icon_mipmaps = 4, + resistances = { { type = "explosion", decrease = 30, percent = 60 }, { type = "impact", decrease = 20, percent = 50 }, @@ -87,7 +87,7 @@ data:extend({ name = "nullius-chassis-5", icon = "__base__/graphics/icons/power-armor-mk2.png", icon_size = 64, - icon_mipmaps = 4, + resistances = { { type = "explosion", decrease = 40, percent = 75 }, { type = "impact", decrease = 30, percent = 60 }, @@ -132,11 +132,13 @@ data:extend({ always_show_made_in = true, energy_required = 30, ingredients = { - {"nullius-steel-plate", 12}, - {"nullius-rubber", 8}, - {"inserter", 4} + {type = "item", name = "nullius-steel-plate", amount = 12}, + {type = "item", name = "nullius-rubber", amount = 8}, + {type = "item", name = "inserter", amount = 4} }, - result = "nullius-chassis-2" + results = { + {type = "item", name = "nullius-chassis-2", amount = 1} + } }, { type = "recipe", @@ -146,14 +148,16 @@ data:extend({ always_show_made_in = true, energy_required = 60, ingredients = { - {"nullius-titanium-plate", 20}, - {"nullius-ceramic-powder", 15}, - {"nullius-textile", 10}, - {"nullius-robot-frame-1", 2}, - {"nullius-efficiency-module-1", 1}, - {"nullius-transformer", 1} + {type = "item", name = "nullius-titanium-plate", amount = 20}, + {type = "item", name = "nullius-ceramic-powder", amount = 15}, + {type = "item", name = "nullius-textile", amount = 10}, + {type = "item", name = "nullius-robot-frame-1", amount = 2}, + {type = "item", name = "nullius-efficiency-module-1", amount = 1}, + {type = "item", name = "nullius-transformer", amount = 1} }, - result = "nullius-chassis-3" + results = { + {type = "item", name = "nullius-chassis-3", amount = 1} + } }, { type = "recipe", @@ -163,15 +167,17 @@ data:extend({ category = "hand-casting", energy_required = 120, ingredients = { - {"nullius-titanium-plate", 20}, - {"nullius-ceramic-powder", 20}, - {"nullius-carbon-composite", 20}, - {"nullius-textile", 20}, - {"nullius-robot-frame-3", 4}, - {"nullius-efficiency-module-2", 2}, - {"nullius-small-cargo-pod-2", 3} + {type = "item", name = "nullius-titanium-plate", amount = 20}, + {type = "item", name = "nullius-ceramic-powder", amount = 20}, + {type = "item", name = "nullius-carbon-composite", amount = 20}, + {type = "item", name = "nullius-textile", amount = 20}, + {type = "item", name = "nullius-robot-frame-3", amount = 4}, + {type = "item", name = "nullius-efficiency-module-2", amount = 2}, + {type = "item", name = "nullius-small-cargo-pod-2", amount = 3} }, - result = "nullius-chassis-4" + results = { + {type = "item", name = "nullius-chassis-4", amount = 1} + } }, { type = "recipe", @@ -181,15 +187,17 @@ data:extend({ category = "hand-casting", energy_required = 250, ingredients = { - {"nullius-box-titanium-plate", 8}, - {"nullius-box-carbon-composite", 8}, - {"nullius-armor-plate", 8}, - {"nullius-box-robot-frame-4", 1}, - {"nullius-leg-augmentation-3", 2}, - {"nullius-productivity-module-3", 2}, - {"nullius-large-cargo-pod-3", 2} + {type = "item", name = "nullius-box-titanium-plate", amount = 8}, + {type = "item", name = "nullius-box-carbon-composite", amount = 8}, + {type = "item", name = "nullius-armor-plate", amount = 8}, + {type = "item", name = "nullius-box-robot-frame-4", amount = 1}, + {type = "item", name = "nullius-leg-augmentation-3", amount = 2}, + {type = "item", name = "nullius-productivity-module-3", amount = 2}, + {type = "item", name = "nullius-large-cargo-pod-3", amount = 2} }, - result = "nullius-chassis-5" + results = { + {type = "item", name = "nullius-chassis-5", amount = 1} + } }, { type = "recipe", @@ -203,16 +211,18 @@ data:extend({ category = "hand-casting", energy_required = 250, ingredients = { - {"nullius-box-titanium-plate", 8}, - {"nullius-box-ceramic-powder", 6}, - {"nullius-box-carbon-composite", 8}, - {"nullius-box-textile", 6}, - {"nullius-box-robot-frame-4", 1}, - {"nullius-leg-augmentation-3", 4}, - {"nullius-box-productivity-module-3", 1}, - {"nullius-large-buffer-chest-2", 1} + {type = "item", name = "nullius-box-titanium-plate", amount = 8}, + {type = "item", name = "nullius-box-ceramic-powder", amount = 6}, + {type = "item", name = "nullius-box-carbon-composite", amount = 8}, + {type = "item", name = "nullius-box-textile", amount = 6}, + {type = "item", name = "nullius-box-robot-frame-4", amount = 1}, + {type = "item", name = "nullius-leg-augmentation-3", amount = 4}, + {type = "item", name = "nullius-box-productivity-module-3", amount = 1}, + {type = "item", name = "nullius-large-buffer-chest-2", amount = 1} }, - result = "nullius-chassis-5" + results = { + {type = "item", name = "nullius-chassis-5", amount = 1} + } }, { type = "recipe", @@ -221,14 +231,16 @@ data:extend({ category = "nanotechnology", energy_required = 500, ingredients = { - {"nullius-chassis-5", 1}, - {"nullius-solar-panel-4", 3}, - {"nullius-battery-3", 4}, - {"nullius-box-graphene", 6}, - {"nullius-leg-augmentation-4", 2}, - {"nullius-relay-4", 1} + {type = "item", name = "nullius-chassis-5", amount = 1}, + {type = "item", name = "nullius-solar-panel-4", amount = 3}, + {type = "item", name = "nullius-battery-3", amount = 4}, + {type = "item", name = "nullius-box-graphene", amount = 6}, + {type = "item", name = "nullius-leg-augmentation-4", amount = 2}, + {type = "item", name = "nullius-relay-4", amount = 1} }, - result = "nullius-chassis-6" + results = { + {type = "item", name = "nullius-chassis-6", amount = 1} + } }, { @@ -237,13 +249,13 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/solar-panel.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.77, 0.77, 0.68} }}, subgroup = "solar", order = "nullius-bb", place_result = "nullius-solar-panel-1", - placed_as_equipment_result = "nullius-solar-panel-1", + place_as_equipment_result = "nullius-solar-panel-1", stack_size = 100 }, { @@ -252,13 +264,13 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/solar-panel.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.8, 0.8, 0.9} }}, subgroup = "solar", order = "nullius-bc", place_result = "nullius-solar-panel-2", - placed_as_equipment_result = "nullius-solar-panel-2", + place_as_equipment_result = "nullius-solar-panel-2", stack_size = 100 }, { @@ -267,12 +279,12 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/solar-panel.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "solar", order = "nullius-bd", place_result = "nullius-solar-panel-3", - placed_as_equipment_result = "nullius-solar-panel-3", + place_as_equipment_result = "nullius-solar-panel-3", stack_size = 100 }, { @@ -281,13 +293,13 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/solar-panel.png", icon_size = 64, - icon_mipmaps = 4, + tint = {1, 0.75, 0.85} }}, subgroup = "solar", order = "nullius-be", place_result = "nullius-solar-panel-4", - placed_as_equipment_result = "nullius-solar-panel-4", + place_as_equipment_result = "nullius-solar-panel-4", stack_size = 100 }, @@ -299,13 +311,15 @@ data:extend({ always_show_made_in = true, energy_required = 8, ingredients = { - {"nullius-polycrystalline-silicon", 6}, - {"nullius-glass", 4}, - {"nullius-aluminum-sheet", 3}, - {"nullius-plastic", 2}, - {"nullius-aluminum-rod", 1} + {type = "item", name = "nullius-polycrystalline-silicon", amount = 6}, + {type = "item", name = "nullius-glass", amount = 4}, + {type = "item", name = "nullius-aluminum-sheet", amount = 3}, + {type = "item", name = "nullius-plastic", amount = 2}, + {type = "item", name = "nullius-aluminum-rod", amount = 1} }, - result = "nullius-solar-panel-1" + results = { + {type = "item", name = "nullius-solar-panel-1", amount = 1} + } }, { type = "recipe", @@ -316,13 +330,15 @@ data:extend({ always_show_made_in = true, energy_required = 40, ingredients = { - {"nullius-box-polycrystalline-silicon", 6}, - {"nullius-box-glass", 4}, - {"nullius-box-aluminum-sheet", 3}, - {"nullius-box-plastic", 2}, - {"nullius-box-aluminum-rod", 1} + {type = "item", name = "nullius-box-polycrystalline-silicon", amount = 6}, + {type = "item", name = "nullius-box-glass", amount = 4}, + {type = "item", name = "nullius-box-aluminum-sheet", amount = 3}, + {type = "item", name = "nullius-box-plastic", amount = 2}, + {type = "item", name = "nullius-box-aluminum-rod", amount = 1} }, - result = "nullius-box-solar-panel-1" + results = { + {type = "item", name = "nullius-box-solar-panel-1", amount = 1} + } }, { type = "recipe", @@ -340,8 +356,9 @@ data:extend({ {type="item", name="nullius-ceramic-powder", amount=5}, {type="fluid", name="nullius-epoxy", amount=8, fluidbox_index=1} }, - result = "nullius-solar-panel-2", - result_count = 2 + results = { + {type = "item", name = "nullius-solar-panel-2", amount = 2} + } }, { type = "recipe", @@ -360,8 +377,9 @@ data:extend({ {type="item", name="nullius-box-ceramic-powder", amount=5}, {type="fluid", name="nullius-epoxy", amount=40, fluidbox_index=1} }, - result = "nullius-box-solar-panel-2", - result_count = 2 + results = { + {type = "item", name = "nullius-box-solar-panel-2", amount = 2} + } }, { type = "recipe", @@ -420,7 +438,9 @@ data:extend({ {type="item", name="nullius-productivity-module-3", amount=1}, {type="item", name="nullius-antimatter", amount=1} }, - result = "nullius-solar-panel-4" + results = { + {type = "item", name = "nullius-solar-panel-4", amount = 1} + } }, { @@ -428,8 +448,8 @@ data:extend({ name = "nullius-capacitor", icon = "__base__/graphics/icons/battery.png", icon_size = 64, - icon_mipmaps = 4, - placed_as_equipment_result = "nullius-capacitor", + + place_as_equipment_result = "nullius-capacitor", subgroup = "battery", order = "nullius-c", stack_size = 100 @@ -448,8 +468,9 @@ data:extend({ {type="item", name="nullius-alumina", amount=1}, {type="item", name="nullius-graphite", amount=1} }, - result = "nullius-capacitor", - result_count = 2 + results = { + {type = "item", name = "nullius-capacitor", amount = 2} + } }, { type = "recipe", @@ -467,13 +488,14 @@ data:extend({ {type="item", name="nullius-box-alumina", amount=1}, {type="item", name="nullius-box-graphite", amount=1} }, - result = "nullius-box-capacitor", - result_count = 2 + results = { + {type = "item", name = "nullius-box-capacitor", amount = 2} + } }, { type = "recipe", name = "nullius-capacitor-2", - localised_name = {"", {"item-name.nullius-box", {"equipment-name.nullius-capacitor"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"equipment-name.nullius-capacitor"}}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "crate.png", @@ -499,8 +521,9 @@ data:extend({ {type="item", name="nullius-box-graphite", amount=1}, {type="fluid", name="nullius-argon", amount=3, fluidbox_index=1} }, - result = "nullius-box-capacitor", - result_count = 3 + results = { + {type = "item", name = "nullius-box-capacitor", amount = 3} + } }, { @@ -510,8 +533,8 @@ data:extend({ localised_description = {"equipment-description.nullius-battery"}, icon = "__base__/graphics/icons/battery-equipment.png", icon_size = 64, - icon_mipmaps = 4, - placed_as_equipment_result = "nullius-charged-battery-1", + + place_as_equipment_result = "nullius-charged-battery-1", subgroup = "battery", order = "nullius-db", fuel_category = "vehicle", @@ -527,7 +550,7 @@ data:extend({ localised_name = {"item-name.nullius-uncharged-battery-1"}, icon = ICONPATH .. "uncharged1.png", icon_size = 64, - placed_as_equipment_result = "nullius-battery-1", + place_as_equipment_result = "nullius-battery-1", subgroup = "battery", order = "nullius-eb", stack_size = 100 @@ -552,7 +575,9 @@ data:extend({ {type="item", name="nullius-aluminum-sheet", amount=3}, {type="item", name="nullius-plastic", amount=4} }, - result = "nullius-battery-1" + results = { + {type = "item", name = "nullius-battery-1", amount = 1} + } }, { type = "recipe", @@ -576,7 +601,9 @@ data:extend({ {type="item", name="nullius-box-aluminum-sheet", amount=3}, {type="item", name="nullius-box-plastic", amount=4} }, - result = "nullius-box-battery-1" + results = { + {type = "item", name = "nullius-box-battery-1", amount = 1} + } }, { type = "recipe", @@ -591,7 +618,7 @@ data:extend({ { icon = "__base__/graphics/icons/battery-equipment.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.36 } }, @@ -614,7 +641,9 @@ data:extend({ {type="item", name="nullius-box-copper-sheet", amount=2}, {type="item", name="nullius-box-plastic", amount=3} }, - result = "nullius-box-battery-1" + results = { + {type = "item", name = "nullius-box-battery-1", amount = 1} + } }, { type = "recipe", @@ -629,9 +658,11 @@ data:extend({ order = "nullius-eb", energy_required = 2, ingredients = { - {"nullius-uncharged-battery-1", 1} + {type = "item", name = "nullius-uncharged-battery-1", amount = 1} }, - result = "nullius-battery-1" + results = { + {type = "item", name = "nullius-battery-1", amount = 1} + } }, { type = "recipe", @@ -656,9 +687,11 @@ data:extend({ order = "nullius-ebd", energy_required = 10, ingredients = { - {"nullius-uncharged-battery-1", 5} + {type = "item", name = "nullius-uncharged-battery-1", amount = 5} }, - result = "nullius-box-battery-1" + results = { + {type = "item", name = "nullius-box-battery-1", amount = 1} + } }, { @@ -668,8 +701,8 @@ data:extend({ localised_description = {"equipment-description.nullius-battery"}, icon = "__base__/graphics/icons/battery-mk2-equipment.png", icon_size = 64, - icon_mipmaps = 4, - placed_as_equipment_result = "nullius-charged-battery-2", + + place_as_equipment_result = "nullius-charged-battery-2", subgroup = "battery", order = "nullius-dc", fuel_category = "vehicle", @@ -685,7 +718,7 @@ data:extend({ localised_name = {"item-name.nullius-uncharged-battery-2"}, icon = ICONPATH .. "uncharged2.png", icon_size = 64, - placed_as_equipment_result = "nullius-battery-2", + place_as_equipment_result = "nullius-battery-2", subgroup = "battery", order = "nullius-ec", stack_size = 100 @@ -704,7 +737,9 @@ data:extend({ {type="item", name="nullius-lithium", amount=2}, {type="item", name="nullius-capacitor", amount=2} }, - result = "nullius-battery-2" + results = { + {type = "item", name = "nullius-battery-2", amount = 1} + } }, { type = "recipe", @@ -721,7 +756,9 @@ data:extend({ {type="item", name="nullius-box-lithium", amount=3}, {type="item", name="nullius-box-capacitor", amount=2} }, - result = "nullius-box-battery-2" + results = { + {type = "item", name = "nullius-box-battery-2", amount = 1} + } }, { type = "recipe", @@ -736,9 +773,11 @@ data:extend({ order = "nullius-ec", energy_required = 6, ingredients = { - {"nullius-uncharged-battery-2", 1} + {type = "item", name = "nullius-uncharged-battery-2", amount = 1} }, - result = "nullius-battery-2" + results = { + {type = "item", name = "nullius-battery-2", amount = 1} + } }, { type = "recipe", @@ -763,9 +802,11 @@ data:extend({ order = "nullius-ec", energy_required = 30, ingredients = { - {"nullius-uncharged-battery-2", 5} + {type = "item", name = "nullius-uncharged-battery-2", amount = 5} }, - result = "nullius-box-battery-2" + results = { + {type = "item", name = "nullius-box-battery-2", amount = 1} + } }, { @@ -775,7 +816,7 @@ data:extend({ localised_description = {"equipment-description.nullius-battery"}, icon = ICONPATH .. "battery3.png", icon_size = 64, - placed_as_equipment_result = "nullius-charged-battery-3", + place_as_equipment_result = "nullius-charged-battery-3", subgroup = "battery", order = "nullius-dd", fuel_category = "vehicle", @@ -791,7 +832,7 @@ data:extend({ localised_name = {"item-name.nullius-uncharged-battery-3"}, icon = ICONPATH .. "uncharged3.png", icon_size = 64, - placed_as_equipment_result = "nullius-battery-3", + place_as_equipment_result = "nullius-battery-3", subgroup = "battery", order = "nullius-ed", stack_size = 100 @@ -811,7 +852,9 @@ data:extend({ {type="item", name="nullius-antimatter", amount=1}, {type="item", name="nullius-efficiency-module-3", amount=1} }, - result = "nullius-battery-3" + results = { + {type = "item", name = "nullius-battery-3", amount = 1} + } }, { type = "recipe", @@ -826,9 +869,11 @@ data:extend({ order = "nullius-ed", energy_required = 12, ingredients = { - {"nullius-uncharged-battery-3", 1} + {type = "item", name = "nullius-uncharged-battery-3", amount = 1} }, - result = "nullius-battery-3" + results = { + {type = "item", name = "nullius-battery-3", amount = 1} + } }, { @@ -838,10 +883,10 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/roboport.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.8, 0.6, 0.65} }}, - placed_as_equipment_result = "nullius-hangar-1", + place_as_equipment_result = "nullius-hangar-1", place_result = "nullius-hangar-1", subgroup = "hangar-2", order = "nullius-bb", @@ -854,10 +899,10 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/roboport.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.85, 0.9, 1} }}, - placed_as_equipment_result = "nullius-hangar-2", + place_as_equipment_result = "nullius-hangar-2", place_result = "nullius-hangar-2", subgroup = "hangar-2", order = "nullius-bc", @@ -870,10 +915,10 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/roboport.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.55, 0.7, 0.55} }}, - placed_as_equipment_result = "nullius-hangar-3", + place_as_equipment_result = "nullius-hangar-3", place_result = "nullius-hangar-3", subgroup = "hangar-2", order = "nullius-bd", @@ -888,7 +933,7 @@ data:extend({ icon_size = 64, tint = {0.55, 0.7, 0.55} }}, - placed_as_equipment_result = "nullius-hangar-4", + place_as_equipment_result = "nullius-hangar-4", place_result = "nullius-hangar-4", subgroup = "hangar-2", order = "nullius-be", @@ -902,13 +947,15 @@ data:extend({ category = "large-crafting", energy_required = 6, ingredients = { - {name="nullius-small-storage-chest-1", amount=2}, - {name="nullius-relay-1", amount=1}, - {name="nullius-charger-1", amount=1}, - {name="fast-transport-belt", amount=4}, - {name="train-stop", amount=1} + {type = "item", name="nullius-small-storage-chest-1", amount=2}, + {type = "item", name="nullius-relay-1", amount=1}, + {type = "item", name="nullius-charger-1", amount=1}, + {type = "item", name="fast-transport-belt", amount=4}, + {type = "item", name="train-stop", amount=1} }, - result = "nullius-hangar-1" + results = { + {type = "item", name = "nullius-hangar-1", amount = 1} + } }, { type = "recipe", @@ -918,13 +965,15 @@ data:extend({ category = "large-crafting", energy_required = 15, ingredients = { - {name="nullius-hangar-1", amount=1}, - {name="nullius-large-storage-chest-1", amount=1}, - {name="nullius-relay-2", amount=1}, - {name="nullius-charger-2", amount=1}, - {name="fast-splitter", amount=2} + {type = "item", name="nullius-hangar-1", amount=1}, + {type = "item", name="nullius-large-storage-chest-1", amount=1}, + {type = "item", name="nullius-relay-2", amount=1}, + {type = "item", name="nullius-charger-2", amount=1}, + {type = "item", name="fast-splitter", amount=2} }, - result = "nullius-hangar-2" + results = { + {type = "item", name = "nullius-hangar-2", amount = 1} + } }, { type = "recipe", @@ -934,14 +983,16 @@ data:extend({ category = "large-crafting", energy_required = 30, ingredients = { - {name="nullius-hangar-2", amount=1}, - {name="nullius-large-buffer-chest-2", amount=1}, - {name="nullius-relay-3", amount=1}, - {name="nullius-charger-3", amount=1}, - {name="express-stack-filter-inserter", amount=2}, - {name="gate", amount=3} + {type = "item", name="nullius-hangar-2", amount=1}, + {type = "item", name="nullius-large-buffer-chest-2", amount=1}, + {type = "item", name="nullius-relay-3", amount=1}, + {type = "item", name="nullius-charger-3", amount=1}, + {type = "item", name="bob-express-bulk-inserter", amount=2}, + {type = "item", name="gate", amount=3} }, - result = "nullius-hangar-3" + results = { + {type = "item", name = "nullius-hangar-3", amount = 1} + } }, { type = "recipe", @@ -951,11 +1002,13 @@ data:extend({ category = "nanotechnology", energy_required = 20, ingredients = { - {name="nullius-hangar-3", amount=1}, - {name="nullius-yield-module-4", amount=1}, - {name="nullius-charger-4", amount=1} + {type = "item", name="nullius-hangar-3", amount=1}, + {type = "item", name="nullius-yield-module-4", amount=1}, + {type = "item", name="nullius-charger-4", amount=1} }, - result = "nullius-hangar-4" + results = { + {type = "item", name = "nullius-hangar-4", amount = 1} + } }, { @@ -966,7 +1019,7 @@ data:extend({ icon = "__boblogistics__/graphics/icons/roboport-chargepad.png", icon_size = 32 }}, - placed_as_equipment_result = "nullius-charger-1", + place_as_equipment_result = "nullius-charger-1", place_result = "nullius-charger-1", subgroup = "hangar-1", order = "nullius-cb", @@ -980,7 +1033,7 @@ data:extend({ icon = "__boblogistics__/graphics/icons/roboport-chargepad-2.png", icon_size = 32 }}, - placed_as_equipment_result = "nullius-charger-2", + place_as_equipment_result = "nullius-charger-2", place_result = "nullius-charger-2", subgroup = "hangar-1", order = "nullius-cc", @@ -994,7 +1047,7 @@ data:extend({ icon = "__boblogistics__/graphics/icons/roboport-chargepad-4.png", icon_size = 32 }}, - placed_as_equipment_result = "nullius-charger-3", + place_as_equipment_result = "nullius-charger-3", place_result = "nullius-charger-3", subgroup = "hangar-1", order = "nullius-cd", @@ -1008,7 +1061,7 @@ data:extend({ icon = ICONPATH .. "charger.png", icon_size = 64 }}, - placed_as_equipment_result = "nullius-charger-4", + place_as_equipment_result = "nullius-charger-4", place_result = "nullius-charger-4", subgroup = "hangar-1", order = "nullius-ce", @@ -1022,11 +1075,13 @@ data:extend({ category = "medium-crafting", energy_required = 4, ingredients = { - {"medium-electric-pole", 1}, - {"nullius-capacitor", 3}, - {"programmable-speaker", 1} + {type = "item", name = "medium-electric-pole", amount = 1}, + {type = "item", name = "nullius-capacitor", amount = 3}, + {type = "item", name = "programmable-speaker", amount = 1} }, - result = "nullius-charger-1" + results = { + {type = "item", name = "nullius-charger-1", amount = 1} + } }, { type = "recipe", @@ -1037,11 +1092,13 @@ data:extend({ subgroup = "boxed-hangar", energy_required = 20, ingredients = { - {"nullius-box-power-pole-2", 1}, - {"nullius-box-capacitor", 3}, - {"nullius-box-antenna", 1} + {type = "item", name = "nullius-box-power-pole-2", amount = 1}, + {type = "item", name = "nullius-box-capacitor", amount = 3}, + {type = "item", name = "nullius-box-antenna", amount = 1} }, - result = "nullius-box-charger-1" + results = { + {type = "item", name = "nullius-box-charger-1", amount = 1} + } }, { type = "recipe", @@ -1051,11 +1108,13 @@ data:extend({ category = "medium-crafting", energy_required = 10, ingredients = { - {"nullius-charger-1", 1}, - {"nullius-grid-battery-1", 1}, - {"rail-signal", 3} + {type = "item", name = "nullius-charger-1", amount = 1}, + {type = "item", name = "nullius-grid-battery-1", amount = 1}, + {type = "item", name = "rail-signal", amount = 3} }, - result = "nullius-charger-2" + results = { + {type = "item", name = "nullius-charger-2", amount = 1} + } }, { type = "recipe", @@ -1066,11 +1125,13 @@ data:extend({ subgroup = "boxed-hangar", energy_required = 50, ingredients = { - {"nullius-box-charger-1", 1}, - {"nullius-box-grid-battery-1", 1}, - {"nullius-box-rail-signal", 3} + {type = "item", name = "nullius-box-charger-1", amount = 1}, + {type = "item", name = "nullius-box-grid-battery-1", amount = 1}, + {type = "item", name = "nullius-box-rail-signal", amount = 3} }, - result = "nullius-box-charger-2" + results = { + {type = "item", name = "nullius-box-charger-2", amount = 1} + } }, { type = "recipe", @@ -1080,11 +1141,13 @@ data:extend({ category = "medium-crafting", energy_required = 20, ingredients = { - {"nullius-charger-2", 1}, - {"nullius-relay-2", 1}, - {"nullius-grid-battery-2", 1} + {type = "item", name = "nullius-charger-2", amount = 1}, + {type = "item", name = "nullius-relay-2", amount = 1}, + {type = "item", name = "nullius-grid-battery-2", amount = 1} }, - result = "nullius-charger-3" + results = { + {type = "item", name = "nullius-charger-3", amount = 1} + } }, { type = "recipe", @@ -1095,11 +1158,13 @@ data:extend({ subgroup = "boxed-hangar", energy_required = 100, ingredients = { - {"nullius-box-charger-2", 1}, - {"nullius-box-relay-2", 1}, - {"nullius-box-grid-battery-2", 1} + {type = "item", name = "nullius-box-charger-2", amount = 1}, + {type = "item", name = "nullius-box-relay-2", amount = 1}, + {type = "item", name = "nullius-box-grid-battery-2", amount = 1} }, - result = "nullius-box-charger-3" + results = { + {type = "item", name = "nullius-box-charger-3", amount = 1} + } }, { type = "recipe", @@ -1109,12 +1174,14 @@ data:extend({ category = "nanotechnology", energy_required = 25, ingredients = { - {"nullius-charger-3", 1}, - {"nullius-substation-3", 1}, - {"nullius-copper-wire", 5}, - {"nullius-lithium", 2} + {type = "item", name = "nullius-charger-3", amount = 1}, + {type = "item", name = "nullius-substation-3", amount = 1}, + {type = "item", name = "nullius-copper-wire", amount = 5}, + {type = "item", name = "nullius-lithium", amount = 2} }, - result = "nullius-charger-4" + results = { + {type = "item", name = "nullius-charger-4", amount = 1} + } }, { type = "recipe", @@ -1125,12 +1192,14 @@ data:extend({ subgroup = "boxed-hangar", energy_required = 125, ingredients = { - {"nullius-box-charger-3", 1}, - {"nullius-substation-3", 5}, - {"nullius-box-copper-wire", 5}, - {"nullius-box-lithium", 2} + {type = "item", name = "nullius-box-charger-3", amount = 1}, + {type = "item", name = "nullius-substation-3", amount = 5}, + {type = "item", name = "nullius-box-copper-wire", amount = 5}, + {type = "item", name = "nullius-box-lithium", amount = 2} }, - result = "nullius-box-charger-4" + results = { + {type = "item", name = "nullius-box-charger-4", amount = 1} + } }, { @@ -1141,7 +1210,7 @@ data:extend({ icon = "__boblogistics__/graphics/icons/logistic-zone-expander.png", icon_size = 32 }}, - placed_as_equipment_result = "nullius-relay-1", + place_as_equipment_result = "nullius-relay-1", place_result = "nullius-relay-1", subgroup = "hangar-1", order = "nullius-db", @@ -1155,7 +1224,7 @@ data:extend({ icon = "__boblogistics__/graphics/icons/logistic-zone-expander-2.png", icon_size = 32 }}, - placed_as_equipment_result = "nullius-relay-2", + place_as_equipment_result = "nullius-relay-2", place_result = "nullius-relay-2", subgroup = "hangar-1", order = "nullius-dc", @@ -1169,7 +1238,7 @@ data:extend({ icon = "__boblogistics__/graphics/icons/logistic-zone-expander-4.png", icon_size = 32 }}, - placed_as_equipment_result = "nullius-relay-3", + place_as_equipment_result = "nullius-relay-3", place_result = "nullius-relay-3", subgroup = "hangar-1", order = "nullius-dd", @@ -1184,7 +1253,7 @@ data:extend({ tint = {0.85, 1, 0.9}, icon_size = 32 }}, - placed_as_equipment_result = "nullius-relay-4", + place_as_equipment_result = "nullius-relay-4", place_result = "nullius-relay-4", subgroup = "hangar-1", order = "nullius-de", @@ -1198,12 +1267,14 @@ data:extend({ category = "medium-crafting", energy_required = 4, ingredients = { - {"programmable-speaker", 1}, - {"decider-combinator", 2}, - {"constant-combinator", 1}, - {"small-lamp", 1} + {type = "item", name = "programmable-speaker", amount = 1}, + {type = "item", name = "decider-combinator", amount = 2}, + {type = "item", name = "constant-combinator", amount = 1}, + {type = "item", name = "small-lamp", amount = 1} }, - result = "nullius-relay-1" + results = { + {type = "item", name = "nullius-relay-1", amount = 1} + } }, { type = "recipe", @@ -1214,12 +1285,14 @@ data:extend({ subgroup = "boxed-beacon", energy_required = 20, ingredients = { - {"nullius-box-antenna", 1}, - {"nullius-box-logic-circuit", 2}, - {"nullius-box-memory-circuit", 1}, - {"nullius-box-lamp-1", 1} + {type = "item", name = "nullius-box-antenna", amount = 1}, + {type = "item", name = "nullius-box-logic-circuit", amount = 2}, + {type = "item", name = "nullius-box-memory-circuit", amount = 1}, + {type = "item", name = "nullius-box-lamp-1", amount = 1} }, - result = "nullius-box-relay-1" + results = { + {type = "item", name = "nullius-box-relay-1", amount = 1} + } }, { type = "recipe", @@ -1229,12 +1302,14 @@ data:extend({ category = "medium-crafting", energy_required = 8, ingredients = { - {"nullius-relay-1", 1}, - {"nullius-sensor-1", 2}, - {"nullius-transformer", 1}, - {"rail-chain-signal", 2} + {type = "item", name = "nullius-relay-1", amount = 1}, + {type = "item", name = "nullius-sensor-1", amount = 2}, + {type = "item", name = "nullius-transformer", amount = 1}, + {type = "item", name = "rail-chain-signal", amount = 2} }, - result = "nullius-relay-2" + results = { + {type = "item", name = "nullius-relay-2", amount = 1} + } }, { type = "recipe", @@ -1245,12 +1320,14 @@ data:extend({ subgroup = "boxed-beacon", energy_required = 40, ingredients = { - {"nullius-box-relay-1", 1}, - {"nullius-box-sensor-1", 2}, - {"nullius-box-transformer", 1}, - {"nullius-box-chain-signal", 2} + {type = "item", name = "nullius-box-relay-1", amount = 1}, + {type = "item", name = "nullius-box-sensor-1", amount = 2}, + {type = "item", name = "nullius-box-transformer", amount = 1}, + {type = "item", name = "nullius-box-chain-signal", amount = 2} }, - result = "nullius-box-relay-2" + results = { + {type = "item", name = "nullius-box-relay-2", amount = 1} + } }, { type = "recipe", @@ -1260,13 +1337,15 @@ data:extend({ category = "medium-crafting", energy_required = 20, ingredients = { - {"nullius-relay-2", 2}, - {"nullius-sensor-2", 2}, - {"nullius-power-pole-4", 1}, - {"nullius-lamp-2", 3}, - {"nullius-processor-2", 1} + {type = "item", name = "nullius-relay-2", amount = 2}, + {type = "item", name = "nullius-sensor-2", amount = 2}, + {type = "item", name = "nullius-power-pole-4", amount = 1}, + {type = "item", name = "nullius-lamp-2", amount = 3}, + {type = "item", name = "nullius-processor-2", amount = 1} }, - result = "nullius-relay-3" + results = { + {type = "item", name = "nullius-relay-3", amount = 1} + } }, { type = "recipe", @@ -1277,13 +1356,15 @@ data:extend({ subgroup = "boxed-beacon", energy_required = 100, ingredients = { - {"nullius-box-relay-2", 2}, - {"nullius-box-sensor-2", 2}, - {"nullius-box-power-pole-4", 1}, - {"nullius-box-lamp-2", 3}, - {"nullius-box-processor-2", 1} + {type = "item", name = "nullius-box-relay-2", amount = 2}, + {type = "item", name = "nullius-box-sensor-2", amount = 2}, + {type = "item", name = "nullius-box-power-pole-4", amount = 1}, + {type = "item", name = "nullius-box-lamp-2", amount = 3}, + {type = "item", name = "nullius-box-processor-2", amount = 1} }, - result = "nullius-box-relay-3" + results = { + {type = "item", name = "nullius-box-relay-3", amount = 1} + } }, { type = "recipe", @@ -1292,11 +1373,13 @@ data:extend({ category = "nanotechnology", energy_required = 30, ingredients = { - {"nullius-box-relay-3", 1}, - {"nullius-box-copper-wire", 3}, - {"nullius-speed-module-4", 1} + {type = "item", name = "nullius-box-relay-3", amount = 1}, + {type = "item", name = "nullius-box-copper-wire", amount = 3}, + {type = "item", name = "nullius-speed-module-4", amount = 1} }, - result = "nullius-relay-4" + results = { + {type = "item", name = "nullius-relay-4", amount = 1} + } }, { @@ -1305,7 +1388,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/repair-pack.png", icon_size = 64, - icon_mipmaps = 4, + tint = {1, 0.6, 0.8} }}, subgroup = "tool-upgrades", @@ -1319,7 +1402,6 @@ data:extend({ cooldown = 20, range = 0, ammo_type = { - category = "capsule", target_type = "position", action = { type = "direct", @@ -1338,18 +1420,21 @@ data:extend({ { type = "recipe", name = "nullius-repair-pack", + localised_name = {"item-name.repair-pack"}, enabled = false, category = "small-crafting", always_show_made_in = true, energy_required = 6, ingredients = { - {"decider-combinator", 1}, - {"nullius-fabrication-tool-1", 1}, - {"nullius-steel-gear", 2}, - {"nullius-plastic", 2}, - {"nullius-aluminum-carbide", 1} + {type = "item", name = "decider-combinator", amount = 1}, + {type = "item", name = "nullius-fabrication-tool-1", amount = 1}, + {type = "item", name = "nullius-steel-gear", amount = 2}, + {type = "item", name = "nullius-plastic", amount = 2}, + {type = "item", name = "nullius-aluminum-carbide", amount = 1} }, - result = "repair-pack" + results = { + {type = "item", name = "repair-pack", amount = 1} + } }, { type = "recipe", @@ -1360,13 +1445,15 @@ data:extend({ always_show_made_in = true, energy_required = 30, ingredients = { - {"nullius-box-logic-circuit", 1}, - {"nullius-box-fabrication-tool-1", 1}, - {"nullius-box-steel-gear", 2}, - {"nullius-box-plastic", 2}, - {"nullius-box-aluminum-carbide", 1} + {type = "item", name = "nullius-box-logic-circuit", amount = 1}, + {type = "item", name = "nullius-box-fabrication-tool-1", amount = 1}, + {type = "item", name = "nullius-box-steel-gear", amount = 2}, + {type = "item", name = "nullius-box-plastic", amount = 2}, + {type = "item", name = "nullius-box-aluminum-carbide", amount = 1} }, - result = "nullius-box-repair-pack" + results = { + {type = "item", name = "nullius-box-repair-pack", amount = 1} + } }, { type = "recipe", @@ -1379,13 +1466,15 @@ data:extend({ always_show_made_in = true, energy_required = 6, ingredients = { - {"decider-combinator", 1}, - {"inserter", 1}, - {"nullius-steel-gear", 1}, - {"nullius-plastic", 1}, - {"nullius-aluminum-carbide", 1} + {type = "item", name = "decider-combinator", amount = 1}, + {type = "item", name = "inserter", amount = 1}, + {type = "item", name = "nullius-steel-gear", amount = 1}, + {type = "item", name = "nullius-plastic", amount = 1}, + {type = "item", name = "nullius-aluminum-carbide", amount = 1} }, - result = "repair-pack" + results = { + {type = "item", name = "repair-pack", amount = 1} + } }, { type = "recipe", @@ -1399,13 +1488,15 @@ data:extend({ always_show_made_in = true, energy_required = 30, ingredients = { - {"nullius-box-logic-circuit", 1}, - {"nullius-box-inserter-1", 1}, - {"nullius-box-steel-gear", 1}, - {"nullius-box-plastic", 1}, - {"nullius-box-aluminum-carbide", 1} + {type = "item", name = "nullius-box-logic-circuit", amount = 1}, + {type = "item", name = "nullius-box-inserter-1", amount = 1}, + {type = "item", name = "nullius-box-steel-gear", amount = 1}, + {type = "item", name = "nullius-box-plastic", amount = 1}, + {type = "item", name = "nullius-box-aluminum-carbide", amount = 1} }, - result = "nullius-box-repair-pack" + results = { + {type = "item", name = "nullius-box-repair-pack", amount = 1} + } }, { type = "recipe", @@ -1415,29 +1506,29 @@ data:extend({ always_show_made_in = true, energy_required = 8, ingredients = { - {"nullius-fabrication-tool-2", 1}, - {"turbo-filter-inserter", 1}, - {"repair-pack", 2}, - {"nullius-steel-plate", 2}, - {"nullius-rubber", 2} + {type = "item", name = "nullius-fabrication-tool-2", amount = 1}, + {type = "item", name = "bob-turbo-inserter", amount = 1}, + {type = "item", name = "repair-pack", amount = 2}, + {type = "item", name = "nullius-steel-plate", amount = 2}, + {type = "item", name = "nullius-rubber", amount = 2} }, - result = "nullius-self-repair-pack", - reult_count = 10 + results = { + {type = "item", name = "nullius-self-repair-pack", amount = 10} + } }, { type = "item", name = "nullius-levitation-field-1", - localised_name = {"", {"equipment-name.nullius-levitation-field"}, " ", 1}, localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-levitation-field"}, - {"entity-description.nullius-kilojoule", 100}}, + {"entity-description.nullius-kilojoule", tostring(100)}}, icons = {{ icon = "__base__/graphics/icons/belt-immunity-equipment.png", icon_size = 64, - icon_mipmaps = 4 + }}, - placed_as_equipment_result = "nullius-levitation-field-1", + place_as_equipment_result = "nullius-levitation-field-1", subgroup = "equipment", order = "nullius-db", stack_size = 20 @@ -1447,12 +1538,12 @@ data:extend({ name = "nullius-levitation-field-2", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-levitation-field"}, - {"entity-description.nullius-kilojoule", 200}}, + {"entity-description.nullius-kilojoule", tostring(200)}}, icons = {{ icon = ICONPATH .. "levitation2.png", icon_size = 64 }}, - placed_as_equipment_result = "nullius-levitation-field-2", + place_as_equipment_result = "nullius-levitation-field-2", subgroup = "equipment", order = "nullius-dc", stack_size = 10 @@ -1465,14 +1556,16 @@ data:extend({ always_show_made_in = true, energy_required = 12, ingredients = { - {"copper-cable", 6}, - {"nullius-plastic", 4}, - {"nullius-iron-rod", 3}, - {"nullius-sensor-1", 1}, - {"programmable-speaker", 2}, - {"nullius-capacitor", 3} + {type = "item", name = "copper-cable", amount = 6}, + {type = "item", name = "nullius-plastic", amount = 4}, + {type = "item", name = "nullius-iron-rod", amount = 3}, + {type = "item", name = "nullius-sensor-1", amount = 1}, + {type = "item", name = "programmable-speaker", amount = 2}, + {type = "item", name = "nullius-capacitor", amount = 3} }, - result = "nullius-levitation-field-1" + results = { + {type = "item", name = "nullius-levitation-field-1", amount = 1} + } }, { type = "recipe", @@ -1483,14 +1576,16 @@ data:extend({ always_show_made_in = true, energy_required = 60, ingredients = { - {"nullius-box-insulated-wire", 6}, - {"nullius-box-plastic", 4}, - {"nullius-box-iron-rod", 3}, - {"nullius-box-sensor-1", 1}, - {"nullius-box-antenna", 2}, - {"nullius-box-capacitor", 3} + {type = "item", name = "nullius-box-insulated-wire", amount = 6}, + {type = "item", name = "nullius-box-plastic", amount = 4}, + {type = "item", name = "nullius-box-iron-rod", amount = 3}, + {type = "item", name = "nullius-box-sensor-1", amount = 1}, + {type = "item", name = "nullius-box-antenna", amount = 2}, + {type = "item", name = "nullius-box-capacitor", amount = 3} }, - result = "nullius-box-levitation-field-1" + results = { + {type = "item", name = "nullius-box-levitation-field-1", amount = 1} + } }, { type = "recipe", @@ -1500,15 +1595,17 @@ data:extend({ always_show_made_in = true, energy_required = 20, ingredients = { - {"nullius-levitation-field-1", 2}, - {"nullius-ceramic-powder", 2}, - {"nullius-carbon-composite", 3}, - {"nullius-stabilizer-1", 1}, - {"nullius-transformer", 1}, - {"nullius-processor-3", 1}, - {"nullius-copper-sheet", 4} + {type = "item", name = "nullius-levitation-field-1", amount = 2}, + {type = "item", name = "nullius-ceramic-powder", amount = 2}, + {type = "item", name = "nullius-carbon-composite", amount = 3}, + {type = "item", name = "nullius-stabilizer-1", amount = 1}, + {type = "item", name = "nullius-transformer", amount = 1}, + {type = "item", name = "nullius-processor-3", amount = 1}, + {type = "item", name = "nullius-copper-sheet", amount = 4} }, - result = "nullius-levitation-field-2" + results = { + {type = "item", name = "nullius-levitation-field-2", amount = 1} + } }, { type = "recipe", @@ -1521,16 +1618,18 @@ data:extend({ always_show_made_in = true, energy_required = 20, ingredients = { - {"nullius-levitation-field-1", 2}, - {"nullius-ceramic-powder", 2}, - {"nullius-carbon-composite", 3}, - {"nullius-battery-2", 1}, - {"nullius-transformer", 1}, - {"nullius-sensor-2", 1}, - {"nullius-processor-3", 1}, - {"nullius-copper-sheet", 4} + {type = "item", name = "nullius-levitation-field-1", amount = 2}, + {type = "item", name = "nullius-ceramic-powder", amount = 2}, + {type = "item", name = "nullius-carbon-composite", amount = 3}, + {type = "item", name = "nullius-battery-2", amount = 1}, + {type = "item", name = "nullius-transformer", amount = 1}, + {type = "item", name = "nullius-sensor-2", amount = 1}, + {type = "item", name = "nullius-processor-3", amount = 1}, + {type = "item", name = "nullius-copper-sheet", amount = 4} }, - result = "nullius-levitation-field-2" + results = { + {type = "item", name = "nullius-levitation-field-2", amount = 1} + } }, { @@ -1538,10 +1637,10 @@ data:extend({ name = "nullius-night-vision-1", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-night-vision-1"}, - {"entity-description.nullius-kilojoule", 150}}, + {"entity-description.nullius-kilojoule", tostring(150)}}, icon = "__base__/graphics/equipment/night-vision-equipment.png", - icon_size = 64, - placed_as_equipment_result = "nullius-night-vision-1", + icon_size = 128, + place_as_equipment_result = "nullius-night-vision-1", subgroup = "equipment", order = "nullius-cb", stack_size = 20 @@ -1551,10 +1650,10 @@ data:extend({ name = "nullius-night-vision-2", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-night-vision-2"}, - {"entity-description.nullius-kilojoule", 400}}, + {"entity-description.nullius-kilojoule", tostring(400)}}, icon = ICONPATH .. "night-vision-2.png", icon_size = 64, - placed_as_equipment_result = "nullius-night-vision-2", + place_as_equipment_result = "nullius-night-vision-2", subgroup = "equipment", order = "nullius-cc", stack_size = 10 @@ -1564,10 +1663,10 @@ data:extend({ name = "nullius-night-vision-3", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-night-vision-3"}, - {"entity-description.nullius-megajoule", 1}}, + {"entity-description.nullius-megajoule", tostring(1)}}, icon = ICONPATH .. "night-vision-3.png", icon_size = 64, - placed_as_equipment_result = "nullius-night-vision-3", + place_as_equipment_result = "nullius-night-vision-3", subgroup = "equipment", order = "nullius-cd", stack_size = 10 @@ -1581,12 +1680,14 @@ data:extend({ always_show_made_in = true, energy_required = 10, ingredients = { - {"nullius-sensor-1", 2}, - {"nullius-glass", 2}, - {"nullius-aluminum-sheet", 1}, - {"nullius-capacitor", 2} + {type = "item", name = "nullius-sensor-1", amount = 2}, + {type = "item", name = "nullius-glass", amount = 2}, + {type = "item", name = "nullius-aluminum-sheet", amount = 1}, + {type = "item", name = "nullius-capacitor", amount = 2} }, - result = "nullius-night-vision-1" + results = { + {type = "item", name = "nullius-night-vision-1", amount = 1} + } }, { type = "recipe", @@ -1597,12 +1698,14 @@ data:extend({ always_show_made_in = true, energy_required = 50, ingredients = { - {"nullius-box-sensor-1", 2}, - {"nullius-box-glass", 2}, - {"nullius-box-aluminum-sheet", 1}, - {"nullius-box-capacitor", 2} + {type = "item", name = "nullius-box-sensor-1", amount = 2}, + {type = "item", name = "nullius-box-glass", amount = 2}, + {type = "item", name = "nullius-box-aluminum-sheet", amount = 1}, + {type = "item", name = "nullius-box-capacitor", amount = 2} }, - result = "nullius-box-night-vision-1" + results = { + {type = "item", name = "nullius-box-night-vision-1", amount = 1} + } }, { type = "recipe", @@ -1612,11 +1715,13 @@ data:extend({ always_show_made_in = true, energy_required = 40, ingredients = { - {"nullius-night-vision-1", 1}, - {"nullius-sensor-2", 2}, - {"nullius-hard-glass", 2} + {type = "item", name = "nullius-night-vision-1", amount = 1}, + {type = "item", name = "nullius-sensor-2", amount = 2}, + {type = "item", name = "nullius-hard-glass", amount = 2} }, - result = "nullius-night-vision-2" + results = { + {type = "item", name = "nullius-night-vision-2", amount = 1} + } }, { type = "recipe", @@ -1626,12 +1731,14 @@ data:extend({ category = "small-crafting", energy_required = 60, ingredients = { - {"nullius-night-vision-2", 2}, - {"nullius-yield-module-3", 1}, - {"nullius-graphene", 2}, - {"nullius-battery-2", 1} + {type = "item", name = "nullius-night-vision-2", amount = 2}, + {type = "item", name = "nullius-yield-module-3", amount = 1}, + {type = "item", name = "nullius-graphene", amount = 2}, + {type = "item", name = "nullius-battery-2", amount = 1} }, - result = "nullius-night-vision-3" + results = { + {type = "item", name = "nullius-night-vision-3", amount = 1} + } }, { @@ -1639,14 +1746,14 @@ data:extend({ name = "nullius-leg-augmentation-1", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-leg-augmentation"}, - {"entity-description.nullius-megajoule", 6}}, + {"entity-description.nullius-megajoule", tostring(6)}}, icons = {{ icon = "__base__/graphics/icons/exoskeleton-equipment.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.75, 0.75, 0.6} }}, - placed_as_equipment_result = "nullius-leg-augmentation-1", + place_as_equipment_result = "nullius-leg-augmentation-1", subgroup = "leg-augmentation", order = "nullius-cb", stack_size = 5 @@ -1655,18 +1762,20 @@ data:extend({ type = "recipe", name = "nullius-leg-augmentation-1", enabled = false, - always_show_made_in = true, + always_show_made_in = true, category = "medium-crafting", energy_required = 15, ingredients = { - {"stack-inserter", 2}, - {"nullius-sensor-2", 1}, - {"nullius-motor-2", 3}, - {"nullius-titanium-rod", 5}, - {"nullius-jump-boots", 1}, - {"nullius-battery-1", 2} + {type = "item", name = "bulk-inserter", amount = 2}, + {type = "item", name = "nullius-sensor-2", amount = 1}, + {type = "item", name = "nullius-motor-2", amount = 3}, + {type = "item", name = "nullius-titanium-rod", amount = 5}, + {type = "item", name = "nullius-jump-boots", amount = 1}, + {type = "item", name = "nullius-battery-1", amount = 2} }, - result = "nullius-leg-augmentation-1" + results = { + {type = "item", name = "nullius-leg-augmentation-1", amount = 1} + } }, { type = "recipe", @@ -1679,14 +1788,16 @@ data:extend({ category = "medium-crafting", energy_required = 15, ingredients = { - {"stack-inserter", 4}, - {"nullius-sensor-2", 2}, - {"nullius-motor-2", 6}, - {"nullius-titanium-rod", 6}, - {"nullius-steel-gear", 4}, - {"nullius-battery-1", 2} + {type = "item", name = "bulk-inserter", amount = 4}, + {type = "item", name = "nullius-sensor-2", amount = 2}, + {type = "item", name = "nullius-motor-2", amount = 6}, + {type = "item", name = "nullius-titanium-rod", amount = 6}, + {type = "item", name = "nullius-steel-gear", amount = 4}, + {type = "item", name = "nullius-battery-1", amount = 2} }, - result = "nullius-leg-augmentation-1" + results = { + {type = "item", name = "nullius-leg-augmentation-1", amount = 1} + } }, { @@ -1694,14 +1805,14 @@ data:extend({ name = "nullius-leg-augmentation-2", localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-leg-augmentation"}, - {"entity-description.nullius-megajoule", 15}}, + {"entity-description.nullius-megajoule", tostring(15)}}, icons = {{ icon = "__base__/graphics/icons/exoskeleton-equipment.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.8, 0.8, 0.95} }}, - placed_as_equipment_result = "nullius-leg-augmentation-2", + place_as_equipment_result = "nullius-leg-augmentation-2", subgroup = "leg-augmentation", order = "nullius-cc", stack_size = 5 @@ -1714,29 +1825,31 @@ data:extend({ category = "medium-crafting", energy_required = 30, ingredients = { - {"nullius-leg-augmentation-1", 2}, - {"express-stack-filter-inserter", 4}, - {"nullius-motor-3", 5}, - {"nullius-carbon-composite", 6}, - {"nullius-levitation-field-1", 1}, - {"nullius-battery-2", 3}, - {"nullius-speed-module-3", 1} + {type = "item", name = "nullius-leg-augmentation-1", amount = 2}, + {type = "item", name = "bob-express-bulk-inserter", amount = 4}, + {type = "item", name = "nullius-motor-3", amount = 5}, + {type = "item", name = "nullius-carbon-composite", amount = 6}, + {type = "item", name = "nullius-levitation-field-1", amount = 1}, + {type = "item", name = "nullius-battery-2", amount = 3}, + {type = "item", name = "nullius-speed-module-3", amount = 1} }, - result = "nullius-leg-augmentation-2" + results = { + {type = "item", name = "nullius-leg-augmentation-2", amount = 1} + } }, { type = "item", name = "nullius-leg-augmentation-3", - localised_description = {"equipment-description.nullius-buffer", + localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-leg-augmentation"}, - {"entity-description.nullius-megajoule", 30}}, + {"entity-description.nullius-megajoule", tostring(30)}}, icons = {{ icon = "__base__/graphics/icons/exoskeleton-equipment.png", icon_size = 64, - icon_mipmaps = 4 + }}, - placed_as_equipment_result = "nullius-leg-augmentation-3", + place_as_equipment_result = "nullius-leg-augmentation-3", subgroup = "leg-augmentation", order = "nullius-cd", stack_size = 5 @@ -1757,20 +1870,22 @@ data:extend({ {type="fluid", name="nullius-compressed-argon", amount=100}, {type="fluid", name="nullius-lubricant", amount=40} }, - result = "nullius-leg-augmentation-3" + results = { + {type = "item", name = "nullius-leg-augmentation-3", amount = 1} + } }, { type = "item", name = "nullius-leg-augmentation-4", - localised_description = {"equipment-description.nullius-buffer", + localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-leg-augmentation"}, - {"entity-description.nullius-megajoule", 30}}, + {"entity-description.nullius-megajoule", tostring(30)}}, icons = {{ icon = ICONPATH .. "legs.png", icon_size = 64 }}, - placed_as_equipment_result = "nullius-leg-augmentation-4", + place_as_equipment_result = "nullius-leg-augmentation-4", subgroup = "leg-augmentation", order = "nullius-ce", stack_size = 5 @@ -1789,23 +1904,25 @@ data:extend({ {type="item", name="nullius-productivity-module-3", amount=1}, {type="item", name="nullius-graphene", amount=4} }, - result = "nullius-leg-augmentation-4" + results = { + {type = "item", name = "nullius-leg-augmentation-4", amount = 1} + } }, { type = "item", name = "nullius-quadrupedal-adaptation-1", localised_description = {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-bonus-cargo", 3}, "\n", - {"equipment-description.nullius-penalty-craft", 25}, "\n", - {"equipment-description.nullius-penalty-reach", 2}}, - {"entity-description.nullius-megajoule", 8}}, + {"equipment-description.nullius-bonus-cargo", tostring(3)}, "\n", + {"equipment-description.nullius-penalty-craft", tostring(25)}, "\n", + {"equipment-description.nullius-penalty-reach", tostring(2)}}, + {"entity-description.nullius-megajoule", tostring(8)}}, icons = {{ icon = ICONPATH.."equipment/quadruped.png", icon_size = 128, tint = {0.75, 0.75, 0.6} }}, - placed_as_equipment_result = "nullius-upgrade-quadrupedal-adaptation-1", + place_as_equipment_result = "nullius-upgrade-quadrupedal-adaptation-1", subgroup = "leg-augmentation", order = "nullius-db", stack_size = 5 @@ -1814,16 +1931,16 @@ data:extend({ type = "item", name = "nullius-quadrupedal-adaptation-2", localised_description = {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-bonus-cargo", 5}, "\n", - {"equipment-description.nullius-penalty-craft", 30}, "\n", - {"equipment-description.nullius-penalty-reach", 2}}, - {"entity-description.nullius-megajoule", 20}}, + {"equipment-description.nullius-bonus-cargo", tostring(5)}, "\n", + {"equipment-description.nullius-penalty-craft", tostring(30)}, "\n", + {"equipment-description.nullius-penalty-reach", tostring(2)}}, + {"entity-description.nullius-megajoule", tostring(20)}}, icons = {{ icon = ICONPATH.."equipment/quadruped.png", icon_size = 128, tint = {0.8, 0.8, 0.95} }}, - placed_as_equipment_result = "nullius-upgrade-quadrupedal-adaptation-2", + place_as_equipment_result = "nullius-upgrade-quadrupedal-adaptation-2", subgroup = "leg-augmentation", order = "nullius-dc", stack_size = 5 @@ -1832,15 +1949,15 @@ data:extend({ type = "item", name = "nullius-quadrupedal-adaptation-3", localised_description = {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-bonus-cargo", 6}, "\n", - {"equipment-description.nullius-penalty-craft", 40}, "\n", - {"equipment-description.nullius-penalty-reach", 2}}, - {"entity-description.nullius-megajoule", 40}}, + {"equipment-description.nullius-bonus-cargo", tostring(6)}, "\n", + {"equipment-description.nullius-penalty-craft", tostring(40)}, "\n", + {"equipment-description.nullius-penalty-reach", tostring(2)}}, + {"entity-description.nullius-megajoule", tostring(40)}}, icons = {{ icon = ICONPATH.."equipment/quadruped.png", icon_size = 128 }}, - placed_as_equipment_result = "nullius-upgrade-quadrupedal-adaptation-3", + place_as_equipment_result = "nullius-upgrade-quadrupedal-adaptation-3", subgroup = "leg-augmentation", order = "nullius-dd", stack_size = 5 @@ -1849,15 +1966,15 @@ data:extend({ type = "item", name = "nullius-quadrupedal-adaptation-4", localised_description = {"equipment-description.nullius-buffer", {"", - {"equipment-description.nullius-bonus-cargo", 6}, "\n", - {"equipment-description.nullius-penalty-craft", 30}, "\n", - {"equipment-description.nullius-penalty-reach", 2}}, - {"entity-description.nullius-megajoule", 40}}, + {"equipment-description.nullius-bonus-cargo", tostring(6)}, "\n", + {"equipment-description.nullius-penalty-craft", tostring(30)}, "\n", + {"equipment-description.nullius-penalty-reach", tostring(2)}}, + {"entity-description.nullius-megajoule", tostring(40)}}, icons = {{ icon = ICONPATH.."equipment/quadruped-4.png", icon_size = 128 }}, - placed_as_equipment_result = "nullius-upgrade-quadrupedal-adaptation-4", + place_as_equipment_result = "nullius-upgrade-quadrupedal-adaptation-4", subgroup = "leg-augmentation", order = "nullius-de", stack_size = 5 @@ -1870,11 +1987,13 @@ data:extend({ category = "large-crafting", energy_required = 6, ingredients = { - {"nullius-leg-augmentation-1", 2}, - {"nullius-steel-beam", 2}, - {"red-wire", 4} + {type = "item", name = "nullius-leg-augmentation-1", amount = 2}, + {type = "item", name = "nullius-steel-beam", amount = 2}, + {type = "item", name = "nullius-red-wire", amount = 4} }, - result = "nullius-quadrupedal-adaptation-1" + results = { + {type = "item", name = "nullius-quadrupedal-adaptation-1", amount = 1} + } }, { type = "recipe", @@ -1884,11 +2003,13 @@ data:extend({ category = "large-crafting", energy_required = 10, ingredients = { - {"nullius-leg-augmentation-2", 1}, - {"nullius-quadrupedal-adaptation-1", 1}, - {"nullius-steel-gear", 8} + {type = "item", name = "nullius-leg-augmentation-2", amount = 1}, + {type = "item", name = "nullius-quadrupedal-adaptation-1", amount = 1}, + {type = "item", name = "nullius-steel-gear", amount = 8} }, - result = "nullius-quadrupedal-adaptation-2" + results = { + {type = "item", name = "nullius-quadrupedal-adaptation-2", amount = 1} + } }, { type = "recipe", @@ -1898,11 +2019,13 @@ data:extend({ category = "large-crafting", energy_required = 20, ingredients = { - {"nullius-leg-augmentation-3", 2}, - {"nullius-quadrupedal-adaptation-2", 1}, - {"nullius-titanium-plate", 4} + {type = "item", name = "nullius-leg-augmentation-3", amount = 2}, + {type = "item", name = "nullius-quadrupedal-adaptation-2", amount = 1}, + {type = "item", name = "nullius-titanium-plate", amount = 4} }, - result = "nullius-quadrupedal-adaptation-3" + results = { + {type = "item", name = "nullius-quadrupedal-adaptation-3", amount = 1} + } }, { type = "recipe", @@ -1912,11 +2035,13 @@ data:extend({ category = "large-crafting", energy_required = 30, ingredients = { - {"nullius-leg-augmentation-4", 1}, - {"nullius-quadrupedal-adaptation-3", 1}, - {"nullius-sensor-2", 2} + {type = "item", name = "nullius-leg-augmentation-4", amount = 1}, + {type = "item", name = "nullius-quadrupedal-adaptation-3", amount = 1}, + {type = "item", name = "nullius-sensor-2", amount = 2} }, - result = "nullius-quadrupedal-adaptation-4" + results = { + {type = "item", name = "nullius-quadrupedal-adaptation-4", amount = 1} + } }, { @@ -1924,13 +2049,13 @@ data:extend({ name = "nullius-jump-boots", localised_description = {"equipment-description.nullius-buffer", {"", {"equipment-description.nullius-jump-boots"}, "\n", - {"equipment-description.nullius-penalty-cargo", 2}}, - {"entity-description.nullius-megajoule", 1}}, + {"equipment-description.nullius-penalty-cargo", tostring(2)}}, + {"entity-description.nullius-megajoule", tostring(1)}}, icons = {{ icon = ICONPATH.."equipment/boot.png", icon_size = 128 }}, - placed_as_equipment_result = "nullius-upgrade-jump-boots", + place_as_equipment_result = "nullius-upgrade-jump-boots", subgroup = "leg-augmentation", order = "nullius-b", stack_size = 10 @@ -1943,27 +2068,29 @@ data:extend({ category = "small-crafting", energy_required = 10, ingredients = { - {"turbo-inserter", 2}, - {"nullius-steel-gear", 3}, - {"nullius-aluminum-plate", 2}, - {"red-wire", 2}, - {"nullius-capacitor", 1} + {type = "item", name = "bob-turbo-inserter", amount = 2}, + {type = "item", name = "nullius-steel-gear", amount = 3}, + {type = "item", name = "nullius-aluminum-plate", amount = 2}, + {type = "item", name = "nullius-red-wire", amount = 2}, + {type = "item", name = "nullius-capacitor", amount = 1} }, - result = "nullius-jump-boots" + results = { + {type = "item", name = "nullius-jump-boots", amount = 1} + } }, { type = "item", name = "nullius-shield", - localised_description = {"equipment-description.nullius-buffer", + localised_description = {"equipment-description.nullius-buffer", {"equipment-description.nullius-shield"}, - {"entity-description.nullius-kilojoule", 500}}, + {"entity-description.nullius-kilojoule", tostring(500)}}, icons = {{ icon = "__base__/graphics/icons/energy-shield-equipment.png", icon_size = 64, - icon_mipmaps = 4 + }}, - placed_as_equipment_result = "nullius-shield", + place_as_equipment_result = "nullius-shield", subgroup = "armor", order = "nullius-h", stack_size = 10 @@ -1976,12 +2103,14 @@ data:extend({ always_show_made_in = true, energy_required = 20, ingredients = { - {"nullius-antimatter", 3}, - {"nullius-telekinesis-field-3", 1}, - {"nullius-armor-plate", 1}, - {"nullius-optical-cable", 8} + {type = "item", name = "nullius-antimatter", amount = 3}, + {type = "item", name = "nullius-telekinesis-field-3", amount = 1}, + {type = "item", name = "nullius-armor-plate", amount = 1}, + {type = "item", name = "nullius-optical-cable", amount = 8} }, - result = "nullius-shield" + results = { + {type = "item", name = "nullius-shield", amount = 1} + } }, { @@ -2002,7 +2131,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/locomotive.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "train-wagon", order = "nullius-bc", @@ -2041,13 +2170,15 @@ data:extend({ category = "large-crafting", energy_required = 10, ingredients = { - {"nullius-cargo-wagon-1", 1}, - {"nullius-portable-generator-1", 1}, - {"nullius-motor-1", 4}, - {"nullius-steel-gear", 10}, - {"nullius-glass", 3} + {type = "item", name = "nullius-cargo-wagon-1", amount = 1}, + {type = "item", name = "nullius-portable-generator-1", amount = 1}, + {type = "item", name = "nullius-motor-1", amount = 4}, + {type = "item", name = "nullius-steel-gear", amount = 10}, + {type = "item", name = "nullius-glass", amount = 3} }, - result = "nullius-locomotive-1" + results = { + {type = "item", name = "nullius-locomotive-1", amount = 1} + } }, { type = "recipe", @@ -2060,14 +2191,16 @@ data:extend({ category = "large-crafting", energy_required = 10, ingredients = { - {"nullius-cargo-wagon-1", 1}, - {"nullius-combustion-chamber-1", 1}, - {"nullius-turbine-open-1", 1}, - {"nullius-motor-1", 4}, - {"nullius-steel-gear", 10}, - {"nullius-glass", 3} + {type = "item", name = "nullius-cargo-wagon-1", amount = 1}, + {type = "item", name = "nullius-combustion-chamber-1", amount = 1}, + {type = "item", name = "nullius-turbine-open-1", amount = 1}, + {type = "item", name = "nullius-motor-1", amount = 4}, + {type = "item", name = "nullius-steel-gear", amount = 10}, + {type = "item", name = "nullius-glass", amount = 3} }, - result = "nullius-locomotive-1" + results = { + {type = "item", name = "nullius-locomotive-1", amount = 1} + } }, { type = "recipe", @@ -2077,14 +2210,16 @@ data:extend({ category = "huge-crafting", energy_required = 20, ingredients = { - {"nullius-locomotive-1", 1}, - {"nullius-cargo-wagon-2", 1}, - {"nullius-refueler", 1}, - {"nullius-portable-generator-2", 1}, - {"nullius-motor-2", 4}, - {"nullius-sensor-1", 1} + {type = "item", name = "nullius-locomotive-1", amount = 1}, + {type = "item", name = "nullius-cargo-wagon-2", amount = 1}, + {type = "item", name = "nullius-refueler", amount = 1}, + {type = "item", name = "nullius-portable-generator-2", amount = 1}, + {type = "item", name = "nullius-motor-2", amount = 4}, + {type = "item", name = "nullius-sensor-1", amount = 1} }, - result = "nullius-locomotive-2" + results = { + {type = "item", name = "nullius-locomotive-2", amount = 1} + } }, { type = "recipe", @@ -2097,14 +2232,16 @@ data:extend({ category = "huge-crafting", energy_required = 20, ingredients = { - {"nullius-locomotive-1", 1}, - {"nullius-cargo-wagon-2", 1}, - {"nullius-combustion-chamber-2", 1}, - {"nullius-turbine-open-2", 1}, - {"nullius-motor-2", 4}, - {"nullius-sensor-1", 1} + {type = "item", name = "nullius-locomotive-1", amount = 1}, + {type = "item", name = "nullius-cargo-wagon-2", amount = 1}, + {type = "item", name = "nullius-combustion-chamber-2", amount = 1}, + {type = "item", name = "nullius-turbine-open-2", amount = 1}, + {type = "item", name = "nullius-motor-2", amount = 4}, + {type = "item", name = "nullius-sensor-1", amount = 1} }, - result = "nullius-locomotive-2" + results = { + {type = "item", name = "nullius-locomotive-2", amount = 1} + } }, { type = "recipe", @@ -2114,12 +2251,14 @@ data:extend({ category = "huge-crafting", energy_required = 40, ingredients = { - {"nullius-locomotive-2", 1}, - {"nullius-portable-reactor", 1}, - {"nullius-motor-3", 4}, - {"nullius-speed-module-2", 1} + {type = "item", name = "nullius-locomotive-2", amount = 1}, + {type = "item", name = "nullius-portable-reactor", amount = 1}, + {type = "item", name = "nullius-motor-3", amount = 4}, + {type = "item", name = "nullius-speed-module-2", amount = 1} }, - result = "nullius-locomotive-3" + results = { + {type = "item", name = "nullius-locomotive-3", amount = 1} + } }, { type = "recipe", @@ -2132,13 +2271,15 @@ data:extend({ category = "huge-crafting", energy_required = 40, ingredients = { - {"nullius-locomotive-2", 1}, - {"nullius-combustion-chamber-3", 1}, - {"nullius-turbine-closed-3", 1}, - {"nullius-motor-3", 4}, - {"nullius-speed-module-2", 1} + {type = "item", name = "nullius-locomotive-2", amount = 1}, + {type = "item", name = "nullius-combustion-chamber-3", amount = 1}, + {type = "item", name = "nullius-turbine-closed-3", amount = 1}, + {type = "item", name = "nullius-motor-3", amount = 4}, + {type = "item", name = "nullius-speed-module-2", amount = 1} }, - result = "nullius-locomotive-3" + results = { + {type = "item", name = "nullius-locomotive-3", amount = 1} + } }, { type = "recipe", @@ -2148,13 +2289,15 @@ data:extend({ category = "huge-crafting", energy_required = 40, ingredients = { - {"nullius-locomotive-2", 1}, - {"nullius-solar-panel-2", 8}, - {"nullius-grid-battery-2", 1}, - {"nullius-motor-3", 2}, - {"nullius-efficiency-module-2", 1} + {type = "item", name = "nullius-locomotive-2", amount = 1}, + {type = "item", name = "nullius-solar-panel-2", amount = 8}, + {type = "item", name = "nullius-grid-battery-2", amount = 1}, + {type = "item", name = "nullius-motor-3", amount = 2}, + {type = "item", name = "nullius-efficiency-module-2", amount = 1} }, - result = "nullius-solar-locomotive" + results = { + {type = "item", name = "nullius-solar-locomotive", amount = 1} + } }, { @@ -2163,7 +2306,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/cargo-wagon.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.9, 0.9, 0.7} }}, subgroup = "train-wagon", @@ -2177,7 +2320,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/cargo-wagon.png", icon_size = 64, - icon_mipmaps = 4, + tint = {1, 0.85, 0.85} }}, subgroup = "train-wagon", @@ -2191,7 +2334,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/cargo-wagon.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "train-wagon", order = "nullius-cd", @@ -2213,7 +2356,9 @@ data:extend({ {type="item", name="nullius-graphite", amount=2}, {type="fluid", name="nullius-lubricant", amount=10, fluidbox_index=1} }, - result = "nullius-cargo-wagon-1" + results = { + {type = "item", name = "nullius-cargo-wagon-1", amount = 1} + } }, { type = "recipe", @@ -2226,13 +2371,15 @@ data:extend({ category = "large-crafting", energy_required = 5, ingredients = { - {"iron-chest", 3}, - {"nullius-steel-beam", 4}, - {"nullius-steel-plate", 5}, - {"nullius-steel-rod", 3}, - {"nullius-graphite", 2} + {type = "item", name = "iron-chest", amount = 3}, + {type = "item", name = "nullius-steel-beam", amount = 4}, + {type = "item", name = "nullius-steel-plate", amount = 5}, + {type = "item", name = "nullius-steel-rod", amount = 3}, + {type = "item", name = "nullius-graphite", amount = 2} }, - result = "nullius-cargo-wagon-1" + results = { + {type = "item", name = "nullius-cargo-wagon-1", amount = 1} + } }, { type = "recipe", @@ -2249,7 +2396,9 @@ data:extend({ {type="item", name="nullius-sensor-1", amount=1}, {type="fluid", name="nullius-lubricant", amount=50, fluidbox_index=1} }, - result = "nullius-cargo-wagon-2" + results = { + {type = "item", name = "nullius-cargo-wagon-2", amount = 1} + } }, { type = "recipe", @@ -2264,7 +2413,9 @@ data:extend({ {type="item", name="nullius-carbon-composite", amount=8}, {type="item", name="nullius-logistic-bot-3", amount=1} }, - result = "nullius-cargo-wagon-3" + results = { + {type = "item", name = "nullius-cargo-wagon-3", amount = 1} + } }, { @@ -2273,7 +2424,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/fluid-wagon.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.9, 0.9, 0.7} }}, subgroup = "train-wagon", @@ -2287,7 +2438,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/fluid-wagon.png", icon_size = 64, - icon_mipmaps = 4, + tint = {1, 0.85, 0.85} }}, subgroup = "train-wagon", @@ -2301,7 +2452,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/fluid-wagon.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "train-wagon", order = "nullius-dd", @@ -2316,10 +2467,12 @@ data:extend({ always_show_made_in = true, energy_required = 5, ingredients = { - {"nullius-cargo-wagon-1", 1}, - {"nullius-small-tank-1", 3} + {type = "item", name = "nullius-cargo-wagon-1", amount = 1}, + {type = "item", name = "nullius-small-tank-1", amount = 3} }, - result = "nullius-fluid-wagon-1" + results = { + {type = "item", name = "nullius-fluid-wagon-1", amount = 1} + } }, { type = "recipe", @@ -2329,11 +2482,13 @@ data:extend({ always_show_made_in = true, energy_required = 8, ingredients = { - {"nullius-fluid-wagon-1", 1}, - {"nullius-cargo-wagon-2", 1}, - {"nullius-small-tank-2", 3} + {type = "item", name = "nullius-fluid-wagon-1", amount = 1}, + {type = "item", name = "nullius-cargo-wagon-2", amount = 1}, + {type = "item", name = "nullius-small-tank-2", amount = 3} }, - result = "nullius-fluid-wagon-2" + results = { + {type = "item", name = "nullius-fluid-wagon-2", amount = 1} + } }, { type = "recipe", @@ -2343,11 +2498,13 @@ data:extend({ category = "large-crafting", energy_required = 20, ingredients = { - {"nullius-fluid-wagon-2", 1}, - {"nullius-large-tank-2", 1}, - {"nullius-box-steel-cable", 1} + {type = "item", name = "nullius-fluid-wagon-2", amount = 1}, + {type = "item", name = "nullius-large-tank-2", amount = 1}, + {type = "item", name = "nullius-box-steel-cable", amount = 1} }, - result = "nullius-fluid-wagon-3" + results = { + {type = "item", name = "nullius-fluid-wagon-3", amount = 1} + } }, { @@ -2406,11 +2563,13 @@ data:extend({ category = "tiny-crafting", energy_required = 5, ingredients = { - {"nullius-robot-frame-1", 1}, - {"decider-combinator", 1}, - {"nullius-fabrication-tool-2", 1} + {type = "item", name = "nullius-robot-frame-1", amount = 1}, + {type = "item", name = "decider-combinator", amount = 1}, + {type = "item", name = "nullius-fabrication-tool-2", amount = 1} }, - result = "nullius-construction-bot-1" + results = { + {type = "item", name = "nullius-construction-bot-1", amount = 1} + } }, { type = "recipe", @@ -2421,11 +2580,13 @@ data:extend({ subgroup = "boxed-robot", energy_required = 25, ingredients = { - {"nullius-box-robot-frame-1", 1}, - {"nullius-box-logic-circuit", 1}, - {"nullius-box-fabrication-tool-2", 1} + {type = "item", name = "nullius-box-robot-frame-1", amount = 1}, + {type = "item", name = "nullius-box-logic-circuit", amount = 1}, + {type = "item", name = "nullius-box-fabrication-tool-2", amount = 1} }, - result = "nullius-box-construction-bot-1" + results = { + {type = "item", name = "nullius-box-construction-bot-1", amount = 1} + } }, { type = "recipe", @@ -2438,11 +2599,13 @@ data:extend({ category = "tiny-crafting", energy_required = 5, ingredients = { - {"nullius-robot-frame-1", 1}, - {"decider-combinator", 1}, - {"repair-pack", 1} + {type = "item", name = "nullius-robot-frame-1", amount = 1}, + {type = "item", name = "decider-combinator", amount = 1}, + {type = "item", name = "repair-pack", amount = 1} }, - result = "nullius-construction-bot-1" + results = { + {type = "item", name = "nullius-construction-bot-1", amount = 1} + } }, { type = "recipe", @@ -2456,11 +2619,13 @@ data:extend({ subgroup = "boxed-robot", energy_required = 25, ingredients = { - {"nullius-box-robot-frame-1", 1}, - {"nullius-box-logic-circuit", 1}, - {"nullius-box-repair-pack", 1} + {type = "item", name = "nullius-box-robot-frame-1", amount = 1}, + {type = "item", name = "nullius-box-logic-circuit", amount = 1}, + {type = "item", name = "nullius-box-repair-pack", amount = 1} }, - result = "nullius-box-construction-bot-1" + results = { + {type = "item", name = "nullius-box-construction-bot-1", amount = 1} + } }, { type = "recipe", @@ -2470,12 +2635,14 @@ data:extend({ category = "tiny-crafting", energy_required = 6, ingredients = { - {"nullius-construction-bot-1", 1}, - {"nullius-robot-frame-2", 1}, - {"nullius-yield-module-1", 1}, - {"nullius-multi-tool-1", 1} + {type = "item", name = "nullius-construction-bot-1", amount = 1}, + {type = "item", name = "nullius-robot-frame-2", amount = 1}, + {type = "item", name = "nullius-yield-module-1", amount = 1}, + {type = "item", name = "nullius-multi-tool-1", amount = 1} }, - result = "nullius-construction-bot-2" + results = { + {type = "item", name = "nullius-construction-bot-2", amount = 1} + } }, { type = "recipe", @@ -2486,12 +2653,14 @@ data:extend({ subgroup = "boxed-robot", energy_required = 30, ingredients = { - {"nullius-box-construction-bot-1", 1}, - {"nullius-box-robot-frame-2", 1}, - {"nullius-box-yield-module-1", 1}, - {"nullius-multi-tool-1", 5} + {type = "item", name = "nullius-box-construction-bot-1", amount = 1}, + {type = "item", name = "nullius-box-robot-frame-2", amount = 1}, + {type = "item", name = "nullius-box-yield-module-1", amount = 1}, + {type = "item", name = "nullius-multi-tool-1", amount = 5} }, - result = "nullius-box-construction-bot-2" + results = { + {type = "item", name = "nullius-box-construction-bot-2", amount = 1} + } }, { type = "recipe", @@ -2504,11 +2673,13 @@ data:extend({ category = "tiny-crafting", energy_required = 6, ingredients = { - {"nullius-construction-bot-1", 1}, - {"nullius-robot-frame-2", 1}, - {"nullius-yield-module-1", 1} + {type = "item", name = "nullius-construction-bot-1", amount = 1}, + {type = "item", name = "nullius-robot-frame-2", amount = 1}, + {type = "item", name = "nullius-yield-module-1", amount = 1} }, - result = "nullius-construction-bot-2" + results = { + {type = "item", name = "nullius-construction-bot-2", amount = 1} + } }, { type = "recipe", @@ -2522,11 +2693,13 @@ data:extend({ subgroup = "boxed-robot", energy_required = 30, ingredients = { - {"nullius-box-construction-bot-1", 1}, - {"nullius-box-robot-frame-2", 1}, - {"nullius-box-yield-module-1", 1} + {type = "item", name = "nullius-box-construction-bot-1", amount = 1}, + {type = "item", name = "nullius-box-robot-frame-2", amount = 1}, + {type = "item", name = "nullius-box-yield-module-1", amount = 1} }, - result = "nullius-box-construction-bot-2" + results = { + {type = "item", name = "nullius-box-construction-bot-2", amount = 1} + } }, { type = "recipe", @@ -2536,12 +2709,14 @@ data:extend({ category = "tiny-crafting", energy_required = 8, ingredients = { - {"nullius-construction-bot-2", 2}, - {"nullius-robot-frame-3", 1}, - {"nullius-productivity-module-1", 1}, - {"nullius-fabrication-tool-3", 1} + {type = "item", name = "nullius-construction-bot-2", amount = 2}, + {type = "item", name = "nullius-robot-frame-3", amount = 1}, + {type = "item", name = "nullius-productivity-module-1", amount = 1}, + {type = "item", name = "nullius-fabrication-tool-3", amount = 1} }, - result = "nullius-construction-bot-3" + results = { + {type = "item", name = "nullius-construction-bot-3", amount = 1} + } }, { type = "recipe", @@ -2552,12 +2727,14 @@ data:extend({ subgroup = "boxed-robot", energy_required = 40, ingredients = { - {"nullius-box-construction-bot-2", 2}, - {"nullius-box-robot-frame-3", 1}, - {"nullius-box-productivity-module-1", 1}, - {"nullius-fabrication-tool-3", 5} + {type = "item", name = "nullius-box-construction-bot-2", amount = 2}, + {type = "item", name = "nullius-box-robot-frame-3", amount = 1}, + {type = "item", name = "nullius-box-productivity-module-1", amount = 1}, + {type = "item", name = "nullius-fabrication-tool-3", amount = 5} }, - result = "nullius-box-construction-bot-3" + results = { + {type = "item", name = "nullius-box-construction-bot-3", amount = 1} + } }, { type = "recipe", @@ -2570,12 +2747,14 @@ data:extend({ category = "tiny-crafting", energy_required = 8, ingredients = { - {"nullius-construction-bot-2", 2}, - {"nullius-robot-frame-3", 1}, - {"nullius-productivity-module-1", 1}, - {"nullius-small-miner-3", 1} + {type = "item", name = "nullius-construction-bot-2", amount = 2}, + {type = "item", name = "nullius-robot-frame-3", amount = 1}, + {type = "item", name = "nullius-productivity-module-1", amount = 1}, + {type = "item", name = "nullius-small-miner-3", amount = 1} }, - result = "nullius-construction-bot-3" + results = { + {type = "item", name = "nullius-construction-bot-3", amount = 1} + } }, { type = "recipe", @@ -2589,12 +2768,14 @@ data:extend({ subgroup = "boxed-robot", energy_required = 40, ingredients = { - {"nullius-box-construction-bot-2", 2}, - {"nullius-box-robot-frame-3", 1}, - {"nullius-box-productivity-module-1", 1}, - {"nullius-small-miner-3", 5} + {type = "item", name = "nullius-box-construction-bot-2", amount = 2}, + {type = "item", name = "nullius-box-robot-frame-3", amount = 1}, + {type = "item", name = "nullius-box-productivity-module-1", amount = 1}, + {type = "item", name = "nullius-small-miner-3", amount = 5} }, - result = "nullius-box-construction-bot-3" + results = { + {type = "item", name = "nullius-box-construction-bot-3", amount = 1} + } }, { type = "recipe", @@ -2606,13 +2787,14 @@ data:extend({ category = "tiny-crafting", energy_required = 25, ingredients = { - {"nullius-construction-bot-3", 3}, - {"nullius-robot-frame-4", 2}, - {"nullius-productivity-module-3", 1}, - {"nullius-multi-tool-2", 2} + {type = "item", name = "nullius-construction-bot-3", amount = 3}, + {type = "item", name = "nullius-robot-frame-4", amount = 2}, + {type = "item", name = "nullius-productivity-module-3", amount = 1}, + {type = "item", name = "nullius-multi-tool-2", amount = 2} }, - result = "nullius-construction-bot-4", - result_count = 2 + results = { + {type = "item", name = "nullius-construction-bot-4", amount = 2} + } }, { type = "recipe", @@ -2625,13 +2807,14 @@ data:extend({ subgroup = "boxed-robot", energy_required = 125, ingredients = { - {"nullius-box-construction-bot-3", 3}, - {"nullius-box-robot-frame-4", 2}, - {"nullius-box-productivity-module-3", 1}, - {"nullius-multi-tool-2", 10} + {type = "item", name = "nullius-box-construction-bot-3", amount = 3}, + {type = "item", name = "nullius-box-robot-frame-4", amount = 2}, + {type = "item", name = "nullius-box-productivity-module-3", amount = 1}, + {type = "item", name = "nullius-multi-tool-2", amount = 10} }, - result = "nullius-box-construction-bot-4", - result_count = 2 + results = { + {type = "item", name = "nullius-box-construction-bot-4", amount = 2} + } }, { type = "recipe", @@ -2646,12 +2829,13 @@ data:extend({ category = "tiny-crafting", energy_required = 25, ingredients = { - {"nullius-construction-bot-3", 3}, - {"nullius-robot-frame-4", 2}, - {"nullius-productivity-module-3", 1} + {type = "item", name = "nullius-construction-bot-3", amount = 3}, + {type = "item", name = "nullius-robot-frame-4", amount = 2}, + {type = "item", name = "nullius-productivity-module-3", amount = 1} }, - result = "nullius-construction-bot-4", - result_count = 2 + results = { + {type = "item", name = "nullius-construction-bot-4", amount = 2} + } }, { type = "recipe", @@ -2667,12 +2851,13 @@ data:extend({ subgroup = "boxed-robot", energy_required = 125, ingredients = { - {"nullius-box-construction-bot-3", 3}, - {"nullius-box-robot-frame-4", 2}, - {"nullius-box-productivity-module-3", 1} + {type = "item", name = "nullius-box-construction-bot-3", amount = 3}, + {type = "item", name = "nullius-box-robot-frame-4", amount = 2}, + {type = "item", name = "nullius-box-productivity-module-3", amount = 1} }, - result = "nullius-box-construction-bot-4", - result_count = 2 + results = { + {type = "item", name = "nullius-box-construction-bot-4", amount = 2} + } }, { @@ -2731,11 +2916,13 @@ data:extend({ category = "tiny-crafting", energy_required = 5, ingredients = { - {"nullius-robot-frame-1", 1}, - {"arithmetic-combinator", 1}, - {"nullius-small-cargo-pod-1", 1} + {type = "item", name = "nullius-robot-frame-1", amount = 1}, + {type = "item", name = "arithmetic-combinator", amount = 1}, + {type = "item", name = "nullius-small-cargo-pod-1", amount = 1} }, - result = "nullius-logistic-bot-1" + results = { + {type = "item", name = "nullius-logistic-bot-1", amount = 1} + } }, { type = "recipe", @@ -2746,11 +2933,13 @@ data:extend({ subgroup = "boxed-robot", energy_required = 25, ingredients = { - {"nullius-box-robot-frame-1", 1}, - {"nullius-box-arithmetic-circuit", 1}, - {"nullius-small-cargo-pod-1", 5} + {type = "item", name = "nullius-box-robot-frame-1", amount = 1}, + {type = "item", name = "nullius-box-arithmetic-circuit", amount = 1}, + {type = "item", name = "nullius-small-cargo-pod-1", amount = 5} }, - result = "nullius-box-logistic-bot-1" + results = { + {type = "item", name = "nullius-box-logistic-bot-1", amount = 1} + } }, { type = "recipe", @@ -2763,11 +2952,13 @@ data:extend({ category = "tiny-crafting", energy_required = 5, ingredients = { - {"nullius-robot-frame-1", 1}, - {"arithmetic-combinator", 1}, - {"nullius-small-storage-chest-1", 1} + {type = "item", name = "nullius-robot-frame-1", amount = 1}, + {type = "item", name = "arithmetic-combinator", amount = 1}, + {type = "item", name = "nullius-small-storage-chest-1", amount = 1} }, - result = "nullius-logistic-bot-1" + results = { + {type = "item", name = "nullius-logistic-bot-1", amount = 1} + } }, { type = "recipe", @@ -2781,11 +2972,13 @@ data:extend({ subgroup = "boxed-robot", energy_required = 25, ingredients = { - {"nullius-box-robot-frame-1", 1}, - {"nullius-box-arithmetic-circuit", 1}, - {"nullius-small-storage-chest-1", 5} + {type = "item", name = "nullius-box-robot-frame-1", amount = 1}, + {type = "item", name = "nullius-box-arithmetic-circuit", amount = 1}, + {type = "item", name = "nullius-small-storage-chest-1", amount = 5} }, - result = "nullius-box-logistic-bot-1" + results = { + {type = "item", name = "nullius-box-logistic-bot-1", amount = 1} + } }, { type = "recipe", @@ -2795,12 +2988,14 @@ data:extend({ category = "tiny-crafting", energy_required = 6, ingredients = { - {"nullius-logistic-bot-1", 1}, - {"nullius-robot-frame-2", 1}, - {"nullius-efficiency-module-1", 1}, - {"nullius-large-cargo-pod-1", 1} + {type = "item", name = "nullius-logistic-bot-1", amount = 1}, + {type = "item", name = "nullius-robot-frame-2", amount = 1}, + {type = "item", name = "nullius-efficiency-module-1", amount = 1}, + {type = "item", name = "nullius-large-cargo-pod-1", amount = 1} }, - result = "nullius-logistic-bot-2" + results = { + {type = "item", name = "nullius-logistic-bot-2", amount = 1} + } }, { type = "recipe", @@ -2811,12 +3006,14 @@ data:extend({ subgroup = "boxed-robot", energy_required = 30, ingredients = { - {"nullius-box-logistic-bot-1", 1}, - {"nullius-box-robot-frame-2", 1}, - {"nullius-box-efficiency-module-1", 1}, - {"nullius-large-cargo-pod-1", 5} + {type = "item", name = "nullius-box-logistic-bot-1", amount = 1}, + {type = "item", name = "nullius-box-robot-frame-2", amount = 1}, + {type = "item", name = "nullius-box-efficiency-module-1", amount = 1}, + {type = "item", name = "nullius-large-cargo-pod-1", amount = 5} }, - result = "nullius-box-logistic-bot-2" + results = { + {type = "item", name = "nullius-box-logistic-bot-2", amount = 1} + } }, { type = "recipe", @@ -2829,11 +3026,13 @@ data:extend({ category = "tiny-crafting", energy_required = 6, ingredients = { - {"nullius-logistic-bot-1", 1}, - {"nullius-robot-frame-2", 1}, - {"nullius-efficiency-module-1", 1} + {type = "item", name = "nullius-logistic-bot-1", amount = 1}, + {type = "item", name = "nullius-robot-frame-2", amount = 1}, + {type = "item", name = "nullius-efficiency-module-1", amount = 1} }, - result = "nullius-logistic-bot-2" + results = { + {type = "item", name = "nullius-logistic-bot-2", amount = 1} + } }, { type = "recipe", @@ -2847,11 +3046,13 @@ data:extend({ subgroup = "boxed-robot", energy_required = 30, ingredients = { - {"nullius-box-logistic-bot-1", 1}, - {"nullius-box-robot-frame-2", 1}, - {"nullius-box-efficiency-module-1", 1} + {type = "item", name = "nullius-box-logistic-bot-1", amount = 1}, + {type = "item", name = "nullius-box-robot-frame-2", amount = 1}, + {type = "item", name = "nullius-box-efficiency-module-1", amount = 1} }, - result = "nullius-box-logistic-bot-2" + results = { + {type = "item", name = "nullius-box-logistic-bot-2", amount = 1} + } }, { type = "recipe", @@ -2861,12 +3062,14 @@ data:extend({ category = "tiny-crafting", energy_required = 8, ingredients = { - {"nullius-logistic-bot-2", 2}, - {"nullius-robot-frame-3", 1}, - {"nullius-speed-module-2", 1}, - {"nullius-large-cargo-pod-2", 1} + {type = "item", name = "nullius-logistic-bot-2", amount = 2}, + {type = "item", name = "nullius-robot-frame-3", amount = 1}, + {type = "item", name = "nullius-speed-module-2", amount = 1}, + {type = "item", name = "nullius-large-cargo-pod-2", amount = 1} }, - result = "nullius-logistic-bot-3" + results = { + {type = "item", name = "nullius-logistic-bot-3", amount = 1} + } }, { type = "recipe", @@ -2877,12 +3080,14 @@ data:extend({ subgroup = "boxed-robot", energy_required = 40, ingredients = { - {"nullius-box-logistic-bot-2", 2}, - {"nullius-box-robot-frame-3", 1}, - {"nullius-box-speed-module-2", 1}, - {"nullius-large-cargo-pod-2", 5} + {type = "item", name = "nullius-box-logistic-bot-2", amount = 2}, + {type = "item", name = "nullius-box-robot-frame-3", amount = 1}, + {type = "item", name = "nullius-box-speed-module-2", amount = 1}, + {type = "item", name = "nullius-large-cargo-pod-2", amount = 5} }, - result = "nullius-box-logistic-bot-3" + results = { + {type = "item", name = "nullius-box-logistic-bot-3", amount = 1} + } }, { type = "recipe", @@ -2895,12 +3100,14 @@ data:extend({ category = "tiny-crafting", energy_required = 8, ingredients = { - {"nullius-logistic-bot-2", 2}, - {"nullius-robot-frame-3", 1}, - {"nullius-speed-module-2", 1}, - {"logistic-chest-buffer", 1} + {type = "item", name = "nullius-logistic-bot-2", amount = 2}, + {type = "item", name = "nullius-robot-frame-3", amount = 1}, + {type = "item", name = "nullius-speed-module-2", amount = 1}, + {type = "item", name = "buffer-chest", amount = 1} }, - result = "nullius-logistic-bot-3" + results = { + {type = "item", name = "nullius-logistic-bot-3", amount = 1} + } }, { type = "recipe", @@ -2914,12 +3121,14 @@ data:extend({ subgroup = "boxed-robot", energy_required = 40, ingredients = { - {"nullius-box-logistic-bot-2", 2}, - {"nullius-box-robot-frame-3", 1}, - {"nullius-box-speed-module-2", 1}, - {"logistic-chest-buffer", 5} + {type = "item", name = "nullius-box-logistic-bot-2", amount = 2}, + {type = "item", name = "nullius-box-robot-frame-3", amount = 1}, + {type = "item", name = "nullius-box-speed-module-2", amount = 1}, + {type = "item", name = "buffer-chest", amount = 5} }, - result = "nullius-box-logistic-bot-3" + results = { + {type = "item", name = "nullius-box-logistic-bot-3", amount = 1} + } }, { type = "recipe", @@ -2931,13 +3140,14 @@ data:extend({ category = "tiny-crafting", energy_required = 25, ingredients = { - {"nullius-logistic-bot-3", 3}, - {"nullius-robot-frame-4", 2}, - {"nullius-speed-module-4", 1}, - {"nullius-large-cargo-pod-3", 2} + {type = "item", name = "nullius-logistic-bot-3", amount = 3}, + {type = "item", name = "nullius-robot-frame-4", amount = 2}, + {type = "item", name = "nullius-speed-module-4", amount = 1}, + {type = "item", name = "nullius-large-cargo-pod-3", amount = 2} }, - result = "nullius-logistic-bot-4", - result_count = 2 + results = { + {type = "item", name = "nullius-logistic-bot-4", amount = 2} + } }, { type = "recipe", @@ -2950,13 +3160,14 @@ data:extend({ subgroup = "boxed-robot", energy_required = 125, ingredients = { - {"nullius-box-logistic-bot-3", 3}, - {"nullius-box-robot-frame-4", 2}, - {"nullius-box-speed-module-4", 1}, - {"nullius-large-cargo-pod-3", 10} + {type = "item", name = "nullius-box-logistic-bot-3", amount = 3}, + {type = "item", name = "nullius-box-robot-frame-4", amount = 2}, + {type = "item", name = "nullius-box-speed-module-4", amount = 1}, + {type = "item", name = "nullius-large-cargo-pod-3", amount = 10} }, - result = "nullius-box-logistic-bot-4", - result_count = 2 + results = { + {type = "item", name = "nullius-box-logistic-bot-4", amount = 2} + } }, { type = "recipe", @@ -2971,12 +3182,13 @@ data:extend({ category = "tiny-crafting", energy_required = 25, ingredients = { - {"nullius-logistic-bot-3", 3}, - {"nullius-robot-frame-4", 2}, - {"nullius-speed-module-4", 1} + {type = "item", name = "nullius-logistic-bot-3", amount = 3}, + {type = "item", name = "nullius-robot-frame-4", amount = 2}, + {type = "item", name = "nullius-speed-module-4", amount = 1} }, - result = "nullius-logistic-bot-4", - result_count = 2 + results = { + {type = "item", name = "nullius-logistic-bot-4", amount = 2} + } }, { type = "recipe", @@ -2992,12 +3204,13 @@ data:extend({ subgroup = "boxed-robot", energy_required = 125, ingredients = { - {"nullius-box-logistic-bot-3", 3}, - {"nullius-box-robot-frame-4", 2}, - {"nullius-box-speed-module-4", 1} + {type = "item", name = "nullius-box-logistic-bot-3", amount = 3}, + {type = "item", name = "nullius-box-robot-frame-4", amount = 2}, + {type = "item", name = "nullius-box-speed-module-4", amount = 1} }, - result = "nullius-box-logistic-bot-4", - result_count = 2 + results = { + {type = "item", name = "nullius-box-logistic-bot-4", amount = 2} + } }, { @@ -3006,7 +3219,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/car.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.75, 0.75, 0.6} }}, subgroup = "vehicle", @@ -3020,7 +3233,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/car.png", icon_size = 64, - icon_mipmaps = 4, + tint = {1, 0.8, 0.9} }}, subgroup = "vehicle", @@ -3034,7 +3247,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/car.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.65, 0.75, 1} }}, subgroup = "vehicle", @@ -3048,7 +3261,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/tank.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "vehicle", order = "nullius-cb", @@ -3061,7 +3274,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/tank.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.6, 0.85} }}, subgroup = "vehicle", @@ -3083,7 +3296,9 @@ data:extend({ {type="item", name="nullius-steel-rod", amount=4}, {type="fluid", name="nullius-air", amount=20, fluidbox_index=1} }, - result = "nullius-car-1" + results = { + {type = "item", name = "nullius-car-1", amount = 1} + } }, { type = "recipe", @@ -3101,7 +3316,9 @@ data:extend({ {type="item", name="nullius-iron-wire", amount=4}, {type="fluid", name="nullius-air", amount=15, fluidbox_index=1} }, - result = "nullius-car-1" + results = { + {type = "item", name = "nullius-car-1", amount = 1} + } }, { type = "recipe", @@ -3118,7 +3335,9 @@ data:extend({ {type="item", name="nullius-battery-1", amount=4}, {type="item", name="nullius-gun", amount=2} }, - result = "nullius-car-2" + results = { + {type = "item", name = "nullius-car-2", amount = 1} + } }, { type = "recipe", @@ -3132,7 +3351,9 @@ data:extend({ {type="item", name="nullius-solar-locomotive", amount=1}, {type="item", name="nullius-missile-launcher", amount=2} }, - result = "nullius-car-3" + results = { + {type = "item", name = "nullius-car-3", amount = 1} + } }, { type = "recipe", @@ -3148,7 +3369,9 @@ data:extend({ {type="item", name="nullius-rubber", amount=8}, {type="fluid", name="nullius-compressed-air", amount=40, fluidbox_index=1} }, - result = "nullius-truck-1" + results = { + {type = "item", name = "nullius-truck-1", amount = 1} + } }, { type = "recipe", @@ -3161,7 +3384,9 @@ data:extend({ {type="item", name="nullius-truck-1", amount=1}, {type="item", name="nullius-locomotive-3", amount=1} }, - result = "nullius-truck-2" + results = { + {type = "item", name = "nullius-truck-2", amount = 1} + } }, { @@ -3170,7 +3395,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/spidertron.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "vehicle", order = "nullius-db", @@ -3183,7 +3408,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/spidertron-tintable.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "vehicle", order = "nullius-dc", @@ -3206,7 +3431,9 @@ data:extend({ {type="item", name="nullius-efficiency-module-3", amount=4}, {type="item", name="nullius-stabilizer-1", amount=2} }, - result = "nullius-mecha" + results = { + {type = "item", name = "nullius-mecha", amount = 1} + } }, { type = "recipe", @@ -3223,7 +3450,9 @@ data:extend({ {type="item", name="nullius-armor-plate", amount=16}, {type="item", name="nullius-stabilizer-2", amount=4} }, - result = "nullius-mecha-2" + results = { + {type = "item", name = "nullius-mecha-2", amount = 1} + } }, { @@ -3232,10 +3461,21 @@ data:extend({ icon = "__base__/graphics/icons/spidertron-remote.png", icon_color_indicator_mask = "__base__/graphics/icons/spidertron-remote-mask.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "vehicle", order = "nullius-df", - stack_size = 1 + stack_size = 1, + + select = { + border_color = {1,0,0}, + cursor_box_type = "spidertron-remote-selected", + mode = "controllable" + }, + alt_select = { + border_color = {1,0,0}, + cursor_box_type = "spidertron-remote-selected", + mode = "controllable" + } }, { type = "recipe", @@ -3246,10 +3486,12 @@ data:extend({ category = "tiny-crafting", energy_required = 20, ingredients = { - {"nullius-scout-remote", 1}, - {"nullius-processor-2", 1} + {type = "item", name = "nullius-scout-remote", amount = 1}, + {type = "item", name = "nullius-processor-2", amount = 1} }, - result = "nullius-mecha-remote" + results = { + {type = "item", name = "nullius-mecha-remote", amount = 1} + } }, { @@ -3257,7 +3499,7 @@ data:extend({ name = "nullius-rocket", icon = "__base__/graphics/icons/rocket.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "space", order = "nullius-c", stack_size = 1 @@ -3267,22 +3509,25 @@ data:extend({ name = "nullius-rocket", enabled = false, always_show_made_in = true, + hide_from_player_crafting = true, category = "rocketry", energy_required = 400, ingredients = { - {"nullius-box-rocket-fuel", 50}, - {"nullius-box-carbon-composite", 40}, - {"nullius-box-titanium-sheet", 30}, - {"nullius-haste-module-3", 2}, - {"nullius-sensor-node-2", 3}, - {"nullius-box-steel-beam", 20}, - {"nullius-box-heat-pipe-3", 6}, - {"nullius-box-insulation", 12}, - {"nullius-box-ceramic-powder", 20}, - {"nullius-box-logistic-bot-2", 1}, - {"nullius-box-gate", 1} + {type = "item", name = "nullius-box-rocket-fuel", amount = 50}, + {type = "item", name = "nullius-box-carbon-composite", amount = 40}, + {type = "item", name = "nullius-box-titanium-sheet", amount = 30}, + {type = "item", name = "nullius-haste-module-3", amount = 2}, + {type = "item", name = "nullius-sensor-node-2", amount = 3}, + {type = "item", name = "nullius-box-steel-beam", amount = 20}, + {type = "item", name = "nullius-box-heat-pipe-3", amount = 6}, + {type = "item", name = "nullius-box-insulation", amount = 12}, + {type = "item", name = "nullius-box-ceramic-powder", amount = 20}, + {type = "item", name = "nullius-box-logistic-bot-2", amount = 1}, + {type = "item", name = "nullius-box-gate", amount = 1} }, - result = "nullius-rocket" + results = { + {type = "item", name = "nullius-rocket", amount = 1} + } }, { @@ -3290,11 +3535,15 @@ data:extend({ name = "nullius-satellite", icon = "__base__/graphics/icons/satellite.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "space", order = "nullius-d", stack_size = 1, - rocket_launch_product = {"nullius-box-astronomy-pack", 100} + weight = 1000000, + send_to_orbit_mode = "automated", + rocket_launch_products = { + {type = "item", name = "nullius-box-astronomy-pack", amount = 100} + } }, { type = "recipe", @@ -3304,16 +3553,18 @@ data:extend({ category = "huge-crafting", energy_required = 120, ingredients = { - {"nullius-box-rocket-fuel", 10}, - {"nullius-box-carbon-composite", 6}, - {"nullius-box-aluminum-sheet", 5}, - {"nullius-efficiency-module-3", 2}, - {"nullius-lab-2", 3}, - {"nullius-beacon-3", 2}, - {"nullius-box-solar-panel-2", 3}, - {"nullius-grid-battery-2", 4} + {type = "item", name = "nullius-box-rocket-fuel", amount = 10}, + {type = "item", name = "nullius-box-carbon-composite", amount = 6}, + {type = "item", name = "nullius-box-aluminum-sheet", amount = 5}, + {type = "item", name = "nullius-efficiency-module-3", amount = 2}, + {type = "item", name = "nullius-lab-2", amount = 3}, + {type = "item", name = "nullius-beacon-3", amount = 2}, + {type = "item", name = "nullius-box-solar-panel-2", amount = 3}, + {type = "item", name = "nullius-grid-battery-2", amount = 4} }, - result = "nullius-satellite" + results = { + {type = "item", name = "nullius-satellite", amount = 1} + } }, { @@ -3321,15 +3572,17 @@ data:extend({ name = "nullius-probe", icon = "__base__/graphics/icons/crash-site-spaceship.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "space", order = "nullius-l", stack_size = 1, + weight = 1000000, + send_to_orbit_mode = "automated", rocket_launch_products = { - {"nullius-box-astronomy-pack", 1000}, - {"nullius-box-physics-pack", 200}, - {"nullius-box-chemical-pack", 200}, - {"nullius-box-electrical-pack", 200} + {type = "item", name = "nullius-box-astronomy-pack", amount = 1000}, + {type = "item", name = "nullius-box-physics-pack", amount = 200}, + {type = "item", name = "nullius-box-chemical-pack", amount = 200}, + {type = "item", name = "nullius-box-electrical-pack", amount = 200} } }, { @@ -3340,25 +3593,27 @@ data:extend({ category = "huge-crafting", energy_required = 800, ingredients = { - {"nullius-asteroid-miner-1", 1}, - {"nullius-satellite", 2}, - {"nullius-antimatter", 25}, - {"nullius-box-copper-sheet", 10}, - {"nullius-android-2", 1}, - {"nullius-nanofabricator-2", 1}, - {"nullius-reactor", 1} + {type = "item", name = "nullius-asteroid-miner-1", amount = 1}, + {type = "item", name = "nullius-satellite", amount = 2}, + {type = "item", name = "nullius-antimatter", amount = 25}, + {type = "item", name = "nullius-box-copper-sheet", amount = 10}, + {type = "item", name = "nullius-android-2", amount = 1}, + {type = "item", name = "nullius-nanofabricator-2", amount = 1}, + {type = "item", name = "nullius-reactor", amount = 1} }, - result = "nullius-probe" + results = { + {type = "item", name = "nullius-probe", amount = 1} + } }, { type = "item", name = "nullius-armor-plate", - icons = {{ - icon = EQUIPPATH.."armor-plate.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-armor-plate", + icons = {{ + icon = EQUIPPATH.."armor-plate.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-armor-plate", subgroup = "armor", order = "nullius-g", stack_size = 50 @@ -3371,23 +3626,25 @@ data:extend({ category = "hand-casting", energy_required = 12, ingredients = { - {"nullius-steel-plate", 3}, - {"nullius-ceramic-powder", 4}, - {"nullius-plastic", 3}, - {"nullius-textile", 2}, - {"nullius-rubber", 1} + {type = "item", name = "nullius-steel-plate", amount = 3}, + {type = "item", name = "nullius-ceramic-powder", amount = 4}, + {type = "item", name = "nullius-plastic", amount = 3}, + {type = "item", name = "nullius-textile", amount = 2}, + {type = "item", name = "nullius-rubber", amount = 1} }, - result = "nullius-armor-plate" + results = { + {type = "item", name = "nullius-armor-plate", amount = 1} + } }, { type = "item", name = "nullius-small-cargo-pod-1", - icons = {{ - icon = EQUIPPATH.."small-pod-1.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-small-cargo-pod-1", + icons = {{ + icon = EQUIPPATH.."small-pod-1.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-small-cargo-pod-1", subgroup = "cargo-pod", order = "nullius-bb", stack_size = 50 @@ -3395,11 +3652,11 @@ data:extend({ { type = "item", name = "nullius-small-cargo-pod-2", - icons = {{ - icon = EQUIPPATH.."small-pod-2.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-small-cargo-pod-2", + icons = {{ + icon = EQUIPPATH.."small-pod-2.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-small-cargo-pod-2", subgroup = "cargo-pod", order = "nullius-bc", stack_size = 50 @@ -3407,11 +3664,11 @@ data:extend({ { type = "item", name = "nullius-large-cargo-pod-1", - icons = {{ - icon = ICONPATH.."equipment/large-pod-1.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-large-cargo-pod-1", + icons = {{ + icon = ICONPATH.."equipment/large-pod-1.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-large-cargo-pod-1", subgroup = "cargo-pod", order = "nullius-cb", stack_size = 20 @@ -3419,11 +3676,11 @@ data:extend({ { type = "item", name = "nullius-large-cargo-pod-2", - icons = {{ - icon = ICONPATH.."equipment/large-pod-2.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-large-cargo-pod-2", + icons = {{ + icon = ICONPATH.."equipment/large-pod-2.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-large-cargo-pod-2", subgroup = "cargo-pod", order = "nullius-cc", stack_size = 20 @@ -3431,11 +3688,11 @@ data:extend({ { type = "item", name = "nullius-large-cargo-pod-3", - icons = {{ - icon = ICONPATH.."equipment/large-pod-3.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-large-cargo-pod-3", + icons = {{ + icon = ICONPATH.."equipment/large-pod-3.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-large-cargo-pod-3", subgroup = "cargo-pod", order = "nullius-cd", stack_size = 20 @@ -3451,7 +3708,9 @@ data:extend({ {type="item", name="wooden-chest", amount=1}, {type="item", name="nullius-iron-wire", amount=1} }, - result = "nullius-small-cargo-pod-1" + results = { + {type = "item", name = "nullius-small-cargo-pod-1", amount = 1} + } }, { type = "recipe", @@ -3463,9 +3722,11 @@ data:extend({ ingredients = { {type="item", name="nullius-small-cargo-pod-1", amount=1}, {type="item", name="nullius-textile", amount=2}, - {type="item", name="logistic-chest-buffer", amount=1} + {type="item", name="buffer-chest", amount=1} }, - result = "nullius-small-cargo-pod-2" + results = { + {type = "item", name = "nullius-small-cargo-pod-2", amount = 1} + } }, { type = "recipe", @@ -3478,7 +3739,9 @@ data:extend({ {type="item", name="nullius-small-cargo-pod-1", amount=2}, {type="item", name="nullius-large-chest-1", amount=1} }, - result = "nullius-large-cargo-pod-1" + results = { + {type = "item", name = "nullius-large-cargo-pod-1", amount = 1} + } }, { type = "recipe", @@ -3493,7 +3756,9 @@ data:extend({ {type="item", name="nullius-textile", amount=4}, {type="item", name="nullius-steel-cable", amount=2} }, - result = "nullius-large-cargo-pod-2" + results = { + {type = "item", name = "nullius-large-cargo-pod-2", amount = 1} + } }, { type = "recipe", @@ -3507,17 +3772,19 @@ data:extend({ {type="item", name="nullius-small-cargo-pod-2", amount=2}, {type="item", name="nullius-large-buffer-chest-2", amount=1} }, - result = "nullius-large-cargo-pod-3" + results = { + {type = "item", name = "nullius-large-cargo-pod-3", amount = 1} + } }, { type = "item", name = "nullius-trash-compactor", - icons = {{ - icon = ICONPATH.."equipment/trash-compactor-1.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-trash-compactor", + icons = {{ + icon = ICONPATH.."equipment/trash-compactor-1.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-trash-compactor", subgroup = "cargo-pod", order = "nullius-db", stack_size = 20 @@ -3525,11 +3792,11 @@ data:extend({ { type = "item", name = "nullius-trash-compactor-2", - icons = {{ - icon = ICONPATH.."equipment/trash-compactor-2.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-trash-compactor-2", + icons = {{ + icon = ICONPATH.."equipment/trash-compactor-2.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-trash-compactor-2", subgroup = "cargo-pod", order = "nullius-dc", stack_size = 20 @@ -3546,7 +3813,9 @@ data:extend({ {type="item", name="nullius-crusher-2", amount=1}, {type="item", name="nullius-battery-1", amount=1} }, - result = "nullius-trash-compactor" + results = { + {type = "item", name = "nullius-trash-compactor", amount = 1} + } }, { type = "recipe", @@ -3560,17 +3829,19 @@ data:extend({ {type="item", name="nullius-trash-compactor", amount=2}, {type="item", name="nullius-mining-tool-2", amount=1} }, - result = "nullius-trash-compactor-2" + results = { + {type = "item", name = "nullius-trash-compactor-2", amount = 1} + } }, { type = "item", name = "nullius-fabrication-tool-1", - icons = {{ - icon = ICONPATH.."equipment/fabrication-tool-1.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-fabrication-tool-1", + icons = {{ + icon = ICONPATH.."equipment/fabrication-tool-1.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-fabrication-tool-1", subgroup = "tool-upgrades", order = "nullius-cb", stack_size = 50 @@ -3578,11 +3849,11 @@ data:extend({ { type = "item", name = "nullius-fabrication-tool-2", - icons = {{ - icon = ICONPATH.."equipment/fabrication-tool-2.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-fabrication-tool-2", + icons = {{ + icon = ICONPATH.."equipment/fabrication-tool-2.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-fabrication-tool-2", subgroup = "tool-upgrades", order = "nullius-cc", stack_size = 50 @@ -3590,11 +3861,11 @@ data:extend({ { type = "item", name = "nullius-fabrication-tool-3", - icons = {{ - icon = ICONPATH.."equipment/fabrication-tool-3.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-fabrication-tool-3", + icons = {{ + icon = ICONPATH.."equipment/fabrication-tool-3.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-fabrication-tool-3", subgroup = "tool-upgrades", order = "nullius-cd", stack_size = 20 @@ -3602,11 +3873,11 @@ data:extend({ { type = "item", name = "nullius-mining-tool-1", - icons = {{ - icon = ICONPATH.."equipment/mining-tool-1.png", - icon_size = 64 - }}, - placed_as_equipment_result = "nullius-upgrade-mining-tool-1", + icons = {{ + icon = ICONPATH.."equipment/mining-tool-1.png", + icon_size = 64 + }}, + place_as_equipment_result = "nullius-upgrade-mining-tool-1", subgroup = "tool-upgrades", order = "nullius-db", stack_size = 50 @@ -3614,11 +3885,11 @@ data:extend({ { type = "item", name = "nullius-mining-tool-2", - icons = {{ - icon = ICONPATH.."equipment/mining-tool-2.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-mining-tool-2", + icons = {{ + icon = ICONPATH.."equipment/mining-tool-2.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-mining-tool-2", subgroup = "tool-upgrades", order = "nullius-dc", stack_size = 50 @@ -3626,11 +3897,11 @@ data:extend({ { type = "item", name = "nullius-multi-tool-1", - icons = {{ - icon = ICONPATH.."equipment/multi-tool-1.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-multi-tool-1", + icons = {{ + icon = ICONPATH.."equipment/multi-tool-1.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-multi-tool-1", subgroup = "tool-upgrades", order = "nullius-eb", stack_size = 50 @@ -3638,11 +3909,11 @@ data:extend({ { type = "item", name = "nullius-multi-tool-2", - icons = {{ - icon = ICONPATH.."equipment/multi-tool-2.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-multi-tool-2", + icons = {{ + icon = ICONPATH.."equipment/multi-tool-2.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-multi-tool-2", subgroup = "tool-upgrades", order = "nullius-ec", stack_size = 50 @@ -3650,11 +3921,11 @@ data:extend({ { type = "item", name = "nullius-multi-tool-3", - icons = {{ - icon = ICONPATH.."equipment/multi-tool-3.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-multi-tool-3", + icons = {{ + icon = ICONPATH.."equipment/multi-tool-3.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-multi-tool-3", subgroup = "tool-upgrades", order = "nullius-ed", stack_size = 50 @@ -3671,7 +3942,9 @@ data:extend({ {type="item", name="nullius-iron-rod", amount=1}, {type="item", name="nullius-iron-gear", amount=1} }, - result = "nullius-fabrication-tool-1" + results = { + {type = "item", name = "nullius-fabrication-tool-1", amount = 1} + } }, { type = "recipe", @@ -3686,7 +3959,9 @@ data:extend({ {type="item", name="nullius-box-iron-rod", amount=1}, {type="item", name="nullius-box-iron-gear", amount=1} }, - result = "nullius-box-fabrication-tool-1" + results = { + {type = "item", name = "nullius-box-fabrication-tool-1", amount = 1} + } }, { type = "recipe", @@ -3702,7 +3977,9 @@ data:extend({ {type="item", name="nullius-capacitor", amount=1}, {type="item", name="nullius-steel-rod", amount=2} }, - result = "nullius-fabrication-tool-2" + results = { + {type = "item", name = "nullius-fabrication-tool-2", amount = 1} + } }, { type = "recipe", @@ -3719,7 +3996,9 @@ data:extend({ {type="item", name="nullius-box-capacitor", amount=1}, {type="item", name="nullius-box-steel-rod", amount=2} }, - result = "nullius-box-fabrication-tool-2" + results = { + {type = "item", name = "nullius-box-fabrication-tool-2", amount = 1} + } }, { type = "recipe", @@ -3733,7 +4012,9 @@ data:extend({ {type="item", name="nullius-nanofabricator-1", amount=1}, {type="item", name="nullius-battery-1", amount=1} }, - result = "nullius-fabrication-tool-3" + results = { + {type = "item", name = "nullius-fabrication-tool-3", amount = 1} + } }, { type = "recipe", @@ -3748,7 +4029,9 @@ data:extend({ {type="item", name="nullius-iron-plate", amount=2}, {type="item", name="nullius-iron-rod", amount=2} }, - result = "nullius-mining-tool-1" + results = { + {type = "item", name = "nullius-mining-tool-1", amount = 1} + } }, { type = "recipe", @@ -3764,7 +4047,9 @@ data:extend({ {type="item", name="nullius-small-miner-3", amount=1}, {type="item", name="nullius-battery-1", amount=1} }, - result = "nullius-mining-tool-2" + results = { + {type = "item", name = "nullius-mining-tool-2", amount = 1} + } }, { type = "recipe", @@ -3780,7 +4065,9 @@ data:extend({ {type="item", name="nullius-yield-module-1", amount=1}, {type="item", name="nullius-aluminum-rod", amount=2} }, - result = "nullius-multi-tool-1" + results = { + {type = "item", name = "nullius-multi-tool-1", amount = 1} + } }, { type = "recipe", @@ -3796,7 +4083,9 @@ data:extend({ {type="item", name="nullius-productivity-module-2", amount=1}, {type="item", name="nullius-lithium", amount=2} }, - result = "nullius-multi-tool-2" + results = { + {type = "item", name = "nullius-multi-tool-2", amount = 1} + } }, { type = "recipe", @@ -3812,17 +4101,19 @@ data:extend({ {type="item", name="nullius-copper-sheet", amount=2}, {type="item", name="nullius-enriched-uranium", amount=1} }, - result = "nullius-multi-tool-3" + results = { + {type = "item", name = "nullius-multi-tool-3", amount = 1} + } }, { type = "item", name = "nullius-telekinesis-field-1", - icons = {{ - icon = ICONPATH.."equipment/telekinesis-1.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-telekinesis-field-1", + icons = {{ + icon = ICONPATH.."equipment/telekinesis-1.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-telekinesis-field-1", subgroup = "equipment", order = "nullius-gb", stack_size = 20 @@ -3830,11 +4121,11 @@ data:extend({ { type = "item", name = "nullius-telekinesis-field-2", - icons = {{ - icon = ICONPATH.."equipment/telekinesis-2.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-telekinesis-field-2", + icons = {{ + icon = ICONPATH.."equipment/telekinesis-2.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-telekinesis-field-2", subgroup = "equipment", order = "nullius-gc", stack_size = 20 @@ -3842,11 +4133,11 @@ data:extend({ { type = "item", name = "nullius-telekinesis-field-3", - icons = {{ - icon = ICONPATH.."equipment/telekinesis-3.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-telekinesis-field-3", + icons = {{ + icon = ICONPATH.."equipment/telekinesis-3.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-telekinesis-field-3", subgroup = "equipment", order = "nullius-gd", stack_size = 20 @@ -3863,7 +4154,9 @@ data:extend({ {type="item", name="nullius-levitation-field-1", amount=2}, {type="item", name="nullius-speed-module-1", amount=1} }, - result = "nullius-telekinesis-field-1" + results = { + {type = "item", name = "nullius-telekinesis-field-1", amount = 1} + } }, { type = "recipe", @@ -3878,7 +4171,9 @@ data:extend({ {type="item", name="nullius-multi-tool-1", amount=1}, {type="item", name="nullius-battery-2", amount=1} }, - result = "nullius-telekinesis-field-2" + results = { + {type = "item", name = "nullius-telekinesis-field-2", amount = 1} + } }, { type = "recipe", @@ -3893,29 +4188,31 @@ data:extend({ {type="item", name="nullius-multi-tool-2", amount=1}, {type="item", name="nullius-copper-wire", amount=8} }, - result = "nullius-telekinesis-field-3" + results = { + {type = "item", name = "nullius-telekinesis-field-3", amount = 1} + } }, { type = "item", name = "nullius-stabilizer-1", - icons = {{ - icon = ICONPATH.."equipment/stabilizer-1.png", - icon_size = 64 - }}, - placed_as_equipment_result = "nullius-upgrade-stabilizer-1", - subgroup = "cargo-pod", + icons = {{ + icon = ICONPATH.."equipment/stabilizer-1.png", + icon_size = 64 + }}, + place_as_equipment_result = "nullius-upgrade-stabilizer-1", + subgroup = "cargo-pod", order = "nullius-eb", stack_size = 50 }, { type = "item", name = "nullius-stabilizer-2", - icons = {{ - icon = ICONPATH.."equipment/stabilizer-2.png", - icon_size = 64 - }}, - placed_as_equipment_result = "nullius-upgrade-stabilizer-2", + icons = {{ + icon = ICONPATH.."equipment/stabilizer-2.png", + icon_size = 64 + }}, + place_as_equipment_result = "nullius-upgrade-stabilizer-2", subgroup = "cargo-pod", order = "nullius-ec", stack_size = 50 @@ -3934,7 +4231,9 @@ data:extend({ {type="item", name="nullius-steel-plate", amount=3}, {type="item", name="nullius-steel-gear", amount=3} }, - result = "nullius-stabilizer-1" + results = { + {type = "item", name = "nullius-stabilizer-1", amount = 1} + } }, { type = "recipe", @@ -3949,18 +4248,20 @@ data:extend({ {type="item", name="nullius-uranium", amount=3}, {type="item", name="nullius-battery-3", amount=1} }, - result = "nullius-stabilizer-2" + results = { + {type = "item", name = "nullius-stabilizer-2", amount = 1} + } }, { type = "item", name = "nullius-shackle", - icons = {{ - icon = EQUIPPATH.."shackle.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-upgrade-shackle", - subgroup = "leg-augmentation", + icons = {{ + icon = EQUIPPATH.."shackle.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-upgrade-shackle", + subgroup = "leg-augmentation", order = "nullius-f", stack_size = 20 }, @@ -3976,18 +4277,20 @@ data:extend({ {type="item", name="nullius-steel-rod", amount=3}, {type="item", name="nullius-steel-plate", amount=1} }, - result = "nullius-shackle" + results = { + {type = "item", name = "nullius-shackle", amount = 1} + } }, { type = "item", name = "nullius-refueler", localised_description = {"equipment-description.nullius-refueler"}, - icons = {{ - icon = EQUIPPATH .. "refueler.png", - icon_size = 128 - }}, - placed_as_equipment_result = "nullius-refueler", + icons = {{ + icon = EQUIPPATH .. "refueler.png", + icon_size = 128 + }}, + place_as_equipment_result = "nullius-refueler", subgroup = "solar", order = "nullius-e", stack_size = 20 @@ -4000,23 +4303,25 @@ data:extend({ category = "medium-crafting", energy_required = 8, ingredients = { - {type="item", name="turbo-filter-inserter", amount=1}, - {type="item", name="nullius-pump-2", amount=1}, - {type="item", name="nullius-rubber", amount=3} + {type="item", name="bob-turbo-inserter", amount=1}, + {type="item", name="nullius-pump-2", amount=1}, + {type="item", name="nullius-rubber", amount=3} }, - result = "nullius-refueler" + results = { + {type = "item", name = "nullius-refueler", amount = 1} + } }, { type = "item", name = "nullius-portable-generator-1", - localised_name = {"", {"equipment-name.nullius-portable-generator"}, " ", 1}, + localised_name = {"", {"equipment-name.nullius-portable-generator"}, " ", tostring(1)}, localised_description = {"equipment-description.nullius-portable-generator"}, icons = {{ icon = ICONPATH.."equipment/generator-1.png", icon_size = 64 }}, - placed_as_equipment_result = "nullius-portable-generator-1", + place_as_equipment_result = "nullius-portable-generator-1", subgroup = "solar", order = "nullius-dbb", stack_size = 20 @@ -4024,13 +4329,13 @@ data:extend({ { type = "item", name = "nullius-portable-generator-2", - localised_name = {"", {"equipment-name.nullius-portable-generator"}, " ", 2}, + localised_name = {"", {"equipment-name.nullius-portable-generator"}, " ", tostring(2)}, localised_description = {"equipment-description.nullius-portable-generator"}, icons = {{ icon = ICONPATH.."equipment/generator-2.png", icon_size = 64 }}, - placed_as_equipment_result = "nullius-portable-generator-2", + place_as_equipment_result = "nullius-portable-generator-2", subgroup = "solar", order = "nullius-dbc", stack_size = 20 @@ -4043,7 +4348,7 @@ data:extend({ icon = ICONPATH.."equipment/generator-backup.png", icon_size = 64 }}, - placed_as_equipment_result = "nullius-portable-generator-backup", + place_as_equipment_result = "nullius-portable-generator-backup", subgroup = "solar", order = "nullius-dbd", stack_size = 20 @@ -4051,12 +4356,12 @@ data:extend({ { type = "item", name = "nullius-portable-reactor", - localised_description = {"equipment-description.nullius-portable-reactor"}, - icons = {{ - icon = ICONPATH.."equipment/reactor.png", - icon_size = 64 - }}, - placed_as_equipment_result = "nullius-portable-reactor", + localised_description = {"equipment-description.nullius-portable-reactor"}, + icons = {{ + icon = ICONPATH.."equipment/reactor.png", + icon_size = 64 + }}, + place_as_equipment_result = "nullius-portable-reactor", subgroup = "solar", order = "nullius-dc", stack_size = 20 @@ -4077,7 +4382,9 @@ data:extend({ {type="item", name="nullius-small-cargo-pod-1", amount=1}, {type="item", name="copper-cable", amount=4} }, - result = "nullius-portable-generator-1" + results = { + {type = "item", name = "nullius-portable-generator-1", amount = 1} + } }, { type = "recipe", @@ -4092,7 +4399,9 @@ data:extend({ {type="item", name="nullius-large-cargo-pod-1", amount=1}, {type="item", name="nullius-portable-generator-1", amount=1} }, - result = "nullius-portable-generator-2" + results = { + {type = "item", name = "nullius-portable-generator-2", amount = 1} + } }, { type = "recipe", @@ -4106,7 +4415,9 @@ data:extend({ {type="item", name="nullius-portable-generator-2", amount=1}, {type="item", name="power-switch", amount=1} }, - result = "nullius-portable-generator-backup" + results = { + {type = "item", name = "nullius-portable-generator-backup", amount = 1} + } }, { type = "recipe", @@ -4134,10 +4445,12 @@ data:extend({ order = "nullius-dbdc", energy_required = 1, ingredients = { - {"nullius-portable-generator-backup", 1}, - {"copper-cable", 1} + {type = "item", name = "nullius-portable-generator-backup", amount = 1}, + {type = "item", name = "copper-cable", amount = 1} }, - result = "nullius-portable-generator-2" + results = { + {type = "item", name = "nullius-portable-generator-2", amount = 1} + } }, { type = "recipe", @@ -4153,8 +4466,9 @@ data:extend({ {type="item", name="nullius-reactor", amount=1}, {type="item", name="nullius-stirling-engine-3", amount=2} }, - result = "nullius-portable-reactor", - result_count = 6 + results = { + {type = "item", name = "nullius-portable-reactor", amount = 6} + } } }) @@ -4163,16 +4477,16 @@ if mods["reskins-bobs"] then data.raw.item["nullius-solar-panel-1"].icons = { { icon = "__reskins-bobs__/graphics/icons/power/solar-panel/solar-panel-icon-base.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }, { icon = "__reskins-bobs__/graphics/icons/power/solar-panel/solar-panel-icon-mask.png", - icon_size = 64, icon_mipmaps = 4, + icon_size = 64, tint = tiercolor("yellow") }, { icon = "__reskins-bobs__/graphics/icons/power/solar-panel/solar-panel-icon-highlights.png", - icon_size = 64, icon_mipmaps = 4, tint = {1, 1, 1, 0} + icon_size = 64, tint = {1, 1, 1, 0} } } data.raw.item["nullius-solar-panel-2"].icons = diff --git a/nullius/prototypes/item/fluid.lua b/nullius/prototypes/item/fluid.lua index 3f97ddf..b614d83 100644 --- a/nullius/prototypes/item/fluid.lua +++ b/nullius/prototypes/item/fluid.lua @@ -39,22 +39,22 @@ data:extend({ order = "nullius-b", base_color = {r=18, g=193, b=200}, flow_color = {r=18, g=193, b=200}, - heat_capacity = "0.075KJ", + heat_capacity = "0.075kJ", default_temperature = 15, max_temperature = 100 }, { type = "fluid", name = "nullius-steam", - fuel_value = "6KJ", + fuel_value = "6kJ", icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "nullius-water-treatment", order = "nullius-cb", base_color = {r=0.5, g=0.5, b=0.5}, flow_color = {r=0.6, g=0.6, b=0.6}, - heat_capacity = "0.05KJ", + heat_capacity = "0.05kJ", default_temperature = 165, max_temperature = 200, gas_temperature = 100 @@ -62,14 +62,14 @@ data:extend({ { type = "fluid", name = "nullius-pressure-steam", - fuel_value = "20KJ", + fuel_value = "20kJ", icon = FLUIDPATH .. "steam2.png", icon_size = 64, subgroup = "nullius-water-treatment", order = "nullius-cc", base_color = {r=0.7, g=0.7, b=0.7}, flow_color = {r=0.8, g=0.8, b=0.8}, - heat_capacity = "0.1KJ", + heat_capacity = "0.1kJ", default_temperature = 500, max_temperature = 600, gas_temperature = 100 @@ -83,7 +83,7 @@ data:extend({ order = "nullius-d", base_color = {r=72, g=144, b=140}, flow_color = {r=72, g=144, b=140}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 15, max_temperature = 100 }, @@ -96,7 +96,7 @@ data:extend({ order = "nullius-e", base_color = {r=76, g=160, b=148}, flow_color = {r=76, g=160, b=148}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 15, max_temperature = 100 }, @@ -105,12 +105,12 @@ data:extend({ name = "nullius-saline", icon = "__base__/graphics/icons/fluid/water.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "nullius-water-treatment", order = "nullius-f", base_color = {r=34, g=169, b=187}, flow_color = {r=34, g=169, b=187}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 15, max_temperature = 100 }, @@ -123,22 +123,22 @@ data:extend({ order = "nullius-g", base_color = {r=36, g=94, b=142}, flow_color = {r=36, g=94, b=142}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 20, max_temperature = 100 }, { type = "fluid", name = "nullius-heavy-water", - icons = angelsmods.functions.create_liquid_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/semiheavy-water.png", 72 }, + icons = angelsLegacy.functions.create_liquid_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/semiheavy-water.png", 72 }, {element_tint["heavy"], element_tint["oxygen"], element_tint["hydrogen"]} ), subgroup = "nullius-water-treatment", order = "nullius-h", base_color = {r=18, g=180, b=180}, flow_color = {r=18, g=180, b=180}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 20, max_temperature = 100 }, @@ -151,7 +151,7 @@ data:extend({ order = "nullius-i", base_color = {r=97, g=127, b=104}, flow_color = {r=97, g=127, b=104}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 20, max_temperature = 100 }, @@ -164,7 +164,7 @@ data:extend({ order = "nullius-j", base_color = {r=115, g=94, b=57}, flow_color = {r=115, g=94, b=57}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, @@ -172,14 +172,14 @@ data:extend({ { type = "fluid", name = "nullius-air", - icons = angelsmods.functions.create_gas_fluid_icon(nil, + icons = angelsLegacy.functions.create_gas_fluid_icon(nil, {element_tint["air"], element_tint["residual"], element_tint["air"]} ), subgroup = "air-filtration", order = "nullius-b", base_color = {r = 32, g = 144, b = 255}, flow_color = {r = 32, g = 144, b = 255}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -187,14 +187,14 @@ data:extend({ { type = "fluid", name = "nullius-residual-gas", - icons = angelsmods.functions.create_gas_fluid_icon(nil, + icons = angelsLegacy.functions.create_gas_fluid_icon(nil, {element_tint["residual"], element_tint["trace"], element_tint["residual"]} ), subgroup = "air-filtration", order = "nullius-c", base_color = {r = 122, g = 175, b = 232}, flow_color = {r = 122, g = 175, b = 232}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -202,14 +202,14 @@ data:extend({ { type = "fluid", name = "nullius-trace-gas", - icons = angelsmods.functions.create_gas_fluid_icon(nil, + icons = angelsLegacy.functions.create_gas_fluid_icon(nil, {element_tint["trace"], element_tint["volcanic"], element_tint["trace"]} ), subgroup = "air-filtration", order = "nullius-d", base_color = {r = 152, g = 176, b = 204}, flow_color = {r = 152, g = 176, b = 204}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -217,16 +217,16 @@ data:extend({ { type = "fluid", name = "nullius-volcanic-gas", - icons = angelsmods.functions.create_gas_fluid_icon(nil, + icons = angelsLegacy.functions.create_gas_fluid_icon(nil, {element_tint["volcanic"], element_tint["air"], element_tint["volcanic"]} ), - localised_description = {"fluid-description.nullius-oxygen-reduction", 20, + localised_description = {"fluid-description.nullius-oxygen-reduction", tostring(20), {"fluid-description.nullius-volcanic-gas"}}, subgroup = "air-filtration", order = "nullius-e", base_color = {r = 224, g = 128, b = 0}, flow_color = {r = 224, g = 128, b = 0}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 200, max_temperature = 500, gas_temperature = 0 @@ -234,14 +234,14 @@ data:extend({ { type = "fluid", name = "nullius-nitrogen", - icons = angelsmods.functions.create_gas_fluid_icon(nil, + icons = angelsLegacy.functions.create_gas_fluid_icon(nil, {element_tint["nitrogen"], element_tint["nitrogen"], element_tint["nitrogen"]} ), subgroup = "air-filtration", order = "nullius-f", base_color = { r = 40, g = 80, b = 192 }, flow_color = { r = 40, g = 80, b = 192 }, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -249,14 +249,14 @@ data:extend({ { type = "fluid", name = "nullius-argon", - icons = angelsmods.functions.create_gas_fluid_icon(nil, + icons = angelsLegacy.functions.create_gas_fluid_icon(nil, {element_tint["argon"], element_tint["argon"], element_tint["argon"]} ), subgroup = "air-filtration", order = "nullius-g", base_color = { r = 164, g = 140, b = 204 }, flow_color = { r = 164, g = 140, b = 204 }, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -264,14 +264,14 @@ data:extend({ { type = "fluid", name = "nullius-helium", - icons = angelsmods.functions.create_gas_fluid_icon(nil, + icons = angelsLegacy.functions.create_gas_fluid_icon(nil, {element_tint["helium"], element_tint["helium"], element_tint["helium"]} ), subgroup = "air-filtration", order = "nullius-h", base_color = { r = 224, g = 200, b = 255 }, flow_color = { r = 224, g = 200, b = 255 }, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -280,15 +280,15 @@ data:extend({ { type = "fluid", name = "nullius-carbon-dioxide", - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", 72 }, {element_tint["carbon"], element_tint["oxygen"], element_tint["oxygen"]} ), subgroup = "carbon", order = "nullius-b", base_color = {r = 1, g = 0.4, b = 0.4}, flow_color = {r = 1, g = 0.4, b = 0.4}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -296,17 +296,17 @@ data:extend({ { type = "fluid", name = "nullius-carbon-monoxide", - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", 72 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", 72 }, {element_tint["carbon"], element_tint["carbon"], element_tint["oxygen"]} ), - localised_description = {"fluid-description.nullius-oxygen-reduction", 50, + localised_description = {"fluid-description.nullius-oxygen-reduction", tostring(50), {"fluid-description.nullius-carbon-monoxide"}}, subgroup = "carbon", order = "nullius-c", base_color = {r = 0.5, g = 0.2, b = 0.2}, flow_color = {r = 0.5, g = 0.2, b = 0.2}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -314,17 +314,17 @@ data:extend({ { type = "fluid", name = "nullius-methane", - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/methane.png", 72 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", 72 }, {element_tint["carbon"], element_tint["hydrogen"], element_tint["hydrogen"]} ), - localised_description = {"fluid-description.nullius-oxygen-reduction", 200, + localised_description = {"fluid-description.nullius-oxygen-reduction", tostring(200), {"fluid-description.nullius-methane"}}, subgroup = "carbon", order = "nullius-d", base_color = {r = 0.68, g = 0.68, b = 0.68}, flow_color = {r = 0.68, g = 0.68, b = 0.68}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -332,15 +332,15 @@ data:extend({ { type = "fluid", name = "nullius-ethylene", - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/ethylene.png", 72 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/ethylene.png", 72 }, {element_tint["carbon"], element_tint["carbon"], element_tint["hydrogen"]} ), subgroup = "carbon", order = "nullius-f", base_color = {r = 0.45, g = 0.45, b = 0.45}, flow_color = {r = 0.45, g = 0.45, b = 0.45}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -348,15 +348,15 @@ data:extend({ { type = "fluid", name = "nullius-propene", - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/propene.png", 72 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/propene.png", 72 }, {element_tint["carbon"], element_tint["hydrogen"], element_tint["carbon"]} ), subgroup = "carbon", order = "nullius-g", base_color = {r = 0.3, g = 0.3, b = 0.3}, flow_color = {r = 0.3, g = 0.3, b = 0.3}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -364,29 +364,29 @@ data:extend({ { type = "fluid", name = "nullius-benzene", - icons = angelsmods.functions.create_liquid_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/benzene.png", 72 }, + icons = angelsLegacy.functions.create_liquid_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/benzene.png", 72 }, {element_tint["carbon"], element_tint["hydrogen"], element_tint["hydrogen"]} ), subgroup = "carbon", order = "nullius-h", base_color = {r = 0.15, g = 0.15, b = 0.15}, flow_color = {r = 0.15, g = 0.15, b = 0.15}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, { type = "fluid", name = "nullius-petroleum", - icon = "__base__/graphics/icons/fluid/crude-oil.png", + icon = "__base__/graphics/icons/fluid/crude-oil.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "carbon", order = "nullius-k", base_color = {r = 0, g = 0, b = 0}, flow_color = {r = 0, g = 0, b = 0}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, @@ -394,30 +394,30 @@ data:extend({ { type = "fluid", name = "nullius-methanol", - icons = angelsmods.functions.create_liquid_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/methanol.png", 72 }, + icons = angelsLegacy.functions.create_liquid_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/methanol.png", 72 }, {element_tint["carbon"], element_tint["oxygen"], element_tint["hydrogen"]} ), subgroup = "organic-chemistry", order = "nullius-b", base_color = {r = 0.7, g = 0.575, b = 0.575}, flow_color = {r = 0.7, g = 0.575, b = 0.575}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, { type = "fluid", name = "nullius-butadiene", - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/butadiene.png", 75 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/butadiene.png", 75 }, {element_tint["hydrogen"], element_tint["carbon"], element_tint["carbon"]} ), subgroup = "organic-chemistry", order = "nullius-c", base_color = {r = 0.8, g = 0.8, b = 0.8}, flow_color = {r = 0.8, g = 0.8, b = 0.8}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -425,60 +425,60 @@ data:extend({ { type = "fluid", name = "nullius-styrene", - icons = angelsmods.functions.create_liquid_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/styrene.png", 72 }, + icons = angelsLegacy.functions.create_liquid_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/styrene.png", 72 }, {element_tint["carbon"], element_tint["hydrogen"], element_tint["carbon"]} ), subgroup = "organic-chemistry", order = "nullius-d", base_color = {r = 0, g = 0, b = 0}, flow_color = {r = 0, g = 0, b = 0}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, { type = "fluid", name = "nullius-acrylonitrile", - icons = angelsmods.functions.create_liquid_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/methylamine.png", 72 }, + icons = angelsLegacy.functions.create_liquid_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/methylamine.png", 72 }, {element_tint["carbon"], element_tint["hydrogen"], element_tint["nitrogen"]} ), subgroup = "organic-chemistry", order = "nullius-e", base_color = {r = 0.2, g = 0.2, b = 0.4}, flow_color = {r = 0.2, g = 0.2, b = 0.4}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, { type = "fluid", name = "nullius-ech", - icons = angelsmods.functions.create_liquid_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/epichlorohydrin.png", 72 }, + icons = angelsLegacy.functions.create_liquid_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/epichlorohydrin.png", 72 }, {element_tint["carbon"], element_tint["chlorine"], element_tint["oxygen"]} ), subgroup = "organic-chemistry", order = "nullius-f", base_color = {r = 224, g = 212, b = 168}, flow_color = {r = 224, g = 212, b = 168}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, { type = "fluid", name = "nullius-glycerol", - icons = angelsmods.functions.create_liquid_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/glycerol.png", 72 }, + icons = angelsLegacy.functions.create_liquid_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/glycerol.png", 72 }, {element_tint["carbon"], element_tint["hydrogen"], element_tint["oxygen"]} ), subgroup = "organic-chemistry", order = "nullius-g", base_color = {r = 224, g = 192, b = 128}, flow_color = {r = 224, g = 192, b = 128}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, @@ -487,12 +487,12 @@ data:extend({ name = "nullius-lubricant", icon = "__base__/graphics/icons/fluid/lubricant.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "organic-chemistry", order = "nullius-h", base_color = {r = 0.43, g = 0.65, b = 0.31}, flow_color = {r = 0.43, g = 0.65, b = 0.31}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, @@ -505,7 +505,7 @@ data:extend({ order = "nullius-i", base_color = {r = 232, g = 228, b = 200}, flow_color = {r = 232, g = 228, b = 200}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, @@ -518,7 +518,7 @@ data:extend({ order = "nullius-j", base_color = {r = 192, g = 184, b = 136}, flow_color = {r = 192, g = 184, b = 136}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, @@ -526,42 +526,42 @@ data:extend({ { type = "fluid", name = "nullius-amino-acids", - icons = angelsmods.functions.create_liquid_fluid_icon(nil, + icons = angelsLegacy.functions.create_liquid_fluid_icon(nil, {element_tint["nitrogen"], element_tint["carbon"], element_tint["hydrogen"]} ), subgroup = "biochemistry", order = "nullius-c", base_color = {r = 0.5, g = 0.4, b = 0.2}, flow_color = {r = 0.5, g = 0.4, b = 0.2}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, { type = "fluid", name = "nullius-nucleotides", - icons = angelsmods.functions.create_liquid_fluid_icon(nil, + icons = angelsLegacy.functions.create_liquid_fluid_icon(nil, {element_tint["carbon"], element_tint["oxygen"], element_tint["nitrogen"]} ), subgroup = "biochemistry", order = "nullius-d", base_color = {r = 0.7, g = 0.9, b = 0.5}, flow_color = {r = 0.7, g = 0.9, b = 0.5}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, { type = "fluid", name = "nullius-fatty-acids", - icons = angelsmods.functions.create_liquid_fluid_icon(nil, + icons = angelsLegacy.functions.create_liquid_fluid_icon(nil, {element_tint["carbon"], element_tint["carbon"], element_tint["hydrogen"]} ), subgroup = "biochemistry", order = "nullius-e", base_color = {r = 0.8, g = 0.8, b = 0.4}, flow_color = {r = 0.8, g = 0.8, b = 0.4}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, @@ -571,13 +571,13 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/fluid/light-oil.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "biochemistry", order = "nullius-f", base_color = {r=0.57, g=0.33, b=0}, flow_color = {r=1, g=0.73, b=0.07}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, @@ -587,13 +587,13 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/fluid/heavy-oil.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "biochemistry", order = "nullius-g", base_color = {r=0.5, g=0.04, b=0}, flow_color = {r=0.85, g=0.6, b=0.3}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, @@ -608,7 +608,7 @@ data:extend({ order = "nullius-h", base_color = {r = 0.9, g = 0.7, b = 0.5}, flow_color = {r = 0.9, g = 0.7, b = 0.5}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, @@ -623,7 +623,7 @@ data:extend({ order = "nullius-i", base_color = {r = 0.8, g = 0.5, b = 0.3}, flow_color = {r = 0.8, g = 0.5, b = 0.3}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, @@ -631,16 +631,16 @@ data:extend({ { type = "fluid", name = "nullius-hydrogen", - icons = angelsmods.functions.create_gas_fluid_icon(nil, + icons = angelsLegacy.functions.create_gas_fluid_icon(nil, {element_tint["hydrogen"], element_tint["hydrogen"], element_tint["hydrogen"]} ), - localised_description = {"fluid-description.nullius-oxygen-reduction", 50, + localised_description = {"fluid-description.nullius-oxygen-reduction", tostring(50), {"fluid-description.nullius-hydrogen"}}, subgroup = "inorganic-chemistry", order = "nullius-bb", base_color = {r = 1, g = 1, b = 1}, flow_color = {r = 1, g = 1, b = 1}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -648,16 +648,16 @@ data:extend({ { type = "fluid", name = "nullius-deuterium", - icons = angelsmods.functions.create_gas_fluid_icon(nil, + icons = angelsLegacy.functions.create_gas_fluid_icon(nil, {element_tint["hydrogen"], element_tint["heavy"], element_tint["heavy"]} ), - localised_description = {"fluid-description.nullius-oxygen-reduction", 50, + localised_description = {"fluid-description.nullius-oxygen-reduction", tostring(50), {"fluid-description.nullius-deuterium"}}, subgroup = "inorganic-chemistry", order = "nullius-bc", base_color = {r = 1, g = 0.95, b = 0.85}, flow_color = {r = 1, g = 0.95, b = 0.85}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -665,14 +665,14 @@ data:extend({ { type = "fluid", name = "nullius-tritium", - icons = angelsmods.functions.create_gas_fluid_icon(nil, + icons = angelsLegacy.functions.create_gas_fluid_icon(nil, {element_tint["heavy"], element_tint["heavy"], element_tint["heavy"]} ), subgroup = "inorganic-chemistry", order = "nullius-bd", base_color = {r = 1, g = 0.9, b = 0.7}, flow_color = {r = 1, g = 0.9, b = 0.7}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -680,16 +680,16 @@ data:extend({ { type = "fluid", name = "nullius-oxygen", - icons = angelsmods.functions.create_gas_fluid_icon(nil, + icons = angelsLegacy.functions.create_gas_fluid_icon(nil, {element_tint["oxygen"], element_tint["oxygen"], element_tint["oxygen"]} ), - localised_description = {"fluid-description.nullius-oxygenation", 100, + localised_description = {"fluid-description.nullius-oxygenation", tostring(100), {"fluid-description.nullius-oxygen"}}, subgroup = "inorganic-chemistry", order = "nullius-c", base_color = {r = 1, g = 0, b = 0}, flow_color = {r = 1, g = 0, b = 0}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -697,14 +697,14 @@ data:extend({ { type = "fluid", name = "nullius-chlorine", - icons = angelsmods.functions.create_gas_fluid_icon(nil, + icons = angelsLegacy.functions.create_gas_fluid_icon(nil, {element_tint["chlorine"], element_tint["chlorine"], element_tint["chlorine"]} ), subgroup = "inorganic-chemistry", order = "nullius-d", base_color = {r = 0, g = 1, b = 0}, flow_color = {r = 0, g = 1, b = 0}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -712,7 +712,7 @@ data:extend({ { type = "fluid", name = "nullius-caustic-solution", - icons = angelsmods.functions.create_liquid_fluid_icon( + icons = angelsLegacy.functions.create_liquid_fluid_icon( {FLUIDPATH .. "sodium-hydroxide.png", 64, nil, 0.18}, {element_tint["sodium"], element_tint["oxygen"], element_tint["hydrogen"]} @@ -721,14 +721,14 @@ data:extend({ order = "nullius-g", base_color = { r = 150, g = 40, b = 180 }, flow_color = { r = 150, g = 40, b = 180 }, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, { type = "fluid", name = "nullius-calcium-chloride-solution", - icons = angelsmods.functions.create_liquid_fluid_icon( + icons = angelsLegacy.functions.create_liquid_fluid_icon( {FLUIDPATH .. "calcium-chloride.png", 64, nil, 0.18 }, {element_tint["calcium"], element_tint["chlorine"], element_tint["chlorine"]} @@ -737,35 +737,35 @@ data:extend({ order = "nullius-i", base_color = {r = 0.9, g = 1, b = 0.7}, flow_color = {r = 0.9, g = 1, b = 0.7}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100 }, { type = "fluid", name = "nullius-titanium-tetrachloride", - icons = angelsmods.functions.create_liquid_fluid_icon(nil, + icons = angelsLegacy.functions.create_liquid_fluid_icon(nil, {element_tint["titanium"], element_tint["titanium"], element_tint["chlorine"]} ), subgroup = "inorganic-chemistry", order = "nullius-l", base_color = {r = 120, g = 60, b = 90}, flow_color = {r = 120, g = 60, b = 90}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, { type = "fluid", name = "nullius-copper-solution", - icons = angelsmods.functions.create_liquid_fluid_icon(nil, + icons = angelsLegacy.functions.create_liquid_fluid_icon(nil, {element_tint["copper"], element_tint["copper"], element_tint["copper"]} ), subgroup = "inorganic-chemistry", order = "nullius-m", base_color = {r=0.803, g=0.388, b=0.215}, flow_color = {r=0.803, g=0.388, b=0.215}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, @@ -773,8 +773,8 @@ data:extend({ { type = "fluid", name = "nullius-hydrogen-chloride", - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/hydrogen-chloride.png", + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen-chloride.png", 72, nil, 0.15}, {element_tint["chlorine"], element_tint["chlorine"], element_tint["hydrogen"]} ), @@ -782,7 +782,7 @@ data:extend({ order = "nullius-e", base_color = {r = 0.7, g = 1, b = 0.7}, flow_color = {r = 0.7, g = 1, b = 0.7}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -790,8 +790,8 @@ data:extend({ { type = "fluid", name = "nullius-acid-hydrochloric", - icons = angelsmods.functions.create_liquid_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/hydrogen-chloride.png", + icons = angelsLegacy.functions.create_liquid_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen-chloride.png", 72, nil, 0.15 }, {element_tint["chlorine"], element_tint["chlorine"], element_tint["hydrogen"]} ), @@ -799,15 +799,15 @@ data:extend({ order = "nullius-f", base_color = {r = 0.4, g = 1, b = 0.4}, flow_color = {r = 0.4, g = 1, b = 0.4}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100 }, { type = "fluid", name = "nullius-sulfur-dioxide", - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/sulfur-dioxide.png", + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/sulfur-dioxide.png", 72, nil, 0.17}, {element_tint["sulfur"], element_tint["oxygen"], element_tint["oxygen"]} ), @@ -815,7 +815,7 @@ data:extend({ order = "nullius-h", base_color = {r = 0.9, g = 0.9, b = 0.2}, flow_color = {r = 0.9, g = 0.9, b = 0.2}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -823,8 +823,8 @@ data:extend({ { type = "fluid", name = "nullius-acid-sulfuric", - icons = angelsmods.functions.create_liquid_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/sulfuric-acid.png", + icons = angelsLegacy.functions.create_liquid_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/sulfuric-acid.png", 72, nil, 0.18}, {element_tint["sulfur"], element_tint["oxygen"], element_tint["hydrogen"]} ), @@ -832,24 +832,24 @@ data:extend({ order = "nullius-i", base_color = {r = 0.75, g = 0.65, b = 0.1}, flow_color = {r = 0.75, g = 0.65, b = 0.1}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, { type = "fluid", name = "nullius-ammonia", - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/ammonia.png", 72 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/ammonia.png", 72 }, {element_tint["nitrogen"], element_tint["hydrogen"], element_tint["hydrogen"]} ), - localised_description = {"fluid-description.nullius-oxygen-reduction", 100, + localised_description = {"fluid-description.nullius-oxygen-reduction", tostring(100), {"fluid-description.nullius-ammonia"}}, subgroup = "acid-chemistry", order = "nullius-j", base_color = {r = 0.4, g = 0.4, b = 0.7}, flow_color = {r = 0.4, g = 0.4, b = 0.7}, - heat_capacity = "0.04KJ", + heat_capacity = "0.04kJ", default_temperature = 25, max_temperature = 100, gas_temperature = 0 @@ -857,8 +857,8 @@ data:extend({ { type = "fluid", name = "nullius-acid-nitric", - icons = angelsmods.functions.create_liquid_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/nitric-acid.png", + icons = angelsLegacy.functions.create_liquid_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/nitric-acid.png", 72, nil, 0.18}, {element_tint["nitrogen"], element_tint["oxygen"], element_tint["hydrogen"]} ), @@ -866,7 +866,7 @@ data:extend({ order = "nullius-k", base_color = {r = 148, g = 112, b = 224}, flow_color = {r = 148, g = 112, b = 224}, - heat_capacity = "0.08KJ", + heat_capacity = "0.08kJ", default_temperature = 25, max_temperature = 100 }, @@ -874,211 +874,211 @@ data:extend({ { type = "fluid", name = "nullius-compressed-air", - icons = angelsmods.functions.create_liquid_fluid_icon(nil, + icons = angelsLegacy.functions.create_liquid_fluid_icon(nil, {element_tint["air"], element_tint["residual"], element_tint["air"]} ), - localised_description = {"fluid-description.nullius-recapture", 85, + localised_description = {"fluid-description.nullius-recapture", tostring(85), {"fluid-description.nullius-compressed-air"}}, subgroup = "compressed-air", order = "nullius-b", base_color = {r = 32, g = 144, b = 255}, flow_color = {r = 32, g = 144, b = 255}, - heat_capacity = "0.08KJ", - fuel_value = "14KJ", + heat_capacity = "0.08kJ", + fuel_value = "14kJ", default_temperature = 50, max_temperature = 100 }, { type = "fluid", name = "nullius-compressed-residual-gas", - icons = angelsmods.functions.create_liquid_fluid_icon(nil, + icons = angelsLegacy.functions.create_liquid_fluid_icon(nil, {element_tint["residual"], element_tint["trace"], element_tint["residual"]} ), - localised_description = {"fluid-description.nullius-recapture", 90, + localised_description = {"fluid-description.nullius-recapture", tostring(90), {"fluid-description.nullius-compressed-residual-gas"}}, subgroup = "compressed-air", order = "nullius-cc", base_color = {r = 122, g = 175, b = 232}, flow_color = {r = 122, g = 175, b = 232}, - heat_capacity = "0.08KJ", - fuel_value = "15KJ", + heat_capacity = "0.08kJ", + fuel_value = "15kJ", default_temperature = 50, max_temperature = 100 }, { type = "fluid", name = "nullius-compressed-trace-gas", - icons = angelsmods.functions.create_liquid_fluid_icon(nil, + icons = angelsLegacy.functions.create_liquid_fluid_icon(nil, {element_tint["trace"], element_tint["volcanic"], element_tint["trace"]} ), - localised_description = {"fluid-description.nullius-recapture", 90, + localised_description = {"fluid-description.nullius-recapture", tostring(90), {"fluid-description.nullius-compressed-trace-gas"}}, subgroup = "compressed-air", order = "nullius-dc", base_color = {r = 152, g = 176, b = 204}, flow_color = {r = 152, g = 176, b = 204}, - heat_capacity = "0.08KJ", - fuel_value = "15KJ", + heat_capacity = "0.08kJ", + fuel_value = "15kJ", default_temperature = 50, max_temperature = 100 }, { type = "fluid", name = "nullius-compressed-nitrogen", - icons = angelsmods.functions.create_liquid_fluid_icon(nil, + icons = angelsLegacy.functions.create_liquid_fluid_icon(nil, {element_tint["nitrogen"], element_tint["nitrogen"], element_tint["nitrogen"]} ), - localised_description = {"fluid-description.nullius-recapture", 90, + localised_description = {"fluid-description.nullius-recapture", tostring(90), {"fluid-description.nullius-compressed-nitrogen"}}, subgroup = "compressed-air", order = "nullius-e", base_color = { r = 40, g = 80, b = 192}, flow_color = { r = 40, g = 80, b = 192}, - heat_capacity = "0.08KJ", - fuel_value = "18KJ", + heat_capacity = "0.08kJ", + fuel_value = "18kJ", default_temperature = 50, max_temperature = 100 }, { type = "fluid", name = "nullius-compressed-argon", - icons = angelsmods.functions.create_liquid_fluid_icon(nil, + icons = angelsLegacy.functions.create_liquid_fluid_icon(nil, {element_tint["argon"], element_tint["argon"], element_tint["argon"]} ), - localised_description = {"fluid-description.nullius-recapture", 96, + localised_description = {"fluid-description.nullius-recapture", tostring(96), {"fluid-description.nullius-compressed-argon"}}, subgroup = "compressed-air", order = "nullius-f", base_color = { r = 164, g = 140, b = 204}, flow_color = { r = 164, g = 140, b = 204}, - heat_capacity = "0.08KJ", - fuel_value = "24KJ", + heat_capacity = "0.08kJ", + fuel_value = "24kJ", default_temperature = 50, max_temperature = 100 }, { type = "fluid", name = "nullius-compressed-helium", - icons = angelsmods.functions.create_liquid_fluid_icon(nil, + icons = angelsLegacy.functions.create_liquid_fluid_icon(nil, {element_tint["helium"], element_tint["helium"], element_tint["helium"]} ), - localised_description = {"fluid-description.nullius-recapture", 99, + localised_description = {"fluid-description.nullius-recapture", tostring(99), {"fluid-description.nullius-compressed-helium"}}, subgroup = "compressed-air", order = "nullius-g", base_color = { r = 224, g = 200, b = 255}, flow_color = { r = 224, g = 200, b = 255}, - heat_capacity = "0.08KJ", - fuel_value = "32KJ", + heat_capacity = "0.08kJ", + fuel_value = "32kJ", default_temperature = 50, max_temperature = 100 }, { type = "fluid", name = "nullius-compressed-hydrogen", - icons = angelsmods.functions.create_liquid_fluid_icon(nil, + icons = angelsLegacy.functions.create_liquid_fluid_icon(nil, {element_tint["hydrogen"], element_tint["hydrogen"], element_tint["hydrogen"]} ), - localised_description = {"fluid-description.nullius-oxygen-reduction", 200, - {"fluid-description.nullius-recapture", 85, + localised_description = {"fluid-description.nullius-oxygen-reduction", tostring(200), + {"fluid-description.nullius-recapture", tostring(85), {"fluid-description.nullius-compressed-hydrogen"}}}, subgroup = "compression", order = "nullius-h", base_color = {r = 1, g = 1, b = 1}, flow_color = {r = 1, g = 1, b = 1}, - heat_capacity = "0.08KJ", - fuel_value = "4KJ", + heat_capacity = "0.08kJ", + fuel_value = "4kJ", default_temperature = 50, max_temperature = 100 }, { type = "fluid", name = "nullius-compressed-oxygen", - icons = angelsmods.functions.create_liquid_fluid_icon(nil, + icons = angelsLegacy.functions.create_liquid_fluid_icon(nil, {element_tint["oxygen"], element_tint["oxygen"], element_tint["oxygen"]} ), - localised_description = {"fluid-description.nullius-oxygenation", 400, - {"fluid-description.nullius-recapture", 85, + localised_description = {"fluid-description.nullius-oxygenation", tostring(400), + {"fluid-description.nullius-recapture", tostring(85), {"fluid-description.nullius-compressed-oxygen"}}}, subgroup = "compression", order = "nullius-i", base_color = {r = 1, g = 0, b = 0}, flow_color = {r = 1, g = 0, b = 0}, - heat_capacity = "0.08KJ", - fuel_value = "4KJ", + heat_capacity = "0.08kJ", + fuel_value = "4kJ", default_temperature = 50, max_temperature = 100 }, { type = "fluid", name = "nullius-compressed-carbon-dioxide", - icons = angelsmods.functions.create_liquid_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72 }, + icons = angelsLegacy.functions.create_liquid_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", 72 }, {element_tint["carbon"], element_tint["oxygen"], element_tint["oxygen"]} ), - localised_description = {"fluid-description.nullius-recapture", 90, + localised_description = {"fluid-description.nullius-recapture", tostring(90), {"fluid-description.nullius-compressed-carbon-dioxide"}}, subgroup = "compression", order = "nullius-j", base_color = {r = 1, g = 0.4, b = 0.4}, flow_color = {r = 1, g = 0.4, b = 0.4}, - heat_capacity = "0.08KJ", - fuel_value = "12KJ", + heat_capacity = "0.08kJ", + fuel_value = "12kJ", default_temperature = 50, max_temperature = 100 }, { type = "fluid", name = "nullius-compressed-carbon-monoxide", - icons = angelsmods.functions.create_liquid_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", 72 }, + icons = angelsLegacy.functions.create_liquid_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", 72 }, {element_tint["carbon"], element_tint["carbon"], element_tint["oxygen"]} ), - localised_description = {"fluid-description.nullius-oxygen-reduction", 200, - {"fluid-description.nullius-recapture", 90, + localised_description = {"fluid-description.nullius-oxygen-reduction", tostring(200), + {"fluid-description.nullius-recapture", tostring(90), {"fluid-description.nullius-compressed-carbon-monoxide"}}}, subgroup = "compression", order = "nullius-k", base_color = {r = 0.5, g = 0.2, b = 0.2}, flow_color = {r = 0.5, g = 0.2, b = 0.2}, - heat_capacity = "0.08KJ", - fuel_value = "8KJ", + heat_capacity = "0.08kJ", + fuel_value = "8kJ", default_temperature = 50, max_temperature = 100 }, { type = "fluid", name = "nullius-compressed-methane", - icons = angelsmods.functions.create_liquid_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/methane.png", 72 }, + icons = angelsLegacy.functions.create_liquid_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", 72 }, {element_tint["carbon"], element_tint["hydrogen"], element_tint["hydrogen"]} ), - localised_description = {"fluid-description.nullius-oxygen-reduction", 800, - {"fluid-description.nullius-recapture", 85, + localised_description = {"fluid-description.nullius-oxygen-reduction", tostring(800), + {"fluid-description.nullius-recapture", tostring(85), {"fluid-description.nullius-compressed-methane"}}}, subgroup = "compression", order = "nullius-l", base_color = {r = 0.68, g = 0.68, b = 0.68}, flow_color = {r = 0.68, g = 0.68, b = 0.68}, - heat_capacity = "0.08KJ", - fuel_value = "6KJ", + heat_capacity = "0.08kJ", + fuel_value = "6kJ", default_temperature = 50, max_temperature = 100 }, { type = "fluid", name = "nullius-energy", - icons = {{ + icons = {{ icon = FLUIDPATH .. "energy.png", icon_size = 32 - }}, - hidden = true, + }}, + hidden = true, subgroup = "compressed-air", order = "nullius-x", base_color = {r=1, g=1, b=0}, flow_color = {r=1, g=1, b=0}, - heat_capacity = "0.1KJ", - fuel_value = "10KJ", + heat_capacity = "0.1kJ", + fuel_value = "10kJ", default_temperature = 100, max_temperature = 200, gas_temperature = 0 @@ -1095,12 +1095,12 @@ data:extend({ { icon = "__base__/graphics/icons/chemical-science-pack.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.27, shift = {1, 7}, tint = {r=1, g=1, b=1, a=0.75} @@ -1115,28 +1115,30 @@ data:extend({ { type = "recipe", name = "nullius-climatology-pack-1", - localised_name = {"", {"item-name.nullius-climatology-pack"}, " ", 1}, + localised_name = {"", {"item-name.nullius-climatology-pack"}, " ", tostring(1)}, show_amount_in_title = false, always_show_products = true, enabled = false, - allow_decomposition = false, + allow_decomposition = false, category = "nullius-water-treatment", energy_required = 60, ingredients = { {type="fluid", name="nullius-air", amount=5000}, {type="fluid", name="nullius-seawater", amount=4000} }, - result = "nullius-climatology-pack" + results = { + {type = "item", name = "nullius-climatology-pack", amount = 1} + } }, { type = "recipe", name = "nullius-climatology-pack-2", - localised_name = {"", {"item-name.nullius-climatology-pack"}, " ", 2}, + localised_name = {"", {"item-name.nullius-climatology-pack"}, " ", tostring(2)}, icons = { { icon = "__base__/graphics/icons/chemical-science-pack.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = FLUIDPATH .. "wastewater.png", @@ -1149,7 +1151,8 @@ data:extend({ show_amount_in_title = false, always_show_products = true, enabled = false, - allow_decomposition = false, + allow_decomposition = false, + hide_from_signal_gui = false, category = "basic-chemistry", subgroup = "research-pack-2", crafting_machine_tint = { @@ -1162,7 +1165,9 @@ data:extend({ {type="fluid", name="nullius-wastewater", amount=100}, {type="fluid", name="nullius-volcanic-gas", amount=5} }, - result = "nullius-climatology-pack" + results = { + {type = "item", name = "nullius-climatology-pack", amount = 1} + } }, { type = "recipe", @@ -1170,7 +1175,7 @@ data:extend({ show_amount_in_title = false, always_show_products = true, enabled = false, - allow_decomposition = false, + allow_decomposition = false, category = "basic-chemistry", subgroup = "boxed-science", crafting_machine_tint = { @@ -1183,7 +1188,9 @@ data:extend({ {type="fluid", name="nullius-wastewater", amount=500}, {type="fluid", name="nullius-volcanic-gas", amount=25} }, - result = "nullius-box-climatology-pack" + results = { + {type = "item", name = "nullius-box-climatology-pack", amount = 1} + } }, { @@ -1192,7 +1199,7 @@ data:extend({ order = "nullius-f", icon = "__base__/graphics/icons/logistic-science-pack.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "research-pack", stack_size = 200, durability = 1, @@ -1202,7 +1209,7 @@ data:extend({ { type = "recipe", name = "nullius-chemical-pack", - localised_name = {"", {"item-name.nullius-chemical-pack"}, " ", 1}, + localised_name = {"", {"item-name.nullius-chemical-pack"}, " ", tostring(1)}, enabled = false, category = "basic-chemistry", show_amount_in_title = false, @@ -1220,12 +1227,14 @@ data:extend({ {type="fluid", name="nullius-acid-sulfuric", amount=20}, {type="fluid", name="nullius-lubricant", amount=4} }, - result = "nullius-chemical-pack" + results = { + {type = "item", name = "nullius-chemical-pack", amount = 1} + } }, { type = "recipe", name = "nullius-boxed-chemical-pack", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-chemical-pack"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-chemical-pack"}}, " ", tostring(1)}, enabled = false, show_amount_in_title = false, always_show_products = true, @@ -1244,12 +1253,14 @@ data:extend({ {type="fluid", name="nullius-acid-sulfuric", amount=100}, {type="fluid", name="nullius-lubricant", amount=20} }, - result = "nullius-box-chemical-pack" + results = { + {type = "item", name = "nullius-box-chemical-pack", amount = 1} + } }, { type = "recipe", name = "nullius-chemical-pack-2", - localised_name = {"", {"item-name.nullius-chemical-pack"}, " ", 2}, + localised_name = {"", {"item-name.nullius-chemical-pack"}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "crate.png", @@ -1258,13 +1269,13 @@ data:extend({ { icon = "__base__/graphics/icons/logistic-science-pack.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { icon = "__base__/graphics/icons/fluid/barreling/empty-barrel.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.2, shift = {0, 5}, tint = {r=0.9, g=0.8, b=0.9, a=0.9} @@ -1273,6 +1284,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "basic-chemistry", subgroup = "research-pack-2", order = "nullius-fd", @@ -1303,8 +1315,8 @@ data:extend({ { type = "recipe", name = "nullius-saline-caustic-solution", - localised_name = {"", {"fluid-name.nullius-caustic-solution"}, " ", 1}, - icons = angelsmods.functions.create_liquid_recipe_icon( + localised_name = {"", {"fluid-name.nullius-caustic-solution"}, " ", tostring(1)}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( {{FLUIDPATH .. "sodium-hydroxide.png", 64}}, {element_tint["sodium"], element_tint["oxygen"], element_tint["hydrogen"]}, {{FLUIDPATH .. "brine.png", 64 }} @@ -1315,6 +1327,7 @@ data:extend({ order = "nullius-bb", show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, energy_required = 1, ingredients = { {type="fluid", name="nullius-saline", amount=60}, @@ -1328,8 +1341,8 @@ data:extend({ { type = "recipe", name = "nullius-caustic-solution", - localised_name = {"", {"fluid-name.nullius-caustic-solution"}, " ", 2}, - icons = angelsmods.functions.create_liquid_recipe_icon( + localised_name = {"", {"fluid-name.nullius-caustic-solution"}, " ", tostring(2)}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( {{FLUIDPATH .. "sodium-hydroxide.png", 64}}, {element_tint["hydrogen"], element_tint["oxygen"], element_tint["sodium"]}, {{FLUIDPATH .. "purewater.png", 64 }} @@ -1340,6 +1353,7 @@ data:extend({ order = "nullius-bc", show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, energy_required = 1, ingredients = { {type="fluid", name="nullius-water", amount=80}, @@ -1384,6 +1398,7 @@ data:extend({ { type = "recipe", name = "nullius-hydrogen-chloride", + icons = add_recipe_gear_icon(data.raw.fluid["nullius-hydrogen-chloride"].icons), enabled = false, category = "basic-chemistry", subgroup = "chlorine-chemistry", @@ -1396,6 +1411,7 @@ data:extend({ always_show_products = true, energy_required = 1, no_productivity = true, + hide_from_signal_gui = false, ingredients = { {type="fluid", name="nullius-hydrogen", amount=30}, {type="fluid", name="nullius-chlorine", amount=30} @@ -1408,9 +1424,9 @@ data:extend({ { type = "recipe", name = "nullius-hydrogen-chloride-electrolysis", - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/hydrogen.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/chlorine.png", 72}}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/chlorine.png", 72}}, {element_tint["hydrogen"], element_tint["chlorine"], element_tint["chlorine"]}, nil ), @@ -1424,6 +1440,7 @@ data:extend({ }, energy_required = 1, no_productivity = true, + hide_from_signal_gui = false, ingredients = { {type="fluid", name="nullius-hydrogen-chloride", amount=240} }, @@ -1435,6 +1452,7 @@ data:extend({ { type = "recipe", name = "nullius-acid-hydrochloric", + icons = add_recipe_gear_icon(data.raw.fluid["nullius-acid-hydrochloric"].icons), enabled = false, category = "basic-chemistry", subgroup = "chlorine-chemistry", @@ -1445,6 +1463,7 @@ data:extend({ }, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, energy_required = 1, ingredients = { {type="fluid", name="nullius-hydrogen-chloride", amount=35}, @@ -1467,7 +1486,7 @@ data:extend({ icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-chloride.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen-chloride.png", icon_size = 72, scale = 0.11, shift = {-13, -12} @@ -1485,6 +1504,7 @@ data:extend({ order = "nullius-cb", energy_required = 1, no_productivity = true, + hide_from_signal_gui = false, ingredients = { {type="fluid", name="nullius-hydrogen-chloride", amount=56}, {type="fluid", name="nullius-caustic-solution", amount=64} @@ -1504,10 +1524,10 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/water.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-chloride.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen-chloride.png", icon_size = 72, scale = 0.12, shift = {-13, -12} @@ -1525,6 +1545,7 @@ data:extend({ order = "nullius-cc", energy_required = 1, no_productivity = true, + hide_from_signal_gui = false, ingredients = { {type="fluid", name="nullius-acid-hydrochloric", amount=100}, {type="fluid", name="nullius-caustic-solution", amount=100} @@ -1608,7 +1629,7 @@ data:extend({ { type = "item", name = "nullius-soda-ash", - icon = "__angelspetrochem__/graphics/icons/solid-sodium-carbonate.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium-carbonate.png", icon_size = 32, subgroup = "sodium-product", order = "nullius-f", @@ -1617,7 +1638,7 @@ data:extend({ { type = "item", name = "nullius-sodium-sulfate", - icon = "__angelspetrochem__/graphics/icons/solid-sodium-sulfate.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium-sulfate.png", icon_size = 32, subgroup = "sodium-product", order = "nullius-e", @@ -1652,11 +1673,11 @@ data:extend({ localised_name = {"recipe-name.nullius-soda-ash-2"}, icons = { { - icon = "__angelspetrochem__/graphics/icons/solid-sodium-carbonate.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium-carbonate.png", icon_size = 32 }, { - icon = "__angelspetrochem__/graphics/icons/solid-sodium-sulfate.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium-sulfate.png", icon_size = 32, scale = 0.5, shift = {9, -9} @@ -1715,7 +1736,7 @@ data:extend({ localised_name = {"recipe-name.nullius-sodium-sulfate-1"}, icons = { { - icon = "__angelspetrochem__/graphics/icons/solid-sodium-sulfate.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium-sulfate.png", icon_size = 32 }, { @@ -1746,14 +1767,14 @@ data:extend({ { type = "recipe", name = "nullius-boxed-sodium-sulfate-1", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-sodium-sulfate"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-sodium-sulfate"}}, " ", tostring(1)}, icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/solid-sodium-sulfate.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium-sulfate.png", icon_size = 32, scale = 0.9 }, @@ -1789,7 +1810,7 @@ data:extend({ localised_name = {"recipe-name.nullius-sodium-sulfate-2"}, icons = { { - icon = "__angelspetrochem__/graphics/icons/solid-sodium-sulfate.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium-sulfate.png", icon_size = 32 }, { @@ -1800,6 +1821,7 @@ data:extend({ } }, enabled = false, + hide_from_signal_gui = false, category = "basic-chemistry", order = "nullius-ec", crafting_machine_tint = { @@ -1820,14 +1842,14 @@ data:extend({ { type = "recipe", name = "nullius-boxed-sodium-sulfate-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-sodium-sulfate"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-sodium-sulfate"}}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/solid-sodium-sulfate.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium-sulfate.png", icon_size = 32, scale = 0.9 }, @@ -1861,6 +1883,7 @@ data:extend({ { type = "recipe", name = "nullius-air-filtration", + localised_name = {"fluid-name.nullius-air"}, enabled = true, hide_from_player_crafting = true, category = "air-filtration", @@ -1892,7 +1915,7 @@ data:extend({ name = "nullius-seawater", enabled = true, hide_from_player_crafting = true, - crafting_machine_tint = { primary = + crafting_machine_tint = { primary = data.raw.fluid["nullius-seawater"].flow_color }, category = "seawater-pumping", subgroup = "nullius-water-treatment", @@ -1907,8 +1930,15 @@ data:extend({ type = "recipe", name = "nullius-seawater-filtration", localised_name = {"recipe-name.nullius-seawater-filtration"}, + icons = add_recipe_gear_icon({ + { + icon = "__base__/graphics/icons/fluid/water.png", + icon_size = 64, + } + }), order = "nullius-b", enabled = false, + hide_from_signal_gui = false, category = "nullius-water-treatment", subgroup = "nullius-water-treatment", energy_required = 1, @@ -1925,8 +1955,15 @@ data:extend({ type = "recipe", name = "nullius-freshwater-filtration", localised_name = {"recipe-name.nullius-freshwater-filtration"}, + icons = add_recipe_gear_icon({ + { + icon = FLUIDPATH .. "purewater.png", + icon_size = 64 + } + }), order = "nullius-c", enabled = false, + hide_from_signal_gui = false, category = "nullius-water-treatment", subgroup = "nullius-water-treatment", energy_required = 1, @@ -1943,14 +1980,15 @@ data:extend({ type = "recipe", name = "nullius-wastewater-filtration", localised_name = {"recipe-name.nullius-wastewater-filtration"}, - icons = angelsmods.functions.create_liquid_recipe_icon( + icons = angelsLegacy.functions.create_liquid_recipe_icon( {{FLUIDPATH .. "sludge.png", 64}, {"__base__/graphics/icons/fluid/water.png", 64}}, {element_tint["waste"], element_tint["sludge"], element_tint["saline"]}, nil ), enabled = false, - allow_decomposition = false, + allow_decomposition = false, + hide_from_signal_gui = false, category = "nullius-water-treatment", subgroup = "waste-management", order = "nullius-eb", @@ -1967,7 +2005,8 @@ data:extend({ type = "recipe", name = "nullius-heavy-water", enabled = false, - allow_decomposition = false, + allow_decomposition = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "waste-management", order = "nullius-ecb", @@ -1985,12 +2024,12 @@ data:extend({ { type = "recipe", name = "nullius-sludge-dehydration", - localised_name = {"recipe-name.nullius-dehydration", {"fluid-name.nullius-sludge"}}, - icons = { + localised_name = {"recipe-name.nullius-dehydration", {"fluid-name.nullius-sludge"}}, + icons = { { - icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-tungsten.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = FLUIDPATH .. "sludge.png", @@ -2000,7 +2039,8 @@ data:extend({ } }, enabled = false, - allow_decomposition = false, + allow_decomposition = false, + hide_from_signal_gui = false, category = "pressure-boiling", subgroup = "waste-management", order = "nullius-ea", @@ -2011,20 +2051,21 @@ data:extend({ results = { {type="item", name="nullius-mineral-dust", amount=2}, {type="fluid", name="nullius-steam", amount=80}, - {type="fluid", name="nullius-carbon-monoxide", amount=6} + {type="fluid", name="nullius-carbon-monoxide", amount=6} } }, { type = "recipe", name = "nullius-desalination", - localised_name = {"", {"recipe-name.nullius-desalination"}, " ", 1}, - icons = angelsmods.functions.create_liquid_recipe_icon( + localised_name = {"", {"recipe-name.nullius-desalination"}, " ", tostring(1)}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( {{FLUIDPATH .. "brine.png", 64 }, {FLUIDPATH .. "purewater.png", 64 }}, {element_tint["saline"], element_tint["brine"], element_tint["water"]}, nil ), enabled = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "nullius-water-treatment", order = "nullius-ebb", @@ -2041,8 +2082,8 @@ data:extend({ { type = "recipe", name = "nullius-desalination-2", - localised_name = {"", {"recipe-name.nullius-desalination"}, " ", 2}, - icons = angelsmods.functions.create_liquid_recipe_icon( + localised_name = {"", {"recipe-name.nullius-desalination"}, " ", tostring(2)}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( {{FLUIDPATH .. "brine.png", 64 }, {FLUIDPATH .. "purewater.png", 64 }, {FLUIDPATH .. "wastewater.png", 64 }}, @@ -2050,6 +2091,7 @@ data:extend({ {{"__base__/graphics/icons/fluid/steam.png", 64}} ), enabled = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "nullius-water-treatment", order = "nullius-ebc", @@ -2068,8 +2110,8 @@ data:extend({ { type = "recipe", name = "nullius-desalination-3", - localised_name = {"", {"recipe-name.nullius-desalination"}, " ", 3}, - icons = angelsmods.functions.create_liquid_recipe_icon( + localised_name = {"", {"recipe-name.nullius-desalination"}, " ", tostring(3)}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( {{FLUIDPATH .. "purewater.png", 64 }, {FLUIDPATH .. "brine.png", 64 }, {FLUIDPATH .. "wastewater.png", 64 }}, @@ -2096,14 +2138,15 @@ data:extend({ { type = "recipe", name = "nullius-saline-electrolysis", - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/hydrogen.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/chlorine.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/oxygen.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/chlorine.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/oxygen.png", 72}}, {element_tint["saline"], element_tint["hydrogen"], element_tint["chlorine"]}, nil ), enabled = false, + hide_from_signal_gui = false, category = "nullius-electrolysis", subgroup = "nullius-electrolysis", order = "nullius-i", @@ -2121,13 +2164,14 @@ data:extend({ { type = "recipe", name = "nullius-water-electrolysis", - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/oxygen.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/hydrogen.png", 72}}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/oxygen.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", 72}}, {element_tint["water"], element_tint["oxygen"], element_tint["hydrogen"]}, nil ), enabled = false, + hide_from_signal_gui = false, category = "nullius-electrolysis", subgroup = "nullius-electrolysis", order = "nullius-hb", @@ -2143,13 +2187,14 @@ data:extend({ { type = "recipe", name = "nullius-pressure-water-electrolysis", - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/oxygen.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/hydrogen.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/oxygen.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", 72}}, {element_tint["oxygen"], element_tint["hydrogen"], element_tint["water"]}, nil ), enabled = false, + hide_from_signal_gui = false, category = "nullius-electrolysis", subgroup = "nullius-electrolysis", order = "nullius-hd", @@ -2165,14 +2210,15 @@ data:extend({ { type = "recipe", name = "nullius-steam-electrolysis", - localised_name = {"recipe-name.nullius-electrolysis", {"fluid-name.nullius-steam"}}, - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/oxygen.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/hydrogen.png", 72}}, + localised_name = {"recipe-name.nullius-electrolysis", {"fluid-name.nullius-steam"}}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/oxygen.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", 72}}, {{ 56, 142, 147 }, element_tint["oxygen"], element_tint["hydrogen"]}, {{"__base__/graphics/icons/fluid/steam.png", 64}} ), enabled = false, + hide_from_signal_gui = false, category = "nullius-electrolysis", subgroup = "nullius-electrolysis", order = "nullius-hc", @@ -2188,15 +2234,16 @@ data:extend({ { type = "recipe", name = "nullius-pressure-steam-electrolysis", - localised_name = {"recipe-name.nullius-pressure", + localised_name = {"recipe-name.nullius-pressure", {"recipe-name.nullius-electrolysis", {"fluid-name.nullius-steam"}}}, - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/oxygen.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/hydrogen.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/oxygen.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", 72}}, {element_tint["oxygen"], element_tint["hydrogen"], { 56, 142, 147 }}, {{"__base__/graphics/icons/fluid/steam.png", 64}} ), enabled = false, + hide_from_signal_gui = false, category = "nullius-electrolysis", subgroup = "nullius-electrolysis", order = "nullius-he", @@ -2212,14 +2259,15 @@ data:extend({ { type = "recipe", name = "nullius-high-pressure-steam-electrolysis", - localised_name = {"recipe-name.nullius-electrolysis", {"fluid-name.nullius-pressure-steam"}}, - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/oxygen.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/hydrogen.png", 72}}, + localised_name = {"recipe-name.nullius-electrolysis", {"fluid-name.nullius-pressure-steam"}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/oxygen.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", 72}}, {element_tint["oxygen"], element_tint["hydrogen"], { 129, 202, 210 }}, {{FLUIDPATH .. "steam2.png", 64}} ), enabled = false, + hide_from_signal_gui = false, category = "nullius-electrolysis", subgroup = "nullius-electrolysis", order = "nullius-hf", @@ -2235,14 +2283,15 @@ data:extend({ { type = "recipe", name = "nullius-brine-electrolysis", - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/hydrogen.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/chlorine.png", 72}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/chlorine.png", 72}, {FLUIDPATH .. "sodium-hydroxide.png", 64, nil, 0.9}}, {element_tint["brine"], element_tint["sodium"], element_tint["chlorine"]}, nil ), enabled = false, + hide_from_signal_gui = false, category = "nullius-electrolysis", subgroup = "nullius-electrolysis", order = "nullius-j", @@ -2280,7 +2329,7 @@ data:extend({ name = "nullius-deuterium", enabled = false, category = "nullius-electrolysis", - subgroup = "waste-management", + subgroup = "waste-management", order = "nullius-ecc", energy_required = 8, ingredients = { @@ -2306,7 +2355,7 @@ data:extend({ { type = "item", name = "nullius-sodium", - icon = "__angelspetrochem__/graphics/icons/solid-sodium.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium.png", icon_size = 32, subgroup = "sodium-product", order = "nullius-d", @@ -2356,7 +2405,7 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/water.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "salt.png", @@ -2371,6 +2420,7 @@ data:extend({ always_show_products = true, allow_as_intermediate = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "nullius-water-treatment", order = "nullius-ec", energy_required = 1, @@ -2422,7 +2472,7 @@ data:extend({ localised_name = {"recipe-name.nullius-salt-electrolysis"}, icons = { { - icon = "__angelspetrochem__/graphics/icons/solid-sodium.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium.png", icon_size = 32 }, { @@ -2433,6 +2483,7 @@ data:extend({ } }, enabled = false, + hide_from_signal_gui = false, category = "nullius-electrolysis", order = "nullius-db", energy_required = 2, @@ -2448,14 +2499,14 @@ data:extend({ { type = "recipe", name = "nullius-boxed-sodium-1", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-sodium"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-sodium"}}, " ", tostring(1)}, icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/solid-sodium.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium.png", icon_size = 32, scale = 0.9 }, @@ -2486,7 +2537,7 @@ data:extend({ localised_name = {"recipe-name.nullius-sodium-hydroxide-electrolysis"}, icons = { { - icon = "__angelspetrochem__/graphics/icons/solid-sodium.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium.png", icon_size = 32 }, { @@ -2497,6 +2548,7 @@ data:extend({ } }, enabled = false, + hide_from_signal_gui = false, category = "nullius-electrolysis", order = "nullius-dc", energy_required = 2, @@ -2513,14 +2565,14 @@ data:extend({ { type = "recipe", name = "nullius-boxed-sodium-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-sodium"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-sodium"}}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/solid-sodium.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium.png", icon_size = 32, scale = 0.9 }, @@ -2612,7 +2664,7 @@ data:extend({ type = "recipe", name = "nullius-legacy-lithium-chloride", enabled = false, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, category = "nullius-water-treatment", @@ -2633,7 +2685,7 @@ data:extend({ type = "recipe", name = "nullius-legacy-boxed-lithium-chloride", enabled = false, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, category = "nullius-water-treatment", @@ -2687,14 +2739,15 @@ data:extend({ { type = "recipe", name = "nullius-air-separation-1", - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/nitrogen.png", 64}, - {"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72}}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/nitrogen.png", 64}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", 72}}, {element_tint["air"], element_tint["nitrogen"], element_tint["carbon"]}, nil ), enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "air-filtration", order = "nullius-cb", @@ -2711,14 +2764,15 @@ data:extend({ { type = "recipe", name = "nullius-air-separation-2", - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/nitrogen.png", 64}, - {"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72}}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/nitrogen.png", 64}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", 72}}, {element_tint["air"], element_tint["carbon"], element_tint["residual"]}, nil ), enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "air-filtration", order = "nullius-cc", @@ -2736,14 +2790,15 @@ data:extend({ { type = "recipe", name = "nullius-pressure-air-separation", - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/nitrogen.png", 64}, - {"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/nitrogen.png", 64}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", 72}}, {element_tint["air"], element_tint["carbon"], element_tint["residual"]}, nil ), enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "air-filtration", order = "nullius-cd", @@ -2761,18 +2816,19 @@ data:extend({ { type = "recipe", name = "nullius-oxygen-separation", - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/oxygen.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72}}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/oxygen.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", 72}}, {element_tint["oxygen"], element_tint["carbon"], element_tint["residual"]}, nil ), enabled = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "air-filtration", order = "nullius-cob", - crafting_machine_tint = { primary = data.raw.fluid["nullius-nitrogen"].flow_color }, + crafting_machine_tint = { primary = data.raw.fluid["nullius-nitrogen"].flow_color }, energy_required = 4, ingredients = { {type="fluid", name="nullius-air", amount=400} @@ -2786,18 +2842,19 @@ data:extend({ { type = "recipe", name = "nullius-pressure-oxygen-separation", - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/oxygen.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/oxygen.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", 72}}, {element_tint["oxygen"], element_tint["carbon"], element_tint["residual"]}, nil ), enabled = false, + hide_from_signal_gui = false, allow_decomposition = false, category = "distillation", subgroup = "air-filtration", order = "nullius-coc", - crafting_machine_tint = { primary = data.raw.fluid["nullius-compressed-nitrogen"].flow_color }, + crafting_machine_tint = { primary = data.raw.fluid["nullius-compressed-nitrogen"].flow_color }, energy_required = 3, ingredients = { {type="fluid", name="nullius-compressed-air", amount=180} @@ -2812,13 +2869,14 @@ data:extend({ type = "recipe", name = "nullius-residual-gas", localised_name = {"fluid-name.nullius-residual-gas"}, - icons = angelsmods.functions.create_liquid_recipe_icon(nil, + icons = angelsLegacy.functions.create_liquid_recipe_icon(nil, {element_tint["residual"], element_tint["air"], element_tint["residual"]}, nil ), enabled = false, - allow_decomposition = false, + allow_decomposition = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "air-filtration", order = "nullius-cr", @@ -2837,7 +2895,7 @@ data:extend({ { type = "recipe", name = "nullius-residual-separation", - icons = angelsmods.functions.create_gas_recipe_icon( + icons = angelsLegacy.functions.create_gas_recipe_icon( {{FLUIDPATH .. "atom.png", 64, nil, nil, element_tint["argon"]}, {FLUIDPATH .. "purewater.png", 64}}, {element_tint["residual"], element_tint["argon"], element_tint["water"]}, @@ -2845,6 +2903,7 @@ data:extend({ ), enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "air-filtration", order = "nullius-db", @@ -2862,7 +2921,7 @@ data:extend({ { type = "recipe", name = "nullius-pressure-residual-separation", - icons = angelsmods.functions.create_liquid_recipe_icon( + icons = angelsLegacy.functions.create_liquid_recipe_icon( {{FLUIDPATH .. "atom.png", 64, nil, nil, element_tint["argon"]}, {FLUIDPATH .. "purewater.png", 64}}, {element_tint["residual"], element_tint["argon"], element_tint["water"]}, @@ -2870,6 +2929,7 @@ data:extend({ ), enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "air-filtration", order = "nullius-dc", @@ -2887,14 +2947,15 @@ data:extend({ { type = "recipe", name = "nullius-trace-separation", - icons = angelsmods.functions.create_gas_recipe_icon( + icons = angelsLegacy.functions.create_gas_recipe_icon( {{FLUIDPATH .. "atom.png", 64, nil, nil, element_tint["helium"]}, - {"__angelspetrochem__/graphics/icons/molecules/methane.png", 72}}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", 72}}, {element_tint["trace"], element_tint["helium"], element_tint["methane"]}, nil ), enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "air-filtration", order = "nullius-eb", @@ -2912,14 +2973,15 @@ data:extend({ { type = "recipe", name = "nullius-pressure-trace-separation", - icons = angelsmods.functions.create_liquid_recipe_icon( + icons = angelsLegacy.functions.create_liquid_recipe_icon( {{FLUIDPATH .. "atom.png", 64, nil, nil, element_tint["helium"]}, - {"__angelspetrochem__/graphics/icons/molecules/methane.png", 72}}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", 72}}, {element_tint["trace"], element_tint["helium"], element_tint["methane"]}, nil ), enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "air-filtration", order = "nullius-ec", @@ -2937,15 +2999,16 @@ data:extend({ { type = "recipe", name = "nullius-volcanic-separation-1", - localised_name = {"", {"recipe-name.nullius-volcanic-separation"}, " ", 1}, - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/sulfur-dioxide.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", 72}}, + localised_name = {"", {"recipe-name.nullius-volcanic-separation"}, " ", tostring(1)}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/sulfur-dioxide.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", 72}}, {element_tint["volcanic"], element_tint["sulfur"], element_tint["carbon"]}, nil ), enabled = false, - allow_decomposition = false, + allow_decomposition = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "inorganic-chemistry", order = "nullius-eb", @@ -2963,15 +3026,16 @@ data:extend({ { type = "recipe", name = "nullius-volcanic-separation-2", - localised_name = {"", {"recipe-name.nullius-volcanic-separation"}, " ", 2}, - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/sulfur-dioxide.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", 72}}, + localised_name = {"", {"recipe-name.nullius-volcanic-separation"}, " ", tostring(2)}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/sulfur-dioxide.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", 72}}, {element_tint["sulfur"], element_tint["carbon"], element_tint["boron"]}, nil ), enabled = false, - allow_decomposition = false, + allow_decomposition = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "inorganic-chemistry", order = "nullius-ec", @@ -2990,10 +3054,10 @@ data:extend({ { type = "recipe", name = "nullius-boxed-volcanic", - localised_name = {"", {"recipe-name.nullius-boxed", - {"recipe-name.nullius-volcanic-separation"}}, " ", 1}, + localised_name = {"", {"recipe-name.nullius-boxed", + {"recipe-name.nullius-volcanic-separation"}}, " ", tostring(1)}, enabled = false, - allow_decomposition = false, + allow_decomposition = false, category = "distillation", subgroup = "boxed-fluid", order = "nullius-bb", @@ -3013,15 +3077,16 @@ data:extend({ { type = "recipe", name = "nullius-volcanic-separation-3", - localised_name = {"", {"recipe-name.nullius-volcanic-separation"}, " ", 3}, - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/sulfur-dioxide.png", 72}, - {FLUIDPATH .. "atom.png", 64, nil, nil, element_tint["helium"]}}, - {element_tint["sulfur"], element_tint["helium"], element_tint["boron"]}, - nil + localised_name = {"", {"recipe-name.nullius-volcanic-separation"}, " ", tostring(3)}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/sulfur-dioxide.png", 72}, + {FLUIDPATH .. "atom.png", 64, nil, nil, element_tint["helium"]}}, + {element_tint["sulfur"], element_tint["helium"], element_tint["boron"]}, + nil ), enabled = false, - allow_decomposition = false, + allow_decomposition = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "inorganic-chemistry", order = "nullius-ed", @@ -3041,28 +3106,28 @@ data:extend({ type = "recipe", name = "nullius-boxed-volcanic-2", localised_name = {"", {"recipe-name.nullius-boxed", - {"recipe-name.nullius-volcanic-separation"}}, " ", 2}, - icons = { + {"recipe-name.nullius-volcanic-separation"}}, " ", tostring(2)}, + icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, - { + { icon = ICONPATH .. "lye.png", icon_size = 64, tint = { 240, 172, 172 }, - scale = 0.45 + scale = 0.45 }, - { + { icon = FLUIDPATH .. "atom.png", - icon_size = 64, - scale = 0.2, - shift = {10, 10}, + icon_size = 64, + scale = 0.2, + shift = {10, 10}, tint = {164, 140, 204} } }, enabled = false, - allow_decomposition = false, + allow_decomposition = false, category = "distillation", subgroup = "boxed-fluid", order = "nullius-bc", @@ -3084,12 +3149,13 @@ data:extend({ type = "recipe", name = "nullius-carbon-dioxide-to-monoxide", localised_name = {"recipe-name.nullius-carbon-dioxide-to-monoxide"}, - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", 72}}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", 72}}, {element_tint["carbon"], element_tint["carbon"], element_tint["oxygen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", 72}} ), enabled = false, + hide_from_signal_gui = false, category = "basic-chemistry", subgroup = "carbon", order = "nullius-bb", @@ -3111,12 +3177,13 @@ data:extend({ { type = "recipe", name = "nullius-pressure-carbon-monoxide", - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", 72}}, {element_tint["carbon"], element_tint["carbon"], element_tint["oxygen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", 72}} ), enabled = false, + --hide_from_signal_gui = false, category = "basic-chemistry", subgroup = "carbon", order = "nullius-bc", @@ -3138,13 +3205,14 @@ data:extend({ type = "recipe", name = "nullius-carbon-monoxide-to-dioxide", localised_name = {"recipe-name.nullius-carbon-monoxide-to-dioxide"}, - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72}}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", 72}}, {element_tint["carbon"], element_tint["oxygen"], element_tint["oxygen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", 72}} ), enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "basic-chemistry", subgroup = "carbon", order = "nullius-db", @@ -3166,13 +3234,14 @@ data:extend({ { type = "recipe", name = "nullius-pressure-carbon-dioxide", - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", 72}}, {element_tint["carbon"], element_tint["oxygen"], element_tint["oxygen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", 72}} ), enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "basic-chemistry", subgroup = "carbon", order = "nullius-dc", @@ -3197,10 +3266,10 @@ data:extend({ { icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", icon_size = 72, scale = 0.25, shift = {-9, -10} @@ -3231,16 +3300,17 @@ data:extend({ { icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", icon_size = 72, scale = 0.16, shift = {-11, -11} } }, enabled = false, + hide_from_signal_gui = false, category = "basic-chemistry", subgroup = "organic-material-1", order = "nullius-bc", @@ -3261,14 +3331,15 @@ data:extend({ { type = "recipe", name = "nullius-carbon-gasification-1", - localised_name = {"", {"recipe-name.nullius-carbon-gasification"}, " ", 1}, - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", 72}}, + localised_name = {"", {"recipe-name.nullius-carbon-gasification"}, " ", tostring(1)}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", 72}}, {element_tint["carbon"], element_tint["carbon"], element_tint["oxygen"]}, {{"__base__/graphics/icons/coal-dark-background.png", 64}} ), enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "carbon", order = "nullius-cb", @@ -3289,14 +3360,15 @@ data:extend({ { type = "recipe", name = "nullius-carbon-gasification-2", - localised_name = {"", {"recipe-name.nullius-carbon-gasification"}, " ", 2}, - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", 72}}, + localised_name = {"", {"recipe-name.nullius-carbon-gasification"}, " ", tostring(2)}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", 72}}, {element_tint["carbon"], element_tint["carbon"], element_tint["oxygen"]}, {{"__base__/graphics/icons/coal-dark-background.png", 64}} ), enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "carbon", order = "nullius-cc", @@ -3320,9 +3392,9 @@ data:extend({ { type = "recipe", name = "nullius-boxed-carbon-gasification-1", - localised_name = {"recipe-name.nullius-boxed", - {"", {"recipe-name.nullius-carbon-gasification"}, " ", 1}}, - icons = { + localised_name = {"recipe-name.nullius-boxed", + {"", {"recipe-name.nullius-carbon-gasification"}, " ", tostring(1)}}, + icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 @@ -3356,8 +3428,8 @@ data:extend({ { type = "recipe", name = "nullius-boxed-carbon-gasification-2", - localised_name = {"recipe-name.nullius-boxed", - {"", {"recipe-name.nullius-carbon-gasification"}, " ", 2}}, + localised_name = {"recipe-name.nullius-boxed", + {"", {"recipe-name.nullius-carbon-gasification"}, " ", tostring(2)}}, icons = { { icon = ICONPATH .. "crate.png", @@ -3392,8 +3464,8 @@ data:extend({ { type = "recipe", name = "nullius-legacy-graphite-to-carbon-monoxide", - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", 72}}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", 72}}, {element_tint["carbon"], element_tint["carbon"], element_tint["oxygen"]}, {{"__base__/graphics/icons/coal-dark-background.png", 64}} ), @@ -3428,7 +3500,7 @@ data:extend({ icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", icon_size = 72, scale = 0.4 } @@ -3458,13 +3530,14 @@ data:extend({ type = "recipe", name = "nullius-carbon-dioxide-electrolysis", localised_name = {"recipe-name.nullius-carbon-dioxide-electrolysis"}, - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/oxygen.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/oxygen.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", 72}}, {element_tint["carbon"], element_tint["carbon"], element_tint["oxygen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", 72}} ), enabled = false, + hide_from_signal_gui = false, category = "nullius-electrolysis", subgroup = "carbon", order = "nullius-bd", @@ -3482,14 +3555,15 @@ data:extend({ type = "recipe", name = "nullius-carbon-monoxide-to-alkenes", localised_name = {"recipe-name.nullius-alkene-synthesis"}, - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/ethylene.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/benzene.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/propene.png", 72}}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/ethylene.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/benzene.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/propene.png", 72}}, {element_tint["carbon"], element_tint["hydrogen"], element_tint["oxygen"]}, nil ), enabled = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "hydrocarbon", order = "nullius-i", @@ -3509,14 +3583,15 @@ data:extend({ { type = "recipe", name = "nullius-pressure-alkene-synthesis", - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/ethylene.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/benzene.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/propene.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/ethylene.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/benzene.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/propene.png", 72}}, {element_tint["carbon"], element_tint["hydrogen"], element_tint["oxygen"]}, nil ), enabled = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "hydrocarbon", order = "nullius-fb", @@ -3536,14 +3611,15 @@ data:extend({ type = "recipe", name = "nullius-alkene-synthesis-light", localised_name = {"recipe-name.nullius-light", {"recipe-name.nullius-alkene-synthesis"}}, - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/methane.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/propene.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/ethylene.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/propene.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/ethylene.png", 72}}, {element_tint["oxygen"], element_tint["hydrogen"], element_tint["carbon"]}, nil ), enabled = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "hydrocarbon", order = "nullius-fc", @@ -3563,12 +3639,13 @@ data:extend({ { type = "recipe", name = "nullius-carbon-dioxide-to-methane", - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/methane.png", 72}}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", 72}}, {element_tint["carbon"], element_tint["hydrogen"], element_tint["hydrogen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", 72}} ), enabled = false, + hide_from_signal_gui = false, category = "basic-chemistry", subgroup = "hydrocarbon", order = "nullius-f", @@ -3590,12 +3667,13 @@ data:extend({ { type = "recipe", name = "nullius-pressure-methane", - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/methane.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", 72}}, {element_tint["carbon"], element_tint["hydrogen"], element_tint["hydrogen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", 72}} ), enabled = false, + hide_from_signal_gui = false, category = "basic-chemistry", subgroup = "hydrocarbon", order = "nullius-d", @@ -3616,12 +3694,13 @@ data:extend({ { type = "recipe", name = "nullius-methane-to-ethylene", - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/ethylene.png", 72}}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/ethylene.png", 72}}, {element_tint["carbon"], element_tint["carbon"], element_tint["hydrogen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/methane.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", 72}} ), enabled = false, + hide_from_signal_gui = false, category = "basic-chemistry", subgroup = "hydrocarbon", order = "nullius-h", @@ -3644,12 +3723,13 @@ data:extend({ type = "recipe", name = "nullius-pressure-ethylene", localised_name = {"recipe-name.nullius-pressure-ethylene"}, - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/ethylene.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/ethylene.png", 72}}, {element_tint["carbon"], element_tint["carbon"], element_tint["hydrogen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/methane.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", 72}} ), enabled = false, + hide_from_signal_gui = false, category = "basic-chemistry", subgroup = "hydrocarbon", order = "nullius-e", @@ -3671,16 +3751,17 @@ data:extend({ { type = "recipe", name = "nullius-methanol", - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/methanol.png", 72}}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/methanol.png", 72}}, {element_tint["carbon"], element_tint["oxygen"], element_tint["hydrogen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/methane.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", 72}} ), enabled = false, show_amount_in_title = false, always_show_products = true, + --hide_from_signal_gui = false, category = "basic-chemistry", - order = "nullius-bb", + order = "nullius-bb", crafting_machine_tint = { primary = data.raw.fluid["nullius-oxygen"].flow_color, secondary = data.raw.fluid["nullius-methane"].flow_color @@ -3699,14 +3780,15 @@ data:extend({ type = "recipe", name = "nullius-pressure-methanol", localised_name = {"recipe-name.nullius-pressure-methanol"}, - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/methanol.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/methanol.png", 72}}, {element_tint["carbon"], element_tint["oxygen"], element_tint["hydrogen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/methane.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", 72}} ), enabled = false, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "basic-chemistry", subgroup = "organic-chemistry", order = "nullius-bc", @@ -3746,15 +3828,16 @@ data:extend({ { type = "recipe", name = "nullius-pressure-butadiene", - localised_name = {"recipe-name.nullius-pressure", {"fluid-name.nullius-butadiene"}}, - icons = angelsmods.functions.create_liquid_fluid_icon( - {"__angelspetrochem__/graphics/icons/molecules/butadiene.png", 75 }, + localised_name = {"recipe-name.nullius-pressure", {"fluid-name.nullius-butadiene"}}, + icons = angelsLegacy.functions.create_liquid_fluid_icon( + {"__angelspetrochemgraphics__/graphics/icons/molecules/butadiene.png", 75 }, {element_tint["hydrogen"], element_tint["carbon"], element_tint["carbon"]} ), - enabled = false, + enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "distillation", - order = "nullius-cc", + order = "nullius-cc", crafting_machine_tint = { primary = data.raw.fluid["nullius-ethylene"].flow_color }, energy_required = 1, ingredients = { @@ -3852,7 +3935,7 @@ data:extend({ icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/methylamine.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/methylamine.png", icon_size = 72, scale = 0.2, shift = {11, -10} @@ -3909,6 +3992,7 @@ data:extend({ localised_name = {"recipe-name.nullius-boiling", {"fluid-name.nullius-water"}}, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, icons = { { icon = FLUIDPATH .. "purewater.png", @@ -3917,7 +4001,7 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45, tint = {0.8, 0.8, 0.8, 0.8}, shift = {2, -2} @@ -3949,13 +4033,14 @@ data:extend({ { icon = FLUIDPATH .. "purewater.png", icon_size = 64, - scale = 0.36 + scale = 0.36 } }, enabled = false, - show_amount_in_title = false, + show_amount_in_title = false, always_show_products = true, - no_productivity = true, + no_productivity = true, + hide_from_signal_gui = false, category = "pressure-boiling", subgroup = "pressure-boiling", order = "nullius-b", @@ -3974,16 +4059,17 @@ data:extend({ localised_name = {"recipe-name.nullius-boiling", {"fluid-name.nullius-saline"}}, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, icons = { { icon = "__base__/graphics/icons/fluid/water.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45, tint = {0.8, 0.8, 0.8, 0.8}, shift = {2, -2} @@ -4016,14 +4102,14 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/water.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.36 + scale = 0.36 } }, enabled = false, - show_amount_in_title = false, + show_amount_in_title = false, always_show_products = true, - no_productivity = true, + no_productivity = true, + hide_from_signal_gui = false, category = "pressure-boiling", subgroup = "pressure-boiling", order = "nullius-c", @@ -4043,6 +4129,7 @@ data:extend({ localised_name = {"recipe-name.nullius-boiling", {"fluid-name.nullius-brine"}}, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, icons = { { icon = FLUIDPATH .. "brine.png", @@ -4051,7 +4138,6 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.45, tint = {0.8, 0.8, 0.8, 0.8}, shift = {2, -2} @@ -4084,13 +4170,14 @@ data:extend({ { icon = FLUIDPATH .. "brine.png", icon_size = 64, - scale = 0.36 + scale = 0.36 } }, enabled = false, - show_amount_in_title = false, + show_amount_in_title = false, always_show_products = true, - no_productivity = true, + no_productivity = true, + hide_from_signal_gui = false, category = "pressure-boiling", subgroup = "pressure-boiling", order = "nullius-d", @@ -4118,7 +4205,7 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45, tint = {0.8, 0.8, 0.8, 0.8}, shift = {2, -2} @@ -4130,6 +4217,7 @@ data:extend({ order = "nullius-d", energy_required = 1, no_productivity = true, + hide_from_signal_gui = false, ingredients = { {type="fluid", name="nullius-seawater", amount=65} }, @@ -4151,13 +4239,14 @@ data:extend({ { icon = FLUIDPATH .. "seawater.png", icon_size = 64, - scale = 0.36 + scale = 0.36 } }, enabled = false, - show_amount_in_title = false, + show_amount_in_title = false, always_show_products = true, - no_productivity = true, + no_productivity = true, + hide_from_signal_gui = false, category = "pressure-boiling", subgroup = "pressure-boiling", order = "nullius-e", @@ -4185,7 +4274,6 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.45, tint = {0.8, 0.8, 0.8, 0.8}, shift = {2, -2} @@ -4197,6 +4285,7 @@ data:extend({ order = "nullius-e", energy_required = 1, no_productivity = true, + hide_from_signal_gui = false, ingredients = { {type="fluid", name="nullius-freshwater", amount=60} }, @@ -4218,13 +4307,14 @@ data:extend({ { icon = FLUIDPATH .. "freshwater.png", icon_size = 64, - scale = 0.36 + scale = 0.36 } }, enabled = false, - show_amount_in_title = false, + show_amount_in_title = false, always_show_products = true, - no_productivity = true, + no_productivity = true, + hide_from_signal_gui = false, category = "pressure-boiling", subgroup = "pressure-boiling", order = "nullius-f", @@ -4252,14 +4342,14 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.45, tint = {0.8, 0.8, 0.8, 0.8}, shift = {2, -2} } }, enabled = false, - allow_decomposition = false, + allow_decomposition = false, + hide_from_signal_gui = false, category = "boiling", subgroup = "boiling", order = "nullius-f", @@ -4286,13 +4376,14 @@ data:extend({ { icon = FLUIDPATH .. "wastewater.png", icon_size = 64, - scale = 0.36 + scale = 0.36 } }, enabled = false, - show_amount_in_title = false, + show_amount_in_title = false, always_show_products = true, - no_productivity = true, + no_productivity = true, + hide_from_signal_gui = false, category = "pressure-boiling", subgroup = "pressure-boiling", order = "nullius-g", @@ -4313,6 +4404,7 @@ data:extend({ show_amount_in_title = false, always_show_products = true, allow_as_intermediate = false, + hide_from_signal_gui = false, icon_size = 64, icons = { { @@ -4320,7 +4412,6 @@ data:extend({ }, { icon = "__base__/graphics/icons/fluid/steam.png", - icon_mipmaps = 4, scale = 0.25, shift = {-8, -8} } @@ -4349,10 +4440,10 @@ data:extend({ icon_size = 64 }, { - icon = "__angelsrefining__/graphics/icons/barreling-pump.png", + icon = "__angelsrefininggraphics__/graphics/icons/barreling-pump.png", icon_size = 32, - scale = 0.5, - shift = {-8, -8} + scale = 0.5, + shift = {-8, -8} } }, enabled = false, @@ -4360,7 +4451,8 @@ data:extend({ always_show_products = true, allow_decomposition = false, allow_as_intermediate = false, - hide_from_stats = true, + hide_from_stats = true, + hide_from_signal_gui = false, category = "decompression", subgroup = "pressure-boiling", order = "nullius-i", @@ -4379,7 +4471,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, - hide_from_stats = true, + hide_from_stats = true, category = "compression", subgroup = "pressure-boiling", order = "nullius-h", @@ -4401,7 +4493,7 @@ data:extend({ icons = { { icon = "__base__/graphics/icons/fluid/steam.png", - icon_mipmaps = 4 + }, { icon = FLUIDPATH .. "atom2.png", @@ -4416,6 +4508,7 @@ data:extend({ show_amount_in_title = false, always_show_products = true, allow_as_intermediate = false, + hide_from_signal_gui = false, energy_required = 1, ingredients = { {type="fluid", name="nullius-hydrogen", amount=200}, @@ -4433,7 +4526,7 @@ data:extend({ icons = { { icon = "__base__/graphics/icons/fluid/steam.png", - icon_mipmaps = 4 + }, { icon = FLUIDPATH .. "atom2.png", @@ -4448,6 +4541,7 @@ data:extend({ show_amount_in_title = false, always_show_products = true, allow_as_intermediate = false, + hide_from_signal_gui = false, energy_required = 1, ingredients = { {type="fluid", name="nullius-compressed-hydrogen", amount=65}, @@ -4466,7 +4560,7 @@ data:extend({ icons = { { icon = "__base__/graphics/icons/fluid/steam.png", - icon_mipmaps = 4 + }, { icon = FLUIDPATH .. "atom2.png", @@ -4481,6 +4575,7 @@ data:extend({ show_amount_in_title = false, always_show_products = true, allow_as_intermediate = false, + hide_from_signal_gui = false, energy_required = 1, ingredients = { {type="fluid", name="nullius-compressed-hydrogen", amount=90}, @@ -4500,10 +4595,9 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/methane.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", icon_size = 72, scale = 0.25, shift = {-8, -8} @@ -4511,6 +4605,7 @@ data:extend({ }, enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "combustion", subgroup = "combustion", order = "nullius-eb", @@ -4533,10 +4628,10 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelspetrochem__/graphics/icons/molecules/methane.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", icon_size = 72, scale = 0.15, shift = {-11, -11} @@ -4544,6 +4639,7 @@ data:extend({ }, enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "combustion", subgroup = "combustion", order = "nullius-ec", @@ -4567,10 +4663,9 @@ data:extend({ icons = { { icon = "__base__/graphics/icons/fluid/steam.png", - icon_mipmaps = 4 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/ethylene.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/ethylene.png", icon_size = 72, scale = 0.2, shift = {-8, -8} @@ -4578,6 +4673,7 @@ data:extend({ }, enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "combustion", subgroup = "combustion", order = "nullius-fb", @@ -4600,10 +4696,10 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelspetrochem__/graphics/icons/molecules/propene.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/propene.png", icon_size = 72, scale = 0.2, shift = {-8, -8} @@ -4611,6 +4707,7 @@ data:extend({ }, enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "combustion", subgroup = "combustion", order = "nullius-fc", @@ -4633,11 +4730,10 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.5 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/benzene.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/benzene.png", icon_size = 72, scale = 0.2, shift = {-8, -8} @@ -4645,6 +4741,7 @@ data:extend({ }, enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "combustion", subgroup = "combustion", order = "nullius-fd", @@ -4667,11 +4764,10 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.5 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/methanol.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/methanol.png", icon_size = 72, scale = 0.2, shift = {-8, -8} @@ -4679,6 +4775,7 @@ data:extend({ }, enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "combustion", subgroup = "combustion", order = "nullius-fe", @@ -4701,18 +4798,18 @@ data:extend({ icons = { { icon = "__base__/graphics/icons/fluid/steam.png", - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/fluid/heavy-oil.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.25, shift = {-8, -8} } }, enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "combustion", subgroup = "combustion", order = "nullius-ff", @@ -4735,7 +4832,7 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.5 }, { @@ -4747,8 +4844,9 @@ data:extend({ }, enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "combustion", - subgroup = "boiling", + subgroup = "boiling", order = "nullius-g", energy_required = 1, ingredients = { @@ -4775,11 +4873,10 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.45 }, { - icon = "__base__/graphics/icons/coal-dark-background.png", + icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, scale = 0.27, shift = {-5, -5} @@ -4788,7 +4885,7 @@ data:extend({ enabled = false, allow_as_intermediate = false, category = "combustion", - subgroup = "boxed-organic-1", + subgroup = "boxed-organic-1", order = "nullius-dg", energy_required = 5, ingredients = { @@ -4809,22 +4906,20 @@ data:extend({ icons = { { icon = "__base__/graphics/icons/fluid/steam.png", - icon_size = 64, - icon_mipmaps = 4 + icon_size = 64, }, { - icon = "__angelssmelting__/graphics/icons/ingot-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-aluminium.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.3, + scale = 0.3, shift = {-7, -7} }, - { - icon = "__angelssmelting__/graphics/icons/solid-aluminium-hydroxide.png", + { + icon = "__angelssmeltinggraphics__/graphics/icons/solid-aluminium-hydroxide.png", icon_size = 32, - scale = 0.5, - shift = {7, 7} - } + scale = 0.5, + shift = {7, 7} + } }, enabled = false, category = "combustion", @@ -4833,15 +4928,16 @@ data:extend({ show_amount_in_title = false, always_show_products = true, allow_as_intermediate = false, + hide_from_signal_gui = false, energy_required = 1, ingredients = { {type="item", name="nullius-aluminum-powder", amount=8}, {type="fluid", name="nullius-water", amount=100} }, results = { - {type="item", name="nullius-aluminum-hydroxide", amount=1}, + {type="item", name="nullius-aluminum-hydroxide", amount=1}, {type="fluid", name="nullius-steam", amount=180}, - {type="fluid", name="nullius-hydrogen", amount=90} + {type="fluid", name="nullius-hydrogen", amount=90} } }, { @@ -4856,23 +4952,21 @@ data:extend({ }, { icon = "__base__/graphics/icons/fluid/steam.png", - icon_size = 64, - icon_mipmaps = 4, - scale = 0.45 + icon_size = 64, + scale = 0.45 }, { - icon = "__angelssmelting__/graphics/icons/ingot-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-aluminium.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.27, + scale = 0.27, shift = {-6, -6} }, - { - icon = "__angelssmelting__/graphics/icons/solid-aluminium-hydroxide.png", + { + icon = "__angelssmeltinggraphics__/graphics/icons/solid-aluminium-hydroxide.png", icon_size = 32, - scale = 0.45, - shift = {6, 6} - } + scale = 0.45, + shift = {6, 6} + } }, enabled = false, category = "combustion", @@ -4900,10 +4994,10 @@ data:extend({ { icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelspetrochem__/graphics/icons/molecules/methane.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", icon_size = 72, scale = 0.24, shift = {-8, -8} @@ -4911,6 +5005,7 @@ data:extend({ }, enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "wet-smelting", subgroup = "organic-material-1", order = "nullius-bd", @@ -4930,10 +5025,10 @@ data:extend({ { icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelspetrochem__/graphics/icons/molecules/methane.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", icon_size = 72, scale = 0.16, shift = {-10, -10} @@ -4964,11 +5059,10 @@ data:extend({ { icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/methane.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", icon_size = 72, scale = 0.21, shift = {-6, -6} @@ -5000,11 +5094,11 @@ data:extend({ { icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/methane.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", icon_size = 72, scale = 0.14, shift = {-8, -8} @@ -5036,17 +5130,17 @@ data:extend({ { icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", icon_size = 72, scale = 0.18, shift = {-7, -7} } }, enabled = false, + hide_from_signal_gui = false, category = "compression", subgroup = "boxed-organic-1", order = "nullius-bf", @@ -5064,15 +5158,16 @@ data:extend({ type = "recipe", name = "nullius-ethylene-pyrolysis", localised_name = {"recipe-name.nullius-ethylene-pyrolysis"}, - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/methane.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/benzene.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/propene.png", 72}}, - {element_tint["carbon"], element_tint["carbon"], element_tint["hydrogen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/ethylene.png", 72}} + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/benzene.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/propene.png", 72}}, + {element_tint["carbon"], element_tint["carbon"], element_tint["hydrogen"]}, + {{"__angelspetrochemgraphics__/graphics/icons/molecules/ethylene.png", 72}} ), enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "reforming", order = "nullius-pb", @@ -5091,15 +5186,16 @@ data:extend({ type = "recipe", name = "nullius-propene-pyrolysis", localised_name = {"recipe-name.nullius-propene-pyrolysis"}, - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/methane.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/benzene.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/ethylene.png", 72}}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/benzene.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/ethylene.png", 72}}, {element_tint["carbon"], element_tint["hydrogen"], element_tint["carbon"]}, - {{"__angelspetrochem__/graphics/icons/molecules/propene.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/propene.png", 72}} ), enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "reforming", order = "nullius-pc", @@ -5118,14 +5214,15 @@ data:extend({ type = "recipe", name = "nullius-methane-reforming", localised_name = {"recipe-name.nullius-reforming", {"fluid-name.nullius-methane"}}, - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/hydrogen.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", 72}}, {element_tint["hydrogen"], element_tint["carbon"], element_tint["oxygen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/methane.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", 72}} ), enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "reforming", order = "nullius-g", @@ -5144,15 +5241,16 @@ data:extend({ type = "recipe", name = "nullius-benzene-reforming", localised_name = {"recipe-name.nullius-reforming", {"fluid-name.nullius-benzene"}}, - icons = angelsmods.functions.create_gas_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/hydrogen.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", 72}}, + icons = angelsLegacy.functions.create_gas_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", 72}}, {element_tint["hydrogen"], element_tint["carbon"], element_tint["oxygen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/benzene.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/benzene.png", 72}} ), enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "reforming", order = "nullius-qb", @@ -5173,15 +5271,16 @@ data:extend({ name = "nullius-pressure-benzene-reforming", localised_name = {"recipe-name.nullius-pressure", {"recipe-name.nullius-reforming", {"fluid-name.nullius-benzene"}}}, - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/hydrogen.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72}, - {"__angelspetrochem__/graphics/icons/molecules/carbon-monoxide.png", 72}}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-dioxide.png", 72}, + {"__angelspetrochemgraphics__/graphics/icons/molecules/carbon-monoxide.png", 72}}, {element_tint["hydrogen"], element_tint["carbon"], element_tint["oxygen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/benzene.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/benzene.png", 72}} ), enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "distillation", subgroup = "reforming", order = "nullius-qc", @@ -5274,10 +5373,11 @@ data:extend({ name = "nullius-canister-emptying", icon = ICONPATH .. "canister-water.png", icon_size = 64, - enabled = false, - no_productivity = true, - category = "nullius-unbarrel", - subgroup = "canister-emptying", + enabled = false, + no_productivity = true, + hide_from_signal_gui = false, -- maybe remove it + category = "nullius-unbarrel", + subgroup = "canister-emptying", order = "nullius-e", energy_required = 0.2, ingredients = { @@ -5304,7 +5404,7 @@ data:extend({ } }, enabled = false, - no_productivity = true, + no_productivity = true, category = "nullius-unbarrel", subgroup = "boxed-canister", order = "nullius-h", @@ -5321,13 +5421,14 @@ data:extend({ { type = "recipe", name = "nullius-hydrogen-canister-1", + localised_name = {"item-name.nullius-hydrogen-canister"}, icons = { { icon = ICONPATH .. "canister-hydrogen.png", icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", icon_size = 72, scale = 0.21, shift = {10, -10} @@ -5349,7 +5450,9 @@ data:extend({ {type="fluid", name="nullius-hydrogen", amount=300, fluidbox_index=1}, {type="fluid", name="nullius-oxygen", amount=150, fluidbox_index=2} }, - result = "nullius-hydrogen-canister" + results = { + {type = "item", name = "nullius-hydrogen-canister", amount = 1} + } }, { type = "recipe", @@ -5365,7 +5468,7 @@ data:extend({ scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", icon_size = 72, scale = 0.18, shift = {9, -9} @@ -5388,7 +5491,9 @@ data:extend({ {type="fluid", name="nullius-hydrogen", amount=1500, fluidbox_index=1}, {type="fluid", name="nullius-oxygen", amount=750, fluidbox_index=2} }, - result = "nullius-box-hydrogen-canister" + results = { + {type = "item", name = "nullius-box-hydrogen-canister", amount = 1} + } }, { type = "recipe", @@ -5400,7 +5505,7 @@ data:extend({ icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", icon_size = 72, scale = 0.15, shift = {11, -11} @@ -5409,6 +5514,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "basic-chemistry", order = "nullius-dc", crafting_machine_tint = { @@ -5422,7 +5528,9 @@ data:extend({ {type="fluid", name="nullius-compressed-hydrogen", amount=70, fluidbox_index=1}, {type="fluid", name="nullius-compressed-oxygen", amount=35, fluidbox_index=2} }, - result = "nullius-hydrogen-canister" + results = { + {type = "item", name = "nullius-hydrogen-canister", amount = 1} + } }, { type = "recipe", @@ -5440,7 +5548,7 @@ data:extend({ scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", icon_size = 72, scale = 0.13, shift = {10, -10} @@ -5463,19 +5571,22 @@ data:extend({ {type="fluid", name="nullius-compressed-hydrogen", amount=350, fluidbox_index=1}, {type="fluid", name="nullius-compressed-oxygen", amount=175, fluidbox_index=2} }, - result = "nullius-box-hydrogen-canister" + results = { + {type = "item", name = "nullius-box-hydrogen-canister", amount = 1} + } }, { type = "recipe", name = "nullius-methanol-canister-1", + localised_name = {"item-name.nullius-methanol-canister"}, icons = { { icon = ICONPATH .. "canister-methanol.png", icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/methanol.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/methanol.png", icon_size = 72, scale = 0.21, shift = {10, -10} @@ -5498,7 +5609,9 @@ data:extend({ {type="fluid", name="nullius-oxygen", amount=420}, {type="fluid", name="nullius-benzene", amount=3} }, - result = "processed-fuel" + results = { + {type = "item", name = "processed-fuel", amount = 1} + } }, { type = "recipe", @@ -5514,7 +5627,7 @@ data:extend({ scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/methanol.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/methanol.png", icon_size = 72, scale = 0.18, shift = {9, -9} @@ -5538,7 +5651,9 @@ data:extend({ {type="fluid", name="nullius-oxygen", amount=2100}, {type="fluid", name="nullius-benzene", amount=15} }, - result = "nullius-box-methanol-canister" + results = { + {type = "item", name = "nullius-box-methanol-canister", amount = 1} + } }, { type = "recipe", @@ -5550,7 +5665,7 @@ data:extend({ icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/methanol.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/methanol.png", icon_size = 72, scale = 0.15, shift = {11, -11} @@ -5559,6 +5674,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "basic-chemistry", order = "nullius-ec", crafting_machine_tint = { @@ -5573,7 +5689,9 @@ data:extend({ {type="fluid", name="nullius-compressed-oxygen", amount=95}, {type="fluid", name="nullius-benzene", amount=2} }, - result = "processed-fuel" + results = { + {type = "item", name = "processed-fuel", amount = 1} + } }, { type = "recipe", @@ -5590,7 +5708,7 @@ data:extend({ scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/methanol.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/methanol.png", icon_size = 72, scale = 0.13, shift = {10, -10} @@ -5614,7 +5732,9 @@ data:extend({ {type="fluid", name="nullius-compressed-oxygen", amount=475}, {type="fluid", name="nullius-benzene", amount=10} }, - result = "nullius-box-methanol-canister" + results = { + {type = "item", name = "nullius-box-methanol-canister", amount = 1} + } }, { type = "recipe", @@ -5631,7 +5751,9 @@ data:extend({ {type="fluid", name="nullius-biodiesel", amount=25}, {type="fluid", name="nullius-compressed-oxygen", amount=120} }, - result = "nullius-biodiesel-canister" + results = { + {type = "item", name = "nullius-biodiesel-canister", amount = 1} + } }, { type = "recipe", @@ -5649,28 +5771,31 @@ data:extend({ {type="fluid", name="nullius-biodiesel", amount=125}, {type="fluid", name="nullius-compressed-oxygen", amount=600} }, - result = "nullius-box-biodiesel-canister" + results = { + {type = "item", name = "nullius-box-biodiesel-canister", amount = 1} + } }, { type = "recipe", name = "nullius-hydrogen-canister-flushing", - localised_name = {"recipe-name.nullius-flushing", + localised_name = {"recipe-name.nullius-flushing", {"item-name.nullius-hydrogen-canister"}}, - icons = { + icons = { { icon = ICONPATH .. "canister-empty.png", icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", icon_size = 72, scale = 0.25, shift = {-8, 8} } }, enabled = false, - no_productivity = true, + no_productivity = true, + hide_from_signal_gui = false, category = "nullius-unbarrel", subgroup = "canister-emptying", order = "nullius-fb", @@ -5686,22 +5811,22 @@ data:extend({ { type = "recipe", name = "nullius-methanol-canister-flushing", - localised_name = {"recipe-name.nullius-flushing", + localised_name = {"recipe-name.nullius-flushing", {"item-name.nullius-methanol-canister"}}, - icons = { + icons = { { icon = ICONPATH .. "canister-empty.png", icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/methanol.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/methanol.png", icon_size = 72, scale = 0.25, shift = {-8, 8} } }, enabled = false, - no_productivity = true, + no_productivity = true, category = "nullius-unbarrel", subgroup = "canister-emptying", order = "nullius-fc", @@ -5717,9 +5842,9 @@ data:extend({ { type = "recipe", name = "nullius-biodiesel-canister-flushing", - localised_name = {"recipe-name.nullius-flushing", + localised_name = {"recipe-name.nullius-flushing", {"item-name.nullius-biodiesel-canister"}}, - icons = { + icons = { { icon = ICONPATH .. "canister-empty.png", icon_size = 64 @@ -5727,13 +5852,14 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/heavy-oil.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.26, shift = {-4, 6} } }, enabled = false, - no_productivity = true, + no_productivity = true, + hide_from_signal_gui = false, category = "nullius-unbarrel", subgroup = "canister-emptying", order = "nullius-fd", @@ -5750,6 +5876,7 @@ data:extend({ { type = "recipe", name = "nullius-rocket-fuel", + localised_name = {"item-name.rocket-fuel"}, enabled = false, show_amount_in_title = false, always_show_products = true, @@ -5878,7 +6005,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, - hide_from_stats = true, + hide_from_stats = true, category = "compression", energy_required = 1, ingredients = { @@ -5895,7 +6022,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, - hide_from_stats = true, + hide_from_stats = true, category = "compression", energy_required = 1, ingredients = { @@ -5912,7 +6039,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, - hide_from_stats = true, + hide_from_stats = true, category = "compression", energy_required = 1, ingredients = { @@ -5929,7 +6056,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, - hide_from_stats = true, + hide_from_stats = true, category = "compression", energy_required = 1, ingredients = { @@ -5946,7 +6073,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, - hide_from_stats = true, + hide_from_stats = true, category = "compression", energy_required = 1, ingredients = { @@ -5963,7 +6090,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, - hide_from_stats = true, + hide_from_stats = true, category = "compression", energy_required = 1, ingredients = { @@ -5980,7 +6107,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, - hide_from_stats = true, + hide_from_stats = true, category = "compression", energy_required = 1, ingredients = { @@ -5997,7 +6124,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, - hide_from_stats = true, + hide_from_stats = true, category = "compression", energy_required = 1, ingredients = { @@ -6014,7 +6141,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, - hide_from_stats = true, + hide_from_stats = true, category = "compression", energy_required = 1, ingredients = { @@ -6031,7 +6158,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, - hide_from_stats = true, + hide_from_stats = true, category = "compression", energy_required = 1, ingredients = { @@ -6048,7 +6175,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, - hide_from_stats = true, + hide_from_stats = true, category = "compression", energy_required = 1, ingredients = { @@ -6064,8 +6191,8 @@ data:extend({ type = "recipe", name = "nullius-decompress-air", localised_name = {"recipe-name.nullius-decompress-air"}, - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelsrefining__/graphics/icons/barreling-pump.png", 32 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelsrefininggraphics__/graphics/icons/barreling-pump.png", 32 }, {element_tint["air"], element_tint["residual"], element_tint["air"]} ), enabled = false, @@ -6073,7 +6200,7 @@ data:extend({ always_show_products = true, allow_decomposition = false, allow_as_intermediate = false, - hide_from_stats = true, + hide_from_stats = true, category = "decompression", subgroup = "decompression", order = "nullius-bb", @@ -6090,8 +6217,8 @@ data:extend({ type = "recipe", name = "nullius-decompress-nitrogen", localised_name = {"recipe-name.nullius-decompress-nitrogen"}, - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelsrefining__/graphics/icons/barreling-pump.png", 32 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelsrefininggraphics__/graphics/icons/barreling-pump.png", 32 }, {element_tint["nitrogen"], element_tint["nitrogen"], element_tint["nitrogen"]} ), enabled = false, @@ -6099,7 +6226,8 @@ data:extend({ always_show_products = true, allow_decomposition = false, allow_as_intermediate = false, - hide_from_stats = true, + hide_from_stats = true, + hide_from_signal_gui = false, category = "decompression", subgroup = "decompression", order = "nullius-c", @@ -6116,8 +6244,8 @@ data:extend({ type = "recipe", name = "nullius-decompress-argon", localised_name = {"recipe-name.nullius-decompress-argon"}, - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelsrefining__/graphics/icons/barreling-pump.png", 32 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelsrefininggraphics__/graphics/icons/barreling-pump.png", 32 }, {element_tint["argon"], element_tint["argon"], element_tint["argon"]} ), enabled = false, @@ -6125,7 +6253,7 @@ data:extend({ always_show_products = true, allow_decomposition = false, allow_as_intermediate = false, - hide_from_stats = true, + hide_from_stats = true, category = "decompression", subgroup = "decompression", order = "nullius-d", @@ -6142,8 +6270,8 @@ data:extend({ type = "recipe", name = "nullius-decompress-helium", localised_name = {"recipe-name.nullius-decompress-helium"}, - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelsrefining__/graphics/icons/barreling-pump.png", 32 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelsrefininggraphics__/graphics/icons/barreling-pump.png", 32 }, {element_tint["helium"], element_tint["helium"], element_tint["helium"]} ), enabled = false, @@ -6151,7 +6279,7 @@ data:extend({ always_show_products = true, allow_decomposition = false, allow_as_intermediate = false, - hide_from_stats = true, + hide_from_stats = true, category = "decompression", subgroup = "decompression", order = "nullius-e", @@ -6168,8 +6296,8 @@ data:extend({ type = "recipe", name = "nullius-decompress-hydrogen", localised_name = {"recipe-name.nullius-decompress-hydrogen"}, - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelsrefining__/graphics/icons/barreling-pump.png", 32 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelsrefininggraphics__/graphics/icons/barreling-pump.png", 32 }, {element_tint["hydrogen"], element_tint["hydrogen"], element_tint["hydrogen"]} ), enabled = false, @@ -6177,7 +6305,8 @@ data:extend({ always_show_products = true, allow_decomposition = false, allow_as_intermediate = false, - hide_from_stats = true, + hide_from_stats = true, + hide_from_signal_gui = false, category = "decompression", subgroup = "decompression", order = "nullius-f", @@ -6194,8 +6323,8 @@ data:extend({ type = "recipe", name = "nullius-decompress-oxygen", localised_name = {"recipe-name.nullius-decompress-oxygen"}, - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelsrefining__/graphics/icons/barreling-pump.png", 32 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelsrefininggraphics__/graphics/icons/barreling-pump.png", 32 }, {element_tint["oxygen"], element_tint["oxygen"], element_tint["oxygen"]} ), enabled = false, @@ -6203,7 +6332,7 @@ data:extend({ always_show_products = true, allow_decomposition = false, allow_as_intermediate = false, - hide_from_stats = true, + hide_from_stats = true, category = "decompression", subgroup = "decompression", order = "nullius-g", @@ -6220,8 +6349,8 @@ data:extend({ type = "recipe", name = "nullius-decompress-carbon-dioxide", localised_name = {"recipe-name.nullius-decompress-carbon-dioxide"}, - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelsrefining__/graphics/icons/barreling-pump.png", 32 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelsrefininggraphics__/graphics/icons/barreling-pump.png", 32 }, {element_tint["carbon"], element_tint["oxygen"], element_tint["oxygen"]} ), enabled = false, @@ -6229,9 +6358,9 @@ data:extend({ always_show_products = true, allow_decomposition = false, allow_as_intermediate = false, - hide_from_stats = true, + hide_from_stats = true, category = "decompression", - subgroup = "compression", + subgroup = "compression", order = "nullius-pb", energy_required = 1, ingredients = { @@ -6246,8 +6375,8 @@ data:extend({ type = "recipe", name = "nullius-decompress-carbon-monoxide", localised_name = {"recipe-name.nullius-decompress-carbon-monoxide"}, - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelsrefining__/graphics/icons/barreling-pump.png", 32 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelsrefininggraphics__/graphics/icons/barreling-pump.png", 32 }, {element_tint["carbon"], element_tint["carbon"], element_tint["oxygen"]} ), enabled = false, @@ -6255,7 +6384,7 @@ data:extend({ always_show_products = true, allow_decomposition = false, allow_as_intermediate = false, - hide_from_stats = true, + hide_from_stats = true, category = "decompression", subgroup = "compression", order = "nullius-pc", @@ -6272,8 +6401,8 @@ data:extend({ type = "recipe", name = "nullius-decompress-methane", localised_name = {"recipe-name.nullius-decompress-methane"}, - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelsrefining__/graphics/icons/barreling-pump.png", 32 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelsrefininggraphics__/graphics/icons/barreling-pump.png", 32 }, {element_tint["carbon"], element_tint["hydrogen"], element_tint["hydrogen"]} ), enabled = false, @@ -6281,9 +6410,9 @@ data:extend({ always_show_products = true, allow_decomposition = false, allow_as_intermediate = false, - hide_from_stats = true, + hide_from_stats = true, category = "decompression", - subgroup = "compression", + subgroup = "compression", order = "nullius-pd", energy_required = 1, ingredients = { @@ -6299,8 +6428,8 @@ data:extend({ type = "recipe", name = "nullius-decompress-residual-gas", localised_name = {"recipe-name.nullius-decompression", {"fluid-name.nullius-residual-gas"}}, - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelsrefining__/graphics/icons/barreling-pump.png", 32 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelsrefininggraphics__/graphics/icons/barreling-pump.png", 32 }, {element_tint["residual"], element_tint["trace"], element_tint["residual"]} ), enabled = false, @@ -6308,7 +6437,7 @@ data:extend({ always_show_products = true, allow_decomposition = false, allow_as_intermediate = false, - hide_from_stats = true, + hide_from_stats = true, category = "decompression", subgroup = "decompression", order = "nullius-bc", @@ -6325,8 +6454,8 @@ data:extend({ type = "recipe", name = "nullius-decompress-trace-gas", localised_name = {"recipe-name.nullius-decompression", {"fluid-name.nullius-trace-gas"}}, - icons = angelsmods.functions.create_gas_fluid_icon( - {"__angelsrefining__/graphics/icons/barreling-pump.png", 32 }, + icons = angelsLegacy.functions.create_gas_fluid_icon( + {"__angelsrefininggraphics__/graphics/icons/barreling-pump.png", 32 }, {element_tint["trace"], element_tint["volcanic"], element_tint["trace"]} ), enabled = false, @@ -6334,7 +6463,7 @@ data:extend({ always_show_products = true, allow_decomposition = false, allow_as_intermediate = false, - hide_from_stats = true, + hide_from_stats = true, category = "decompression", subgroup = "decompression", order = "nullius-bd", @@ -6369,6 +6498,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "nullius-water-treatment", subgroup = "waste-management", order = "nullius-cb", @@ -6402,6 +6532,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "nullius-water-treatment", subgroup = "waste-management", order = "nullius-cc", @@ -6435,6 +6566,7 @@ data:extend({ enabled = false, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "nullius-water-treatment", subgroup = "waste-management", order = "nullius-d", @@ -6459,13 +6591,14 @@ data:extend({ icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-chloride.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen-chloride.png", icon_size = 72, scale = 0.14, shift = {-12, -10} } }, enabled = false, + hide_from_signal_gui = false, category = "ore-flotation", subgroup = "waste-management", order = "nullius-bb", @@ -6483,7 +6616,7 @@ data:extend({ { type = "recipe", name = "nullius-boxed-sludge-1", - localised_name = {"recipe-name.nullius-boxed", {"", {"fluid-name.nullius-sludge"}, " ", 1}}, + localised_name = {"recipe-name.nullius-boxed", {"", {"fluid-name.nullius-sludge"}, " ", tostring(1)}}, icons = { { icon = ICONPATH .. "crate.png", @@ -6495,7 +6628,7 @@ data:extend({ scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-chloride.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen-chloride.png", icon_size = 72, scale = 0.12, shift = {-11, -9} @@ -6526,13 +6659,14 @@ data:extend({ icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/sulfuric-acid.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/sulfuric-acid.png", icon_size = 72, scale = 0.16, shift = {-12, -10} } }, enabled = false, + hide_from_signal_gui = false, category = "ore-flotation", subgroup = "waste-management", order = "nullius-bc", @@ -6550,7 +6684,7 @@ data:extend({ { type = "recipe", name = "nullius-boxed-sludge-2", - localised_name = {"recipe-name.nullius-boxed", {"", {"fluid-name.nullius-sludge"}, " ", 2}}, + localised_name = {"recipe-name.nullius-boxed", {"", {"fluid-name.nullius-sludge"}, " ", tostring(2)}}, icons = { { icon = ICONPATH .. "crate.png", @@ -6562,7 +6696,7 @@ data:extend({ scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/sulfuric-acid.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/sulfuric-acid.png", icon_size = 72, scale = 0.14, shift = {-11, -9} @@ -6589,7 +6723,7 @@ data:extend({ name = "nullius-plastic", icon = "__base__/graphics/icons/plastic-bar.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "organic-material-2", order = "nullius-b", stack_size = 100 @@ -6602,10 +6736,10 @@ data:extend({ { icon = "__base__/graphics/icons/plastic-bar.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelspetrochem__/graphics/icons/molecules/chlorine.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/chlorine.png", icon_size = 72, scale = 0.2, shift = {9, -10} @@ -6637,10 +6771,10 @@ data:extend({ { icon = "__base__/graphics/icons/plastic-bar.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelspetrochem__/graphics/icons/molecules/propene.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/propene.png", icon_size = 72, scale = 0.2, shift = {9, -10} @@ -6660,8 +6794,9 @@ data:extend({ {type="fluid", name="nullius-propene", amount=45}, {type="fluid", name="nullius-ethylene", amount=5} }, - result = "nullius-plastic", - result_count = 4 + results = { + {type = "item", name = "nullius-plastic", amount = 4} + } }, { type = "recipe", @@ -6671,10 +6806,10 @@ data:extend({ { icon = "__base__/graphics/icons/plastic-bar.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelspetrochem__/graphics/icons/molecules/styrene.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/styrene.png", icon_size = 72, scale = 0.2, shift = {10, -9} @@ -6682,6 +6817,7 @@ data:extend({ }, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, enabled = false, category = "basic-chemistry", order = "nullius-be", @@ -6696,8 +6832,9 @@ data:extend({ {type="fluid", name="nullius-styrene", amount=4}, {type="fluid", name="nullius-acrylonitrile", amount=3} }, - result = "nullius-plastic", - result_count = 8 + results = { + {type = "item", name = "nullius-plastic", amount = 8} + } }, { type = "recipe", @@ -6711,11 +6848,10 @@ data:extend({ { icon = "__base__/graphics/icons/plastic-bar.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.45 + scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/styrene.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/styrene.png", icon_size = 72, scale = 0.18, shift = {9, -8} @@ -6738,8 +6874,9 @@ data:extend({ {type="fluid", name="nullius-styrene", amount=20}, {type="fluid", name="nullius-acrylonitrile", amount=15} }, - result = "nullius-box-plastic", - result_count = 8 + results = { + {type = "item", name = "nullius-box-plastic", amount = 8} + } }, { type = "recipe", @@ -6749,10 +6886,10 @@ data:extend({ { icon = "__base__/graphics/icons/plastic-bar.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelspetrochem__/graphics/icons/molecules/ethylene.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/ethylene.png", icon_size = 72, scale = 0.2, shift = {10, -9} @@ -6760,6 +6897,7 @@ data:extend({ }, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, enabled = false, category = "basic-chemistry", order = "nullius-bd", @@ -6778,8 +6916,7 @@ data:extend({ {type="item", name="nullius-plastic", amount=45}, {type="fluid", name="nullius-sludge", amount=40} }, - main_product = "nullius-plastic", - result_count = 45 + main_product = "nullius-plastic" }, { type = "recipe", @@ -6793,11 +6930,10 @@ data:extend({ { icon = "__base__/graphics/icons/plastic-bar.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.45 + scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/ethylene.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/ethylene.png", icon_size = 72, scale = 0.18, shift = {9, -8} @@ -6825,7 +6961,6 @@ data:extend({ {type="fluid", name="nullius-sludge", amount=40} }, main_product = "nullius-box-plastic", - result_count = 9 }, { type = "recipe", @@ -6835,10 +6970,10 @@ data:extend({ { icon = "__base__/graphics/icons/plastic-bar.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelspetrochem__/graphics/icons/molecules/ethylene.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/ethylene.png", icon_size = 72, scale = 0.2, shift = {10, -9} @@ -6868,7 +7003,6 @@ data:extend({ {type="fluid", name="nullius-sludge", amount=40} }, main_product = "nullius-plastic", - result_count = 40 }, { type = "recipe", @@ -6882,11 +7016,11 @@ data:extend({ { icon = "__base__/graphics/icons/plastic-bar.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/ethylene.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/ethylene.png", icon_size = 72, scale = 0.18, shift = {9, -8} @@ -6917,7 +7051,6 @@ data:extend({ {type="fluid", name="nullius-sludge", amount=40} }, main_product = "nullius-box-plastic", - result_count = 8 }, { @@ -7004,13 +7137,14 @@ data:extend({ type = "recipe", name = "nullius-pressure-solvent", localised_name = {"recipe-name.nullius-pressure-solvent"}, - icons = angelsmods.functions.create_liquid_recipe_icon(nil, + icons = angelsLegacy.functions.create_liquid_recipe_icon(nil, {element_tint["solvent"], element_tint["solvent"], element_tint["solvent"]}, nil ), enabled = false, + hide_from_signal_gui = false, category = "basic-chemistry", - subgroup = "organic-chemistry", + subgroup = "organic-chemistry", order = "nullius-ic", crafting_machine_tint = { primary = data.raw.fluid["nullius-methane"].flow_color, @@ -7033,7 +7167,7 @@ data:extend({ type = "item", name = "nullius-bpa", icons = {{ - icon = "__angelsrefining__/graphics/icons/solid-salt.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-salt.png", icon_size = 32, tint = {1, 0.95, 0.9, 0.6} }}, @@ -7070,12 +7204,12 @@ data:extend({ name = "nullius-pressure-bpa", icons = { { - icon = "__angelsrefining__/graphics/icons/solid-salt.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-salt.png", icon_size = 32, tint = {1, 0.95, 0.9, 0.6} }, { - icon = "__angelspetrochem__/graphics/icons/molecules/oxygen.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/oxygen.png", icon_size = 72, scale = 0.22, shift = {9, -12} @@ -7083,6 +7217,7 @@ data:extend({ }, enabled = false, allow_as_intermediate = false, + hide_from_signal_gui = false, category = "basic-chemistry", subgroup = "organic-material-1", order = "nullius-cc", @@ -7137,13 +7272,13 @@ data:extend({ icon_size = 64 }, { - icon = "__angelsrefining__/graphics/icons/solid-salt.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-salt.png", icon_size = 32, tint = {1, 0.95, 0.9, 0.6}, scale = 0.9 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/oxygen.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/oxygen.png", icon_size = 72, scale = 0.18, shift = {7, -10} @@ -7174,10 +7309,10 @@ data:extend({ { type = "recipe", name = "nullius-ech", - localised_name = {"", {"fluid-name.nullius-ech"}, " ", 1}, + localised_name = {"", {"fluid-name.nullius-ech"}, " ", tostring(1)}, enabled = false, category = "basic-chemistry", - subgroup = "chlorine-chemistry", + subgroup = "chlorine-chemistry", order = "nullius-hb", crafting_machine_tint = { primary = data.raw.fluid["nullius-propene"].flow_color, @@ -7200,7 +7335,7 @@ data:extend({ name = "nullius-glycerol", enabled = false, category = "basic-chemistry", - subgroup = "chlorine-chemistry", + subgroup = "chlorine-chemistry", order = "nullius-i", crafting_machine_tint = { primary = data.raw.fluid["nullius-ech"].flow_color, @@ -7228,7 +7363,7 @@ data:extend({ icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/glycerol.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/glycerol.png", icon_size = 72, scale = 0.4 } @@ -7256,15 +7391,16 @@ data:extend({ { type = "recipe", name = "nullius-glycerol-to-ech", - localised_name = {"", {"fluid-name.nullius-ech"}, " ", 2}, - icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__angelspetrochem__/graphics/icons/molecules/epichlorohydrin.png", 72}}, + localised_name = {"", {"fluid-name.nullius-ech"}, " ", tostring(2)}, + icons = angelsLegacy.functions.create_liquid_recipe_icon( + {{"__angelspetrochemgraphics__/graphics/icons/molecules/epichlorohydrin.png", 72}}, {element_tint["carbon"], element_tint["chlorine"], element_tint["oxygen"]}, - {{"__angelspetrochem__/graphics/icons/molecules/glycerol.png", 72}} + {{"__angelspetrochemgraphics__/graphics/icons/molecules/glycerol.png", 72}} ), enabled = false, + hide_from_signal_gui = false, category = "basic-chemistry", - subgroup = "chlorine-chemistry", + subgroup = "chlorine-chemistry", order = "nullius-hc", crafting_machine_tint = { primary = data.raw.fluid["nullius-glycerol"].flow_color, @@ -7346,7 +7482,7 @@ data:extend({ localised_name = {"recipe-name.nullius-limestone-recovery"}, icons = { { - icon = "__angelsrefining__/graphics/icons/solid-limestone.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-limestone.png", icon_size = 32 }, { @@ -7359,8 +7495,9 @@ data:extend({ enabled = false, allow_as_intermediate = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "ore-flotation", - subgroup = "ore-recovery", + subgroup = "ore-recovery", order = "nullius-oe", energy_required = 20, ingredients = { @@ -7381,7 +7518,7 @@ data:extend({ localised_name = {"recipe-name.nullius-iron-recovery"}, icons = { { - icon = "__angelsrefining__/graphics/icons/iron-pebbles.png", + icon = "__angelsrefininggraphics__/graphics/icons/iron-pebbles.png", icon_size = 32 }, { @@ -7394,6 +7531,7 @@ data:extend({ enabled = false, allow_as_intermediate = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "ore-flotation", subgroup = "ore-recovery", order = "nullius-ob", @@ -7415,7 +7553,7 @@ data:extend({ localised_name = {"recipe-name.nullius-bauxite-recovery"}, icons = { { - icon = "__angelsrefining__/graphics/icons/crushed/crushed-6.png", + icon = "__angelsrefininggraphics__/graphics/icons/crushed/crushed-6.png", icon_size = 64, tint = {0.867, 0.820, 0.609} }, @@ -7429,8 +7567,9 @@ data:extend({ enabled = false, allow_as_intermediate = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "ore-flotation", - subgroup = "ore-recovery", + subgroup = "ore-recovery", order = "nullius-oc", energy_required = 20, ingredients = { @@ -7464,8 +7603,9 @@ data:extend({ enabled = false, allow_as_intermediate = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "ore-flotation", - subgroup = "ore-recovery", + subgroup = "ore-recovery", order = "nullius-od", energy_required = 20, ingredients = { @@ -7488,7 +7628,7 @@ data:extend({ { icon = "__base__/graphics/icons/stone.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = FLUIDPATH .. "sludge.png", @@ -7500,8 +7640,9 @@ data:extend({ enabled = false, allow_as_intermediate = false, allow_decomposition = false, + hide_from_signal_gui = false, category = "ore-flotation", - subgroup = "ore-recovery", + subgroup = "ore-recovery", order = "nullius-of", energy_required = 30, ingredients = { @@ -7585,7 +7726,7 @@ data:extend({ fuel_value = "1GJ", fuel_acceleration_multiplier = 1.6, fuel_top_speed_multiplier = 1.3, - fuel_glow_color = {r=0.8, g=0.7, b=0, a=1}, + fuel_glow_color = {r=0.8, g=0.7, b=0, a=1}, subgroup = "nuclear", order = "nullius-can", stack_size = 20 @@ -7600,7 +7741,7 @@ data:extend({ fuel_value = "3GJ", fuel_acceleration_multiplier = 2, fuel_top_speed_multiplier = 1.5, - fuel_glow_color = {r=0.9, g=0, b=0.8, a=1}, + fuel_glow_color = {r=0.9, g=0, b=0.8, a=1}, subgroup = "nuclear", order = "nullius-cb", stack_size = 20 @@ -7651,7 +7792,9 @@ data:extend({ {type="fluid", name="nullius-compressed-hydrogen", amount=50}, {type="item", name="nullius-boron", amount=5} }, - result = "nullius-aneutronic-cell" + results = { + {type = "item", name = "nullius-aneutronic-cell", amount = 1} + } }, { type = "recipe", @@ -7670,16 +7813,23 @@ data:extend({ {type="fluid", name="nullius-deuterium", amount=7}, {type="fluid", name="nullius-tritium", amount=4} }, - result = "nullius-fusion-cell" + results = { + {type = "item", name = "nullius-fusion-cell", amount = 1} + } }, { type = "recipe", name = "nullius-fusion-recycling", - icon = ICONPATH .. "fusion-spent.png", - icon_size = 64, + icons = add_recipe_gear_icon({ + { + icon = ICONPATH .. "fusion-spent.png", + icon_size = 64 + }, + }), enabled = false, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "basic-chemistry", subgroup = "nuclear", order = "nullius-cc", @@ -7714,16 +7864,23 @@ data:extend({ {type="fluid", name="nullius-deuterium", amount=12}, {type="fluid", name="nullius-compressed-helium", amount=10} }, - result = "nullius-breeder-cell" + results = { + {type = "item", name = "nullius-breeder-cell", amount = 1} + } }, { type = "recipe", name = "nullius-breeder-recycling", - icon = ICONPATH .. "breeder-spent.png", - icon_size = 64, + icons = add_recipe_gear_icon({ + { + icon = ICONPATH .. "breeder-spent.png", + icon_size = 64 + }, + }), enabled = false, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "distillation", subgroup = "nuclear", order = "nullius-dc", diff --git a/nullius/prototypes/item/intermediate.lua b/nullius/prototypes/item/intermediate.lua index 116c68c..cdeb50e 100644 --- a/nullius/prototypes/item/intermediate.lua +++ b/nullius/prototypes/item/intermediate.lua @@ -7,7 +7,7 @@ data:extend({ type = "item", name = "nullius-bauxite", icons = {{ - icon = "__angelssmelting__/graphics/icons/ore-bauxite.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ore-bauxite.png", icon_size = 32 }}, subgroup = "aluminum-ingot", @@ -18,7 +18,7 @@ data:extend({ type = "item", name = "nullius-sandstone", icons = {{ - icon = "__angelsrefining__/graphics/icons/angels-ore6/angels-ore6-2.png", + icon = "__angelsrefininggraphics__/graphics/icons/angels-ore6/angels-ore6-2.png", icon_size = 64, tint = {184, 125, 73} }}, @@ -30,7 +30,7 @@ data:extend({ type = "item", name = "nullius-limestone", icons = {{ - icon = "__angelsrefining__/graphics/icons/angels-ore6/angels-ore6-3.png", + icon = "__angelsrefininggraphics__/graphics/icons/angels-ore6/angels-ore6-3.png", icon_size = 64, tint = {0.898, 0.773, 0.688} }}, @@ -43,7 +43,7 @@ data:extend({ name = "nullius-gypsum", icons = { { - icon = "__angelsrefining__/graphics/icons/crushed/crushed-4.png", + icon = "__angelsrefininggraphics__/graphics/icons/crushed/crushed-4.png", icon_size = 64, tint = {1, 1, 0.8} } @@ -57,7 +57,7 @@ data:extend({ name = "nullius-graphite", icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "organic-material-1", order = "nullius-b", stack_size = 100 @@ -71,10 +71,10 @@ data:extend({ { icon = ICONPATH .. "checkpoint.png", icon_size = 64, - icon_mipmaps = 4 + } }, - flags = {"hidden"}, + hidden = true, subgroup = "other", stack_size = 1, durability = 1, @@ -89,10 +89,10 @@ data:extend({ { icon = "__base__/graphics/icons/construction-robot.png", icon_size = 64, - icon_mipmaps = 4 + } }, - flags = {"hidden"}, + hidden = true, subgroup = "other", stack_size = 1, durability = 1, @@ -109,7 +109,7 @@ data:extend({ icon_size = 64 } }, - flags = {"hidden"}, + hidden = true, subgroup = "other", stack_size = 1, durability = 1, @@ -125,12 +125,12 @@ data:extend({ { icon = "__base__/graphics/icons/utility-science-pack.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/stone.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.25, shift = {0, 7}, tint = {r=0.6, g=0.4, b=0.2, a=0.75} @@ -145,7 +145,7 @@ data:extend({ { type = "recipe", name = "nullius-geology-pack-1", - localised_name = {"", {"item-name.nullius-geology-pack"}, " ", 1}, + localised_name = {"", {"item-name.nullius-geology-pack"}, " ", tostring(1)}, show_amount_in_title = false, always_show_products = true, always_show_made_in = true, @@ -153,24 +153,27 @@ data:extend({ category = "small-crafting", energy_required = 30, ingredients = { - {"nullius-bauxite", 4}, - {"nullius-sandstone", 4}, - {"iron-ore", 4} + {type = "item", name = "nullius-bauxite", amount = 4}, + {type = "item", name = "nullius-sandstone", amount = 4}, + {type = "item", name = "iron-ore", amount = 4} }, - result = "nullius-geology-pack" + results = { + {type = "item", name = "nullius-geology-pack", amount = 1} + } }, { type = "recipe", name = "nullius-geology-pack-2", - localised_name = {"", {"item-name.nullius-geology-pack"}, " ", 2}, + localised_name = {"", {"item-name.nullius-geology-pack"}, " ", tostring(2)}, + hide_from_signal_gui = false, icons = { { icon = "__base__/graphics/icons/utility-science-pack.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelsrefining__/graphics/icons/iron-pebbles.png", + icon = "__angelsrefininggraphics__/graphics/icons/iron-pebbles.png", icon_size = 32, scale = 0.55, shift = {0, 6}, @@ -185,13 +188,15 @@ data:extend({ subgroup = "research-pack-2", energy_required = 8, ingredients = { - {"nullius-crushed-iron-ore", 1}, - {"nullius-crushed-bauxite", 1}, - {"nullius-crushed-limestone", 1}, - {"nullius-sand", 1}, - {"nullius-mineral-dust", 4} + {type = "item", name = "nullius-crushed-iron-ore", amount = 1}, + {type = "item", name = "nullius-crushed-bauxite", amount = 1}, + {type = "item", name = "nullius-crushed-limestone", amount = 1}, + {type = "item", name = "nullius-sand", amount = 1}, + {type = "item", name = "nullius-mineral-dust", amount = 4} }, - result = "nullius-geology-pack" + results = { + {type = "item", name = "nullius-geology-pack", amount = 1} + } }, { type = "recipe", @@ -199,18 +204,21 @@ data:extend({ show_amount_in_title = false, always_show_products = true, always_show_made_in = true, + hide_from_signal_gui = false, enabled = false, category = "large-assembly", subgroup = "boxed-science", energy_required = 40, ingredients = { - {"nullius-box-crushed-iron-ore", 1}, - {"nullius-box-crushed-bauxite", 1}, - {"nullius-box-crushed-limestone", 1}, - {"nullius-box-sand", 1}, - {"nullius-box-mineral-dust", 4} + {type = "item", name = "nullius-box-crushed-iron-ore", amount = 1}, + {type = "item", name = "nullius-box-crushed-bauxite", amount = 1}, + {type = "item", name = "nullius-box-crushed-limestone", amount = 1}, + {type = "item", name = "nullius-box-sand", amount = 1}, + {type = "item", name = "nullius-box-mineral-dust", amount = 4} }, - result = "nullius-box-geology-pack" + results = { + {type = "item", name = "nullius-box-geology-pack", amount = 1} + } }, { @@ -221,12 +229,12 @@ data:extend({ { icon = "__base__/graphics/icons/automation-science-pack.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/iron-gear-wheel.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.22, shift = {1, 6}, tint = {r=0.9, g=1, b=1, a=0.8} @@ -241,7 +249,7 @@ data:extend({ { type = "recipe", name = "nullius-mechanical-pack-1", - localised_name = {"", {"item-name.nullius-mechanical-pack"}, " ", 1}, + localised_name = {"", {"item-name.nullius-mechanical-pack"}, " ", tostring(1)}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -250,41 +258,47 @@ data:extend({ order = "nullius-db", energy_required = 15, ingredients = { - {"nullius-motor-1", 1}, - {"nullius-iron-gear", 3} + {type = "item", name = "nullius-motor-1", amount = 1}, + {type = "item", name = "nullius-iron-gear", amount = 3} }, - result = "nullius-mechanical-pack" + results = { + {type = "item", name = "nullius-mechanical-pack", amount = 1} + } }, { type = "recipe", name = "nullius-boxed-mechanical-pack-1", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-mechanical-pack"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-mechanical-pack"}}, " ", tostring(1)}, enabled = false, always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "large-assembly", subgroup = "boxed-science", order = "nullius-db", energy_required = 75, ingredients = { - {"nullius-box-motor-1", 1}, - {"nullius-box-iron-gear", 3} + {type = "item", name = "nullius-box-motor-1", amount = 1}, + {type = "item", name = "nullius-box-iron-gear", amount = 3} }, - result = "nullius-box-mechanical-pack" + results = { + {type = "item", name = "nullius-box-mechanical-pack", amount = 1} + } }, { type = "recipe", name = "nullius-mechanical-pack-2", - localised_name = {"", {"item-name.nullius-mechanical-pack"}, " ", 2}, + localised_name = {"", {"item-name.nullius-mechanical-pack"}, " ", tostring(2)}, + hide_from_signal_gui = false, icons = { { icon = "__base__/graphics/icons/automation-science-pack.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelssmelting__/graphics/icons/wire-silver.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-silver.png", icon_size = 32, scale = 0.48, shift = {0, 6}, @@ -300,16 +314,18 @@ data:extend({ order = "nullius-dc", energy_required = 60, ingredients = { - {"pump", 1}, - {"nullius-steel-cable", 3} + {type = "item", name = "pump", amount = 1}, + {type = "item", name = "nullius-steel-cable", amount = 3} }, - result = "nullius-mechanical-pack", - result_count = 25 + results = { + {type = "item", name = "nullius-mechanical-pack", amount = 25} + } }, { type = "recipe", name = "nullius-boxed-mechanical-pack-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-mechanical-pack"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-mechanical-pack"}}, " ", tostring(2)}, + hide_from_signal_gui = false, icons = { { icon = ICONPATH .. "crate.png", @@ -318,11 +334,11 @@ data:extend({ { icon = "__base__/graphics/icons/automation-science-pack.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { - icon = "__angelssmelting__/graphics/icons/wire-silver.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-silver.png", icon_size = 32, scale = 0.44, shift = {0, 5.4}, @@ -338,11 +354,12 @@ data:extend({ order = "nullius-dc", energy_required = 300, ingredients = { - {"nullius-box-pump-3", 1}, - {"nullius-box-steel-cable", 3} + {type = "item", name = "nullius-box-pump-3", amount = 1}, + {type = "item", name = "nullius-box-steel-cable", amount = 3} }, - result = "nullius-box-mechanical-pack", - result_count = 25 + results = { + {type = "item", name = "nullius-box-mechanical-pack", amount = 25} + } }, { @@ -353,12 +370,12 @@ data:extend({ { icon = "__base__/graphics/icons/production-science-pack.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/processing-unit.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.18, shift = {0, 6}, tint = {r=1, g=1, b=1, a=0.5} @@ -373,7 +390,7 @@ data:extend({ { type = "recipe", name = "nullius-electrical-pack", - localised_name = {"", {"item-name.nullius-electrical-pack"}, " ", 1}, + localised_name = {"", {"item-name.nullius-electrical-pack"}, " ", tostring(1)}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -381,46 +398,52 @@ data:extend({ category = "small-crafting", energy_required = 12, ingredients = { - {"decider-combinator", 1}, - {"small-lamp", 1}, - {"copper-cable", 2}, - {"nullius-capacitor", 1} + {type = "item", name = "decider-combinator", amount = 1}, + {type = "item", name = "small-lamp", amount = 1}, + {type = "item", name = "copper-cable", amount = 2}, + {type = "item", name = "nullius-capacitor", amount = 1} }, - result = "nullius-electrical-pack" + results = { + {type = "item", name = "nullius-electrical-pack", amount = 1} + } }, { type = "recipe", name = "nullius-boxed-electrical-pack", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-electrical-pack"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-electrical-pack"}}, " ", tostring(1)}, enabled = false, always_show_made_in = true, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "large-assembly", subgroup = "boxed-science", energy_required = 60, ingredients = { - {"nullius-box-logic-circuit", 1}, - {"nullius-box-lamp-1", 1}, - {"nullius-box-insulated-wire", 2}, - {"nullius-box-capacitor", 1} + {type = "item", name = "nullius-box-logic-circuit", amount = 1}, + {type = "item", name = "nullius-box-lamp-1", amount = 1}, + {type = "item", name = "nullius-box-insulated-wire", amount = 2}, + {type = "item", name = "nullius-box-capacitor", amount = 1} }, - result = "nullius-box-electrical-pack" + results = { + {type = "item", name = "nullius-box-electrical-pack", amount = 1} + } }, { type = "recipe", name = "nullius-electrical-pack-2", - localised_name = {"", {"item-name.nullius-electrical-pack"}, " ", 2}, + localised_name = {"", {"item-name.nullius-electrical-pack"}, " ", tostring(2)}, + hide_from_signal_gui = false, icons = { { icon = "__base__/graphics/icons/production-science-pack.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/advanced-circuit.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.18, shift = {0, 6}, tint = {r=1, g=1, b=1, a=0.8} @@ -435,17 +458,19 @@ data:extend({ order = "nullius-ed", energy_required = 160, ingredients = { - {"nullius-processor-2", 1}, - {"nullius-sensor-2", 1}, - {"nullius-battery-2", 1} + {type = "item", name = "nullius-processor-2", amount = 1}, + {type = "item", name = "nullius-sensor-2", amount = 1}, + {type = "item", name = "nullius-battery-2", amount = 1} }, - result = "nullius-electrical-pack", - result_count = 50 + results = { + {type = "item", name = "nullius-electrical-pack", amount = 50} + } }, { type = "recipe", name = "nullius-boxed-electrical-pack-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-electrical-pack"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-electrical-pack"}}, " ", tostring(2)}, + hide_from_signal_gui = false, icons = { { icon = ICONPATH .. "crate.png", @@ -454,13 +479,13 @@ data:extend({ { icon = "__base__/graphics/icons/production-science-pack.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { icon = "__base__/graphics/icons/advanced-circuit.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.162, shift = {0, 5.4}, tint = {r=1, g=1, b=1, a=0.8} @@ -475,12 +500,13 @@ data:extend({ order = "nullius-ed", energy_required = 800, ingredients = { - {"nullius-box-processor-2", 1}, - {"nullius-box-sensor-2", 1}, - {"nullius-box-battery-2", 1} + {type = "item", name = "nullius-box-processor-2", amount = 1}, + {type = "item", name = "nullius-box-sensor-2", amount = 1}, + {type = "item", name = "nullius-box-battery-2", amount = 1} }, - result = "nullius-box-electrical-pack", - result_count = 50 + results = { + {type = "item", name = "nullius-box-electrical-pack", amount = 50} + } }, { @@ -490,7 +516,7 @@ data:extend({ { icon = "__base__/graphics/icons/space-science-pack.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/tooltips/tooltip-category-nuclear.png", @@ -510,6 +536,7 @@ data:extend({ { type = "recipe", name = "nullius-physics-pack", + localised_name = {"item-name.nullius-physics-pack"}, enabled = false, category = "huge-assembly", subgroup = "research-pack", @@ -519,17 +546,18 @@ data:extend({ always_show_products = true, energy_required = 900, ingredients = { - {"nullius-stirling-engine-2", 1}, - {"nullius-nanofabricator-1", 1}, - {"nullius-box-underground-belt-3", 1}, - {"nullius-lab-2", 1}, - {"nullius-combustion-chamber-3", 1}, - {"nullius-substation-2", 1}, - {"nullius-drone-launcher-1", 1}, - {"nullius-box-missile-1", 3} + {type = "item", name = "nullius-stirling-engine-2", amount = 1}, + {type = "item", name = "nullius-nanofabricator-1", amount = 1}, + {type = "item", name = "nullius-box-underground-belt-3", amount = 1}, + {type = "item", name = "nullius-lab-2", amount = 1}, + {type = "item", name = "nullius-combustion-chamber-3", amount = 1}, + {type = "item", name = "nullius-substation-2", amount = 1}, + {type = "item", name = "nullius-drone-launcher-1", amount = 1}, + {type = "item", name = "nullius-box-missile-1", amount = 3} }, - result = "nullius-box-physics-pack", - result_count = 25 + results = { + {type = "item", name = "nullius-box-physics-pack", amount = 25} + } }, { @@ -539,7 +567,7 @@ data:extend({ { icon = "__base__/graphics/icons/military-science-pack.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.75, 0.72, 0.78} } }, @@ -554,7 +582,7 @@ data:extend({ { type = "item", name = "nullius-crushed-copper-ore", - icon = "__angelsrefining__/graphics/icons/copper-pebbles.png", + icon = "__angelsrefininggraphics__/graphics/icons/copper-pebbles.png", icon_size = 32, subgroup = "copper", order = "nullius-c", @@ -566,7 +594,7 @@ data:extend({ enabled = false, category = "ore-crushing", energy_required = 4, - ingredients = {{"copper-ore", 4}}, + ingredients = {{type = "item", name = "copper-ore", amount = 4}}, results = { {type="item", name="nullius-crushed-copper-ore", amount=3}, {type="item", name="stone", amount=1} @@ -577,10 +605,11 @@ data:extend({ type = "recipe", name = "nullius-boxed-crushed-copper-ore", enabled = false, + hide_from_signal_gui = false, category = "ore-crushing", subgroup = "boxed-copper", energy_required = 20, - ingredients = {{"nullius-box-copper-ore", 4}}, + ingredients = {{type = "item", name = "nullius-box-copper-ore", amount = 4}}, results = { {type="item", name="nullius-box-crushed-copper-ore", amount=3}, {type="item", name="nullius-box-stone", amount=1} @@ -680,8 +709,9 @@ data:extend({ {type="item", name="nullius-copper-ingot", amount=1}, {type="fluid", name="nullius-lubricant", amount=1} }, - result = "nullius-copper-wire", - result_count = 2 + results = { + {type = "item", name = "nullius-copper-wire", amount = 2} + } }, { type = "recipe", @@ -696,8 +726,9 @@ data:extend({ {type="item", name="nullius-box-copper-ingot", amount=1}, {type="fluid", name="nullius-lubricant", amount=5} }, - result = "nullius-box-copper-wire", - result_count = 2 + results = { + {type = "item", name = "nullius-box-copper-wire", amount = 2} + } }, { type = "recipe", @@ -711,7 +742,9 @@ data:extend({ {type="item", name="nullius-copper-ingot", amount=1}, {type="fluid", name="nullius-acid-sulfuric", amount=1} }, - result = "nullius-copper-sheet" + results = { + {type = "item", name = "nullius-copper-sheet", amount = 1} + } }, { type = "recipe", @@ -726,13 +759,15 @@ data:extend({ {type="item", name="nullius-box-copper-ingot", amount=1}, {type="fluid", name="nullius-acid-sulfuric", amount=5} }, - result = "nullius-box-copper-sheet" + results = { + {type = "item", name = "nullius-box-copper-sheet", amount = 1} + } }, { type = "item", name = "nullius-crushed-iron-ore", - icon = "__angelsrefining__/graphics/icons/iron-pebbles.png", + icon = "__angelsrefininggraphics__/graphics/icons/iron-pebbles.png", icon_size = 32, subgroup = "iron-ingot", order = "nullius-c", @@ -744,7 +779,7 @@ data:extend({ enabled = false, category = "ore-crushing", energy_required = 5, - ingredients = {{"iron-ore", 6}}, + ingredients = {{type="item", name="iron-ore", amount = 6}}, results = { {type="item", name="nullius-crushed-iron-ore", amount=5}, {type="item", name="stone", amount=1} @@ -758,7 +793,7 @@ data:extend({ category = "ore-crushing", subgroup = "boxed-iron", energy_required = 25, - ingredients = {{"nullius-box-iron-ore", 6}}, + ingredients = {{type="item", name="nullius-box-iron-ore", amount = 6}}, results = { {type="item", name="nullius-box-crushed-iron-ore", amount=5}, {type="item", name="nullius-box-stone", amount=1} @@ -769,7 +804,7 @@ data:extend({ type = "item", name = "nullius-iron-oxide", icons = {{ - icon = "__angelssmelting__/graphics/icons/solid-iron-hydroxide.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-iron-hydroxide.png", icon_size = 32, tint = {0.77, 0.54, 0.48} }}, @@ -813,81 +848,82 @@ data:extend({ { type = "recipe", name = "nullius-iron-oxidation", - localised_name = {"recipe-name.nullius-oxidation", {"item-name.nullius-iron"}}, - icons = { + localised_name = {"recipe-name.nullius-oxidation", {"item-name.nullius-iron"}}, + icons = { { - icon = "__angelssmelting__/graphics/icons/solid-iron-hydroxide.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-iron-hydroxide.png", icon_size = 32, tint = {0.77, 0.54, 0.48} }, { - icon = "__angelssmelting__/graphics/icons/ingot-iron.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-iron.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.3, + scale = 0.3, shift = {-7, -7} } }, enabled = false, - no_productivity = true, - show_amount_in_title = false, + no_productivity = true, + show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "ore-flotation", - order = "nullius-o", + order = "nullius-o", energy_required = 3, ingredients = { {type="item", name="nullius-iron-wire", amount=11}, {type="fluid", name="nullius-water", amount=20}, {type="fluid", name="nullius-oxygen", amount=40} }, - result = "nullius-iron-oxide", - result_count = 2 + results = { + {type = "item", name = "nullius-iron-oxide", amount = 2} + } }, { type = "recipe", name = "nullius-boxed-iron-oxidation", - localised_name = {"recipe-name.nullius-boxed", + localised_name = {"recipe-name.nullius-boxed", {"recipe-name.nullius-oxidation", {"item-name.nullius-iron"}}}, - icons = { + icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/solid-iron-hydroxide.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-iron-hydroxide.png", icon_size = 32, tint = {0.77, 0.54, 0.48}, - scale = 0.9 + scale = 0.9 }, { - icon = "__angelssmelting__/graphics/icons/ingot-iron.png", - icon_size = 64, - icon_mipmaps = 4, - scale = 0.27, + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-iron.png", + icon_size = 64, + scale = 0.27, shift = {-6, -6} } }, enabled = false, - no_productivity = true, - show_amount_in_title = false, + no_productivity = true, + show_amount_in_title = false, always_show_products = true, category = "ore-flotation", - subgroup = "boxed-iron", - order = "nullius-o", + subgroup = "boxed-iron", + order = "nullius-o", energy_required = 15, ingredients = { {type="item", name="nullius-box-iron-wire", amount=11}, {type="fluid", name="nullius-water", amount=100}, {type="fluid", name="nullius-oxygen", amount=200} }, - result = "nullius-box-iron-oxide", - result_count = 2 + results = { + {type = "item", name = "nullius-box-iron-oxide", amount = 2} + } }, { type = "item", name = "nullius-crushed-limestone", - icon = "__angelsrefining__/graphics/icons/solid-limestone.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-limestone.png", icon_size = 32, subgroup = "calcium-product", order = "nullius-d", @@ -896,13 +932,13 @@ data:extend({ { type = "recipe", name = "nullius-crushed-limestone-1", - localised_name = {"", {"item-name.nullius-crushed-limestone"}, " ", 1}, + localised_name = {"", {"item-name.nullius-crushed-limestone"}, " ", tostring(1)}, enabled = false, icon_size = 32, category = "ore-crushing", order = "nullius-db", energy_required = 4, - ingredients = {{"nullius-limestone", 8}}, + ingredients = {{type="item", name="nullius-limestone", amount = 8}}, results = { {type="item", name="nullius-crushed-limestone", amount=5}, {type="item", name="stone", amount=3} @@ -912,14 +948,14 @@ data:extend({ { type = "recipe", name = "nullius-boxed-crushed-limestone-1", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-crushed-limestone"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-crushed-limestone"}}, " ", tostring(1)}, enabled = false, icon_size = 32, category = "ore-crushing", subgroup = "boxed-calcium", order = "nullius-cb", energy_required = 20, - ingredients = {{"nullius-box-limestone", 8}}, + ingredients = {{type="item", name="nullius-box-limestone", amount = 8}}, results = { {type="item", name="nullius-box-crushed-limestone", amount=5}, {type="item", name="nullius-box-stone", amount=3} @@ -929,14 +965,15 @@ data:extend({ { type = "recipe", name = "nullius-crushed-limestone-2", - localised_name = {"", {"item-name.nullius-crushed-limestone"}, " ", 2}, + localised_name = {"", {"item-name.nullius-crushed-limestone"}, " ", tostring(2)}, + hide_from_signal_gui = false, icons = { { - icon = "__angelsrefining__/graphics/icons/solid-limestone.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-limestone.png", icon_size = 32 }, { - icon = "__angelsrefining__/graphics/icons/crushed/crushed-4.png", + icon = "__angelsrefininggraphics__/graphics/icons/crushed/crushed-4.png", icon_size = 64, tint = {1, 1, 0.8}, scale = 0.2, @@ -948,7 +985,7 @@ data:extend({ category = "ore-crushing", order = "nullius-dc", energy_required = 7, - ingredients = {{"nullius-limestone", 15}}, + ingredients = {{type="item", name="nullius-limestone", amount = 15}}, results = { {type="item", name="nullius-crushed-limestone", amount=10}, {type="item", name="nullius-gypsum", amount=1}, @@ -959,19 +996,19 @@ data:extend({ { type = "recipe", name = "nullius-boxed-crushed-limestone-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-crushed-limestone"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-crushed-limestone"}}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelsrefining__/graphics/icons/solid-limestone.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-limestone.png", icon_size = 32, scale = 0.9 }, { - icon = "__angelsrefining__/graphics/icons/crushed/crushed-4.png", + icon = "__angelsrefininggraphics__/graphics/icons/crushed/crushed-4.png", icon_size = 64, tint = {1, 1, 0.8}, scale = 0.18, @@ -984,7 +1021,7 @@ data:extend({ subgroup = "boxed-calcium", order = "nullius-cc", energy_required = 35, - ingredients = {{"nullius-box-limestone", 15}}, + ingredients = {{type="item", name="nullius-box-limestone", amount = 15}}, results = { {type="item", name="nullius-box-crushed-limestone", amount=10}, {type="item", name="nullius-box-gypsum", amount=1}, @@ -999,7 +1036,7 @@ data:extend({ icons = { { icon_size = 64, - icon = "__angelsrefining__/graphics/icons/crushed/crushed-6.png", + icon = "__angelsrefininggraphics__/graphics/icons/crushed/crushed-6.png", tint = {0.867, 0.820, 0.609} } }, @@ -1012,9 +1049,9 @@ data:extend({ name = "nullius-crushed-bauxite", enabled = false, category = "ore-crushing", - subgroup = "alumina", + subgroup = "alumina", energy_required = 5, - ingredients = {{"nullius-bauxite", 7}}, + ingredients = {{type="item", name="nullius-bauxite", amount = 7}}, results = { {type="item", name="nullius-crushed-bauxite", amount=5}, {type="item", name="nullius-crushed-iron-ore", amount=1}, @@ -1030,7 +1067,7 @@ data:extend({ subgroup = "boxed-aluminum-1", order = "nullius-b", energy_required = 25, - ingredients = {{"nullius-box-bauxite", 7}}, + ingredients = {{type="item", name="nullius-box-bauxite", amount = 7}}, results = { {type="item", name="nullius-box-crushed-bauxite", amount=5}, {type="item", name="nullius-box-crushed-iron-ore", amount=1}, @@ -1051,12 +1088,14 @@ data:extend({ { type = "recipe", name = "nullius-crushed-sandstone", + localised_name = {"item-name.nullius-sand"}, enabled = false, category = "hand-crushing", always_show_made_in = true, allow_decomposition = false, + hide_from_signal_gui = false, energy_required = 4, - ingredients = {{"nullius-sandstone", 5}}, + ingredients = {{type="item", name="nullius-sandstone", amount = 5}}, results = { {type="item", name="nullius-sand", amount=4}, {type="item", name="stone", amount=1} @@ -1072,7 +1111,7 @@ data:extend({ always_show_made_in = true, allow_decomposition = false, energy_required = 20, - ingredients = {{"nullius-box-sandstone", 5}}, + ingredients = {{type="item", name="nullius-box-sandstone", amount = 5}}, results = { {type="item", name="nullius-box-sand", amount=4}, {type="item", name="nullius-box-stone", amount=1} @@ -1083,6 +1122,7 @@ data:extend({ { type = "recipe", name = "nullius-crushed-stone", + localised_name = {"item-name.nullius-gravel"}, enabled = false, icon_size = 32, category = "hand-crushing", @@ -1090,9 +1130,12 @@ data:extend({ show_amount_in_title = false, always_show_products = true, allow_decomposition = false, + hide_from_signal_gui = false, energy_required = 0.5, - ingredients = {{"stone", 1}}, - result = "nullius-gravel" + ingredients = {{type="item", name="stone", amount = 1}}, + results = { + {type = "item", name = "nullius-gravel", amount = 1} + } }, { type = "recipe", @@ -1106,16 +1149,18 @@ data:extend({ always_show_products = true, allow_decomposition = false, energy_required = 2.5, - ingredients = {{"nullius-box-stone", 1}}, - result = "nullius-box-gravel" + ingredients = {{type="item", name="nullius-box-stone", amount = 1}}, + results = { + {type = "item", name = "nullius-box-gravel", amount = 1} + } }, { type = "item", name = "nullius-mineral-dust", - icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-tungsten.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "masonry-material", order = "nullius-m", stack_size = 100 @@ -1126,14 +1171,16 @@ data:extend({ localised_name = {"recipe-name.nullius-gravel-disposal"}, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, enabled = false, icon_size = 32, category = "ore-crushing", order = "nullius-nb", energy_required = 3, - ingredients = {{"nullius-gravel", 6}}, - result = "nullius-mineral-dust", - result_count = 5 + ingredients = {{type="item", name="nullius-gravel", amount = 6}}, + results = { + {type = "item", name = "nullius-mineral-dust", amount = 5} + } }, { type = "recipe", @@ -1146,9 +1193,10 @@ data:extend({ subgroup = "boxed-silicon", order = "nullius-nb", energy_required = 15, - ingredients = {{"nullius-box-gravel", 6}}, - result = "nullius-box-mineral-dust", - result_count = 5 + ingredients = {{type="item", name="nullius-box-gravel", amount = 6}}, + results = { + {type = "item", name = "nullius-box-mineral-dust", amount = 5} + } }, { type = "recipe", @@ -1156,9 +1204,9 @@ data:extend({ localised_name = {"recipe-name.nullius-slag-reprocessing"}, icons = { { - icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-tungsten.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "sand.png", @@ -1169,13 +1217,14 @@ data:extend({ }, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, enabled = false, icon_size = 32, category = "ore-crushing", subgroup = "masonry-material", order = "nullius-nc", energy_required = 6, - ingredients = {{"nullius-gravel", 8}}, + ingredients = {{type="item", name="nullius-gravel", amount = 8}}, results = { {type="item", name="nullius-sand", amount=3}, {type="item", name="nullius-mineral-dust", amount=6} @@ -1192,9 +1241,9 @@ data:extend({ icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-tungsten.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { @@ -1212,7 +1261,7 @@ data:extend({ subgroup = "boxed-silicon", order = "nullius-nc", energy_required = 30, - ingredients = {{"nullius-box-gravel", 8}}, + ingredients = {{type="item", name="nullius-box-gravel", amount = 8}}, results = { {type="item", name="nullius-box-sand", amount=3}, {type="item", name="nullius-box-mineral-dust", amount=6} @@ -1226,12 +1275,12 @@ data:extend({ localised_name = {"recipe-name.nullius-iron-disposal"}, icons = { { - icon = "__angelsrefining__/graphics/icons/stone-crushed.png", + icon = "__angelsrefininggraphics__/graphics/icons/stone-crushed.png", icon_size = 32, tint = {r=0.95, g=0.85, b=0.75} }, { - icon = "__angelsrefining__/graphics/icons/iron-pebbles.png", + icon = "__angelsrefininggraphics__/graphics/icons/iron-pebbles.png", icon_size = 32, scale = 0.5, shift = {10, -9} @@ -1245,9 +1294,10 @@ data:extend({ order = "nullius-n", no_productivity = true, energy_required = 2, - ingredients = {{"nullius-crushed-iron-ore", 4}}, - result = "nullius-gravel", - result_count = 3 + ingredients = {{type="item", name="nullius-crushed-iron-ore", amount = 4}}, + results = { + {type = "item", name = "nullius-gravel", amount = 3} + } }, { type = "recipe", @@ -1259,13 +1309,13 @@ data:extend({ icon_size = 64 }, { - icon = "__angelsrefining__/graphics/icons/stone-crushed.png", + icon = "__angelsrefininggraphics__/graphics/icons/stone-crushed.png", icon_size = 32, scale = 0.9, tint = {r=0.95, g=0.85, b=0.75} }, { - icon = "__angelsrefining__/graphics/icons/iron-pebbles.png", + icon = "__angelsrefininggraphics__/graphics/icons/iron-pebbles.png", icon_size = 32, scale = 0.45, shift = {9, -8} @@ -1274,14 +1324,15 @@ data:extend({ show_amount_in_title = false, always_show_products = true, enabled = false, - no_productivity = true, + no_productivity = true, category = "ore-crushing", - subgroup = "boxed-aluminum-1", + subgroup = "boxed-aluminum-1", order = "nullius-n", energy_required = 10, - ingredients = {{"nullius-box-crushed-iron-ore", 4}}, - result = "nullius-box-gravel", - result_count = 3 + ingredients = {{type="item", name="nullius-box-crushed-iron-ore", amount = 4}}, + results = { + {type = "item", name = "nullius-box-gravel", amount = 3} + } }, { type = "recipe", @@ -1289,12 +1340,12 @@ data:extend({ localised_name = {"recipe-name.nullius-bauxite-disposal"}, icons = { { - icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-tungsten.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelsrefining__/graphics/icons/crushed/crushed-6.png", + icon = "__angelsrefininggraphics__/graphics/icons/crushed/crushed-6.png", icon_size = 64, tint = {0.867, 0.820, 0.609}, scale = 0.25, @@ -1303,14 +1354,16 @@ data:extend({ }, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, enabled = false, category = "ore-crushing", - subgroup = "alumina", + subgroup = "alumina", order = "nullius-n", energy_required = 2, - ingredients = {{"nullius-crushed-bauxite", 5}}, - result = "nullius-mineral-dust", - result_count = 4 + ingredients = {{type="item", name="nullius-crushed-bauxite", amount = 5}}, + results = { + {type = "item", name = "nullius-mineral-dust", amount = 4} + } }, { type = "recipe", @@ -1323,13 +1376,12 @@ data:extend({ icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-tungsten.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.45 + scale = 0.45 }, { - icon = "__angelsrefining__/graphics/icons/crushed/crushed-6.png", + icon = "__angelsrefininggraphics__/graphics/icons/crushed/crushed-6.png", icon_size = 64, tint = {0.867, 0.820, 0.609}, scale = 0.22, @@ -1340,12 +1392,13 @@ data:extend({ always_show_products = true, enabled = false, category = "ore-crushing", - subgroup = "boxed-aluminum-1", + subgroup = "boxed-aluminum-1", order = "nullius-l", energy_required = 10, - ingredients = {{"nullius-box-crushed-bauxite", 5}}, - result = "nullius-box-mineral-dust", - result_count = 4 + ingredients = {{type="item", name="nullius-box-crushed-bauxite", amount = 5}}, + results = { + {type = "item", name = "nullius-box-mineral-dust", amount = 4} + } }, { type = "recipe", @@ -1353,14 +1406,14 @@ data:extend({ localised_name = {"recipe-name.nullius-disposal", {"item-name.nullius-rutile"}}, icons = { { - icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-tungsten.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelssmelting__/graphics/icons/powder-titanium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-titanium.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.25, shift = {10, -9} } @@ -1368,14 +1421,16 @@ data:extend({ show_amount_in_title = false, always_show_products = true, no_productivity = true, + hide_from_signal_gui = false, enabled = false, category = "ore-crushing", subgroup = "titanium-product", order = "nullius-xr", energy_required = 5, - ingredients = {{"nullius-rutile", 8}}, - result = "nullius-mineral-dust", - result_count = 7 + ingredients = {{type="item", name="nullius-rutile", amount = 8}}, + results = { + {type = "item", name = "nullius-mineral-dust", amount = 7} + } }, { type = "recipe", @@ -1388,15 +1443,13 @@ data:extend({ icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-tungsten.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.45 + scale = 0.45 }, { - icon = "__angelssmelting__/graphics/icons/powder-titanium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-titanium.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.22, shift = {9, -8} } @@ -1409,9 +1462,10 @@ data:extend({ subgroup = "boxed-titanium", order = "nullius-xr", energy_required = 25, - ingredients = {{"nullius-box-rutile", 8}}, - result = "nullius-box-mineral-dust", - result_count = 7 + ingredients = {{type="item", name="nullius-box-rutile", amount = 8}}, + results = { + {type = "item", name = "nullius-box-mineral-dust", amount = 7} + } }, { type = "recipe", @@ -1419,12 +1473,12 @@ data:extend({ localised_name = {"recipe-name.nullius-limestone-disposal"}, icons = { { - icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-tungsten.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelsrefining__/graphics/icons/solid-limestone.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-limestone.png", icon_size = 32, scale = 0.5, shift = {10, -9} @@ -1432,14 +1486,16 @@ data:extend({ }, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, enabled = false, category = "ore-crushing", subgroup = "calcium-product", order = "nullius-m", energy_required = 2, - ingredients = {{"nullius-crushed-limestone", 3}}, - result = "nullius-mineral-dust", - result_count = 3 + ingredients = {{type="item", name="nullius-crushed-limestone", amount = 3}}, + results = { + {type = "item", name = "nullius-mineral-dust", amount = 3} + } }, { type = "recipe", @@ -1451,13 +1507,13 @@ data:extend({ icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-tungsten.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { - icon = "__angelsrefining__/graphics/icons/solid-limestone.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-limestone.png", icon_size = 32, scale = 0.45, shift = {9, -8} @@ -1470,17 +1526,18 @@ data:extend({ subgroup = "boxed-calcium", order = "nullius-y", energy_required = 10, - ingredients = {{"nullius-box-crushed-limestone", 3}}, - result = "nullius-box-mineral-dust", - result_count = 3 + ingredients = {{type="item", name="nullius-box-crushed-limestone", amount = 3}}, + results = { + {type = "item", name = "nullius-box-mineral-dust", amount = 3} + } }, { type = "item", name = "nullius-iron-ingot", - icon = "__angelssmelting__/graphics/icons/ingot-iron.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-iron.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "iron-ingot", order = "nullius-e", stack_size = 100 @@ -1494,7 +1551,7 @@ data:extend({ order = "nullius-eb", energy_required = 8, ingredients = { - {"iron-ore", 5} + {type="item", name="iron-ore", amount = 5} }, results = { {type="item", name="nullius-iron-ingot", amount=2}, @@ -1506,16 +1563,17 @@ data:extend({ type = "recipe", name = "nullius-iron-ingot-2", localised_name = {"recipe-name.nullius-iron-ingot-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/ingot-iron.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-iron.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/coal.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.25, shift = {10, -10} } @@ -1525,8 +1583,8 @@ data:extend({ order = "nullius-ec", energy_required = 18, ingredients = { - {"nullius-crushed-iron-ore", 11}, - {"nullius-graphite", 1} + {type="item", name="nullius-crushed-iron-ore", amount = 11}, + {type="item", name="nullius-graphite", amount = 1} }, results = { {type="item", name="nullius-iron-ingot", amount=8}, @@ -1538,14 +1596,15 @@ data:extend({ type = "recipe", name = "nullius-iron-ingot-3", localised_name = {"recipe-name.nullius-iron-ingot-3"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/ingot-iron.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-iron.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelssmelting__/graphics/icons/solid-iron-hydroxide.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-iron-hydroxide.png", icon_size = 32, tint = {0.77, 0.54, 0.48}, scale = 0.5, @@ -1557,9 +1616,9 @@ data:extend({ order = "nullius-ed", energy_required = 20, ingredients = { - {"nullius-iron-oxide", 8}, - {"nullius-crushed-limestone", 2}, - {"nullius-graphite", 1} + {type="item", name="nullius-iron-oxide", amount = 8}, + {type="item", name="nullius-crushed-limestone", amount = 2}, + {type="item", name="nullius-graphite", amount = 1} }, results = { {type="item", name="nullius-iron-ingot", amount=10}, @@ -1578,9 +1637,9 @@ data:extend({ order = "nullius-ed", energy_required = 20, ingredients = { - {"nullius-box-iron-oxide", 8}, - {"nullius-box-crushed-limestone", 2}, - {"nullius-box-graphite", 1} + {type="item", name="nullius-box-iron-oxide", amount = 8}, + {type="item", name="nullius-box-crushed-limestone", amount = 2}, + {type="item", name="nullius-box-graphite", amount = 1} }, results = { {type="item", name="nullius-box-iron-ingot", amount=10}, @@ -1594,17 +1653,18 @@ data:extend({ { type = "recipe", name = "nullius-thermite", - localised_name = {"recipe-name.nullius-aluminothermic", {"item-name.nullius-iron-ingot"}}, + localised_name = {"recipe-name.nullius-aluminothermic", {"item-name.nullius-iron-ingot"}}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/ingot-iron.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-iron.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelssmelting__/graphics/icons/ingot-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-aluminium.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.25, shift = {10, -10} } @@ -1614,9 +1674,9 @@ data:extend({ order = "nullius-ee", energy_required = 6, ingredients = { - {"nullius-iron-oxide", 17}, - {"nullius-aluminum-ingot", 12}, - {"nullius-graphite", 1} + {type="item", name="nullius-iron-oxide", amount = 17}, + {type="item", name="nullius-aluminum-ingot", amount = 12}, + {type="item", name="nullius-graphite", amount = 1} }, results = { {type="item", name="nullius-iron-ingot", amount=21}, @@ -1628,7 +1688,7 @@ data:extend({ { type = "recipe", name = "nullius-boxed-thermite", - localised_name = {"recipe-name.nullius-aluminothermic", + localised_name = {"recipe-name.nullius-aluminothermic", {"item-name.nullius-box", {"item-name.nullius-iron-ingot"}}}, icons = { { @@ -1636,15 +1696,15 @@ data:extend({ icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/ingot-iron.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-iron.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { - icon = "__angelssmelting__/graphics/icons/ingot-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-aluminium.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.22, shift = {9, -9} } @@ -1655,9 +1715,9 @@ data:extend({ order = "nullius-ee", energy_required = 25, ingredients = { - {"nullius-box-iron-oxide", 13}, - {"nullius-box-aluminum-ingot", 10}, - {"nullius-box-graphite", 1} + {type="item", name="nullius-box-iron-oxide", amount = 13}, + {type="item", name="nullius-box-aluminum-ingot", amount = 10}, + {type="item", name="nullius-box-graphite", amount = 1} }, results = { {type="item", name="nullius-box-iron-ingot", amount=16}, @@ -1670,9 +1730,9 @@ data:extend({ { type = "item", name = "nullius-steel-ingot", - icon = "__angelssmelting__/graphics/icons/ingot-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-steel.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "iron-ingot", order = "nullius-f", stack_size = 100 @@ -1699,14 +1759,15 @@ data:extend({ type = "recipe", name = "nullius-steel-ingot-2", localised_name = {"recipe-name.nullius-steel-ingot-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/ingot-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-steel.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelssmelting__/graphics/icons/solid-lime.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-lime.png", icon_size = 32, scale = 0.5, shift = {10, -10} @@ -1730,7 +1791,7 @@ data:extend({ { type = "recipe", name = "nullius-boxed-steel-ingot-1", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-steel-ingot"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-steel-ingot"}}, " ", tostring(1)}, enabled = false, category = "bulk-smelting", subgroup = "boxed-steel", @@ -1751,12 +1812,13 @@ data:extend({ { type = "recipe", name = "nullius-steel-ingot-3", - localised_name = {"", {"item-name.nullius-steel-ingot"}, " ", 3}, + localised_name = {"", {"item-name.nullius-steel-ingot"}, " ", tostring(3)}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/ingot-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-steel.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "calcium.png", @@ -1784,16 +1846,16 @@ data:extend({ { type = "recipe", name = "nullius-boxed-steel-ingot-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-steel-ingot"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-steel-ingot"}}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/ingot-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-steel.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { @@ -1825,19 +1887,20 @@ data:extend({ type = "recipe", name = "nullius-steel-ingot-hydrogen", localised_name = {"recipe-name.nullius-hydrogen", {"item-name.nullius-box", {"item-name.nullius-steel-ingot"}}}, + hide_from_signal_gui = false, icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/ingot-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-steel.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen.png", icon_size = 72, scale = 0.18, shift = {8, -10} @@ -1864,9 +1927,9 @@ data:extend({ type = "item", name = "nullius-silicon-ingot", icons = {{ - icon = "__angelssmelting__/graphics/icons/ingot-silicon.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-silicon.png", icon_size = 64, - icon_mipmaps = 4, + tint = {1, 0.925, 0.85} }}, subgroup = "silicon-product", @@ -1876,9 +1939,9 @@ data:extend({ { type = "item", name = "nullius-copper-ingot", - icon = "__angelssmelting__/graphics/icons/ingot-copper.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-copper.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "copper", order = "nullius-e", stack_size = 100 @@ -1886,9 +1949,9 @@ data:extend({ { type = "item", name = "nullius-aluminum-ingot", - icon = "__angelssmelting__/graphics/icons/ingot-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-aluminium.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "aluminum-ingot", order = "nullius-g", stack_size = 100 @@ -1896,7 +1959,7 @@ data:extend({ { type = "item", name = "nullius-aluminum-hydroxide", - icon = "__angelssmelting__/graphics/icons/solid-aluminium-hydroxide.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-aluminium-hydroxide.png", icon_size = 32, subgroup = "aluminum-ingot", order = "nullius-d", @@ -1915,7 +1978,7 @@ data:extend({ type = "item", name = "nullius-calcium-chloride", icons = {{ - icon = "__angelspetrochem__/graphics/icons/solid-calcium-chloride.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-calcium-chloride.png", icon_size = 32 }}, subgroup = "calcium-product", @@ -1935,7 +1998,7 @@ data:extend({ { type = "item", name = "nullius-lime", - icon = "__angelssmelting__/graphics/icons/solid-lime.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-lime.png", icon_size = 32, subgroup = "masonry-material", order = "nullius-b", @@ -1944,10 +2007,23 @@ data:extend({ { type = "recipe", name = "nullius-lime", + icons = { + { + icon = "__angelssmeltinggraphics__/graphics/icons/solid-lime.png", + icon_size = 32 + }, + { + icon = "__angelsrefininggraphics__/graphics/icons/solid-limestone.png", + icon_size = 32, + scale = 0.4, + shift = {-11, -11} + } + }, enabled = false, category = "vent-smelting", + hide_from_signal_gui = false, energy_required = 5, - ingredients = {{"nullius-crushed-limestone", 3}}, + ingredients = {{type="item", name="nullius-crushed-limestone", amount = 3}}, results = { {type="item", name="nullius-lime", amount=2}, {type="fluid", name="nullius-carbon-dioxide", amount=40} @@ -1961,7 +2037,7 @@ data:extend({ category = "bulk-smelting", subgroup = "boxed-calcium", energy_required = 5, - ingredients = {{"nullius-box-crushed-limestone", 3}}, + ingredients = {{type="item", name="nullius-box-crushed-limestone", amount = 3}}, results = { {type="item", name="nullius-box-lime", amount=2}, {type="fluid", name="nullius-carbon-dioxide", amount=200} @@ -1972,13 +2048,14 @@ data:extend({ type = "recipe", name = "nullius-limestone-precipitation", localised_name = {"recipe-name.nullius-limestone-precipitation"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelsrefining__/graphics/icons/solid-limestone.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-limestone.png", icon_size = 32 }, { - icon = "__angelssmelting__/graphics/icons/solid-lime.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-lime.png", icon_size = 32, scale = 0.4, shift = {-11, -11} @@ -2010,12 +2087,12 @@ data:extend({ icon_size = 64 }, { - icon = "__angelsrefining__/graphics/icons/solid-limestone.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-limestone.png", icon_size = 32, scale = 0.9 }, { - icon = "__angelssmelting__/graphics/icons/solid-lime.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-lime.png", icon_size = 32, scale = 0.36, shift = {-10, -10} @@ -2043,13 +2120,14 @@ data:extend({ type = "recipe", name = "nullius-gypsum-decomposition", localised_name = {"recipe-name.nullius-gypsum-decomposition"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/solid-lime.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-lime.png", icon_size = 32 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/sulfur-dioxide.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/sulfur-dioxide.png", icon_size = 72, scale = 0.16, shift = {12, 13} @@ -2060,7 +2138,7 @@ data:extend({ category = "vent-smelting", order = "nullius-bc", energy_required = 3, - ingredients = {{"nullius-gypsum", 2}}, + ingredients = {{type="item", name="nullius-gypsum", amount = 2}}, results = { {type="item", name="nullius-lime", amount=1}, {type="fluid", name="nullius-sulfur-dioxide", amount=10} @@ -2078,12 +2156,12 @@ data:extend({ icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/solid-lime.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-lime.png", icon_size = 32, scale = 0.9 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/sulfur-dioxide.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/sulfur-dioxide.png", icon_size = 72, scale = 0.14, shift = {11, 12} @@ -2094,7 +2172,7 @@ data:extend({ subgroup = "boxed-calcium", order = "nullius-dc", energy_required = 3, - ingredients = {{"nullius-box-gypsum", 2}}, + ingredients = {{type="item", name="nullius-box-gypsum", amount = 2}}, results = { {type="item", name="nullius-box-lime", amount=1}, {type="fluid", name="nullius-sulfur-dioxide", amount=60} @@ -2108,12 +2186,12 @@ data:extend({ localised_name = {"recipe-name.nullius-gypsum-1"}, icons = { { - icon = "__angelsrefining__/graphics/icons/crushed/crushed-4.png", + icon = "__angelsrefininggraphics__/graphics/icons/crushed/crushed-4.png", icon_size = 64, tint = {1, 1, 0.8} }, { - icon = "__angelspetrochem__/graphics/icons/molecules/sulfuric-acid.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/sulfuric-acid.png", icon_size = 72, scale = 0.22, shift = {-9, -11} @@ -2140,20 +2218,20 @@ data:extend({ { type = "recipe", name = "nullius-boxed-gypsum-1", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-gypsum"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-gypsum"}}, " ", tostring(1)}, icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelsrefining__/graphics/icons/crushed/crushed-4.png", + icon = "__angelsrefininggraphics__/graphics/icons/crushed/crushed-4.png", icon_size = 64, tint = {1, 1, 0.8}, scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/sulfuric-acid.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/sulfuric-acid.png", icon_size = 72, scale = 0.2, shift = {-8, -10} @@ -2183,14 +2261,15 @@ data:extend({ type = "recipe", name = "nullius-gypsum-2", localised_name = {"recipe-name.nullius-gypsum-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelsrefining__/graphics/icons/crushed/crushed-4.png", + icon = "__angelsrefininggraphics__/graphics/icons/crushed/crushed-4.png", icon_size = 64, tint = {1, 1, 0.8} }, { - icon = "__angelspetrochem__/graphics/icons/solid-sodium-sulfate.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium-sulfate.png", icon_size = 32, scale = 0.55, shift = {-9, -9} @@ -2217,20 +2296,20 @@ data:extend({ { type = "recipe", name = "nullius-boxed-gypsum-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-gypsum"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-gypsum"}}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelsrefining__/graphics/icons/crushed/crushed-4.png", + icon = "__angelsrefininggraphics__/graphics/icons/crushed/crushed-4.png", icon_size = 64, tint = {1, 1, 0.8}, scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/solid-sodium-sulfate.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium-sulfate.png", icon_size = 32, scale = 0.5, shift = {-8, -8} @@ -2260,7 +2339,8 @@ data:extend({ { type = "recipe", name = "nullius-calcium-chloride-1", - localised_name = {"", {"item-name.nullius-calcium-chloride"}, " ", 1}, + localised_name = {"", {"item-name.nullius-calcium-chloride"}, " ", tostring(1)}, + hide_from_signal_gui = false, category = "basic-chemistry", subgroup = "chlorine-chemistry", order = "nullius-fb", @@ -2284,7 +2364,7 @@ data:extend({ { type = "recipe", name = "nullius-boxed-calcium-chloride-1", - localised_name = {"recipe-name.nullius-boxed", {"", {"item-name.nullius-calcium-chloride"}, " ", 1}}, + localised_name = {"recipe-name.nullius-boxed", {"", {"item-name.nullius-calcium-chloride"}, " ", tostring(1)}}, icons = { { icon = ICONPATH .. "crate.png", @@ -2317,13 +2397,14 @@ data:extend({ { type = "recipe", name = "nullius-calcium-chloride-2", - localised_name = {"", {"item-name.nullius-calcium-chloride"}, " ", 2}, + localised_name = {"", {"item-name.nullius-calcium-chloride"}, " ", tostring(2)}, + hide_from_signal_gui = false, icons = { data.raw.fluid["nullius-calcium-chloride-solution"].icons[2], data.raw.fluid["nullius-calcium-chloride-solution"].icons[3], data.raw.fluid["nullius-calcium-chloride-solution"].icons[4], { - icon = "__angelssmelting__/graphics/icons/solid-lime.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-lime.png", icon_size = 32, scale = 0.4, shift = {-11, -12} @@ -2352,7 +2433,7 @@ data:extend({ { type = "recipe", name = "nullius-boxed-calcium-chloride-2", - localised_name = {"recipe-name.nullius-boxed", {"", {"item-name.nullius-calcium-chloride"}, " ", 2}}, + localised_name = {"recipe-name.nullius-boxed", {"", {"item-name.nullius-calcium-chloride"}, " ", tostring(2)}}, icons = { { icon = ICONPATH .. "crate.png", @@ -2362,7 +2443,7 @@ data:extend({ data.raw.fluid["nullius-calcium-chloride-solution"].icons[3], data.raw.fluid["nullius-calcium-chloride-solution"].icons[4], { - icon = "__angelssmelting__/graphics/icons/solid-lime.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-lime.png", icon_size = 32, scale = 0.36, shift = {-10, -11} @@ -2393,7 +2474,7 @@ data:extend({ name = "nullius-calcium-chloride-dehydration", localised_name = {"recipe-name.nullius-dehydration", {"item-name.nullius-calcium-chloride"}}, enabled = false, - no_productivity = true, + no_productivity = true, category = "distillation", order = "nullius-ic", crafting_machine_tint = { @@ -2416,7 +2497,7 @@ data:extend({ localised_name = {"recipe-name.nullius-dehydration", {"item-name.nullius-box", {"item-name.nullius-calcium-chloride"}}}, enabled = false, - no_productivity = true, + no_productivity = true, category = "distillation", subgroup = "boxed-calcium", order = "nullius-fc", @@ -2439,7 +2520,7 @@ data:extend({ name = "nullius-legacy-calcium-chloride-dehydration", localised_name = {"recipe-name.nullius-dehydration", {"item-name.nullius-calcium-chloride"}}, enabled = false, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, category = "distillation", @@ -2464,7 +2545,7 @@ data:extend({ localised_name = {"recipe-name.nullius-dehydration", {"item-name.nullius-box", {"item-name.nullius-calcium-chloride"}}}, enabled = false, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, category = "distillation", @@ -2493,7 +2574,7 @@ data:extend({ data.raw.fluid["nullius-calcium-chloride-solution"].icons[3], data.raw.fluid["nullius-calcium-chloride-solution"].icons[4], { - icon = "__angelspetrochem__/graphics/icons/solid-calcium-chloride.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-calcium-chloride.png", icon_size = 32, scale = 0.4, shift = {-11, -12} @@ -2520,7 +2601,7 @@ data:extend({ name = "nullius-boxed-calcium-chloride-hydration", localised_name = {"recipe-name.nullius-hydration", {"item-name.nullius-box", {"item-name.nullius-calcium-chloride"}}}, - icons = { + icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 @@ -2529,18 +2610,18 @@ data:extend({ data.raw.fluid["nullius-calcium-chloride-solution"].icons[3], data.raw.fluid["nullius-calcium-chloride-solution"].icons[4], { - icon = "__angelspetrochem__/graphics/icons/solid-calcium-chloride.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-calcium-chloride.png", icon_size = 32, scale = 0.36, shift = {-10, -11} } }, enabled = false, - no_productivity = true, - show_amount_in_title = false, + no_productivity = true, + show_amount_in_title = false, always_show_products = true, category = "ore-flotation", - subgroup = "boxed-fluid", + subgroup = "boxed-fluid", order = "nullius-cd", energy_required = 5, ingredients = { @@ -2555,13 +2636,14 @@ data:extend({ type = "recipe", name = "nullius-calcium-chloride-decomposition", localised_name = {"recipe-name.nullius-calcium-chloride-decomposition"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/solid-lime.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-lime.png", icon_size = 32 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-chloride.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen-chloride.png", icon_size = 72, scale = 0.15, shift = {12, 12} @@ -2593,12 +2675,12 @@ data:extend({ icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/solid-lime.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-lime.png", icon_size = 32, scale = 0.9 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-chloride.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen-chloride.png", icon_size = 72, scale = 0.13, shift = {11, 11} @@ -2658,9 +2740,9 @@ data:extend({ subgroup = "silicon-product", order = "nullius-d", icons = {{ - icon = "__angelssmelting__/graphics/icons/powder-silica.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-silica.png", icon_size = 64, - icon_mipmaps = 4 + }}, stack_size = 100 }, @@ -2669,9 +2751,9 @@ data:extend({ name = "nullius-rutile", subgroup = "titanium-product", order = "nullius-b", - icon = "__angelssmelting__/graphics/icons/powder-titanium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-titanium.png", icon_size = 64, - icon_mipmaps = 4, + stack_size = 100 }, { @@ -2695,16 +2777,17 @@ data:extend({ type = "recipe", name = "nullius-silica-2", localised_name = {"recipe-name.nullius-silica-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/powder-silica.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-silica.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelssmelting__/graphics/icons/powder-titanium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-titanium.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.25, shift = {9, 9} } @@ -2727,7 +2810,7 @@ data:extend({ { type = "recipe", name = "nullius-boxed-silica-1", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-silica"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-silica"}}, " ", tostring(1)}, enabled = false, category = "ore-flotation", subgroup = "boxed-silicon", @@ -2745,22 +2828,22 @@ data:extend({ { type = "recipe", name = "nullius-boxed-silica-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-silica"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-silica"}}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/powder-silica.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-silica.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { - icon = "__angelssmelting__/graphics/icons/powder-titanium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-titanium.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.23, shift = {8, 8} } @@ -2822,7 +2905,7 @@ data:extend({ type = "item", name = "nullius-glass", icons = {{ - icon = "__angelssmelting__/graphics/icons/plate-glass.png", + icon = "__angelssmeltinggraphics__/graphics/icons/plate-glass.png", icon_size = 32, tint = {0.8, 0.8, 0.9} }}, @@ -2840,21 +2923,24 @@ data:extend({ category = "machine-casting", order = "nullius-bb", energy_required = 30, - ingredients = {{"nullius-silica", 3}}, - result = "nullius-glass" + ingredients = {{type="item", name="nullius-silica", amount = 3}}, + results = { + {type = "item", name = "nullius-glass", amount = 1} + } }, { type = "recipe", name = "nullius-soda-lime-glass-1", localised_name = {"recipe-name.nullius-soda-lime-glass-1"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/plate-glass.png", + icon = "__angelssmeltinggraphics__/graphics/icons/plate-glass.png", icon_size = 32, tint = {0.8, 0.8, 0.9} }, { - icon = "__angelspetrochem__/graphics/icons/solid-sodium-carbonate.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium-carbonate.png", icon_size = 32, scale = 0.4, shift = {10, -11} @@ -2867,9 +2953,9 @@ data:extend({ order = "nullius-bc", energy_required = 36, ingredients = { - {"nullius-silica", 9}, - {"nullius-soda-ash", 2}, - {"nullius-lime", 1} + {type="item", name="nullius-silica", amount = 9}, + {type="item", name="nullius-soda-ash", amount = 2}, + {type="item", name="nullius-lime", amount = 1} }, results = { {type="item", name="nullius-glass", amount=6}, @@ -2881,14 +2967,15 @@ data:extend({ type = "recipe", name = "nullius-soda-lime-glass-2", localised_name = {"recipe-name.nullius-soda-lime-glass-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/plate-glass.png", + icon = "__angelssmeltinggraphics__/graphics/icons/plate-glass.png", icon_size = 32, tint = {0.8, 0.8, 0.9} }, { - icon = "__angelssmelting__/graphics/icons/solid-aluminium-oxide.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-aluminium-oxide.png", icon_size = 32, scale = 0.4, shift = {10, -11} @@ -2901,11 +2988,11 @@ data:extend({ order = "nullius-bd", energy_required = 45, ingredients = { - {"nullius-silica", 12}, - {"nullius-alumina", 3}, - {"nullius-lime", 3}, - {"nullius-soda-ash", 3}, - {"nullius-sodium-sulfate", 1} + {type="item", name="nullius-silica", amount = 12}, + {type="item", name="nullius-alumina", amount = 3}, + {type="item", name="nullius-lime", amount = 3}, + {type="item", name="nullius-soda-ash", amount = 3}, + {type="item", name="nullius-sodium-sulfate", amount = 1} }, results = { {type="item", name="nullius-glass", amount=16}, @@ -2923,11 +3010,11 @@ data:extend({ subgroup = "boxed-glass", energy_required = 225, ingredients = { - {"nullius-box-silica", 12}, - {"nullius-box-alumina", 3}, - {"nullius-box-lime", 3}, - {"nullius-box-soda-ash", 3}, - {"nullius-box-sodium-sulfate", 1} + {type="item", name="nullius-box-silica", amount = 12}, + {type="item", name="nullius-box-alumina", amount = 3}, + {type="item", name="nullius-box-lime", amount = 3}, + {type="item", name="nullius-box-soda-ash", amount = 3}, + {type="item", name="nullius-box-sodium-sulfate", amount = 1} }, results = { {type="item", name="nullius-box-glass", amount=16}, @@ -2940,7 +3027,7 @@ data:extend({ type = "item", name = "nullius-hard-glass", icons = {{ - icon = "__angelssmelting__/graphics/icons/plate-glass.png", + icon = "__angelssmeltinggraphics__/graphics/icons/plate-glass.png", icon_size = 32, tint = {1, 1, 1, 0.5} }}, @@ -2957,13 +3044,14 @@ data:extend({ category = "dry-smelting", energy_required = 50, ingredients = { - {"nullius-silica", 5}, - {"nullius-alumina", 3}, - {"nullius-lime", 2}, - {"nullius-acid-boric", 1} + {type="item", name="nullius-silica", amount = 5}, + {type="item", name="nullius-alumina", amount = 3}, + {type="item", name="nullius-lime", amount = 2}, + {type="item", name="nullius-acid-boric", amount = 1} }, - result = "nullius-hard-glass", - result_count = 4 + results = { + {type = "item", name = "nullius-hard-glass", amount = 4} + } }, { type = "recipe", @@ -2975,21 +3063,22 @@ data:extend({ subgroup = "boxed-glass", energy_required = 50, ingredients = { - {"nullius-box-silica", 5}, - {"nullius-box-alumina", 3}, - {"nullius-box-lime", 2}, - {"nullius-box-acid-boric", 1} + {type="item", name="nullius-box-silica", amount = 5}, + {type="item", name="nullius-box-alumina", amount = 3}, + {type="item", name="nullius-box-lime", amount = 2}, + {type="item", name="nullius-box-acid-boric", amount = 1} }, - result = "nullius-box-hard-glass", - result_count = 4 + results = { + {type = "item", name = "nullius-box-hard-glass", amount = 4} + } }, { type = "item", name = "nullius-glass-fiber", - icon = "__angelssmelting__/graphics/icons/wire-coil-glass.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-coil-glass.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "glass-product", order = "nullius-d", stack_size = 100 @@ -3098,7 +3187,7 @@ data:extend({ subgroup = "masonry-material", order = "nullius-l", icons = {{ - icon = "__angelsrefining__/graphics/icons/stone-crushed.png", + icon = "__angelsrefininggraphics__/graphics/icons/stone-crushed.png", icon_size = 32, tint = {r=0.95, g=0.85, b=0.75} }}, @@ -3111,7 +3200,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/iron-plate.png", icon_size = 64, - icon_mipmaps = 4, + tint = {r=0.75, g=0.85, b=0.95} }}, subgroup = "iron-product", @@ -3124,7 +3213,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/iron-stick.png", icon_size = 64, - icon_mipmaps = 4, + tint = {r=0.65, g=0.75, b=0.8} }}, subgroup = "iron-product", @@ -3134,7 +3223,7 @@ data:extend({ { type = "item", name = "nullius-steel-rod", - icon = "__angelssmelting__/graphics/icons/rod-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/rod-steel.png", icon_size = 32, subgroup = "steel-product", order = "nullius-e", @@ -3143,7 +3232,7 @@ data:extend({ { type = "item", name = "nullius-aluminum-rod", - icon = "__angelssmelting__/graphics/icons/rod-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/rod-aluminium.png", icon_size = 32, subgroup = "aluminum-product", order = "nullius-g", @@ -3152,30 +3241,33 @@ data:extend({ { type = "recipe", name = "nullius-iron-rod-1", + localised_name = {"item-name.nullius-iron-rod"}, enabled = false, show_amount_in_title = false, always_show_products = true, category = "machine-casting", energy_required = 4, ingredients = { - {"nullius-iron-ingot", 4} + {type = "item", name = "nullius-iron-ingot", amount = 4} }, - result = "nullius-iron-rod", - result_count = 5 + results = { + {type = "item", name = "nullius-iron-rod", amount = 5} + } }, { type = "recipe", name = "nullius-iron-rod-2", localised_name = {"recipe-name.nullius-iron-rod-2"}, + hide_from_signal_gui = false, icons = { { icon = "__base__/graphics/icons/iron-stick.png", icon_size = 64, - icon_mipmaps = 4, + tint = {r=0.65, g=0.75, b=0.8} }, { - icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-chloride.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen-chloride.png", icon_size = 72, scale = 0.16, shift = {11, -12} @@ -3215,28 +3307,31 @@ data:extend({ { type = "recipe", name = "nullius-steel-rod-1", + localised_name = {"item-name.nullius-steel-rod"}, enabled = false, show_amount_in_title = false, always_show_products = true, category = "machine-casting", energy_required = 5, ingredients = { - {"nullius-steel-ingot", 4} + {type = "item", name = "nullius-steel-ingot", amount = 4} }, - result = "nullius-steel-rod", - result_count = 5 + results = { + {type = "item", name = "nullius-steel-rod", amount = 5} + } }, { type = "recipe", name = "nullius-steel-rod-2", localised_name = {"recipe-name.nullius-steel-rod-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/rod-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/rod-steel.png", icon_size = 32 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/sulfuric-acid.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/sulfuric-acid.png", icon_size = 72, scale = 0.18, shift = {-10, -11} @@ -3276,24 +3371,27 @@ data:extend({ { type = "recipe", name = "nullius-aluminum-rod-1", + localised_name = {"item-name.nullius-aluminum-rod"}, enabled = false, show_amount_in_title = false, always_show_products = true, category = "machine-casting", energy_required = 4, ingredients = { - {"nullius-aluminum-ingot", 4} + {type = "item", name = "nullius-aluminum-ingot", amount = 4} }, - result = "nullius-aluminum-rod", - result_count = 5 + results = { + {type = "item", name = "nullius-aluminum-rod", amount = 5} + } }, { type = "recipe", name = "nullius-aluminum-rod-2", localised_name = {"recipe-name.nullius-aluminum-rod-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/rod-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/rod-aluminium.png", icon_size = 32 }, { @@ -3339,7 +3437,7 @@ data:extend({ name = "nullius-steel-beam", icon = "__base__/graphics/icons/steel-plate.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "steel-product", order = "nullius-l", stack_size = 100 @@ -3353,10 +3451,11 @@ data:extend({ category = "machine-casting", energy_required = 2, ingredients = { - {"nullius-steel-ingot", 3} + {type = "item", name = "nullius-steel-ingot", amount = 3} }, - result = "nullius-steel-beam", - result_count = 2 + results = { + {type = "item", name = "nullius-steel-beam", amount = 2} + } }, { type = "recipe", @@ -3368,16 +3467,17 @@ data:extend({ subgroup = "boxed-steel", energy_required = 10, ingredients = { - {"nullius-box-steel-ingot", 3} + {type = "item", name = "nullius-box-steel-ingot", amount = 3} }, - result = "nullius-box-steel-beam", - result_count = 2 + results = { + {type = "item", name = "nullius-box-steel-beam", amount = 2} + } }, { type = "item", name = "nullius-aluminum-plate", - icon = "__angelssmelting__/graphics/icons/plate-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/plate-aluminium.png", icon_size = 32, subgroup = "aluminum-product", order = "nullius-f", @@ -3386,7 +3486,7 @@ data:extend({ { type = "item", name = "nullius-steel-plate", - icon = "__angelssmelting__/graphics/icons/plate-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/plate-steel.png", icon_size = 32, subgroup = "steel-product", order = "nullius-c", @@ -3395,24 +3495,27 @@ data:extend({ { type = "recipe", name = "nullius-aluminum-plate-1", + localised_name = {"item-name.nullius-aluminum-plate"}, enabled = false, show_amount_in_title = false, always_show_products = true, category = "machine-casting", energy_required = 4, ingredients = { - {"nullius-aluminum-ingot", 4} + {type = "item", name = "nullius-aluminum-ingot", amount = 4} }, - result = "nullius-aluminum-plate", - result_count = 3 + results = { + {type = "item", name = "nullius-aluminum-plate", amount = 3} + } }, { type = "recipe", name = "nullius-aluminum-plate-2", localised_name = {"recipe-name.nullius-aluminum-plate-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/plate-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/plate-aluminium.png", icon_size = 32 }, { @@ -3456,30 +3559,33 @@ data:extend({ { type = "recipe", name = "nullius-iron-plate-1", + localised_name = {"item-name.nullius-iron-plate"}, enabled = false, show_amount_in_title = false, always_show_products = true, category = "machine-casting", energy_required = 3, ingredients = { - {"nullius-iron-ingot", 4} + {type = "item", name = "nullius-iron-ingot", amount = 4} + }, + results = { + {type = "item", name = "nullius-iron-plate", amount = 3} }, - result = "nullius-iron-plate", - result_count = 3 }, { type = "recipe", name = "nullius-iron-plate-2", localised_name = {"recipe-name.nullius-iron-plate-2"}, + hide_from_signal_gui = false, icons = { { icon = "__base__/graphics/icons/iron-plate.png", icon_size = 64, - icon_mipmaps = 4, + tint = {r=0.75, g=0.85, b=0.95} }, { - icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-chloride.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/hydrogen-chloride.png", icon_size = 72, scale = 0.16, shift = {11, -12} @@ -3519,28 +3625,31 @@ data:extend({ { type = "recipe", name = "nullius-steel-plate-1", + localised_name = {"item-name.nullius-steel-plate"}, enabled = false, show_amount_in_title = false, always_show_products = true, category = "machine-casting", energy_required = 4, ingredients = { - {"nullius-steel-ingot", 4} + {type = "item", name = "nullius-steel-ingot", amount = 4} }, - result = "nullius-steel-plate", - result_count = 3 + results = { + {type = "item", name = "nullius-steel-plate", amount = 3} + } }, { type = "recipe", name = "nullius-steel-plate-2", localised_name = {"recipe-name.nullius-steel-plate-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/plate-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/plate-steel.png", icon_size = 32 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/sulfuric-acid.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/sulfuric-acid.png", icon_size = 72, scale = 0.18, shift = {10, -11} @@ -3580,9 +3689,9 @@ data:extend({ { type = "item", name = "nullius-iron-sheet", - icon = "__angelssmelting__/graphics/icons/roll-iron.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-iron.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "iron-product", order = "nullius-d", stack_size = 100 @@ -3591,9 +3700,9 @@ data:extend({ type = "item", name = "nullius-steel-sheet", order = "nullius-f", - icon = "__angelssmelting__/graphics/icons/roll-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-steel.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "steel-product", stack_size = 100 }, @@ -3601,9 +3710,9 @@ data:extend({ type = "item", name = "nullius-aluminum-sheet", order = "nullius-e", - icon = "__angelssmelting__/graphics/icons/roll-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-aluminium.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "aluminum-product", order = "nullius-h", stack_size = 100 @@ -3611,9 +3720,9 @@ data:extend({ { type = "item", name = "nullius-copper-sheet", - icon = "__angelssmelting__/graphics/icons/roll-copper.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-copper.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "copper", order = "nullius-f", stack_size = 100 @@ -3621,6 +3730,7 @@ data:extend({ { type = "recipe", name = "nullius-iron-sheet-1", + localised_name = {"item-name.nullius-iron-sheet"}, enabled = false, category = "hand-casting", always_show_made_in = true, @@ -3628,25 +3738,27 @@ data:extend({ always_show_products = true, energy_required = 5, ingredients = { - {"nullius-iron-plate", 5} + {type = "item", name = "nullius-iron-plate", amount = 5} }, - result = "nullius-iron-sheet", - result_count = 6 + results = { + {type = "item", name = "nullius-iron-sheet", amount = 6} + } }, { type = "recipe", name = "nullius-iron-sheet-2", localised_name = {"recipe-name.nullius-iron-sheet-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/roll-iron.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-iron.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/fluid/lubricant.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.25, shift = {12, -10} } @@ -3662,8 +3774,9 @@ data:extend({ {type="item", name="nullius-iron-plate", amount=6}, {type="fluid", name="nullius-lubricant", amount=1} }, - result = "nullius-iron-sheet", - result_count = 8 + results = { + {type = "item", name = "nullius-iron-sheet", amount = 8} + } }, { type = "recipe", @@ -3680,13 +3793,15 @@ data:extend({ {type="item", name="nullius-box-iron-plate", amount=6}, {type="fluid", name="nullius-lubricant", amount=5} }, - result = "nullius-box-iron-sheet", - result_count = 8 + results = { + {type = "item", name = "nullius-box-iron-sheet", amount = 8} + } }, { type = "recipe", name = "nullius-steel-sheet-1", + localised_name = {"item-name.nullius-steel-sheet"}, enabled = false, category = "hand-casting", always_show_made_in = true, @@ -3694,25 +3809,27 @@ data:extend({ always_show_products = true, energy_required = 5, ingredients = { - {"nullius-steel-plate", 5} + {type = "item", name = "nullius-steel-plate", amount = 5} }, - result = "nullius-steel-sheet", - result_count = 6 + results = { + {type = "item", name = "nullius-steel-sheet", amount = 6} + } }, { type = "recipe", name = "nullius-steel-sheet-2", localised_name = {"recipe-name.nullius-steel-sheet-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/roll-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-steel.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/fluid/lubricant.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.25, shift = {12, -10} } @@ -3728,8 +3845,9 @@ data:extend({ {type="item", name="nullius-steel-plate", amount=5}, {type="fluid", name="nullius-lubricant", amount=2} }, - result = "nullius-steel-sheet", - result_count = 7 + results = { + {type = "item", name = "nullius-steel-sheet", amount = 7} + } }, { type = "recipe", @@ -3746,13 +3864,15 @@ data:extend({ {type="item", name="nullius-box-steel-plate", amount=5}, {type="fluid", name="nullius-lubricant", amount=10} }, - result = "nullius-box-steel-sheet", - result_count = 7 + results = { + {type = "item", name = "nullius-box-steel-sheet", amount = 7} + } }, { type = "recipe", name = "nullius-aluminum-sheet-1", + localised_name = {"item-name.nullius-aluminum-sheet"}, enabled = false, category = "hand-casting", always_show_made_in = true, @@ -3760,25 +3880,27 @@ data:extend({ always_show_products = true, energy_required = 4, ingredients = { - {"nullius-aluminum-plate", 4} + {type = "item", name = "nullius-aluminum-plate", amount = 4} }, - result = "nullius-aluminum-sheet", - result_count = 5 + results = { + {type = "item", name = "nullius-aluminum-sheet", amount = 5} + } }, { type = "recipe", name = "nullius-aluminum-sheet-2", localised_name = {"recipe-name.nullius-aluminum-sheet-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/roll-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-aluminium.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/fluid/lubricant.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.25, shift = {12, -10} } @@ -3794,8 +3916,9 @@ data:extend({ {type="item", name="nullius-aluminum-plate", amount=5}, {type="fluid", name="nullius-lubricant", amount=1} }, - result = "nullius-aluminum-sheet", - result_count = 7 + results = { + {type = "item", name = "nullius-aluminum-sheet", amount = 7} + } }, { type = "recipe", @@ -3812,8 +3935,9 @@ data:extend({ {type="item", name="nullius-box-aluminum-plate", amount=5}, {type="fluid", name="nullius-lubricant", amount=5} }, - result = "nullius-box-aluminum-sheet", - result_count = 7 + results = { + {type = "item", name = "nullius-box-aluminum-sheet", amount = 7} + } }, { @@ -3822,7 +3946,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/iron-gear-wheel.png", icon_size = 64, - icon_mipmaps = 4, + tint = {r=0.8, g=0.9, b=1} }}, subgroup = "iron-product", @@ -3839,11 +3963,12 @@ data:extend({ always_show_products = true, energy_required = 4, ingredients = { - {"nullius-iron-plate", 2}, - {"nullius-iron-rod", 1} + {type = "item", name = "nullius-iron-plate", amount = 2}, + {type = "item", name = "nullius-iron-rod", amount = 1} }, - result = "nullius-iron-gear", - result_count = 2 + results = { + {type = "item", name = "nullius-iron-gear", amount = 2} + } }, { type = "recipe", @@ -3856,11 +3981,12 @@ data:extend({ always_show_products = true, energy_required = 20, ingredients = { - {"nullius-box-iron-plate", 2}, - {"nullius-box-iron-rod", 1} + {type = "item", name = "nullius-box-iron-plate", amount = 2}, + {type = "item", name = "nullius-box-iron-rod", amount = 1} }, - result = "nullius-box-iron-gear", - result_count = 2 + results = { + {type = "item", name = "nullius-box-iron-gear", amount = 2} + } }, { @@ -3882,11 +4008,12 @@ data:extend({ always_show_products = true, energy_required = 6, ingredients = { - {"nullius-steel-plate", 2}, - {"nullius-steel-rod", 1} + {type = "item", name = "nullius-steel-plate", amount = 2}, + {type = "item", name = "nullius-steel-rod", amount = 1} }, - result = "nullius-steel-gear", - result_count = 2 + results = { + {type = "item", name = "nullius-steel-gear", amount = 2} + } }, { type = "recipe", @@ -3899,11 +4026,12 @@ data:extend({ always_show_products = true, energy_required = 30, ingredients = { - {"nullius-box-steel-plate", 2}, - {"nullius-box-steel-rod", 1} + {type = "item", name = "nullius-box-steel-plate", amount = 2}, + {type = "item", name = "nullius-box-steel-rod", amount = 1} }, - result = "nullius-box-steel-gear", - result_count = 2 + results = { + {type = "item", name = "nullius-box-steel-gear", amount = 2} + } }, { @@ -3911,9 +4039,9 @@ data:extend({ name = "nullius-iron-wire", icons = { { - icon = "__angelssmelting__/graphics/icons/wire-coil-silver.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-coil-silver.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.8, 0.825, 0.85} } }, @@ -3925,9 +4053,9 @@ data:extend({ type = "item", name = "nullius-copper-wire", icons = {{ - icon = "__angelssmelting__/graphics/icons/wire-coil-copper.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-coil-copper.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "copper", order = "nullius-g", @@ -3938,9 +4066,9 @@ data:extend({ name = "nullius-aluminum-wire", icons = { { - icon = "__angelssmelting__/graphics/icons/wire-coil-gold.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-coil-gold.png", icon_size = 64, - icon_mipmaps = 4, + tint = {r=0.8, g=0.9, b=1} } }, @@ -3953,9 +4081,9 @@ data:extend({ name = "nullius-aluminum-powder", icons = { { - icon = "__angelssmelting__/graphics/icons/powder-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-aluminium.png", icon_size = 64, - icon_mipmaps = 4 + } }, subgroup = "aluminum-product", @@ -3967,9 +4095,9 @@ data:extend({ name = "nullius-steel-wire", icons = { { - icon = "__angelssmelting__/graphics/icons/wire-coil-platinum.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-coil-platinum.png", icon_size = 64, - icon_mipmaps = 4, + tint = {r=0.75, g=0.875, b=1} } }, @@ -3980,7 +4108,7 @@ data:extend({ { type = "item", name = "nullius-steel-cable", - icon = "__angelssmelting__/graphics/icons/wire-silver.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-silver.png", icon_size = 32, subgroup = "steel-product", order = "nullius-i", @@ -3989,6 +4117,7 @@ data:extend({ { type = "recipe", name = "nullius-iron-wire-1", + localised_name = {"item-name.nullius-iron-wire"}, enabled = false, category = "hand-casting", always_show_made_in = true, @@ -3996,26 +4125,28 @@ data:extend({ always_show_products = true, energy_required = 4, ingredients = { - {"nullius-iron-rod", 3} + {type = "item", name = "nullius-iron-rod", amount = 3} }, - result = "nullius-iron-wire", - result_count = 4 + results = { + {type = "item", name = "nullius-iron-wire", amount = 4} + } }, { type = "recipe", name = "nullius-iron-wire-2", localised_name = {"recipe-name.nullius-iron-wire-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/wire-coil-silver.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-coil-silver.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.8, 0.825, 0.85} }, { icon = "__base__/graphics/icons/fluid/lubricant.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.25, shift = {12, -10} } @@ -4031,8 +4162,9 @@ data:extend({ {type="item", name="nullius-iron-rod", amount=5}, {type="fluid", name="nullius-lubricant", amount=1} }, - result = "nullius-iron-wire", - result_count = 8 + results = { + {type = "item", name = "nullius-iron-wire", amount = 8} + } }, { type = "recipe", @@ -4049,13 +4181,15 @@ data:extend({ {type="item", name="nullius-box-iron-rod", amount=5}, {type="fluid", name="nullius-lubricant", amount=5} }, - result = "nullius-box-iron-wire", - result_count = 8 + results = { + {type = "item", name = "nullius-box-iron-wire", amount = 8} + } }, { type = "recipe", name = "nullius-aluminum-wire-1", + localised_name = {"item-name.nullius-aluminum-wire"}, enabled = false, category = "hand-casting", always_show_made_in = true, @@ -4063,26 +4197,28 @@ data:extend({ always_show_products = true, energy_required = 5, ingredients = { - {"nullius-aluminum-rod", 5} + {type = "item", name = "nullius-aluminum-rod", amount = 5} }, - result = "nullius-aluminum-wire", - result_count = 7 + results = { + {type = "item", name = "nullius-aluminum-wire", amount = 7} + } }, { type = "recipe", name = "nullius-aluminum-wire-2", localised_name = {"recipe-name.nullius-aluminum-wire-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/wire-coil-gold.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-coil-gold.png", icon_size = 64, - icon_mipmaps = 4, + tint = {r=0.8, g=0.9, b=1} }, { icon = "__base__/graphics/icons/fluid/lubricant.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.25, shift = {12, -10} } @@ -4098,8 +4234,9 @@ data:extend({ {type="item", name="nullius-aluminum-rod", amount=6}, {type="fluid", name="nullius-lubricant", amount=1} }, - result = "nullius-aluminum-wire", - result_count = 10 + results = { + {type = "item", name = "nullius-aluminum-wire", amount = 10} + } }, { type = "recipe", @@ -4116,8 +4253,9 @@ data:extend({ {type="item", name="nullius-box-aluminum-rod", amount=6}, {type="fluid", name="nullius-lubricant", amount=5} }, - result = "nullius-box-aluminum-wire", - result_count = 10 + results = { + {type = "item", name = "nullius-box-aluminum-wire", amount = 10} + } }, { type = "recipe", @@ -4132,8 +4270,9 @@ data:extend({ {type="item", name="nullius-aluminum-wire", amount=2}, {type="fluid", name="nullius-nitrogen", amount=12} }, - result = "nullius-aluminum-powder", - result_count = 3 + results = { + {type = "item", name = "nullius-aluminum-powder", amount = 3} + } }, { type = "recipe", @@ -4150,8 +4289,9 @@ data:extend({ {type="item", name="nullius-box-aluminum-wire", amount=2}, {type="fluid", name="nullius-nitrogen", amount=60} }, - result = "nullius-box-aluminum-powder", - result_count = 3 + results = { + {type = "item", name = "nullius-box-aluminum-powder", amount = 3} + } }, { @@ -4166,8 +4306,9 @@ data:extend({ {type="item", name="nullius-steel-rod", amount=2}, {type="fluid", name="nullius-lubricant", amount=1} }, - result = "nullius-steel-wire", - result_count = 3 + results = { + {type = "item", name = "nullius-steel-wire", amount = 3} + } }, { type = "recipe", @@ -4182,8 +4323,9 @@ data:extend({ {type="item", name="nullius-box-steel-rod", amount=2}, {type="fluid", name="nullius-lubricant", amount=5} }, - result = "nullius-box-steel-wire", - result_count = 3 + results = { + {type = "item", name = "nullius-box-steel-wire", amount = 3} + } }, { type = "recipe", @@ -4197,8 +4339,9 @@ data:extend({ {type="item", name="nullius-steel-wire", amount=7}, {type="fluid", name="nullius-lubricant", amount=2, fluidbox_index=1} }, - result = "nullius-steel-cable", - result_count = 2 + results = { + {type = "item", name = "nullius-steel-cable", amount = 2} + } }, { type = "recipe", @@ -4213,13 +4356,14 @@ data:extend({ {type="item", name="nullius-box-steel-wire", amount=7}, {type="fluid", name="nullius-lubricant", amount=10, fluidbox_index=1} }, - result = "nullius-box-steel-cable", - result_count = 2 + results = { + {type = "item", name = "nullius-box-steel-cable", amount = 2} + } }, { type = "recipe", name = "nullius-insulated-wire-1", - localised_name = {"", {"item-name.nullius-insulated-wire"}, " ", 1}, + localised_name = {"", {"item-name.nullius-insulated-wire"}, " ", tostring(1)}, enabled = false, category = "small-crafting", always_show_made_in = true, @@ -4227,16 +4371,17 @@ data:extend({ always_show_products = true, energy_required = 6, ingredients = { - {"nullius-aluminum-wire", 3}, - {"nullius-rubber", 2} + {type = "item", name = "nullius-aluminum-wire", amount = 3}, + {type = "item", name = "nullius-rubber", amount = 2} }, - result = "copper-cable", - result_count = 4 + results = { + {type = "item", name = "copper-cable", amount = 4} + } }, { type = "recipe", name = "nullius-boxed-insulated-wire-1", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-insulated-wire"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-insulated-wire"}}, " ", tostring(1)}, enabled = false, category = "large-assembly", subgroup = "boxed-electrical", @@ -4245,26 +4390,28 @@ data:extend({ always_show_products = true, energy_required = 30, ingredients = { - {"nullius-box-aluminum-wire", 3}, - {"nullius-box-rubber", 2} + {type = "item", name = "nullius-box-aluminum-wire", amount = 3}, + {type = "item", name = "nullius-box-rubber", amount = 2} }, - result = "nullius-box-insulated-wire", - result_count = 4 + results = { + {type = "item", name = "nullius-box-insulated-wire", amount = 4} + } }, { type = "recipe", name = "nullius-insulated-wire-2", - localised_name = {"", {"item-name.nullius-insulated-wire"}, " ", 2}, - icons = { + localised_name = {"", {"item-name.nullius-insulated-wire"}, " ", tostring(2)}, + hide_from_signal_gui = false, + icons = { { - icon = "__angelssmelting__/graphics/icons/wire-coil-tin.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-coil-tin.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelssmelting__/graphics/icons/ingot-copper.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-copper.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.25, shift = {12, -10} } @@ -4276,31 +4423,32 @@ data:extend({ category = "small-crafting", energy_required = 4, ingredients = { - {"nullius-copper-wire", 1}, - {"nullius-rubber", 2} + {type = "item", name = "nullius-copper-wire", amount = 1}, + {type = "item", name = "nullius-rubber", amount = 2} }, - result = "copper-cable", - result_count = 6 + results = { + {type = "item", name = "copper-cable", amount = 6} + } }, { type = "recipe", name = "nullius-boxed-insulated-wire-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-insulated-wire"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-insulated-wire"}}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/wire-coil-tin.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-coil-tin.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { - icon = "__angelssmelting__/graphics/icons/ingot-copper.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-copper.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.22, shift = {11, -9} } @@ -4313,20 +4461,21 @@ data:extend({ subgroup = "boxed-electrical", energy_required = 20, ingredients = { - {"nullius-box-copper-wire", 1}, - {"nullius-box-rubber", 2} + {type = "item", name = "nullius-box-copper-wire", amount = 1}, + {type = "item", name = "nullius-box-rubber", amount = 2} }, - result = "nullius-box-insulated-wire", - result_count = 6 + results = { + {type = "item", name = "nullius-box-insulated-wire", amount = 6} + } }, { type = "item", name = "nullius-optical-cable", icons = {{ - icon = "__angelssmelting__/graphics/icons/wire-coil-gold.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-coil-gold.png", icon_size = 64, - icon_mipmaps = 4, + tint = {1, 0.6, 1} }}, subgroup = "electronic-intermediate", @@ -4340,13 +4489,15 @@ data:extend({ category = "small-fluid-assembly", energy_required = 3, ingredients = { - {type="item", name="red-wire", amount=2}, + {type="item", name="nullius-red-wire", amount=2}, {type="item", name="nullius-glass-fiber", amount=1}, {type="item", name="nullius-plastic", amount=1}, {type="fluid", name="nullius-epoxy", amount=1}, {type="fluid", name="nullius-argon", amount=1} }, - result = "nullius-optical-cable" + results = { + {type = "item", name = "nullius-optical-cable", amount = 1} + } }, { type = "recipe", @@ -4362,7 +4513,9 @@ data:extend({ {type="fluid", name="nullius-epoxy", amount=5}, {type="fluid", name="nullius-argon", amount=5} }, - result = "nullius-box-optical-cable" + results = { + {type = "item", name = "nullius-box-optical-cable", amount = 1} + } }, { @@ -4379,7 +4532,7 @@ data:extend({ name = "nullius-motor-2", icon = "__base__/graphics/icons/electric-engine-unit.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "mechanical-intermediate", order = "nullius-dc", stack_size = 50 @@ -4401,12 +4554,14 @@ data:extend({ always_show_made_in = true, energy_required = 8, ingredients = { - {"nullius-iron-wire", 2}, - {"nullius-iron-plate", 1}, - {"nullius-plastic", 1}, - {"nullius-iron-rod", 1} + {type = "item", name = "nullius-iron-wire", amount = 2}, + {type = "item", name = "nullius-iron-plate", amount = 1}, + {type = "item", name = "nullius-plastic", amount = 1}, + {type = "item", name = "nullius-iron-rod", amount = 1} }, - result = "nullius-motor-1" + results = { + {type = "item", name = "nullius-motor-1", amount = 1} + } }, { type = "recipe", @@ -4418,11 +4573,13 @@ data:extend({ always_show_made_in = true, energy_required = 30, ingredients = { - {"nullius-box-insulated-wire", 1}, - {"nullius-box-iron-plate", 1}, - {"nullius-box-iron-rod", 1} + {type = "item", name = "nullius-box-insulated-wire", amount = 1}, + {type = "item", name = "nullius-box-iron-plate", amount = 1}, + {type = "item", name = "nullius-box-iron-rod", amount = 1} }, - result = "nullius-box-motor-1" + results = { + {type = "item", name = "nullius-box-motor-1", amount = 1} + } }, { type = "recipe", @@ -4437,7 +4594,9 @@ data:extend({ {type="item", name="nullius-steel-rod", amount=1}, {type="fluid", name="nullius-lubricant", amount=5, fluidbox_index=1} }, - result = "nullius-motor-2" + results = { + {type = "item", name = "nullius-motor-2", amount = 1} + } }, { type = "recipe", @@ -4454,7 +4613,9 @@ data:extend({ {type="item", name="nullius-box-steel-rod", amount=1}, {type="fluid", name="nullius-lubricant", amount=30, fluidbox_index=1} }, - result = "nullius-box-motor-2" + results = { + {type = "item", name = "nullius-box-motor-2", amount = 1} + } }, { type = "recipe", @@ -4471,7 +4632,9 @@ data:extend({ {type="item", name="nullius-bearing", amount=1}, {type="fluid", name="nullius-epoxy", amount=5, fluidbox_index=1} }, - result = "nullius-motor-3" + results = { + {type = "item", name = "nullius-motor-3", amount = 1} + } }, { type = "recipe", @@ -4490,27 +4653,29 @@ data:extend({ {type="item", name="nullius-box-bearing", amount=1}, {type="fluid", name="nullius-epoxy", amount=25, fluidbox_index=1} }, - result = "nullius-box-motor-3" + results = { + {type = "item", name = "nullius-box-motor-3", amount = 1} + } }, { type = "item", name = "nullius-refractory-brick", - icon = "__angelssmelting__/graphics/icons/brick-clay.png", + icon = "__angelssmeltinggraphics__/graphics/icons/brick-clay.png", icon_size = 32, subgroup = "masonry", order = "nullius-c", stack_size = 500, place_as_tile = { - result = "clay-bricks", + result = "nullius-tile-clay-brick", condition_size = 1, - condition = { "water-tile" } + condition = { layers = {water_tile=true} } } }, { type = "recipe", name = "nullius-refractory-brick-1", - localised_name = {"", {"item-name.nullius-refractory-brick"}, " ", 1}, + localised_name = {"", {"item-name.nullius-refractory-brick"}, " ", tostring(1)}, order = "nullius-cb", enabled = false, show_amount_in_title = false, @@ -4518,24 +4683,26 @@ data:extend({ category = "dry-smelting", energy_required = 15, ingredients = { - {"nullius-silica", 3} + {type = "item", name = "nullius-silica", amount = 3} }, - result = "nullius-refractory-brick", - result_count = 5 + results = { + {type = "item", name = "nullius-refractory-brick", amount = 5} + } }, { type = "recipe", name = "nullius-refractory-brick-2", - localised_name = {"", {"item-name.nullius-refractory-brick"}, " ", 2}, + localised_name = {"", {"item-name.nullius-refractory-brick"}, " ", tostring(2)}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/brick-clay.png", + icon = "__angelssmeltinggraphics__/graphics/icons/brick-clay.png", icon_size = 32 }, { - icon = "__angelssmelting__/graphics/icons/powder-platinum.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-platinum.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.2, shift = {-10, -12} } @@ -4547,10 +4714,11 @@ data:extend({ category = "dry-smelting", energy_required = 8, ingredients = { - {"nullius-ceramic-powder", 2} + {type = "item", name = "nullius-ceramic-powder", amount = 2} }, - result = "nullius-refractory-brick", - result_count = 12 + results = { + {type = "item", name = "nullius-refractory-brick", amount = 12} + } }, { type = "recipe", @@ -4562,17 +4730,18 @@ data:extend({ subgroup = "boxed-terrain", energy_required = 8, ingredients = { - {"nullius-box-ceramic-powder", 2} + {type = "item", name = "nullius-box-ceramic-powder", amount = 2} }, - result = "nullius-box-refractory-brick", - result_count = 6 + results = { + {type = "item", name = "nullius-box-refractory-brick", amount = 6} + } }, { type = "item", name = "nullius-crucible", icons = {{ - icon = "__angelssmelting__/graphics/icons/silicon-crucible.png", + icon = "__angelssmeltinggraphics__/graphics/icons/silicon-crucible.png", icon_size = 32, tint = {1, 1, 1, 0.6} }}, @@ -4583,7 +4752,7 @@ data:extend({ { type = "recipe", name = "nullius-crucible", - localised_name = {"", {"item-name.nullius-crucible"}, " ", 1}, + localised_name = {"", {"item-name.nullius-crucible"}, " ", tostring(1)}, enabled = false, show_amount_in_title = false, always_show_products = true, @@ -4591,24 +4760,27 @@ data:extend({ category = "machine-casting", energy_required = 50, ingredients = { - {"nullius-silica", 12} + {type = "item", name = "nullius-silica", amount = 12} }, - result = "nullius-crucible" + results = { + {type = "item", name = "nullius-crucible", amount = 1} + } }, { type = "recipe", name = "nullius-crucible-2", - localised_name = {"", {"item-name.nullius-crucible"}, " ", 2}, + localised_name = {"", {"item-name.nullius-crucible"}, " ", tostring(2)}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/silicon-crucible.png", + icon = "__angelssmeltinggraphics__/graphics/icons/silicon-crucible.png", icon_size = 32, tint = {1, 1, 1, 0.6} }, { - icon = "__angelssmelting__/graphics/icons/powder-platinum.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-platinum.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.2, shift = {-10, -12} } @@ -4636,9 +4808,9 @@ data:extend({ { type = "item", name = "nullius-aluminum-carbide", - icon = "__angelssmelting__/graphics/icons/powder-lead.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-lead.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "aluminum-ingot", order = "nullius-f", stack_size = 100 @@ -4646,7 +4818,7 @@ data:extend({ { type = "item", name = "nullius-alumina", - icon = "__angelssmelting__/graphics/icons/solid-aluminium-oxide.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-aluminium-oxide.png", icon_size = 32, subgroup = "aluminum-ingot", order = "nullius-e", @@ -4655,10 +4827,10 @@ data:extend({ { type = "recipe", name = "nullius-bauxite-flotation-1", - localised_name = {"", {"item-name.nullius-aluminum-hydroxide"}, " ", 1}, + localised_name = {"", {"item-name.nullius-aluminum-hydroxide"}, " ", tostring(1)}, enabled = false, category = "ore-flotation", - subgroup = "alumina", + subgroup = "alumina", order = "nullius-db", energy_required = 5, ingredients = { @@ -4674,7 +4846,7 @@ data:extend({ { type = "recipe", name = "nullius-boxed-bauxite-flotation-1", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-aluminum-hydroxide"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-aluminum-hydroxide"}}, " ", tostring(1)}, enabled = false, category = "ore-flotation", subgroup = "boxed-aluminum-1", @@ -4693,14 +4865,15 @@ data:extend({ { type = "recipe", name = "nullius-bauxite-flotation-2", - localised_name = {"", {"item-name.nullius-aluminum-hydroxide"}, " ", 2}, + localised_name = {"", {"item-name.nullius-aluminum-hydroxide"}, " ", tostring(2)}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/solid-aluminium-hydroxide.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-aluminium-hydroxide.png", icon_size = 32 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/sulfuric-acid.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/sulfuric-acid.png", icon_size = 72, scale = 0.19, shift = {10, -11} @@ -4708,7 +4881,7 @@ data:extend({ }, enabled = false, category = "ore-flotation", - subgroup = "alumina", + subgroup = "alumina", order = "nullius-dc", energy_required = 7, ingredients = { @@ -4726,19 +4899,19 @@ data:extend({ { type = "recipe", name = "nullius-boxed-bauxite-flotation-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-aluminum-hydroxide"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-aluminum-hydroxide"}}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/solid-aluminium-hydroxide.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-aluminium-hydroxide.png", icon_size = 32, scale = 0.9 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/sulfuric-acid.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/sulfuric-acid.png", icon_size = 72, scale = 0.17, shift = {9, -10} @@ -4770,22 +4943,24 @@ data:extend({ show_amount_in_title = false, always_show_products = true, category = "dry-smelting", - subgroup = "alumina", + subgroup = "alumina", order = "nullius-eb", energy_required = 2, ingredients = { - {"nullius-aluminum-hydroxide", 4} + {type = "item", name = "nullius-aluminum-hydroxide", amount = 4} }, - result = "nullius-alumina", - result_count = 3 + results = { + {type = "item", name = "nullius-alumina", amount = 3} + } }, { type = "recipe", name = "nullius-alumina-2", localised_name = {"recipe-name.nullius-alumina-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/solid-aluminium-oxide.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-aluminium-oxide.png", icon_size = 32 }, { @@ -4797,7 +4972,7 @@ data:extend({ }, enabled = false, category = "wet-smelting", - subgroup = "alumina", + subgroup = "alumina", order = "nullius-ec", energy_required = 2, ingredients = { @@ -4835,13 +5010,13 @@ data:extend({ localised_name = {"recipe-name.nullius-aluminum-carbide-reprocessing"}, icons = { { - icon = "__angelssmelting__/graphics/icons/solid-aluminium-hydroxide.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-aluminium-hydroxide.png", icon_size = 32 }, { - icon = "__angelssmelting__/graphics/icons/powder-lead.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-lead.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.2, shift = {10, -10} } @@ -4874,8 +5049,8 @@ data:extend({ order = "nullius-gb", energy_required = 10, ingredients = { - {"nullius-alumina", 9}, - {"nullius-graphite", 5} + {type = "item", name = "nullius-alumina", amount = 9}, + {type = "item", name = "nullius-graphite", amount = 5} }, results = { {type="item", name="nullius-aluminum-ingot", amount=3}, @@ -4887,16 +5062,17 @@ data:extend({ type = "recipe", name = "nullius-aluminum-ingot-2", localised_name = {"recipe-name.nullius-aluminum-ingot-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/ingot-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-aluminium.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelssmelting__/graphics/icons/powder-lead.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-lead.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.25, shift = {9, -9} } @@ -4906,8 +5082,8 @@ data:extend({ order = "nullius-gc", energy_required = 25, ingredients = { - {"nullius-aluminum-carbide", 5}, - {"nullius-alumina", 4} + {type = "item", name = "nullius-aluminum-carbide", amount = 5}, + {type = "item", name = "nullius-alumina", amount = 4} }, results = { {type="item", name="nullius-aluminum-ingot", amount=9}, @@ -4918,22 +5094,21 @@ data:extend({ { type = "recipe", name = "nullius-boxed-aluminum-carbide", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-aluminum-carbide"}}, " ", 1}, - icons = { + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-aluminum-carbide"}}, " ", tostring(1)}, + icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/powder-lead.png", - icon_size = 64, - icon_mipmaps = 4, - scale = 0.45 + icon = "__angelssmeltinggraphics__/graphics/icons/powder-lead.png", + icon_size = 64, + scale = 0.45 }, { - icon = "__angelssmelting__/graphics/icons/solid-aluminium-oxide.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-aluminium-oxide.png", icon_size = 32, - scale = 0.5, + scale = 0.5, shift = {-6, -6} } }, @@ -4943,8 +5118,8 @@ data:extend({ order = "nullius-gbb", energy_required = 10, ingredients = { - {"nullius-box-alumina", 9}, - {"nullius-box-graphite", 5} + {type = "item", name = "nullius-box-alumina", amount = 9}, + {type = "item", name = "nullius-box-graphite", amount = 5} }, results = { {type="item", name="nullius-box-aluminum-ingot", amount=3}, @@ -4955,15 +5130,15 @@ data:extend({ { type = "recipe", name = "nullius-boxed-aluminum-ingot-1", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-aluminum-ingot"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-aluminum-ingot"}}, " ", tostring(1)}, enabled = false, category = "bulk-smelting", subgroup = "boxed-aluminum-2", order = "nullius-gc", energy_required = 25, ingredients = { - {"nullius-box-aluminum-carbide", 5}, - {"nullius-box-alumina", 4} + {type = "item", name = "nullius-box-aluminum-carbide", amount = 5}, + {type = "item", name = "nullius-box-alumina", amount = 4} }, results = { {type="item", name="nullius-box-aluminum-ingot", amount=9}, @@ -4974,15 +5149,16 @@ data:extend({ { type = "recipe", name = "nullius-aluminum-ingot-3", - localised_name = {"", {"item-name.nullius-aluminum-ingot"}, " ", 3}, + localised_name = {"", {"item-name.nullius-aluminum-ingot"}, " ", tostring(3)}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/ingot-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-aluminium.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelspetrochem__/graphics/icons/solid-sodium-carbonate.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium-carbonate.png", icon_size = 32, scale = 0.5, shift = {9, -9} @@ -5009,20 +5185,20 @@ data:extend({ { type = "recipe", name = "nullius-boxed-aluminum-ingot-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-aluminum-ingot"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-aluminum-ingot"}}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/ingot-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-aluminium.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/solid-sodium-carbonate.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium-carbonate.png", icon_size = 32, scale = 0.4, shift = {8, -8} @@ -5052,18 +5228,19 @@ data:extend({ name = "nullius-aluminum-ingot-electrolytic", localised_name = {"recipe-name.nullius-electrolytic", {"item-name.nullius-box", {"item-name.nullius-aluminum-ingot"}}}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/ingot-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-aluminium.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.5 }, { icon = ICONPATH .. "salt.png", icon_size = 64, tint = {0.4, 0.6, 0.8}, - scale = 0.23, + scale = 0.23, shift = {9, -10} } }, @@ -5086,56 +5263,57 @@ data:extend({ type = "recipe", name = "nullius-aluminum-carbide", enabled = false, - show_amount_in_title = false, + show_amount_in_title = false, always_show_products = true, - no_productivity = true, + no_productivity = true, + hide_from_signal_gui = false, category = "dry-smelting", order = "nullius-hb", energy_required = 2, ingredients = { - {"nullius-aluminum-powder", 20}, - {"nullius-graphite", 2} + {type = "item", name = "nullius-aluminum-powder", amount = 20}, + {type = "item", name = "nullius-graphite", amount = 2} }, - result = "nullius-aluminum-carbide", - result_count = 3 + results = { + {type = "item", name = "nullius-aluminum-carbide", amount = 3} + } }, { type = "recipe", name = "nullius-boxed-aluminum-carbide-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-aluminum-carbide"}}, " ", 2}, - icons = { + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-aluminum-carbide"}}, " ", tostring(2)}, + icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/powder-lead.png", - icon_size = 64, - icon_mipmaps = 4, - scale = 0.45 + icon = "__angelssmeltinggraphics__/graphics/icons/powder-lead.png", + icon_size = 64, + scale = 0.45 }, { - icon = "__angelssmelting__/graphics/icons/powder-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-aluminium.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.27, + scale = 0.27, shift = {-6, -6} } }, enabled = false, - show_amount_in_title = false, + show_amount_in_title = false, always_show_products = true, - no_productivity = true, + no_productivity = true, category = "bulk-smelting", - subgroup = "boxed-aluminum-2", + subgroup = "boxed-aluminum-2", order = "nullius-gbc", energy_required = 2, ingredients = { - {"nullius-box-aluminum-powder", 20}, - {"nullius-box-graphite", 2} + {type = "item", name = "nullius-box-aluminum-powder", amount = 20}, + {type = "item", name = "nullius-box-graphite", amount = 2} }, - result = "nullius-box-aluminum-carbide", - result_count = 3 + results = { + {type = "item", name = "nullius-box-aluminum-carbide", amount = 3} + } }, { @@ -5148,25 +5326,27 @@ data:extend({ category = "dry-smelting", energy_required = 10, ingredients = { - {"nullius-silica", 5}, - {"nullius-graphite", 2} + {type = "item", name = "nullius-silica", amount = 5}, + {type = "item", name = "nullius-graphite", amount = 2} }, - result = "nullius-silicon-ingot", - result_count = 3 + results = { + {type = "item", name = "nullius-silicon-ingot", amount = 3} + } }, { type = "recipe", name = "nullius-silicon-ingot-2", localised_name = {"recipe-name.nullius-silicon-ingot-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/ingot-silicon.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-silicon.png", icon_size = 64, - icon_mipmaps = 4, + tint = {1, 0.925, 0.85} }, { - icon = "__angelspetrochem__/graphics/icons/molecules/oxygen.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/oxygen.png", icon_size = 72, scale = 0.22, shift = {9, -12} @@ -5209,7 +5389,7 @@ data:extend({ type = "item", name = "nullius-polycrystalline-silicon", icons = {{ - icon = "__angelssmelting__/graphics/icons/silicon-mono.png", + icon = "__angelssmeltinggraphics__/graphics/icons/silicon-mono.png", icon_size = 32, tint = {0.8, 0.75, 0.7, 0.9} }}, @@ -5232,7 +5412,7 @@ data:extend({ { type = "recipe", name = "nullius-polycrystalline-silicon", - localised_name = {"", {"item-name.nullius-polycrystalline-silicon"}, " ", 1}, + localised_name = {"", {"item-name.nullius-polycrystalline-silicon"}, " ", tostring(1)}, enabled = false, category = "basic-chemistry", order = "nullius-fb", @@ -5256,7 +5436,7 @@ data:extend({ { type = "recipe", name = "nullius-boxed-polycrystalline-silicon", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-polycrystalline-silicon"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-polycrystalline-silicon"}}, " ", tostring(1)}, enabled = false, category = "basic-chemistry", subgroup = "boxed-silicon", @@ -5281,10 +5461,11 @@ data:extend({ { type = "recipe", name = "nullius-polycrystalline-silicon-2", - localised_name = {"", {"item-name.nullius-polycrystalline-silicon"}, " ", 2}, + localised_name = {"", {"item-name.nullius-polycrystalline-silicon"}, " ", tostring(2)}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/silicon-mono.png", + icon = "__angelssmeltinggraphics__/graphics/icons/silicon-mono.png", icon_size = 32, tint = {0.8, 0.75, 0.7, 0.9} }, @@ -5293,7 +5474,7 @@ data:extend({ icon_size = 64, scale = 0.2, shift = {-11, -11}, - tint = {164, 140, 204} + tint = {164, 140, 204} } }, enabled = false, @@ -5319,24 +5500,24 @@ data:extend({ { type = "recipe", name = "nullius-boxed-polycrystalline-silicon-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-polycrystalline-silicon"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-polycrystalline-silicon"}}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/silicon-mono.png", + icon = "__angelssmeltinggraphics__/graphics/icons/silicon-mono.png", icon_size = 32, tint = {0.8, 0.75, 0.7, 0.9}, - scale = 0.9 + scale = 0.9 }, { icon = FLUIDPATH .. "atom.png", icon_size = 64, scale = 0.18, shift = {-10, -10}, - tint = {164, 140, 204} + tint = {164, 140, 204} } }, enabled = false, @@ -5372,8 +5553,9 @@ data:extend({ {type="item", name="nullius-polycrystalline-silicon", amount=5}, {type="fluid", name="nullius-argon", amount=10, fluidbox_index=1} }, - result = "nullius-monocrystalline-silicon", - result_count = 3 + results = { + {type = "item", name = "nullius-monocrystalline-silicon", amount = 3} + } }, { type = "recipe", @@ -5388,8 +5570,9 @@ data:extend({ {type="item", name="nullius-box-polycrystalline-silicon", amount=5}, {type="fluid", name="nullius-argon", amount=50, fluidbox_index=1} }, - result = "nullius-box-monocrystalline-silicon", - result_count = 3 + results = { + {type = "item", name = "nullius-box-monocrystalline-silicon", amount = 3} + } }, { @@ -5403,7 +5586,7 @@ data:extend({ }, { type = "recipe", - name = "nullius-empty-canister", + name = "nullius-canister", enabled = false, category = "hand-casting", always_show_made_in = true, @@ -5411,12 +5594,13 @@ data:extend({ always_show_products = true, energy_required = 8, ingredients = { - {type="item", name="empty-barrel", amount=1}, + {type="item", name="barrel", amount=1}, {type="item", name="nullius-aluminum-sheet", amount=2}, {type="item", name="nullius-top-up-valve", amount=1} }, - result = "nullius-canister", - result_count = 5 + results = { + {type = "item", name = "nullius-canister", amount = 5} + } }, { type = "recipe", @@ -5433,8 +5617,9 @@ data:extend({ {type="item", name="nullius-box-aluminum-sheet", amount=2}, {type="item", name="nullius-box-top-up-valve", amount=1} }, - result = "nullius-box-canister", - result_count = 5 + results = { + {type = "item", name = "nullius-box-canister", amount = 5} + } }, { type = "recipe", @@ -5444,17 +5629,18 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, energy_required = 7, ingredients = { - {type="item", name="empty-barrel", amount=1}, + {type="item", name="barrel", amount=1}, {type="item", name="nullius-aluminum-sheet", amount=2}, {type="item", name="nullius-top-up-valve", amount=1} }, - result = "nullius-canister", - result_count = 5 + results = { + {type = "item", name = "nullius-canister", amount = 5} + } }, { type = "recipe", @@ -5465,7 +5651,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, energy_required = 35, @@ -5474,15 +5660,16 @@ data:extend({ {type="item", name="nullius-box-aluminum-sheet", amount=2}, {type="item", name="nullius-box-top-up-valve", amount=1} }, - result = "nullius-box-canister", - result_count = 5 + results = { + {type = "item", name = "nullius-box-canister", amount = 5} + } }, { type = "item", name = "nullius-filter-1", icons = {{ - icon = "__angelsrefining__/graphics/icons/filter-coal.png", + icon = "__angelsrefininggraphics__/graphics/icons/filter-coal.png", icon_size = 32 }}, subgroup = "mechanical-intermediate", @@ -5508,7 +5695,9 @@ data:extend({ {type="item", name="nullius-iron-sheet", amount=1}, {type="fluid", name="nullius-carbon-dioxide", amount=10, fluidbox_index=3} }, - result = "nullius-filter-1" + results = { + {type = "item", name = "nullius-filter-1", amount = 1} + } }, { type = "recipe", @@ -5530,21 +5719,24 @@ data:extend({ {type="item", name="nullius-box-iron-sheet", amount=1}, {type="fluid", name="nullius-carbon-dioxide", amount=50, fluidbox_index=3} }, - result = "nullius-box-filter-1" + results = { + {type = "item", name = "nullius-box-filter-1", amount = 1} + } }, { type = "recipe", name = "nullius-pressure-filter-1", localised_name = {"recipe-name.nullius-pressure", {"item-name.nullius-filter-1"}}, + hide_from_signal_gui = false, icons = { { - icon = "__angelsrefining__/graphics/icons/filter-coal.png", + icon = "__angelsrefininggraphics__/graphics/icons/filter-coal.png", icon_size = 32 }, { - icon = "__angelssmelting__/graphics/icons/roll-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-aluminium.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.3, shift = {11, -10} } @@ -5565,8 +5757,9 @@ data:extend({ {type="item", name="nullius-aluminum-sheet", amount=1}, {type="fluid", name="nullius-compressed-carbon-dioxide", amount=4, fluidbox_index=3} }, - result = "nullius-filter-1", - result_count = 2 + results = { + {type = "item", name = "nullius-filter-1", amount = 2} + } }, { type = "recipe", @@ -5578,14 +5771,14 @@ data:extend({ icon_size = 64 }, { - icon = "__angelsrefining__/graphics/icons/filter-coal.png", + icon = "__angelsrefininggraphics__/graphics/icons/filter-coal.png", icon_size = 32, scale = 0.9 }, { - icon = "__angelssmelting__/graphics/icons/roll-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-aluminium.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.25, shift = {10, -9} } @@ -5607,15 +5800,16 @@ data:extend({ {type="item", name="nullius-box-aluminum-sheet", amount=1}, {type="fluid", name="nullius-compressed-carbon-dioxide", amount=20, fluidbox_index=3} }, - result = "nullius-box-filter-1", - result_count = 2 + results = { + {type = "item", name = "nullius-box-filter-1", amount = 2} + } }, { type = "item", name = "nullius-filter-2", icons = {{ - icon = "__angelsrefining__/graphics/icons/filter-ceramic.png", + icon = "__angelsrefininggraphics__/graphics/icons/filter-ceramic.png", icon_size = 32 }}, subgroup = "mechanical-intermediate", @@ -5638,7 +5832,9 @@ data:extend({ {type="item", name="nullius-textile", amount=2}, {type="item", name="nullius-alumina", amount=3} }, - result = "nullius-filter-2" + results = { + {type = "item", name = "nullius-filter-2", amount = 1} + } }, { type = "recipe", @@ -5658,13 +5854,15 @@ data:extend({ {type="item", name="nullius-box-textile", amount=2}, {type="item", name="nullius-box-alumina", amount=3} }, - result = "nullius-box-filter-2" + results = { + {type = "item", name = "nullius-box-filter-2", amount = 1} + } }, { type = "item", name = "nullius-cement", - icon = "__angelssmelting__/graphics/icons/solid-cement.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-cement.png", icon_size = 32, subgroup = "masonry-material", order = "nullius-cb", @@ -5673,7 +5871,7 @@ data:extend({ { type = "item", name = "nullius-mortar", - icon = "__angelsrefining__/graphics/icons/solid-sand.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-sand.png", icon_size = 32, subgroup = "masonry-material", order = "nullius-cd", @@ -5693,20 +5891,22 @@ data:extend({ {type="item", name="nullius-silica", amount=4}, {type="item", name="nullius-aluminum-hydroxide", amount=1} }, - result = "nullius-cement", - result_count = 4 + results = { + {type = "item", name = "nullius-cement", amount = 4} + } }, { type = "recipe", name = "nullius-cement-2", localised_name = {"recipe-name.nullius-cement-2"}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/solid-cement.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-cement.png", icon_size = 32 }, { - icon = "__angelspetrochem__/graphics/icons/solid-sodium-carbonate.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-sodium-carbonate.png", icon_size = 32, scale = 0.45, shift = {-10, -10} @@ -5726,8 +5926,9 @@ data:extend({ {type="item", name="nullius-iron-oxide", amount=2}, {type="item", name="nullius-soda-ash", amount=1} }, - result = "nullius-cement", - result_count = 16 + results = { + {type = "item", name = "nullius-cement", amount = 16} + } }, { type = "recipe", @@ -5746,8 +5947,9 @@ data:extend({ {type="item", name="nullius-box-iron-oxide", amount=2}, {type="item", name="nullius-box-soda-ash", amount=1} }, - result = "nullius-box-cement", - result_count = 16 + results = { + {type = "item", name = "nullius-box-cement", amount = 16} + } }, { @@ -5764,8 +5966,9 @@ data:extend({ {type="item", name="nullius-sand", amount=5}, {type="fluid", name="nullius-water", amount=8, fluidbox_index=1} }, - result = "nullius-mortar", - result_count = 4 + results = { + {type = "item", name = "nullius-mortar", amount = 4} + } }, { type = "recipe", @@ -5777,7 +5980,7 @@ data:extend({ icon_size = 64 }, { - icon = "__angelsrefining__/graphics/icons/solid-sand.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-sand.png", icon_size = 32, scale = 0.9 } @@ -5795,14 +5998,15 @@ data:extend({ {type="item", name="nullius-box-sand", amount=5}, {type="fluid", name="nullius-water", amount=40, fluidbox_index=1} }, - result = "nullius-mortar", - result_count = 20 + results = { + {type = "item", name = "nullius-mortar", amount = 20} + } }, { type = "recipe", name = "nullius-concrete-1", - localised_name = {"", {"item-name.concrete"}, " ", 1}, + localised_name = {"", {"item-name.concrete"}, " ", tostring(1)}, order = "nullius-bb", enabled = false, show_amount_in_title = false, @@ -5815,18 +6019,20 @@ data:extend({ {type="item", name="nullius-gravel", amount=4}, {type="fluid", name="nullius-water", amount=6, fluidbox_index=1} }, - result = "concrete", - result_count = 5 + results = { + {type = "item", name = "concrete", amount = 5} + } }, { type = "recipe", name = "nullius-concrete-2", - localised_name = {"", {"item-name.concrete"}, " ", 2}, + localised_name = {"", {"item-name.concrete"}, " ", tostring(2)}, + hide_from_signal_gui = false, icons = { { icon = "__base__/graphics/icons/concrete.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "fluid/calcium-chloride.png", @@ -5848,8 +6054,9 @@ data:extend({ {type="fluid", name="nullius-calcium-chloride-solution", amount=5}, {type="fluid", name="nullius-water", amount=15} }, - result = "concrete", - result_count = 20 + results = { + {type = "item", name = "concrete", amount = 20} + } }, { type = "recipe", @@ -5868,13 +6075,15 @@ data:extend({ {type="fluid", name="nullius-calcium-chloride-solution", amount=25}, {type="fluid", name="nullius-water", amount=75} }, - result = "nullius-box-concrete", - result_count = 10 + results = { + {type = "item", name = "nullius-box-concrete", amount = 10} + } }, { type = "recipe", name = "nullius-reinforced-concrete", + localised_name = {"item-name.nullius-reinforced-concrete"}, enabled = false, show_amount_in_title = false, always_show_products = true, @@ -5889,8 +6098,9 @@ data:extend({ {type="item", name="nullius-steel-wire", amount=2}, {type="item", name="nullius-steel-rod", amount=2} }, - result = "refined-concrete", - result_count = 10 + results = { + {type = "item", name = "refined-concrete", amount = 10} + } }, { type = "recipe", @@ -5911,8 +6121,9 @@ data:extend({ {type="item", name="nullius-box-steel-wire", amount=2}, {type="item", name="nullius-box-steel-rod", amount=2} }, - result = "nullius-box-reinforced-concrete", - result_count = 5 + results = { + {type = "item", name = "nullius-box-reinforced-concrete", amount = 5} + } }, { @@ -5920,7 +6131,7 @@ data:extend({ name = "nullius-red-concrete", icons = {{ icon = "__base__/graphics/icons/refined-concrete.png", - icon_size = 64, icon_mipmaps = 4, + icon_size = 64, tint = { r = 1.000, g = 0.266, b = 0.241 } }}, subgroup = "colored-concrete", @@ -5929,7 +6140,7 @@ data:extend({ place_as_tile = { result = "red-refined-concrete", condition_size = 1, - condition = { "water-tile" } + condition = { layers = {water_tile=true} } } }, { @@ -5940,7 +6151,7 @@ data:extend({ show_amount_in_title = false, always_show_products = true, category = "basic-chemistry", - crafting_machine_tint = { + crafting_machine_tint = { primary = {r=1, g=0, b=0}, secondary = {r=1, g=0, b=0} }, @@ -5951,8 +6162,9 @@ data:extend({ {type="fluid", name="nullius-water", amount=4}, {type="fluid", name="nullius-epoxy", amount=3} }, - result = "nullius-red-concrete", - result_count = 60 + results = { + {type = "item", name = "nullius-red-concrete", amount = 60} + } }, { type = "recipe", @@ -5974,8 +6186,9 @@ data:extend({ {type="fluid", name="nullius-water", amount=20}, {type="fluid", name="nullius-epoxy", amount=15} }, - result = "nullius-box-red-concrete", - result_count = 30 + results = { + {type = "item", name = "nullius-box-red-concrete", amount = 30} + } }, { @@ -5983,7 +6196,7 @@ data:extend({ name = "nullius-blue-concrete", icons = {{ icon = "__base__/graphics/icons/refined-concrete.png", - icon_size = 64, icon_mipmaps = 4, + icon_size = 64, tint = { r = 0.343, g = 0.683, b = 1.000 } }}, subgroup = "colored-concrete", @@ -5992,7 +6205,7 @@ data:extend({ place_as_tile = { result = "blue-refined-concrete", condition_size = 1, - condition = { "water-tile" } + condition = { layers = {water_tile=true} } } }, { @@ -6017,8 +6230,9 @@ data:extend({ {type="fluid", name="nullius-water", amount=3}, {type="fluid", name="nullius-epoxy", amount=3} }, - result = "nullius-blue-concrete", - result_count = 60 + results = { + {type = "item", name = "nullius-blue-concrete", amount = 60} + } }, { type = "recipe", @@ -6043,8 +6257,9 @@ data:extend({ {type="fluid", name="nullius-water", amount=15}, {type="fluid", name="nullius-epoxy", amount=15} }, - result = "nullius-box-blue-concrete", - result_count = 30 + results = { + {type = "item", name = "nullius-box-blue-concrete", amount = 30} + } }, { @@ -6052,7 +6267,7 @@ data:extend({ name = "nullius-yellow-concrete", icons = {{ icon = ICONPATH.."entity/white-concrete.png", - icon_size = 64, icon_mipmaps = 4, + icon_size = 64, tint = { r = 0.9, g = 0.8, b = 0.2 } }}, subgroup = "colored-concrete", @@ -6061,7 +6276,7 @@ data:extend({ place_as_tile = { result = "yellow-refined-concrete", condition_size = 1, - condition = { "water-tile" } + condition = { layers = {water_tile=true} } } }, { @@ -6084,8 +6299,9 @@ data:extend({ {type="fluid", name="nullius-acid-hydrochloric", amount=5}, {type="fluid", name="nullius-epoxy", amount=3} }, - result = "nullius-yellow-concrete", - result_count = 60 + results = { + {type = "item", name = "nullius-yellow-concrete", amount = 60} + } }, { type = "recipe", @@ -6108,8 +6324,9 @@ data:extend({ {type="fluid", name="nullius-acid-hydrochloric", amount=25}, {type="fluid", name="nullius-epoxy", amount=15} }, - result = "nullius-box-yellow-concrete", - result_count = 30 + results = { + {type = "item", name = "nullius-box-yellow-concrete", amount = 30} + } }, { @@ -6117,7 +6334,7 @@ data:extend({ name = "nullius-green-concrete", icons = {{ icon = "__base__/graphics/icons/refined-concrete.png", - icon_size = 64, icon_mipmaps = 4, + icon_size = 64, tint = { r = 0.173, g = 0.824, b = 0.250 } }}, subgroup = "colored-concrete", @@ -6126,7 +6343,7 @@ data:extend({ place_as_tile = { result = "green-refined-concrete", condition_size = 1, - condition = { "water-tile" } + condition = { layers = {water_tile=true} } } }, { @@ -6143,8 +6360,9 @@ data:extend({ {type="item", name="nullius-yellow-concrete", amount=15}, {type="item", name="nullius-blue-concrete", amount=15} }, - result = "nullius-green-concrete", - result_count = 30 + results = { + {type = "item", name = "nullius-green-concrete", amount = 30} + } }, { type = "recipe", @@ -6161,8 +6379,9 @@ data:extend({ {type="item", name="nullius-box-yellow-concrete", amount=3}, {type="item", name="nullius-box-blue-concrete", amount=3} }, - result = "nullius-box-green-concrete", - result_count = 6 + results = { + {type = "item", name = "nullius-box-green-concrete", amount = 6} + } }, { @@ -6170,7 +6389,7 @@ data:extend({ name = "nullius-purple-concrete", icons = {{ icon = "__base__/graphics/icons/refined-concrete.png", - icon_size = 64, icon_mipmaps = 4, + icon_size = 64, tint = { r = 0.821, g = 0.440, b = 0.998 } }}, subgroup = "colored-concrete", @@ -6179,7 +6398,7 @@ data:extend({ place_as_tile = { result = "purple-refined-concrete", condition_size = 1, - condition = { "water-tile" } + condition = { layers = {water_tile=true} } } }, { @@ -6196,8 +6415,9 @@ data:extend({ {type="item", name="nullius-red-concrete", amount=15}, {type="item", name="nullius-blue-concrete", amount=15} }, - result = "nullius-purple-concrete", - result_count = 30 + results = { + {type = "item", name = "nullius-purple-concrete", amount = 30} + } }, { type = "recipe", @@ -6214,8 +6434,9 @@ data:extend({ {type="item", name="nullius-box-red-concrete", amount=3}, {type="item", name="nullius-box-blue-concrete", amount=3} }, - result = "nullius-box-purple-concrete", - result_count = 6 + results = { + {type = "item", name = "nullius-box-purple-concrete", amount = 6} + } }, { @@ -6223,7 +6444,7 @@ data:extend({ name = "nullius-brown-concrete", icons = {{ icon = "__base__/graphics/icons/refined-concrete.png", - icon_size = 64, icon_mipmaps = 4, + icon_size = 64, tint = { r = 0.757, g = 0.522, b = 0.371 } }}, subgroup = "colored-concrete", @@ -6232,7 +6453,7 @@ data:extend({ place_as_tile = { result = "brown-refined-concrete", condition_size = 1, - condition = { "water-tile" } + condition = { layers = {water_tile=true} } } }, { @@ -6249,8 +6470,9 @@ data:extend({ {type="item", name="nullius-yellow-concrete", amount=15}, {type="item", name="nullius-red-concrete", amount=15} }, - result = "nullius-brown-concrete", - result_count = 30 + results = { + {type = "item", name = "nullius-brown-concrete", amount = 30} + } }, { type = "recipe", @@ -6267,8 +6489,9 @@ data:extend({ {type="item", name="nullius-box-yellow-concrete", amount=3}, {type="item", name="nullius-box-red-concrete", amount=3} }, - result = "nullius-box-brown-concrete", - result_count = 6 + results = { + {type = "item", name = "nullius-box-brown-concrete", amount = 6} + } }, { @@ -6276,7 +6499,7 @@ data:extend({ name = "nullius-black-concrete", icons = {{ icon = "__base__/graphics/icons/refined-concrete.png", - icon_size = 64, icon_mipmaps = 4, + icon_size = 64, tint = { r = 0.5, g = 0.5, b = 0.5 } }}, subgroup = "colored-concrete", @@ -6285,7 +6508,7 @@ data:extend({ place_as_tile = { result = "black-refined-concrete", condition_size = 1, - condition = { "water-tile" } + condition = { layers = {water_tile=true} } } }, { @@ -6304,8 +6527,9 @@ data:extend({ {type="item", name="nullius-yellow-concrete", amount=20}, {type="item", name="nullius-graphite", amount=1} }, - result = "nullius-black-concrete", - result_count = 60 + results = { + {type = "item", name = "nullius-black-concrete", amount = 60} + } }, { type = "recipe", @@ -6324,8 +6548,9 @@ data:extend({ {type="item", name="nullius-box-yellow-concrete", amount=10}, {type="item", name="nullius-box-graphite", amount=1} }, - result = "nullius-box-black-concrete", - result_count = 30 + results = { + {type = "item", name = "nullius-box-black-concrete", amount = 30} + } }, { @@ -6333,7 +6558,7 @@ data:extend({ name = "nullius-white-concrete", icons = {{ icon = ICONPATH.."entity/white-concrete.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }}, subgroup = "colored-concrete", order = "nullius-ad", @@ -6341,7 +6566,7 @@ data:extend({ place_as_tile = { result = "nullius-white-concrete", condition_size = 1, - condition = { "water-tile" } + condition = { layers = {water_tile=true} } } }, { @@ -6360,8 +6585,9 @@ data:extend({ {type="fluid", name="nullius-epoxy", amount=3}, {type="fluid", name="nullius-solvent", amount=4} }, - result = "nullius-white-concrete", - result_count = 60 + results = { + {type = "item", name = "nullius-white-concrete", amount = 60} + } }, { type = "recipe", @@ -6380,8 +6606,9 @@ data:extend({ {type="fluid", name="nullius-epoxy", amount=15}, {type="fluid", name="nullius-solvent", amount=20} }, - result = "nullius-box-white-concrete", - result_count = 30 + results = { + {type = "item", name = "nullius-box-white-concrete", amount = 30} + } }, { @@ -6389,7 +6616,7 @@ data:extend({ name = "nullius-orange-concrete", icons = {{ icon = ICONPATH.."entity/white-concrete.png", - icon_size = 64, icon_mipmaps = 4, + icon_size = 64, tint = { r = 0.9, g = 0.5, b = 0.1 } }}, subgroup = "colored-concrete", @@ -6398,7 +6625,7 @@ data:extend({ place_as_tile = { result = "nullius-orange-concrete", condition_size = 1, - condition = { "water-tile" } + condition = { layers = {water_tile=true} } } }, { @@ -6416,8 +6643,9 @@ data:extend({ {type="item", name="nullius-red-concrete", amount=10}, {type="item", name="nullius-white-concrete", amount=5} }, - result = "nullius-orange-concrete", - result_count = 30 + results = { + {type = "item", name = "nullius-orange-concrete", amount = 30} + } }, { type = "recipe", @@ -6435,13 +6663,15 @@ data:extend({ {type="item", name="nullius-box-red-concrete", amount=2}, {type="item", name="nullius-box-white-concrete", amount=1} }, - result = "nullius-box-orange-concrete", - result_count = 6 + results = { + {type = "item", name = "nullius-box-orange-concrete", amount = 6} + } }, { type = "recipe", name = "nullius-hazard-concrete", + localised_name = {"item-name.nullius-hazard-concrete"}, enabled = false, category = "large-crafting", always_show_made_in = true, @@ -6453,8 +6683,9 @@ data:extend({ {type="item", name="nullius-yellow-concrete", amount=24}, {type="item", name="nullius-black-concrete", amount=16} }, - result = "refined-hazard-concrete", - result_count = 40 + results = { + {type = "item", name = "refined-hazard-concrete", amount = 40} + } }, { type = "recipe", @@ -6471,8 +6702,9 @@ data:extend({ {type="item", name="nullius-box-yellow-concrete", amount=12}, {type="item", name="nullius-box-black-concrete", amount=8} }, - result = "nullius-box-hazard-concrete", - result_count = 20 + results = { + {type = "item", name = "nullius-box-hazard-concrete", amount = 20} + } }, { @@ -6480,7 +6712,7 @@ data:extend({ name = "nullius-sensor-1", icon = "__base__/graphics/icons/discharge-defense-equipment-controller.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "robotic-intermediate", order = "nullius-bb", stack_size = 100 @@ -6495,15 +6727,16 @@ data:extend({ always_show_products = true, energy_required = 5, ingredients = { - {"arithmetic-combinator", 1}, - {"nullius-glass", 1}, - {"small-lamp", 1}, - {"nullius-capacitor", 1}, - {"nullius-polycrystalline-silicon", 1}, - {"red-wire", 2} + {type = "item", name = "arithmetic-combinator", amount = 1}, + {type = "item", name = "nullius-glass", amount = 1}, + {type = "item", name = "small-lamp", amount = 1}, + {type = "item", name = "nullius-capacitor", amount = 1}, + {type = "item", name = "nullius-polycrystalline-silicon", amount = 1}, + {type = "item", name = "nullius-red-wire", amount = 2} }, - result = "nullius-sensor-1", - result_count = 2 + results = { + {type = "item", name = "nullius-sensor-1", amount = 2} + } }, { type = "recipe", @@ -6517,15 +6750,16 @@ data:extend({ always_show_products = true, energy_required = 25, ingredients = { - {"nullius-box-arithmetic-circuit", 1}, - {"nullius-box-glass", 1}, - {"nullius-box-lamp-1", 1}, - {"nullius-box-capacitor", 1}, - {"nullius-box-polycrystalline-silicon", 1}, - {"nullius-box-red-wire", 2} + {type = "item", name = "nullius-box-arithmetic-circuit", amount = 1}, + {type = "item", name = "nullius-box-glass", amount = 1}, + {type = "item", name = "nullius-box-lamp-1", amount = 1}, + {type = "item", name = "nullius-box-capacitor", amount = 1}, + {type = "item", name = "nullius-box-polycrystalline-silicon", amount = 1}, + {type = "item", name = "nullius-box-red-wire", amount = 2} }, - result = "nullius-box-sensor-1", - result_count = 2 + results = { + {type = "item", name = "nullius-box-sensor-1", amount = 2} + } }, { @@ -6587,9 +6821,9 @@ data:extend({ { type = "item", name = "nullius-ceramic-powder", - icon = "__angelssmelting__/graphics/icons/powder-platinum.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-platinum.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "glass-product", order = "nullius-l", stack_size = 100 @@ -6654,7 +6888,9 @@ data:extend({ {type="item", name="nullius-ceramic-powder", amount=1}, {type="fluid", name="nullius-lubricant", amount=1} }, - result = "nullius-bearing" + results = { + {type = "item", name = "nullius-bearing", amount = 1} + } }, { type = "recipe", @@ -6668,14 +6904,16 @@ data:extend({ {type="item", name="nullius-box-ceramic-powder", amount=1}, {type="fluid", name="nullius-lubricant", amount=5} }, - result = "nullius-box-bearing" + results = { + {type = "item", name = "nullius-box-bearing", amount = 1} + } }, { type = "item", name = "nullius-acrylic-fiber", icons = {{ - icon = "__angelssmelting__/graphics/icons/wire-platinum.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-platinum.png", icon_size = 32, tint = { 0.4, 0.8, 0.8 } }}, @@ -6696,7 +6934,9 @@ data:extend({ {type="fluid", name="nullius-acrylonitrile", amount=4}, {type="fluid", name="nullius-water", amount=3} }, - result = "nullius-acrylic-fiber" + results = { + {type = "item", name = "nullius-acrylic-fiber", amount = 1} + } }, { type = "recipe", @@ -6713,7 +6953,9 @@ data:extend({ {type="fluid", name="nullius-acrylonitrile", amount=20}, {type="fluid", name="nullius-water", amount=15} }, - result = "nullius-box-acrylic-fiber" + results = { + {type = "item", name = "nullius-box-acrylic-fiber", amount = 1} + } }, { @@ -6779,8 +7021,8 @@ data:extend({ scale = 0.4, shift = {5, -8} } - }, - enabled = false, + }, + enabled = false, always_show_made_in = true, show_amount_in_title = false, always_show_products = true, @@ -6804,10 +7046,10 @@ data:extend({ icon = ICONPATH .. "boxing.png", icon_size = 64 }, - { - icon = ICONPATH .. "carbon-fiber.png", + { + icon = ICONPATH .. "carbon-fiber.png", icon_size = 128, - scale = 0.225 + scale = 0.225 }, { icon = ICONPATH .. "plate.png", @@ -6817,7 +7059,7 @@ data:extend({ shift = {4, -7} } }, - enabled = false, + enabled = false, always_show_made_in = true, show_amount_in_title = false, always_show_products = true, @@ -6837,9 +7079,9 @@ data:extend({ { type = "item", name = "nullius-textile", - icon = "__angelssmelting__/graphics/icons/roll-zinc.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-zinc.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "organic-material-2", order = "nullius-d", stack_size = 100 @@ -6847,7 +7089,7 @@ data:extend({ { type = "recipe", name = "nullius-textile-1", - localised_name = {"", {"item-name.nullius-textile"}, " ", 1}, + localised_name = {"", {"item-name.nullius-textile"}, " ", tostring(1)}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -6859,13 +7101,14 @@ data:extend({ {type="item", name="nullius-acrylic-fiber", amount=10}, {type="item", name="nullius-sodium-sulfate", amount=1} }, - result = "nullius-textile", - result_count = 5 + results = { + {type = "item", name = "nullius-textile", amount = 5} + } }, { type = "recipe", name = "nullius-boxed-textile-1", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-textile"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-textile"}}, " ", tostring(1)}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -6878,21 +7121,23 @@ data:extend({ {type="item", name="nullius-box-acrylic-fiber", amount=10}, {type="item", name="nullius-box-sodium-sulfate", amount=1} }, - result = "nullius-box-textile", - result_count = 5 + results = { + {type = "item", name = "nullius-box-textile", amount = 5} + } }, { type = "recipe", name = "nullius-textile-2", - localised_name = {"", {"item-name.nullius-textile"}, " ", 2}, + localised_name = {"", {"item-name.nullius-textile"}, " ", tostring(2)}, + hide_from_signal_gui = false, icons = { { - icon = "__angelssmelting__/graphics/icons/roll-zinc.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-zinc.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__base__/graphics/decorative/brown-asterisk/hr-brown-asterisk-11.png", + icon = "__base__/graphics/decorative/brown-asterisk/brown-asterisk-11.png", icon_size = 54, scale = 0.35, shift = {7, -10} @@ -6910,26 +7155,27 @@ data:extend({ {type="item", name="nullius-cellulose", amount=6}, {type="item", name="nullius-sodium-sulfate", amount=1} }, - result = "nullius-textile", - result_count = 12 + results = { + {type = "item", name = "nullius-textile", amount = 12} + } }, { type = "recipe", name = "nullius-boxed-textile-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-textile"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-textile"}}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/roll-zinc.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-zinc.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { - icon = "__base__/graphics/decorative/brown-asterisk/hr-brown-asterisk-11.png", + icon = "__base__/graphics/decorative/brown-asterisk/brown-asterisk-11.png", icon_size = 54, scale = 0.32, shift = {6, -9} @@ -6948,16 +7194,17 @@ data:extend({ {type="item", name="nullius-box-cellulose", amount=6}, {type="item", name="nullius-box-sodium-sulfate", amount=1} }, - result = "nullius-box-textile", - result_count = 12 + results = { + {type = "item", name = "nullius-box-textile", amount = 12} + } }, { type = "item", name = "nullius-titanium-ingot", - icon = "__angelssmelting__/graphics/icons/ingot-titanium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-titanium.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "titanium-product", order = "nullius-d", stack_size = 100 @@ -7014,7 +7261,7 @@ data:extend({ { type = "recipe", name = "nullius-titanium-ingot-1", - localised_name = {"", {"item-name.nullius-titanium-ingot"}, " ", 1}, + localised_name = {"", {"item-name.nullius-titanium-ingot"}, " ", tostring(1)}, enabled = false, category = "ore-flotation", order = "nullius-db", @@ -7033,7 +7280,7 @@ data:extend({ { type = "recipe", name = "nullius-boxed-titanium-ingot-1", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-titanium-ingot"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-titanium-ingot"}}, " ", tostring(1)}, enabled = false, category = "ore-flotation", subgroup = "boxed-titanium", @@ -7053,12 +7300,12 @@ data:extend({ { type = "recipe", name = "nullius-titanium-ingot-2", - localised_name = {"", {"item-name.nullius-titanium-ingot"}, " ", 2}, + localised_name = {"", {"item-name.nullius-titanium-ingot"}, " ", tostring(2)}, icons = { { - icon = "__angelssmelting__/graphics/icons/ingot-titanium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-titanium.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "calcium.png", @@ -7086,16 +7333,16 @@ data:extend({ { type = "recipe", name = "nullius-boxed-titanium-ingot-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-titanium-ingot"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"item-name.nullius-titanium-ingot"}}, " ", tostring(2)}, icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/ingot-titanium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-titanium.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { @@ -7126,7 +7373,7 @@ data:extend({ { type = "item", name = "nullius-titanium-plate", - icon = "__angelssmelting__/graphics/icons/plate-titanium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/plate-titanium.png", icon_size = 32, subgroup = "titanium-product", order = "nullius-e", @@ -7170,7 +7417,7 @@ data:extend({ type = "item", name = "nullius-titanium-rod", icons = {{ - icon = "__angelssmelting__/graphics/icons/rod-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/rod-steel.png", icon_size = 32, tint = {0.8, 0.6, 0.8} }}, @@ -7215,9 +7462,9 @@ data:extend({ { type = "item", name = "nullius-titanium-sheet", - icon = "__angelssmelting__/graphics/icons/roll-titanium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-titanium.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "titanium-product", order = "nullius-g", stack_size = 100 @@ -7235,8 +7482,9 @@ data:extend({ {type="item", name="nullius-titanium-plate", amount=4}, {type="fluid", name="nullius-lubricant", amount=1} }, - result = "nullius-titanium-sheet", - result_count = 5 + results = { + {type = "item", name = "nullius-titanium-sheet", amount = 5} + } }, { type = "recipe", @@ -7252,8 +7500,9 @@ data:extend({ {type="item", name="nullius-box-titanium-plate", amount=4}, {type="fluid", name="nullius-lubricant", amount=5} }, - result = "nullius-box-titanium-sheet", - result_count = 5 + results = { + {type = "item", name = "nullius-box-titanium-sheet", amount = 5} + } }, { @@ -7302,16 +7551,17 @@ data:extend({ category = "tiny-crafting", energy_required = 15, ingredients = { - {"nullius-turbine-open-2", 1}, - {"nullius-capacitor", 4}, - {"turbo-filter-inserter", 3}, - {"constant-combinator", 3}, - {"programmable-speaker", 2}, - {"nullius-sensor-1", 2}, - {"nullius-aluminum-plate", 3} + {type = "item", name = "nullius-turbine-open-2", amount = 1}, + {type = "item", name = "nullius-capacitor", amount = 4}, + {type = "item", name = "bob-turbo-inserter", amount = 3}, + {type = "item", name = "constant-combinator", amount = 3}, + {type = "item", name = "programmable-speaker", amount = 2}, + {type = "item", name = "nullius-sensor-1", amount = 2}, + {type = "item", name = "nullius-aluminum-plate", amount = 3} }, - result = "nullius-robot-frame-1", - result_count = 2 + results = { + {type = "item", name = "nullius-robot-frame-1", amount = 2} + } }, { type = "recipe", @@ -7325,22 +7575,23 @@ data:extend({ order = "nullius-gb", energy_required = 75, ingredients = { - {"nullius-box-turbine-open-2", 1}, - {"nullius-box-capacitor", 4}, - {"nullius-box-filter-inserter-2", 3}, - {"nullius-box-memory-circuit", 3}, - {"nullius-box-antenna", 2}, - {"nullius-box-sensor-1", 2}, - {"nullius-box-aluminum-plate", 3} + {type = "item", name = "nullius-box-turbine-open-2", amount = 1}, + {type = "item", name = "nullius-box-capacitor", amount = 4}, + {type = "item", name = "nullius-box-inserter-2", amount = 3}, + {type = "item", name = "nullius-box-memory-circuit", amount = 3}, + {type = "item", name = "nullius-box-antenna", amount = 2}, + {type = "item", name = "nullius-box-sensor-1", amount = 2}, + {type = "item", name = "nullius-box-aluminum-plate", amount = 3} }, - result = "nullius-box-robot-frame-1", - result_count = 2 + results = { + {type = "item", name = "nullius-box-robot-frame-1", amount = 2} + } }, { type = "recipe", name = "nullius-legacy-robot-frame-1", enabled = false, - hidden = true, + hidden = true, show_amount_in_title = false, always_show_products = true, always_show_made_in = true, @@ -7350,21 +7601,22 @@ data:extend({ order = "nullius-cbl", energy_required = 12, ingredients = { - {"nullius-turbine-open-1", 1}, - {"nullius-capacitor", 2}, - {"turbo-filter-inserter", 2}, - {"constant-combinator", 2}, - {"programmable-speaker", 1}, - {"nullius-aluminum-sheet", 3} + {type = "item", name = "nullius-turbine-open-1", amount = 1}, + {type = "item", name = "nullius-capacitor", amount = 2}, + {type = "item", name = "bob-turbo-inserter", amount = 2}, + {type = "item", name = "constant-combinator", amount = 2}, + {type = "item", name = "programmable-speaker", amount = 1}, + {type = "item", name = "nullius-aluminum-sheet", amount = 3} }, - result = "nullius-robot-frame-1", - result_count = 2 + results = { + {type = "item", name = "nullius-robot-frame-1", amount = 2} + } }, { type = "recipe", name = "nullius-legacy-boxed-robot-frame-1", enabled = false, - hidden = true, + hidden = true, show_amount_in_title = false, always_show_products = true, always_show_made_in = true, @@ -7375,15 +7627,16 @@ data:extend({ order = "nullius-gbl", energy_required = 60, ingredients = { - {"nullius-box-turbine-open-1", 1}, - {"nullius-box-capacitor", 2}, - {"nullius-box-filter-inserter-2", 2}, - {"nullius-box-memory-circuit", 2}, - {"nullius-box-antenna", 1}, - {"nullius-box-aluminum-sheet", 3} + {type = "item", name = "nullius-box-turbine-open-1", amount = 1}, + {type = "item", name = "nullius-box-capacitor", amount = 2}, + {type = "item", name = "nullius-box-inserter-2", amount = 2}, + {type = "item", name = "nullius-box-memory-circuit", amount = 2}, + {type = "item", name = "nullius-box-antenna", amount = 1}, + {type = "item", name = "nullius-box-aluminum-sheet", amount = 3} }, - result = "nullius-box-robot-frame-1", - result_count = 2 + results = { + {type = "item", name = "nullius-box-robot-frame-1", amount = 2} + } }, { type = "recipe", @@ -7395,13 +7648,15 @@ data:extend({ category = "tiny-crafting", energy_required = 10, ingredients = { - {"nullius-robot-frame-1", 1}, - {"nullius-levitation-field-1", 1}, - {"nullius-battery-1", 2}, - {"nullius-night-vision-1", 1}, - {"nullius-fiberglass", 3} + {type = "item", name = "nullius-robot-frame-1", amount = 1}, + {type = "item", name = "nullius-levitation-field-1", amount = 1}, + {type = "item", name = "nullius-battery-1", amount = 2}, + {type = "item", name = "nullius-night-vision-1", amount = 1}, + {type = "item", name = "nullius-fiberglass", amount = 3} }, - result = "nullius-robot-frame-2" + results = { + {type = "item", name = "nullius-robot-frame-2", amount = 1} + } }, { type = "recipe", @@ -7415,19 +7670,21 @@ data:extend({ order = "nullius-gc", energy_required = 50, ingredients = { - {"nullius-box-robot-frame-1", 1}, - {"nullius-box-levitation-field-1", 1}, - {"nullius-box-battery-1", 2}, - {"nullius-box-night-vision-1", 1}, - {"nullius-box-fiberglass", 3} + {type = "item", name = "nullius-box-robot-frame-1", amount = 1}, + {type = "item", name = "nullius-box-levitation-field-1",amount = 1}, + {type = "item", name = "nullius-box-battery-1", amount = 2}, + {type = "item", name = "nullius-box-night-vision-1", amount = 1}, + {type = "item", name = "nullius-box-fiberglass", amount = 3} }, - result = "nullius-box-robot-frame-2" + results = { + {type = "item", name = "nullius-box-robot-frame-2", amount = 1} + } }, { type = "recipe", name = "nullius-legacy-robot-frame-2", enabled = false, - hidden = true, + hidden = true, show_amount_in_title = false, always_show_products = true, always_show_made_in = true, @@ -7437,20 +7694,21 @@ data:extend({ order = "nullius-ccl", energy_required = 15, ingredients = { - {"nullius-robot-frame-1", 1}, - {"nullius-turbine-open-2", 1}, - {"nullius-battery-1", 3}, - {"nullius-sensor-1", 2}, - {"nullius-fiberglass", 5} + {type = "item", name = "nullius-robot-frame-1", amount = 1}, + {type = "item", name = "nullius-turbine-open-2", amount = 1}, + {type = "item", name = "nullius-battery-1", amount = 3}, + {type = "item", name = "nullius-sensor-1", amount = 2}, + {type = "item", name = "nullius-fiberglass", amount = 5} }, - result = "nullius-robot-frame-2", - result_count = 2 + results = { + {type = "item", name = "nullius-robot-frame-2", amount = 2} + } }, { type = "recipe", name = "nullius-legacy-boxed-robot-frame-2", enabled = false, - hidden = true, + hidden = true, show_amount_in_title = false, always_show_products = true, always_show_made_in = true, @@ -7461,14 +7719,15 @@ data:extend({ order = "nullius-gcl", energy_required = 75, ingredients = { - {"nullius-box-robot-frame-1", 1}, - {"nullius-box-turbine-open-2", 1}, - {"nullius-box-battery-1", 3}, - {"nullius-box-sensor-1", 2}, - {"nullius-box-fiberglass", 5} + {type = "item", name = "nullius-box-robot-frame-1", amount = 1}, + {type = "item", name = "nullius-box-turbine-open-2", amount = 1}, + {type = "item", name = "nullius-box-battery-1", amount = 3}, + {type = "item", name = "nullius-box-sensor-1", amount = 2}, + {type = "item", name = "nullius-box-fiberglass", amount = 5} }, - result = "nullius-box-robot-frame-2", - result_count = 2 + results = { + {type = "item", name = "nullius-box-robot-frame-2", amount = 2} + } }, { type = "recipe", @@ -7480,15 +7739,16 @@ data:extend({ category = "tiny-crafting", energy_required = 25, ingredients = { - {"nullius-robot-frame-2", 2}, - {"nullius-turbine-open-3", 1}, - {"nullius-battery-2", 2}, - {"nullius-carbon-composite", 5}, - {"nullius-relay-3", 1}, - {"express-stack-filter-inserter", 3} + {type = "item", name = "nullius-robot-frame-2", amount = 2}, + {type = "item", name = "nullius-turbine-open-3", amount = 1}, + {type = "item", name = "nullius-battery-2", amount = 2}, + {type = "item", name = "nullius-carbon-composite", amount = 5}, + {type = "item", name = "nullius-relay-3", amount = 1}, + {type = "item", name = "bob-express-bulk-inserter", amount = 3} }, - result = "nullius-robot-frame-3", - result_count = 2 + results = { + {type = "item", name = "nullius-robot-frame-3", amount = 2} + } }, { type = "recipe", @@ -7502,15 +7762,16 @@ data:extend({ order = "nullius-gd", energy_required = 125, ingredients = { - {"nullius-box-robot-frame-2", 2}, - {"nullius-box-turbine-open-3", 1}, - {"nullius-box-battery-2", 2}, - {"nullius-box-carbon-composite", 5}, - {"nullius-box-relay-3", 1}, - {"nullius-box-filter-inserter-4", 3} + {type = "item", name = "nullius-box-robot-frame-2", amount = 2}, + {type = "item", name = "nullius-box-turbine-open-3", amount = 1}, + {type = "item", name = "nullius-box-battery-2", amount = 2}, + {type = "item", name = "nullius-box-carbon-composite", amount = 5}, + {type = "item", name = "nullius-box-relay-3", amount = 1}, + {type = "item", name = "nullius-box-inserter-4", amount = 3} }, - result = "nullius-box-robot-frame-3", - result_count = 2 + results = { + {type = "item", name = "nullius-box-robot-frame-3", amount = 2} + } }, { type = "recipe", @@ -7522,14 +7783,16 @@ data:extend({ category = "tiny-crafting", energy_required = 30, ingredients = { - {"nullius-robot-frame-3", 1}, - {"nullius-titanium-sheet", 6}, - {"nullius-copper-wire", 4}, - {"nullius-night-vision-3", 1}, - {"nullius-levitation-field-2", 1}, - {"nullius-processor-3", 2} + {type = "item", name = "nullius-robot-frame-3", amount = 1}, + {type = "item", name = "nullius-titanium-sheet", amount = 6}, + {type = "item", name = "nullius-copper-wire", amount = 4}, + {type = "item", name = "nullius-night-vision-3", amount = 1}, + {type = "item", name = "nullius-levitation-field-2", amount = 1}, + {type = "item", name = "nullius-processor-3", amount = 2} }, - result = "nullius-robot-frame-4" + results = { + {type = "item", name = "nullius-robot-frame-4", amount = 1} + } }, { type = "recipe", @@ -7543,21 +7806,23 @@ data:extend({ order = "nullius-ge", energy_required = 150, ingredients = { - {"nullius-box-robot-frame-3", 1}, - {"nullius-box-titanium-sheet", 6}, - {"nullius-box-copper-wire", 4}, - {"nullius-night-vision-3", 5}, - {"nullius-levitation-field-2", 5}, - {"nullius-box-processor-3", 2} + {type = "item", name = "nullius-box-robot-frame-3", amount = 1}, + {type = "item", name = "nullius-box-titanium-sheet", amount = 6}, + {type = "item", name = "nullius-box-copper-wire", amount = 4}, + {type = "item", name = "nullius-night-vision-3", amount = 5}, + {type = "item", name = "nullius-levitation-field-2", amount = 5}, + {type = "item", name = "nullius-box-processor-3", amount = 2} }, - result = "nullius-box-robot-frame-4" + results = { + {type = "item", name = "nullius-box-robot-frame-4", amount = 1} + } }, { type = "item", name = "nullius-fiberglass", icons = {{ - icon = "__angelssmelting__/graphics/icons/plate-nickel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/plate-nickel.png", icon_size = 32, tint = {0.5, 0.7, 1} }}, @@ -7577,8 +7842,9 @@ data:extend({ {type="item", name="nullius-glass-fiber", amount=2}, {type="fluid", name="nullius-epoxy", amount=15, fluidbox_index=1} }, - result = "nullius-fiberglass", - result_count = 5 + results = { + {type = "item", name = "nullius-fiberglass", amount = 5} + } }, { type = "recipe", @@ -7593,8 +7859,9 @@ data:extend({ {type="item", name="nullius-box-glass-fiber", amount=2}, {type="fluid", name="nullius-epoxy", amount=75, fluidbox_index=1} }, - result = "nullius-box-fiberglass", - result_count = 5 + results = { + {type = "item", name = "nullius-box-fiberglass", amount = 5} + } }, { @@ -7621,7 +7888,9 @@ data:extend({ {type="item", name="nullius-carbon-fiber", amount=2}, {type="fluid", name="nullius-epoxy", amount=8} }, - result = "nullius-carbon-composite" + results = { + {type = "item", name = "nullius-carbon-composite", amount = 1} + } }, { type = "recipe", @@ -7637,7 +7906,9 @@ data:extend({ {type="item", name="nullius-box-carbon-fiber", amount=2}, {type="fluid", name="nullius-epoxy", amount=40} }, - result = "nullius-box-carbon-composite" + results = { + {type = "item", name = "nullius-box-carbon-composite", amount = 1} + } }, { @@ -7696,9 +7967,9 @@ data:extend({ { type = "item", name = "nullius-insulation", - icon = "__angelssmelting__/graphics/icons/roll-manganese.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-manganese.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "glass-product", order = "nullius-f", stack_size = 100 @@ -7712,13 +7983,14 @@ data:extend({ category = "medium-assembly", energy_required = 6, ingredients = { - {"nullius-gypsum", 3}, - {"nullius-glass-fiber", 2}, - {"nullius-plastic", 2}, - {"nullius-textile", 1} + {type = "item", name = "nullius-gypsum", amount = 3}, + {type = "item", name = "nullius-glass-fiber", amount = 2}, + {type = "item", name = "nullius-plastic", amount = 2}, + {type = "item", name = "nullius-textile", amount = 1} }, - result = "nullius-insulation", - result_count = 2 + results = { + {type = "item", name = "nullius-insulation", amount = 2} + } }, { type = "recipe", @@ -7730,13 +8002,14 @@ data:extend({ subgroup = "boxed-glass", energy_required = 30, ingredients = { - {"nullius-box-gypsum", 3}, - {"nullius-box-glass-fiber", 2}, - {"nullius-box-plastic", 2}, - {"nullius-box-textile", 1} + {type = "item", name = "nullius-box-gypsum", amount = 3}, + {type = "item", name = "nullius-box-glass-fiber", amount = 2}, + {type = "item", name = "nullius-box-plastic", amount = 2}, + {type = "item", name = "nullius-box-textile", amount = 1} }, - result = "nullius-box-insulation", - result_count = 2 + results = { + {type = "item", name = "nullius-box-insulation", amount = 2} + } }, { @@ -7744,7 +8017,7 @@ data:extend({ name = "nullius-processor-1", icon = "__base__/graphics/icons/electronic-circuit.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "electronic-intermediate", order = "nullius-fb", stack_size = 50 @@ -7760,11 +8033,13 @@ data:extend({ {type="item", name="nullius-monocrystalline-silicon", amount=2}, {type="item", name="nullius-ceramic-powder", amount=1}, {type="item", name="constant-combinator", amount=2}, - {type="item", name="green-wire", amount=2}, + {type="item", name="nullius-green-wire", amount=2}, {type="fluid", name="nullius-acid-nitric", amount=3, fluidbox_index=2}, {type="fluid", name="nullius-argon", amount=2, fluidbox_index=3} }, - result = "nullius-processor-1" + results = { + {type = "item", name = "nullius-processor-1", amount = 1} + } }, { type = "recipe", @@ -7782,14 +8057,16 @@ data:extend({ {type="fluid", name="nullius-acid-nitric", amount=15, fluidbox_index=2}, {type="fluid", name="nullius-argon", amount=10, fluidbox_index=3} }, - result = "nullius-box-processor-1" + results = { + {type = "item", name = "nullius-box-processor-1", amount = 1} + } }, { type = "item", name = "nullius-processor-2", icon = "__base__/graphics/icons/advanced-circuit.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "electronic-intermediate", order = "nullius-fc", stack_size = 50 @@ -7809,7 +8086,9 @@ data:extend({ {type="fluid", name="nullius-acid-sulfuric", amount=4, fluidbox_index=2}, {type="fluid", name="nullius-helium", amount=8, fluidbox_index=3} }, - result = "nullius-processor-2" + results = { + {type = "item", name = "nullius-processor-2", amount = 1} + } }, { type = "recipe", @@ -7827,14 +8106,16 @@ data:extend({ {type="fluid", name="nullius-acid-sulfuric", amount=20, fluidbox_index=2}, {type="fluid", name="nullius-helium", amount=40, fluidbox_index=3} }, - result = "nullius-box-processor-2" + results = { + {type = "item", name = "nullius-box-processor-2", amount = 1} + } }, { type = "item", name = "nullius-processor-3", icon = "__base__/graphics/icons/processing-unit.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "electronic-intermediate", order = "nullius-fc", stack_size = 50 @@ -7855,7 +8136,9 @@ data:extend({ {type="fluid", name="nullius-helium", amount=8, fluidbox_index=2}, {type="fluid", name="nullius-compressed-oxygen", amount=10, fluidbox_index=3} }, - result = "nullius-processor-3" + results = { + {type = "item", name = "nullius-processor-3", amount = 1} + } }, { type = "recipe", @@ -7874,7 +8157,9 @@ data:extend({ {type="fluid", name="nullius-helium", amount=40, fluidbox_index=2}, {type="fluid", name="nullius-compressed-oxygen", amount=50, fluidbox_index=3} }, - result = "nullius-box-processor-3" + results = { + {type = "item", name = "nullius-box-processor-3", amount = 1} + } }, { @@ -7899,7 +8184,9 @@ data:extend({ {type="item", name="copper-cable", amount=2}, {type="item", name="nullius-plastic", amount=1} }, - result = "nullius-transformer" + results = { + {type = "item", name = "nullius-transformer", amount = 1} + } }, { type = "recipe", @@ -7915,16 +8202,18 @@ data:extend({ {type="item", name="nullius-box-insulated-wire", amount=2}, {type="item", name="nullius-box-plastic", amount=1} }, - result = "nullius-box-transformer" + results = { + {type = "item", name = "nullius-box-transformer", amount = 1} + } }, { type = "item", name = "nullius-crushed-uranium-ore", icons = {{ - icon = "__angelssmelting__/graphics/icons/processed-tin.png", + icon = "__angelssmeltinggraphics__/graphics/icons/processed-tin.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.8, 1, 0.8} }}, subgroup = "uranium", @@ -7937,7 +8226,7 @@ data:extend({ enabled = false, category = "ore-crushing", energy_required = 12, - ingredients = {{"uranium-ore", 5}}, + ingredients = {{type="item", name="uranium-ore", amount = 5}}, results = { {type="item", name="nullius-crushed-uranium-ore", amount=2}, {type="item", name="nullius-mineral-dust", amount=3} @@ -7948,9 +8237,9 @@ data:extend({ type = "item", name = "nullius-yellowcake", icons = {{ - icon = "__angelssmelting__/graphics/icons/pellet-gold.png", + icon = "__angelssmeltinggraphics__/graphics/icons/pellet-gold.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.7, 1, 0.7} }}, subgroup = "uranium", @@ -7981,7 +8270,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/uranium-238.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "uranium", order = "nullius-e", @@ -7994,8 +8283,8 @@ data:extend({ category = "vent-smelting", energy_required = 16, ingredients = { - {"nullius-yellowcake", 5}, - {"nullius-soda-ash", 2} + {type="item", name="nullius-yellowcake", amount = 5}, + {type="item", name="nullius-soda-ash", amount = 2} }, results = { {type="item", name="nullius-uranium", amount=3}, @@ -8011,7 +8300,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/uranium-235.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "uranium", order = "nullius-f", @@ -8040,13 +8329,13 @@ data:extend({ name = "nullius-fission-cell", icon = "__base__/graphics/icons/uranium-fuel-cell.png", icon_size = 64, - icon_mipmaps = 4, + fuel_category = "nullius-nuclear", burnt_result = "nullius-spent-fission-cell", fuel_value = "4GJ", fuel_acceleration_multiplier = 2.2, fuel_top_speed_multiplier = 1.6, - fuel_glow_color = {r=0, g=1, b=0, a=1}, + fuel_glow_color = {r=0, g=1, b=0, a=1}, subgroup = "nuclear", order = "nullius-eb", stack_size = 20 @@ -8054,9 +8343,9 @@ data:extend({ { type = "item", name = "nullius-spent-fission-cell", - icon = "__base__/graphics/icons/used-up-uranium-fuel-cell.png", + icon = "__base__/graphics/icons/depleted-uranium-fuel-cell.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "nuclear", order = "nullius-ec", stack_size = 20 @@ -8074,17 +8363,23 @@ data:extend({ {type="item", name="nullius-uranium", amount=5}, {type="item", name="nullius-enriched-uranium", amount=1} }, - result = "nullius-fission-cell" + results = { + {type = "item", name = "nullius-fission-cell", amount = 1} + } }, { type = "recipe", name = "nullius-fission-recycling", - icon = "__base__/graphics/icons/used-up-uranium-fuel-cell.png", - icon_size = 64, - icon_mipmaps = 4, + icons = add_recipe_gear_icon({ + { + icon = "__base__/graphics/icons/depleted-uranium-fuel-cell.png", + icon_size = 64 + }, + }), enabled = false, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, category = "ore-flotation", subgroup = "nuclear", order = "nullius-ec", @@ -8109,7 +8404,7 @@ data:extend({ fuel_category = "nullius-nuclear", burnt_result = "nullius-antimatter", fuel_value = "1GJ", - fuel_glow_color = {r=0.9, g=0.6, b=0, a=1}, + fuel_glow_color = {r=0.9, g=0.6, b=0, a=1}, subgroup = "nuclear", order = "nullius-fb", stack_size = 20 @@ -8142,7 +8437,37 @@ data:extend({ {type="item", name="nullius-sensor-2", amount=1}, {type="item", name="nullius-battery-2", amount=2} }, - result = "nullius-antimatter-trap" + results = { + {type = "item", name = "nullius-antimatter-trap", amount = 1} + } + }, + { + type = "item", + name = "nullius-red-wire", + icon = ICONPATH.."red-wire.png", + icon_size = 64, + flags = {}, + auto_recycle = false, + subgroup = "electronic-intermediate", + color_hint = { text = "R" }, + inventory_move_sound = data.raw["item"]["red-wire"].inventory_move_sound, + pick_sound = data.raw["item"]["red-wire"].pick_sound, + drop_sound = data.raw["item"]["red-wire"].drop_sound, + stack_size = 200 + }, + { + type = "item", + name = "nullius-green-wire", + icon = ICONPATH.."green-wire.png", + icon_size = 64, + flags = {}, + auto_recycle = false, + subgroup = "electronic-intermediate", + color_hint = { text = "G" }, + inventory_move_sound = data.raw["item"]["green-wire"].inventory_move_sound, + pick_sound = data.raw["item"]["green-wire"].pick_sound, + drop_sound = data.raw["item"]["green-wire"].drop_sound, + stack_size = 200 }, }) diff --git a/nullius/prototypes/item/landfill.lua b/nullius/prototypes/item/landfill.lua index 0bff417..b58e94b 100644 --- a/nullius/prototypes/item/landfill.lua +++ b/nullius/prototypes/item/landfill.lua @@ -16,7 +16,7 @@ data:extend({ place_as_tile = { result = "landfill", condition_size = 1, - condition = { "ground-tile" } + condition = { layers = {ground_tile = true}} } }, { @@ -30,7 +30,7 @@ data:extend({ place_as_tile = { result = "nullius-land-fill-sand", condition_size = 1, - condition = { "ground-tile" } + condition = { layers = {ground_tile = true}} } }, { @@ -44,7 +44,7 @@ data:extend({ place_as_tile = { result = "nullius-land-fill-bauxite", condition_size = 1, - condition = { "ground-tile" } + condition = { layers = {ground_tile = true}} } }, { @@ -58,7 +58,7 @@ data:extend({ place_as_tile = { result = "nullius-land-fill-iron", condition_size = 1, - condition = { "ground-tile" } + condition = { layers = {ground_tile = true}} } }, { @@ -72,7 +72,7 @@ data:extend({ place_as_tile = { result = "nullius-land-fill-limestone", condition_size = 1, - condition = { "ground-tile" } + condition = { layers = {ground_tile = true}} } }, @@ -88,11 +88,12 @@ data:extend({ show_amount_in_title = false, always_show_products = true, ingredients = { - {"nullius-gravel", 5}, - {"nullius-sand", 1} + {type = "item", name = "nullius-gravel", amount = 5}, + {type = "item", name = "nullius-sand", amount = 1} }, - result = "nullius-land-fill-gravel", - result_count = 2 + results = { + {type="item", name="nullius-land-fill-gravel", amount = 2} + } }, { type = "recipe", @@ -107,10 +108,12 @@ data:extend({ category = "ore-crushing", subgroup = "boxed-land-fill", ingredients = { - {"nullius-box-gravel", 5}, - {"nullius-box-sand", 1} + {type = "item", name = "nullius-box-gravel", amount = 5}, + {type = "item", name = "nullius-box-sand", amount = 1} }, - result = "nullius-box-land-fill-gravel" + results = { + {type="item", name="nullius-box-land-fill-gravel", amount = 1} + } }, { type = "recipe", @@ -124,11 +127,12 @@ data:extend({ show_amount_in_title = false, always_show_products = true, ingredients = { - {"nullius-sand", 10}, - {"nullius-gravel", 2} + {type = "item", name = "nullius-sand", amount = 10}, + {type = "item", name = "nullius-gravel", amount = 2} }, - result = "nullius-land-fill-sand", - result_count = 4 + results = { + {type="item", name="nullius-land-fill-sand", amount = 4} + } }, { type = "recipe", @@ -143,10 +147,12 @@ data:extend({ category = "ore-crushing", subgroup = "boxed-land-fill", ingredients = { - {"nullius-box-sand", 5}, - {"nullius-box-gravel", 1} + {type = "item", name = "nullius-box-sand", amount = 5}, + {type = "item", name = "nullius-box-gravel", amount = 1} }, - result = "nullius-box-land-fill-sand" + results = { + {type="item", name="nullius-box-land-fill-sand", amount = 1} + } }, { type = "recipe", @@ -160,11 +166,12 @@ data:extend({ show_amount_in_title = false, always_show_products = true, ingredients = { - {"nullius-crushed-bauxite", 15}, - {"nullius-gravel", 5} + {type = "item", name = "nullius-crushed-bauxite", amount = 15}, + {type = "item", name = "nullius-gravel", amount = 5} }, - result = "nullius-land-fill-bauxite", - result_count = 10 + results = { + {type="item", name="nullius-land-fill-bauxite", amount = 10} + } }, { type = "recipe", @@ -177,11 +184,12 @@ data:extend({ always_show_products = true, category = "ore-crushing", ingredients = { - {"nullius-crushed-iron-ore", 4}, - {"nullius-sand", 1} + {type = "item", name = "nullius-crushed-iron-ore", amount = 4}, + {type = "item", name = "nullius-sand", amount = 1} }, - result = "nullius-land-fill-iron", - result_count = 2 + results = { + {type="item", name="nullius-land-fill-iron", amount = 2} + } }, { type = "recipe", @@ -194,10 +202,11 @@ data:extend({ always_show_products = true, category = "ore-crushing", ingredients = { - {"nullius-crushed-limestone", 25} + {type = "item", name = "nullius-crushed-limestone", amount = 25} }, - result = "nullius-land-fill-limestone", - result_count = 10 + results = { + {type="item", name="nullius-land-fill-limestone", amount = 10} + } }, { @@ -212,7 +221,7 @@ data:extend({ { icon = "__base__/graphics/icons/concrete.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.2, shift = {-12, -12} } @@ -225,11 +234,12 @@ data:extend({ show_amount_in_title = false, always_show_products = true, ingredients = { - {"nullius-gravel", 10}, - {"concrete", 15} + {type = "item", name = "nullius-gravel", amount = 10}, + {type = "item", name = "concrete", amount = 15} }, - result = "nullius-land-fill-gravel", - result_count = 20 + results = { + {type="item", name="nullius-land-fill-gravel", amount = 20} + } }, { type = "recipe", @@ -249,7 +259,7 @@ data:extend({ { icon = "__base__/graphics/icons/concrete.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.18, shift = {-11, -11} } @@ -262,11 +272,12 @@ data:extend({ subgroup = "boxed-land-fill", energy_required = 16, ingredients = { - {"nullius-box-gravel", 4}, - {"nullius-box-concrete", 3} + {type = "item", name = "nullius-box-gravel", amount = 4}, + {type = "item", name = "nullius-box-concrete", amount = 3} }, - result = "nullius-box-land-fill-gravel", - result_count = 4 + results = { + {type="item", name="nullius-box-land-fill-gravel", amount = 4} + } }, { @@ -281,7 +292,7 @@ data:extend({ { icon = "__base__/graphics/icons/concrete.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.2, shift = {-12, -12} } @@ -294,11 +305,12 @@ data:extend({ show_amount_in_title = false, always_show_products = true, ingredients = { - {"nullius-sand", 10}, - {"nullius-yellow-concrete", 10} + {type = "item", name = "nullius-sand", amount = 10}, + {type = "item", name = "nullius-yellow-concrete", amount = 10} }, - result = "nullius-land-fill-sand", - result_count = 20 + results = { + {type="item", name="nullius-land-fill-sand", amount = 20} + } }, { type = "recipe", @@ -318,7 +330,7 @@ data:extend({ { icon = "__base__/graphics/icons/concrete.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.18, shift = {-11, -11} } @@ -331,11 +343,12 @@ data:extend({ subgroup = "boxed-land-fill", energy_required = 6, ingredients = { - {"nullius-box-sand", 2}, - {"nullius-box-yellow-concrete", 1} + {type = "item", name = "nullius-box-sand", amount = 2}, + {type = "item", name = "nullius-box-yellow-concrete", amount = 1} }, - result = "nullius-box-land-fill-sand", - result_count = 2 + results = { + {type="item", name="nullius-box-land-fill-sand", amount = 2} + } }, { @@ -350,7 +363,7 @@ data:extend({ { icon = "__base__/graphics/icons/concrete.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.2, shift = {-12, -12} } @@ -363,11 +376,12 @@ data:extend({ show_amount_in_title = false, always_show_products = true, ingredients = { - {"nullius-crushed-bauxite", 3}, - {"nullius-brown-concrete", 5} + {type = "item", name = "nullius-crushed-bauxite", amount = 3}, + {type = "item", name = "nullius-brown-concrete", amount = 5} }, - result = "nullius-land-fill-bauxite", - result_count = 10 + results = { + {type="item", name="nullius-land-fill-bauxite", amount = 10} + } }, { type = "recipe", @@ -381,11 +395,12 @@ data:extend({ order = "nullius-db", energy_required = 40, ingredients = { - {"nullius-box-crushed-bauxite", 6}, - {"nullius-box-brown-concrete", 5} + {type = "item", name = "nullius-box-crushed-bauxite", amount = 6}, + {type = "item", name = "nullius-box-brown-concrete", amount = 5} }, - result = "nullius-box-land-fill-bauxite", - result_count = 10 + results = { + {type="item", name="nullius-box-land-fill-bauxite", amount = 10} + } }, { @@ -400,7 +415,7 @@ data:extend({ { icon = "__base__/graphics/icons/concrete.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.2, shift = {-12, -12} } @@ -412,11 +427,12 @@ data:extend({ always_show_products = true, category = "ore-crushing", ingredients = { - {"nullius-crushed-iron-ore", 4}, - {"nullius-red-concrete", 5} + {type = "item", name = "nullius-crushed-iron-ore", amount = 4}, + {type = "item", name = "nullius-red-concrete", amount = 5} }, - result = "nullius-land-fill-iron", - result_count = 10 + results = { + {type="item", name="nullius-land-fill-iron", amount = 10} + } }, { type = "recipe", @@ -429,11 +445,12 @@ data:extend({ order = "nullius-eb", energy_required = 40, ingredients = { - {"nullius-box-crushed-iron-ore", 8}, - {"nullius-box-red-concrete", 5} + {type = "item", name = "nullius-box-crushed-iron-ore", amount = 8}, + {type = "item", name = "nullius-box-red-concrete", amount = 5} }, - result = "nullius-box-land-fill-iron", - result_count = 10 + results = { + {type="item", name="nullius-box-land-fill-iron", amount = 10} + } }, { @@ -448,7 +465,7 @@ data:extend({ { icon = "__base__/graphics/icons/concrete.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.2, shift = {-12, -12} } @@ -460,11 +477,12 @@ data:extend({ always_show_products = true, category = "ore-crushing", ingredients = { - {"nullius-crushed-limestone", 5}, - {"refined-concrete", 4} + {type = "item", name = "nullius-crushed-limestone", amount = 5}, + {type = "item", name = "refined-concrete", amount = 4} }, - result = "nullius-land-fill-limestone", - result_count = 10 + results = { + {type="item", name="nullius-land-fill-limestone", amount = 10} + } }, { type = "recipe", @@ -477,11 +495,12 @@ data:extend({ order = "nullius-fb", energy_required = 20, ingredients = { - {"nullius-box-crushed-limestone", 5}, - {"nullius-box-reinforced-concrete", 2} + {type = "item", name = "nullius-box-crushed-limestone", amount = 5}, + {type = "item", name = "nullius-box-reinforced-concrete", amount = 2} }, - result = "nullius-box-land-fill-limestone", - result_count = 5 + results = { + {type="item", name="nullius-box-land-fill-limestone", amount = 5} + } }, { @@ -513,8 +532,9 @@ data:extend({ {type="item", name="nullius-land-fill-sand", amount=2}, {type="fluid", name="nullius-sludge", amount=30} }, - result = "nullius-land-fill-bauxite", - result_count = 10 + results = { + {type="item", name="nullius-land-fill-bauxite", amount = 10} + } }, { type = "recipe", @@ -550,8 +570,9 @@ data:extend({ {type="item", name="nullius-box-land-fill-sand", amount=2}, {type="fluid", name="nullius-sludge", amount=300} }, - result = "nullius-box-land-fill-bauxite", - result_count = 10 + results = { + {type="item", name="nullius-box-land-fill-bauxite", amount = 10} + } }, { type = "recipe", @@ -568,9 +589,9 @@ data:extend({ scale = 0.45 }, { - icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-tungsten.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.225, shift = {-9, -10} } @@ -589,8 +610,9 @@ data:extend({ {type="item", name="nullius-box-mineral-dust", amount=15}, {type="fluid", name="nullius-freshwater", amount=400} }, - result = "nullius-box-land-fill-bauxite", - result_count = 8 + results = { + {type="item", name="nullius-box-land-fill-bauxite", amount = 8} + } }, { type = "recipe", @@ -609,7 +631,7 @@ data:extend({ { icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.2, shift = {-9, -9} } @@ -628,8 +650,9 @@ data:extend({ {type="item", name="nullius-box-rubber", amount=1}, {type="item", name="nullius-box-graphite", amount=30} }, - result = "nullius-box-land-fill-gravel", - result_count = 12 + results = { + {type="item", name="nullius-box-land-fill-gravel", amount = 12} + } }, { type = "recipe", @@ -641,7 +664,7 @@ data:extend({ icon_size = 64 }, { - icon = "__base__/graphics/decorative/brown-asterisk/hr-brown-asterisk-11.png", + icon = "__base__/graphics/decorative/brown-asterisk/brown-asterisk-11.png", icon_size = 54, scale = 0.41, shift = {-7, -7} @@ -682,7 +705,7 @@ data:extend({ scale = 0.45 }, { - icon = "__base__/graphics/decorative/brown-asterisk/hr-brown-asterisk-11.png", + icon = "__base__/graphics/decorative/brown-asterisk/brown-asterisk-11.png", icon_size = 54, scale = 0.37, shift = {-6, -6} @@ -802,7 +825,7 @@ data:extend({ scale = 0.45 }, { - icon = "__angelspetrochem__/graphics/icons/molecules/chlorine.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/chlorine.png", icon_size = 72, scale = 0.2, shift = {-9, -10} @@ -812,7 +835,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - no_productivity = true, + no_productivity = true, category = "bulk-smelting", subgroup = "boxed-dumping", order = "nullius-fc", @@ -823,8 +846,9 @@ data:extend({ {type="item", name="nullius-box-plastic", amount=1}, {type="fluid", name="nullius-chlorine", amount=5000} }, - result = "nullius-box-land-fill-sand", - result_count = 8 + results = { + {type="item", name="nullius-box-land-fill-sand", amount = 8} + } }, { type = "recipe", @@ -852,7 +876,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - no_productivity = true, + no_productivity = true, category = "ore-crushing", subgroup = "boxed-dumping", order = "nullius-h", @@ -862,8 +886,9 @@ data:extend({ {type="item", name="nullius-box-soda-ash", amount=2}, {type="item", name="nullius-box-acid-boric", amount=40} }, - result = "nullius-box-land-fill-iron", - result_count = 6 + results = { + {type="item", name="nullius-box-land-fill-iron", amount = 6} + } }, { @@ -969,7 +994,7 @@ data:extend({ ingredients = { {type="item", name="nullius-terraforming-drone-tan", amount=5}, {type="item", name="nullius-box-land-fill-sand", amount=2500}, - {type="item", name="nullius-box-rocket-fuel", amount=4} + {type="item", name="nullius-box-rocket-fuel", amount=4} }, results = { {type="item", name="nullius-shallow-excavation-drone", amount=3}, @@ -981,15 +1006,20 @@ data:extend({ { type = "tile", name = "nullius-land-fill-sand", - collision_mask = {"ground-tile"}, + collision_mask = { layers = {ground_tile = true}}, layer = 40, map_color={r=158, g=129, b=81}, + is_foundation = true, vehicle_friction_modifier = 1.4, walking_speed_modifier = 1, transitions = transitions.cliff_transitions(), transitions_between_transitions = transitions.cliff_transitions_between_transitions(), walking_sound = data.raw.tile["landfill"].walking_sound, - pollution_absorption_per_second = 0, + absorptions_per_second = {pollution = 0}, + minable = { + mining_time = 1, + result = "nullius-land-fill-sand" + }, variants = { material_background = { picture = ENTITYPATH .. "landfill/sand.png", @@ -999,7 +1029,7 @@ data:extend({ { count = 16, line_length = 16, - picture = "__alien-biomes__/graphics/terrain/sr/mineral-tan-sand-2.png", + picture = "__alien-biomes-graphics__/graphics/terrain/mineral-tan-sand-2.png", size = 1, weights = { 0.085, 0.085, 0.085, 0.085, 0.087, 0.085, 0.065, 0.085, 0.045, 0.045, 0.045, 0.045, 0.005, 0.025, 0.045, 0.045 @@ -1009,7 +1039,7 @@ data:extend({ { count = 16, line_length = 16, - picture = "__alien-biomes__/graphics/terrain/sr/mineral-tan-sand-2.png", + picture = "__alien-biomes-graphics__/graphics/terrain/mineral-tan-sand-2.png", probability = 1, size = 2, weights = { @@ -1020,7 +1050,7 @@ data:extend({ { count = 16, line_length = 16, - picture = "__alien-biomes__/graphics/terrain/sr/mineral-tan-sand-2.png", + picture = "__alien-biomes-graphics__/graphics/terrain/mineral-tan-sand-2.png", probability = 0.1, size = 4, weights = { @@ -1029,25 +1059,34 @@ data:extend({ y = 160 } }, - inner_corner_mask = { count = 8, line_length = 8, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 0 }, - o_transition_mask = { count = 1, line_length = 2, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 1152 }, - outer_corner_mask = { count = 8, line_length = 8, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 288 }, - side_mask = { count = 8, line_length = 8, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 576 }, - u_transition_mask = { count = 1, line_length = 1, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 864 } + transition = { + mask_layout = { + inner_corner = { count = 8, line_length = 8, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 0 }, + o_transition = { count = 1, line_length = 2, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 1152 }, + outer_corner = { count = 8, line_length = 8, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 288 }, + side = { count = 8, line_length = 8, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 576 }, + u_transition = { count = 1, line_length = 1, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 864 } + } + }, } }, { type = "tile", name = "nullius-land-fill-bauxite", - collision_mask = {"ground-tile"}, + collision_mask = { layers = {ground_tile = true}}, layer = 39, map_color={r=121, g=103, b=65}, + is_foundation = true, vehicle_friction_modifier = 1.2, walking_speed_modifier = 1, transitions = transitions.cliff_transitions(), transitions_between_transitions = transitions.cliff_transitions_between_transitions(), walking_sound = data.raw.tile["landfill"].walking_sound, - pollution_absorption_per_second = 0, + absorptions_per_second = {pollution = 0}, + minable = { + mining_time = 1, + result = "nullius-land-fill-bauxite" + }, variants = { material_background = { picture = ENTITYPATH .. "landfill/dirt.png", @@ -1057,7 +1096,7 @@ data:extend({ { count = 16, line_length = 16, - picture = "__alien-biomes__/graphics/terrain/sr/mineral-tan-dirt-5.png", + picture = "__alien-biomes-graphics__/graphics/terrain/mineral-tan-dirt-5.png", size = 1, weights = { 0.085, 0.085, 0.085, 0.085, 0.087, 0.085, 0.065, 0.085, 0.045, 0.045, 0.045, 0.045, 0.005, 0.025, 0.045, 0.045 @@ -1067,7 +1106,7 @@ data:extend({ { count = 16, line_length = 16, - picture = "__alien-biomes__/graphics/terrain/sr/mineral-tan-dirt-5.png", + picture = "__alien-biomes-graphics__/graphics/terrain/mineral-tan-dirt-5.png", probability = 1, size = 2, weights = { @@ -1078,7 +1117,7 @@ data:extend({ { count = 16, line_length = 16, - picture = "__alien-biomes__/graphics/terrain/sr/mineral-tan-dirt-5.png", + picture = "__alien-biomes-graphics__/graphics/terrain/mineral-tan-dirt-5.png", probability = 0.1, size = 4, weights = { @@ -1087,25 +1126,35 @@ data:extend({ y = 160 } }, - inner_corner_mask = { count = 8, line_length = 8, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 0 }, - o_transition_mask = { count = 1, line_length = 2, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 1152 }, - outer_corner_mask = { count = 8, line_length = 8, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 288 }, - side_mask = { count = 8, line_length = 8, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 576 }, - u_transition_mask = { count = 1, line_length = 1, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 864 } + transition = { + mask_layout = { + inner_corner = { count = 8, line_length = 8, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 0 }, + o_transition = { count = 1, line_length = 2, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 1152 }, + outer_corner = { count = 8, line_length = 8, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 288 }, + side = { count = 8, line_length = 8, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 576 }, + u_transition = { count = 1, line_length = 1, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 864 } + } + } + } }, { type = "tile", name = "nullius-land-fill-iron", - collision_mask = {"ground-tile"}, + collision_mask = { layers = {ground_tile = true}}, layer = 36, map_color={r=119, g=73, b=68}, + is_foundation = true, vehicle_friction_modifier = 1.1, walking_speed_modifier = 1, transitions = transitions.cliff_transitions(), transitions_between_transitions = transitions.cliff_transitions_between_transitions(), walking_sound = data.raw.tile["landfill"].walking_sound, - pollution_absorption_per_second = 0, + absorptions_per_second = {pollution = 0}, + minable = { + mining_time = 1, + result = "nullius-land-fill-iron" + }, variants = { material_background = { picture = ENTITYPATH .. "landfill/iron.png", @@ -1115,7 +1164,7 @@ data:extend({ { count = 16, line_length = 16, - picture = "__alien-biomes__/graphics/terrain/sr/mineral-red-dirt-2.png", + picture = "__alien-biomes-graphics__/graphics/terrain/mineral-red-dirt-2.png", size = 1, weights = { 0.085, 0.085, 0.085, 0.085, 0.087, 0.085, 0.065, 0.085, 0.045, 0.045, 0.045, 0.045, 0.005, 0.025, 0.045, 0.045 @@ -1125,7 +1174,7 @@ data:extend({ { count = 16, line_length = 16, - picture = "__alien-biomes__/graphics/terrain/sr/mineral-red-dirt-2.png", + picture = "__alien-biomes-graphics__/graphics/terrain/mineral-red-dirt-2.png", probability = 1, size = 2, weights = { @@ -1136,7 +1185,7 @@ data:extend({ { count = 16, line_length = 16, - picture = "__alien-biomes__/graphics/terrain/sr/mineral-red-dirt-2.png", + picture = "__alien-biomes-graphics__/graphics/terrain/mineral-red-dirt-2.png", probability = 0.1, size = 4, weights = { @@ -1145,25 +1194,34 @@ data:extend({ y = 160 } }, - inner_corner_mask = { count = 8, line_length = 8, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 0 }, - o_transition_mask = { count = 1, line_length = 2, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 1152 }, - outer_corner_mask = { count = 8, line_length = 8, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 288 }, - side_mask = { count = 8, line_length = 8, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 576 }, - u_transition_mask = { count = 1, line_length = 1, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 864 } + transition = { + mask_layout = { + inner_corner = { count = 8, line_length = 8, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 0 }, + o_transition = { count = 1, line_length = 2, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 1152 }, + outer_corner = { count = 8, line_length = 8, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 288 }, + side = { count = 8, line_length = 8, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 576 }, + u_transition = { count = 1, line_length = 1, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 864 } + } + } } }, { type = "tile", name = "nullius-land-fill-limestone", - collision_mask = {"ground-tile"}, + collision_mask = { layers = {ground_tile = true}}, layer = 38, map_color={r=161, g=140, b=119}, + is_foundation = true, vehicle_friction_modifier = 1, walking_speed_modifier = 1, transitions = transitions.cliff_transitions(), transitions_between_transitions = transitions.cliff_transitions_between_transitions(), walking_sound = data.raw.tile["landfill"].walking_sound, - pollution_absorption_per_second = 0, + absorptions_per_second = {pollution = 0}, + minable = { + mining_time = 1, + result = "nullius-land-fill-limestone" + }, variants = { material_background = { picture = ENTITYPATH .. "landfill/limestone.png", @@ -1173,7 +1231,7 @@ data:extend({ { count = 16, line_length = 16, - picture = "__alien-biomes__/graphics/terrain/sr/mineral-beige-sand-2.png", + picture = "__alien-biomes-graphics__/graphics/terrain/mineral-beige-sand-2.png", size = 1, weights = { 0.085, 0.085, 0.085, 0.085, 0.087, 0.085, 0.065, 0.085, 0.045, 0.045, 0.045, 0.045, 0.005, 0.025, 0.045, 0.045 @@ -1183,7 +1241,7 @@ data:extend({ { count = 16, line_length = 16, - picture = "__alien-biomes__/graphics/terrain/sr/mineral-beige-sand-2.png", + picture = "__alien-biomes-graphics__/graphics/terrain/mineral-beige-sand-2.png", probability = 1, size = 2, weights = { @@ -1194,7 +1252,7 @@ data:extend({ { count = 16, line_length = 16, - picture = "__alien-biomes__/graphics/terrain/sr/mineral-beige-sand-2.png", + picture = "__alien-biomes-graphics__/graphics/terrain/mineral-beige-sand-2.png", probability = 0.1, size = 4, weights = { @@ -1203,75 +1261,83 @@ data:extend({ y = 160 } }, - inner_corner_mask = { count = 8, line_length = 8, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 0 }, - o_transition_mask = { count = 1, line_length = 2, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 1152 }, - outer_corner_mask = { count = 8, line_length = 8, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 288 }, - side_mask = { count = 8, line_length = 8, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 576 }, - u_transition_mask = { count = 1, line_length = 1, picture = "__base__/graphics/terrain/masks/transition-3.png", x = 864 } + transition = { + mask_layout = { + inner_corner = { count = 8, line_length = 8, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 0 }, + o_transition = { count = 1, line_length = 2, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 1152 }, + outer_corner = { count = 8, line_length = 8, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 288 }, + side = { count = 8, line_length = 8, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 576 }, + u_transition = { count = 1, line_length = 1, spritesheet = "__base__/graphics/terrain/masks/transition-3.png", x = 864 } + } + } } }, { type = "tile", name = "nullius-white-concrete", - localised_name = {"item-name.nullius-white-concrete"}, + localised_name = {"item-name.nullius-white-concrete"}, order = "nullius-ccw", minable = {mining_time = 0.1, result = "nullius-white-concrete"}, - collision_mask = {"ground-tile"}, + collision_mask = { layers = {ground_tile = true}}, walking_speed_modifier = 1.6, vehicle_friction_modifier = 0.5, - layer = 66, + layer = 40, + layer_group = "ground-artificial", map_color={r=0.85, g=0.85, b=0.85}, needs_correction = false, transition_overlay_layer_offset = data.raw.tile["refined-concrete"].transition_overlay_layer_offset, decorative_removal_probability = data.raw.tile["refined-concrete"].decorative_removal_probability, transitions = data.raw.tile["refined-concrete"].transitions, - transitions_between_transitions = data.raw.tile["refined-concrete"].transitions_between_transitions, + transitions_between_transitions = data.raw.tile["refined-concrete"].transitions_between_transitions, mined_sound = data.raw.tile["refined-concrete"].mined_sound, - walking_sound = data.raw.tile["refined-concrete"].walking_sound, - build_sound = data.raw.tile["refined-concrete"].build_sound, - scorch_mark_color = data.raw.tile["refined-concrete"].scorch_mark_color, - pollution_absorption_per_second = data.raw.tile["refined-concrete"].pollution_absorption_per_second, - trigger_effect = data.raw.tile["refined-concrete"].trigger_effect, - + walking_sound = data.raw.tile["refined-concrete"].walking_sound, + build_sound = data.raw.tile["refined-concrete"].build_sound, + scorch_mark_color = data.raw.tile["refined-concrete"].scorch_mark_color, + absorptions_per_second = data.raw.tile["refined-concrete"].absorptions_per_second, + trigger_effect = data.raw.tile["refined-concrete"].trigger_effect, + driving_sound = data.raw.tile["refined-concrete"].driving_sound, + variants = { material_background = { - picture = ENTITYPATH.."concrete/white-concrete.png", + picture = ENTITYPATH.."concrete/white-concrete.png", count = 8, scale = 0.5 }, - inner_corner = { - picture = ENTITYPATH.."concrete/white-concrete-inner-corner.png", - count = 16, - scale = 0.5 - }, - outer_corner = { - picture = ENTITYPATH.."concrete/white-concrete-outer-corner.png", - count = 8, - scale = 0.5 - }, - side = { - picture = ENTITYPATH.."concrete/white-concrete-side.png", - count = 16, - scale = 0.5 - }, - u_transition = { - picture = ENTITYPATH.."concrete/white-concrete-u.png", - count = 8, - scale = 0.5 - }, - o_transition = { - picture = ENTITYPATH.."concrete/white-concrete-o.png", - count = 4, - scale = 0.5 + + transition = { + overlay_layout = { + inner_corner = { + spritesheet = ENTITYPATH.."concrete/white-concrete-inner-corner.png", + count = 16, + scale = 0.5 + }, + outer_corner = { + spritesheet = ENTITYPATH.."concrete/white-concrete-outer-corner.png", + count = 8, + scale = 0.5 + }, + side = { + spritesheet = ENTITYPATH.."concrete/white-concrete-side.png", + count = 16, + scale = 0.5 + }, + u_transition = { + spritesheet = ENTITYPATH.."concrete/white-concrete-u.png", + count = 8, + scale = 0.5 + }, + o_transition = { + spritesheet = ENTITYPATH.."concrete/white-concrete-o.png", + count = 4, + scale = 0.5 + }, + }, + mask_layout = data.raw.tile["refined-concrete"].variants.transition.mask_layout }, + main = data.raw.tile["refined-concrete"].variants.main, - inner_corner_mask = data.raw.tile["refined-concrete"].variants.inner_corner_mask, - outer_corner_mask = data.raw.tile["refined-concrete"].variants.outer_corner_mask, - side_mask = data.raw.tile["refined-concrete"].variants.side_mask, - u_transition_mask = data.raw.tile["refined-concrete"].variants.u_transition_mask, - o_transition_mask = data.raw.tile["refined-concrete"].variants.o_transition_mask } } }) diff --git a/nullius/prototypes/item/module.lua b/nullius/prototypes/item/module.lua index 3381470..86e6661 100644 --- a/nullius/prototypes/item/module.lua +++ b/nullius/prototypes/item/module.lua @@ -6,15 +6,15 @@ data:extend({ { type = "module", name = "nullius-efficiency-module-1", - icon = "__base__/graphics/icons/effectivity-module.png", + icon = "__base__/graphics/icons/efficiency-module.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "module-2", category = "efficiency", tier = 1, order = "nullius-bb", stack_size = 50, - effect = { consumption = {bonus = -0.5} }, + effect = { consumption = -0.5 }, beacon_tint = { primary = {r = 0, g = 1, b = 0, a = 1.000}, secondary = {r = 0.370, g = 1.000, b = 0.370, a = 1.000} @@ -25,15 +25,15 @@ data:extend({ { type = "module", name = "nullius-efficiency-module-2", - icon = "__base__/graphics/icons/effectivity-module-2.png", + icon = "__base__/graphics/icons/efficiency-module-2.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "module-2", category = "efficiency", tier = 2, order = "nullius-bc", stack_size = 50, - effect = { consumption = {bonus = -0.8} }, + effect = { consumption = -0.8 }, beacon_tint = { primary = {r = 0, g = 1, b = 0, a = 1.000}, secondary = {r = 0.370, g = 1.000, b = 0.370, a = 1.000} @@ -44,15 +44,15 @@ data:extend({ { type = "module", name = "nullius-efficiency-module-3", - icon = "__base__/graphics/icons/effectivity-module-3.png", + icon = "__base__/graphics/icons/efficiency-module-3.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "module-2", category = "efficiency", tier = 3, order = "nullius-bd", stack_size = 50, - effect = { consumption = {bonus = -1.2} }, + effect = { consumption = -1.2 }, beacon_tint = { primary = {r = 0, g = 1, b = 0, a = 1.000}, secondary = {r = 0.370, g = 1.000, b = 0.370, a = 1.000} @@ -70,7 +70,7 @@ data:extend({ tier = 0, order = "nullius-db", stack_size = 50, - effect = { speed = {bonus = 0.2}, consumption = {bonus = 0.25} }, + effect = { speed = 0.2, consumption = 0.25 }, beacon_tint = { primary = {r = 0.45, g = 0.3, b = 0.75, a = 1.000}, secondary = {r = 0.56, g = 0.42, b = 0.7, a = 1.000} @@ -88,7 +88,7 @@ data:extend({ tier = 1, order = "nullius-dc", stack_size = 50, - effect = { speed = {bonus = 0.3}, consumption = {bonus = 0.4} }, + effect = { speed = 0.3, consumption = 0.4 }, beacon_tint = { primary = {r = 0.45, g = 0.3, b = 0.75, a = 1.000}, secondary = {r = 0.8, g = 0.6, b = 1, a = 1.000} @@ -106,7 +106,7 @@ data:extend({ tier = 2, order = "nullius-dd", stack_size = 50, - effect = { speed = {bonus = 0.4}, consumption = {bonus = 0.6} }, + effect = { speed = 0.4, consumption = 0.6 }, beacon_tint = { primary = {r = 0.45, g = 0.3, b = 0.75, a = 1.000}, secondary = {r = 0.8, g = 0.6, b = 1, a = 1.000} @@ -124,7 +124,7 @@ data:extend({ tier = 3, order = "nullius-de", stack_size = 50, - effect = { speed = {bonus = 0.5}, consumption = {bonus = 0.8} }, + effect = { speed = 0.5, consumption = 0.8 }, beacon_tint = { primary = {r = 0.45, g = 0.3, b = 0.75, a = 1.000}, secondary = {r = 0.8, g = 0.6, b = 1, a = 1.000} @@ -142,7 +142,7 @@ data:extend({ tier = 0, order = "nullius-eb", stack_size = 50, - effect = { speed = {bonus = 0.15} }, + effect = { speed = 0.15 }, beacon_tint = { primary = {r = 0.441, g = 0.714, b = 1.000, a = 1.000}, secondary = {r = 0.272, g = 0.683, b = 0.7, a = 1.000} @@ -155,13 +155,13 @@ data:extend({ name = "nullius-speed-module-2", icon = "__base__/graphics/icons/speed-module.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "module-1", category = "speed", tier = 1, order = "nullius-ec", stack_size = 50, - effect = { speed = {bonus = 0.2}}, + effect = { speed = 0.2 }, beacon_tint = { primary = {r = 0.441, g = 0.714, b = 1.000, a = 1.000}, secondary = {r = 0.388, g = 0.976, b = 1.000, a = 1.000} @@ -174,13 +174,13 @@ data:extend({ name = "nullius-speed-module-3", icon = "__base__/graphics/icons/speed-module-2.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "module-1", category = "speed", tier = 2, order = "nullius-ed", stack_size = 50, - effect = { speed = {bonus = 0.3}, consumption = {bonus = 0.05} }, + effect = { speed = 0.3, consumption = 0.05 }, beacon_tint = { primary = {r = 0.441, g = 0.714, b = 1.000, a = 1.000}, secondary = {r = 0.388, g = 0.976, b = 1.000, a = 1.000} @@ -193,13 +193,13 @@ data:extend({ name = "nullius-speed-module-4", icon = "__base__/graphics/icons/speed-module-3.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "module-1", category = "speed", tier = 3, order = "nullius-ee", stack_size = 50, - effect = { speed = {bonus = 0.4}, consumption = {bonus = 0.1} }, + effect = { speed = 0.4, consumption = 0.1 }, beacon_tint = { primary = {r = 0.441, g = 0.714, b = 1.000, a = 1.000}, secondary = {r = 0.388, g = 0.976, b = 1.000, a = 1.000} @@ -217,9 +217,7 @@ data:extend({ tier = 0, order = "nullius-cb", stack_size = 50, - effect = { productivity = {bonus = 0.03}, speed = {bonus = -0.05}, consumption = {bonus = 0.1} }, - limitation = {}, - limitation_message_key = "production-module-not-usable" + effect = { productivity = 0.03, speed = -0.05, consumption = 0.1 } }, { type = "module", @@ -231,9 +229,7 @@ data:extend({ tier = 1, order = "nullius-cc", stack_size = 50, - effect = { productivity = {bonus = 0.05}, speed = {bonus = -0.15}, consumption = {bonus = 0.4} }, - limitation = {}, - limitation_message_key = "production-module-not-usable" + effect = { productivity = 0.05, speed = -0.15, consumption = 0.4 } }, { type = "module", @@ -245,9 +241,7 @@ data:extend({ tier = 2, order = "nullius-cd", stack_size = 50, - effect = { productivity = {bonus = 0.07}, speed = {bonus = -0.25}, consumption = {bonus = 0.7} }, - limitation = {}, - limitation_message_key = "production-module-not-usable" + effect = { productivity = 0.07, speed = -0.25, consumption = 0.7 } }, { type = "module", @@ -259,54 +253,46 @@ data:extend({ tier = 3, order = "nullius-ce", stack_size = 50, - effect = { productivity = {bonus = 0.08}, speed = {bonus = -0.4}, consumption = {bonus = 1} }, - limitation = {}, - limitation_message_key = "production-module-not-usable" + effect = { productivity = 0.08, speed = -0.4, consumption = 1 } }, { type = "module", name = "nullius-productivity-module-1", icon = "__base__/graphics/icons/productivity-module.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "module-2", category = "productivity", tier = 1, order = "nullius-db", stack_size = 50, - effect = { productivity = {bonus = 0.04} }, - limitation = {}, - limitation_message_key = "production-module-not-usable" + effect = { productivity = 0.04 } }, { type = "module", name = "nullius-productivity-module-2", icon = "__base__/graphics/icons/productivity-module-2.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "module-2", category = "productivity", tier = 2, order = "nullius-dc", stack_size = 50, - effect = { productivity = {bonus = 0.06}, consumption = {bonus = 0.05} }, - limitation = {}, - limitation_message_key = "production-module-not-usable" + effect = { productivity = 0.06, consumption = 0.05 } }, { type = "module", name = "nullius-productivity-module-3", icon = "__base__/graphics/icons/productivity-module-3.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "module-2", category = "productivity", tier = 3, order = "nullius-dd", stack_size = 50, - effect = { productivity = {bonus = 0.07}, consumption = {bonus = 0.1} }, - limitation = {}, - limitation_message_key = "production-module-not-usable" + effect = { productivity = 0.07, consumption = 0.1 } }, { @@ -320,9 +306,11 @@ data:extend({ ingredients = { {type="item", name="decider-combinator", amount=2}, {type="item", name="constant-combinator", amount=2}, - {type="item", name="green-wire", amount=3} + {type="item", name="nullius-green-wire", amount=3} }, - result = "nullius-efficiency-module-1" + results = { + {type="item", name="nullius-efficiency-module-1", amount = 1} + } }, { type = "recipe", @@ -338,7 +326,9 @@ data:extend({ {type="item", name="nullius-box-memory-circuit", amount=2}, {type="item", name="nullius-box-green-wire", amount=3} }, - result = "nullius-box-efficiency-module-1" + results = { + {type="item", name="nullius-box-efficiency-module-1", amount = 1} + } }, { type = "recipe", @@ -351,9 +341,11 @@ data:extend({ ingredients = { {type="item", name="arithmetic-combinator", amount=2}, {type="item", name="decider-combinator", amount=1}, - {type="item", name="green-wire", amount=3} + {type="item", name="nullius-green-wire", amount=3} }, - result = "nullius-haste-module-1" + results = { + {type="item", name="nullius-haste-module-1", amount = 1} + } }, { type = "recipe", @@ -369,7 +361,9 @@ data:extend({ {type="item", name="nullius-box-logic-circuit", amount=1}, {type="item", name="nullius-box-green-wire", amount=3} }, - result = "nullius-box-haste-module-1" + results = { + {type="item", name="nullius-box-haste-module-1", amount = 1} + } }, { type = "recipe", @@ -383,8 +377,9 @@ data:extend({ {type="item", name="nullius-haste-module-1", amount=2}, {type="item", name="nullius-efficiency-module-1", amount=1} }, - result = "nullius-speed-module-1", - result_count = 2 + results = { + {type="item", name="nullius-speed-module-1", amount = 2} + } }, { type = "recipe", @@ -399,8 +394,9 @@ data:extend({ {type="item", name="nullius-box-haste-module-1", amount=2}, {type="item", name="nullius-box-efficiency-module-1", amount=1} }, - result = "nullius-box-speed-module-1", - result_count = 2 + results = { + {type="item", name="nullius-box-speed-module-1", amount = 2} + } }, { type = "recipe", @@ -414,8 +410,9 @@ data:extend({ {type="item", name="nullius-efficiency-module-1", amount=2}, {type="item", name="nullius-haste-module-1", amount=1} }, - result = "nullius-yield-module-1", - result_count = 2 + results = { + {type="item", name="nullius-yield-module-1", amount = 2} + } }, { type = "recipe", @@ -430,8 +427,9 @@ data:extend({ {type="item", name="nullius-box-efficiency-module-1", amount=2}, {type="item", name="nullius-box-haste-module-1", amount=1} }, - result = "nullius-box-yield-module-1", - result_count = 2 + results = { + {type="item", name="nullius-box-yield-module-1", amount = 2} + } }, { @@ -446,7 +444,9 @@ data:extend({ {type="item", name="nullius-sensor-1", amount=2}, {type="item", name="nullius-battery-1", amount=1} }, - result = "nullius-efficiency-module-2" + results = { + {type="item", name="nullius-efficiency-module-2", amount = 1} + } }, { type = "recipe", @@ -463,7 +463,9 @@ data:extend({ {type="item", name="nullius-box-sensor-1", amount=2}, {type="item", name="nullius-box-battery-1", amount=1} }, - result = "nullius-box-efficiency-module-2" + results = { + {type="item", name="nullius-box-efficiency-module-2", amount = 1} + } }, { type = "recipe", @@ -479,7 +481,9 @@ data:extend({ {type="item", name="nullius-sensor-1", amount=1}, {type="item", name="nullius-optical-cable", amount=1} }, - result = "nullius-haste-module-2" + results = { + {type="item", name="nullius-haste-module-2", amount = 1} + } }, { type = "recipe", @@ -496,7 +500,9 @@ data:extend({ {type="item", name="nullius-box-sensor-1", amount=1}, {type="item", name="nullius-box-optical-cable", amount=1} }, - result = "nullius-box-haste-module-2" + results = { + {type="item", name="nullius-box-haste-module-2", amount = 1} + } }, { type = "recipe", @@ -510,7 +516,9 @@ data:extend({ {type="item", name="nullius-yield-module-1", amount=1}, {type="item", name="nullius-efficiency-module-2", amount=1} }, - result = "nullius-yield-module-2" + results = { + {type="item", name="nullius-yield-module-2", amount = 1} + } }, { type = "recipe", @@ -525,7 +533,9 @@ data:extend({ {type="item", name="nullius-box-yield-module-1", amount=1}, {type="item", name="nullius-box-efficiency-module-2", amount=1} }, - result = "nullius-box-yield-module-2" + results = { + {type="item", name="nullius-box-yield-module-2", amount = 1} + } }, { type = "recipe", @@ -539,7 +549,9 @@ data:extend({ {type="item", name="nullius-speed-module-1", amount=1}, {type="item", name="nullius-haste-module-2", amount=1} }, - result = "nullius-speed-module-2" + results = { + {type="item", name="nullius-speed-module-2", amount = 1} + } }, { type = "recipe", @@ -554,7 +566,9 @@ data:extend({ {type="item", name="nullius-box-speed-module-1", amount=1}, {type="item", name="nullius-box-haste-module-2", amount=1} }, - result = "nullius-box-speed-module-2" + results = { + {type="item", name="nullius-box-speed-module-2", amount = 1} + } }, { type = "recipe", @@ -568,8 +582,9 @@ data:extend({ {type="item", name="nullius-yield-module-2", amount=2}, {type="item", name="nullius-speed-module-2", amount=1} }, - result = "nullius-productivity-module-1", - result_count = 3 + results = { + {type="item", name="nullius-productivity-module-1", amount = 3} + } }, { type = "recipe", @@ -584,8 +599,9 @@ data:extend({ {type="item", name="nullius-box-yield-module-2", amount=2}, {type="item", name="nullius-box-speed-module-2", amount=1} }, - result = "nullius-box-productivity-module-1", - result_count = 3 + results = { + {type="item", name="nullius-box-productivity-module-1", amount = 3} + } }, { @@ -604,8 +620,9 @@ data:extend({ {type="item", name="nullius-transformer", amount=1}, {type="item", name="power-switch", amount=1} }, - result = "nullius-efficiency-module-3", - result_count = 2 + results = { + {type="item", name="nullius-efficiency-module-3", amount = 2} + } }, { type = "recipe", @@ -624,8 +641,9 @@ data:extend({ {type="item", name="nullius-box-transformer", amount=1}, {type="item", name="nullius-box-power-switch", amount=1} }, - result = "nullius-box-efficiency-module-3", - result_count = 2 + results = { + {type="item", name="nullius-box-efficiency-module-3", amount = 2} + } }, { type = "recipe", @@ -642,7 +660,9 @@ data:extend({ {type="item", name="nullius-sensor-2", amount=1}, {type="item", name="nullius-heat-pipe-3", amount=1} }, - result = "nullius-haste-module-3" + results = { + {type="item", name="nullius-haste-module-3", amount = 1} + } }, { type = "recipe", @@ -660,7 +680,9 @@ data:extend({ {type="item", name="nullius-box-sensor-2", amount=1}, {type="item", name="nullius-box-heat-pipe-3", amount=1} }, - result = "nullius-box-haste-module-3" + results = { + {type="item", name="nullius-box-haste-module-3", amount = 1} + } }, { type = "recipe", @@ -675,7 +697,9 @@ data:extend({ {type="item", name="nullius-yield-module-2", amount=1}, {type="item", name="nullius-productivity-module-1", amount=1} }, - result = "nullius-yield-module-3" + results = { + {type="item", name="nullius-yield-module-3", amount = 1} + } }, { type = "recipe", @@ -691,7 +715,9 @@ data:extend({ {type="item", name="nullius-box-yield-module-2", amount=1}, {type="item", name="nullius-box-productivity-module-1", amount=1} }, - result = "nullius-box-yield-module-3" + results = { + {type="item", name="nullius-box-yield-module-3", amount = 1} + } }, { type = "recipe", @@ -706,7 +732,9 @@ data:extend({ {type="item", name="nullius-speed-module-2", amount=1}, {type="item", name="nullius-efficiency-module-2", amount=1} }, - result = "nullius-speed-module-3" + results = { + {type="item", name="nullius-speed-module-3", amount = 1} + } }, { type = "recipe", @@ -722,7 +750,9 @@ data:extend({ {type="item", name="nullius-box-speed-module-2", amount=1}, {type="item", name="nullius-box-efficiency-module-2", amount=1} }, - result = "nullius-box-speed-module-3" + results = { + {type="item", name="nullius-box-speed-module-3", amount = 1} + } }, { type = "recipe", @@ -737,8 +767,9 @@ data:extend({ {type="item", name="nullius-yield-module-3", amount=2}, {type="item", name="nullius-speed-module-3", amount=1} }, - result = "nullius-productivity-module-2", - result_count = 4 + results = { + {type="item", name="nullius-productivity-module-2", amount = 4} + } }, { type = "recipe", @@ -754,8 +785,9 @@ data:extend({ {type="item", name="nullius-box-yield-module-3", amount=2}, {type="item", name="nullius-box-speed-module-3", amount=1} }, - result = "nullius-box-productivity-module-2", - result_count = 4 + results = { + {type="item", name="nullius-box-productivity-module-2", amount = 4} + } }, { @@ -773,7 +805,9 @@ data:extend({ {type="item", name="nullius-copper-wire", amount=8}, {type="item", name="nullius-electrical-pack", amount=3} }, - result = "nullius-haste-module-4" + results = { + {type="item", name="nullius-haste-module-4", amount = 1} + } }, { type = "recipe", @@ -791,7 +825,9 @@ data:extend({ {type="item", name="nullius-box-copper-wire", amount=8}, {type="item", name="nullius-box-electrical-pack", amount=3} }, - result = "nullius-box-haste-module-4" + results = { + {type="item", name="nullius-box-haste-module-4", amount = 1} + } }, { type = "recipe", @@ -806,7 +842,9 @@ data:extend({ {type="item", name="nullius-haste-module-4", amount=1}, {type="item", name="nullius-efficiency-module-3", amount=1} }, - result = "nullius-speed-module-4" + results = { + {type="item", name="nullius-speed-module-4", amount = 1} + } }, { type = "recipe", @@ -822,7 +860,9 @@ data:extend({ {type="item", name="nullius-box-haste-module-4", amount=1}, {type="item", name="nullius-box-efficiency-module-3", amount=1} }, - result = "nullius-box-speed-module-4" + results = { + {type="item", name="nullius-box-speed-module-4", amount = 1} + } }, { type = "recipe", @@ -837,8 +877,9 @@ data:extend({ {type="item", name="nullius-speed-module-4", amount=2}, {type="item", name="nullius-yield-module-3", amount=1} }, - result = "nullius-productivity-module-3", - result_count = 3 + results = { + {type="item", name="nullius-productivity-module-3", amount = 3} + } }, { type = "recipe", @@ -854,8 +895,9 @@ data:extend({ {type="item", name="nullius-box-speed-module-4", amount=2}, {type="item", name="nullius-box-yield-module-3", amount=1} }, - result = "nullius-box-productivity-module-3", - result_count = 3 + results = { + {type="item", name="nullius-box-productivity-module-3", amount = 3} + } }, { type = "recipe", @@ -869,8 +911,9 @@ data:extend({ {type="item", name="nullius-productivity-module-3", amount=3}, {type="item", name="nullius-electrical-pack", amount=5} }, - result = "nullius-yield-module-4", - result_count = 2 + results = { + {type="item", name="nullius-yield-module-4", amount = 2} + } }, { type = "recipe", @@ -885,18 +928,19 @@ data:extend({ {type="item", name="nullius-box-productivity-module-3", amount=3}, {type="item", name="nullius-box-electrical-pack", amount=5} }, - result = "nullius-box-yield-module-4", - result_count = 2 + results = { + {type="item", name="nullius-box-yield-module-4", amount = 2} + } }, { type = "item", name = "nullius-coprocessor-speed-1", - icons = {{ - icon = EQUIPPATH.."coprocessor/speed1.png", - icon_size = 64 - }}, - placed_as_equipment_result = "nullius-upgrade-coprocessor-speed-1", + icons = {{ + icon = EQUIPPATH.."coprocessor/speed1.png", + icon_size = 64 + }}, + place_as_equipment_result = "nullius-upgrade-coprocessor-speed-1", subgroup = "coprocessors", order = "nullius-bb", stack_size = 10 @@ -904,11 +948,11 @@ data:extend({ { type = "item", name = "nullius-coprocessor-speed-2", - icons = {{ - icon = EQUIPPATH.."coprocessor/speed2.png", - icon_size = 64 - }}, - placed_as_equipment_result = "nullius-upgrade-coprocessor-speed-2", + icons = {{ + icon = EQUIPPATH.."coprocessor/speed2.png", + icon_size = 64 + }}, + place_as_equipment_result = "nullius-upgrade-coprocessor-speed-2", subgroup = "coprocessors", order = "nullius-bc", stack_size = 10 @@ -916,11 +960,11 @@ data:extend({ { type = "item", name = "nullius-coprocessor-speed-3", - icons = {{ - icon = EQUIPPATH.."coprocessor/speed3.png", - icon_size = 64 - }}, - placed_as_equipment_result = "nullius-upgrade-coprocessor-speed-3", + icons = {{ + icon = EQUIPPATH.."coprocessor/speed3.png", + icon_size = 64 + }}, + place_as_equipment_result = "nullius-upgrade-coprocessor-speed-3", subgroup = "coprocessors", order = "nullius-bd", stack_size = 10 @@ -928,11 +972,11 @@ data:extend({ { type = "item", name = "nullius-coprocessor-efficiency-1", - icons = {{ - icon = EQUIPPATH.."coprocessor/efficiency1.png", - icon_size = 64 - }}, - placed_as_equipment_result = "nullius-upgrade-coprocessor-efficiency-1", + icons = {{ + icon = EQUIPPATH.."coprocessor/efficiency1.png", + icon_size = 64 + }}, + place_as_equipment_result = "nullius-upgrade-coprocessor-efficiency-1", subgroup = "coprocessors", order = "nullius-cb", stack_size = 10 @@ -940,11 +984,11 @@ data:extend({ { type = "item", name = "nullius-coprocessor-efficiency-2", - icons = {{ - icon = EQUIPPATH.."coprocessor/efficiency2.png", - icon_size = 64 - }}, - placed_as_equipment_result = "nullius-upgrade-coprocessor-efficiency-2", + icons = {{ + icon = EQUIPPATH.."coprocessor/efficiency2.png", + icon_size = 64 + }}, + place_as_equipment_result = "nullius-upgrade-coprocessor-efficiency-2", subgroup = "coprocessors", order = "nullius-cc", stack_size = 10 @@ -952,11 +996,11 @@ data:extend({ { type = "item", name = "nullius-coprocessor-efficiency-3", - icons = {{ - icon = EQUIPPATH.."coprocessor/efficiency3.png", - icon_size = 64 - }}, - placed_as_equipment_result = "nullius-upgrade-coprocessor-efficiency-3", + icons = {{ + icon = EQUIPPATH.."coprocessor/efficiency3.png", + icon_size = 64 + }}, + place_as_equipment_result = "nullius-upgrade-coprocessor-efficiency-3", subgroup = "coprocessors", order = "nullius-cd", stack_size = 10 @@ -964,11 +1008,11 @@ data:extend({ { type = "item", name = "nullius-coprocessor-productivity-1", - icons = {{ - icon = EQUIPPATH.."coprocessor/productivity1.png", - icon_size = 64 - }}, - placed_as_equipment_result = "nullius-upgrade-coprocessor-productivity-1", + icons = {{ + icon = EQUIPPATH.."coprocessor/productivity1.png", + icon_size = 64 + }}, + place_as_equipment_result = "nullius-upgrade-coprocessor-productivity-1", subgroup = "coprocessors", order = "nullius-db", stack_size = 10 @@ -976,11 +1020,11 @@ data:extend({ { type = "item", name = "nullius-coprocessor-productivity-2", - icons = {{ - icon = EQUIPPATH.."coprocessor/productivity2.png", - icon_size = 64 - }}, - placed_as_equipment_result = "nullius-upgrade-coprocessor-productivity-2", + icons = {{ + icon = EQUIPPATH.."coprocessor/productivity2.png", + icon_size = 64 + }}, + place_as_equipment_result = "nullius-upgrade-coprocessor-productivity-2", subgroup = "coprocessors", order = "nullius-dc", stack_size = 10 @@ -988,11 +1032,11 @@ data:extend({ { type = "item", name = "nullius-coprocessor-productivity-3", - icons = {{ - icon = EQUIPPATH.."coprocessor/productivity3.png", - icon_size = 64 - }}, - placed_as_equipment_result = "nullius-upgrade-coprocessor-productivity-3", + icons = {{ + icon = EQUIPPATH.."coprocessor/productivity3.png", + icon_size = 64 + }}, + place_as_equipment_result = "nullius-upgrade-coprocessor-productivity-3", subgroup = "coprocessors", order = "nullius-dd", stack_size = 10 @@ -1000,11 +1044,11 @@ data:extend({ { type = "item", name = "nullius-coprocessor-quantum", - icons = {{ - icon = EQUIPPATH.."coprocessor/quantum.png", - icon_size = 64 - }}, - placed_as_equipment_result = "nullius-upgrade-coprocessor-quantum", + icons = {{ + icon = EQUIPPATH.."coprocessor/quantum.png", + icon_size = 64 + }}, + place_as_equipment_result = "nullius-upgrade-coprocessor-quantum", subgroup = "coprocessors", order = "nullius-e", stack_size = 10 @@ -1021,7 +1065,9 @@ data:extend({ {type="item", name="nullius-capacitor", amount=1}, {type="item", name="nullius-aluminum-sheet", amount=1} }, - result = "nullius-coprocessor-speed-1" + results = { + {type="item", name="nullius-coprocessor-speed-1", amount = 1} + } }, { type = "recipe", @@ -1034,7 +1080,9 @@ data:extend({ {type="item", name="nullius-capacitor", amount=2}, {type="item", name="nullius-aluminum-sheet", amount=1} }, - result = "nullius-coprocessor-efficiency-1" + results = { + {type="item", name="nullius-coprocessor-efficiency-1", amount = 1} + } }, { type = "recipe", @@ -1047,7 +1095,9 @@ data:extend({ {type="item", name="nullius-capacitor", amount=1}, {type="item", name="nullius-aluminum-sheet", amount=2} }, - result = "nullius-coprocessor-productivity-1" + results = { + {type="item", name="nullius-coprocessor-productivity-1", amount = 1} + } }, { type = "recipe", @@ -1061,7 +1111,9 @@ data:extend({ {type="item", name="nullius-insulation", amount=1}, {type="item", name="nullius-titanium-sheet", amount=1} }, - result = "nullius-coprocessor-speed-2" + results = { + {type="item", name="nullius-coprocessor-speed-2", amount = 1} + } }, { type = "recipe", @@ -1075,7 +1127,9 @@ data:extend({ {type="item", name="nullius-insulation", amount=2}, {type="item", name="nullius-titanium-sheet", amount=1} }, - result = "nullius-coprocessor-efficiency-2" + results = { + {type="item", name="nullius-coprocessor-efficiency-2", amount = 1} + } }, { type = "recipe", @@ -1089,7 +1143,9 @@ data:extend({ {type="item", name="nullius-insulation", amount=1}, {type="item", name="nullius-titanium-sheet", amount=2} }, - result = "nullius-coprocessor-productivity-2" + results = { + {type="item", name="nullius-coprocessor-productivity-2", amount = 1} + } }, { type = "recipe", @@ -1103,7 +1159,9 @@ data:extend({ {type="item", name="nullius-battery-2", amount=1}, {type="item", name="nullius-small-cargo-pod-2", amount=1} }, - result = "nullius-coprocessor-speed-3" + results = { + {type="item", name="nullius-coprocessor-speed-3", amount = 1} + } }, { type = "recipe", @@ -1117,7 +1175,9 @@ data:extend({ {type="item", name="nullius-battery-2", amount=2}, {type="item", name="nullius-small-cargo-pod-2", amount=1} }, - result = "nullius-coprocessor-efficiency-3" + results = { + {type="item", name="nullius-coprocessor-efficiency-3", amount = 1} + } }, { type = "recipe", @@ -1131,7 +1191,9 @@ data:extend({ {type="item", name="nullius-battery-2", amount=1}, {type="item", name="nullius-small-cargo-pod-2", amount=2} }, - result = "nullius-coprocessor-productivity-3" + results = { + {type="item", name="nullius-coprocessor-productivity-3", amount = 1} + } }, { type = "recipe", @@ -1147,6 +1209,8 @@ data:extend({ {type="item", name="nullius-beacon-3", amount=1}, {type="item", name="nullius-antimatter-trap", amount=1} }, - result = "nullius-coprocessor-quantum" + results = { + {type="item", name="nullius-coprocessor-quantum", amount = 1} + } } }) diff --git a/nullius/prototypes/item/module_limitation.lua b/nullius/prototypes/item/module_limitation.lua index 32226c8..ec6273c 100644 --- a/nullius/prototypes/item/module_limitation.lua +++ b/nullius/prototypes/item/module_limitation.lua @@ -1,16 +1,6 @@ local ICONPATH = "__nullius__/graphics/icons/" local ENTITYPATH = "__nullius__/graphics/entity/" -nullius_productivity_modules = { - "nullius-yield-module-1", - "nullius-yield-module-2", - "nullius-yield-module-3", - "nullius-yield-module-4", - "nullius-productivity-module-1", - "nullius-productivity-module-2", - "nullius-productivity-module-3" -} - nullius_non_productivity_categories = { ["nullius-electrolysis"] = true, ["nullius-gas-void"] = true, @@ -30,14 +20,12 @@ nullius_non_productivity_categories = { ["turbine-closed"] = true } - for _,recipe in pairs(data.raw.recipe) do if (((string.sub(recipe.name, 1, 8) == "nullius-") or ((recipe.order ~= nil) and (string.sub(recipe.order, 1, 8) == "nullius-"))) and (recipe.no_productivity ~= true) and (nullius_non_productivity_categories[recipe.category] ~= true)) then - for _,modname in pairs(nullius_productivity_modules) do - table.insert(data.raw.module[modname].limitation, recipe.name) - end + recipe.allow_productivity = true end + recipe.no_productivity = nil end diff --git a/nullius/prototypes/item/plumbing.lua b/nullius/prototypes/item/plumbing.lua index 7148e72..8eaf1c3 100644 --- a/nullius/prototypes/item/plumbing.lua +++ b/nullius/prototypes/item/plumbing.lua @@ -8,7 +8,7 @@ data:extend({ name = "nullius-pipe-2", icons = {{ icon = "__boblogistics__/graphics/icons/pipe/copper-tungsten-pipe.png", - icon_size = 32 + icon_size = 64 }}, subgroup = "pipes", order = "nullius-d", @@ -20,7 +20,7 @@ data:extend({ name = "nullius-pipe-3", icons = {{ icon = "__boblogistics__/graphics/icons/pipe/plastic-pipe.png", - icon_size = 32 + icon_size = 64 }}, subgroup = "pipes", order = "nullius-f", @@ -32,7 +32,7 @@ data:extend({ name = "nullius-pipe-4", icons = {{ icon = "__boblogistics__/graphics/icons/pipe/tungsten-pipe.png", - icon_size = 32 + icon_size = 64 }}, subgroup = "pipes", order = "nullius-h", @@ -44,7 +44,7 @@ data:extend({ name = "nullius-underground-pipe-2", icons = {{ icon = "__boblogistics__/graphics/icons/pipe/copper-tungsten-pipe-to-ground.png", - icon_size = 32 + icon_size = 64 }}, subgroup = "pipes", order = "nullius-e", @@ -56,7 +56,7 @@ data:extend({ name = "nullius-underground-pipe-3", icons = {{ icon = "__boblogistics__/graphics/icons/pipe/plastic-pipe-to-ground.png", - icon_size = 32 + icon_size = 64 }}, subgroup = "pipes", order = "nullius-g", @@ -68,7 +68,7 @@ data:extend({ name = "nullius-underground-pipe-4", icons = {{ icon = "__boblogistics__/graphics/icons/pipe/tungsten-pipe-to-ground.png", - icon_size = 32 + icon_size = 64 }}, subgroup = "pipes", order = "nullius-i", @@ -84,12 +84,12 @@ data:extend({ { icon = "__base__/graphics/icons/pipe.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelssmelting__/graphics/icons/ingot-iron.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-iron.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.3, shift = {8, -9} } @@ -105,10 +105,11 @@ data:extend({ allow_as_intermediate = false, energy_required = 3, ingredients = { - {"nullius-iron-rod", 1} + {type = "item", name = "nullius-iron-rod", amount = 1} }, - result = "pipe", - result_count = 3 + results = { + {type = "item", name = "pipe", amount = 3} + } }, { type = "recipe", @@ -122,13 +123,13 @@ data:extend({ { icon = "__base__/graphics/icons/pipe.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { - icon = "__angelssmelting__/graphics/icons/ingot-iron.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-iron.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.27, shift = {7, -8} } @@ -144,14 +145,16 @@ data:extend({ allow_as_intermediate = false, energy_required = 15, ingredients = { - {"nullius-box-iron-rod", 1} + {type = "item", name = "nullius-box-iron-rod", amount = 1} }, - result = "nullius-box-pipe-1", - result_count = 3 + results = { + {type = "item", name = "nullius-box-pipe-1", amount = 3} + } }, { type = "recipe", name = "nullius-underground-pipe-1", + localised_name = {"item-name.pipe-to-ground"}, enabled = false, always_show_made_in = true, always_show_products = true, @@ -160,11 +163,12 @@ data:extend({ subgroup = "pipes", energy_required = 8, ingredients = { - {"pipe", 5}, - {"nullius-sand", 2} + {type = "item", name = "pipe", amount = 5}, + {type = "item", name = "nullius-sand", amount = 2} }, - result = "pipe-to-ground", - result_count = 2 + results = { + {type = "item", name = "pipe-to-ground", amount = 2} + } }, { type = "recipe", @@ -177,11 +181,12 @@ data:extend({ subgroup = "boxed-pipe", energy_required = 40, ingredients = { - {"nullius-box-pipe-1", 5}, - {"nullius-box-sand", 2} + {type = "item", name = "nullius-box-pipe-1", amount = 5}, + {type = "item", name = "nullius-box-sand", amount = 2} }, - result = "nullius-box-underground-pipe-1", - result_count = 2 + results = { + {type = "item", name = "nullius-box-underground-pipe-1", amount = 2} + } }, { type = "recipe", @@ -191,12 +196,12 @@ data:extend({ { icon = "__base__/graphics/icons/pipe.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/stone-brick.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.3, shift = {9, -10} } @@ -211,7 +216,7 @@ data:extend({ allow_decomposition = false, energy_required = 9, ingredients = { - {"stone-brick", 8} + {type = "item", name = "stone-brick", amount = 8} }, results = { {type="item", name="pipe", amount=5}, @@ -231,7 +236,7 @@ data:extend({ allow_decomposition = false, energy_required = 45, ingredients = { - {"nullius-box-stone-brick", 4} + {type = "item", name = "nullius-box-stone-brick", amount = 4} }, results = { {type="item", name="nullius-box-pipe-1", amount=5}, @@ -247,12 +252,12 @@ data:extend({ icons = { { icon = "__boblogistics__/graphics/icons/pipe/copper-tungsten-pipe.png", - icon_size = 32 + icon_size = 64 }, { - icon = "__angelssmelting__/graphics/icons/ingot-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-steel.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.3, shift = {8, -9} } @@ -268,10 +273,11 @@ data:extend({ allow_as_intermediate = false, energy_required = 8, ingredients = { - {"nullius-steel-rod", 2} + {type = "item", name = "nullius-steel-rod", amount = 2} }, - result = "nullius-pipe-2", - result_count = 3 + results = { + {type = "item", name = "nullius-pipe-2", amount = 3} + } }, { type = "recipe", @@ -284,13 +290,13 @@ data:extend({ }, { icon = "__boblogistics__/graphics/icons/pipe/copper-tungsten-pipe.png", - icon_size = 32, - scale = 0.9 + icon_size = 64, + scale = 0.45 }, { - icon = "__angelssmelting__/graphics/icons/ingot-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-steel.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.27, shift = {7, -8} } @@ -306,10 +312,11 @@ data:extend({ allow_as_intermediate = false, energy_required = 40, ingredients = { - {"nullius-box-steel-rod", 2} + {type = "item", name = "nullius-box-steel-rod", amount = 2} }, - result = "nullius-box-pipe-2", - result_count = 3 + results = { + {type = "item", name = "nullius-box-pipe-2", amount = 3} + } }, { type = "recipe", @@ -322,11 +329,12 @@ data:extend({ subgroup = "pipes", energy_required = 10, ingredients = { - {"nullius-pipe-2", 8}, - {"nullius-gravel", 3} + {type = "item", name = "nullius-pipe-2", amount = 8}, + {type = "item", name = "nullius-gravel", amount = 3} }, - result = "nullius-underground-pipe-2", - result_count = 2 + results = { + {type = "item", name = "nullius-underground-pipe-2", amount = 2} + } }, { type = "recipe", @@ -339,11 +347,12 @@ data:extend({ subgroup = "boxed-pipe", energy_required = 50, ingredients = { - {"nullius-box-pipe-2", 8}, - {"nullius-box-gravel", 3} + {type = "item", name = "nullius-box-pipe-2", amount = 8}, + {type = "item", name = "nullius-box-gravel", amount = 3} }, - result = "nullius-box-underground-pipe-2", - result_count = 2 + results = { + {type = "item", name = "nullius-box-underground-pipe-2", amount = 2} + } }, { type = "recipe", @@ -352,12 +361,12 @@ data:extend({ icons = { { icon = "__boblogistics__/graphics/icons/pipe/copper-tungsten-pipe.png", - icon_size = 32 + icon_size = 64 }, { icon = "__base__/graphics/icons/plastic-bar.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.3, shift = {9, -10} } @@ -372,9 +381,11 @@ data:extend({ allow_decomposition = false, energy_required = 2, ingredients = { - {"nullius-plastic", 1} + {type = "item", name = "nullius-plastic", amount = 1} }, - result = "nullius-pipe-2" + results = { + {type = "item", name = "nullius-pipe-2", amount = 1} + } }, { type = "recipe", @@ -388,9 +399,11 @@ data:extend({ allow_decomposition = false, energy_required = 10, ingredients = { - {"nullius-box-plastic", 1} + {type = "item", name = "nullius-box-plastic", amount = 1} }, - result = "nullius-box-pipe-2" + results = { + {type = "item", name = "nullius-box-pipe-2", amount = 1} + } }, { @@ -406,7 +419,9 @@ data:extend({ {type="item", name="nullius-fiberglass", amount=1}, {type="fluid", name="nullius-epoxy", amount=1, fluidbox_index=1} }, - result = "nullius-pipe-3" + results = { + {type = "item", name = "nullius-pipe-3", amount = 1} + } }, { type = "recipe", @@ -422,7 +437,9 @@ data:extend({ {type="item", name="nullius-box-fiberglass", amount=1}, {type="fluid", name="nullius-epoxy", amount=5, fluidbox_index=1} }, - result = "nullius-box-pipe-3" + results = { + {type = "item", name = "nullius-box-pipe-3", amount = 1} + } }, { type = "recipe", @@ -435,11 +452,12 @@ data:extend({ subgroup = "pipes", energy_required = 20, ingredients = { - {"nullius-pipe-3", 10}, - {"concrete", 4} + {type = "item", name = "nullius-pipe-3", amount = 10}, + {type = "item", name = "concrete", amount = 4} }, - result = "nullius-underground-pipe-3", - result_count = 2 + results = { + {type = "item", name = "nullius-underground-pipe-3", amount = 2} + } }, { type = "recipe", @@ -452,11 +470,12 @@ data:extend({ subgroup = "boxed-pipe", energy_required = 100, ingredients = { - {"nullius-box-pipe-3", 10}, - {"nullius-box-concrete", 2} + {type = "item", name = "nullius-box-pipe-3", amount = 10}, + {type = "item", name = "nullius-box-concrete", amount = 2} }, - result = "nullius-box-underground-pipe-3", - result_count = 2 + results = { + {type = "item", name = "nullius-box-underground-pipe-3", amount = 2} + } }, { @@ -476,8 +495,9 @@ data:extend({ {type="item", name="nullius-titanium-sheet", amount=4}, {type="item", name="nullius-graphene", amount=1} }, - result = "nullius-pipe-4", - result_count = 10 + results = { + {type = "item", name = "nullius-pipe-4", amount = 10} + } }, { type = "recipe", @@ -497,8 +517,9 @@ data:extend({ {type="item", name="nullius-box-titanium-sheet", amount=4}, {type="item", name="nullius-box-graphene", amount=1} }, - result = "nullius-box-pipe-4", - result_count = 10 + results = { + {type = "item", name = "nullius-box-pipe-4", amount = 10} + } }, { type = "recipe", @@ -510,11 +531,12 @@ data:extend({ always_show_products = true, energy_required = 30, ingredients = { - {"nullius-pipe-4", 12}, - {"refined-concrete", 6} + {type = "item", name = "nullius-pipe-4", amount = 12}, + {type = "item", name = "refined-concrete", amount = 6} }, - result = "nullius-underground-pipe-4", - result_count = 2 + results = { + {type = "item", name = "nullius-underground-pipe-4", amount = 2} + } }, { type = "recipe", @@ -527,11 +549,12 @@ data:extend({ always_show_products = true, energy_required = 150, ingredients = { - {"nullius-box-pipe-4", 12}, - {"nullius-box-reinforced-concrete", 3} + {type = "item", name = "nullius-box-pipe-4", amount = 12}, + {type = "item", name = "nullius-box-reinforced-concrete", amount = 3} }, - result = "nullius-box-underground-pipe-4", - result_count = 2 + results = { + {type = "item", name = "nullius-box-underground-pipe-4", amount = 2} + } }, { @@ -562,10 +585,12 @@ data:extend({ always_show_made_in = true, energy_required = 2, ingredients = { - {"nullius-motor-1", 1}, - {"nullius-one-way-valve", 1} + {type = "item", name = "nullius-motor-1", amount = 1}, + {type = "item", name = "nullius-one-way-valve", amount = 1} }, - result = "nullius-pump-1" + results = { + {type = "item", name = "nullius-pump-1", amount = 1} + } }, { type = "recipe", @@ -576,10 +601,12 @@ data:extend({ always_show_made_in = true, energy_required = 10, ingredients = { - {"nullius-box-motor-1", 1}, - {"nullius-box-one-way-valve", 1} + {type = "item", name = "nullius-box-motor-1", amount = 1}, + {type = "item", name = "nullius-box-one-way-valve", amount = 1} }, - result = "nullius-box-pump-1" + results = { + {type = "item", name = "nullius-box-pump-1", amount = 1} + } }, { type = "recipe", @@ -589,12 +616,14 @@ data:extend({ always_show_made_in = true, energy_required = 6, ingredients = { - {"nullius-pump-1", 1}, - {"nullius-motor-2", 1}, - {"nullius-pipe-2", 2}, - {"nullius-rubber", 1} + {type = "item", name = "nullius-pump-1", amount = 1}, + {type = "item", name = "nullius-motor-2", amount = 1}, + {type = "item", name = "nullius-pipe-2", amount = 2}, + {type = "item", name = "nullius-rubber", amount = 1} }, - result = "nullius-pump-2" + results = { + {type = "item", name = "nullius-pump-2", amount = 1} + } }, { type = "recipe", @@ -605,28 +634,33 @@ data:extend({ always_show_made_in = true, energy_required = 30, ingredients = { - {"nullius-box-pump-1", 1}, - {"nullius-box-motor-2", 1}, - {"nullius-box-pipe-2", 2}, - {"nullius-box-rubber", 1} + {type = "item", name = "nullius-box-pump-1", amount = 1}, + {type = "item", name = "nullius-box-motor-2", amount = 1}, + {type = "item", name = "nullius-box-pipe-2", amount = 2}, + {type = "item", name = "nullius-box-rubber", amount = 1} }, - result = "nullius-box-pump-2" + results = { + {type = "item", name = "nullius-box-pump-2", amount = 1} + } }, { type = "recipe", name = "nullius-pump-3", + localised_name = {"entity-name.nullius-pump-3"}, enabled = false, category = "medium-crafting", always_show_made_in = true, energy_required = 20, ingredients = { - {"nullius-pump-2", 2}, - {"nullius-motor-3", 1}, - {"nullius-pipe-4", 2}, - {"nullius-top-up-valve", 2}, - {"power-switch", 1} + {type = "item", name = "nullius-pump-2", amount = 2}, + {type = "item", name = "nullius-motor-3", amount = 1}, + {type = "item", name = "nullius-pipe-4", amount = 2}, + {type = "item", name = "nullius-top-up-valve", amount = 2}, + {type = "item", name = "power-switch", amount = 1} }, - result = "pump" + results = { + {type = "item", name = "pump", amount = 1} + } }, { type = "recipe", @@ -637,20 +671,22 @@ data:extend({ always_show_made_in = true, energy_required = 100, ingredients = { - {"nullius-box-pump-2", 2}, - {"nullius-box-motor-3", 1}, - {"nullius-box-pipe-4", 2}, - {"nullius-box-top-up-valve", 2}, - {"nullius-box-power-switch", 1} + {type = "item", name = "nullius-box-pump-2", amount = 2}, + {type = "item", name = "nullius-box-motor-3", amount = 1}, + {type = "item", name = "nullius-box-pipe-4", amount = 2}, + {type = "item", name = "nullius-box-top-up-valve", amount = 2}, + {type = "item", name = "nullius-box-power-switch", amount = 1} }, - result = "nullius-box-pump-3" + results = { + {type = "item", name = "nullius-box-pump-3", amount = 1} + } }, { type = "item", name = "nullius-small-pump-1", icons = {{ - icon = "__angelsrefining__/graphics/icons/water-pump.png", + icon = "__angelsrefininggraphics__/graphics/icons/water-pump.png", icon_size = 48, tint = {0.75, 0.85, 0.95} }}, @@ -663,7 +699,7 @@ data:extend({ type = "item", name = "nullius-small-pump-2", icons = {{ - icon = "__angelsrefining__/graphics/icons/water-pump.png", + icon = "__angelsrefininggraphics__/graphics/icons/water-pump.png", icon_size = 48, tint = {1, 1, 0.85} }}, @@ -682,11 +718,12 @@ data:extend({ always_show_products = true, energy_required = 2, ingredients = { - {"nullius-pump-2", 1}, - {"nullius-one-way-valve", 2} + {type = "item", name = "nullius-pump-2", amount = 1}, + {type = "item", name = "nullius-one-way-valve", amount = 2} }, - result = "nullius-small-pump-1", - result_count = 2 + results = { + {type = "item", name = "nullius-small-pump-1", amount = 2} + } }, { type = "recipe", @@ -699,11 +736,12 @@ data:extend({ always_show_products = true, energy_required = 10, ingredients = { - {"nullius-box-pump-2", 1}, - {"nullius-box-one-way-valve", 2} + {type = "item", name = "nullius-box-pump-2", amount = 1}, + {type = "item", name = "nullius-box-one-way-valve", amount = 2} }, - result = "nullius-box-small-pump-1", - result_count = 2 + results = { + {type = "item", name = "nullius-box-small-pump-1", amount = 2} + } }, { type = "recipe", @@ -715,11 +753,12 @@ data:extend({ category = "tiny-crafting", energy_required = 5, ingredients = { - {"nullius-small-pump-1", 2}, - {"pump", 1} + {type = "item", name = "nullius-small-pump-1", amount = 2}, + {type = "item", name = "pump", amount = 1} }, - result = "nullius-small-pump-2", - result_count = 2 + results = { + {type = "item", name = "nullius-small-pump-2", amount = 2} + } }, { type = "recipe", @@ -732,11 +771,12 @@ data:extend({ subgroup = "boxed-plumbing", energy_required = 25, ingredients = { - {"nullius-box-small-pump-1", 2}, - {"nullius-box-pump-3", 1} + {type = "item", name = "nullius-box-small-pump-1", amount = 2}, + {type = "item", name = "nullius-box-pump-3", amount = 1} }, - result = "nullius-box-small-pump-2", - result_count = 2 + results = { + {type = "item", name = "nullius-box-small-pump-2", amount = 2} + } }, { @@ -783,12 +823,14 @@ data:extend({ always_show_made_in = true, energy_required = 4, ingredients = { - {"stone-brick", 3}, - {"pipe", 3}, - {"nullius-iron-rod", 2}, - {"nullius-one-way-valve", 1} + {type = "item", name = "stone-brick", amount = 3}, + {type = "item", name = "pipe", amount = 3}, + {type = "item", name = "nullius-iron-rod", amount = 2}, + {type = "item", name = "nullius-one-way-valve", amount = 1} }, - result = "nullius-chimney-1" + results = { + {type = "item", name = "nullius-chimney-1", amount = 1} + } }, { type = "recipe", @@ -798,13 +840,15 @@ data:extend({ always_show_made_in = true, energy_required = 12, ingredients = { - {"nullius-chimney-1", 2}, - {"nullius-pipe-2", 10}, - {"nullius-steel-beam", 4}, - {"concrete", 10}, - {"nullius-pump-2", 1} + {type = "item", name = "nullius-chimney-1", amount = 2}, + {type = "item", name = "nullius-pipe-2", amount = 10}, + {type = "item", name = "nullius-steel-beam", amount = 4}, + {type = "item", name = "concrete", amount = 10}, + {type = "item", name = "nullius-pump-2", amount = 1} }, - result = "nullius-chimney-2" + results = { + {type = "item", name = "nullius-chimney-2", amount = 1} + } }, { type = "recipe", @@ -814,18 +858,20 @@ data:extend({ always_show_made_in = true, energy_required = 25, ingredients = { - {"nullius-chimney-2", 4}, - {"nullius-underground-pipe-3", 8}, - {"nullius-compressor-2", 1}, - {"stone-wall", 4} + {type = "item", name = "nullius-chimney-2", amount = 4}, + {type = "item", name = "nullius-underground-pipe-3", amount = 8}, + {type = "item", name = "nullius-compressor-2", amount = 1}, + {type = "item", name = "stone-wall", amount = 4} }, - result = "nullius-chimney-3" + results = { + {type = "item", name = "nullius-chimney-3", amount = 1} + } }, { type = "item", name = "nullius-one-way-valve", - icon = "__angelspetrochem__/graphics/icons/valve-overflow.png", + icon = "__angelspetrochemgraphics__/graphics/icons/valve-overflow.png", icon_size = 32, subgroup = "valves", order = "nullius-db", @@ -835,7 +881,7 @@ data:extend({ { type = "item", name = "nullius-priority-valve", - icon = "__angelspetrochem__/graphics/icons/valve-inspector.png", + icon = "__angelspetrochemgraphics__/graphics/icons/valve-inspector.png", icon_size = 32, subgroup = "valves", order = "nullius-dc", @@ -845,7 +891,7 @@ data:extend({ { type = "item", name = "nullius-top-up-valve", - icon = "__angelspetrochem__/graphics/icons/valve-converter.png", + icon = "__angelspetrochemgraphics__/graphics/icons/valve-underflow.png", icon_size = 32, subgroup = "valves", order = "nullius-dd", @@ -855,7 +901,7 @@ data:extend({ { type = "item", name = "nullius-relief-valve", - icon = "__angelspetrochem__/graphics/icons/valve-return.png", + icon = "__angelspetrochemgraphics__/graphics/icons/valve-return.png", icon_size = 32, subgroup = "valves", order = "nullius-de", @@ -865,7 +911,7 @@ data:extend({ { type = "recipe", name = "nullius-one-way-valve-1", - localised_name = {"", {"entity-name.nullius-one-way-valve"}, " ", 1}, + localised_name = {"", {"entity-name.nullius-one-way-valve"}, " ", tostring(1)}, enabled = false, category = "small-crafting", always_show_made_in = true, @@ -874,18 +920,20 @@ data:extend({ order = "nullius-dbb", energy_required = 4, ingredients = { - {"pipe", 1}, - {"nullius-iron-sheet", 1} + {type = "item", name = "pipe", amount = 1}, + {type = "item", name = "nullius-iron-sheet", amount = 1} }, - result = "nullius-one-way-valve" + results = { + {type = "item", name = "nullius-one-way-valve", amount = 1} + } }, { type = "recipe", name = "nullius-one-way-valve-2", - localised_name = {"", {"entity-name.nullius-one-way-valve"}, " ", 2}, + localised_name = {"", {"entity-name.nullius-one-way-valve"}, " ", tostring(2)}, icons = { { - icon = "__angelspetrochem__/graphics/icons/valve-overflow.png", + icon = "__angelspetrochemgraphics__/graphics/icons/valve-overflow.png", icon_size = 32 }, { @@ -903,12 +951,13 @@ data:extend({ order = "nullius-dbc", energy_required = 6, ingredients = { - {"nullius-pipe-2", 2}, - {"nullius-rubber", 1}, - {"nullius-steel-sheet", 1} + {type = "item", name = "nullius-pipe-2", amount = 2}, + {type = "item", name = "nullius-rubber", amount = 1}, + {type = "item", name = "nullius-steel-sheet", amount = 1} }, - result = "nullius-one-way-valve", - result_count = 5 + results = { + {type = "item", name = "nullius-one-way-valve", amount = 5} + } }, { type = "recipe", @@ -921,12 +970,13 @@ data:extend({ always_show_products = true, energy_required = 30, ingredients = { - {"nullius-box-pipe-2", 2}, - {"nullius-box-rubber", 1}, - {"nullius-box-steel-sheet", 1} + {type = "item", name = "nullius-box-pipe-2", amount = 2}, + {type = "item", name = "nullius-box-rubber", amount = 1}, + {type = "item", name = "nullius-box-steel-sheet", amount = 1} }, - result = "nullius-box-one-way-valve", - result_count = 5 + results = { + {type = "item", name = "nullius-box-one-way-valve", amount = 5} + } }, { type = "recipe", @@ -938,10 +988,12 @@ data:extend({ always_show_products = true, energy_required = 2, ingredients = { - {"nullius-priority-valve", 1}, - {"nullius-iron-wire", 1} + {type = "item", name = "nullius-priority-valve", amount = 1}, + {type = "item", name = "nullius-iron-wire", amount = 1} }, - result = "nullius-relief-valve" + results = { + {type = "item", name = "nullius-relief-valve", amount = 1} + } }, { type = "recipe", @@ -954,11 +1006,12 @@ data:extend({ always_show_products = true, energy_required = 10, ingredients = { - {"nullius-box-priority-valve", 2}, - {"nullius-box-steel-wire", 1} + {type = "item", name = "nullius-box-priority-valve", amount = 2}, + {type = "item", name = "nullius-box-steel-wire", amount = 1} }, - result = "nullius-box-relief-valve", - result_count = 2 + results = { + {type = "item", name = "nullius-box-relief-valve", amount = 2} + } }, { type = "recipe", @@ -970,10 +1023,12 @@ data:extend({ always_show_products = true, energy_required = 2, ingredients = { - {"nullius-priority-valve", 1}, - {"nullius-plastic", 1} + {type = "item", name = "nullius-priority-valve", amount = 1}, + {type = "item", name = "nullius-plastic", amount = 1} }, - result = "nullius-top-up-valve" + results = { + {type = "item", name = "nullius-top-up-valve", amount = 1} + } }, { type = "recipe", @@ -986,11 +1041,12 @@ data:extend({ always_show_products = true, energy_required = 10, ingredients = { - {"nullius-box-priority-valve", 2}, - {"nullius-box-rubber", 1} + {type = "item", name = "nullius-box-priority-valve", amount = 2}, + {type = "item", name = "nullius-box-rubber", amount = 1} }, - result = "nullius-box-top-up-valve", - result_count = 2 + results = { + {type = "item", name = "nullius-box-top-up-valve", amount = 2} + } }, { type = "recipe", @@ -1002,10 +1058,12 @@ data:extend({ always_show_products = true, energy_required = 2, ingredients = { - {"nullius-one-way-valve", 1}, - {"nullius-iron-wire", 1} + {type = "item", name = "nullius-one-way-valve", amount = 1}, + {type = "item", name = "nullius-iron-wire", amount = 1} }, - result = "nullius-priority-valve" + results = { + {type = "item", name = "nullius-priority-valve", amount = 1} + } }, { type = "recipe", @@ -1018,11 +1076,12 @@ data:extend({ always_show_products = true, energy_required = 10, ingredients = { - {"nullius-box-one-way-valve", 2}, - {"nullius-box-steel-wire", 1} + {type = "item", name = "nullius-box-one-way-valve", amount = 2}, + {type = "item", name = "nullius-box-steel-wire", amount = 1} }, - result = "nullius-box-priority-valve", - result_count = 2 + results = { + {type = "item", name = "nullius-box-priority-valve", amount = 2} + } }, { @@ -1035,7 +1094,7 @@ data:extend({ scale = 0.5 }, { - icon = "__angelsrefining__/graphics/icons/seafloor-pump-ico.png", + icon = "__angelsrefininggraphics__/graphics/icons/seafloor-pump-ico.png", icon_size = 32, scale = 0.8 } @@ -1049,7 +1108,7 @@ data:extend({ type = "item", name = "nullius-outfall-2", icons = {{ - icon = "__angelsrefining__/graphics/icons/seafloor-pump-ico.png", + icon = "__angelsrefininggraphics__/graphics/icons/seafloor-pump-ico.png", icon_size = 32 }}, subgroup = "water-intake", @@ -1061,7 +1120,7 @@ data:extend({ type = "item", name = "nullius-outfall-3", icons = {{ - icon = "__angelsrefining__/graphics/icons/sea-pump-ico.png", + icon = "__angelsrefininggraphics__/graphics/icons/sea-pump-ico.png", icon_size = 32 }}, subgroup = "water-intake", @@ -1077,10 +1136,12 @@ data:extend({ always_show_made_in = true, energy_required = 4, ingredients = { - {"pipe-to-ground", 1}, - {"nullius-one-way-valve", 1} + {type = "item", name = "pipe-to-ground", amount = 1}, + {type = "item", name = "nullius-one-way-valve", amount = 1} }, - result = "nullius-outfall-1" + results = { + {type = "item", name = "nullius-outfall-1", amount = 1} + } }, { type = "recipe", @@ -1090,12 +1151,14 @@ data:extend({ always_show_made_in = true, energy_required = 10, ingredients = { - {"nullius-outfall-1", 2}, - {"nullius-underground-pipe-2", 4}, - {"concrete", 10}, - {"nullius-pump-2", 1} + {type = "item", name = "nullius-outfall-1", amount = 2}, + {type = "item", name = "nullius-underground-pipe-2", amount = 4}, + {type = "item", name = "concrete", amount = 10}, + {type = "item", name = "nullius-pump-2", amount = 1} }, - result = "nullius-outfall-2" + results = { + {type = "item", name = "nullius-outfall-2", amount = 1} + } }, { type = "recipe", @@ -1105,12 +1168,14 @@ data:extend({ category = "large-crafting", energy_required = 15, ingredients = { - {"nullius-outfall-2", 1}, - {"nullius-underground-pipe-3", 4}, - {"nullius-barrel-pump-2", 1}, - {"nullius-seawater-intake-2", 1} + {type = "item", name = "nullius-outfall-2", amount = 1}, + {type = "item", name = "nullius-underground-pipe-3", amount = 4}, + {type = "item", name = "nullius-barrel-pump-2", amount = 1}, + {type = "item", name = "nullius-seawater-intake-2", amount = 1} }, - result = "nullius-outfall-3" + results = { + {type = "item", name = "nullius-outfall-3", amount = 1} + } }, { @@ -1132,7 +1197,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/offshore-pump.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "water-intake", order = "nullius-bc", @@ -1152,7 +1217,7 @@ data:extend({ icon_size = 64 } }, - flags = {"hidden"}, + hidden = true, subgroup = "other", order = "nullius-bb", place_result = "nullius-legacy-seawater-intake-1", @@ -1166,14 +1231,14 @@ data:extend({ { icon = "__base__/graphics/icons/offshore-pump.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = ICONPATH .. "broken.png", icon_size = 64 } }, - flags = {"hidden"}, + hidden = true, subgroup = "other", order = "nullius-bc", place_result = "nullius-legacy-seawater-intake-2", @@ -1187,11 +1252,13 @@ data:extend({ always_show_made_in = true, energy_required = 5, ingredients = { - {"nullius-pump-1", 1}, - {"nullius-outfall-1", 1}, - {"nullius-filter-1", 1} + {type = "item", name = "nullius-pump-1", amount = 1}, + {type = "item", name = "nullius-outfall-1", amount = 1}, + {type = "item", name = "nullius-filter-1", amount = 1} }, - result = "nullius-seawater-intake-1" + results = { + {type = "item", name = "nullius-seawater-intake-1", amount = 1} + } }, { type = "recipe", @@ -1201,12 +1268,14 @@ data:extend({ always_show_made_in = true, energy_required = 20, ingredients = { - {"nullius-seawater-intake-1", 1}, - {"nullius-pump-2", 1}, - {"nullius-underground-pipe-2", 2}, - {"nullius-filter-1", 5} + {type = "item", name = "nullius-seawater-intake-1", amount = 1}, + {type = "item", name = "nullius-pump-2", amount = 1}, + {type = "item", name = "nullius-underground-pipe-2", amount = 2}, + {type = "item", name = "nullius-filter-1", amount = 5} }, - result = "nullius-seawater-intake-2" + results = { + {type = "item", name = "nullius-seawater-intake-2", amount = 1} + } }, { @@ -1219,7 +1288,7 @@ data:extend({ scale = 0.5 }, { - icon = "__angelspetrochem__/graphics/icons/air-filter.png", + icon = "__angelspetrochemgraphics__/graphics/icons/air-filter.png", icon_size = 32, scale = 0.6 } @@ -1239,7 +1308,7 @@ data:extend({ scale = 0.5 }, { - icon = "__angelspetrochem__/graphics/icons/air-filter.png", + icon = "__angelspetrochemgraphics__/graphics/icons/air-filter.png", icon_size = 32, scale = 0.8 } @@ -1253,7 +1322,7 @@ data:extend({ type = "item", name = "nullius-air-filter-3", icons = {{ - icon = "__angelspetrochem__/graphics/icons/air-filter.png", + icon = "__angelspetrochemgraphics__/graphics/icons/air-filter.png", icon_size = 32 }}, subgroup = "air-treatment", @@ -1269,11 +1338,13 @@ data:extend({ always_show_made_in = true, energy_required = 8, ingredients = { - {"nullius-turbine-open-1", 1}, - {"nullius-filter-1", 2}, - {"nullius-pump-1", 1} + {type = "item", name = "nullius-turbine-open-1", amount = 1}, + {type = "item", name = "nullius-filter-1", amount = 2}, + {type = "item", name = "nullius-pump-1", amount = 1} }, - result = "nullius-air-filter-1" + results = { + {type = "item", name = "nullius-air-filter-1", amount = 1} + } }, { type = "recipe", @@ -1285,13 +1356,14 @@ data:extend({ category = "large-crafting", energy_required = 25, ingredients = { - {"nullius-air-filter-1", 2}, - {"nullius-turbine-open-2", 1}, - {"nullius-filter-1", 10}, - {"nullius-pump-2", 2} + {type = "item", name = "nullius-air-filter-1", amount = 2}, + {type = "item", name = "nullius-turbine-open-2", amount = 1}, + {type = "item", name = "nullius-filter-1", amount = 10}, + {type = "item", name = "nullius-pump-2", amount = 2} }, - result = "nullius-air-filter-2", - result_count = 2 + results = { + {type = "item", name = "nullius-air-filter-2", amount = 2} + } }, { type = "recipe", @@ -1303,15 +1375,16 @@ data:extend({ category = "large-crafting", energy_required = 60, ingredients = { - {"nullius-air-filter-2", 3}, - {"nullius-compressor-2", 1}, - {"nullius-filter-2", 6}, - {"pump", 2}, - {"nullius-chimney-2", 1}, - {"stone-wall", 8} + {type = "item", name = "nullius-air-filter-2", amount = 3}, + {type = "item", name = "nullius-compressor-2", amount = 1}, + {type = "item", name = "nullius-filter-2", amount = 6}, + {type = "item", name = "pump", amount = 2}, + {type = "item", name = "nullius-chimney-2", amount = 1}, + {type = "item", name = "stone-wall", amount = 8} }, - result = "nullius-air-filter-3", - result_count = 2 + results = { + {type = "item", name = "nullius-air-filter-3", amount = 2} + } }, { @@ -1321,7 +1394,7 @@ data:extend({ { icon = "__base__/graphics/icons/boiler.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.77, 0.77, 0.66, 1} } }, @@ -1337,7 +1410,7 @@ data:extend({ { icon = "__base__/graphics/icons/boiler.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.8, 0.8, 1, 1} } }, @@ -1353,7 +1426,7 @@ data:extend({ { icon = "__base__/graphics/icons/boiler.png", icon_size = 64, - icon_mipmaps = 4 + } }, subgroup = "energy-storage", @@ -1369,10 +1442,12 @@ data:extend({ always_show_made_in = true, energy_required = 3, ingredients = { - {"nullius-small-furnace-1", 1}, - {"storage-tank", 1} + {type = "item", name = "nullius-small-furnace-1", amount = 1}, + {type = "item", name = "storage-tank", amount = 1} }, - result = "nullius-combustion-chamber-1" + results = { + {type = "item", name = "nullius-combustion-chamber-1", amount = 1} + } }, { type = "recipe", @@ -1382,11 +1457,13 @@ data:extend({ always_show_made_in = true, energy_required = 10, ingredients = { - {"nullius-combustion-chamber-1", 1}, - {"nullius-small-furnace-2", 1}, - {"nullius-medium-tank-2", 1} + {type = "item", name = "nullius-combustion-chamber-1", amount = 1}, + {type = "item", name = "nullius-small-furnace-2", amount = 1}, + {type = "item", name = "nullius-medium-tank-2", amount = 1} }, - result = "nullius-combustion-chamber-2" + results = { + {type = "item", name = "nullius-combustion-chamber-2", amount = 1} + } }, { type = "recipe", @@ -1396,21 +1473,23 @@ data:extend({ always_show_made_in = true, energy_required = 25, ingredients = { - {"nullius-combustion-chamber-2", 1}, - {"nullius-medium-furnace-2", 1}, - {"nullius-medium-tank-3", 1}, - {"nullius-ceramic-powder", 8} + {type = "item", name = "nullius-combustion-chamber-2", amount = 1}, + {type = "item", name = "nullius-medium-furnace-2", amount = 1}, + {type = "item", name = "nullius-medium-tank-3", amount = 1}, + {type = "item", name = "nullius-ceramic-powder", amount = 8} }, - result = "nullius-combustion-chamber-3" + results = { + {type = "item", name = "nullius-combustion-chamber-3", amount = 1} + } }, { type = "item", name = "nullius-hydro-plant-1", icons = {{ - icon = "__angelsrefining__/graphics/icons/hydro-plant.png", + icon = "__angelsrefininggraphics__/graphics/icons/hydro-plant.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.77, 0.77, 0.68} }}, subgroup = "water-treatment", @@ -1422,9 +1501,9 @@ data:extend({ type = "item", name = "nullius-hydro-plant-2", icons = {{ - icon = "__angelsrefining__/graphics/icons/hydro-plant.png", + icon = "__angelsrefininggraphics__/graphics/icons/hydro-plant.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.8, 0.8, 0.9} }}, subgroup = "water-treatment", @@ -1436,9 +1515,9 @@ data:extend({ type = "item", name = "nullius-hydro-plant-3", icons = {{ - icon = "__angelsrefining__/graphics/icons/hydro-plant.png", + icon = "__angelsrefininggraphics__/graphics/icons/hydro-plant.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "water-treatment", order = "nullius-bdb", @@ -1455,11 +1534,12 @@ data:extend({ always_show_products = true, energy_required = 10, ingredients = { - {"nullius-distillery-1", 1}, - {"nullius-seawater-intake-1", 2} + {type = "item", name = "nullius-distillery-1", amount = 1}, + {type = "item", name = "nullius-seawater-intake-1", amount = 2} }, - result = "nullius-hydro-plant-1", - result_count = 2 + results = { + {type = "item", name = "nullius-hydro-plant-1", amount = 2} + } }, { type = "recipe", @@ -1469,13 +1549,15 @@ data:extend({ always_show_made_in = true, energy_required = 16, ingredients = { - {"nullius-hydro-plant-1", 1}, - {"nullius-chemical-plant-1", 1}, - {"nullius-seawater-intake-2", 1}, - {"nullius-medium-tank-2", 1}, - {"red-wire", 5} + {type = "item", name = "nullius-hydro-plant-1", amount = 1}, + {type = "item", name = "nullius-chemical-plant-1", amount = 1}, + {type = "item", name = "nullius-seawater-intake-2", amount = 1}, + {type = "item", name = "nullius-medium-tank-2", amount = 1}, + {type = "item", name = "nullius-red-wire", amount = 5} }, - result = "nullius-hydro-plant-2" + results = { + {type = "item", name = "nullius-hydro-plant-2", amount = 1} + } }, { type = "recipe", @@ -1485,15 +1567,17 @@ data:extend({ category = "huge-crafting", energy_required = 50, ingredients = { - {"nullius-hydro-plant-2", 1}, - {"nullius-flotation-cell-2", 1}, - {"nullius-chemical-plant-2", 1}, - {"nullius-large-tank-3", 1}, - {"pump", 3}, - {"nullius-box-filter-2", 1}, - {"nullius-box-sensor-2", 1} + {type = "item", name = "nullius-hydro-plant-2", amount = 1}, + {type = "item", name = "nullius-flotation-cell-2", amount = 1}, + {type = "item", name = "nullius-chemical-plant-2", amount = 1}, + {type = "item", name = "nullius-large-tank-3", amount = 1}, + {type = "item", name = "pump", amount = 3}, + {type = "item", name = "nullius-box-filter-2", amount = 1}, + {type = "item", name = "nullius-box-sensor-2", amount = 1} }, - result = "nullius-hydro-plant-3" + results = { + {type = "item", name = "nullius-hydro-plant-3", amount = 1} + } }, { @@ -1503,7 +1587,7 @@ data:extend({ { icon = "__base__/graphics/icons/oil-refinery.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.85, 0.85, 0.6, 1} } }, @@ -1519,7 +1603,7 @@ data:extend({ { icon = "__base__/graphics/icons/oil-refinery.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.7, 0.7, 1, 1} } }, @@ -1535,7 +1619,7 @@ data:extend({ { icon = "__base__/graphics/icons/oil-refinery.png", icon_size = 64, - icon_mipmaps = 4 + } }, subgroup = "air-treatment", @@ -1551,13 +1635,15 @@ data:extend({ always_show_made_in = true, energy_required = 4, ingredients = { - {"nullius-small-furnace-1", 1}, - {"storage-tank", 1}, - {"nullius-priority-valve", 2}, - {"nullius-chimney-1", 1}, - {"nullius-filter-1", 2} + {type = "item", name = "nullius-small-furnace-1", amount = 1}, + {type = "item", name = "storage-tank", amount = 1}, + {type = "item", name = "nullius-priority-valve", amount = 2}, + {type = "item", name = "nullius-chimney-1", amount = 1}, + {type = "item", name = "nullius-filter-1", amount = 2} }, - result = "nullius-distillery-1" + results = { + {type = "item", name = "nullius-distillery-1", amount = 1} + } }, { type = "recipe", @@ -1567,13 +1653,15 @@ data:extend({ always_show_made_in = true, energy_required = 10, ingredients = { - {"nullius-distillery-1", 1}, - {"nullius-small-furnace-2", 1}, - {"nullius-small-tank-1", 3}, - {"nullius-heat-pipe-1", 8}, - {"nullius-filter-1", 4} + {type = "item", name = "nullius-distillery-1", amount = 1}, + {type = "item", name = "nullius-small-furnace-2", amount = 1}, + {type = "item", name = "nullius-small-tank-1", amount = 3}, + {type = "item", name = "nullius-heat-pipe-1", amount = 8}, + {type = "item", name = "nullius-filter-1", amount = 4} }, - result = "nullius-distillery-2" + results = { + {type = "item", name = "nullius-distillery-2", amount = 1} + } }, { type = "recipe", @@ -1583,24 +1671,26 @@ data:extend({ category = "huge-crafting", energy_required = 40, ingredients = { - {"nullius-distillery-2", 2}, - {"nullius-hydro-plant-2", 1}, - {"nullius-air-filter-2", 1}, - {"nullius-filter-2", 4}, - {"nullius-large-furnace-1", 1}, - {"nullius-thermal-tank-2", 2}, - {"nullius-barrel-pump-1", 1} + {type = "item", name = "nullius-distillery-2", amount = 2}, + {type = "item", name = "nullius-hydro-plant-2", amount = 1}, + {type = "item", name = "nullius-air-filter-2", amount = 1}, + {type = "item", name = "nullius-filter-2", amount = 4}, + {type = "item", name = "nullius-large-furnace-1", amount = 1}, + {type = "item", name = "nullius-thermal-tank-2", amount = 2}, + {type = "item", name = "nullius-barrel-pump-1", amount = 1} }, - result = "nullius-distillery-3" + results = { + {type = "item", name = "nullius-distillery-3", amount = 1} + } }, { type = "item", name = "nullius-flotation-cell-1", icons = {{ - icon = "__angelsrefining__/graphics/icons/ore-floatation-cell.png", + icon = "__angelsrefininggraphics__/graphics/icons/ore-floatation-cell.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.77, 0.77, 0.60, 1} }}, subgroup = "water-treatment", @@ -1612,9 +1702,9 @@ data:extend({ type = "item", name = "nullius-flotation-cell-2", icons = {{ - icon = "__angelsrefining__/graphics/icons/ore-floatation-cell.png", + icon = "__angelsrefininggraphics__/graphics/icons/ore-floatation-cell.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.8, 0.8, 1, 1} }}, subgroup = "water-treatment", @@ -1626,9 +1716,9 @@ data:extend({ type = "item", name = "nullius-flotation-cell-3", icons = {{ - icon = "__angelsrefining__/graphics/icons/ore-floatation-cell.png", + icon = "__angelsrefininggraphics__/graphics/icons/ore-floatation-cell.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "water-treatment", order = "nullius-cdb", @@ -1645,11 +1735,12 @@ data:extend({ always_show_products = true, energy_required = 18, ingredients = { - {"nullius-hydro-plant-1", 1}, - {"nullius-crusher-1", 1} + {type = "item", name = "nullius-hydro-plant-1", amount = 1}, + {type = "item", name = "nullius-crusher-1", amount = 1} }, - result = "nullius-flotation-cell-1", - result_count = 2 + results = { + {type = "item", name = "nullius-flotation-cell-1", amount = 2} + } }, { type = "recipe", @@ -1659,11 +1750,13 @@ data:extend({ always_show_made_in = true, energy_required = 25, ingredients = { - {"nullius-flotation-cell-1", 2}, - {"nullius-chemical-plant-1", 1}, - {"nullius-foundry-1", 1} + {type = "item", name = "nullius-flotation-cell-1", amount = 2}, + {type = "item", name = "nullius-chemical-plant-1", amount = 1}, + {type = "item", name = "nullius-foundry-1", amount = 1} }, - result = "nullius-flotation-cell-2" + results = { + {type = "item", name = "nullius-flotation-cell-2", amount = 1} + } }, { type = "recipe", @@ -1673,11 +1766,13 @@ data:extend({ category = "huge-crafting", energy_required = 60, ingredients = { - {"nullius-flotation-cell-2", 1}, - {"nullius-hydro-plant-2", 1}, - {"nullius-crusher-2", 1} + {type = "item", name = "nullius-flotation-cell-2", amount = 1}, + {type = "item", name = "nullius-hydro-plant-2", amount = 1}, + {type = "item", name = "nullius-crusher-2", amount = 1} }, - result = "nullius-flotation-cell-3" + results = { + {type = "item", name = "nullius-flotation-cell-3", amount = 1} + } }, { @@ -1687,7 +1782,7 @@ data:extend({ { icon = "__base__/graphics/icons/chemical-plant.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.75, 0.75, 0.6, 1} } }, @@ -1703,7 +1798,7 @@ data:extend({ { icon = "__base__/graphics/icons/chemical-plant.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.8, 0.8, 1, 1} } }, @@ -1719,7 +1814,7 @@ data:extend({ { icon = "__base__/graphics/icons/chemical-plant.png", icon_size = 64, - icon_mipmaps = 4 + } }, subgroup = "chemical-plant", @@ -1735,13 +1830,15 @@ data:extend({ always_show_made_in = true, energy_required = 15, ingredients = { - {"nullius-small-assembler-1", 1}, - {"storage-tank", 1}, - {"nullius-filter-1", 1}, - {"nullius-priority-valve", 1}, - {"nullius-glass", 3} + {type = "item", name = "nullius-small-assembler-1", amount = 1}, + {type = "item", name = "storage-tank", amount = 1}, + {type = "item", name = "nullius-filter-1", amount = 1}, + {type = "item", name = "nullius-priority-valve", amount = 1}, + {type = "item", name = "nullius-glass", amount = 3} }, - result = "nullius-chemical-plant-1" + results = { + {type = "item", name = "nullius-chemical-plant-1", amount = 1} + } }, { type = "recipe", @@ -1753,13 +1850,14 @@ data:extend({ always_show_products = true, energy_required = 50, ingredients = { - {"nullius-chemical-plant-1", 3}, - {"nullius-lab-1", 1}, - {"nullius-distillery-2", 1}, - {"nullius-sensor-1", 4} + {type = "item", name = "nullius-chemical-plant-1", amount = 3}, + {type = "item", name = "nullius-lab-1", amount = 1}, + {type = "item", name = "nullius-distillery-2", amount = 1}, + {type = "item", name = "nullius-sensor-1", amount = 4} }, - result = "nullius-chemical-plant-2", - result_count = 2 + results = { + {type = "item", name = "nullius-chemical-plant-2", amount = 2} + } }, { type = "recipe", @@ -1769,25 +1867,27 @@ data:extend({ always_show_made_in = true, energy_required = 80, ingredients = { - {"nullius-chemical-plant-2", 2}, - {"nullius-lab-2", 1}, - {"nullius-flotation-cell-2", 1}, - {"nullius-box-hard-glass", 4}, - {"nullius-filter-2", 3} + {type = "item", name = "nullius-chemical-plant-2", amount = 2}, + {type = "item", name = "nullius-lab-2", amount = 1}, + {type = "item", name = "nullius-flotation-cell-2", amount = 1}, + {type = "item", name = "nullius-box-hard-glass", amount = 4}, + {type = "item", name = "nullius-filter-2", amount = 3} }, - result = "nullius-chemical-plant-3" + results = { + {type = "item", name = "nullius-chemical-plant-3", amount = 1} + } }, { type = "item", name = "nullius-electrolyzer-1", - localised_name = {"", {"entity-name.nullius-electrolyzer"}, " ", 1}, + localised_name = {"", {"entity-name.nullius-electrolyzer"}, " ", tostring(1)}, icons = {{ - icon = "__angelspetrochem__/graphics/icons/electrolyser.png", + icon = "__angelspetrochemgraphics__/graphics/icons/electrolyser.png", icon_size = 32, tint = {0.8, 0.75, 0.55} }}, - localised_description = {"entity-description.nullius-prioritize", + localised_description = {"entity-description.nullius-prioritize", {"entity-description.nullius-electrolyzer"}}, subgroup = "electrolyzer", order = "nullius-bbb", @@ -1797,13 +1897,13 @@ data:extend({ { type = "item", name = "nullius-electrolyzer-2", - localised_name = {"", {"entity-name.nullius-electrolyzer"}, " ", 2}, + localised_name = {"", {"entity-name.nullius-electrolyzer"}, " ", tostring(2)}, icons = {{ - icon = "__angelspetrochem__/graphics/icons/electrolyser.png", + icon = "__angelspetrochemgraphics__/graphics/icons/electrolyser.png", icon_size = 32, tint = {0.8, 0.85, 0.9} }}, - localised_description = {"entity-description.nullius-prioritize", + localised_description = {"entity-description.nullius-prioritize", {"entity-description.nullius-electrolyzer"}}, subgroup = "electrolyzer", order = "nullius-bcbb", @@ -1813,12 +1913,12 @@ data:extend({ { type = "item", name = "nullius-electrolyzer-3", - localised_name = {"", {"entity-name.nullius-electrolyzer"}, " ", 3}, + localised_name = {"", {"entity-name.nullius-electrolyzer"}, " ", tostring(3)}, icons = {{ - icon = "__angelspetrochem__/graphics/icons/electrolyser.png", + icon = "__angelspetrochemgraphics__/graphics/icons/electrolyser.png", icon_size = 32 }}, - localised_description = {"entity-description.nullius-prioritize", + localised_description = {"entity-description.nullius-prioritize", {"entity-description.nullius-electrolyzer"}}, subgroup = "electrolyzer", order = "nullius-bdb", @@ -1833,12 +1933,14 @@ data:extend({ always_show_made_in = true, energy_required = 12, ingredients = { - {"small-electric-pole", 3}, - {"storage-tank", 1}, - {"nullius-filter-1", 1}, - {"nullius-priority-valve", 2} + {type = "item", name = "small-electric-pole", amount = 3}, + {type = "item", name = "storage-tank", amount = 1}, + {type = "item", name = "nullius-filter-1", amount = 1}, + {type = "item", name = "nullius-priority-valve", amount = 2} }, - result = "nullius-electrolyzer-1" + results = { + {type = "item", name = "nullius-electrolyzer-1", amount = 1} + } }, { type = "recipe", @@ -1848,13 +1950,15 @@ data:extend({ category = "huge-crafting", energy_required = 25, ingredients = { - {"nullius-electrolyzer-1", 2}, - {"big-electric-pole", 2}, - {"nullius-small-tank-1", 2}, - {"nullius-small-pump-1", 1}, - {"power-switch", 1} + {type = "item", name = "nullius-electrolyzer-1", amount = 2}, + {type = "item", name = "big-electric-pole", amount = 2}, + {type = "item", name = "nullius-small-tank-1", amount = 2}, + {type = "item", name = "nullius-small-pump-1", amount = 1}, + {type = "item", name = "power-switch", amount = 1} }, - result = "nullius-electrolyzer-2" + results = { + {type = "item", name = "nullius-electrolyzer-2", amount = 1} + } }, { type = "recipe", @@ -1864,28 +1968,33 @@ data:extend({ category = "huge-crafting", energy_required = 60, ingredients = { - {"nullius-electrolyzer-2", 2}, - {"nullius-distillery-2", 1}, - {"nullius-substation-2", 1}, - {"nullius-charger-2", 2}, - {"nullius-efficiency-module-2", 1} + {type = "item", name = "nullius-electrolyzer-2", amount = 2}, + {type = "item", name = "nullius-distillery-2", amount = 1}, + {type = "item", name = "nullius-substation-2", amount = 1}, + {type = "item", name = "nullius-charger-2", amount = 2}, + {type = "item", name = "nullius-efficiency-module-2", amount = 1} }, - result = "nullius-electrolyzer-3" + results = { + {type = "item", name = "nullius-electrolyzer-3", amount = 1} + } }, { type = "recipe", name = "nullius-medium-tank-1", + localised_name = {"entity-name.nullius-medium-tank-1"}, enabled = false, category = "large-crafting", always_show_made_in = true, energy_required = 6, ingredients = { - {"nullius-iron-sheet", 2}, - {"nullius-iron-rod", 1}, - {"pipe", 3} + {type = "item", name = "nullius-iron-sheet", amount = 2}, + {type = "item", name = "nullius-iron-rod", amount = 1}, + {type = "item", name = "pipe", amount = 3} }, - result = "storage-tank" + results = { + {type = "item", name = "storage-tank", amount = 1} + } }, { type = "recipe", @@ -1896,11 +2005,13 @@ data:extend({ always_show_made_in = true, energy_required = 30, ingredients = { - {"nullius-box-iron-sheet", 2}, - {"nullius-box-iron-rod", 1}, - {"nullius-box-pipe-1", 3} + {type = "item", name = "nullius-box-iron-sheet", amount = 2}, + {type = "item", name = "nullius-box-iron-rod", amount = 1}, + {type = "item", name = "nullius-box-pipe-1", amount = 3} }, - result = "nullius-box-medium-tank-1" + results = { + {type = "item", name = "nullius-box-medium-tank-1", amount = 1} + } }, { @@ -1924,13 +2035,15 @@ data:extend({ always_show_made_in = true, energy_required = 10, ingredients = { - {"storage-tank", 1}, - {"nullius-steel-sheet", 2}, - {"nullius-steel-rod", 1}, - {"nullius-plastic", 2}, - {"nullius-pipe-2", 3} + {type = "item", name = "storage-tank", amount = 1}, + {type = "item", name = "nullius-steel-sheet", amount = 2}, + {type = "item", name = "nullius-steel-rod", amount = 1}, + {type = "item", name = "nullius-plastic", amount = 2}, + {type = "item", name = "nullius-pipe-2", amount = 3} }, - result = "nullius-medium-tank-2" + results = { + {type = "item", name = "nullius-medium-tank-2", amount = 1} + } }, { type = "recipe", @@ -1941,13 +2054,15 @@ data:extend({ always_show_made_in = true, energy_required = 50, ingredients = { - {"nullius-box-medium-tank-1", 1}, - {"nullius-box-steel-sheet", 2}, - {"nullius-box-steel-rod", 1}, - {"nullius-box-plastic", 2}, - {"nullius-box-pipe-2", 3} + {type = "item", name = "nullius-box-medium-tank-1", amount = 1}, + {type = "item", name = "nullius-box-steel-sheet", amount = 2}, + {type = "item", name = "nullius-box-steel-rod", amount = 1}, + {type = "item", name = "nullius-box-plastic", amount = 2}, + {type = "item", name = "nullius-box-pipe-2", amount = 3} }, - result = "nullius-box-medium-tank-2" + results = { + {type = "item", name = "nullius-box-medium-tank-2", amount = 1} + } }, { @@ -1973,7 +2088,9 @@ data:extend({ {type="item", name="nullius-pipe-3", amount=2}, {type="fluid", name="nullius-epoxy", amount=2, fluidbox_index=1} }, - result = "nullius-medium-tank-3" + results = { + {type = "item", name = "nullius-medium-tank-3", amount = 1} + } }, { type = "recipe", @@ -1989,7 +2106,9 @@ data:extend({ {type="item", name="nullius-box-pipe-3", amount=2}, {type="fluid", name="nullius-epoxy", amount=10, fluidbox_index=1} }, - result = "nullius-box-medium-tank-3" + results = { + {type = "item", name = "nullius-box-medium-tank-3", amount = 1} + } }, { @@ -1997,9 +2116,9 @@ data:extend({ name = "nullius-small-tank-1", icons = { { - icon = "__angelspetrochem__/graphics/icons/petrochem-inline-tank.png", + icon = "__angelspetrochemgraphics__/graphics/icons/petrochem-inline-tank.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.8, 0.8, 0.4} } }, @@ -2018,10 +2137,11 @@ data:extend({ category = "medium-crafting", energy_required = 5, ingredients = { - {"nullius-medium-tank-2", 1} + {type = "item", name = "nullius-medium-tank-2", amount = 1} }, - result = "nullius-small-tank-1", - result_count = 3 + results = { + {type = "item", name = "nullius-small-tank-1", amount = 3} + } }, { type = "recipe", @@ -2034,10 +2154,11 @@ data:extend({ subgroup = "boxed-tank", energy_required = 25, ingredients = { - {"nullius-box-medium-tank-2", 1} + {type = "item", name = "nullius-box-medium-tank-2", amount = 1} }, - result = "nullius-box-small-tank-1", - result_count = 3 + results = { + {type = "item", name = "nullius-box-small-tank-1", amount = 3} + } }, { @@ -2045,9 +2166,9 @@ data:extend({ name = "nullius-small-tank-2", icons = { { - icon = "__angelspetrochem__/graphics/icons/petrochem-inline-tank.png", + icon = "__angelspetrochemgraphics__/graphics/icons/petrochem-inline-tank.png", icon_size = 64, - icon_mipmaps = 4 + } }, subgroup = "tanks", @@ -2065,11 +2186,12 @@ data:extend({ category = "medium-crafting", energy_required = 8, ingredients = { - {"nullius-small-tank-1", 2}, - {"nullius-medium-tank-3", 1} + {type = "item", name = "nullius-small-tank-1", amount = 2}, + {type = "item", name = "nullius-medium-tank-3", amount = 1} }, - result = "nullius-small-tank-2", - result_count = 3 + results = { + {type = "item", name = "nullius-small-tank-2", amount = 3} + } }, { type = "recipe", @@ -2082,20 +2204,21 @@ data:extend({ subgroup = "boxed-tank", energy_required = 40, ingredients = { - {"nullius-box-small-tank-1", 2}, - {"nullius-box-medium-tank-3", 1} + {type = "item", name = "nullius-box-small-tank-1", amount = 2}, + {type = "item", name = "nullius-box-medium-tank-3", amount = 1} }, - result = "nullius-box-small-tank-2", - result_count = 3 + results = { + {type = "item", name = "nullius-box-small-tank-2", amount = 3} + } }, { type = "item", name = "nullius-large-tank-1", icons = {{ - icon = "__angelspetrochem__/graphics/icons/petrochem-gas-tank.png", + icon = "__angelspetrochemgraphics__/graphics/icons/petrochem-gas-tank.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.75, 0.75, 0.6} }}, subgroup = "tanks", @@ -2116,16 +2239,18 @@ data:extend({ {type="item", name="concrete", amount=8}, {type="item", name="nullius-relief-valve", amount=1} }, - result = "nullius-large-tank-1" + results = { + {type = "item", name = "nullius-large-tank-1", amount = 1} + } }, { type = "item", name = "nullius-large-tank-2", icons = {{ - icon = "__angelspetrochem__/graphics/icons/petrochem-gas-tank.png", + icon = "__angelspetrochemgraphics__/graphics/icons/petrochem-gas-tank.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.85, 0.85, 0.95} }}, subgroup = "tanks", @@ -2146,16 +2271,18 @@ data:extend({ {type="item", name="nullius-steel-beam", amount=6}, {type="item", name="refined-concrete", amount=10} }, - result = "nullius-large-tank-2" + results = { + {type = "item", name = "nullius-large-tank-2", amount = 1} + } }, { type = "item", name = "nullius-large-tank-3", icons = {{ - icon = "__angelspetrochem__/graphics/icons/petrochem-gas-tank.png", + icon = "__angelspetrochemgraphics__/graphics/icons/petrochem-gas-tank.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "tanks", order = "nullius-bdd", @@ -2174,7 +2301,9 @@ data:extend({ {type="item", name="nullius-box-wall", amount=2}, {type="item", name="nullius-box-underground-pipe-4", amount=1} }, - result = "nullius-large-tank-3" + results = { + {type = "item", name = "nullius-large-tank-3", amount = 1} + } }, { @@ -2214,7 +2343,7 @@ data:extend({ icon_size = 64 } }, - flags = {"hidden"}, + hidden = true, subgroup = "other", order = "nullius-cd", place_result = "nullius-legacy-well-1", @@ -2233,7 +2362,7 @@ data:extend({ icon_size = 64 } }, - flags = {"hidden"}, + hidden = true, subgroup = "other", order = "nullius-ce", place_result = "nullius-legacy-well-2", @@ -2247,13 +2376,15 @@ data:extend({ always_show_made_in = true, energy_required = 10, ingredients = { - {"nullius-underground-pipe-2", 4}, - {"nullius-filter-1", 3}, - {"nullius-pump-2", 1}, - {"nullius-top-up-valve", 1}, - {"stone-brick", 12} + {type = "item", name = "nullius-underground-pipe-2", amount = 4}, + {type = "item", name = "nullius-filter-1", amount = 3}, + {type = "item", name = "nullius-pump-2", amount = 1}, + {type = "item", name = "nullius-top-up-valve", amount = 1}, + {type = "item", name = "stone-brick", amount = 12} }, - result = "nullius-well-1" + results = { + {type = "item", name = "nullius-well-1", amount = 1} + } }, { type = "recipe", @@ -2263,13 +2394,15 @@ data:extend({ category = "medium-crafting", energy_required = 30, ingredients = { - {"nullius-well-1", 2}, - {"nullius-box-underground-pipe-4", 1}, - {"nullius-filter-2", 2}, - {"pump", 2}, - {"nullius-mortar", 8} + {type = "item", name = "nullius-well-1", amount = 2}, + {type = "item", name = "nullius-box-underground-pipe-4", amount = 1}, + {type = "item", name = "nullius-filter-2", amount = 2}, + {type = "item", name = "pump", amount = 2}, + {type = "item", name = "nullius-mortar", amount = 8} }, - result = "nullius-well-2" + results = { + {type = "item", name = "nullius-well-2", amount = 1} + } }, { @@ -2304,12 +2437,14 @@ data:extend({ always_show_made_in = true, energy_required = 30, ingredients = { - {"nullius-well-1", 3}, - {"nullius-steel-sheet", 8}, - {"nullius-refractory-brick", 40}, - {"nullius-relief-valve", 1} + {type = "item", name = "nullius-well-1", amount = 3}, + {type = "item", name = "nullius-steel-sheet", amount = 8}, + {type = "item", name = "nullius-refractory-brick", amount = 40}, + {type = "item", name = "nullius-relief-valve", amount = 1} }, - result = "nullius-extractor-1" + results = { + {type = "item", name = "nullius-extractor-1", amount = 1} + } }, { type = "recipe", @@ -2319,46 +2454,50 @@ data:extend({ category = "huge-crafting", energy_required = 75, ingredients = { - {"nullius-extractor-1", 2}, - {"nullius-well-2", 1}, - {"nullius-box-heat-pipe-2", 2}, - {"nullius-chimney-3", 1}, - {"nullius-medium-miner-3", 1}, - {"nullius-sensor-2", 1} + {type = "item", name = "nullius-extractor-1", amount = 2}, + {type = "item", name = "nullius-well-2", amount = 1}, + {type = "item", name = "nullius-box-heat-pipe-2", amount = 2}, + {type = "item", name = "nullius-chimney-3", amount = 1}, + {type = "item", name = "nullius-medium-miner-3", amount = 1}, + {type = "item", name = "nullius-sensor-2", amount = 1} }, - result = "nullius-extractor-2" + results = { + {type = "item", name = "nullius-extractor-2", amount = 1} + } }, { type = "recipe", name = "nullius-legacy-extractor-2", enabled = false, always_show_made_in = true, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, category = "huge-crafting", energy_required = 75, ingredients = { - {"nullius-extractor-1", 2}, - {"nullius-well-2", 2}, - {"nullius-box-heat-pipe-2", 3}, - {"nullius-barrel-pump-2", 1}, - {"nullius-medium-miner-3", 1}, - {"nullius-sensor-2", 1} + {type = "item", name = "nullius-extractor-1", amount = 2}, + {type = "item", name = "nullius-well-2", amount = 2}, + {type = "item", name = "nullius-box-heat-pipe-2", amount = 3}, + {type = "item", name = "nullius-barrel-pump-2", amount = 1}, + {type = "item", name = "nullius-medium-miner-3", amount = 1}, + {type = "item", name = "nullius-sensor-2", amount = 1} }, - result = "nullius-extractor-2" + results = { + {type = "item", name = "nullius-extractor-2", amount = 1} + } }, { type = "item", name = "nullius-compressor-1", - localised_name = {"", {"entity-name.nullius-compressor"}, " ", 1}, + localised_name = {"", {"entity-name.nullius-compressor"}, " ", tostring(1)}, icons = {{ - icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", + icon = "__angelsrefininggraphics__/graphics/icons/thermal-extractor.png", icon_size = 32, tint = {0.6, 0.55, 0.36} }}, - localised_description = {"entity-description.nullius-prioritize", + localised_description = {"entity-description.nullius-prioritize", {"entity-description.nullius-compressor"}}, subgroup = "electrolyzer", order = "nullius-cbb", @@ -2368,13 +2507,13 @@ data:extend({ { type = "item", name = "nullius-compressor-2", - localised_name = {"", {"entity-name.nullius-compressor"}, " ", 2}, + localised_name = {"", {"entity-name.nullius-compressor"}, " ", tostring(2)}, icons = {{ - icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", + icon = "__angelsrefininggraphics__/graphics/icons/thermal-extractor.png", icon_size = 32, tint = {0.65, 0.6, 0.8} }}, - localised_description = {"entity-description.nullius-prioritize", + localised_description = {"entity-description.nullius-prioritize", {"entity-description.nullius-compressor"}}, subgroup = "electrolyzer", order = "nullius-ccb", @@ -2384,12 +2523,12 @@ data:extend({ { type = "item", name = "nullius-compressor-3", - localised_name = {"", {"entity-name.nullius-compressor"}, " ", 3}, + localised_name = {"", {"entity-name.nullius-compressor"}, " ", tostring(3)}, icons = {{ - icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", + icon = "__angelsrefininggraphics__/graphics/icons/thermal-extractor.png", icon_size = 32 }}, - localised_description = {"entity-description.nullius-prioritize", + localised_description = {"entity-description.nullius-prioritize", {"entity-description.nullius-compressor"}}, subgroup = "electrolyzer", order = "nullius-cdb", @@ -2404,12 +2543,14 @@ data:extend({ category = "large-crafting", energy_required = 8, ingredients = { - {"nullius-pump-2", 1}, - {"nullius-medium-tank-2", 1}, - {"nullius-top-up-valve", 1}, - {"power-switch", 1} + {type = "item", name = "nullius-pump-2", amount = 1}, + {type = "item", name = "nullius-medium-tank-2", amount = 1}, + {type = "item", name = "nullius-top-up-valve", amount = 1}, + {type = "item", name = "power-switch", amount = 1} }, - result = "nullius-compressor-1" + results = { + {type = "item", name = "nullius-compressor-1", amount = 1} + } }, { type = "recipe", @@ -2421,14 +2562,15 @@ data:extend({ category = "huge-crafting", energy_required = 40, ingredients = { - {"nullius-compressor-1", 5}, - {"nullius-air-filter-2", 1}, - {"nullius-large-tank-2", 1}, - {"nullius-relief-valve", 6}, - {"nullius-sensor-1", 1} + {type = "item", name = "nullius-compressor-1", amount = 5}, + {type = "item", name = "nullius-air-filter-2", amount = 1}, + {type = "item", name = "nullius-large-tank-2", amount = 1}, + {type = "item", name = "nullius-relief-valve", amount = 6}, + {type = "item", name = "nullius-sensor-1", amount = 1} }, - result = "nullius-compressor-2", - result_count = 3 + results = { + {type = "item", name = "nullius-compressor-2", amount = 3} + } }, { type = "recipe", @@ -2440,15 +2582,16 @@ data:extend({ category = "huge-crafting", energy_required = 90, ingredients = { - {"nullius-compressor-2", 6}, - {"nullius-air-filter-3", 1}, - {"nullius-large-tank-3", 1}, - {"nullius-turbine-closed-3", 1}, - {"nullius-box-pump-3", 1}, - {"nullius-pylon-2", 2} + {type = "item", name = "nullius-compressor-2", amount = 6}, + {type = "item", name = "nullius-air-filter-3", amount = 1}, + {type = "item", name = "nullius-large-tank-3", amount = 1}, + {type = "item", name = "nullius-turbine-closed-3", amount = 1}, + {type = "item", name = "nullius-box-pump-3", amount = 1}, + {type = "item", name = "nullius-pylon-2", amount = 2} }, - result = "nullius-compressor-3", - result_count = 4 + results = { + {type = "item", name = "nullius-compressor-3", amount = 4} + } }, { @@ -2456,7 +2599,7 @@ data:extend({ name = "nullius-geothermal-plant-1", order = "nullius-bb", icons = {{ - icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", + icon = "__angelssmeltinggraphics__/graphics/icons/chemical-furnace.png", icon_size = 64, tint = {0.65, 0.8, 1} }}, @@ -2472,12 +2615,14 @@ data:extend({ always_show_made_in = true, energy_required = 10, ingredients = { - {"nullius-extractor-1", 3}, - {"nullius-heat-pipe-1", 30}, - {"nullius-aluminum-plate", 20}, - {"nullius-aluminum-rod", 10} + {type = "item", name = "nullius-extractor-1", amount = 3}, + {type = "item", name = "nullius-heat-pipe-1", amount = 30}, + {type = "item", name = "nullius-aluminum-plate", amount = 20}, + {type = "item", name = "nullius-aluminum-rod", amount = 10} }, - result = "nullius-geothermal-plant-1" + results = { + {type = "item", name = "nullius-geothermal-plant-1", amount = 1} + } }, { @@ -2485,7 +2630,7 @@ data:extend({ name = "nullius-geothermal-plant-2", order = "nullius-bc", icons = {{ - icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", + icon = "__angelssmeltinggraphics__/graphics/icons/chemical-furnace.png", icon_size = 64, tint = {0.85, 0.8, 1} }}, @@ -2501,20 +2646,22 @@ data:extend({ always_show_made_in = true, energy_required = 30, ingredients = { - {"nullius-geothermal-plant-1", 2}, - {"nullius-thermal-tank-2", 2}, - {"nullius-heat-pipe-2", 25}, - {"stone-wall", 20}, - {"gate", 5} + {type = "item", name = "nullius-geothermal-plant-1", amount = 2}, + {type = "item", name = "nullius-thermal-tank-2", amount = 2}, + {type = "item", name = "nullius-heat-pipe-2", amount = 25}, + {type = "item", name = "stone-wall", amount = 20}, + {type = "item", name = "gate", amount = 5} }, - result = "nullius-geothermal-plant-2" + results = { + {type = "item", name = "nullius-geothermal-plant-2", amount = 1} + } }, { type = "item", name = "nullius-geothermal-plant-3", icons = {{ - icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", + icon = "__angelssmeltinggraphics__/graphics/icons/chemical-furnace.png", icon_size = 64 }}, subgroup = "geothermal", @@ -2530,14 +2677,16 @@ data:extend({ category = "huge-crafting", energy_required = 80, ingredients = { - {"nullius-geothermal-plant-2", 2}, - {"nullius-extractor-2", 3}, - {"nullius-thermal-tank-3", 3}, - {"nullius-stirling-engine-3", 2}, - {"nullius-large-miner-2", 1}, - {"nullius-efficiency-module-2", 2} + {type = "item", name = "nullius-geothermal-plant-2", amount = 2}, + {type = "item", name = "nullius-extractor-2", amount = 3}, + {type = "item", name = "nullius-thermal-tank-3", amount = 3}, + {type = "item", name = "nullius-stirling-engine-3", amount = 2}, + {type = "item", name = "nullius-large-miner-2", amount = 1}, + {type = "item", name = "nullius-efficiency-module-2", amount = 2} }, - result = "nullius-geothermal-plant-3" + results = { + {type = "item", name = "nullius-geothermal-plant-3", amount = 1} + } }, { @@ -2547,7 +2696,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/heat-pipe.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.4, 0.6, 0.9} }}, subgroup = "heat-energy", @@ -2567,7 +2716,9 @@ data:extend({ {type="item", name="nullius-aluminum-sheet", amount=1}, {type="fluid", name="nullius-water", amount=100, fluidbox_index=1} }, - result = "nullius-heat-pipe-1" + results = { + {type = "item", name = "nullius-heat-pipe-1", amount = 1} + } }, { type = "recipe", @@ -2584,7 +2735,9 @@ data:extend({ {type="item", name="nullius-box-aluminum-sheet", amount=1}, {type="fluid", name="nullius-water", amount=500, fluidbox_index=1} }, - result = "nullius-box-heat-pipe-1" + results = { + {type = "item", name = "nullius-box-heat-pipe-1", amount = 1} + } }, { @@ -2594,7 +2747,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/heat-pipe.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.7, 0.8, 0.95} }}, subgroup = "heat-energy", @@ -2617,8 +2770,9 @@ data:extend({ {type="item", name="nullius-insulation", amount=2}, {type="item", name="nullius-eutectic-salt", amount=5} }, - result = "nullius-heat-pipe-2", - result_count = 2 + results = { + {type = "item", name = "nullius-heat-pipe-2", amount = 2} + } }, { type = "recipe", @@ -2637,8 +2791,9 @@ data:extend({ {type="item", name="nullius-box-insulation", amount=2}, {type="item", name="nullius-box-eutectic-salt", amount=5} }, - result = "nullius-box-heat-pipe-2", - result_count = 3 + results = { + {type = "item", name = "nullius-box-heat-pipe-2", amount = 3} + } }, { type = "recipe", @@ -2662,8 +2817,9 @@ data:extend({ {type="item", name="nullius-insulation", amount=2}, {type="item", name="nullius-eutectic-salt", amount=5} }, - result = "nullius-heat-pipe-2", - result_count = 3 + results = { + {type = "item", name = "nullius-heat-pipe-2", amount = 3} + } }, { type = "recipe", @@ -2695,8 +2851,9 @@ data:extend({ {type="item", name="nullius-box-insulation", amount=2}, {type="item", name="nullius-box-eutectic-salt", amount=5} }, - result = "nullius-box-heat-pipe-2", - result_count = 3 + results = { + {type = "item", name = "nullius-box-heat-pipe-2", amount = 3} + } }, { @@ -2706,7 +2863,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/heat-pipe.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "heat-energy", place_result = "nullius-heat-pipe-3", @@ -2726,8 +2883,9 @@ data:extend({ {type="item", name="nullius-small-pump-2", amount=1}, {type="fluid", name="nullius-compressed-helium", amount=50} }, - result = "nullius-heat-pipe-3", - result_count = 6 + results = { + {type = "item", name = "nullius-heat-pipe-3", amount = 6} + } }, { type = "recipe", @@ -2745,8 +2903,9 @@ data:extend({ {type="item", name="nullius-box-small-pump-2", amount=1}, {type="fluid", name="nullius-compressed-helium", amount=250} }, - result = "nullius-box-heat-pipe-3", - result_count = 6 + results = { + {type = "item", name = "nullius-box-heat-pipe-3", amount = 6} + } }, { @@ -2797,7 +2956,9 @@ data:extend({ {type="item", name="nullius-small-pump-1", amount=1}, {type="fluid", name="nullius-water", amount=1000} }, - result = "nullius-thermal-tank-1" + results = { + {type = "item", name = "nullius-thermal-tank-1", amount = 1} + } }, { type = "recipe", @@ -2814,7 +2975,9 @@ data:extend({ {type="item", name="nullius-crucible", amount=4}, {type="item", name="nullius-thermal-tank-1", amount=1} }, - result = "nullius-thermal-tank-2" + results = { + {type = "item", name = "nullius-thermal-tank-2", amount = 1} + } }, { type = "recipe", @@ -2831,8 +2994,9 @@ data:extend({ {type="item", name="nullius-large-tank-3", amount=1}, {type="item", name="nullius-barrel-pump-2", amount=1} }, - result = "nullius-thermal-tank-3", - result_count = 2 + results = { + {type = "item", name = "nullius-thermal-tank-3", amount = 2} + } }, { @@ -2842,7 +3006,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/steam-engine.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.8, 0.8, 0.6} }}, subgroup = "heat-exchange", @@ -2856,7 +3020,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/steam-engine.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.75, 0.75, 0.95} }}, subgroup = "heat-exchange", @@ -2870,7 +3034,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/icons/steam-engine.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "heat-exchange", place_result = "nullius-stirling-engine-3", @@ -2892,8 +3056,9 @@ data:extend({ {type="fluid", name="nullius-compressed-nitrogen", amount=600}, {type="fluid", name="nullius-lubricant", amount=30} }, - result = "nullius-stirling-engine-1", - result_count = 2 + results = { + {type = "item", name = "nullius-stirling-engine-1", amount = 2} + } }, { type = "recipe", @@ -2910,8 +3075,9 @@ data:extend({ {type="item", name="nullius-transformer", amount=3}, {type="fluid", name="nullius-compressed-argon", amount=500, fluidbox_index=1} }, - result = "nullius-stirling-engine-2", - result_count = 2 + results = { + {type = "item", name = "nullius-stirling-engine-2", amount = 2} + } }, { type = "recipe", @@ -2929,15 +3095,16 @@ data:extend({ {type="item", name="nullius-grid-battery-2", amount=2}, {type="fluid", name="nullius-compressed-helium", amount=400, fluidbox_index=1} }, - result = "nullius-stirling-engine-3", - result_count = 3 + results = { + {type = "item", name = "nullius-stirling-engine-3", amount = 3} + } }, { type = "item", name = "nullius-barrel-pump-1", icons = {{ - icon = "__angelsrefining__/graphics/icons/barreling-pump.png", + icon = "__angelsrefininggraphics__/graphics/icons/barreling-pump.png", icon_size = 32, tint = {0.7, 0.9, 0.9} }}, @@ -2954,13 +3121,15 @@ data:extend({ always_show_made_in = true, energy_required = 5, ingredients = { - {"nullius-pump-1", 2}, - {"inserter", 1}, - {"nullius-iron-sheet", 3}, - {"nullius-pipe-2", 5}, - {"nullius-top-up-valve", 2} + {type = "item", name = "nullius-pump-1", amount = 2}, + {type = "item", name = "inserter", amount = 1}, + {type = "item", name = "nullius-iron-sheet", amount = 3}, + {type = "item", name = "nullius-pipe-2", amount = 5}, + {type = "item", name = "nullius-top-up-valve", amount = 2} }, - result = "nullius-barrel-pump-1" + results = { + {type = "item", name = "nullius-barrel-pump-1", amount = 1} + } }, { @@ -2983,10 +3152,12 @@ data:extend({ category = "medium-crafting", energy_required = 3, ingredients = { - {"nullius-combustion-chamber-1", 1}, - {"nullius-heat-pipe-1", 4} + {type = "item", name = "nullius-combustion-chamber-1", amount = 1}, + {type = "item", name = "nullius-heat-pipe-1", amount = 4} }, - result = "nullius-heat-exchanger-1" + results = { + {type = "item", name = "nullius-heat-exchanger-1", amount = 1} + } }, { type = "item", @@ -3008,11 +3179,13 @@ data:extend({ category = "medium-crafting", energy_required = 20, ingredients = { - {"nullius-heat-exchanger-1", 1}, - {"nullius-combustion-chamber-3", 1}, - {"nullius-heat-pipe-2", 8} + {type = "item", name = "nullius-heat-exchanger-1", amount = 1}, + {type = "item", name = "nullius-combustion-chamber-3", amount = 1}, + {type = "item", name = "nullius-heat-pipe-2", amount = 8} }, - result = "nullius-heat-exchanger-2" + results = { + {type = "item", name = "nullius-heat-exchanger-2", amount = 1} + } }, { type = "item", @@ -3034,11 +3207,13 @@ data:extend({ category = "large-crafting", energy_required = 50, ingredients = { - {"nullius-heat-exchanger-2", 2}, - {"nullius-thermal-tank-3", 1}, - {"nullius-filter-2", 1} + {type = "item", name = "nullius-heat-exchanger-2", amount = 2}, + {type = "item", name = "nullius-thermal-tank-3", amount = 1}, + {type = "item", name = "nullius-filter-2", amount = 1} }, - result = "nullius-heat-exchanger-3" + results = { + {type = "item", name = "nullius-heat-exchanger-3", amount = 1} + } }, { @@ -3073,12 +3248,14 @@ data:extend({ category = "medium-crafting", energy_required = 15, ingredients = { - {"nullius-heat-exchanger-1", 1}, - {"nullius-medium-furnace-2", 1}, - {"nullius-ceramic-powder", 5}, - {"nullius-transformer", 1} + {type = "item", name = "nullius-heat-exchanger-1", amount = 1}, + {type = "item", name = "nullius-medium-furnace-2", amount = 1}, + {type = "item", name = "nullius-ceramic-powder", amount = 5}, + {type = "item", name = "nullius-transformer", amount = 1} }, - result = "nullius-boiler-1" + results = { + {type = "item", name = "nullius-boiler-1", amount = 1} + } }, { type = "recipe", @@ -3088,18 +3265,20 @@ data:extend({ category = "medium-crafting", energy_required = 40, ingredients = { - {"nullius-heat-exchanger-3", 1}, - {"nullius-boiler-1", 1}, - {"nullius-medium-furnace-3", 1} + {type = "item", name = "nullius-heat-exchanger-3", amount = 1}, + {type = "item", name = "nullius-boiler-1", amount = 1}, + {type = "item", name = "nullius-medium-furnace-3", amount = 1} }, - result = "nullius-boiler-2" + results = { + {type = "item", name = "nullius-boiler-2", amount = 1} + } }, { type = "item", name = "nullius-barrel-pump-2", icons = {{ - icon = "__angelsrefining__/graphics/icons/barreling-pump.png", + icon = "__angelsrefininggraphics__/graphics/icons/barreling-pump.png", icon_size = 32 }}, subgroup = "pumping", @@ -3115,40 +3294,44 @@ data:extend({ category = "medium-crafting", energy_required = 12, ingredients = { - {"nullius-barrel-pump-1", 1}, - {"nullius-small-pump-2", 2}, - {"nullius-small-tank-2", 1}, - {"nullius-sensor-1", 1}, - {"nullius-refueler", 1} + {type = "item", name = "nullius-barrel-pump-1", amount = 1}, + {type = "item", name = "nullius-small-pump-2", amount = 2}, + {type = "item", name = "nullius-small-tank-2", amount = 1}, + {type = "item", name = "nullius-sensor-1", amount = 1}, + {type = "item", name = "nullius-refueler", amount = 1} }, - result = "nullius-barrel-pump-2" + results = { + {type = "item", name = "nullius-barrel-pump-2", amount = 1} + } }, { type = "recipe", name = "nullius-legacy-barrel-pump-2", enabled = false, - always_show_made_in = true, - hidden = true, + always_show_made_in = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, category = "medium-crafting", energy_required = 12, ingredients = { - {"nullius-barrel-pump-1", 2}, - {"nullius-small-pump-2", 2}, - {"nullius-small-tank-2", 1}, - {"nullius-sensor-1", 1} + {type = "item", name = "nullius-barrel-pump-1", amount = 2}, + {type = "item", name = "nullius-small-pump-2", amount = 2}, + {type = "item", name = "nullius-small-tank-2", amount = 1}, + {type = "item", name = "nullius-sensor-1", amount = 1} }, - result = "nullius-barrel-pump-2" + results = { + {type = "item", name = "nullius-barrel-pump-2", amount = 1} + } }, { type = "item", name = "nullius-nanofabricator-1", icons = {{ - icon = "__angelsrefining__/graphics/icons/crystallizer.png", + icon = "__angelsrefininggraphics__/graphics/icons/crystallizer.png", icon_size = 64, - icon_mipmaps = 4, + tint = {0.6, 0.75, 0.75} }}, subgroup = "chemical-plant", @@ -3160,9 +3343,9 @@ data:extend({ type = "item", name = "nullius-nanofabricator-2", icons = {{ - icon = "__angelsrefining__/graphics/icons/crystallizer.png", + icon = "__angelsrefininggraphics__/graphics/icons/crystallizer.png", icon_size = 64, - icon_mipmaps = 4 + }}, subgroup = "chemical-plant", order = "nullius-ccb", @@ -3179,15 +3362,16 @@ data:extend({ category = "huge-crafting", energy_required = 40, ingredients = { - {"nullius-chemical-plant-2", 1}, - {"nullius-electrolyzer-2", 1}, - {"nullius-telekinesis-field-1", 1}, - {"nullius-foundry-2", 1}, - {"nullius-flotation-cell-2", 1}, - {"nullius-air-filter-2", 1} + {type = "item", name = "nullius-chemical-plant-2", amount = 1}, + {type = "item", name = "nullius-electrolyzer-2", amount = 1}, + {type = "item", name = "nullius-telekinesis-field-1", amount = 1}, + {type = "item", name = "nullius-foundry-2", amount = 1}, + {type = "item", name = "nullius-flotation-cell-2", amount = 1}, + {type = "item", name = "nullius-air-filter-2", amount = 1} }, - result = "nullius-nanofabricator-1", - result_count = 2 + results = { + {type = "item", name = "nullius-nanofabricator-1", amount = 2} + } }, { type = "recipe", @@ -3196,20 +3380,21 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, category = "huge-crafting", energy_required = 40, ingredients = { - {"nullius-chemical-plant-2", 1}, - {"nullius-electrolyzer-2", 1}, - {"nullius-foundry-2", 1}, - {"nullius-flotation-cell-2", 1}, - {"nullius-air-filter-2", 1} + {type = "item", name = "nullius-chemical-plant-2", amount = 1}, + {type = "item", name = "nullius-electrolyzer-2", amount = 1}, + {type = "item", name = "nullius-foundry-2", amount = 1}, + {type = "item", name = "nullius-flotation-cell-2", amount = 1}, + {type = "item", name = "nullius-air-filter-2", amount = 1} }, - result = "nullius-nanofabricator-1", - result_count = 2 + results = { + {type = "item", name = "nullius-nanofabricator-1", amount = 2} + } }, { type = "recipe", @@ -3221,16 +3406,17 @@ data:extend({ category = "huge-crafting", energy_required = 90, ingredients = { - {"nullius-nanofabricator-1", 1}, - {"nullius-chemical-plant-3", 1}, - {"nullius-electrolyzer-3", 1}, - {"nullius-large-furnace-2", 1}, - {"nullius-large-assembler-2", 1}, - {"nullius-fabrication-tool-3", 1}, - {"nullius-large-dispatch-chest-2", 2} + {type = "item", name = "nullius-nanofabricator-1", amount = 1}, + {type = "item", name = "nullius-chemical-plant-3", amount = 1}, + {type = "item", name = "nullius-electrolyzer-3", amount = 1}, + {type = "item", name = "nullius-large-furnace-2", amount = 1}, + {type = "item", name = "nullius-large-assembler-2", amount = 1}, + {type = "item", name = "nullius-fabrication-tool-3", amount = 1}, + {type = "item", name = "nullius-large-dispatch-chest-2", amount = 2} }, - result = "nullius-nanofabricator-2", - result_count = 2 + results = { + {type = "item", name = "nullius-nanofabricator-2", amount = 2} + } }, { type = "recipe", @@ -3239,21 +3425,22 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, category = "huge-crafting", energy_required = 90, ingredients = { - {"nullius-nanofabricator-1", 2}, - {"nullius-chemical-plant-3", 1}, - {"nullius-electrolyzer-3", 1}, - {"nullius-large-furnace-2", 1}, - {"nullius-large-assembler-2", 1}, - {"nullius-large-dispatch-chest-2", 2} + {type = "item", name = "nullius-nanofabricator-1", amount = 2}, + {type = "item", name = "nullius-chemical-plant-3", amount = 1}, + {type = "item", name = "nullius-electrolyzer-3", amount = 1}, + {type = "item", name = "nullius-large-furnace-2", amount = 1}, + {type = "item", name = "nullius-large-assembler-2", amount = 1}, + {type = "item", name = "nullius-large-dispatch-chest-2", amount = 2} }, - result = "nullius-nanofabricator-2", - result_count = 2 + results = { + {type = "item", name = "nullius-nanofabricator-2", amount = 2} + } } }) @@ -3261,30 +3448,30 @@ data:extend({ if mods["reskins-bobs"] then data.raw.item["nullius-heat-pipe-1"].icons = {{ icon = "__reskins-bobs__/graphics/icons/power/heat-pipe/heat-pipe-base-icon-base.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }} data.raw.item["nullius-heat-pipe-2"].icons = {{ icon = "__reskins-bobs__/graphics/icons/power/heat-pipe/heat-pipe-gold-copper-icon-base.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }} data.raw.item["nullius-heat-pipe-3"].icons = {{ icon = "__reskins-bobs__/graphics/icons/power/heat-pipe/heat-pipe-silver-titanium-icon-base.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }} data.raw.item["nullius-stirling-engine-1"].icons = { { icon = "__reskins-bobs__/graphics/icons/power/steam-engine/steam-engine-icon-base.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }, { icon = "__reskins-bobs__/graphics/icons/power/steam-engine/steam-engine-icon-mask.png", - icon_size = 64, icon_mipmaps = 4, + icon_size = 64, tint = tiercolor("yellow") }, { icon = "__reskins-bobs__/graphics/icons/power/steam-engine/steam-engine-icon-highlights.png", - icon_size = 64, icon_mipmaps = 4, tint = {1, 1, 1, 0} + icon_size = 64, tint = {1, 1, 1, 0} } } @@ -3298,35 +3485,35 @@ data.raw.item["nullius-stirling-engine-3"].icons[2].tint = tiercolor("red") data.raw.item["nullius-pipe-2"].icons = {{ icon = ENTICONPATH .. "pipe-red.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }} data.raw.recipe["nullius-steel-pipe"].icons[1] = { icon = ENTICONPATH .. "pipe-red.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, } data.raw.recipe["nullius-plastic-pipe"].icons[1] = { icon = ENTICONPATH .. "pipe-red.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, } data.raw.item["nullius-pipe-3"].icons = {{ icon = "__reskins-bobs__/graphics/icons/logistics/pipe/plastic-pipe-icon.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }} data.raw.item["nullius-pipe-4"].icons = {{ icon = "__reskins-bobs__/graphics/icons/logistics/pipe/tungsten-pipe-icon.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }} data.raw.item["nullius-underground-pipe-2"].icons = {{ icon = ENTICONPATH .. "pipe-underground-red.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, scale = 2 }} data.raw.item["nullius-underground-pipe-3"].icons = {{ icon = "__reskins-bobs__/graphics/icons/logistics/pipe-to-ground/plastic-pipe-to-ground-icon.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }} data.raw.item["nullius-underground-pipe-4"].icons = {{ icon = "__reskins-bobs__/graphics/icons/logistics/pipe-to-ground/tungsten-pipe-to-ground-icon.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }} end diff --git a/nullius/prototypes/item/recipe.lua b/nullius/prototypes/item/recipe.lua index cb16028..0384f75 100644 --- a/nullius/prototypes/item/recipe.lua +++ b/nullius/prototypes/item/recipe.lua @@ -6,6 +6,7 @@ data:extend({ { type = "recipe", name = "nullius-stone-block", + localised_name = {"item-name.stone-brick"}, enabled = false, category = "medium-crafting", order = "nullius-bb", @@ -13,7 +14,7 @@ data:extend({ always_show_made_in = true, energy_required = 4, ingredients = { - {"stone", 2} + {type = "item", name = "stone", amount = 2} }, results = { {type="item", name="stone-brick", amount=5}, @@ -31,7 +32,7 @@ data:extend({ always_show_made_in = true, energy_required = 40, ingredients = { - {"nullius-box-stone", 4} + {type = "item", name = "nullius-box-stone", amount = 4} }, results = { {type="item", name="nullius-box-stone-brick", amount=5}, @@ -47,13 +48,13 @@ data:extend({ { icon = "__base__/graphics/icons/stone-brick.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelsrefining__/graphics/icons/angels-ore6/angels-ore6-3.png", + icon = "__angelsrefininggraphics__/graphics/icons/angels-ore6/angels-ore6-3.png", tint = {0.898, 0.773, 0.688}, - icon_size = 32, - scale = 0.5, + icon_size = 64, + scale = 0.25, shift = {-12, -12} } }, @@ -63,9 +64,10 @@ data:extend({ allow_decomposition = false, allow_as_intermediate = false, always_show_made_in = true, + hide_from_signal_gui = false, energy_required = 5, ingredients = { - {"nullius-limestone", 4} + {type = "item", name = "nullius-limestone", amount = 4} }, results = { {type="item", name="stone-brick", amount=12}, @@ -81,13 +83,13 @@ data:extend({ { icon = "__base__/graphics/icons/stone-brick.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelsrefining__/graphics/icons/angels-ore6/angels-ore6-2.png", + icon = "__angelsrefininggraphics__/graphics/icons/angels-ore6/angels-ore6-2.png", tint = {0.690, 0.611, 0.427}, - icon_size = 32, - scale = 0.5, + icon_size = 64, + scale = 0.25, shift = {-12, -12} } }, @@ -97,9 +99,10 @@ data:extend({ allow_decomposition = false, allow_as_intermediate = false, always_show_made_in = true, + hide_from_signal_gui = false, energy_required = 4, ingredients = { - {"nullius-sandstone", 3} + {type = "item", name = "nullius-sandstone", amount = 3} }, results = { {type="item", name="stone-brick", amount=10}, @@ -111,6 +114,7 @@ data:extend({ { type = "recipe", name = "nullius-inserter-1", + localised_name = {"entity-name.nullius-inserter-1"}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -118,12 +122,13 @@ data:extend({ category = "small-crafting", energy_required = 8, ingredients = { - {"nullius-motor-1", 1}, - {"nullius-iron-gear", 2}, - {"nullius-iron-rod", 3} + {type = "item", name = "nullius-motor-1", amount = 1}, + {type = "item", name = "nullius-iron-gear", amount = 2}, + {type = "item", name = "nullius-iron-rod", amount = 3} }, - result = "inserter", - result_count = 4 + results = { + {type="item", name="inserter", amount = 4} + } }, { type = "recipe", @@ -136,27 +141,32 @@ data:extend({ subgroup = "boxed-inserter", energy_required = 25, ingredients = { - {"nullius-box-motor-1", 1}, - {"nullius-box-steel-gear", 1}, - {"nullius-box-steel-rod", 2} + {type = "item", name = "nullius-box-motor-1", amount = 1}, + {type = "item", name = "nullius-box-steel-gear", amount = 1}, + {type = "item", name = "nullius-box-steel-rod", amount = 2} }, - result = "nullius-box-inserter-1", - result_count = 5 + results = { + {type="item", name="nullius-box-inserter-1", amount = 5} + } }, { type = "recipe", name = "nullius-inserter-2", + localised_name = {"entity-name.nullius-inserter-2"}, enabled = false, always_show_made_in = true, category = "small-crafting", energy_required = 4, ingredients = { - {"inserter", 1}, - {"nullius-motor-1", 1}, - {"nullius-steel-gear", 1}, - {"nullius-aluminum-rod", 1} + {type = "item", name = "inserter", amount = 1}, + {type = "item", name = "nullius-motor-1", amount = 1}, + {type = "item", name = "nullius-steel-gear", amount = 1}, + {type = "item", name = "nullius-aluminum-rod", amount = 1}, + {type = "item", name = "decider-combinator", amount = 1} }, - result = "turbo-inserter" + results = { + {type="item", name="bob-turbo-inserter", amount = 1} + } }, { type = "recipe", @@ -167,55 +177,66 @@ data:extend({ subgroup = "boxed-inserter", energy_required = 20, ingredients = { - {"nullius-box-inserter-1", 1}, - {"nullius-box-motor-1", 1}, - {"nullius-box-steel-gear", 1}, - {"nullius-box-aluminum-rod", 1} - }, - result = "nullius-box-inserter-2" - }, - { - type = "recipe", - name = "nullius-filter-inserter-2", - enabled = false, - always_show_made_in = true, - category = "small-crafting", - energy_required = 2, - ingredients = { - {"turbo-inserter", 1}, - {"decider-combinator", 1} - }, - result = "turbo-filter-inserter" - }, - { - type = "recipe", - name = "nullius-boxed-filter-inserter-2", - enabled = false, - always_show_made_in = true, - category = "large-assembly", - subgroup = "boxed-inserter", - energy_required = 10, - ingredients = { - {"nullius-box-inserter-2", 1}, - {"nullius-box-logic-circuit", 1} + {type = "item", name = "nullius-box-inserter-1", amount = 1}, + {type = "item", name = "nullius-box-motor-1", amount = 1}, + {type = "item", name = "nullius-box-steel-gear", amount = 1}, + {type = "item", name = "nullius-box-aluminum-rod", amount = 1}, + {type = "item", name = "nullius-box-logic-circuit", amount = 1} }, - result = "nullius-box-filter-inserter-2" - }, + results = { + {type="item", name="nullius-box-inserter-2", amount = 1} + } + }, + -- { -- TODO: remove all filter inserters i guess + -- type = "recipe", + -- name = "nullius-filter-inserter-2", + -- enabled = false, + -- always_show_made_in = true, + -- category = "small-crafting", + -- energy_required = 2, + -- ingredients = { + -- {type = "item", name = "turbo-inserter", amount = 1}, + -- {type = "item", name = "decider-combinator", amount = 1} + -- }, + -- results = { + -- {type="item", name="turbo-filter-inserter", amount = 1} + -- } + -- }, + -- { + -- type = "recipe", + -- name = "nullius-boxed-filter-inserter-2", + -- enabled = false, + -- always_show_made_in = true, + -- category = "large-assembly", + -- subgroup = "boxed-inserter", + -- energy_required = 10, + -- ingredients = { + -- {type = "item", name = "nullius-box-inserter-2", amount = 1}, + -- {type = "item", name = "nullius-box-logic-circuit", amount = 1} + -- }, + -- results = { + -- {type="item", name="nullius-box-filter-inserter-2", amount = 1} + -- } + -- }, { type = "recipe", name = "nullius-inserter-3", + localised_name = {"entity-name.nullius-inserter-3"}, enabled = false, always_show_made_in = true, category = "small-crafting", energy_required = 7, ingredients = { - {"turbo-filter-inserter", 1}, - {"nullius-motor-2", 1}, - {"nullius-bearing", 1}, - {"nullius-rubber", 2} + {type = "item", name = "bob-turbo-inserter", amount = 1}, + {type = "item", name = "nullius-motor-2", amount = 1}, + {type = "item", name = "nullius-bearing", amount = 1}, + {type = "item", name = "nullius-rubber", amount = 2}, + {type = "item", name = "nullius-sensor-1", amount = 1} }, - result = "stack-inserter" + results = { + {type="item", name="bulk-inserter", amount = 1} + } }, { type = "recipe", @@ -226,55 +247,66 @@ data:extend({ subgroup = "boxed-inserter", energy_required = 35, ingredients = { - {"nullius-box-filter-inserter-2", 1}, - {"nullius-box-motor-2", 1}, - {"nullius-box-bearing", 1}, - {"nullius-box-rubber", 2} + {type = "item", name = "nullius-box-inserter-2", amount = 1}, + {type = "item", name = "nullius-box-motor-2", amount = 1}, + {type = "item", name = "nullius-box-bearing", amount = 1}, + {type = "item", name = "nullius-box-rubber", amount = 2}, + {type = "item", name = "nullius-box-sensor-1", amount = 1} }, - result = "nullius-box-inserter-3" - }, - { - type = "recipe", - name = "nullius-filter-inserter-3", - enabled = false, - always_show_made_in = true, - category = "small-crafting", - energy_required = 3, - ingredients = { - {"stack-inserter", 1}, - {"nullius-sensor-1", 1} - }, - result = "stack-filter-inserter" - }, - { - type = "recipe", - name = "nullius-boxed-filter-inserter-3", - enabled = false, - always_show_made_in = true, - category = "large-assembly", - subgroup = "boxed-inserter", - energy_required = 15, - ingredients = { - {"nullius-box-inserter-3", 1}, - {"nullius-box-sensor-1", 1} - }, - result = "nullius-box-filter-inserter-3" - }, + results = { + {type="item", name="nullius-box-inserter-3", amount = 1} + } + }, + -- { + -- type = "recipe", + -- name = "nullius-filter-inserter-3", + -- enabled = false, + -- always_show_made_in = true, + -- category = "small-crafting", + -- energy_required = 3, + -- ingredients = { + -- {type = "item", name = "bulk-inserter", amount = 1}, + -- {type = "item", name = "nullius-sensor-1", amount = 1} + -- }, + -- results = { + -- {type="item", name="stack-filter-inserter", amount = 1} + -- } + -- }, + -- { + -- type = "recipe", + -- name = "nullius-boxed-filter-inserter-3", + -- enabled = false, + -- always_show_made_in = true, + -- category = "large-assembly", + -- subgroup = "boxed-inserter", + -- energy_required = 15, + -- ingredients = { + -- {type = "item", name = "nullius-box-inserter-3", amount = 1}, + -- {type = "item", name = "nullius-box-sensor-1", amount = 1} + -- }, + -- results = { + -- {type="item", name="nullius-box-filter-inserter-3", amount = 1} + -- } + -- }, { type = "recipe", name = "nullius-inserter-4", + localised_name = {"entity-name.nullius-inserter-4"}, enabled = false, always_show_made_in = true, category = "small-crafting", energy_required = 12, ingredients = { - {"stack-filter-inserter", 2}, - {"nullius-motor-3", 1}, - {"nullius-titanium-rod", 2}, - {"nullius-carbon-composite", 3} + {type = "item", name = "bulk-inserter", amount = 2}, + {type = "item", name = "nullius-motor-3", amount = 1}, + {type = "item", name = "nullius-titanium-rod", amount = 2}, + {type = "item", name = "nullius-carbon-composite", amount = 3}, + {type = "item", name = "nullius-sensor-2", amount = 1} }, - result = "express-stack-inserter" + results = { + {type="item", name="bob-express-bulk-inserter", amount = 1} + } }, { type = "recipe", @@ -285,50 +317,56 @@ data:extend({ subgroup = "boxed-inserter", energy_required = 60, ingredients = { - {"nullius-box-filter-inserter-3", 2}, - {"nullius-box-motor-3", 1}, - {"nullius-box-titanium-rod", 2}, - {"nullius-box-carbon-composite", 3} - }, - result = "nullius-box-inserter-4" - }, - { - type = "recipe", - name = "nullius-filter-inserter-4", - enabled = false, - always_show_made_in = true, - show_amount_in_title = false, - always_show_products = true, - category = "small-crafting", - energy_required = 8, - ingredients = { - {"express-stack-inserter", 2}, - {"nullius-sensor-2", 1} - }, - result = "express-stack-filter-inserter", - result_count = 2 - }, - { - type = "recipe", - name = "nullius-boxed-filter-inserter-4", - enabled = false, - always_show_made_in = true, - show_amount_in_title = false, - always_show_products = true, - category = "large-assembly", - subgroup = "boxed-inserter", - energy_required = 40, - ingredients = { - {"nullius-box-inserter-4", 2}, - {"nullius-box-sensor-2", 1} + {type = "item", name = "nullius-box-inserter-3", amount = 2}, + {type = "item", name = "nullius-box-motor-3", amount = 1}, + {type = "item", name = "nullius-box-titanium-rod", amount = 2}, + {type = "item", name = "nullius-box-carbon-composite", amount = 3}, + {type = "item", name = "nullius-box-sensor-2", amount = 1} }, - result = "nullius-box-filter-inserter-4", - result_count = 2 - }, + results = { + {type="item", name="nullius-box-inserter-4", amount = 1} + } + }, + -- { + -- type = "recipe", + -- name = "nullius-filter-inserter-4", + -- enabled = false, + -- always_show_made_in = true, + -- show_amount_in_title = false, + -- always_show_products = true, + -- category = "small-crafting", + -- energy_required = 8, + -- ingredients = { + -- {type = "item", name = "express-bulk-inserter", amount = 2}, + -- {type = "item", name = "nullius-sensor-2", amount = 1} + -- }, + -- results = { + -- {type="item", name="express-stack-filter-inserter", amount = 2} + -- } + -- }, + -- { + -- type = "recipe", + -- name = "nullius-boxed-filter-inserter-4", + -- enabled = false, + -- always_show_made_in = true, + -- show_amount_in_title = false, + -- always_show_products = true, + -- category = "large-assembly", + -- subgroup = "boxed-inserter", + -- energy_required = 40, + -- ingredients = { + -- {type = "item", name = "nullius-box-inserter-4", amount = 2}, + -- {type = "item", name = "nullius-box-sensor-2", amount = 1} + -- }, + -- results = { + -- {type="item", name="nullius-box-filter-inserter-4", amount = 2} + -- } + -- }, { type = "recipe", name = "nullius-conveyor-belt-1", + localised_name = {"entity-name.nullius-belt-1"}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -336,13 +374,14 @@ data:extend({ category = "medium-crafting", energy_required = 5, ingredients = { - {"nullius-motor-1", 1}, - {"nullius-iron-gear", 2}, - {"nullius-iron-sheet", 2}, - {"nullius-iron-rod", 2} + {type = "item", name = "nullius-motor-1", amount = 1}, + {type = "item", name = "nullius-iron-gear", amount = 2}, + {type = "item", name = "nullius-iron-sheet", amount = 2}, + {type = "item", name = "nullius-iron-rod", amount = 2} }, - result = "transport-belt", - result_count = 15 + results = { + {type="item", name="transport-belt", amount = 15} + } }, { type = "recipe", @@ -355,17 +394,19 @@ data:extend({ subgroup = "boxed-belt", energy_required = 15, ingredients = { - {"nullius-box-motor-1", 1}, - {"nullius-box-iron-gear", 1}, - {"nullius-box-steel-sheet", 2}, - {"nullius-box-steel-rod", 1} + {type = "item", name = "nullius-box-motor-1", amount = 1}, + {type = "item", name = "nullius-box-iron-gear", amount = 1}, + {type = "item", name = "nullius-box-steel-sheet", amount = 2}, + {type = "item", name = "nullius-box-steel-rod", amount = 1} }, - result = "nullius-box-belt-1", - result_count = 18 + results = { + {type="item", name="nullius-box-belt-1", amount = 18} + } }, { type = "recipe", name = "nullius-underground-belt-1", + localised_name = {"entity-name.nullius-underground-belt-1"}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -373,11 +414,12 @@ data:extend({ category = "medium-crafting", energy_required = 3, ingredients = { - {"transport-belt", 10}, - {"pipe-to-ground", 2} + {type = "item", name = "transport-belt", amount = 10}, + {type = "item", name = "pipe-to-ground", amount = 2} }, - result = "underground-belt", - result_count = 2 + results = { + {type="item", name="underground-belt", amount = 2} + } }, { type = "recipe", @@ -390,15 +432,17 @@ data:extend({ subgroup = "boxed-belt", energy_required = 15, ingredients = { - {"nullius-box-belt-1", 10}, - {"nullius-box-underground-pipe-1", 2} + {type = "item", name = "nullius-box-belt-1", amount = 10}, + {type = "item", name = "nullius-box-underground-pipe-1", amount = 2} }, - result = "nullius-box-underground-belt-1", - result_count = 2 + results = { + {type="item", name="nullius-box-underground-belt-1", amount = 2} + } }, { type = "recipe", name = "nullius-splitter-1", + localised_name = {"entity-name.nullius-splitter-1"}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -406,10 +450,12 @@ data:extend({ category = "medium-crafting", energy_required = 3, ingredients = { - {"underground-belt", 2}, - {"nullius-plastic", 2} + {type = "item", name = "underground-belt", amount = 2}, + {type = "item", name = "nullius-plastic", amount = 2} }, - result = "splitter" + results = { + {type="item", name="splitter", amount = 1} + } }, { type = "recipe", @@ -434,16 +480,18 @@ data:extend({ subgroup = "boxed-belt", energy_required = 15, ingredients = { - {"nullius-box-underground-belt-1", 2}, - {"nullius-box-plastic", 2} + {type = "item", name = "nullius-box-underground-belt-1", amount = 2}, + {type = "item", name = "nullius-box-plastic", amount = 2} }, - result = "splitter", - result_count = 5 + results = { + {type="item", name="splitter", amount = 5} + } }, { type = "recipe", name = "nullius-conveyor-belt-2", + localised_name = {"entity-name.nullius-belt-2"}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -457,8 +505,9 @@ data:extend({ {type="item", name="nullius-rubber", amount=4}, {type="fluid", name="nullius-lubricant", amount=12, fluidbox_index=1} }, - result = "fast-transport-belt", - result_count = 8 + results = { + {type="item", name="fast-transport-belt", amount = 8} + } }, { type = "recipe", @@ -477,12 +526,14 @@ data:extend({ {type="item", name="nullius-box-rubber", amount=4}, {type="fluid", name="nullius-lubricant", amount=60, fluidbox_index=1} }, - result = "nullius-box-belt-2", - result_count = 8 + results = { + {type="item", name="nullius-box-belt-2", amount = 8} + } }, { type = "recipe", name = "nullius-underground-belt-2", + localised_name = {"entity-name.nullius-underground-belt-2"}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -490,12 +541,13 @@ data:extend({ category = "medium-crafting", energy_required = 6, ingredients = { - {"fast-transport-belt", 10}, - {"underground-belt", 1}, - {"nullius-underground-pipe-2", 1} + {type = "item", name = "fast-transport-belt", amount = 10}, + {type = "item", name = "underground-belt", amount = 1}, + {type = "item", name = "nullius-underground-pipe-2", amount = 1} }, - result = "fast-underground-belt", - result_count = 2 + results = { + {type="item", name="fast-underground-belt", amount = 2} + } }, { type = "recipe", @@ -508,16 +560,18 @@ data:extend({ subgroup = "boxed-belt", energy_required = 30, ingredients = { - {"nullius-box-belt-2", 10}, - {"nullius-box-underground-belt-1", 1}, - {"nullius-box-underground-pipe-2", 1} + {type = "item", name = "nullius-box-belt-2", amount = 10}, + {type = "item", name = "nullius-box-underground-belt-1", amount = 1}, + {type = "item", name = "nullius-box-underground-pipe-2", amount = 1} }, - result = "nullius-box-underground-belt-2", - result_count = 2 + results = { + {type="item", name="nullius-box-underground-belt-2", amount = 2} + } }, { type = "recipe", name = "nullius-splitter-2", + localised_name = {"entity-name.nullius-splitter-2"}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -525,12 +579,14 @@ data:extend({ category = "medium-crafting", energy_required = 5, ingredients = { - {"fast-underground-belt", 1}, - {"splitter", 1}, - {"nullius-steel-sheet", 4}, - {"decider-combinator", 1} + {type = "item", name = "fast-underground-belt", amount = 1}, + {type = "item", name = "splitter", amount = 1}, + {type = "item", name = "nullius-steel-sheet", amount = 4}, + {type = "item", name = "decider-combinator", amount = 1} }, - result = "fast-splitter" + results = { + {type="item", name="fast-splitter", amount = 1} + } }, { type = "recipe", @@ -555,18 +611,20 @@ data:extend({ subgroup = "boxed-belt", energy_required = 25, ingredients = { - {"nullius-box-underground-belt-2", 1}, - {"splitter", 5}, - {"nullius-box-steel-sheet", 4}, - {"nullius-box-logic-circuit", 1} + {type = "item", name = "nullius-box-underground-belt-2", amount = 1}, + {type = "item", name = "splitter", amount = 5}, + {type = "item", name = "nullius-box-steel-sheet", amount = 4}, + {type = "item", name = "nullius-box-logic-circuit", amount = 1} }, - result = "fast-splitter", - result_count = 5 + results = { + {type="item", name="fast-splitter", amount = 5} + } }, { type = "recipe", name = "nullius-conveyor-belt-3", + localised_name = {"entity-name.nullius-belt-3"}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -579,8 +637,9 @@ data:extend({ {type="item", name="nullius-bearing", amount=2}, {type="item", name="nullius-fiberglass", amount=3} }, - result = "express-transport-belt", - result_count = 6 + results = { + {type="item", name="express-transport-belt", amount = 6} + } }, { type = "recipe", @@ -598,12 +657,14 @@ data:extend({ {type="item", name="nullius-box-bearing", amount=2}, {type="item", name="nullius-box-fiberglass", amount=3} }, - result = "nullius-box-belt-3", - result_count = 6 + results = { + {type="item", name="nullius-box-belt-3", amount = 6} + } }, { type = "recipe", name = "nullius-underground-belt-3", + localised_name = {"entity-name.nullius-underground-belt-3"}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -611,12 +672,13 @@ data:extend({ category = "medium-crafting", energy_required = 8, ingredients = { - {"express-transport-belt", 12}, - {"fast-underground-belt", 2}, - {"nullius-underground-pipe-3", 1} + {type = "item", name = "express-transport-belt", amount = 12}, + {type = "item", name = "fast-underground-belt", amount = 2}, + {type = "item", name = "nullius-underground-pipe-3", amount = 1} }, - result = "express-underground-belt", - result_count = 2 + results = { + {type="item", name="express-underground-belt", amount = 2} + } }, { type = "recipe", @@ -629,16 +691,18 @@ data:extend({ subgroup = "boxed-belt", energy_required = 40, ingredients = { - {"nullius-box-belt-3", 12}, - {"nullius-box-underground-belt-2", 2}, - {"nullius-box-underground-pipe-3", 1} + {type = "item", name = "nullius-box-belt-3", amount = 12}, + {type = "item", name = "nullius-box-underground-belt-2", amount = 2}, + {type = "item", name = "nullius-box-underground-pipe-3", amount = 1} }, - result = "nullius-box-underground-belt-3", - result_count = 2 + results = { + {type="item", name="nullius-box-underground-belt-3", amount = 2} + } }, { type = "recipe", name = "nullius-splitter-3", + localised_name = {"entity-name.nullius-splitter-3"}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -646,11 +710,13 @@ data:extend({ category = "medium-crafting", energy_required = 10, ingredients = { - {"express-underground-belt", 1}, - {"fast-splitter", 1}, - {"nullius-sensor-1", 1} + {type = "item", name = "express-underground-belt", amount = 1}, + {type = "item", name = "fast-splitter", amount = 1}, + {type = "item", name = "nullius-sensor-1", amount = 1} }, - result = "express-splitter" + results = { + {type="item", name="express-splitter", amount = 1} + } }, { type = "recipe", @@ -676,17 +742,19 @@ data:extend({ order = "nullius-pb", energy_required = 50, ingredients = { - {"nullius-box-underground-belt-3", 1}, - {"fast-splitter", 5}, - {"nullius-box-sensor-1", 1} + {type = "item", name = "nullius-box-underground-belt-3", amount = 1}, + {type = "item", name = "fast-splitter", amount = 5}, + {type = "item", name = "nullius-box-sensor-1", amount = 1} }, - result = "express-splitter", - result_count = 5 + results = { + {type="item", name="express-splitter", amount = 5} + } }, { type = "recipe", name = "nullius-conveyor-belt-4", + localised_name = {"entity-name.nullius-belt-4"}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -700,8 +768,9 @@ data:extend({ {type="item", name="nullius-titanium-sheet", amount=5}, {type="item", name="nullius-transformer", amount=1} }, - result = "ultimate-transport-belt", - result_count = 10 + results = { + {type="item", name="bob-ultimate-transport-belt", amount = 10} + } }, { type = "recipe", @@ -720,12 +789,14 @@ data:extend({ {type="item", name="nullius-box-titanium-sheet", amount=5}, {type="item", name="nullius-box-transformer", amount=1} }, - result = "nullius-box-belt-4", - result_count = 10 + results = { + {type="item", name="nullius-box-belt-4", amount = 10} + } }, { type = "recipe", name = "nullius-underground-belt-4", + localised_name = {"entity-name.nullius-underground-belt-4"}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -733,12 +804,13 @@ data:extend({ category = "medium-crafting", energy_required = 12, ingredients = { - {"ultimate-transport-belt", 16}, - {"express-underground-belt", 2}, - {"nullius-underground-pipe-4", 2} + {type = "item", name = "bob-ultimate-transport-belt", amount = 16}, + {type = "item", name = "express-underground-belt", amount = 2}, + {type = "item", name = "nullius-underground-pipe-4", amount = 2} }, - result = "ultimate-underground-belt", - result_count = 2 + results = { + {type="item", name="bob-ultimate-underground-belt", amount = 2} + } }, { type = "recipe", @@ -751,16 +823,18 @@ data:extend({ subgroup = "boxed-belt", energy_required = 60, ingredients = { - {"nullius-box-belt-4", 16}, - {"nullius-box-underground-belt-3", 2}, - {"nullius-box-underground-pipe-4", 2} + {type = "item", name = "nullius-box-belt-4", amount = 16}, + {type = "item", name = "nullius-box-underground-belt-3", amount = 2}, + {type = "item", name = "nullius-box-underground-pipe-4", amount = 2} }, - result = "nullius-box-underground-belt-4", - result_count = 2 + results = { + {type="item", name="nullius-box-underground-belt-4", amount = 2} + } }, { type = "recipe", name = "nullius-splitter-4", + localised_name = {"entity-name.nullius-splitter-4"}, enabled = false, always_show_made_in = true, show_amount_in_title = false, @@ -768,11 +842,13 @@ data:extend({ category = "small-crafting", energy_required = 16, ingredients = { - {"ultimate-underground-belt", 2}, - {"express-splitter", 2}, - {"express-stack-filter-inserter", 1} + {type = "item", name = "bob-ultimate-underground-belt", amount = 2}, + {type = "item", name = "express-splitter", amount = 2}, + {type = "item", name = "bob-express-bulk-inserter", amount = 1} }, - result = "ultimate-splitter" + results = { + {type="item", name="bob-ultimate-splitter", amount = 1} + } }, { type = "recipe", @@ -798,17 +874,19 @@ data:extend({ order = "nullius-pc", energy_required = 80, ingredients = { - {"nullius-box-underground-belt-4", 2}, - {"express-splitter", 10}, - {"nullius-box-filter-inserter-4", 1} + {type = "item", name = "nullius-box-underground-belt-4", amount = 2}, + {type = "item", name = "express-splitter", amount = 10}, + {type = "item", name = "nullius-box-inserter-4", amount = 1} }, - result = "ultimate-splitter", - result_count = 5 + results = { + {type="item", name="bob-ultimate-splitter", amount = 5} + } }, { type = "recipe", name = "nullius-rail", + localised_name = {"entity-name.straight-rail"}, enabled = false, category = "large-crafting", always_show_made_in = true, @@ -816,13 +894,14 @@ data:extend({ always_show_products = true, energy_required = 8, ingredients = { - {"nullius-steel-beam", 2}, - {"nullius-plastic", 3}, - {"nullius-steel-rod", 1}, - {"nullius-gravel", 5} + {type = "item", name = "nullius-steel-beam", amount = 2}, + {type = "item", name = "nullius-plastic", amount = 3}, + {type = "item", name = "nullius-steel-rod", amount = 1}, + {type = "item", name = "nullius-gravel", amount = 5} }, - result = "rail", - result_count = 3 + results = { + {type="item", name="rail", amount = 3} + } }, { type = "recipe", @@ -835,29 +914,33 @@ data:extend({ always_show_products = true, energy_required = 40, ingredients = { - {"nullius-box-steel-beam", 2}, - {"nullius-box-plastic", 3}, - {"nullius-box-steel-rod", 1}, - {"nullius-box-gravel", 5} + {type = "item", name = "nullius-box-steel-beam", amount = 2}, + {type = "item", name = "nullius-box-plastic", amount = 3}, + {type = "item", name = "nullius-box-steel-rod", amount = 1}, + {type = "item", name = "nullius-box-gravel", amount = 5} }, - result = "nullius-box-rail", - result_count = 3 + results = { + {type="item", name="nullius-box-rail", amount = 3} + } }, { type = "recipe", name = "nullius-train-stop", + localised_name = {"entity-name.train-stop"}, enabled = false, category = "medium-crafting", always_show_made_in = true, energy_required = 8, ingredients = { - {"nullius-steel-sheet", 5}, - {"decider-combinator", 2}, - {"programmable-speaker", 1}, - {"small-lamp", 2} + {type = "item", name = "nullius-steel-sheet", amount = 5}, + {type = "item", name = "decider-combinator", amount = 2}, + {type = "item", name = "programmable-speaker", amount = 1}, + {type = "item", name = "small-lamp", amount = 2} }, - result = "train-stop" + results = { + {type="item", name="train-stop", amount = 1} + } }, { type = "recipe", @@ -868,95 +951,107 @@ data:extend({ always_show_made_in = true, energy_required = 40, ingredients = { - {"nullius-box-steel-sheet", 5}, - {"nullius-box-logic-circuit", 2}, - {"nullius-box-antenna", 1}, - {"nullius-box-lamp-1", 2} + {type = "item", name = "nullius-box-steel-sheet", amount = 5}, + {type = "item", name = "nullius-box-logic-circuit", amount = 2}, + {type = "item", name = "nullius-box-antenna", amount = 1}, + {type = "item", name = "nullius-box-lamp-1", amount = 2} }, - result = "nullius-box-train-stop" + results = { + {type="item", name="nullius-box-train-stop", amount = 1} + } }, { type = "recipe", name = "nullius-rail-signal", + localised_name = {"entity-name.rail-signal"}, enabled = false, - always_show_made_in = true, - show_amount_in_title = false, + always_show_made_in = true, + show_amount_in_title = false, always_show_products = true, category = "small-crafting", energy_required = 8, ingredients = { - {"decider-combinator", 1}, - {"small-lamp", 3}, - {"nullius-sensor-1", 1}, - {"power-switch", 1} + {type = "item", name = "decider-combinator", amount = 1}, + {type = "item", name = "small-lamp", amount = 3}, + {type = "item", name = "nullius-sensor-1", amount = 1}, + {type = "item", name = "power-switch", amount = 1} }, - result = "rail-signal", - result_count = 2 + results = { + {type="item", name="rail-signal", amount = 2} + } }, { type = "recipe", name = "nullius-legacy-rail-signal", enabled = false, - always_show_made_in = true, - hidden = true, + always_show_made_in = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, category = "small-crafting", energy_required = 3, ingredients = { - {"decider-combinator", 1}, - {"small-lamp", 3}, - {"nullius-sensor-1", 1} + {type = "item", name = "decider-combinator", amount = 1}, + {type = "item", name = "small-lamp", amount = 3}, + {type = "item", name = "nullius-sensor-1", amount = 1} }, - result = "rail-signal" + results = { + {type="item", name="rail-signal", amount = 1} + } }, { type = "recipe", name = "nullius-boxed-rail-signal", enabled = false, - always_show_made_in = true, + always_show_made_in = true, category = "large-assembly", subgroup = "boxed-rail", energy_required = 40, ingredients = { - {"nullius-box-logic-circuit", 1}, - {"nullius-box-lamp-1", 3}, - {"nullius-box-sensor-1", 1}, - {"nullius-box-power-switch", 1} + {type = "item", name = "nullius-box-logic-circuit", amount = 1}, + {type = "item", name = "nullius-box-lamp-1", amount = 3}, + {type = "item", name = "nullius-box-sensor-1", amount = 1}, + {type = "item", name = "nullius-box-power-switch", amount = 1} }, - result = "nullius-box-rail-signal", - result_count = 2 + results = { + {type="item", name="nullius-box-rail-signal", amount = 2} + } }, { type = "recipe", name = "nullius-legacy-boxed-rail-signal", enabled = false, - always_show_made_in = true, - hidden = true, + always_show_made_in = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, category = "large-assembly", subgroup = "boxed-rail", energy_required = 15, ingredients = { - {"nullius-box-logic-circuit", 1}, - {"nullius-box-lamp-1", 3}, - {"nullius-box-sensor-1", 1} + {type = "item", name = "nullius-box-logic-circuit", amount = 1}, + {type = "item", name = "nullius-box-lamp-1", amount = 3}, + {type = "item", name = "nullius-box-sensor-1", amount = 1} }, - result = "nullius-box-rail-signal" + results = { + {type="item", name="nullius-box-rail-signal", amount = 1} + } }, { type = "recipe", name = "nullius-chain-signal", + localised_name = {"entity-name.rail-chain-signal"}, enabled = false, category = "small-crafting", always_show_made_in = true, energy_required = 2, ingredients = { - {"rail-signal", 1}, - {"copper-cable", 2} + {type = "item", name = "rail-signal", amount = 1}, + {type = "item", name = "copper-cable", amount = 2} }, - result = "rail-chain-signal" + results = { + {type="item", name="rail-chain-signal", amount = 1} + } }, { type = "recipe", @@ -967,26 +1062,31 @@ data:extend({ always_show_made_in = true, energy_required = 10, ingredients = { - {"nullius-box-rail-signal", 1}, - {"nullius-box-insulated-wire", 2} + {type = "item", name = "nullius-box-rail-signal", amount = 1}, + {type = "item", name = "nullius-box-insulated-wire", amount = 2} }, - result = "nullius-box-chain-signal" + results = { + {type="item", name="nullius-box-chain-signal", amount = 1} + } }, { type = "recipe", name = "nullius-power-switch", + localised_name = {"entity-name.power-switch"}, enabled = false, category = "small-crafting", always_show_made_in = true, energy_required = 3, ingredients = { - {"copper-cable", 2}, - {"nullius-steel-sheet", 1}, - {"nullius-rubber", 1}, - {"nullius-iron-rod", 1} + {type = "item", name = "copper-cable", amount = 2}, + {type = "item", name = "nullius-steel-sheet", amount = 1}, + {type = "item", name = "nullius-rubber", amount = 1}, + {type = "item", name = "nullius-iron-rod", amount = 1} }, - result = "power-switch" + results = { + {type="item", name="power-switch", amount = 1} + } }, { type = "recipe", @@ -997,12 +1097,14 @@ data:extend({ always_show_made_in = true, energy_required = 15, ingredients = { - {"nullius-box-insulated-wire", 2}, - {"nullius-box-steel-sheet", 1}, - {"nullius-box-rubber", 1}, - {"nullius-box-iron-rod", 1} + {type = "item", name = "nullius-box-insulated-wire", amount = 2}, + {type = "item", name = "nullius-box-steel-sheet", amount = 1}, + {type = "item", name = "nullius-box-rubber", amount = 1}, + {type = "item", name = "nullius-box-iron-rod", amount = 1} }, - result = "nullius-box-power-switch" + results = { + {type="item", name="nullius-box-power-switch", amount = 1} + } }, { type = "recipe", @@ -1014,11 +1116,12 @@ data:extend({ always_show_products = true, energy_required = 10, ingredients = { - {"copper-cable", 5}, - {"decider-combinator", 1} + {type = "item", name = "copper-cable", amount = 5}, + {type = "item", name = "decider-combinator", amount = 1} }, - result = "red-wire", - result_count = 8 + results = { + {type="item", name="nullius-red-wire", amount = 8} + } }, { type = "recipe", @@ -1031,11 +1134,12 @@ data:extend({ always_show_products = true, energy_required = 50, ingredients = { - {"nullius-box-insulated-wire", 5}, - {"nullius-box-logic-circuit", 1} + {type = "item", name = "nullius-box-insulated-wire", amount = 5}, + {type = "item", name = "nullius-box-logic-circuit", amount = 1} }, - result = "nullius-box-red-wire", - result_count = 8 + results = { + {type="item", name="nullius-box-red-wire", amount = 8} + } }, { type = "recipe", @@ -1047,10 +1151,11 @@ data:extend({ always_show_products = true, energy_required = 3, ingredients = { - {"red-wire", 5} + {type = "item", name = "nullius-red-wire", amount = 5} }, - result = "green-wire", - result_count = 4 + results = { + {type="item", name="nullius-green-wire", amount = 4} + } }, { type = "recipe", @@ -1063,26 +1168,30 @@ data:extend({ always_show_products = true, energy_required = 15, ingredients = { - {"nullius-box-red-wire", 5} + {type = "item", name = "nullius-box-red-wire", amount = 5} }, - result = "nullius-box-green-wire", - result_count = 4 + results = { + {type="item", name="nullius-box-green-wire", amount = 4} + } }, { type = "recipe", name = "nullius-wall", + localised_name = {"entity-name.stone-wall"}, enabled = false, category = "large-crafting", always_show_made_in = true, energy_required = 4, ingredients = { - {"refined-concrete", 4}, - {"nullius-steel-beam", 3}, - {"nullius-insulation", 1}, - {"nullius-mortar", 1} + {type = "item", name = "refined-concrete", amount = 4}, + {type = "item", name = "nullius-steel-beam", amount = 3}, + {type = "item", name = "nullius-insulation", amount = 1}, + {type = "item", name = "nullius-mortar", amount = 1} }, - result = "stone-wall" + results = { + {type="item", name="stone-wall", amount = 1} + } }, { type = "recipe", @@ -1093,29 +1202,34 @@ data:extend({ always_show_made_in = true, energy_required = 20, ingredients = { - {"nullius-box-reinforced-concrete", 2}, - {"nullius-box-steel-beam", 3}, - {"nullius-box-insulation", 1}, - {"nullius-mortar", 5} + {type = "item", name = "nullius-box-reinforced-concrete", amount = 2}, + {type = "item", name = "nullius-box-steel-beam", amount = 3}, + {type = "item", name = "nullius-box-insulation", amount = 1}, + {type = "item", name = "nullius-mortar", amount = 5} }, - result = "nullius-box-wall" + results = { + {type="item", name="nullius-box-wall", amount = 1} + } }, { type = "recipe", name = "nullius-gate", + localised_name = {"entity-name.gate"}, enabled = false, category = "large-crafting", always_show_made_in = true, energy_required = 5, ingredients = { - {"stone-wall", 1}, - {"nullius-steel-plate", 2}, - {"nullius-steel-gear", 1}, - {"nullius-motor-2", 1}, - {"nullius-sensor-1", 1}, - {"rail-signal", 1} + {type = "item", name = "stone-wall", amount = 1}, + {type = "item", name = "nullius-steel-plate", amount = 2}, + {type = "item", name = "nullius-steel-gear", amount = 1}, + {type = "item", name = "nullius-motor-2", amount = 1}, + {type = "item", name = "nullius-sensor-1", amount = 1}, + {type = "item", name = "rail-signal", amount = 1} }, - result = "gate" + results = { + {type="item", name="gate", amount = 1} + } }, { type = "recipe", @@ -1126,30 +1240,32 @@ data:extend({ always_show_made_in = true, energy_required = 25, ingredients = { - {"nullius-box-wall", 1}, - {"nullius-box-steel-plate", 2}, - {"nullius-box-steel-gear", 1}, - {"nullius-box-motor-2", 1}, - {"nullius-box-sensor-1", 1}, - {"nullius-box-rail-signal", 1} + {type = "item", name = "nullius-box-wall", amount = 1}, + {type = "item", name = "nullius-box-steel-plate", amount = 2}, + {type = "item", name = "nullius-box-steel-gear", amount = 1}, + {type = "item", name = "nullius-box-motor-2", amount = 1}, + {type = "item", name = "nullius-box-sensor-1", amount = 1}, + {type = "item", name = "nullius-box-rail-signal", amount = 1} }, - result = "nullius-box-gate" + results = { + {type="item", name="nullius-box-gate", amount = 1} + } }, { type = "recipe", name = "nullius-barrel-1", - localised_name = {"", {"item-name.empty-barrel"}, " ", 1}, + localised_name = {"", {"item-name.barrel"}, " ", tostring(1)}, icons = { { icon = "__base__/graphics/icons/fluid/barreling/empty-barrel.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelssmelting__/graphics/icons/ingot-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-steel.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.3, shift = {8, -9} } @@ -1168,13 +1284,14 @@ data:extend({ {type="item", name="nullius-plastic", amount=1}, {type="item", name="nullius-one-way-valve", amount=1} }, - result = "empty-barrel", - result_count = 3 + results = { + {type="item", name="barrel", amount = 3} + } }, { type = "recipe", name = "nullius-boxed-barrel-1", - localised_name = {"", {"item-name.nullius-box", {"item-name.empty-barrel"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.barrel"}}, " ", tostring(1)}, icons = { { icon = ICONPATH .. "crate.png", @@ -1183,13 +1300,13 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/barreling/empty-barrel.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { - icon = "__angelssmelting__/graphics/icons/ingot-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-steel.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.27, shift = {7, -8} } @@ -1208,13 +1325,14 @@ data:extend({ {type="item", name="nullius-box-plastic", amount=1}, {type="item", name="nullius-box-one-way-valve", amount=1} }, - result = "nullius-box-barrel", - result_count = 3 + results = { + {type="item", name="nullius-box-barrel", amount = 3} + } }, { type = "recipe", name = "nullius-barrel-2", - localised_name = {"", {"item-name.empty-barrel"}, " ", 2}, + localised_name = {"", {"item-name.barrel"}, " ", tostring(2)}, enabled = false, category = "hand-casting", subgroup = "canisters", @@ -1223,22 +1341,24 @@ data:extend({ allow_decomposition = false, show_amount_in_title = false, always_show_products = true, + hide_from_signal_gui = false, -- todo: proper icon energy_required = 6, ingredients = { {type="item", name="nullius-small-tank-1", amount=1}, {type="item", name="nullius-one-way-valve", amount=3} }, - result = "empty-barrel", - result_count = 6 + results = { + {type="item", name="barrel", amount = 6} + } }, { type = "recipe", name = "nullius-boxed-barrel-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.empty-barrel"}}, " ", 2}, + localised_name = {"", {"item-name.nullius-box", {"item-name.barrel"}}, " ", tostring(2)}, enabled = false, category = "machine-casting", subgroup = "boxed-canister", - order = "nullius-bc", + order = "nullius-bc", always_show_made_in = true, allow_decomposition = false, show_amount_in_title = false, @@ -1248,8 +1368,9 @@ data:extend({ {type="item", name="nullius-box-small-tank-1", amount=1}, {type="item", name="nullius-box-one-way-valve", amount=3} }, - result = "nullius-box-barrel", - result_count = 6 + results = { + {type="item", name="nullius-box-barrel", amount = 6} + } }, { type = "recipe", @@ -1257,10 +1378,10 @@ data:extend({ localised_name = {"recipe-name.nullius-barrel-recycling"}, icon = "__base__/graphics/icons/fluid/barreling/barrel-empty.png", icon_size = 64, - icon_mipmaps = 4, + enabled = false, category = "hand-casting", - subgroup = "canister-emptying", + subgroup = "canister-emptying", order = "nullius-b", always_show_made_in = true, no_productivity = true, @@ -1268,7 +1389,7 @@ data:extend({ allow_as_intermediate = false, energy_required = 2, ingredients = { - {type="item", name="empty-barrel", amount=6} + {type="item", name="barrel", amount=6} }, results = { {type="item", name="nullius-iron-ingot", amount=1}, @@ -1280,7 +1401,7 @@ data:extend({ { type = "recipe", name = "nullius-legacy-barrel-1", - localised_name = {"", {"item-name.empty-barrel"}, " ", 1}, + localised_name = {"", {"item-name.barrel"}, " ", tostring(1)}, enabled = false, category = "large-crafting", subgroup = "canisters", @@ -1288,7 +1409,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, energy_required = 5, @@ -1296,21 +1417,22 @@ data:extend({ {type="item", name="nullius-small-tank-1", amount=1}, {type="item", name="nullius-one-way-valve", amount=3} }, - result = "empty-barrel", - result_count = 6 + results = { + {type="item", name="barrel", amount = 6} + } }, { type = "recipe", name = "nullius-legacy-boxed-barrel-1", - localised_name = {"", {"item-name.nullius-box", {"item-name.empty-barrel"}}, " ", 1}, + localised_name = {"", {"item-name.nullius-box", {"item-name.barrel"}}, " ", tostring(1)}, enabled = false, category = "huge-assembly", subgroup = "boxed-canister", - order = "nullius-bb", + order = "nullius-bb", always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, energy_required = 25, @@ -1318,23 +1440,24 @@ data:extend({ {type="item", name="nullius-box-small-tank-1", amount=1}, {type="item", name="nullius-box-one-way-valve", amount=3} }, - result = "nullius-box-barrel", - result_count = 6 + results = { + {type="item", name="nullius-box-barrel", amount = 6} + } }, { type = "recipe", name = "nullius-legacy-barrel-2", - localised_name = {"", {"item-name.empty-barrel"}, " ", 2}, - icons = { + localised_name = {"", {"item-name.barrel"}, " ", tostring(2)}, + icons = { { icon = "__base__/graphics/icons/fluid/barreling/empty-barrel.png", icon_size = 64, - icon_mipmaps = 4 + }, { - icon = "__angelssmelting__/graphics/icons/ingot-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-steel.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.3, shift = {8, -9} } @@ -1346,7 +1469,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, energy_required = 4, @@ -1355,14 +1478,15 @@ data:extend({ {type="item", name="nullius-plastic", amount=1}, {type="item", name="nullius-one-way-valve", amount=1} }, - result = "empty-barrel", - result_count = 3 + results = { + {type="item", name="barrel", amount = 3} + } }, { type = "recipe", name = "nullius-legacy-boxed-barrel-2", - localised_name = {"", {"item-name.nullius-box", {"item-name.empty-barrel"}}, " ", 2}, - icons = { + localised_name = {"", {"item-name.nullius-box", {"item-name.barrel"}}, " ", tostring(2)}, + icons = { { icon = ICONPATH .. "crate.png", icon_size = 64 @@ -1370,13 +1494,11 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/barreling/empty-barrel.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.45 + scale = 0.45 }, { - icon = "__angelssmelting__/graphics/icons/ingot-steel.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ingot-steel.png", icon_size = 64, - icon_mipmaps = 4, scale = 0.27, shift = {7, -8} } @@ -1388,7 +1510,7 @@ data:extend({ always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - hidden = true, + hidden = true, allow_decomposition = false, allow_as_intermediate = false, energy_required = 20, @@ -1397,8 +1519,9 @@ data:extend({ {type="item", name="nullius-box-plastic", amount=1}, {type="item", name="nullius-box-one-way-valve", amount=1} }, - result = "nullius-box-barrel", - result_count = 3 + results = { + {type="item", name="nullius-box-barrel", amount = 3} + } }, { type = "recipe", @@ -1406,10 +1529,10 @@ data:extend({ localised_name = {"recipe-name.nullius-barrel-recycling"}, icon = "__base__/graphics/icons/fluid/barreling/barrel-empty.png", icon_size = 64, - icon_mipmaps = 4, + enabled = false, category = "medium-crafting", - subgroup = "canister-emptying", + subgroup = "canister-emptying", order = "nullius-b", always_show_made_in = true, no_productivity = true, @@ -1418,7 +1541,7 @@ data:extend({ allow_as_intermediate = false, energy_required = 2, ingredients = { - {type="item", name="empty-barrel", amount=5} + {type="item", name="barrel", amount=5} }, results = { {type="item", name="nullius-iron-ingot", amount=1}, @@ -1431,25 +1554,25 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == false then data:extend({ { type = "item", - name = "turbo-inserter", + name = "bob-turbo-inserter", localised_name = {"entity-name.nullius-inserter-2"}, icon = "__base__/graphics/icons/fast-inserter.png", - icon_size = 64, icon_mipmaps = 4, + icon_size = 64, subgroup = "inserter", order = "nullius-c", - place_result = "turbo-inserter", + place_result = "bob-turbo-inserter", stack_size = 100 }, - { - type = "item", - name = "turbo-filter-inserter", - localised_name = {"entity-name.nullius-filter-inserter-2"}, - icon = "__base__/graphics/icons/filter-inserter.png", - icon_size = 64, icon_mipmaps = 4, - subgroup = "inserter", - order = "nullius-d", - place_result = "turbo-filter-inserter", - stack_size = 100 - } + -- { + -- type = "item", + -- name = "turbo-filter-inserter", + -- localised_name = {"entity-name.nullius-filter-inserter-2"}, + -- icon = "__base__/graphics/icons/filter-inserter.png", + -- icon_size = 64, + -- subgroup = "inserter", + -- order = "nullius-d", + -- place_result = "turbo-filter-inserter", + -- stack_size = 100 + -- } }) end diff --git a/nullius/prototypes/item/turbine.lua b/nullius/prototypes/item/turbine.lua index b752918..0f7bda2 100644 --- a/nullius/prototypes/item/turbine.lua +++ b/nullius/prototypes/item/turbine.lua @@ -3,19 +3,22 @@ local function create_turbine_recipe(fluidname, exhaust, energy, counto, countc, local fluid = data.raw.fluid[fullfluid] local energycounto = math.floor(((energy * counto) / 10) + 0.5) local energycountc = math.floor(((energy * countc) / 10) + 0.5) + local localIcons = fluid.icons + if fluid.icon then + localIcons = {{icon = fluid.icon, icon_size = fluid.icon_size}} + end local open = { type = "recipe", - name = "nullius-burn-open-" .. fluidname, - localised_name = {"recipe-name.nullius-turbine-burn-open", {"fluid-name."..fullfluid}}, - icons = fluid.icons, - icon = fluid.icon, - icon_size = fluid.icon_size, - icon_mipmaps = fluid.icon_mipmaps, - crafting_machine_tint = { primary = fluid.flow_color }, + name = "nullius-burn-open-" .. fluidname, + localised_name = {"recipe-name.nullius-turbine-burn-open", {"fluid-name."..fullfluid}}, + icons = localIcons, + -- icon = fluid.icon, + -- icon_size = fluid.icon_size, + crafting_machine_tint = { primary = fluid.flow_color }, category = "turbine-open", subgroup = "turbine-open", hide_from_player_crafting = true, - hide_from_stats = true, + hide_from_stats = true, energy_required = 1.8, ingredients = {{type="fluid", name=fullfluid, amount=counto}}, results = {{type="fluid", name="nullius-energy", amount=energycounto}} @@ -59,26 +62,24 @@ data:extend({ { type = "item", name = "nullius-turbine-open-1", - localised_name = {"", {"entity-name.nullius-turbine-open"}, " ", 1}, - localised_description = {"entity-description.nullius-turbine-info", - 1, 90, {"entity-description.nullius-turbine-item", + localised_name = {"", {"entity-name.nullius-turbine-open"}, " ", tostring(1)}, + localised_description = {"entity-description.nullius-turbine-info", + tostring(1), tostring(90), {"entity-description.nullius-turbine-item", {"entity-description.nullius-turbine-open"}}}, icons = { - { - icon = "__base__/graphics/icons/steam-turbine.png", - icon_size = 64, - icon_mipmaps = 4, + { + icon = "__base__/graphics/icons/steam-turbine.png", + icon_size = 64, tint = {0.7, 0.7, 0.6, 1} }, - { + { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.32, + scale = 0.32, shift = {1, -8}, tint = {0.75, 0.75, 0.75, 0.8} } - }, + }, subgroup = "energy-backup", order = "nullius-fbb", place_result = "nullius-turbine-open-standard-1", @@ -87,26 +88,24 @@ data:extend({ { type = "item", name = "nullius-turbine-open-2", - localised_name = {"", {"entity-name.nullius-turbine-open"}, " ", 2}, - localised_description = {"entity-description.nullius-turbine-info", - 2.5, 95, {"entity-description.nullius-turbine-item", + localised_name = {"", {"entity-name.nullius-turbine-open"}, " ", tostring(2)}, + localised_description = {"entity-description.nullius-turbine-info", + tostring(2.5), tostring(95), {"entity-description.nullius-turbine-item", {"entity-description.nullius-turbine-open"}}}, icons = { - { - icon = "__base__/graphics/icons/steam-turbine.png", + { + icon = "__base__/graphics/icons/steam-turbine.png", icon_size = 64, - icon_mipmaps = 4, tint = {0.85, 0.85, 0.75, 1} }, - { + { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.32, + scale = 0.32, shift = {1, -8}, tint = {0.8, 0.8, 0.8, 0.82} } - }, + }, subgroup = "energy-backup", order = "nullius-fbc", place_result = "nullius-turbine-open-standard-2", @@ -115,26 +114,24 @@ data:extend({ { type = "item", name = "nullius-turbine-open-3", - localised_name = {"", {"entity-name.nullius-turbine-open"}, " ", 3}, - localised_description = {"entity-description.nullius-turbine-info", - 6, 100, {"entity-description.nullius-turbine-item", + localised_name = {"", {"entity-name.nullius-turbine-open"}, " ", tostring(3)}, + localised_description = {"entity-description.nullius-turbine-info", + tostring(6), tostring(100), {"entity-description.nullius-turbine-item", {"entity-description.nullius-turbine-open"}}}, icons = { - { - icon = "__base__/graphics/icons/steam-turbine.png", + { + icon = "__base__/graphics/icons/steam-turbine.png", icon_size = 64, - icon_mipmaps = 4, tint = {1, 1, 0.9, 1} }, - { + { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, - scale = 0.32, + scale = 0.32, shift = {1, -8}, tint = {0.85, 0.85, 0.85, 0.85} } - }, + }, subgroup = "energy-backup", order = "nullius-fbd", place_result = "nullius-turbine-open-standard-3", @@ -143,14 +140,13 @@ data:extend({ { type = "item", name = "nullius-turbine-closed-1", - localised_name = {"", {"entity-name.nullius-turbine-closed"}, " ", 1}, - localised_description = {"entity-description.nullius-turbine-info", - 1, 85, {"entity-description.nullius-turbine-item", + localised_name = {"", {"entity-name.nullius-turbine-closed"}, " ", tostring(1)}, + localised_description = {"entity-description.nullius-turbine-info", + tostring(1), tostring(85), {"entity-description.nullius-turbine-item", {"entity-description.nullius-turbine-closed"}}}, icons = {{ - icon = "__base__/graphics/icons/steam-turbine.png", + icon = "__base__/graphics/icons/steam-turbine.png", icon_size = 64, - icon_mipmaps = 4, tint = {0.6, 0.6, 0.7, 1} }}, subgroup = "energy-backup", @@ -161,14 +157,13 @@ data:extend({ { type = "item", name = "nullius-turbine-closed-2", - localised_name = {"", {"entity-name.nullius-turbine-closed"}, " ", 2}, - localised_description = {"entity-description.nullius-turbine-info", - 2.5, 90, {"entity-description.nullius-turbine-item", + localised_name = {"", {"entity-name.nullius-turbine-closed"}, " ", tostring(2)}, + localised_description = {"entity-description.nullius-turbine-info", + tostring(2.5), tostring(90), {"entity-description.nullius-turbine-item", {"entity-description.nullius-turbine-closed"}}}, icons = {{ - icon = "__base__/graphics/icons/steam-turbine.png", + icon = "__base__/graphics/icons/steam-turbine.png", icon_size = 64, - icon_mipmaps = 4, tint = {0.75, 0.75, 0.85, 1} }}, subgroup = "energy-backup", @@ -179,14 +174,13 @@ data:extend({ { type = "item", name = "nullius-turbine-closed-3", - localised_name = {"", {"entity-name.nullius-turbine-closed"}, " ", 3}, - localised_description = {"entity-description.nullius-turbine-info", - 6, 95, {"entity-description.nullius-turbine-item", + localised_name = {"", {"entity-name.nullius-turbine-closed"}, " ", tostring(3)}, + localised_description = {"entity-description.nullius-turbine-info", + tostring(6), tostring(95), {"entity-description.nullius-turbine-item", {"entity-description.nullius-turbine-closed"}}}, icons = {{ - icon = "__base__/graphics/icons/steam-turbine.png", + icon = "__base__/graphics/icons/steam-turbine.png", icon_size = 64, - icon_mipmaps = 4, tint = {0.9, 0.9, 1, 1} }}, subgroup = "energy-backup", @@ -203,12 +197,14 @@ data:extend({ always_show_made_in = true, energy_required = 8, ingredients = { - {"nullius-motor-1", 1}, - {"nullius-iron-sheet", 2}, - {"nullius-iron-gear", 1}, - {"pipe", 2} + {type = "item", name = "nullius-motor-1", amount = 1}, + {type = "item", name = "nullius-iron-sheet", amount = 2}, + {type = "item", name = "nullius-iron-gear", amount = 1}, + {type = "item", name = "pipe", amount = 2} }, - result = "nullius-turbine-open-1" + results = { + {type = "item", name = "nullius-turbine-open-1", amount = 1} + } }, { type = "recipe", @@ -219,12 +215,14 @@ data:extend({ always_show_made_in = true, energy_required = 40, ingredients = { - {"nullius-box-motor-1", 1}, - {"nullius-box-iron-sheet", 2}, - {"nullius-box-iron-gear", 1}, - {"nullius-box-pipe-1", 2} + {type = "item", name = "nullius-box-motor-1", amount = 1}, + {type = "item", name = "nullius-box-iron-sheet", amount = 2}, + {type = "item", name = "nullius-box-iron-gear", amount = 1}, + {type = "item", name = "nullius-box-pipe-1", amount = 2} }, - result = "nullius-box-turbine-open-1" + results = { + {type = "item", name = "nullius-box-turbine-open-1", amount = 1} + } }, { type = "recipe", @@ -234,11 +232,13 @@ data:extend({ category = "large-crafting", energy_required = 4, ingredients = { - {"nullius-turbine-open-1", 1}, - {"nullius-small-tank-1", 1}, - {"nullius-top-up-valve", 1} + {type = "item", name = "nullius-turbine-open-1", amount = 1}, + {type = "item", name = "nullius-small-tank-1", amount = 1}, + {type = "item", name = "nullius-top-up-valve", amount = 1} }, - result = "nullius-turbine-closed-1" + results = { + {type = "item", name = "nullius-turbine-closed-1", amount = 1} + } }, { type = "recipe", @@ -249,11 +249,13 @@ data:extend({ subgroup = "boxed-fluid-energy", energy_required = 20, ingredients = { - {"nullius-box-turbine-open-1", 1}, - {"nullius-box-small-tank-1", 1}, - {"nullius-box-top-up-valve", 1} + {type = "item", name = "nullius-box-turbine-open-1", amount = 1}, + {type = "item", name = "nullius-box-small-tank-1", amount = 1}, + {type = "item", name = "nullius-box-top-up-valve", amount = 1} }, - result = "nullius-box-turbine-closed-1" + results = { + {type = "item", name = "nullius-box-turbine-closed-1", amount = 1} + } }, { type = "recipe", @@ -263,13 +265,15 @@ data:extend({ category = "large-crafting", energy_required = 16, ingredients = { - {"nullius-turbine-open-1", 2}, - {"nullius-pump-2", 1}, - {"nullius-aluminum-sheet", 6}, - {"nullius-steel-gear", 3}, - {"nullius-capacitor", 1} + {type = "item", name = "nullius-turbine-open-1", amount = 2}, + {type = "item", name = "nullius-pump-2", amount = 1}, + {type = "item", name = "nullius-aluminum-sheet", amount = 6}, + {type = "item", name = "nullius-steel-gear", amount = 3}, + {type = "item", name = "nullius-capacitor", amount = 1} }, - result = "nullius-turbine-open-2" + results = { + {type = "item", name = "nullius-turbine-open-2", amount = 1} + } }, { type = "recipe", @@ -280,13 +284,15 @@ data:extend({ subgroup = "boxed-fluid-energy", energy_required = 80, ingredients = { - {"nullius-box-turbine-open-1", 2}, - {"nullius-box-pump-2", 1}, - {"nullius-box-aluminum-sheet", 6}, - {"nullius-box-steel-gear", 3}, - {"nullius-box-capacitor", 1} + {type = "item", name = "nullius-box-turbine-open-1", amount = 2}, + {type = "item", name = "nullius-box-pump-2", amount = 1}, + {type = "item", name = "nullius-box-aluminum-sheet", amount = 6}, + {type = "item", name = "nullius-box-steel-gear", amount = 3}, + {type = "item", name = "nullius-box-capacitor", amount = 1} }, - result = "nullius-box-turbine-open-2" + results = { + {type = "item", name = "nullius-box-turbine-open-2", amount = 1} + } }, { type = "recipe", @@ -296,11 +302,13 @@ data:extend({ category = "large-crafting", energy_required = 10, ingredients = { - {"nullius-turbine-open-2", 1}, - {"nullius-turbine-closed-1", 1}, - {"nullius-small-pump-1", 1} + {type = "item", name = "nullius-turbine-open-2", amount = 1}, + {type = "item", name = "nullius-turbine-closed-1", amount = 1}, + {type = "item", name = "nullius-small-pump-1", amount = 1} }, - result = "nullius-turbine-closed-2" + results = { + {type = "item", name = "nullius-turbine-closed-2", amount = 1} + } }, { type = "recipe", @@ -311,11 +319,13 @@ data:extend({ subgroup = "boxed-fluid-energy", energy_required = 50, ingredients = { - {"nullius-box-turbine-open-2", 1}, - {"nullius-box-turbine-closed-1", 1}, - {"nullius-box-small-pump-1", 1} + {type = "item", name = "nullius-box-turbine-open-2", amount = 1}, + {type = "item", name = "nullius-box-turbine-closed-1", amount = 1}, + {type = "item", name = "nullius-box-small-pump-1", amount = 1} }, - result = "nullius-box-turbine-closed-2" + results = { + {type = "item", name = "nullius-box-turbine-closed-2", amount = 1} + } }, { type = "recipe", @@ -325,13 +335,15 @@ data:extend({ category = "large-crafting", energy_required = 40, ingredients = { - {"nullius-turbine-open-2", 2}, - {"pump", 3}, - {"nullius-titanium-sheet", 12}, - {"nullius-bearing", 6}, - {"nullius-transformer", 1} + {type = "item", name = "nullius-turbine-open-2", amount = 2}, + {type = "item", name = "pump", amount = 3}, + {type = "item", name = "nullius-titanium-sheet", amount = 12}, + {type = "item", name = "nullius-bearing", amount = 6}, + {type = "item", name = "nullius-transformer", amount = 1} }, - result = "nullius-turbine-open-3" + results = { + {type = "item", name = "nullius-turbine-open-3", amount = 1} + } }, { type = "recipe", @@ -342,13 +354,15 @@ data:extend({ subgroup = "boxed-fluid-energy", energy_required = 200, ingredients = { - {"nullius-box-turbine-open-2", 2}, - {"nullius-box-pump-3", 3}, - {"nullius-box-titanium-sheet", 12}, - {"nullius-box-bearing", 6}, - {"nullius-box-transformer", 1} + {type = "item", name = "nullius-box-turbine-open-2", amount = 2}, + {type = "item", name = "nullius-box-pump-3", amount = 3}, + {type = "item", name = "nullius-box-titanium-sheet", amount = 12}, + {type = "item", name = "nullius-box-bearing", amount = 6}, + {type = "item", name = "nullius-box-transformer", amount = 1} }, - result = "nullius-box-turbine-open-3" + results = { + {type = "item", name = "nullius-box-turbine-open-3", amount = 1} + } }, { type = "recipe", @@ -358,12 +372,14 @@ data:extend({ category = "large-crafting", energy_required = 20, ingredients = { - {"nullius-turbine-open-3", 1}, - {"nullius-turbine-closed-2", 1}, - {"nullius-small-tank-2", 1}, - {"nullius-small-pump-2", 1} + {type = "item", name = "nullius-turbine-open-3", amount = 1}, + {type = "item", name = "nullius-turbine-closed-2", amount = 1}, + {type = "item", name = "nullius-small-tank-2", amount = 1}, + {type = "item", name = "nullius-small-pump-2", amount = 1} }, - result = "nullius-turbine-closed-3" + results = { + {type = "item", name = "nullius-turbine-closed-3", amount = 1} + } }, { type = "recipe", @@ -374,11 +390,13 @@ data:extend({ subgroup = "boxed-fluid-energy", energy_required = 100, ingredients = { - {"nullius-box-turbine-open-3", 1}, - {"nullius-box-turbine-closed-2", 1}, - {"nullius-box-small-tank-2", 1}, - {"nullius-box-small-pump-2", 1} + {type = "item", name = "nullius-box-turbine-open-3", amount = 1}, + {type = "item", name = "nullius-box-turbine-closed-2", amount = 1}, + {type = "item", name = "nullius-box-small-tank-2", amount = 1}, + {type = "item", name = "nullius-box-small-pump-2", amount = 1} }, - result = "nullius-box-turbine-closed-3" + results = { + {type = "item", name = "nullius-box-turbine-closed-3", amount = 1} + } } }) diff --git a/nullius/prototypes/item/void.lua b/nullius/prototypes/item/void.lua index d184919..e94fad6 100644 --- a/nullius/prototypes/item/void.lua +++ b/nullius/prototypes/item/void.lua @@ -12,7 +12,7 @@ data:extend({ tint = {r=0.7, g=0.7, b=0.7, a=1} } }, - flags = {"hidden"}, + hidden = true, subgroup = "other", stack_size = 100 }, @@ -25,15 +25,15 @@ data:extend({ icon_size = 64 } }, - flags = {"hidden"}, + hidden = true, subgroup = "other", stack_size = 100 }, { type = "item", name = "nullius-power-sink", - icons = data.raw.fluid["nullius-energy"].icons, - flags = {"hidden"}, + icons = data.raw.fluid["nullius-energy"].icons, + hidden = true, subgroup = "other", stack_size = 100 }, @@ -41,8 +41,12 @@ data:extend({ { type = "recipe", name = "nullius-void-seawater", - icon = data.raw.fluid["nullius-seawater"].icon, - icon_size = data.raw.fluid["nullius-seawater"].icon_size, + icons = { + { + icon = data.raw.fluid["nullius-seawater"].icon, + icon_size = data.raw.fluid["nullius-seawater"].icon_size, + } + }, crafting_machine_tint = { primary = data.raw.fluid["nullius-seawater"].flow_color }, category = "nullius-liquid-void", subgroup = "nullius-liquid-void", @@ -55,8 +59,9 @@ data:extend({ { type = "recipe", name = "nullius-void-freshwater", - icon = data.raw.fluid["nullius-freshwater"].icon, - icon_size = data.raw.fluid["nullius-freshwater"].icon_size, + icons = { + { icon = data.raw.fluid["nullius-freshwater"].icon, icon_size = data.raw.fluid["nullius-freshwater"].icon_size} + }, crafting_machine_tint = { primary = data.raw.fluid["nullius-freshwater"].flow_color }, category = "nullius-liquid-void", subgroup = "nullius-liquid-void", @@ -69,8 +74,12 @@ data:extend({ { type = "recipe", name = "nullius-void-wastewater", - icon = data.raw.fluid["nullius-wastewater"].icon, - icon_size = data.raw.fluid["nullius-wastewater"].icon_size, + icons = { + { + icon = data.raw.fluid["nullius-wastewater"].icon, + icon_size = data.raw.fluid["nullius-wastewater"].icon_size, + } + }, crafting_machine_tint = { primary = data.raw.fluid["nullius-wastewater"].flow_color }, category = "nullius-liquid-void", subgroup = "nullius-liquid-void", @@ -83,8 +92,9 @@ data:extend({ { type = "recipe", name = "nullius-void-brine", - icon = data.raw.fluid["nullius-brine"].icon, - icon_size = data.raw.fluid["nullius-brine"].icon_size, + icons = { + { icon = data.raw.fluid["nullius-brine"].icon, icon_size = data.raw.fluid["nullius-brine"].icon_size} + }, crafting_machine_tint = { primary = data.raw.fluid["nullius-brine"].flow_color }, category = "nullius-liquid-void", subgroup = "nullius-liquid-void", @@ -123,9 +133,13 @@ data:extend({ { type = "recipe", name = "nullius-void-water-saline", - icon = data.raw.fluid["nullius-saline"].icon, - icon_size = data.raw.fluid["nullius-saline"].icon_size, - crafting_machine_tint = { primary = data.raw.fluid["water-saline"].flow_color }, + icons = { + { + icon = data.raw.fluid["nullius-saline"].icon, + icon_size = data.raw.fluid["nullius-saline"].icon_size, + } + }, + crafting_machine_tint = { primary = angelsLegacy.functions.flow_color("Ws4NaCl")}, --{r = 0.9, g = 0.9, b = 1} category = "nullius-liquid-void", subgroup = "nullius-liquid-void", hide_from_player_crafting = true, @@ -137,8 +151,12 @@ data:extend({ { type = "recipe", name = "nullius-void-water", - icon = data.raw.fluid["nullius-water"].icon, - icon_size = data.raw.fluid["nullius-water"].icon_size, + icons = { + { + icon = data.raw.fluid["nullius-water"].icon, + icon_size = data.raw.fluid["nullius-water"].icon_size + } + }, crafting_machine_tint = { primary = data.raw.fluid["nullius-water"].flow_color }, category = "nullius-liquid-void", subgroup = "nullius-liquid-void", @@ -203,13 +221,12 @@ data:extend({ { type = "recipe", name = "nullius-void-protocell", - icon = data.raw.fluid["nullius-protocell"].icon, - icon_size = data.raw.fluid["nullius-protocell"].icon_size, + icons = data.raw.fluid["nullius-protocell"].icons, crafting_machine_tint = { primary = data.raw.fluid["nullius-protocell"].flow_color }, category = "nullius-liquid-void", subgroup = "nullius-liquid-void", hide_from_player_crafting = true, - hide_from_stats = true, + hide_from_stats = true, energy_required = 2, ingredients = {{type="fluid", name="nullius-protocell", amount=200}}, results = {{type="item", name="nullius-liquid-void", amount=1, probability=0}} @@ -387,8 +404,12 @@ data:extend({ { type = "recipe", name = "nullius-void-steam", - icon = data.raw.fluid["nullius-steam"].icon, - icon_size = data.raw.fluid["nullius-steam"].icon_size, + icons = { + { + icon = data.raw.fluid["nullius-steam"].icon, + icon_size = data.raw.fluid["nullius-steam"].icon_size + } + }, crafting_machine_tint = { primary = data.raw.fluid["nullius-steam"].flow_color }, category = "nullius-gas-void", subgroup = "nullius-gas-void", @@ -589,10 +610,42 @@ data:extend({ category = "nullius-power-sink", subgroup = "nullius-power-sink", hide_from_player_crafting = true, - hide_from_stats = true, - hidden = true, + hide_from_stats = true, + hidden = true, energy_required = 2.5, ingredients = {{type="fluid", name="nullius-energy", amount=150}}, results = {{type="item", name="nullius-power-sink", amount=1, probability=0}} } }) + +-- Fix localised names and icons for voiding recipes +for _, recipe in pairs(data.raw.recipe) do + if recipe.category == "nullius-liquid-void" then + recipe.localised_name = {"recipe-name.nullius-liquid-void", {"fluid-name."..recipe.ingredients[1].name}} + if recipe.icons ~= nil then + local newIcons = table.deepcopy(recipe.icons) + table.insert(newIcons,{icon = ICONPATH.."red_cross.png", scale=0.6, icon_size=64, shift = {-10,10}, tint = {0.8,0.8,0.8,0.8}}) + recipe.icons = newIcons + end + elseif recipe.category == "nullius-gas-void" then + recipe.localised_name = {"recipe-name.nullius-gas-void", {"fluid-name."..recipe.ingredients[1].name}} + if recipe.icons ~= nil then + local newIcons = table.deepcopy(recipe.icons) + table.insert(newIcons,{icon = ICONPATH.."red_cross.png", scale=0.6, icon_size=64, shift = {-10,10}, tint = {0.8,0.8,0.8,0.8}}) + recipe.icons = newIcons + end + elseif recipe.category == "turbine-open" then --or recipe.category == "turbine-closed" then + if recipe.icons ~= nil then + local newIcons = table.deepcopy(recipe.icons) + table.insert(newIcons,{icon = ICONPATH.."fluid/energy.png", scale=0.6, icon_size=32, shift = {-5,5}}) + table.insert(newIcons,{icon = ICONPATH.."red_cross.png", scale=0.4, icon_size=64, shift = {10,10}}) + recipe.icons = newIcons + end + elseif recipe.category == "turbine-closed" then + if recipe.icons ~= nil then + local newIcons = table.deepcopy(recipe.icons) + table.insert(newIcons,{icon = ICONPATH.."fluid/energy.png", scale=0.6, icon_size=32, shift = {-5,5}}) + recipe.icons = newIcons + end + end +end \ No newline at end of file diff --git a/nullius/prototypes/item/weapon.lua b/nullius/prototypes/item/weapon.lua index 9050fee..0eff602 100644 --- a/nullius/prototypes/item/weapon.lua +++ b/nullius/prototypes/item/weapon.lua @@ -7,8 +7,8 @@ data:extend({ name = "nullius-drone-cannon", icon = "__base__/graphics/icons/artillery-turret.png", icon_size = 64, - icon_mipmaps = 4, - flags = {"hidden"}, + + hidden = true, subgroup = "vehicle-weapon", order = "nullius-xm", stack_size = 1, @@ -18,7 +18,7 @@ data:extend({ "nullius-scout-drone", "nullius-demolition-drone", "nullius-excavation-drone", - "nullius-shallow-excavation-drone", + "nullius-shallow-excavation-drone", "nullius-terraforming-drone-grey", "nullius-terraforming-drone-tan", "nullius-terraforming-drone-brown", @@ -67,8 +67,8 @@ data:extend({ localised_description = {"item-description.nullius-gun"}, icon = "__base__/graphics/icons/submachine-gun.png", icon_size = 64, - icon_mipmaps = 4, - flags = {"hidden"}, + + hidden = true, subgroup = "vehicle-weapon", order = "nullius-xb", stack_size = 1, @@ -99,8 +99,8 @@ data:extend({ localised_description = {"item-description.nullius-gun"}, icon = "__base__/graphics/icons/submachine-gun.png", icon_size = 64, - icon_mipmaps = 4, - flags = {"hidden"}, + + hidden = true, subgroup = "vehicle-weapon", order = "nullius-xb", stack_size = 1, @@ -132,8 +132,8 @@ data:extend({ localised_description = {"item-description.nullius-gun"}, icon = "__base__/graphics/icons/tank-cannon.png", icon_size = 64, - icon_mipmaps = 4, - flags = {"hidden"}, + + hidden = true, subgroup = "vehicle-weapon", order = "nullius-xd", stack_size = 1, @@ -165,8 +165,8 @@ data:extend({ localised_description = {"item-description.nullius-gun"}, icon = "__base__/graphics/icons/tank-cannon.png", icon_size = 64, - icon_mipmaps = 4, - flags = {"hidden"}, + + hidden = true, subgroup = "vehicle-weapon", order = "nullius-xd", stack_size = 1, @@ -199,8 +199,8 @@ data:extend({ localised_description = {"item-description.nullius-gun"}, icon = "__base__/graphics/icons/tank-cannon.png", icon_size = 64, - icon_mipmaps = 4, - flags = {"hidden"}, + + hidden = true, subgroup = "vehicle-weapon", order = "nullius-xf", stack_size = 1, @@ -234,8 +234,8 @@ data:extend({ localised_description = {"item-description.nullius-missile-launcher"}, icon = "__base__/graphics/icons/rocket-launcher.png", icon_size = 64, - icon_mipmaps = 4, - flags = {"hidden"}, + + hidden = true, subgroup = "vehicle-weapon", order = "nullius-xc", stack_size = 1, @@ -258,8 +258,8 @@ data:extend({ localised_description = {"item-description.nullius-missile-launcher"}, icon = "__base__/graphics/icons/rocket-launcher.png", icon_size = 64, - icon_mipmaps = 4, - flags = {"hidden"}, + + hidden = true, subgroup = "vehicle-weapon", order = "nullius-xe", stack_size = 1, @@ -282,8 +282,8 @@ data:extend({ localised_description = {"item-description.nullius-missile-launcher"}, icon = "__base__/graphics/icons/rocket-launcher.png", icon_size = 64, - icon_mipmaps = 4, - flags = {"hidden"}, + + hidden = true, subgroup = "vehicle-weapon", order = "nullius-xg", stack_size = 1, @@ -308,9 +308,9 @@ data:extend({ localised_name = {"item-name.nullius-mecha-drone-launcher"}, icon = "__base__/graphics/icons/artillery-turret.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "vehicle-weapon", - flags = {"hidden"}, + hidden = true, order = "nullius-xmb", attack_parameters = { type = "projectile", @@ -332,9 +332,9 @@ data:extend({ localised_name = {"item-name.nullius-mecha-drone-launcher"}, icon = "__base__/graphics/icons/artillery-turret.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "vehicle-weapon", - flags = {"hidden"}, + hidden = true, order = "nullius-xmc", attack_parameters = { type = "projectile", @@ -356,7 +356,7 @@ data:extend({ name = "nullius-gun", icon = "__base__/graphics/icons/pistol.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "demolitions", order = "nullius-cb", stack_size = 10, @@ -388,12 +388,14 @@ data:extend({ always_show_made_in = true, energy_required = 10, ingredients = { - {"nullius-steel-plate", 6}, - {"nullius-steel-wire", 2}, - {"nullius-steel-gear", 1}, - {"nullius-rubber", 1} + {type = "item", name = "nullius-steel-plate", amount = 6}, + {type = "item", name = "nullius-steel-wire", amount = 2}, + {type = "item", name = "nullius-steel-gear", amount = 1}, + {type = "item", name = "nullius-rubber", amount = 1} }, - result = "nullius-gun" + results = { + {type="item", name="nullius-gun", amount = 1} + } }, { @@ -401,7 +403,7 @@ data:extend({ name = "nullius-rifle", icon = "__base__/graphics/icons/submachine-gun.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "demolitions", order = "nullius-cc", stack_size = 5, @@ -433,12 +435,14 @@ data:extend({ category = "small-crafting", energy_required = 30, ingredients = { - {"nullius-gun", 2}, - {"nullius-titanium-plate", 4}, - {"nullius-motor-3", 1}, - {"nullius-sensor-2", 1} + {type = "item", name = "nullius-gun", amount = 2}, + {type = "item", name = "nullius-titanium-plate", amount = 4}, + {type = "item", name = "nullius-motor-3", amount = 1}, + {type = "item", name = "nullius-sensor-2", amount = 1} }, - result = "nullius-rifle" + results = { + {type="item", name="nullius-rifle", amount = 1} + } }, { @@ -446,7 +450,7 @@ data:extend({ name = "nullius-missile-launcher", icon = "__base__/graphics/icons/rocket-launcher.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "demolitions", order = "nullius-d", stack_size = 10, @@ -469,11 +473,13 @@ data:extend({ always_show_made_in = true, energy_required = 5, ingredients = { - {"nullius-gun", 1}, - {"nullius-pipe-2", 3}, - {"nullius-sensor-1", 1} + {type = "item", name = "nullius-gun", amount = 1}, + {type = "item", name = "nullius-pipe-2", amount = 3}, + {type = "item", name = "nullius-sensor-1", amount = 1} }, - result = "nullius-missile-launcher" + results = { + {type="item", name="nullius-missile-launcher", amount = 1} + } }, { @@ -481,12 +487,12 @@ data:extend({ name = "nullius-missile-1", icon = "__base__/graphics/icons/explosive-rocket.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "demolitions", order = "nullius-fb", stack_size = 100, + ammo_category = "rocket", ammo_type = { - category = "rocket", target_type = "position", action = { type = "direct", @@ -512,15 +518,16 @@ data:extend({ always_show_made_in = true, energy_required = 3, ingredients = { - {"cliff-explosives", 5}, - {"nullius-steel-sheet", 3}, - {"processed-fuel", 1}, - {"nullius-sensor-1", 1}, - {"nullius-battery-1", 1}, - {"nullius-motor-2", 1} + {type = "item", name = "cliff-explosives", amount = 5}, + {type = "item", name = "nullius-steel-sheet", amount = 3}, + {type = "item", name = "processed-fuel", amount = 1}, + {type = "item", name = "nullius-sensor-1", amount = 1}, + {type = "item", name = "nullius-battery-1", amount = 1}, + {type = "item", name = "nullius-motor-2", amount = 1} }, - result = "nullius-missile-1", - result_count = 6 + results = { + {type="item", name="nullius-missile-1", amount = 6} + } }, { type = "recipe", @@ -533,15 +540,16 @@ data:extend({ always_show_made_in = true, energy_required = 15, ingredients = { - {"nullius-box-explosive", 5}, - {"nullius-box-steel-sheet", 3}, - {"nullius-box-methanol-canister", 1}, - {"nullius-box-sensor-1", 1}, - {"nullius-box-battery-1", 1}, - {"nullius-box-motor-2", 1} + {type = "item", name = "nullius-box-explosive", amount = 5}, + {type = "item", name = "nullius-box-steel-sheet", amount = 3}, + {type = "item", name = "nullius-box-methanol-canister", amount = 1}, + {type = "item", name = "nullius-box-sensor-1", amount = 1}, + {type = "item", name = "nullius-box-battery-1", amount = 1}, + {type = "item", name = "nullius-box-motor-2", amount = 1} }, - result = "nullius-box-missile-1", - result_count = 6 + results = { + {type="item", name="nullius-box-missile-1", amount = 6} + } }, { @@ -549,12 +557,12 @@ data:extend({ name = "nullius-missile-2", icon = "__base__/graphics/icons/atomic-bomb.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "demolitions", order = "nullius-fc", stack_size = 100, + ammo_category = "rocket", ammo_type = { - category = "rocket", target_type = "position", action = { type = "direct", @@ -580,13 +588,15 @@ data:extend({ category = "small-crafting", energy_required = 10, ingredients = { - {"nullius-missile-1", 3}, - {"nullius-titanium-sheet", 5}, - {"nullius-fusion-cell", 1}, - {"nullius-sensor-2", 1}, - {"nullius-yield-module-2", 1} + {type = "item", name = "nullius-missile-1", amount = 3}, + {type = "item", name = "nullius-titanium-sheet", amount = 5}, + {type = "item", name = "nullius-fusion-cell", amount = 1}, + {type = "item", name = "nullius-sensor-2", amount = 1}, + {type = "item", name = "nullius-yield-module-2", amount = 1} }, - result = "nullius-missile-2" + results = { + {type="item", name="nullius-missile-2", amount = 1} + } }, { type = "recipe", @@ -599,28 +609,30 @@ data:extend({ subgroup = "boxed-demolition", energy_required = 10, ingredients = { - {"nullius-box-missile-1", 3}, - {"nullius-box-titanium-sheet", 5}, - {"nullius-fusion-cell", 5}, - {"nullius-box-sensor-2", 1}, - {"nullius-box-yield-module-2", 1} + {type = "item", name = "nullius-box-missile-1", amount = 3}, + {type = "item", name = "nullius-box-titanium-sheet", amount = 5}, + {type = "item", name = "nullius-fusion-cell", amount = 5}, + {type = "item", name = "nullius-box-sensor-2", amount = 1}, + {type = "item", name = "nullius-box-yield-module-2", amount = 1} }, - result = "nullius-box-missile-2" + results = { + {type="item", name="nullius-box-missile-2", amount = 1} + } }, { type = "ammo", name = "nullius-magazine", - localised_name = {"", {"item-name.nullius-magazine"}, " ", 1}, + localised_name = {"", {"item-name.nullius-magazine"}, " ", tostring(1)}, icon = "__base__/graphics/icons/piercing-rounds-magazine.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "demolitions", order = "nullius-eb", stack_size = 200, magazine_size = 10, + ammo_category = "bullet", ammo_type = { - category = "bullet", target_type = "position", action = { { @@ -666,16 +678,16 @@ data:extend({ { type = "ammo", name = "nullius-magazine-2", - localised_name = {"", {"item-name.nullius-magazine"}, " ", 2}, + localised_name = {"", {"item-name.nullius-magazine"}, " ", tostring(2)}, icon = "__base__/graphics/icons/uranium-rounds-magazine.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "demolitions", order = "nullius-ec", stack_size = 200, magazine_size = 10, + ammo_category = "bullet", ammo_type = { - category = "bullet", target_type = "position", action = { { @@ -728,11 +740,12 @@ data:extend({ category = "hand-casting", energy_required = 5, ingredients = { - {"cliff-explosives", 1}, - {"nullius-steel-rod", 6} + {type = "item", name = "cliff-explosives", amount = 1}, + {type = "item", name = "nullius-steel-rod", amount = 6} }, - result = "nullius-magazine", - result_count = 20 + results = { + {type="item", name="nullius-magazine", amount = 20} + } }, { type = "recipe", @@ -745,11 +758,12 @@ data:extend({ subgroup = "boxed-demolition", energy_required = 25, ingredients = { - {"nullius-box-explosive", 1}, - {"nullius-box-steel-rod", 6} + {type = "item", name = "nullius-box-explosive", amount = 1}, + {type = "item", name = "nullius-box-steel-rod", amount = 6} }, - result = "nullius-box-magazine", - result_count = 20 + results = { + {type="item", name="nullius-box-magazine", amount = 20} + } }, { type = "recipe", @@ -761,12 +775,13 @@ data:extend({ category = "hand-casting", energy_required = 8, ingredients = { - {"nullius-box-magazine", 2}, - {"nullius-uranium", 1}, - {"nullius-copper-sheet", 1} + {type = "item", name = "nullius-box-magazine", amount = 2}, + {type = "item", name = "nullius-uranium", amount = 1}, + {type = "item", name = "nullius-copper-sheet", amount = 1} }, - result = "nullius-magazine-2", - result_count = 3 + results = { + {type="item", name="nullius-magazine-2", amount = 3} + } }, { @@ -777,7 +792,7 @@ data:extend({ { icon = "__base__/graphics/icons/explosives.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.5 }, { @@ -797,16 +812,18 @@ data:extend({ ingredients = { {type="item", name="nullius-chlorine-barrel", amount=1}, {type="item", name="processed-fuel", amount=5}, - {type="item", name="red-wire", amount=1}, - {type="item", name="green-wire", amount=1}, + {type="item", name="nullius-red-wire", amount=1}, + {type="item", name="nullius-green-wire", amount=1}, {type="item", name="nullius-small-miner-1", amount=1} }, - result = "cliff-explosives" + results = { + {type="item", name="cliff-explosives", amount = 1} + } }, { type = "recipe", name = "nullius-explosive", - localised_name = {"", {"item-name.nullius-explosive"}, " ", 1}, + localised_name = {"", {"item-name.nullius-explosive"}, " ", tostring(1)}, order = "nullius-xc", enabled = false, always_show_made_in = true, @@ -822,7 +839,7 @@ data:extend({ {type="fluid", name="nullius-glycerol", amount=6}, {type="item", name="nullius-sand", amount=2}, {type="item", name="nullius-plastic", amount=1}, - {type="item", name="red-wire", amount=1} + {type="item", name="nullius-red-wire", amount=1} }, results = { {type="item", name="cliff-explosives", amount=1}, @@ -833,12 +850,12 @@ data:extend({ { type = "recipe", name = "nullius-boxed-explosive", - localised_name = {"recipe-name.nullius-boxed", - {"", {"item-name.nullius-explosive"}, " ", 1}}, + localised_name = {"recipe-name.nullius-boxed", + {"", {"item-name.nullius-explosive"}, " ", tostring(1)}}, enabled = false, category = "basic-chemistry", subgroup = "boxed-demolition", - order = "nullius-cb", + order = "nullius-cb", crafting_machine_tint = { primary = data.raw.fluid["nullius-acid-nitric"].flow_color, secondary = data.raw.fluid["nullius-glycerol"].flow_color @@ -862,18 +879,18 @@ data:extend({ { type = "recipe", name = "nullius-explosive-2", - localised_name = {"", {"item-name.nullius-explosive"}, " ", 2}, + localised_name = {"", {"item-name.nullius-explosive"}, " ", tostring(2)}, icons = { { icon = "__base__/graphics/icons/explosives.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.5 }, { - icon = "__angelssmelting__/graphics/icons/powder-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-aluminium.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.3, shift = {-7, -7} } @@ -894,8 +911,8 @@ data:extend({ {type="item", name="nullius-cellulose", amount=5}, {type="item", name="nullius-aluminum-powder", amount=4}, {type="item", name="nullius-plastic", amount=2}, - {type="item", name="red-wire", amount=1}, - {type="item", name="green-wire", amount=1} + {type="item", name="nullius-red-wire", amount=1}, + {type="item", name="nullius-green-wire", amount=1} }, results = { {type="item", name="cliff-explosives", amount=4}, @@ -907,7 +924,7 @@ data:extend({ type = "recipe", name = "nullius-boxed-explosive-2", localised_name = {"recipe-name.nullius-boxed", - {"", {"item-name.nullius-explosive"}, " ", 2}}, + {"", {"item-name.nullius-explosive"}, " ", tostring(2)}}, icons = { { icon = ICONPATH .. "crate.png", @@ -916,13 +933,13 @@ data:extend({ { icon = "__base__/graphics/icons/explosives.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.45 }, { - icon = "__angelssmelting__/graphics/icons/powder-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-aluminium.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.27, shift = {-6, -6} } @@ -959,7 +976,7 @@ data:extend({ name = "nullius-turret", icon = "__base__/graphics/icons/laser-turret.png", icon_size = 64, - icon_mipmaps = 4, + subgroup = "drone-launcher", order = "nullius-h", place_result = "nullius-turret", @@ -982,7 +999,9 @@ data:extend({ {type="item", name="nullius-transformer", amount=2}, {type="fluid", name="nullius-compressed-helium", amount=20, fluidbox_index=1} }, - result = "nullius-turret" + results = { + {type="item", name="nullius-turret", amount = 1} + } }, { @@ -996,15 +1015,20 @@ data:extend({ subgroup = "demolitions", order = "nullius-r", stack_size = 1, - selection_color = {r = 0.8, g = 0.4, b = 0.1, a = 0.8}, - alt_selection_color = {r = 0.8, g = 0.4, b = 0.1, a = 0.8}, - selection_mode = {"any-entity"}, - alt_selection_mode = {"any-entity"}, - selection_cursor_box_type = "entity", - alt_selection_cursor_box_type = "entity", - entity_type_filters = {"simple-entity", + + select = { + border_color = {r = 0.8, g = 0.4, b = 0.1, a = 0.8}, + cursor_box_type = "entity", + mode = "any-entity", + entity_type_filters = {"simple-entity", "item-entity", "rail-remnants", "corpse"}, - alt_entity_type_filters = {"rail-remnants", "corpse"} + }, + alt_select = { + border_color = {r = 0.8, g = 0.4, b = 0.1, a = 0.8}, + cursor_box_type = "entity", + mode = "any-entity", + entity_type_filters = {"rail-remnants", "corpse"}, + } }, { type = "recipe", @@ -1022,6 +1046,8 @@ data:extend({ {type="item", name="fast-splitter", amount=1}, {type="item", name="nullius-hydrogen-canister", amount=8} }, - result = "nullius-rock-picker" + results = { + {type="item", name="nullius-rock-picker", amount = 1} + } } }) diff --git a/nullius/prototypes/mods.lua b/nullius/prototypes/mods.lua index 2f755d5..0732f07 100644 --- a/nullius/prototypes/mods.lua +++ b/nullius/prototypes/mods.lua @@ -1,6 +1,78 @@ local ICONPATH = "__nullius__/graphics/icons/" local ENTITYPATH = "__nullius__/graphics/entity/" +if mods["elevated-rails"] then +data:extend({ + { + type = "technology", + name = "nullius-elevated-rails", + order = "nullius-em", + icon = "__elevated-rails__/graphics/technology/elevated-rail.png", + icon_size = 256, + effects = + { + { + type = "unlock-recipe", + recipe = "nullius-rail-support" + }, + { + type = "unlock-recipe", + recipe = "nullius-rail-ramp" + }, + { + type = "rail-planner-allow-elevated-rails", + modifier = true + }, + }, + prerequisites = {"nullius-architecture-1"}, + unit = { + count = 560, + ingredients = { + {"nullius-geology-pack", 1}, + {"nullius-climatology-pack", 1}, + {"nullius-mechanical-pack", 2}, + {"nullius-chemical-pack", 1} + }, + time = 35 + } + }, + { + type = "recipe", + name = "nullius-rail-support", + localised_name = {"entity-name.nullius-rail-pylon"}, + enabled = false, + category = "large-crafting", + always_show_made_in = true, + show_amount_in_title = false, + always_show_products = true, + energy_required = 8, + ingredients = { + {type = "item", name = "stone-wall", amount = 6}, + {type = "item", name = "nullius-pylon-2", amount = 1} + }, + results = {{type="item", name="rail-support", amount = 1}} + }, + { + type = "recipe", + name = "nullius-rail-ramp", + localised_name = {"entity-name.rail-ramp"}, + enabled = false, + category = "large-crafting", + always_show_made_in = true, + show_amount_in_title = false, + always_show_products = true, + energy_required = 20, + ingredients = { + {type = "item", name = "stone-wall", amount = 8}, + {type = "item", name = "nullius-steel-beam", amount = 10}, + {type = "item", name = "rail-support", amount = 1}, + {type = "item", name = "rail", amount = 8} + }, + results = {{type="item", name="rail-ramp", amount = 1}} + } +}) +end + if mods["LogisticTrainNetwork"] then data:extend({ { @@ -31,16 +103,19 @@ data:extend({ { type = "recipe", name = "nullius-logistic-train-stop", + localised_name = {"entity-name.logistic-train-stop"}, enabled = false, category = "medium-crafting", always_show_made_in = true, energy_required = 3, ingredients = { - {"train-stop", 1}, - {"arithmetic-combinator", 2}, - {"green-wire", 4} + {type = "item", name = "train-stop", amount = 1}, + {type = "item", name = "arithmetic-combinator", amount = 2}, + {type = "item", name = "nullius-green-wire", amount = 4} }, - result = "logistic-train-stop" + results = { + {type = "item", name = "logistic-train-stop", amount = 1} + } } }) end @@ -51,15 +126,18 @@ if mods["LTN_Combinator_Modernized"] then { type = "recipe", name = "nullius-ltn-combinator", + localised_name = {"entity-name.ltn-combinator"}, enabled = false, always_show_made_in = true, category = "tiny-crafting", energy_required = 2, ingredients = { - {"constant-combinator", 1}, - {"decider-combinator", 1} + {type = "item", name = "constant-combinator", amount = 1}, + {type = "item", name = "decider-combinator", amount = 1} }, - result = "ltn-combinator" + results = { + {type = "item", name = "ltn-combinator", amount = 1} + } } }) if mods["LogisticTrainNetwork"] then @@ -77,27 +155,33 @@ data:extend({ { type = "recipe", name = "nullius-aai-signal-sender", + localised_name = {"entity-name.aai-signal-sender"}, category = "huge-crafting", always_show_made_in = true, energy_required = 12, ingredients = { - {"nullius-beacon-1", 1}, - {"nullius-relay-1", 2} + {type = "item", name = "nullius-beacon-1", amount = 1}, + {type = "item", name = "nullius-relay-1", amount = 2} }, - result = "aai-signal-sender", + results = { + {type = "item", name = "aai-signal-sender", amount = 1} + }, enabled = false }, { type = "recipe", name = "nullius-aai-signal-receiver", + localised_name = {"entity-name.aai-signal-receiver"}, category = "huge-crafting", always_show_made_in = true, energy_required = 15, ingredients = { - {"radar", 1}, - {"programmable-speaker", 2} + {type = "item", name = "radar", amount = 1}, + {type = "item", name = "programmable-speaker", amount = 2} }, - result = "aai-signal-receiver", + results = { + {type = "item", name = "aai-signal-receiver", amount = 1} + }, enabled = false }, @@ -132,49 +216,58 @@ data:extend({ { type = "recipe", name = "nullius-factory-1", + localised_name = {"entity-name.factory-1"}, category = "huge-crafting", always_show_made_in = true, energy_required = 40, ingredients = { - {"stone-brick", 200}, - {"nullius-mortar", 60}, - {"nullius-glass", 40}, - {"substation", 4}, - {"small-lamp", 4} + {type = "item", name = "stone-brick", amount = 200}, + {type = "item", name = "nullius-mortar", amount = 60}, + {type = "item", name = "nullius-glass", amount = 40}, + {type = "item", name = "substation", amount = 4}, + {type = "item", name = "small-lamp", amount = 4} + }, + results = { + {type = "item", name = "factory-1", amount = 1} }, - result = "factory-1", enabled = false }, { type = "recipe", name = "nullius-factory-2", + localised_name = {"entity-name.factory-2"}, category = "huge-crafting", always_show_made_in = true, energy_required = 60, ingredients = { - {"factory-1", 3}, - {"concrete", 800}, - {"nullius-refractory-brick", 500}, - {"nullius-steel-beam", 200}, - {"red-wire", 40} + {type = "item", name = "factory-1", amount = 3}, + {type = "item", name = "concrete", amount = 800}, + {type = "item", name = "nullius-refractory-brick", amount = 500}, + {type = "item", name = "nullius-steel-beam", amount = 200}, + {type = "item", name = "nullius-red-wire", amount = 40} + }, + results = { + {type = "item", name = "factory-2", amount = 1} }, - result = "factory-2", enabled = false }, { type = "recipe", name = "nullius-factory-3", + localised_name = {"entity-name.factory-3"}, category = "huge-crafting", always_show_made_in = true, energy_required = 90, ingredients = { - {"factory-2", 3}, - {"stone-wall", 150}, - {"gate", 15}, - {"nullius-grid-battery-1", 8}, - {"radar", 1} + {type = "item", name = "factory-2", amount = 3}, + {type = "item", name = "stone-wall", amount = 150}, + {type = "item", name = "gate", amount = 15}, + {type = "item", name = "nullius-grid-battery-1", amount = 8}, + {type = "item", name = "radar", amount = 1} + }, + results = { + {type = "item", name = "factory-3", amount = 1} }, - result = "factory-3", enabled = false } }) @@ -184,14 +277,17 @@ data:extend({ { type = "recipe", name = "nullius-factory-circuit-connector", + localised_name = {"entity-name.factory-circuit-connector"}, category = "small-crafting", always_show_made_in = true, energy_required = 2, ingredients = { - {"green-wire", 3}, - {"arithmetic-combinator", 1} + {type = "item", name = "nullius-green-wire", amount = 3}, + {type = "item", name = "arithmetic-combinator", amount = 1} + }, + results = { + {type = "item", name = "factory-circuit-connector", amount = 1} }, - result = "factory-circuit-connector", enabled = false } }) @@ -200,65 +296,80 @@ data:extend({ { type = "recipe", name = "nullius-factory-requester-chest", + localised_name = {"entity-name.factory-requester-chest"}, category = "medium-crafting", always_show_made_in = true, energy_required = 10, ingredients = { - {"nullius-small-demand-chest-1", 4} + {type = "item", name = "nullius-small-demand-chest-1", amount = 4} + }, + results = { + {type = "item", name = "factory-requester-chest", amount = 1} }, - result = "factory-requester-chest", enabled = false }, { type = "recipe", name = "nullius-factory-input-pipe", + localised_name = {"entity-name.factory-input-pipe"}, category = "medium-crafting", always_show_made_in = true, energy_required = 2, ingredients = { - {"nullius-underground-pipe-2", 1}, - {"nullius-pipe-2", 4} + {type = "item", name = "nullius-underground-pipe-2", amount = 1}, + {type = "item", name = "nullius-pipe-2", amount = 4} + }, + results = { + {type = "item", name = "factory-input-pipe", amount = 1} }, - result = "factory-input-pipe", enabled = false }, { type = "recipe", name = "nullius-factory-output-pipe", + localised_name = {"entity-name.factory-output-pipe"}, category = "medium-crafting", always_show_made_in = true, energy_required = 0.5, no_productivity = true, ingredients = { - {"factory-input-pipe", 1} + {type = "item", name = "factory-input-pipe", amount = 1} + }, + results = { + {type = "item", name = "factory-output-pipe", amount = 1} }, - result = "factory-output-pipe", enabled = false }, { type = "recipe", name = "nullius-factory-circuit-input", + localised_name = {"entity-name.factory-circuit-input"}, category = "small-crafting", always_show_made_in = true, energy_required = 2, ingredients = { - {"green-wire", 3}, - {"arithmetic-combinator", 1} + {type = "item", name = "nullius-green-wire", amount = 3}, + {type = "item", name = "arithmetic-combinator", amount = 1} + }, + results = { + {type = "item", name = "factory-circuit-input", amount = 1} }, - result = "factory-circuit-input", enabled = false }, { type = "recipe", name = "nullius-factory-circuit-output", + localised_name = {"entity-name.factory-circuit-output"}, category = "small-crafting", always_show_made_in = true, no_productivity = true, energy_required = 0.5, ingredients = { - {"factory-circuit-input", 1} + {type = "item", name = "factory-circuit-input", amount = 1} + }, + results = { + {type = "item", name = "factory-circuit-output", amount = 1} }, - result = "factory-circuit-output", enabled = false } }) @@ -355,7 +466,9 @@ data:extend({ {type="item", name="wooden-chest", amount=1}, {type="item", name="underground-belt", amount=1} }, - result = "chute-miniloader" + results = { + {type = "item", name = "chute-miniloader", amount = 1} + } } }) end @@ -381,7 +494,9 @@ data:extend({ {type="item", name="underground-belt", amount=1}, {type="item", name="inserter", amount=4} }, - result = "miniloader" + results = { + {type = "item", name = "miniloader", amount = 1} + } }, { type = "recipe", @@ -394,9 +509,11 @@ data:extend({ {type="item", name="miniloader", amount=1}, {type="item", name="iron-chest", amount=1}, {type="item", name="fast-underground-belt", amount=2}, - {type="item", name="turbo-inserter", amount=3} + {type="item", name="bob-turbo-inserter", amount=3} }, - result = "fast-miniloader" + results = { + {type = "item", name = "fast-miniloader", amount = 1} + } }, { type = "recipe", @@ -409,9 +526,11 @@ data:extend({ {type="item", name="fast-miniloader", amount=1}, {type="item", name="steel-chest", amount=1}, {type="item", name="express-underground-belt", amount=1}, - {type="item", name="stack-inserter", amount=2} + {type="item", name="bulk-inserter", amount=2} }, - result = "express-miniloader" + results = { + {type = "item", name = "express-miniloader", amount = 1} + } }, { type = "recipe", @@ -422,11 +541,13 @@ data:extend({ energy_required = 8, ingredients = { {type="item", name="express-miniloader", amount=1}, - {type="item", name="logistic-chest-storage", amount=1}, - {type="item", name="ultimate-underground-belt", amount=1}, - {type="item", name="express-stack-inserter", amount=2} + {type="item", name="storage-chest", amount=1}, + {type="item", name="bob-ultimate-underground-belt", amount=1}, + {type="item", name="bob-express-bulk-inserter", amount=2} }, - result = "ultimate-miniloader" + results = { + {type = "item", name = "ultimate-miniloader", amount = 1} + } } }) end @@ -449,9 +570,11 @@ data:extend({ {type="item", name="miniloader", amount=1}, {type="item", name="iron-chest", amount=1}, {type="item", name="fast-underground-belt", amount=2}, - {type="item", name="turbo-filter-inserter", amount=3} + {type="item", name="bob-turbo-filter-inserter", amount=3} }, - result = "fast-filter-miniloader" + results = { + {type = "item", name = "fast-filter-miniloader", amount = 1} + } }, { type = "recipe", @@ -466,7 +589,9 @@ data:extend({ {type="item", name="express-underground-belt", amount=1}, {type="item", name="stack-filter-inserter", amount=2} }, - result = "express-filter-miniloader" + results = { + {type = "item", name = "express-filter-miniloader", amount = 1} + } }, { type = "recipe", @@ -477,11 +602,13 @@ data:extend({ energy_required = 8, ingredients = { {type="item", name="express-filter-miniloader", amount=1}, - {type="item", name="logistic-chest-storage", amount=1}, - {type="item", name="ultimate-underground-belt", amount=1}, - {type="item", name="express-stack-filter-inserter", amount=2} + {type="item", name="storage-chest", amount=1}, + {type="item", name="bob-ultimate-underground-belt", amount=1}, + {type="item", name="express-stack-filter-inserter", amount=2} -- TODO: rename this ?? }, - result = "ultimate-filter-miniloader" + results = { + {type = "item", name = "ultimate-filter-miniloader", amount = 1} + } } }) end @@ -494,7 +621,7 @@ data:extend({ type = "technology", name = "nullius-loader-1", order = "nullius-ce", - localised_description = {"technology-description.nullius-miniloader"}, + localised_description = {"technology-description.nullius-miniloader"}, effects = {{type = "unlock-recipe", recipe = "nullius-loader-1"}}, unit = { count = 3, @@ -511,7 +638,7 @@ data:extend({ type = "technology", name = "nullius-loader-2", order = "nullius-ck", - localised_description = {"technology-description.nullius-miniloader"}, + localised_description = {"technology-description.nullius-miniloader"}, effects = {{type = "unlock-recipe", recipe = "nullius-loader-2"}}, unit = { count = 25, @@ -528,8 +655,8 @@ data:extend({ type = "technology", name = "nullius-loader-3", order = "nullius-dg", - localised_description = {"technology-description.nullius-miniloader"}, - effects = {{type = "unlock-recipe", recipe = "nullius-loader-3"}}, + localised_description = {"technology-description.nullius-miniloader"}, + effects = {{type = "unlock-recipe", recipe = "nullius-loader-3"}}, unit = { count = 50, ingredients = { @@ -544,8 +671,8 @@ data:extend({ type = "technology", name = "nullius-loader-4", order = "nullius-ek", - localised_description = {"technology-description.nullius-miniloader"}, - effects = {{type = "unlock-recipe", recipe = "nullius-loader-4"}}, + localised_description = {"technology-description.nullius-miniloader"}, + effects = {{type = "unlock-recipe", recipe = "nullius-loader-4"}}, unit = { count = 1000, ingredients = { @@ -561,8 +688,8 @@ data:extend({ type = "technology", name = "nullius-loader-5", order = "nullius-fo", - localised_description = {"technology-description.nullius-miniloader"}, - effects = {{type = "unlock-recipe", recipe = "nullius-loader-5"}}, + localised_description = {"technology-description.nullius-miniloader"}, + effects = {{type = "unlock-recipe", recipe = "nullius-loader-5"}}, unit = { count = 3000, ingredients = { @@ -580,6 +707,7 @@ data:extend({ { type = "recipe", name = "nullius-loader-1", + localised_name = {"entity-name.aai-basic-loader"}, enabled = false, always_show_made_in = true, category = "medium-crafting", @@ -588,11 +716,14 @@ data:extend({ {type="item", name="wooden-chest", amount=1}, {type="item", name="underground-belt", amount=1} }, - result = "aai-basic-loader" + results = { + {type = "item", name = "aai-basic-loader", amount = 1} + } }, { type = "recipe", name = "nullius-loader-2", + localised_name = {"entity-name.aai-loader"}, enabled = false, always_show_made_in = true, category = "medium-crafting", @@ -601,13 +732,16 @@ data:extend({ {type="item", name="aai-basic-loader", amount=1}, {type="item", name="underground-belt", amount=1}, {type="item", name="inserter", amount=4}, - {type="fluid", name="nullius-lubricant", amount=30}, + {type="fluid", name="nullius-lubricant", amount=30}, }, - result = "aai-loader" + results = { + {type = "item", name = "aai-loader", amount = 1} + } }, { type = "recipe", name = "nullius-loader-3", + localised_name = {"entity-name.aai-fast-loader"}, enabled = false, always_show_made_in = true, category = "medium-crafting", @@ -616,13 +750,16 @@ data:extend({ {type="item", name="aai-loader", amount=2}, {type="item", name="iron-chest", amount=1}, {type="item", name="fast-underground-belt", amount=2}, - {type="item", name="turbo-inserter", amount=3} + {type="item", name="bob-turbo-inserter", amount=3} }, - result = "aai-fast-loader" + results = { + {type = "item", name = "aai-fast-loader", amount = 1} + } }, { type = "recipe", name = "nullius-loader-4", + localised_name = {"entity-name.aai-express-loader"}, enabled = false, always_show_made_in = true, category = "medium-crafting", @@ -631,24 +768,29 @@ data:extend({ {type="item", name="aai-fast-loader", amount=1}, {type="item", name="steel-chest", amount=1}, {type="item", name="express-underground-belt", amount=1}, - {type="item", name="stack-inserter", amount=2} + {type="item", name="bulk-inserter", amount=2} }, - result = "aai-express-loader" + results = { + {type = "item", name = "aai-express-loader", amount = 1} + } }, { type = "recipe", name = "nullius-loader-5", + localised_name = {"entity-name.aai-ultimate-loader"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 20, ingredients = { {type="item", name="aai-express-loader", amount=2}, - {type="item", name="logistic-chest-storage", amount=1}, - {type="item", name="ultimate-underground-belt", amount=1}, - {type="item", name="express-stack-inserter", amount=2} + {type="item", name="storage-chest", amount=1}, + {type="item", name="bob-ultimate-underground-belt", amount=1}, + {type="item", name="bob-express-bulk-inserter", amount=2} }, - result = "aai-ultimate-loader" + results = { + {type = "item", name = "aai-ultimate-loader", amount = 1} + } } }) end @@ -659,56 +801,68 @@ data:extend({ { type = "recipe", name = "nullius-train-publisher", + localised_name = {"entity-name.train-publisher"}, enabled = false, always_show_made_in = true, category = "small-crafting", energy_required = 3, ingredients = { - {"small-lamp", 1}, - {"train-config", 2} + {type = "item", name = "small-lamp", amount = 1}, + {type = "item", name = "train-config", amount = 2} }, - result = "train-publisher" + results = { + {type = "item", name = "train-publisher", amount = 1} + } }, { type = "recipe", name = "nullius-subscriber-train-stop", + localised_name = {"entity-name.subscriber-train-stop"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 4, ingredients = { - {"train-stop", 1}, - {"train-publisher", 1}, - {"nullius-small-supply-chest-1", 1} + {type = "item", name = "train-stop", amount = 1}, + {type = "item", name = "train-publisher", amount = 1}, + {type = "item", name = "nullius-small-supply-chest-1", amount = 1} }, - result = "subscriber-train-stop" + results = { + {type = "item", name = "subscriber-train-stop", amount = 1} + } }, { type = "recipe", name = "nullius-publisher-train-stop", + localised_name = {"entity-name.publisher-train-stop"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 4, ingredients = { - {"train-stop", 1}, - {"train-publisher", 1}, - {"nullius-small-demand-chest-1", 1} + {type = "item", name = "train-stop", amount = 1}, + {type = "item", name = "train-publisher", amount = 1}, + {type = "item", name = "nullius-small-demand-chest-1", amount = 1} }, - result = "publisher-train-stop" + results = { + {type = "item", name = "publisher-train-stop", amount = 1} + } }, { type = "recipe", name = "nullius-train-config", + localised_name = {"entity-name.train-config"}, enabled = false, always_show_made_in = true, category = "tiny-crafting", energy_required = 2, ingredients = { - {"constant-combinator", 1}, - {"arithmetic-combinator", 1} + {type = "item", name = "constant-combinator", amount = 1}, + {type = "item", name = "arithmetic-combinator", amount = 1} }, - result = "train-config" + results = { + {type = "item", name = "train-config", amount = 1} + } } }) end @@ -719,18 +873,21 @@ data:extend({ { type = "recipe", name = "nullius-teleporter", + localised_name = {"teleporter"}, enabled = false, category = "nanotechnology", energy_required = 60, ingredients = { - {"nullius-productivity-module-2", 4}, - {"nullius-reactor", 1}, - {"nullius-box-gate", 3}, - {"nullius-sensor-node-3", 2}, - {"nullius-box-underground-pipe-4", 5}, - {"nullius-grid-battery-2", 6} + {type = "item", name = "nullius-productivity-module-2", amount = 4}, + {type = "item", name = "nullius-reactor", amount = 1}, + {type = "item", name = "nullius-box-gate", amount = 3}, + {type = "item", name = "nullius-sensor-node-3", amount = 2}, + {type = "item", name = "nullius-box-underground-pipe-4", amount = 5}, + {type = "item", name = "nullius-grid-battery-2", amount = 6} }, - result = "teleporter" + results = { + {type = "item", name = "teleporter", amount = 1} + } } }) end @@ -842,67 +999,79 @@ data:extend({ { type = "recipe", name = "nullius-jetpack-1", + localised_name = {"item-name.jetpack-1"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 10, ingredients = { - {"nullius-robot-frame-1", 1}, - {"nullius-haste-module-1", 1}, - {"nullius-combustion-chamber-1", 1}, - {"nullius-turbine-open-1", 2}, - {"nullius-aluminum-plate", 6} + {type = "item", name = "nullius-robot-frame-1", amount = 1}, + {type = "item", name = "nullius-haste-module-1", amount = 1}, + {type = "item", name = "nullius-combustion-chamber-1", amount = 1}, + {type = "item", name = "nullius-turbine-open-1", amount = 2}, + {type = "item", name = "nullius-aluminum-plate", amount = 6} }, - result = "jetpack-1" + results = { + {type = "item", name = "jetpack-1", amount = 1} + } }, { type = "recipe", name = "nullius-jetpack-2", + localised_name = {"item-name.jetpack-2"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 15, ingredients = { - {"jetpack-1", 1}, - {"nullius-robot-frame-2", 1}, - {"nullius-haste-module-2", 1}, - {"nullius-combustion-chamber-2", 2}, - {"nullius-turbine-open-2", 2}, - {"nullius-ceramic-powder", 8} + {type = "item", name = "jetpack-1", amount = 1}, + {type = "item", name = "nullius-robot-frame-2", amount = 1}, + {type = "item", name = "nullius-haste-module-2", amount = 1}, + {type = "item", name = "nullius-combustion-chamber-2", amount = 2}, + {type = "item", name = "nullius-turbine-open-2", amount = 2}, + {type = "item", name = "nullius-ceramic-powder", amount = 8} }, - result = "jetpack-2" + results = { + {type = "item", name = "jetpack-2", amount = 1} + } }, { type = "recipe", name = "nullius-jetpack-3", + localised_name = {"item-name.jetpack-3"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 20, ingredients = { - {"jetpack-2", 1}, - {"nullius-robot-frame-3", 1}, - {"nullius-haste-module-3", 2}, - {"nullius-combustion-chamber-3", 1}, - {"nullius-turbine-open-3", 2}, - {"nullius-titanium-plate", 10} + {type = "item", name = "jetpack-2", amount = 1}, + {type = "item", name = "nullius-robot-frame-3", amount = 1}, + {type = "item", name = "nullius-haste-module-3", amount = 2}, + {type = "item", name = "nullius-combustion-chamber-3", amount = 1}, + {type = "item", name = "nullius-turbine-open-3", amount = 2}, + {type = "item", name = "nullius-titanium-plate", amount = 10} }, - result = "jetpack-3" + results = { + {type = "item", name = "jetpack-3", amount = 1} + } }, { type = "recipe", name = "nullius-jetpack-4", + localised_name = {"item-name.jetpack-4"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 30, ingredients = { - {"jetpack-3", 2}, - {"nullius-robot-frame-4", 1}, - {"nullius-haste-module-4", 2}, - {"nullius-missile-launcher", 4} + {type = "item", name = "jetpack-3", amount = 2}, + {type = "item", name = "nullius-robot-frame-4", amount = 1}, + {type = "item", name = "nullius-haste-module-4", amount = 2}, + {type = "item", name = "nullius-missile-launcher", amount = 4} }, - result = "jetpack-4" + results = { + {type = "item", name = "jetpack-4", amount = 1} + } } }) end @@ -913,69 +1082,84 @@ data:extend({ { type = "recipe", name = "nullius-surface-two-way-junction-1", + --localised_name = {"entity-name.one-to-one-forward-t2-pipe"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 3, ingredients = { - {"nullius-underground-pipe-2", 2}, - {"nullius-steel-plate", 1}, - {"nullius-rubber", 1} + {type = "item", name = "nullius-underground-pipe-2", amount = 2}, + {type = "item", name = "nullius-steel-plate", amount = 1}, + {type = "item", name = "nullius-rubber", amount = 1} }, - result = "one-to-one-forward-t2-pipe" + results = { + {type = "item", name = "one-to-one-forward-t2-pipe", amount = 1} + } }, { type = "recipe", name = "nullius-surface-three-way-junction-1", + --localised_name = {"entity-name.one-to-two-perpendicular-t2-pipe"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 2, ingredients = { - {"one-to-one-forward-t2-pipe", 1}, - {"nullius-underground-pipe-2", 1} + {type = "item", name = "one-to-one-forward-t2-pipe", amount = 1}, + {type = "item", name = "nullius-underground-pipe-2", amount = 1} }, - result = "one-to-two-perpendicular-t2-pipe" + results = { + {type = "item", name = "one-to-two-perpendicular-t2-pipe", amount = 1} + } }, { type = "recipe", name = "nullius-surface-four-way-junction-1", + --localised_name = {"entity-name.one-to-three-forward-t2-pipe"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 2, ingredients = { - {"one-to-two-perpendicular-t2-pipe", 1}, - {"nullius-underground-pipe-2", 1} + {type = "item", name = "one-to-two-perpendicular-t2-pipe", amount = 1}, + {type = "item", name = "nullius-underground-pipe-2", amount = 1} }, - result = "one-to-three-forward-t2-pipe" + results = { + {type = "item", name = "one-to-three-forward-t2-pipe", amount = 1} + } }, { type = "recipe", name = "nullius-underground-straight-junction-1", + --localised_name = {"entity-name.underground-i-t2-pipe"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 4, ingredients = { - {"one-to-one-forward-t2-pipe", 1}, - {"nullius-underground-pipe-2", 1}, - {"nullius-glass", 1} + {type = "item", name = "one-to-one-forward-t2-pipe", amount = 1}, + {type = "item", name = "nullius-underground-pipe-2", amount = 1}, + {type = "item", name = "nullius-glass", amount = 1} }, - result = "underground-i-t2-pipe" + results = { + {type = "item", name = "underground-i-t2-pipe", amount = 1} + } }, { type = "recipe", name = "nullius-underground-elbow-junction-1", + --localised_name = {"entity-name.underground-L-t2-pipe"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 3, ingredients = { - {"underground-i-t2-pipe", 1}, - {"nullius-pipe-2", 2} + {type = "item", name = "underground-i-t2-pipe", amount = 1}, + {type = "item", name = "nullius-pipe-2", amount = 2} }, - result = "underground-L-t2-pipe" + results = { + {type = "item", name = "underground-L-t2-pipe", amount = 1} + } }, { type = "recipe", @@ -985,23 +1169,28 @@ data:extend({ category = "medium-crafting", energy_required = 3, ingredients = { - {"underground-L-t2-pipe", 1}, - {"nullius-underground-pipe-2", 1} + {type = "item", name = "underground-L-t2-pipe", amount = 1}, + {type = "item", name = "nullius-underground-pipe-2", amount = 1} }, - result = "underground-t-t2-pipe" + results = { + {type = "item", name = "underground-t-t2-pipe", amount = 1} + } }, { type = "recipe", name = "nullius-adjustable-relief-valve", + localised_name = {"item-name.nullius-adjustable-relief-valve"}, enabled = false, always_show_made_in = true, category = "tiny-crafting", energy_required = 3, ingredients = { - {"nullius-relief-valve", 2}, - {"red-wire", 1} + {type = "item", name = "nullius-relief-valve", amount = 2}, + {type = "item", name = "nullius-red-wire", amount = 1} }, - result = "80-overflow-valve" + results = { + {type = "item", name = "80-overflow-valve", amount = 1} + } }, { @@ -1012,11 +1201,13 @@ data:extend({ category = "medium-crafting", energy_required = 3, ingredients = { - {"one-to-one-forward-t2-pipe", 1}, - {"nullius-bearing", 1}, - {"nullius-underground-pipe-3", 1} + {type = "item", name = "one-to-one-forward-t2-pipe", amount = 1}, + {type = "item", name = "nullius-bearing", amount = 1}, + {type = "item", name = "nullius-underground-pipe-3", amount = 1} }, - result = "one-to-one-forward-t3-pipe" + results = { + {type = "item", name = "one-to-one-forward-t3-pipe", amount = 1} + } }, { type = "recipe", @@ -1026,11 +1217,13 @@ data:extend({ category = "medium-crafting", energy_required = 3, ingredients = { - {"one-to-two-perpendicular-t2-pipe", 1}, - {"nullius-bearing", 1}, - {"nullius-underground-pipe-3", 2} + {type = "item", name = "one-to-two-perpendicular-t2-pipe", amount = 1}, + {type = "item", name = "nullius-bearing", amount = 1}, + {type = "item", name = "nullius-underground-pipe-3", amount = 2} }, - result = "one-to-two-perpendicular-t3-pipe" + results = { + {type = "item", name = "one-to-two-perpendicular-t3-pipe", amount = 1} + } }, { type = "recipe", @@ -1040,11 +1233,13 @@ data:extend({ category = "medium-crafting", energy_required = 3, ingredients = { - {"one-to-three-forward-t2-pipe", 1}, - {"nullius-bearing", 1}, - {"nullius-underground-pipe-3", 3} + {type = "item", name = "one-to-three-forward-t2-pipe", amount = 1}, + {type = "item", name = "nullius-bearing", amount = 1}, + {type = "item", name = "nullius-underground-pipe-3", amount = 3} }, - result = "one-to-three-forward-t3-pipe" + results = { + {type = "item", name = "one-to-three-forward-t3-pipe", amount = 1} + } }, { type = "recipe", @@ -1054,10 +1249,12 @@ data:extend({ category = "medium-crafting", energy_required = 4, ingredients = { - {"underground-i-t2-pipe", 1}, - {"nullius-underground-pipe-3", 2} + {type = "item", name = "underground-i-t2-pipe", amount = 1}, + {type = "item", name = "nullius-underground-pipe-3", amount = 2} }, - result = "underground-i-t3-pipe" + results = { + {type = "item", name = "underground-i-t3-pipe", amount = 1} + } }, { type = "recipe", @@ -1067,10 +1264,12 @@ data:extend({ category = "medium-crafting", energy_required = 5, ingredients = { - {"underground-L-t2-pipe", 1}, - {"nullius-underground-pipe-3", 3} + {type = "item", name = "underground-L-t2-pipe", amount = 1}, + {type = "item", name = "nullius-underground-pipe-3", amount = 3} }, - result = "underground-L-t3-pipe" + results = { + {type = "item", name = "underground-L-t3-pipe", amount = 1} + } }, { type = "recipe", @@ -1080,23 +1279,28 @@ data:extend({ category = "medium-crafting", energy_required = 6, ingredients = { - {"underground-t-t2-pipe", 1}, - {"nullius-underground-pipe-3", 4} + {type = "item", name = "underground-t-t2-pipe", amount = 1}, + {type = "item", name = "nullius-underground-pipe-3", amount = 4} }, - result = "underground-t-t3-pipe" + results = { + {type = "item", name = "underground-t-t3-pipe", amount = 1} + } }, { type = "recipe", name = "nullius-adjustable-top-up-valve", + localised_name = {"item-name.nullius-adjustable-top-up-valve"}, enabled = false, always_show_made_in = true, category = "tiny-crafting", energy_required = 3, ingredients = { - {"nullius-top-up-valve", 2}, - {"red-wire", 1} + {type = "item", name = "nullius-top-up-valve", amount = 2}, + {type = "item", name = "nullius-red-wire", amount = 1} }, - result = "80-top-up-valve" + results = { + {type = "item", name = "80-top-up-valve", amount = 1} + } }, { @@ -1107,10 +1311,12 @@ data:extend({ category = "medium-crafting", energy_required = 4, ingredients = { - {"one-to-one-forward-t3-pipe", 1}, - {"nullius-underground-pipe-4", 1} + {type = "item", name = "one-to-one-forward-t3-pipe", amount = 1}, + {type = "item", name = "nullius-underground-pipe-4", amount = 1} }, - result = "one-to-one-forward-pipe" + results = { + {type = "item", name = "one-to-one-forward-pipe", amount = 1} + } }, { type = "recipe", @@ -1120,10 +1326,12 @@ data:extend({ category = "medium-crafting", energy_required = 4, ingredients = { - {"one-to-two-perpendicular-t3-pipe", 1}, - {"nullius-underground-pipe-4", 2} + {type = "item", name = "one-to-two-perpendicular-t3-pipe", amount = 1}, + {type = "item", name = "nullius-underground-pipe-4", amount = 2} }, - result = "one-to-two-perpendicular-pipe" + results = { + {type = "item", name = "one-to-two-perpendicular-pipe", amount = 1} + } }, { type = "recipe", @@ -1133,10 +1341,12 @@ data:extend({ category = "medium-crafting", energy_required = 4, ingredients = { - {"one-to-three-forward-t3-pipe", 1}, - {"nullius-underground-pipe-4", 3} + {type = "item", name = "one-to-three-forward-t3-pipe", amount = 1}, + {type = "item", name = "nullius-underground-pipe-4", amount = 3} }, - result = "one-to-three-forward-pipe" + results = { + {type = "item", name = "one-to-three-forward-pipe", amount = 1} + } }, { type = "recipe", @@ -1146,10 +1356,12 @@ data:extend({ category = "medium-crafting", energy_required = 3, ingredients = { - {"one-to-two-perpendicular-pipe", 1}, - {"one-to-one-forward-pipe", 1} + {type = "item", name = "one-to-two-perpendicular-pipe", amount = 1}, + {type = "item", name = "one-to-one-forward-pipe", amount = 1} }, - result = "one-to-four-pipe" + results = { + {type = "item", name = "one-to-four-pipe", amount = 1} + } }, { type = "recipe", @@ -1159,11 +1371,13 @@ data:extend({ category = "medium-crafting", energy_required = 6, ingredients = { - {"underground-i-t3-pipe", 1}, - {"nullius-hard-glass", 1}, - {"nullius-underground-pipe-4", 2} + {type = "item", name = "underground-i-t3-pipe", amount = 1}, + {type = "item", name = "nullius-hard-glass", amount = 1}, + {type = "item", name = "nullius-underground-pipe-4", amount = 2} }, - result = "underground-i-pipe" + results = { + {type = "item", name = "underground-i-pipe", amount = 1} + } }, { type = "recipe", @@ -1173,11 +1387,13 @@ data:extend({ category = "medium-crafting", energy_required = 8, ingredients = { - {"underground-L-t3-pipe", 1}, - {"nullius-hard-glass", 1}, - {"nullius-underground-pipe-4", 2} + {type = "item", name = "underground-L-t3-pipe", amount = 1}, + {type = "item", name = "nullius-hard-glass", amount = 1}, + {type = "item", name = "nullius-underground-pipe-4", amount = 2} }, - result = "underground-L-pipe" + results = { + {type = "item", name = "underground-L-pipe", amount = 1} + } }, { type = "recipe", @@ -1187,11 +1403,13 @@ data:extend({ category = "medium-crafting", energy_required = 10, ingredients = { - {"underground-t-t3-pipe", 1}, - {"nullius-hard-glass", 1}, - {"nullius-underground-pipe-4", 3} + {type = "item", name = "underground-t-t3-pipe", amount = 1}, + {type = "item", name = "nullius-hard-glass", amount = 1}, + {type = "item", name = "nullius-underground-pipe-4", amount = 3} }, - result = "underground-t-pipe" + results = { + {type = "item", name = "underground-t-pipe", amount = 1} + } }, { type = "recipe", @@ -1201,23 +1419,28 @@ data:extend({ category = "medium-crafting", energy_required = 8, ingredients = { - {"underground-L-pipe", 2}, - {"nullius-underground-pipe-4", 1} + {type = "item", name = "underground-L-pipe", amount = 2}, + {type = "item", name = "nullius-underground-pipe-4", amount = 1} }, - result = "underground-cross-pipe" + results = { + {type = "item", name = "underground-cross-pipe", amount = 1} + } }, { type = "recipe", name = "nullius-underground-pump", + localised_name = {"item-name.nullius-underground-pump"}, enabled = false, always_show_made_in = true, category = "small-crafting", energy_required = 12, ingredients = { - {"nullius-small-pump-2", 3}, - {"underground-i-pipe", 2} + {type = "item", name = "nullius-small-pump-2", amount = 3}, + {type = "item", name = "underground-i-pipe", amount = 2} }, - result = "underground-mini-pump" + results = { + {type = "item", name = "underground-mini-pump", amount = 1} + } } }) end @@ -1228,7 +1451,7 @@ data:extend({ { type = "technology", name = "nullius-warehousing-1", - localised_name = { "", {"technology-name.warehouse-research"}, " ", 1 }, + localised_name = { "", {"technology-name.warehouse-research"}, " ", "1" }, localised_description = { "technology-description.nullius-storage" }, order = "nullius-cl", icon = "__Warehousing__/graphics/research/warehouse-research.png", @@ -1251,7 +1474,7 @@ data:extend({ { type = "technology", name = "nullius-warehousing-2", - localised_name = { "", {"technology-name.warehouse-research"}, " ", 2 }, + localised_name = { "", {"technology-name.warehouse-research"}, " ", "2" }, localised_description = { "technology-description.nullius-storage" }, order = "nullius-di", icon = "__Warehousing__/graphics/research/warehouse-research.png", @@ -1275,7 +1498,7 @@ data:extend({ { type = "technology", name = "nullius-warehousing-3", - localised_name = { "", {"technology-name.warehouse-research"}, " ", 3 }, + localised_name = { "", {"technology-name.warehouse-research"}, " ", "3" }, localised_description = { "technology-description.nullius-storage" }, order = "nullius-dk", icon = "__Warehousing__/graphics/research/warehouse-logistics-research-1.png", @@ -1319,7 +1542,7 @@ data:extend({ { type = "technology", name = "nullius-warehousing-4", - localised_name = { "", {"technology-name.warehouse-research"}, " ", 4 }, + localised_name = { "", {"technology-name.warehouse-research"}, " ", "4" }, localised_description = { "technology-description.nullius-storage" }, order = "nullius-eo", icon = "__Warehousing__/graphics/research/warehouse-logistics-research-2.png", @@ -1357,161 +1580,197 @@ data:extend({ { type = "recipe", name = "nullius-storehouse", + localised_name = {"entity-name.storehouse-basic"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 6, ingredients = { - {"nullius-large-chest-1", 3}, - {"nullius-steel-beam", 6}, - {"nullius-glass", 4} + {type = "item", name = "nullius-large-chest-1", amount = 3}, + {type = "item", name = "nullius-steel-beam", amount = 6}, + {type = "item", name = "nullius-glass", amount = 4} }, - result = "storehouse-basic" + results = { + {type = "item", name = "storehouse-basic", amount = 1} + } }, { type = "recipe", name = "nullius-warehouse", + localised_name = {"entity-name.warehouse-basic"}, enabled = false, always_show_made_in = true, category = "huge-crafting", energy_required = 10, ingredients = { - {"storehouse-basic", 4}, - {"stone-brick", 40}, - {"nullius-mortar", 10}, - {"concrete", 20} + {type = "item", name = "storehouse-basic", amount = 4}, + {type = "item", name = "stone-brick", amount = 40}, + {type = "item", name = "nullius-mortar", amount = 10}, + {type = "item", name = "concrete", amount = 20} }, - result = "warehouse-basic" + results = { + {type = "item", name = "warehouse-basic", amount = 1} + } }, { type = "recipe", name = "nullius-storehouse-storage", + localised_name = {"entity-name.storehouse-storage"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 2, ingredients = { - {"storehouse-basic", 1}, - {"nullius-large-storage-chest-1", 1} + {type = "item", name = "storehouse-basic", amount = 1}, + {type = "item", name = "nullius-large-storage-chest-1", amount = 1} }, - result = "storehouse-storage" + results = { + {type = "item", name = "storehouse-storage", amount = 1} + } }, { type = "recipe", name = "nullius-warehouse-storage", + localised_name = {"entity-name.warehouse-storage"}, enabled = false, always_show_made_in = true, category = "huge-crafting", energy_required = 5, ingredients = { - {"warehouse-basic", 1}, - {"nullius-large-storage-chest-1", 2} + {type = "item", name = "warehouse-basic", amount = 1}, + {type = "item", name = "nullius-large-storage-chest-1", amount = 2} }, - result = "warehouse-storage" + results = { + {type = "item", name = "warehouse-storage", amount = 1} + } }, { type = "recipe", name = "nullius-storehouse-passive-provider", + localised_name = {"entity-name.storehouse-passive-provider"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 2, ingredients = { - {"storehouse-basic", 1}, - {"nullius-large-supply-chest-1", 1} + {type = "item", name = "storehouse-basic", amount = 1}, + {type = "item", name = "nullius-large-supply-chest-1", amount = 1} }, - result = "storehouse-passive-provider" + results = { + {type = "item", name = "storehouse-passive-provider", amount = 1} + } }, { type = "recipe", name = "nullius-warehouse-passive-provider", + localised_name = {"entity-name.warehouse-passive-provider"}, enabled = false, always_show_made_in = true, category = "huge-crafting", energy_required = 5, ingredients = { - {"warehouse-basic", 1}, - {"nullius-large-supply-chest-1", 2} + {type = "item", name = "warehouse-basic", amount = 1}, + {type = "item", name = "nullius-large-supply-chest-1", amount = 2} }, - result = "warehouse-passive-provider" + results = { + {type = "item", name = "warehouse-passive-provider", amount = 1} + } }, { type = "recipe", name = "nullius-storehouse-requester", + localised_name = {"entity-name.storehouse-requester"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 2, ingredients = { - {"storehouse-basic", 1}, - {"nullius-large-demand-chest-1", 1} + {type = "item", name = "storehouse-basic", amount = 1}, + {type = "item", name = "nullius-large-demand-chest-1", amount = 1} }, - result = "storehouse-requester" + results = { + {type = "item", name = "storehouse-requester", amount = 1} + } }, { type = "recipe", name = "nullius-warehouse-requester", + localised_name = {"entity-name.warehouse-requester"}, enabled = false, always_show_made_in = true, category = "huge-crafting", energy_required = 5, ingredients = { - {"warehouse-basic", 1}, - {"nullius-large-demand-chest-1", 2} + {type = "item", name = "warehouse-basic", amount = 1}, + {type = "item", name = "nullius-large-demand-chest-1", amount = 2} }, - result = "warehouse-requester" + results = { + {type = "item", name = "warehouse-requester", amount = 1} + } }, { type = "recipe", name = "nullius-storehouse-buffer", + localised_name = {"entity-name.storehouse-buffer"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 2, ingredients = { - {"storehouse-basic", 1}, - {"nullius-large-buffer-chest-1", 1} + {type = "item", name = "storehouse-basic", amount = 1}, + {type = "item", name = "nullius-large-buffer-chest-1", amount = 1} }, - result = "storehouse-buffer" + results = { + {type = "item", name = "storehouse-buffer", amount = 1} + } }, { type = "recipe", name = "nullius-warehouse-buffer", + localised_name = {"entity-name.warehouse-buffer"}, enabled = false, always_show_made_in = true, category = "huge-crafting", energy_required = 5, ingredients = { - {"warehouse-basic", 1}, - {"nullius-large-buffer-chest-1", 2} + {type = "item", name = "warehouse-basic", amount = 1}, + {type = "item", name = "nullius-large-buffer-chest-1", amount = 2} }, - result = "warehouse-buffer" + results = { + {type = "item", name = "warehouse-buffer", amount = 1} + } }, { type = "recipe", name = "nullius-storehouse-active-provider", + localised_name = {"entity-name.storehouse-active-provider"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 2, ingredients = { - {"storehouse-basic", 1}, - {"nullius-large-dispatch-chest-1", 1} + {type = "item", name = "storehouse-basic", amount = 1}, + {type = "item", name = "nullius-large-dispatch-chest-1", amount = 1} }, - result = "storehouse-active-provider" + results = { + {type = "item", name = "storehouse-active-provider", amount = 1} + } }, { type = "recipe", name = "nullius-warehouse-active-provider", + localised_name = {"entity-name.warehouse-active-provider"}, enabled = false, always_show_made_in = true, category = "huge-crafting", energy_required = 5, ingredients = { - {"warehouse-basic", 1}, - {"nullius-large-dispatch-chest-1", 2} + {type = "item", name = "warehouse-basic", amount = 1}, + {type = "item", name = "nullius-large-dispatch-chest-1", amount = 2} }, - result = "warehouse-active-provider" + results = { + {type = "item", name = "warehouse-active-provider", amount = 1} + } } }) end @@ -1671,15 +1930,18 @@ data:extend({ { type = "recipe", name = "nullius-bot-upgrade-chest", + localised_name = {"entity-name.logistic-chest-botUpgrader"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 5, ingredients = { - {"nullius-small-demand-chest-1", 1}, - {"nullius-relay-2", 1} + {type = "item", name = "nullius-small-demand-chest-1", amount = 1}, + {type = "item", name = "nullius-relay-2", amount = 1} }, - result = "logistic-chest-botUpgrader" + results = { + {type = "item", name = "logistic-chest-botUpgrader", amount = 1} + } } }) end @@ -1690,16 +1952,19 @@ data:extend({ { type = "recipe", name = "nullius-fuel-train-stop", + localised_name = {"entity-name.fuel-train-stop"}, enabled = false, - always_show_made_in = true, - no_productivity = true, + always_show_made_in = true, + no_productivity = true, category = "medium-crafting", energy_required = 2, ingredients = { - {"train-stop", 1}, - {"rail-chain-signal", 1} + {type = "item", name = "train-stop", amount = 1}, + {type = "item", name = "rail-chain-signal", amount = 1} }, - result = "fuel-train-stop" + results = { + {type = "item", name = "fuel-train-stop", amount = 1} + } } }) end @@ -1750,28 +2015,32 @@ data:extend({ type = "recipe", name = "nullius-companion", enabled = false, - always_show_made_in = true, + always_show_made_in = true, category = "medium-crafting", energy_required = 90, ingredients = { - {"nullius-android-2", 1}, - {"nullius-asteroid-miner-2", 1} + {type = "item", name = "nullius-android-2", amount = 1}, + {type = "item", name = "nullius-asteroid-miner-2", amount = 1} }, - result = "companion" + results = { + {type = "item", name = "companion", amount = 1} + } }, { type = "recipe", name = "nullius-companion-reactor-equipment", enabled = false, - always_show_made_in = true, + always_show_made_in = true, category = "medium-crafting", energy_required = 30, ingredients = { - {"nullius-reactor", 1}, - {"nullius-battery-2", 6}, - {"nullius-antimatter", 12} + {type = "item", name = "nullius-reactor", amount = 1}, + {type = "item", name = "nullius-battery-2", amount = 6}, + {type = "item", name = "nullius-antimatter", amount = 12} }, - result = "companion-reactor-equipment" + results = { + {type = "item", name = "companion-reactor-equipment", amount = 1} + } }, { type = "recipe", @@ -1781,10 +2050,12 @@ data:extend({ category = "medium-crafting", energy_required = 5, ingredients = { - {"nullius-shield", 1}, - {"nullius-efficiency-module-3", 1} + {type = "item", name = "nullius-shield", amount = 1}, + {type = "item", name = "nullius-efficiency-module-3", amount = 1} }, - result = "companion-shield-equipment" + results = { + {type = "item", name = "companion-shield-equipment", amount = 1} + } }, { type = "recipe", @@ -1794,11 +2065,13 @@ data:extend({ category = "medium-crafting", energy_required = 40, ingredients = { - {"nullius-drone-carrier-2", 1}, - {"nullius-hangar-3", 1}, - {"nullius-construction-bot-4", 6} + {type = "item", name = "nullius-drone-carrier-2", amount = 1}, + {type = "item", name = "nullius-hangar-3", amount = 1}, + {type = "item", name = "nullius-construction-bot-4", amount = 6} }, - result = "companion-roboport-equipment" + results = { + {type = "item", name = "companion-roboport-equipment", amount = 1} + } }, { type = "recipe", @@ -1808,10 +2081,12 @@ data:extend({ category = "medium-crafting", energy_required = 10, ingredients = { - {"nullius-turret", 5}, - {"nullius-demolition-drone", 1} + {type = "item", name = "nullius-turret", amount = 5}, + {type = "item", name = "nullius-demolition-drone", amount = 1} }, - result = "companion-defense-equipment" + results = { + {type = "item", name = "companion-defense-equipment", amount = 1} + } }, { type = "recipe", @@ -1821,8 +2096,8 @@ data:extend({ category = "medium-crafting", energy_required = 2, ingredients = { - {"nullius-hydrogen-canister", 3}, - {"processed-fuel", 1} + {type = "item", name = "nullius-hydrogen-canister", amount = 3}, + {type = "item", name = "processed-fuel", amount = 1} }, results = { {type="item", name="rocket-booster", amount=3}, @@ -1839,30 +2114,36 @@ data:extend({ { type = "recipe", name = "nullius-railway-motorcar-1", + localised_name = {"entity-name.railway-motor-car-base"}, enabled = false, - always_show_made_in = true, + always_show_made_in = true, category = "large-crafting", energy_required = 15, ingredients = { - {"nullius-locomotive-1", 1}, - {"nullius-large-chest-1", 1}, - {"nullius-small-assembler-1", 1} + {type = "item", name = "nullius-locomotive-1", amount = 1}, + {type = "item", name = "nullius-large-chest-1", amount = 1}, + {type = "item", name = "nullius-small-assembler-1", amount = 1} }, - result = "railway-motor-car-base" + results = { + {type = "item", name = "railway-motor-car-base", amount = 1} + } }, { type = "recipe", name = "nullius-railway-motorcar-2", + localised_name = {"entity-name.railway-motor-car-nuclear"}, enabled = false, - always_show_made_in = true, + always_show_made_in = true, category = "large-crafting", energy_required = 25, ingredients = { - {"railway-motor-car-base", 1}, - {"nullius-solar-locomotive", 1}, - {"nullius-small-assembler-3", 1} + {type = "item", name = "railway-motor-car-base", amount = 1}, + {type = "item", name = "nullius-solar-locomotive", amount = 1}, + {type = "item", name = "nullius-small-assembler-3", amount = 1} }, - result = "railway-motor-car-nuclear" + results = { + {type = "item", name = "railway-motor-car-nuclear", amount = 1} + } } }) end @@ -1873,15 +2154,18 @@ data:extend({ { type = "recipe", name = "nullius-item-sensor", + localised_name = {"entity-name.item-sensor"}, enabled = false, - always_show_made_in = true, + always_show_made_in = true, category = "small-crafting", energy_required = 5, ingredients = { - {"nullius-sensor-1", 1}, - {"green-wire", 3} + {type = "item", name = "nullius-sensor-1", amount = 1}, + {type = "item", name = "nullius-green-wire", amount = 3} }, - result = "item-sensor" + results = { + {type = "item", name = "item-sensor", amount = 1} + } } }) end @@ -1897,10 +2181,12 @@ if (mods["crafting_combinator"] or mods["crafting_combinator_xeraph"]) then category = "small-crafting", energy_required = 2, ingredients = { - {"constant-combinator", 1}, - {"red-wire", 1} + {type = "item", name = "constant-combinator", amount = 1}, + {type = "item", name = "nullius-red-wire", amount = 1} }, - result = "crafting_combinator:crafting-combinator" + results = { + {type = "item", name = "crafting_combinator:crafting-combinator", amount = 1} + } }, { type = "recipe", @@ -1910,10 +2196,12 @@ if (mods["crafting_combinator"] or mods["crafting_combinator_xeraph"]) then category = "small-crafting", energy_required = 2, ingredients = { - {"arithmetic-combinator", 1}, - {"red-wire", 2} + {type = "item", name = "arithmetic-combinator", amount = 1}, + {type = "item", name = "nullius-red-wire", amount = 2} }, - result = "crafting_combinator:recipe-combinator" + results = { + {type = "item", name = "crafting_combinator:recipe-combinator", amount = 1} + } } }) end @@ -1923,50 +2211,59 @@ if mods["UPSFriendlyNixieTubeDisplay"] then data:extend({ { type = "recipe", - name = "nullius-SNTD-old-nixie-tube", + name = "nullius-classic-nixie-tube", + localised_name = {"entity-name.classic-nixie-tube"}, enabled = false, always_show_made_in = true, category = "small-crafting", energy_required = 4, ingredients = { - {"constant-combinator", 2}, - {"small-lamp", 3}, - {"nullius-aluminum-wire", 3}, - {"nullius-glass", 4} - }, - result = "SNTD-old-nixie-tube" + {type = "item", name = "constant-combinator", amount = 2}, + {type = "item", name = "small-lamp", amount = 3}, + {type = "item", name = "nullius-aluminum-wire", amount = 3}, + {type = "item", name = "nullius-glass", amount = 4} + }, + results = { + {type = "item", name = "classic-nixie-tube", amount = 1} + } }, { type = "recipe", - name = "nullius-SNTD-nixie-tube", + name = "nullius-reinforced-nixie-tube", + localised_name = {"entity-name.reinforced-nixie-tube"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 5, ingredients = { - {"SNTD-old-nixie-tube", 1}, - {"nullius-large-chest-1", 1} + {type = "item", name = "classic-nixie-tube", amount = 1}, + {type = "item", name = "nullius-large-chest-1", amount = 1} }, - result = "SNTD-nixie-tube" + results = { + {type = "item", name = "reinforced-nixie-tube", amount = 1} + } }, { type = "recipe", - name = "nullius-SNTD-nixie-tube-small", + name = "nullius-small-reinforced-nixie-tube", + localised_name = {"entity-name.small-reinforced-nixie-tube"}, enabled = false, always_show_made_in = true, category = "small-crafting", energy_required = 3, ingredients = { - {"SNTD-old-nixie-tube", 1}, - {"green-wire", 2}, - {"iron-chest", 1} + {type = "item", name = "classic-nixie-tube", amount = 1}, + {type = "item", name = "nullius-green-wire", amount = 2}, + {type = "item", name = "iron-chest", amount = 1} }, - result = "SNTD-nixie-tube-small" + results = { + {type = "item", name = "small-reinforced-nixie-tube", amount = 1} + } }, { type = "technology", - name = "nullius-SNTD-nixie-tubes-basic", - icon = "__UPSFriendlyNixieTubeDisplay__/graphics/old-nixie-technology-icon.png", + name = "nullius-reinforced-nixie-tubes-basic", + icon = "__UPSFriendlyNixieTubeDisplay__/graphics/classic-nixie-tube-technology-icon.png", icon_size = 32, unit = { count = 25, @@ -1981,14 +2278,14 @@ if mods["UPSFriendlyNixieTubeDisplay"] then effects = { { type = "unlock-recipe", - recipe = "nullius-SNTD-old-nixie-tube" + recipe = "nullius-classic-nixie-tube" } } }, { type = "technology", - name = "nullius-SNTD-nixie-tubes-reinforced", - icon = "__UPSFriendlyNixieTubeDisplay__/graphics/nixie-technology-icon.png", + name = "nullius-reinforced-nixie-tubes-reinforced", + icon = "__UPSFriendlyNixieTubeDisplay__/graphics/reinforced-nixie-tube-technology-icon.png", icon_size = 32, unit = { count = 40, @@ -1999,17 +2296,17 @@ if mods["UPSFriendlyNixieTubeDisplay"] then time = 25 }, prerequisites = { - "nullius-SNTD-nixie-tubes-basic" + "nullius-reinforced-nixie-tubes-basic" }, order = "nullius-df", effects = { { type = "unlock-recipe", - recipe = "nullius-SNTD-nixie-tube" + recipe = "nullius-reinforced-nixie-tube" }, { type = "unlock-recipe", - recipe = "nullius-SNTD-nixie-tube-small" + recipe = "nullius-small-reinforced-nixie-tube" } }, } @@ -2022,17 +2319,20 @@ data:extend({ { type = "recipe", name = "nullius-holographic-sign", + localised_name = {"entity-name.hs_holo_sign"}, enabled = false, always_show_made_in = true, category = "small-crafting", energy_required = 3, ingredients = { - {"constant-combinator", 2}, - {"small-lamp", 3}, - {"nullius-aluminum-plate", 1}, - {"nullius-glass", 2} + {type = "item", name = "constant-combinator", amount = 2}, + {type = "item", name = "small-lamp", amount = 3}, + {type = "item", name = "nullius-aluminum-plate", amount = 1}, + {type = "item", name = "nullius-glass", amount = 2} }, - result = "hs_holo_sign" + results = { + {type = "item", name = "hs_holo_sign", amount = 1} + } }, { type = "technology", @@ -2070,10 +2370,12 @@ data:extend({ category = "large-crafting", energy_required = 8, ingredients = { - {"radar", 1}, - {"nullius-robot-frame-1", 1} + {type = "item", name = "radar", amount = 1}, + {type = "item", name = "nullius-robot-frame-1", amount = 1} }, - result = "shuttle-lite" + results = { + {type = "item", name = "shuttle-lite", amount = 1} + } } }) end @@ -2090,88 +2392,106 @@ data:extend({ { type = "recipe", name = "nullius-duct-small", + localised_name = {"entity-name.duct-small"}, enabled = false, always_show_made_in = true, category = "hand-casting", energy_required = 2, ingredients = { - {"nullius-box-steel-plate", 1}, - {"nullius-underground-pipe-3", 1} + {type = "item", name = "nullius-box-steel-plate", amount = 1}, + {type = "item", name = "nullius-underground-pipe-3", amount = 1} }, - result = "duct-small" + results = { + {type = "item", name = "duct-small", amount = 1}, + } }, { type = "recipe", name = "nullius-duct-curve", + localised_name = {"entity-name.duct-curve"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 2, ingredients = { - {"duct-small", 2}, - {"nullius-steel-rod", 1} + {type = "item", name = "duct-small", amount = 2}, + {type = "item", name = "nullius-steel-rod", amount = 1} }, - result = "duct-curve" + results = { + {type = "item", name = "duct-curve", amount = 1}, + } }, { type = "recipe", name = "nullius-duct-t-junction", + localised_name = {"entity-name.duct-t-junction"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 3, ingredients = { - {"duct-small", 3}, - {"nullius-steel-rod", 2} + {type = "item", name = "duct-small", amount = 3}, + {type = "item", name = "nullius-steel-rod", amount = 2} }, - result = "duct-t-junction" + results = { + {type = "item", name = "duct-t-junction", amount = 1}, + } }, { type = "recipe", name = "nullius-duct-cross", + localised_name = {"entity-name.duct-cross"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 4, ingredients = { - {"duct-small", 4}, - {"nullius-steel-rod", 3} + {type = "item", name = "duct-small", amount = 4}, + {type = "item", name = "nullius-steel-rod", amount = 3} }, - result = "duct-cross" + results = { + {type = "item", name = "duct-cross", amount = 1}, + } }, { type = "recipe", - name = "nullius-duct-end-point-outtake", + name = "nullius-duct-exhaust", + localised_name = {"entity-name.duct-exhaust"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 5, ingredients = { - {"duct-cross", 1}, - {"nullius-outfall-2", 1} + {type = "item", name = "duct-cross", amount = 1}, + {type = "item", name = "nullius-outfall-2", amount = 1} }, - result = "duct-end-point-outtake" + results = { + {type = "item", name = "duct-exhaust", amount = 1}, + } }, { type = "recipe", - name = "nullius-duct-end-point-intake", + name = "nullius-duct-intake", + localised_name = {"entity-name.duct-intake"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 5, ingredients = { - {"duct-end-point-outtake", 1}, - {"nullius-box-pump-2", 1} + {type = "item", name = "duct-exhaust", amount = 1}, + {type = "item", name = "nullius-box-pump-2", amount = 1} }, - result = "duct-end-point-intake" + results = { + {type = "item", name = "duct-intake", amount = 1}, + } }, { type = "technology", name = "nullius-ducts", - localised_name = {"technology-name.Ducts"}, - localised_description = {"technology-description.Ducts"}, - icon = "__FluidMustFlow__/graphics/icon/technologies/iron_duct_tecnology.png", - icon_size = 128, + localised_name = {"technology-name.ducts"}, + localised_description = {"technology-description.ducts"}, + icon = "__FluidMustFlow__/graphics/icons/technologies/ducts.png", + icon_size = 256, order = "nullius-df", effects = { { @@ -2196,11 +2516,11 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "nullius-duct-end-point-outtake", + recipe = "nullius-duct-exhaust", }, { type = "unlock-recipe", - recipe = "nullius-duct-end-point-intake", + recipe = "nullius-duct-intake", }, { type = "unlock-recipe", @@ -2230,54 +2550,66 @@ data:extend({ { type = "recipe", name = "nullius-duct", + localised_name = {"entity-name.duct"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 2, ingredients = { - {"duct-small", 2}, - {"nullius-steel-rod", 1} + {type = "item", name = "duct-small", amount = 2}, + {type = "item", name = "nullius-steel-rod", amount = 1} }, - result = "duct" + results = { + {type = "item", name = "duct", amount = 1}, + } }, { type = "recipe", name = "nullius-duct-long", + localised_name = {"entity-name.duct-long"}, enabled = false, always_show_made_in = true, category = "huge-crafting", energy_required = 2, ingredients = { - {"duct", 2}, - {"nullius-steel-rod", 1} + {type = "item", name = "duct", amount = 2}, + {type = "item", name = "nullius-steel-rod", amount = 1} }, - result = "duct-long" + results = { + {type = "item", name = "duct-long", amount = 1}, + } }, { type = "recipe", name = "nullius-duct-underground", + localised_name = {"entity-name.duct-underground"}, enabled = false, always_show_made_in = true, category = "huge-crafting", energy_required = 6, ingredients = { - {"duct-long", 3}, - {"nullius-box-reinforced-concrete", 4} + {type = "item", name = "duct-long", amount = 3}, + {type = "item", name = "nullius-box-reinforced-concrete", amount = 4} }, - result = "duct-underground" + results = { + {type = "item", name = "duct-underground", amount = 1}, + } }, { type = "recipe", name = "nullius-non-return-duct", + localised_name = {"entity-name.non-return-duct"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 3, ingredients = { - {"duct", 1}, - {"nullius-box-one-way-valve", 1} + {type = "item", name = "duct", amount = 1}, + {type = "item", name = "nullius-box-one-way-valve", amount = 1} }, - result = "non-return-duct" + results = { + {type = "item", name = "non-return-duct", amount = 1}, + } } }) else @@ -2285,28 +2617,34 @@ data:extend({ { type = "recipe", name = "nullius-duct-underground", + localised_name = {"entity-name.duct-underground"}, enabled = false, always_show_made_in = true, category = "huge-crafting", energy_required = 6, ingredients = { - {"duct-small", 12}, - {"nullius-box-reinforced-concrete", 4} + {type = "item", name = "duct-small", amount = 12}, + {type = "item", name = "nullius-box-reinforced-concrete", amount = 4} }, - result = "duct-underground" + results = { + {type = "item", name = "duct-underground", amount = 1}, + } }, { type = "recipe", name = "nullius-non-return-duct", + localised_name = {"entity-name.non-return-duct"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 3, ingredients = { - {"duct-small", 2}, - {"nullius-box-one-way-valve", 1} + {type = "item", name = "duct-small", amount = 2}, + {type = "item", name = "nullius-box-one-way-valve", amount = 1} }, - result = "non-return-duct" + results = { + {type = "item", name = "non-return-duct", amount = 1}, + } } }) end @@ -2333,14 +2671,16 @@ data:extend({ category = "huge-crafting", energy_required = 8, ingredients = { - {"rail", 3}, - {"gate", 8}, - {"stone-wall", 12}, - {"nullius-large-chest-2", 2}, - {"express-underground-belt", 6}, - {"nullius-steel-beam", 16} + {type = "item", name = "rail", amount = 3}, + {type = "item", name = "gate", amount = 8}, + {type = "item", name = "stone-wall", amount = 12}, + {type = "item", name = "nullius-large-chest-2", amount = 2}, + {type = "item", name = "express-underground-belt", amount = 6}, + {type = "item", name = "nullius-steel-beam", amount = 16} }, - result = "railloader" + results = { + {type = "item", name = "railloader", amount = 1} + } }, { type = "recipe", @@ -2350,14 +2690,16 @@ data:extend({ category = "huge-crafting", energy_required = 8, ingredients = { - {"rail", 3}, - {"gate", 8}, - {"stone-wall", 12}, - {"nullius-large-chest-2", 2}, - {"express-underground-belt", 6}, - {"concrete", 36} + {type = "item", name = "rail", amount = 3}, + {type = "item", name = "gate", amount = 8}, + {type = "item", name = "stone-wall", amount = 12}, + {type = "item", name = "nullius-large-chest-2", amount = 2}, + {type = "item", name = "express-underground-belt", amount = 6}, + {type = "item", name = "concrete", amount = 36} }, - result = "railunloader" + results = { + {type = "item", name = "railunloader", amount = 1} + } }, { type = "technology", @@ -2409,115 +2751,87 @@ data:extend({ { type = "recipe", name = "nullius-thrower-1", + localised_name = {"entity-name.nullius-thrower", tostring(1)}, enabled = false, always_show_made_in = true, - GCKI_ignore = true, + GCKI_ignore = true, category = "medium-crafting", energy_required = 3, ingredients = { - {"inserter", 2}, - {"nullius-motor-1", 1} + {type = "item", name = "inserter", amount = 2}, + {type = "item", name = "nullius-motor-1", amount = 1} }, - result = "inserter" + results = { + {type = "item", name = "inserter", amount = 1} + } }, { type = "recipe", name = "nullius-thrower-2", + localised_name = {"entity-name.nullius-thrower", tostring(2)}, enabled = false, always_show_made_in = true, - GCKI_ignore = true, + GCKI_ignore = true, category = "medium-crafting", energy_required = 2, ingredients = { - {"RTThrower-inserter-Item", 1}, - {"turbo-inserter", 1}, - {"nullius-motor-2", 1} + {type = "item", name = "RTThrower-inserter-Item", amount = 1}, + {type = "item", name = "bob-turbo-inserter", amount = 1}, + {type = "item", name = "nullius-motor-2", amount = 1} }, - result = "turbo-inserter" - }, - { - type = "recipe", - name = "nullius-filter-thrower-2", - enabled = false, - always_show_made_in = true, - GCKI_ignore = true, - category = "medium-crafting", - energy_required = 2, - ingredients = { - {"RTThrower-inserter-Item", 1}, - {"turbo-filter-inserter", 1}, - {"nullius-motor-2", 1} - }, - result = "turbo-filter-inserter" + results = { + {type = "item", name = "bob-turbo-inserter", amount = 1} + } }, { type = "recipe", name = "nullius-thrower-3", + localised_name = {"entity-name.nullius-thrower", tostring(3)}, enabled = false, always_show_made_in = true, - GCKI_ignore = true, + GCKI_ignore = true, category = "medium-crafting", energy_required = 2, ingredients = { - {"RTThrower-turbo-inserter-Item", 1}, - {"stack-inserter", 2} + {type = "item", name = "RTThrower-bob-turbo-inserter-Item", amount = 1}, + {type = "item", name = "bulk-inserter", amount = 2} }, - result = "stack-inserter" - }, - { - type = "recipe", - name = "nullius-filter-thrower-3", - enabled = false, - always_show_made_in = true, - GCKI_ignore = true, - category = "medium-crafting", - energy_required = 2, - ingredients = { - {"RTThrower-turbo-filter-inserter-Item", 1}, - {"stack-filter-inserter", 2} - }, - result = "stack-filter-inserter" + results = { + {type = "item", name = "bulk-inserter", amount = 1} + } }, { type = "recipe", name = "nullius-thrower-4", + localised_name = {"entity-name.nullius-thrower", tostring(4)}, enabled = false, always_show_made_in = true, - GCKI_ignore = true, - category = "medium-crafting", - energy_required = 3, - ingredients = { - {"RTThrower-stack-inserter-Item", 1}, - {"express-stack-inserter", 2} - }, - result = "express-stack-inserter" - }, - { - type = "recipe", - name = "nullius-filter-thrower-4", - enabled = false, - always_show_made_in = true, - GCKI_ignore = true, + GCKI_ignore = true, category = "medium-crafting", energy_required = 3, ingredients = { - {"RTThrower-stack-filter-inserter-Item", 1}, - {"express-stack-filter-inserter", 2} + {type = "item", name = "RTThrower-bulk-inserter-Item", amount = 1}, + {type = "item", name = "bob-express-bulk-inserter", amount = 2} }, - result = "express-stack-filter-inserter" + results = { + {type = "item", name = "bob-express-bulk-inserter", amount = 1} + } }, { type = "recipe", name = "nullius-open-chest", + localised_name = {"entity-name.OpenContainer"}, enabled = false, always_show_made_in = true, no_productivity = true, category = "medium-crafting", energy_required = 0.5, ingredients = { - {"wooden-chest", 1} + {type = "item", name = "wooden-chest", amount = 1} }, - result = "OpenContainerItem" + results = { + {type = "item", name = "OpenContainer", amount = 1} + } }, { type = "recipe", @@ -2527,45 +2841,54 @@ data:extend({ always_show_made_in = true, no_productivity = true, category = "medium-crafting", - subgroup = "nullius-renai-bounce", - order = "nullius-dc", + subgroup = "nullius-renai-bounce", + order = "nullius-dc", energy_required = 0.5, ingredients = { - {"OpenContainerItem", 1} + {type = "item", name = "OpenContainer", amount = 1} }, - result = "wooden-chest" + results = { + {type = "item", name = "wooden-chest", amount = 1} + } }, { type = "recipe", name = "nullius-hatch", + localised_name = {"entity-name.HatchRT"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 2, ingredients = { - {"nullius-underground-pipe-2", 1}, - {"nullius-priority-valve", 1}, - {"nullius-steel-rod", 1} + {type = "item", name = "nullius-underground-pipe-2", amount = 1}, + {type = "item", name = "nullius-priority-valve", amount = 1}, + {type = "item", name = "nullius-steel-rod", amount = 1} }, - result = "HatchRTItem" + results = { + {type = "item", name = "HatchRT", amount = 1} + } }, { type = "recipe", name = "nullius-ejector-hatch", + localised_name = {"entity-name.RTThrower-EjectorHatchRT"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 2, ingredients = { - {"HatchRTItem", 1}, - {"RTThrower-turbo-inserter-Item", 1}, - {"fast-underground-belt", 1} + {type = "item", name = "HatchRT", amount = 1}, + {type = "item", name = "RTThrower-bob-turbo-inserter-Item", amount = 1}, + {type = "item", name = "fast-underground-belt", amount = 1} }, - result = "RTThrower-EjectorHatchRTItem" + results = { + {type = "item", name = "RTThrower-EjectorHatchRT", amount = 1} + } }, { type = "recipe", name = "nullius-player-thrower", + localised_name = {"entity-name.PlayerLauncher"}, enabled = false, always_show_made_in = true, category = "medium-crafting", @@ -2574,62 +2897,75 @@ data:extend({ {type="item", name="RTThrower-inserter-Item", amount=1}, {type="item", name="nullius-steel-plate", amount=2} }, - result = "PlayerLauncherItem" + results = { + {type = "item", name = "PlayerLauncher", amount = 1} + } }, { type = "recipe", name = "nullius-bounce-plate", + localised_name = {"entity-name.RTBouncePlate"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 3, ingredients = { - {"nullius-rubber", 4}, - {"nullius-iron-wire", 3}, - {"nullius-steel-rod", 2} + {type = "item", name = "nullius-rubber", amount = 4}, + {type = "item", name = "nullius-iron-wire", amount = 3}, + {type = "item", name = "nullius-steel-rod", amount = 2} }, - result = "BouncePlateItem" + results = { + {type = "item", name = "RTBouncePlate", amount = 1} + } }, { type = "recipe", name = "nullius-directed-bounce-plate", + localised_name = {"entity-name.DirectedBouncePlate"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 1, ingredients = { - {"BouncePlateItem", 1}, - {"stone-brick", 6} - }, - result = "DirectedBouncePlateItem" - }, - { - type = "recipe", - name = "nullius-signal-bounce-plate", - enabled = false, - always_show_made_in = true, - category = "small-crafting", - energy_required = 1, - ingredients = { - {"BouncePlateItem", 1}, - {"constant-combinator", 1} + {type = "item", name = "RTBouncePlate", amount = 1}, + {type = "item", name = "stone-brick", amount = 6} }, - result = "SignalBouncePlateItem" - }, + results = { + {type = "item", name = "DirectedBouncePlate", amount = 1} + } + }, + -- { + -- type = "recipe", + -- name = "nullius-signal-bounce-plate", -- Recently removed by the original mod + -- enabled = false, + -- always_show_made_in = true, + -- category = "small-crafting", + -- energy_required = 1, + -- ingredients = { + -- {type = "item", name = "RTBouncePlate", amount = 1}, + -- {type = "item", name = "constant-combinator", amount = 1} + -- }, + -- results = { + -- {type = "item", name = "SignalBouncePlate", amount = 1} + -- } + -- }, { type = "recipe", name = "nullius-director-bounce-plate", + localised_name = {"entity-name.DirectorBouncePlate"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 3, ingredients = { - {"DirectedBouncePlateItem", 1}, - {"nullius-motor-2", 1}, - {"nullius-iron-gear", 3}, - {"nullius-sensor-1", 1} + {type = "item", name = "DirectedBouncePlate", amount = 1}, + {type = "item", name = "nullius-motor-2", amount = 1}, + {type = "item", name = "nullius-iron-gear", amount = 3}, + {type = "item", name = "nullius-sensor-1", amount = 1} }, - result = "DirectorBouncePlateItem" + results = { + {type = "item", name = "DirectorBouncePlate", amount = 1} + } } }) end @@ -2645,133 +2981,160 @@ data:extend({ { type = "recipe", name = "nullius-zipline-trolley", + localised_name = {"item-name.RTZiplineTrolley"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 3, ingredients = { - {"nullius-locomotive-1", 1}, - {"nullius-iron-wire", 2} + {type = "item", name = "nullius-locomotive-1", amount = 1}, + {type = "item", name = "nullius-iron-wire", amount = 2} }, - result = "RTZiplineItem" + results = { + {type = "item", name = "RTZiplineTrolley", amount = 1} + } }, { type = "recipe", name = "nullius-zipline-trolley-2", + localised_name = {"item-name.RTZiplineTrolley2"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 6, ingredients = { - {"RTZiplineItem", 2}, - {"nullius-motor-2", 3}, - {"nullius-steel-cable", 10} + {type = "item", name = "RTZiplineTrolley", amount = 2}, + {type = "item", name = "nullius-motor-2", amount = 3}, + {type = "item", name = "nullius-steel-cable", amount = 10} }, - result = "RTZiplineItem2" + results = { + {type = "item", name = "RTZiplineTrolley2", amount = 1} + } }, { type = "recipe", name = "nullius-zipline-trolley-3", + localised_name = {"item-name.RTZiplineTrolley3"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 12, ingredients = { - {"RTZiplineItem2", 1}, - {"nullius-locomotive-2", 1}, - {"nullius-textile", 8}, - {"nullius-speed-module-2", 1} + {type = "item", name = "RTZiplineTrolley2", amount = 1}, + {type = "item", name = "nullius-locomotive-2", amount = 1}, + {type = "item", name = "nullius-textile", amount = 8}, + {type = "item", name = "nullius-speed-module-2", amount = 1} }, - result = "RTZiplineItem3" + results = { + {type = "item", name = "RTZiplineTrolley3", amount = 1} + } }, { type = "recipe", name = "nullius-zipline-trolley-4", + localised_name = {"item-name.RTZiplineTrolley4"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 25, ingredients = { - {"RTZiplineItem3", 1}, - {"nullius-motor-3", 4}, - {"nullius-carbon-composite", 12}, - {"nullius-bearing", 12}, - {"nullius-levitation-field-1", 2} + {type = "item", name = "RTZiplineTrolley3", amount = 1}, + {type = "item", name = "nullius-motor-3", amount = 4}, + {type = "item", name = "nullius-carbon-composite", amount = 12}, + {type = "item", name = "nullius-bearing", amount = 12}, + {type = "item", name = "nullius-levitation-field-1", amount = 2} }, - result = "RTZiplineItem4" + results = { + {type = "item", name = "RTZiplineTrolley4", amount = 1} + } }, { type = "recipe", name = "nullius-zipline-trolley-5", + localised_name = {"item-name.RTZiplineTrolley5"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 50, ingredients = { - {"RTZiplineItem4", 2}, - {"nullius-locomotive-3", 1}, - {"nullius-titanium-rod", 6}, - {"nullius-speed-module-3", 3}, - {"nullius-stabilizer-1", 2} + {type = "item", name = "RTZiplineTrolley4", amount = 2}, + {type = "item", name = "nullius-locomotive-3", amount = 1}, + {type = "item", name = "nullius-titanium-rod", amount = 6}, + {type = "item", name = "nullius-speed-module-3", amount = 3}, + {type = "item", name = "nullius-stabilizer-1", amount = 2} }, - result = "RTZiplineItem5" + results = { + {type = "item", name = "RTZiplineTrolley5", amount = 1} + } }, { type = "recipe", name = "nullius-zipline-control", + localised_name = {"item-name.RTZiplineControls"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 2, ingredients = { - {"power-switch", 1}, - {"decider-combinator", 1} + {type = "item", name = "power-switch", amount = 1}, + {type = "item", name = "decider-combinator", amount = 1} }, - result = "RTZiplineControlsItem" + results = { + {type = "item", name = "RTZiplineControls", amount = 1} + } }, { type = "recipe", name = "nullius-zipline-crank-control", + localised_name = {"item-name.RTZiplineCrankControls"}, enabled = false, always_show_made_in = true, category = "medium-crafting", energy_required = 1, ingredients = { - {"RTZiplineControlsItem", 1}, - {"nullius-steel-rod", 1}, - {"nullius-steel-gear", 2} + {type = "item", name = "RTZiplineControls", amount = 1}, + {type = "item", name = "nullius-steel-rod", amount = 1}, + {type = "item", name = "nullius-steel-gear", amount = 2} }, - result = "RTZiplineCrankControlsItem" + results = { + {type = "item", name = "RTZiplineCrankControls", amount = 1} + } }, { type = "recipe", name = "nullius-zipline-smart-control", + localised_name = {"item-name.RTProgrammableZiplineControls"}, enabled = false, always_show_made_in = true, category = "tiny-crafting", energy_required = 5, ingredients = { - {"RTZiplineControlsItem", 1}, - {"nullius-speed-module-1", 1}, - {"programmable-speaker", 1}, - {"nullius-sensor-1", 1} + {type = "item", name = "RTZiplineControls", amount = 1}, + {type = "item", name = "nullius-speed-module-1", amount = 1}, + {type = "item", name = "programmable-speaker", amount = 1}, + {type = "item", name = "nullius-sensor-1", amount = 1} }, - result = "RTProgrammableZiplineControlsItem" + results = { + {type = "item", name = "RTProgrammableZiplineControls", amount = 1} + } }, { type = "recipe", name = "nullius-zipline-terminal", + localised_name = {"entity-name.RTZiplineTerminal"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 15, ingredients = { - {"RTProgrammableZiplineControlsItem", 1}, - {"train-stop", 1}, - {"nullius-steel-cable", 12}, - {"big-electric-pole", 1} + {type = "item", name = "RTProgrammableZiplineControls", amount = 1}, + {type = "item", name = "train-stop", amount = 1}, + {type = "item", name = "nullius-steel-cable", amount = 12}, + {type = "item", name = "big-electric-pole", amount = 1} }, - result = "RTZiplineTerminalItem" + results = { + {type = "item", name = "RTZiplineTerminal", amount = 1} + } } }) end @@ -2787,61 +3150,73 @@ data:extend({ { type = "recipe", name = "nullius-train-ramp", + localised_name = {"entity-name.RTTrainRamp"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 4, ingredients = { - {"rail", 2}, - {"concrete", 25}, - {"nullius-steel-beam", 4} + {type = "item", name = "rail", amount = 2}, + {type = "item", name = "concrete", amount = 25}, + {type = "item", name = "nullius-steel-beam", amount = 4} }, - result = "RTTrainRampItem" + results = { + {type = "item", name = "RTTrainRamp", amount = 1} + } }, { type = "recipe", name = "nullius-magnetic-ramp", + localised_name = {"entity-name.RTMagnetTrainRamp"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 6, ingredients = { - {"RTTrainRampItem", 1}, - {"nullius-grid-battery-1", 1}, - {"nullius-beacon-2", 1}, - {"nullius-levitation-field-1", 4} + {type = "item", name = "RTTrainRamp", amount = 1}, + {type = "item", name = "nullius-grid-battery-1", amount = 1}, + {type = "item", name = "nullius-beacon-2", amount = 1}, + {type = "item", name = "nullius-levitation-field-1", amount = 4} }, - result = "RTMagnetTrainRampItem" + results = { + {type = "item", name = "RTMagnetTrainRamp", amount = 1} + } }, { type = "recipe", name = "nullius-impact-unloader", + localised_name = {"entity-name.RTImpactUnloader"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 5, ingredients = { - {"stone-wall", 6}, - {"refined-concrete", 30}, - {"nullius-steel-plate", 12}, - {"RTTrainDirectedBouncePlateItem", 1} + {type = "item", name = "stone-wall", amount = 6}, + {type = "item", name = "refined-concrete", amount = 30}, + {type = "item", name = "nullius-steel-plate", amount = 12}, + {type = "item", name = "RTTrainDirectedBouncePlate", amount = 1} }, - result = "RTImpactUnloaderItem" + results = { + {type = "item", name = "RTImpactUnloader", amount = 1} + } }, { type = "recipe", name = "nullius-impact-wagon", + localised_name = {"entity-name.RTImpactWagon"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 4, ingredients = { - {"nullius-cargo-wagon-2", 1}, - {"HatchRTItem", 5}, - {"nullius-steel-gear", 4}, - {"nullius-steel-plate", 10} + {type = "item", name = "nullius-cargo-wagon-2", amount = 1}, + {type = "item", name = "HatchRT", amount = 5}, + {type = "item", name = "nullius-steel-gear", amount = 4}, + {type = "item", name = "nullius-steel-plate", amount = 10} }, - result = "RTImpactWagonItem" + results = { + {type = "item", name = "RTImpactWagon", amount = 1} + } } }) if settings.startup["RTThrowersSetting"].value then @@ -2849,36 +3224,42 @@ data:extend({ { type = "recipe", name = "nullius-train-bounce-plate", + localised_name = {"entity-name.RTTrainBouncePlate"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 5, ingredients = { - {"BouncePlateItem", 6}, - {"nullius-textile", 12}, - {"nullius-steel-beam", 4} + {type = "item", name = "RTBouncePlate", amount = 6}, + {type = "item", name = "nullius-textile", amount = 12}, + {type = "item", name = "nullius-steel-beam", amount = 4} }, - result = "RTTrainBouncePlateItem" + results = { + {type = "item", name = "RTTrainBouncePlate", amount = 1} + } }, { type = "recipe", name = "nullius-train-directed-bounce-plate", + localised_name = {"entity-name.RTTrainDirectedBouncePlate"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 2, ingredients = { - {"RTTrainBouncePlateItem", 1}, - {"RTTrainRampItem", 1} + {type = "item", name = "RTTrainBouncePlate", amount = 1}, + {type = "item", name = "RTTrainRamp", amount = 1} }, - result = "RTTrainDirectedBouncePlateItem" + results = { + {type = "item", name = "RTTrainDirectedBouncePlate", amount = 1} + } } }) else data.raw.recipe["nullius-impact-unloader"].ingredients[4] = - {"nullius-rubber", 30} + {type = "item", name = "nullius-rubber", amount = 30} data.raw.recipe["nullius-impact-wagon"].ingredients[2] = - {"nullius-priority-valve", 8} + {type = "item", name = "nullius-priority-valve", amount = 8} end end @@ -2888,8 +3269,8 @@ data:extend({ type = "technology", name = "nullius-logistic-ballistics-1", order = "nullius-cd", - icon = "__RenaiTransportation__/graphics/tech/ThrowerTech.png", - icon_size = 128, + icon = "__RenaiTransportation__/graphics/technology/ThrowerTech.png", + icon_size = 256, effects = { { type = "unlock-recipe", @@ -2916,8 +3297,8 @@ data:extend({ type = "technology", name = "nullius-logistic-ballistics-2", order = "nullius-cf", - icon = "__RenaiTransportation__/graphics/tech/start.png", - icon_size = 128, + icon = "__RenaiTransportation__/graphics/technology/start.png", + icon_size = 256, effects = { { type = "unlock-recipe", @@ -2936,8 +3317,8 @@ data:extend({ type = "technology", name = "nullius-logistic-ballistics-3", order = "nullius-ci", - icon = "__RenaiTransportation__/graphics/hatch/icon.png", - icon_size = 64, + icon = "__RenaiTransportation__/graphics/icons/hatch_icon.png", + icon_size = 64, effects = { { type = "unlock-recipe", @@ -2956,8 +3337,8 @@ data:extend({ type = "technology", name = "nullius-logistic-ballistics-4", order = "nullius-cj", - icon = "__RenaiTransportation__/graphics/BouncePlates/BouncePlate/PlateIconn.png", - icon_size = 64, + icon = "__RenaiTransportation__/graphics/technology/PrimerPlateIconn.png", + icon_size = 256, effects = { { type = "unlock-recipe", @@ -2980,16 +3361,12 @@ data:extend({ type = "technology", name = "nullius-logistic-ballistics-5", order = "nullius-de", - icon = "__RenaiTransportation__/graphics/tech/ThrowerTech.png", - icon_size = 128, + icon = "__RenaiTransportation__/graphics/technology/ThrowerTech.png", + icon_size = 256, effects = { { type = "unlock-recipe", recipe = "nullius-thrower-2" - }, - { - type = "unlock-recipe", - recipe = "nullius-filter-thrower-2" } }, unit = { @@ -3007,13 +3384,13 @@ data:extend({ type = "technology", name = "nullius-logistic-ballistics-6", order = "nullius-dl", - icon = "__RenaiTransportation__/graphics/BouncePlates/DirectorBouncePlate/DirectorPlateIcon.png", - icon_size = 64, + icon = "__RenaiTransportation__/graphics/icons/DirectorPlateIcon.png", + icon_size = 256, effects = { - { - type = "unlock-recipe", - recipe = "nullius-signal-bounce-plate" - }, + -- { + -- type = "unlock-recipe", + -- recipe = "nullius-signal-bounce-plate" + -- }, { type = "unlock-recipe", recipe = "nullius-director-bounce-plate" @@ -3037,17 +3414,13 @@ data:extend({ type = "technology", name = "nullius-logistic-ballistics-7", order = "nullius-ek", - icon = "__RenaiTransportation__/graphics/tech/ThrowerTech.png", - icon_size = 128, + icon = "__RenaiTransportation__/graphics/technology/ThrowerTech.png", + icon_size = 256, effects = { { type = "unlock-recipe", recipe = "nullius-thrower-3" }, - { - type = "unlock-recipe", - recipe = "nullius-filter-thrower-3" - } }, unit = { count = 400, @@ -3064,17 +3437,13 @@ data:extend({ type = "technology", name = "nullius-logistic-ballistics-8", order = "nullius-fe", - icon = "__RenaiTransportation__/graphics/tech/ThrowerTech.png", - icon_size = 128, + icon = "__RenaiTransportation__/graphics/technology/ThrowerTech.png", + icon_size = 256, effects = { { type = "unlock-recipe", recipe = "nullius-thrower-4" }, - { - type = "unlock-recipe", - recipe = "nullius-filter-thrower-4" - } }, unit = { count = 1200, @@ -3103,8 +3472,8 @@ data:extend({ name = "nullius-ziplining-1", localised_description = {"technology-description.RTZiplineTech"}, order = "nullius-dd", - icon = "__RenaiTransportation__/graphics/zipline/controls.png", - icon_size = 64, + icon = "__RenaiTransportation__/graphics/technology/Zipline_crankcontrols.png", + icon_size = 256, effects = { { type = "unlock-recipe", @@ -3135,8 +3504,8 @@ data:extend({ name = "nullius-ziplining-2", localised_description = {"technology-description.RTZiplineTech"}, order = "nullius-dm", - icon = "__RenaiTransportation__/graphics/zipline/terminaltech.png", - icon_size = 128, + icon = "__RenaiTransportation__/graphics/technology/Zipline_terminaltech.png", + icon_size = 256, effects = { { type = "unlock-recipe", @@ -3166,8 +3535,8 @@ data:extend({ name = "nullius-ziplining-3", localised_description = {"technology-description.RTZiplineTech"}, order = "nullius-em", - icon = "__RenaiTransportation__/graphics/zipline/icon.png", - icon_size = 64, + icon = "__RenaiTransportation__/graphics/technology/Zipline1.png", + icon_size = 256, effects = { { type = "unlock-recipe", @@ -3179,7 +3548,7 @@ data:extend({ ingredients = { {"nullius-geology-pack", 1}, {"nullius-climatology-pack", 1}, {"nullius-mechanical-pack", 1}, {"nullius-electrical-pack", 1}, - {"nullius-chemical-pack", 1} + {"nullius-chemical-pack", 1} }, time = 35 }, @@ -3191,8 +3560,8 @@ data:extend({ name = "nullius-ziplining-4", localised_description = {"technology-description.RTZiplineTech"}, order = "nullius-fh", - icon = "__RenaiTransportation__/graphics/zipline/autocontrols.png", - icon_size = 64, + icon = "__RenaiTransportation__/graphics/technology/Zipline2.png", + icon_size = 256, effects = { { type = "unlock-recipe", @@ -3215,8 +3584,8 @@ data:extend({ name = "nullius-ziplining-5", localised_description = {"technology-description.RTZiplineTech"}, order = "nullius-gd", - icon = "__RenaiTransportation__/graphics/zipline/controls.png", - icon_size = 64, + icon = "__RenaiTransportation__/graphics/technology/Zipline3.png", + icon_size = 256, effects = { { type = "unlock-recipe", @@ -3246,8 +3615,8 @@ if settings.startup["RTTrainRampSetting"].value then type = "technology", name = "nullius-freight-ballistics-1", order = "nullius-dm", - icon = "__RenaiTransportation__/graphics/tech/FlyingFreight.png", - icon_size = 128, + icon = "__RenaiTransportation__/graphics/technology/FlyingFreight.png", + icon_size = 256, effects = { { type = "unlock-recipe", @@ -3268,8 +3637,8 @@ if settings.startup["RTTrainRampSetting"].value then type = "technology", name = "nullius-freight-ballistics-2", order = "nullius-eh", - icon = "__RenaiTransportation__/graphics/tech/FlyingFreightPlate.png", - icon_size = 128, + icon = "__RenaiTransportation__/graphics/technology/FlyingFreightPlate.png", + icon_size = 256, effects = { { type = "unlock-recipe", @@ -3295,8 +3664,8 @@ if settings.startup["RTTrainRampSetting"].value then type = "technology", name = "nullius-freight-ballistics-3", order = "nullius-eq", - icon = "__RenaiTransportation__/graphics/tech/Impact.png", - icon_size = 128, + icon = "__RenaiTransportation__/graphics/technology/Impact.png", + icon_size = 256, effects = { { type = "unlock-recipe", @@ -3322,8 +3691,8 @@ if settings.startup["RTTrainRampSetting"].value then type = "technology", name = "nullius-freight-ballistics-4", order = "nullius-fc", - icon = "__RenaiTransportation__/graphics/tech/MagnetFreight.png", - icon_size = 128, + icon = "__RenaiTransportation__/graphics/technology/MagnetFreight.png", + icon_size = 256, effects = { { type = "unlock-recipe", @@ -3366,11 +3735,13 @@ data:extend({ category = "medium-crafting", energy_required = 2, ingredients = { - {"nullius-rubber", 1}, - {"nullius-glass", 1}, - {"nullius-steel-sheet", 2} + {type = "item", name = "nullius-rubber", amount = 1}, + {type = "item", name = "nullius-glass", amount = 1}, + {type = "item", name = "nullius-steel-sheet", amount = 2} }, - result = "iron-display-small" + results = { + {type = "item", name = "iron-display-small", amount = 1} + } }, { type = "recipe", @@ -3380,10 +3751,12 @@ data:extend({ category = "medium-crafting", energy_required = 2, ingredients = { - {"iron-display-small", 4}, - {"small-lamp", 1} + {type = "item", name = "iron-display-small", amount = 4}, + {type = "item", name = "small-lamp", amount = 1} }, - result = "iron-display-medium" + results = { + {type = "item", name = "iron-display-medium", amount = 1} + } }, { type = "recipe", @@ -3393,10 +3766,12 @@ data:extend({ category = "medium-crafting", energy_required = 5, ingredients = { - {"iron-display-small", 9}, - {"small-lamp", 4} + {type = "item", name = "iron-display-small", amount = 9}, + {type = "item", name = "small-lamp", amount = 4} }, - result = "iron-display" + results = { + {type = "item", name = "iron-display", amount = 1} + } }, { type = "recipe", @@ -3406,11 +3781,13 @@ data:extend({ category = "medium-crafting", energy_required = 2, ingredients = { - {"nullius-rubber", 1}, - {"nullius-glass", 1}, - {"nullius-aluminum-sheet", 3} + {type = "item", name = "nullius-rubber", amount = 1}, + {type = "item", name = "nullius-glass", amount = 1}, + {type = "item", name = "nullius-aluminum-sheet", amount = 3} }, - result = "steel-display-small" + results = { + {type = "item", name = "steel-display-small", amount = 1} + } }, { type = "recipe", @@ -3420,10 +3797,12 @@ data:extend({ category = "medium-crafting", energy_required = 2, ingredients = { - {"steel-display-small", 4}, - {"small-lamp", 1} + {type = "item", name = "steel-display-small", amount = 4}, + {type = "item", name = "small-lamp", amount = 1} }, - result = "steel-display-medium" + results = { + {type = "item", name = "steel-display-medium", amount = 1} + } }, { type = "recipe", @@ -3433,10 +3812,12 @@ data:extend({ category = "medium-crafting", energy_required = 5, ingredients = { - {"steel-display-small", 9}, - {"small-lamp", 4} + {type = "item", name = "steel-display-small", amount = 9}, + {type = "item", name = "small-lamp", amount = 4} }, - result = "steel-display" + results = { + {type = "item", name = "steel-display", amount = 1} + } }, { type = "recipe", @@ -3446,11 +3827,13 @@ data:extend({ category = "medium-crafting", energy_required = 2, ingredients = { - {"nullius-rubber", 1}, - {"nullius-glass", 1}, - {"nullius-plastic", 4} + {type = "item", name = "nullius-rubber", amount = 1}, + {type = "item", name = "nullius-glass", amount = 1}, + {type = "item", name = "nullius-plastic", amount = 4} }, - result = "copper-display-small" + results = { + {type = "item", name = "copper-display-small", amount = 1} + } }, { type = "recipe", @@ -3460,10 +3843,12 @@ data:extend({ category = "medium-crafting", energy_required = 2, ingredients = { - {"copper-display-small", 4}, - {"small-lamp", 1} + {type = "item", name = "copper-display-small", amount = 4}, + {type = "item", name = "small-lamp", amount = 1} }, - result = "copper-display-medium" + results = { + {type = "item", name = "copper-display-medium", amount = 1} + } }, { type = "recipe", @@ -3473,10 +3858,12 @@ data:extend({ category = "medium-crafting", energy_required = 5, ingredients = { - {"copper-display-small", 9}, - {"small-lamp", 4} + {type = "item", name = "copper-display-small", amount = 9}, + {type = "item", name = "small-lamp", amount = 4} }, - result = "copper-display" + results = { + {type = "item", name = "copper-display", amount = 1} + } }, { type = "technology", @@ -3545,30 +3932,36 @@ if (mods["rec-blue-plus"] or mods["recursive-blueprints"]) then { type = "recipe", name = "nullius-blueprint-deployer", + localised_name = {"entity-name.blueprint-deployer"}, enabled = false, always_show_made_in = true, category = "small-crafting", energy_required = 12, ingredients = { - {"nullius-small-storage-chest-1", 1}, - {"nullius-relay-1", 1}, - {"decider-combinator", 6} + {type = "item", name = "nullius-small-storage-chest-1", amount = 1}, + {type = "item", name = "nullius-relay-1", amount = 1}, + {type = "item", name = "decider-combinator", amount = 6} }, - result = "blueprint-deployer" + results = { + {type = "item", name = "blueprint-deployer", amount = 1} + } }, { type = "recipe", name = "nullius-recursive-blueprints-scanner", + localised_name = {"entity-name.recursive-blueprints-scanner"}, enabled = false, always_show_made_in = true, category = "large-crafting", energy_required = 20, ingredients = { - {"radar", 1}, - {"nullius-small-miner-2", 1}, - {"nullius-sensor-1", 4} + {type = "item", name = "radar", amount = 1}, + {type = "item", name = "nullius-small-miner-2", amount = 1}, + {type = "item", name = "nullius-sensor-1", amount = 4} }, - result = "recursive-blueprints-scanner" + results = { + {type = "item", name = "recursive-blueprints-scanner", amount = 1} + } } }) end @@ -3579,18 +3972,21 @@ if mods["ch-concentrated-solar"] then { type = "recipe", name = "nullius-heliostat-mirror", + localised_name = {"entity-name.chcs-heliostat-mirror"}, enabled = false, always_show_made_in = true, category = "hand-casting", energy_required = 10, ingredients = { - {"nullius-aluminum-sheet", 8}, - {"nullius-steel-rod", 6}, - {"nullius-hard-glass", 10}, - {"nullius-motor-2", 1}, - {"nullius-bearing", 1} + {type = "item", name = "nullius-aluminum-sheet", amount = 8}, + {type = "item", name = "nullius-steel-rod", amount = 6}, + {type = "item", name = "nullius-hard-glass", amount = 10}, + {type = "item", name = "nullius-motor-2", amount = 1}, + {type = "item", name = "nullius-bearing", amount = 1} }, - result = "chcs-heliostat-mirror" + results = { + {type = "item", name = "chcs-heliostat-mirror", amount = 1} + } }, { type = "recipe", @@ -3598,45 +3994,50 @@ if mods["ch-concentrated-solar"] then enabled = false, always_show_made_in = true, category = "machine-casting", - subgroup = "boxed-heat-energy", + subgroup = "boxed-heat-energy", energy_required = 50, ingredients = { - {"nullius-box-aluminum-sheet", 8}, - {"nullius-box-steel-rod", 6}, - {"nullius-box-hard-glass", 10}, - {"nullius-box-motor-2", 1}, - {"nullius-box-bearing", 1} + {type = "item", name = "nullius-box-aluminum-sheet", amount = 8}, + {type = "item", name = "nullius-box-steel-rod", amount = 6}, + {type = "item", name = "nullius-box-hard-glass", amount = 10}, + {type = "item", name = "nullius-box-motor-2", amount = 1}, + {type = "item", name = "nullius-box-bearing", amount = 1} }, - result = "nullius-box-heliostat-mirror" + results = { + {type = "item", name = "nullius-box-heliostat-mirror", amount = 1} + } }, { type = "recipe", name = "nullius-solar-tower", + localised_name = {"entity-name.chcs-solar-power-tower"}, enabled = false, always_show_made_in = true, category = "huge-crafting", energy_required = 60, ingredients = { - {"nullius-thermal-tank-2", 3}, - {"nullius-box-heat-pipe-2", 10}, - {"nullius-box-steel-beam", 24}, - {"nullius-box-reinforced-concrete", 8}, - {"nullius-pump-2", 8}, - {"nullius-large-beacon-1", 1} - }, - result = "chcs-solar-power-tower", + {type = "item", name = "nullius-thermal-tank-2", amount = 3}, + {type = "item", name = "nullius-box-heat-pipe-2", amount = 10}, + {type = "item", name = "nullius-box-steel-beam", amount = 24}, + {type = "item", name = "nullius-box-reinforced-concrete", amount = 8}, + {type = "item", name = "nullius-pump-2", amount = 8}, + {type = "item", name = "nullius-large-beacon-1", amount = 1} + }, + results = { + {type = "item", name = "chcs-solar-power-tower", amount = 1} + }, requester_paste_multiplier = 2 }, { type = "technology", name = "nullius-concentrated-solar-energy", - order = "nullius-eo", - icons = {{ - icon = "__ch-concentrated-solar__/graphics/technology/concentrated-solar-energy.png", - icon_size = 256, - icon_mipmaps = 4 - }}, - localised_name = {"technology-name.chcs-concentrated-solar-energy"}, + order = "nullius-eo", + icons = {{ + icon = "__ch-concentrated-solar__/graphics/technology/concentrated-solar-energy.png", + icon_size = 256, + icon_mipmaps = 4 + }}, + localised_name = {"technology-name.chcs-concentrated-solar-energy"}, localised_description = {"technology-description.chcs-concentrated-solar-energy"}, effects = { { @@ -3661,7 +4062,7 @@ if mods["ch-concentrated-solar"] then ingredients = { {"nullius-geology-pack", 1}, {"nullius-climatology-pack", 1}, {"nullius-mechanical-pack", 1}, {"nullius-electrical-pack", 1}, - {"nullius-chemical-pack", 1} + {"nullius-chemical-pack", 1} }, time = 35 }, @@ -3683,12 +4084,14 @@ if (mods["beautiful_bridge_railway"] or category = "huge-crafting", energy_required = 6, ingredients = { - {"rail", 2}, - {"nullius-steel-beam", 8}, - {"concrete", 6}, - {"nullius-land-fill-gravel", 1} + {type = "item", name = "rail", amount = 2}, + {type = "item", name = "nullius-steel-beam", amount = 8}, + {type = "item", name = "concrete", amount = 6}, + {type = "item", name = "nullius-land-fill-gravel", amount = 1} }, - result = "bbr-rail-iron" + results = { + {type = "item", name = "bbr-rail-iron", amount = 1} + } }, { type = "recipe", @@ -3698,13 +4101,15 @@ if (mods["beautiful_bridge_railway"] or category = "huge-crafting", energy_required = 8, ingredients = { - {"rail", 2}, - {"nullius-refractory-brick", 4}, - {"nullius-mortar", 1}, - {"concrete", 1}, - {"nullius-land-fill-gravel", 2} + {type = "item", name = "rail", amount = 2}, + {type = "item", name = "nullius-refractory-brick", amount = 4}, + {type = "item", name = "nullius-mortar", amount = 1}, + {type = "item", name = "concrete", amount = 1}, + {type = "item", name = "nullius-land-fill-gravel", amount = 2} }, - result = "bbr-rail-brick" + results = { + {type = "item", name = "bbr-rail-brick", amount = 1} + } }, { type = "recipe", @@ -3714,13 +4119,15 @@ if (mods["beautiful_bridge_railway"] or category = "huge-crafting", energy_required = 5, ingredients = { - {"rail", 2}, - {"nullius-wood", 6}, - {"nullius-steel-rod", 1}, - {"concrete", 2}, - {"nullius-land-fill-gravel", 1} + {type = "item", name = "rail", amount = 2}, + {type = "item", name = "nullius-wood", amount = 6}, + {type = "item", name = "nullius-steel-rod", amount = 1}, + {type = "item", name = "concrete", amount = 2}, + {type = "item", name = "nullius-land-fill-gravel", amount = 1} }, - result = "bbr-rail-wood" + results = { + {type = "item", name = "bbr-rail-wood", amount = 1} + } }, { type = "technology", @@ -3760,10 +4167,10 @@ if mods["Mini_Trains"] then { type = "item", name = "nullius-small-locomotive-1", - icons = {{ - icon = "__Mini_Trains__/data/icons/cab64.png", + icons = {{ + icon = "__Mini_Trains__/data/icons/cab64.png", icon_size = 64, - tint = { r = 0.65, g = 0.65, b = 0.4 } + tint = { r = 0.65, g = 0.65, b = 0.4 } }}, subgroup = "light-rail", order = "nullius-bb", @@ -3773,10 +4180,10 @@ if mods["Mini_Trains"] then { type = "item", name = "nullius-small-locomotive-2", - icons = {{ + icons = {{ icon = "__Mini_Trains__/data/icons/cab64.png", icon_size = 64, - tint = { r = 1, g = 0.7, b = 0.7 } + tint = { r = 1, g = 0.7, b = 0.7 } }}, subgroup = "light-rail", order = "nullius-bc", @@ -3786,10 +4193,10 @@ if mods["Mini_Trains"] then { type = "item", name = "nullius-small-locomotive-3", - icons = {{ + icons = {{ icon = "__Mini_Trains__/data/icons/cab64.png", icon_size = 64, - tint = { r = 0.8, g = 0.8, b = 1 } + tint = { r = 0.8, g = 0.8, b = 1 } }}, subgroup = "light-rail", order = "nullius-bd", @@ -3799,10 +4206,10 @@ if mods["Mini_Trains"] then { type = "item", name = "nullius-small-solar-locomotive", - icons = {{ + icons = {{ icon = "__Mini_Trains__/data/icons/cab64.png", icon_size = 64, - tint = { r = 0.8, g = 1, b = 0.8 } + tint = { r = 0.8, g = 1, b = 0.8 } }}, subgroup = "light-rail", order = "nullius-be", @@ -3812,10 +4219,10 @@ if mods["Mini_Trains"] then { type = "item", name = "nullius-small-cargo-wagon-1", - icons = {{ + icons = {{ icon = "__Mini_Trains__/data/icons/cargo64.png", icon_size = 64, - tint = { r = 0.65, g = 0.65, b = 0.4 } + tint = { r = 0.65, g = 0.65, b = 0.4 } }}, subgroup = "light-rail", order = "nullius-cb", @@ -3825,10 +4232,10 @@ if mods["Mini_Trains"] then { type = "item", name = "nullius-small-cargo-wagon-2", - icons = {{ + icons = {{ icon = "__Mini_Trains__/data/icons/cargo64.png", icon_size = 64, - tint = { r = 1, g = 0.7, b = 0.7 } + tint = { r = 1, g = 0.7, b = 0.7 } }}, subgroup = "light-rail", order = "nullius-cc", @@ -3838,10 +4245,10 @@ if mods["Mini_Trains"] then { type = "item", name = "nullius-small-cargo-wagon-3", - icons = {{ + icons = {{ icon = "__Mini_Trains__/data/icons/cargo64.png", icon_size = 64, - tint = { r = 0.8, g = 0.8, b = 1 } + tint = { r = 0.8, g = 0.8, b = 1 } }}, subgroup = "light-rail", order = "nullius-cd", @@ -3851,10 +4258,10 @@ if mods["Mini_Trains"] then { type = "item", name = "nullius-small-fluid-wagon-1", - icons = {{ + icons = {{ icon = "__Mini_Trains__/data/icons/fluid64.png", icon_size = 64, - tint = { r = 0.65, g = 0.65, b = 0.4 } + tint = { r = 0.65, g = 0.65, b = 0.4 } }}, subgroup = "light-rail", order = "nullius-db", @@ -3864,10 +4271,10 @@ if mods["Mini_Trains"] then { type = "item", name = "nullius-small-fluid-wagon-2", - icons = {{ + icons = {{ icon = "__Mini_Trains__/data/icons/fluid64.png", icon_size = 64, - tint = { r = 1, g = 0.7, b = 0.7 } + tint = { r = 1, g = 0.7, b = 0.7 } }}, subgroup = "light-rail", order = "nullius-dc", @@ -3877,10 +4284,10 @@ if mods["Mini_Trains"] then { type = "item", name = "nullius-small-fluid-wagon-3", - icons = {{ + icons = {{ icon = "__Mini_Trains__/data/icons/fluid64.png", icon_size = 64, - tint = { r = 0.8, g = 0.8, b = 1 } + tint = { r = 0.8, g = 0.8, b = 1 } }}, subgroup = "light-rail", order = "nullius-dd", @@ -3893,15 +4300,16 @@ if mods["Mini_Trains"] then enabled = false, show_amount_in_title = false, always_show_products = true, - always_show_made_in = true, + always_show_made_in = true, category = "large-crafting", energy_required = 8, ingredients = { - {"nullius-locomotive-1", 1}, - {"nullius-aluminum-plate", 4} + {type = "item", name = "nullius-locomotive-1", amount = 1}, + {type = "item", name = "nullius-aluminum-plate", amount = 4} }, - result = "nullius-small-locomotive-1", - result_count = 2 + results = { + {type = "item", name = "nullius-small-locomotive-1", amount = 2} + }, }, { type = "recipe", @@ -3909,16 +4317,17 @@ if mods["Mini_Trains"] then enabled = false, show_amount_in_title = false, always_show_products = true, - always_show_made_in = true, + always_show_made_in = true, category = "large-crafting", energy_required = 15, ingredients = { - {"nullius-locomotive-2", 1}, - {"nullius-small-locomotive-1", 2}, - {"nullius-titanium-plate", 4} + {type = "item", name = "nullius-locomotive-2", amount = 1}, + {type = "item", name = "nullius-small-locomotive-1", amount = 2}, + {type = "item", name = "nullius-titanium-plate", amount = 4} }, - result = "nullius-small-locomotive-2", - result_count = 2 + results = { + {type = "item", name = "nullius-small-locomotive-2", amount = 2} + }, }, { type = "recipe", @@ -3926,15 +4335,16 @@ if mods["Mini_Trains"] then enabled = false, show_amount_in_title = false, always_show_products = true, - always_show_made_in = true, + always_show_made_in = true, category = "large-crafting", energy_required = 30, ingredients = { - {"nullius-locomotive-3", 1}, - {"nullius-small-locomotive-2", 2} + {type = "item", name = "nullius-locomotive-3", amount = 1}, + {type = "item", name = "nullius-small-locomotive-2", amount = 2} }, - result = "nullius-small-locomotive-3", - result_count = 2 + results = { + {type = "item", name = "nullius-small-locomotive-3", amount = 2} + }, }, { type = "recipe", @@ -3942,15 +4352,16 @@ if mods["Mini_Trains"] then enabled = false, show_amount_in_title = false, always_show_products = true, - always_show_made_in = true, + always_show_made_in = true, category = "large-crafting", energy_required = 30, ingredients = { - {"nullius-solar-locomotive", 1}, - {"nullius-small-locomotive-2", 2} + {type = "item", name = "nullius-solar-locomotive", amount = 1}, + {type = "item", name = "nullius-small-locomotive-2", amount = 2} }, - result = "nullius-small-solar-locomotive", - result_count = 2 + results = { + {type = "item", name = "nullius-small-solar-locomotive", amount = 2} + }, }, { type = "recipe", @@ -3958,15 +4369,16 @@ if mods["Mini_Trains"] then enabled = false, show_amount_in_title = false, always_show_products = true, - always_show_made_in = true, + always_show_made_in = true, category = "large-crafting", energy_required = 5, ingredients = { - {"nullius-cargo-wagon-1", 1}, - {"nullius-aluminum-plate", 4} + {type = "item", name = "nullius-cargo-wagon-1", amount = 1}, + {type = "item", name = "nullius-aluminum-plate", amount = 4} }, - result = "nullius-small-cargo-wagon-1", - result_count = 2 + results = { + {type = "item", name = "nullius-small-cargo-wagon-1", amount = 2} + }, }, { type = "recipe", @@ -3974,16 +4386,17 @@ if mods["Mini_Trains"] then enabled = false, show_amount_in_title = false, always_show_products = true, - always_show_made_in = true, + always_show_made_in = true, category = "large-crafting", energy_required = 10, ingredients = { - {"nullius-cargo-wagon-2", 1}, - {"nullius-small-cargo-wagon-1", 2}, - {"nullius-titanium-plate", 4} + {type = "item", name = "nullius-cargo-wagon-2", amount = 1}, + {type = "item", name = "nullius-small-cargo-wagon-1", amount = 2}, + {type = "item", name = "nullius-titanium-plate", amount = 4} }, - result = "nullius-small-cargo-wagon-2", - result_count = 2 + results = { + {type = "item", name = "nullius-small-cargo-wagon-2", amount = 2} + }, }, { type = "recipe", @@ -3991,15 +4404,16 @@ if mods["Mini_Trains"] then enabled = false, show_amount_in_title = false, always_show_products = true, - always_show_made_in = true, + always_show_made_in = true, category = "large-crafting", energy_required = 20, ingredients = { - {"nullius-cargo-wagon-3", 1}, - {"nullius-small-cargo-wagon-2", 2} + {type = "item", name = "nullius-cargo-wagon-3", amount = 1}, + {type = "item", name = "nullius-small-cargo-wagon-2", amount = 2} }, - result = "nullius-small-cargo-wagon-3", - result_count = 2 + results = { + {type = "item", name = "nullius-small-cargo-wagon-3", amount = 2} + }, }, { type = "recipe", @@ -4007,15 +4421,16 @@ if mods["Mini_Trains"] then enabled = false, show_amount_in_title = false, always_show_products = true, - always_show_made_in = true, + always_show_made_in = true, category = "large-crafting", energy_required = 6, ingredients = { - {"nullius-fluid-wagon-1", 1}, - {"nullius-aluminum-sheet", 6} + {type = "item", name = "nullius-fluid-wagon-1", amount = 1}, + {type = "item", name = "nullius-aluminum-sheet", amount = 6} }, - result = "nullius-small-fluid-wagon-1", - result_count = 2 + results = { + {type = "item", name = "nullius-small-fluid-wagon-1", amount = 2} + }, }, { type = "recipe", @@ -4023,16 +4438,17 @@ if mods["Mini_Trains"] then enabled = false, show_amount_in_title = false, always_show_products = true, - always_show_made_in = true, + always_show_made_in = true, category = "large-crafting", energy_required = 12, ingredients = { - {"nullius-fluid-wagon-2", 1}, - {"nullius-small-fluid-wagon-1", 2}, - {"nullius-titanium-sheet", 6} + {type = "item", name = "nullius-fluid-wagon-2", amount = 1}, + {type = "item", name = "nullius-small-fluid-wagon-1", amount = 2}, + {type = "item", name = "nullius-titanium-sheet", amount = 6} }, - result = "nullius-small-fluid-wagon-2", - result_count = 2 + results = { + {type = "item", name = "nullius-small-fluid-wagon-2", amount = 2} + }, }, { type = "recipe", @@ -4040,24 +4456,25 @@ if mods["Mini_Trains"] then enabled = false, show_amount_in_title = false, always_show_products = true, - always_show_made_in = true, + always_show_made_in = true, category = "large-crafting", energy_required = 25, ingredients = { - {"nullius-fluid-wagon-3", 1}, - {"nullius-small-fluid-wagon-2", 2} + {type = "item", name = "nullius-fluid-wagon-3", amount = 1}, + {type = "item", name = "nullius-small-fluid-wagon-2", amount = 2} }, - result = "nullius-small-fluid-wagon-3", - result_count = 2 + results = { + {type = "item", name = "nullius-small-fluid-wagon-3", amount = 2} + }, }, { type = "technology", name = "nullius-light-rail", order = "nullius-cn", - icons = {{ + icons = {{ icon = "__Mini_Trains__/data/icons/tech256.png", icon_size = 256 - }}, + }}, effects = { { type = "unlock-recipe", recipe = "nullius-small-locomotive-1" }, { type = "unlock-recipe", recipe = "nullius-small-cargo-wagon-1" } @@ -4079,29 +4496,32 @@ if mods["fcpu"] then { type = "recipe", name = "nullius-fcpu", + localised_name = {"entity-name.fcpu"}, enabled = false, always_show_made_in = true, category = "tiny-crafting", energy_required = 2, ingredients = { - {"decider-combinator", 10}, - {"arithmetic-combinator", 10}, - {"nullius-processor-2", 1} + {type = "item", name = "decider-combinator", amount = 10}, + {type = "item", name = "arithmetic-combinator", amount = 10}, + {type = "item", name = "nullius-processor-2", amount = 1} }, - result = "fcpu" + results = { + {type = "item", name = "fcpu", amount = 1} + } }, { type = "technology", name = "nullius-fcpu", - localised_name = {"technology-name.fcpu"}, - localised_description = {"technology-description.fcpu"}, + localised_name = {"technology-name.fcpu"}, + localised_description = {"technology-description.fcpu"}, icon_size = 128, icon = "__fcpu__/graphics/technology/fcpu.png", effects = { { type = "unlock-recipe", - recipe = "fcpu" + recipe = "nullius-fcpu" } }, prerequisites = {"nullius-computation", "nullius-electronics-2"}, diff --git a/nullius/prototypes/override.lua b/nullius/prototypes/override.lua index 90470cb..ddc015f 100644 --- a/nullius/prototypes/override.lua +++ b/nullius/prototypes/override.lua @@ -5,22 +5,19 @@ local ENTITYPATH = "__nullius__/graphics/entity/" for _, type in pairs({"unit-spawner", "unit", "turret"}) do for _, entity in pairs(data.raw[type]) do if ((entity.subgroup == "enemies") and entity.autoplace and (entity.autoplace.force == "enemy")) then - entity.autoplace.richness_multiplier = null - entity.autoplace.richness_expression = {expression_id="literal-number:1", literal_value=0, type = "literal-number"} - entity.autoplace.probability_expression = {expression_id="literal-number:1", literal_value=0, type = "literal-number"} + entity.autoplace.richness_expression = "0" + entity.autoplace.probability_expression = "0" end end end data.raw.item["iron-ore"].icon = "__base__/graphics/icons/iron-ore.png" data.raw.item["iron-ore"].icon_size = 64 -data.raw.item["iron-ore"].icon_mipmaps = 4 data.raw.item["iron-ore"].subgroup = "iron-ingot" data.raw.item["iron-ore"].order = "nullius-b" data.raw.item["iron-ore"].stack_size = 50 data.raw.item["copper-ore"].icon = "__base__/graphics/icons/copper-ore.png" data.raw.item["copper-ore"].icon_size = 64 -data.raw.item["copper-ore"].icon_mipmaps = 4 data.raw.item["copper-ore"].subgroup = "copper" data.raw.item["copper-ore"].order = "nullius-b" data.raw.item["copper-ore"].stack_size = 50 @@ -31,13 +28,15 @@ data.raw.item["stone"].subgroup = "masonry-material" data.raw.item["stone"].order = "nullius-k" data.raw.item["stone"].stack_size = 50 -data.raw.item["red-wire"].order = "nullius-c" -data.raw.item["green-wire"].order = "nullius-d" +data.raw.item["nullius-red-wire"].order = "nullius-c" +data.raw.item["nullius-green-wire"].order = "nullius-d" data.raw.item["power-switch"].order = "nullius-h" data.raw["power-switch"]["power-switch"].localised_description = {"", {"entity-description.power-switch"}, {"entity-description.nullius-power-switch", {"item-name.nullius-insulated-wire"}, "copper-cable"}} data.raw["power-switch"]["power-switch"].minable.mining_time = 0.6 +data.raw.item["display-panel"].order = "nullius-ga" +data.raw["display-panel"]["display-panel"].minable.mining_time = 0.6 data.raw["constant-combinator"]["constant-combinator"].localised_name = {"entity-name.nullius-memory-circuit"} data.raw["constant-combinator"]["constant-combinator"].minable.mining_time = 1 @@ -61,6 +60,15 @@ data.raw.item["decider-combinator"].order = "nullius-e" data.raw["decider-combinator"]["decider-combinator"].energy_source = data.raw["arithmetic-combinator"]["arithmetic-combinator"].energy_source data.raw["decider-combinator"]["decider-combinator"].active_energy_usage = "100W" + +data.raw["selector-combinator"]["selector-combinator"].localised_name = {"entity-name.nullius-selector-circuit"} +data.raw["selector-combinator"]["selector-combinator"].minable.mining_time = 1 +data.raw.item["selector-combinator"].localised_name = {"entity-name.nullius-selector-circuit"} +data.raw.item["selector-combinator"].order = "nullius-gb" +data.raw["selector-combinator"]["selector-combinator"].energy_source = + data.raw["arithmetic-combinator"]["arithmetic-combinator"].energy_source +data.raw["selector-combinator"]["selector-combinator"].active_energy_usage = "100W" + data.raw["programmable-speaker"]["programmable-speaker"].localised_name = {"entity-name.nullius-antenna"} data.raw["programmable-speaker"]["programmable-speaker"].localised_description = {"entity-description.nullius-antenna"} data.raw.item["programmable-speaker"].localised_name = {"entity-name.nullius-antenna"} @@ -74,17 +82,24 @@ data.raw["programmable-speaker"]["programmable-speaker"].energy_source = { data.raw["programmable-speaker"]["programmable-speaker"].energy_usage_per_tick = "250W" data.raw["programmable-speaker"]["programmable-speaker"].minable.mining_time = 1 -data.raw["lamp"]["small-lamp"].localised_name = {"entity-name.nullius-lamp-1"} data.raw.item["small-lamp"].localised_name = {"entity-name.nullius-lamp-1"} data.raw.item["small-lamp"].subgroup = "railway" data.raw.item["small-lamp"].order = "nullius-bb" -data.raw.item["small-lamp"].place_result = "nullius-lamp-1" -data.raw["lamp"]["small-lamp"].placeable_by = {item = "small-lamp", count = 1} -data.raw["lamp"]["small-lamp"].minable.mining_time = 0.3 +--data.raw.item["small-lamp"].place_result = "nullius-lamp-1" +data.raw.item["small-lamp"].icon = nil data.raw.item["small-lamp"].icons = {{icon = ENTICONPATH .. "lamp1.png", icon_size = 64}} label_icon("small-lamp", 1, "yellow") -data.raw["lamp"]["small-lamp"].icons = data.raw.item["small-lamp"].icons + +-- data.raw["lamp"]["small-lamp"].localised_name = {"entity-name.nullius-lamp-1"} +-- data.raw["lamp"]["small-lamp"].placeable_by = {item = "small-lamp", count = 1} +-- data.raw["lamp"]["small-lamp"].minable.mining_time = 0.3 +-- data.raw["lamp"]["small-lamp"].icon = nil +-- data.raw["lamp"]["small-lamp"].icons = data.raw.item["small-lamp"].icons + +data.raw["lamp"]["small-lamp"] = data.raw["lamp"]["nullius-lamp-1"] -- rename nullius-lamp-1 to small-lamp (better to follow the same pattern as everything else (helps with factoriopedia clutter)) +data.raw["lamp"]["nullius-lamp-1"] = nil +data.raw["lamp"]["small-lamp"].name = "small-lamp" data.raw.item["stone-wall"].stack_size = 200 data.raw.item["stone-wall"].subgroup = "concrete" @@ -97,10 +112,10 @@ data.raw.item["gate"].order = "nullius-f" data.raw["gate"]["gate"].localised_description = {"entity-description.nullius-gate"} data.raw["gate"]["gate"].minable.mining_time = 0.8 -data.raw.item["empty-barrel"].localised_description = {"item-description.nullius-barrel"} -data.raw.item["empty-barrel"].subgroup = "canisters" -data.raw.item["empty-barrel"].order = "nullius-b" -data.raw.item["empty-barrel"].stack_size = 20 +data.raw.item["barrel"].localised_description = {"item-description.nullius-barrel"} +data.raw.item["barrel"].subgroup = "canisters" +data.raw.item["barrel"].order = "nullius-b" +data.raw.item["barrel"].stack_size = 20 data.raw["capsule"]["cliff-explosives"].localised_name = {"item-name.nullius-explosive"} data.raw["capsule"]["cliff-explosives"].localised_description = {"item-description.nullius-explosive"} @@ -128,16 +143,6 @@ data.raw.tile["landfill"].placeable_by = {item = "nullius-land-fill-gravel", cou data.raw.item["stone-brick"].stack_size = 500 data.raw.tile["stone-path"].walking_speed_modifier = 1.3 data.raw.tile["stone-path"].vehicle_friction_modifier = 0.8 -data.raw.tile["clay-bricks"].minable.result = "nullius-refractory-brick" -data.raw.tile["clay-bricks"].walking_speed_modifier = 1.4 -data.raw.tile["clay-bricks"].vehicle_friction_modifier = 0.7 -data.raw.tile["clay-bricks"].localised_name = {"tile-name.nullius-refractory-brick"} -data.raw.tile["clay-bricks"].placeable_by = {item = "nullius-refractory-brick", count = 1} -if (data.raw.tile["clay-bricks"].transitions == nil) then - data.raw.tile["clay-bricks"].transitions = data.raw.tile["stone-path"].transitions - data.raw.tile["clay-bricks"].transitions_between_transitions = - data.raw.tile["stone-path"].transitions_between_transitions -end data.raw.item["concrete"].stack_size = 500 data.raw.tile["concrete"].walking_speed_modifier = 1.5 data.raw.tile["concrete"].vehicle_friction_modifier = 0.6 @@ -185,7 +190,6 @@ data.raw.tile["black-refined-concrete"].vehicle_friction_modifier = 0.5 data.raw.tile["black-refined-concrete"].minable = {mining_time = 0.1, result = "nullius-black-concrete"} data.raw.tile["black-refined-concrete"].localised_name = {"item-name.nullius-black-concrete"} - data.raw.tile["mineral-grey-dirt-1"].map_color = {r = 119, g = 120, b = 115} data.raw.tile["mineral-grey-dirt-2"].map_color = {r = 91, g = 94, b = 90} data.raw.tile["mineral-grey-dirt-3"].map_color = {r = 94, g = 98, b = 100} @@ -227,17 +231,15 @@ data.raw.tile["mineral-brown-sand-2"].layer = 17 data.raw.tile["mineral-beige-sand-1"].layer = 22 data.raw.tile["mineral-tan-dirt-6"].layer = 24 -for _,variant in pairs(data.raw.tile["water-mud"].variants) do - if (variant.picture ~= nil) then - variant.tint = {0.75, 1, 0.75, 1} - variant.hr_version.tint = {0.75, 1, 0.75, 1} - else - for _,subvariant in pairs(variant) do - subvariant.tint = {0.75, 1, 0.75, 1} - subvariant.hr_version.tint = {0.75, 1, 0.75, 1} - end - end -end +-- for _,variant in pairs(data.raw.tile["water-mud"].variants) do -- todo: this is useless ?? +-- if (variant.picture ~= nil) then +-- variant.tint = {0.75, 1, 0.75, 1} +-- else +-- for _,subvariant in pairs(variant) do +-- subvariant.tint = {0.75, 1, 0.75, 1} +-- end +-- end +-- end data.raw.tile["grass-1"].map_color={r=54, g=57, b=12} data.raw.tile["grass-2"].map_color={r=68, g=65, b=14} @@ -286,57 +288,51 @@ data.raw.item["express-transport-belt"].subgroup = "belt" data.raw.item["express-transport-belt"].order = "nullius-bd" data.raw.item["express-transport-belt"].stack_size = 200 data.raw["transport-belt"]["express-transport-belt"].localised_name = {"entity-name.nullius-belt-3"} -data.raw["transport-belt"]["express-transport-belt"].next_upgrade = "ultimate-transport-belt" +data.raw["transport-belt"]["express-transport-belt"].next_upgrade = "bob-ultimate-transport-belt" data.raw["transport-belt"]["express-transport-belt"].minable.mining_time = 0.3 data.raw.item["express-underground-belt"].subgroup = "belt" data.raw.item["express-underground-belt"].order = "nullius-cd" data.raw.item["express-underground-belt"].stack_size = 100 data.raw["underground-belt"]["express-underground-belt"].localised_name = {"entity-name.nullius-underground-belt-3"} data.raw["underground-belt"]["express-underground-belt"].max_distance = 15 -data.raw["underground-belt"]["express-underground-belt"].next_upgrade = "ultimate-underground-belt" +data.raw["underground-belt"]["express-underground-belt"].next_upgrade = "bob-ultimate-underground-belt" data.raw["underground-belt"]["express-underground-belt"].minable.mining_time = 0.8 data.raw.item["express-splitter"].subgroup = "splitter" data.raw.item["express-splitter"].order = "nullius-dd" data.raw["splitter"]["express-splitter"].localised_name = {"entity-name.nullius-splitter-3"} -data.raw["splitter"]["express-splitter"].next_upgrade = "ultimate-splitter" +data.raw["splitter"]["express-splitter"].next_upgrade = "bob-ultimate-splitter" data.raw["splitter"]["express-splitter"].minable.mining_time = 1.2 -data.raw.item["ultimate-transport-belt"].subgroup = "belt" -data.raw.item["ultimate-transport-belt"].order = "nullius-be" -data.raw.item["ultimate-transport-belt"].icon = ENTICONPATH .. "belt4.png" -data.raw.item["ultimate-transport-belt"].icon_size = 64 -data.raw.item["ultimate-transport-belt"].icon_mipmaps = nil -data.raw.item["ultimate-transport-belt"].stack_size = 200 -data.raw["transport-belt"]["ultimate-transport-belt"].localised_name = {"entity-name.nullius-belt-4"} -data.raw["transport-belt"]["ultimate-transport-belt"].next_upgrade = nil -data.raw["transport-belt"]["ultimate-transport-belt"].icon = ENTICONPATH .. "belt4.png" -data.raw["transport-belt"]["ultimate-transport-belt"].icon_size = 64 -data.raw["transport-belt"]["ultimate-transport-belt"].icon_mipmaps = nil -data.raw["transport-belt"]["ultimate-transport-belt"].minable.mining_time = 0.4 -data.raw.item["ultimate-underground-belt"].subgroup = "belt" -data.raw.item["ultimate-underground-belt"].order = "nullius-ce" -data.raw.item["ultimate-underground-belt"].icon = ENTICONPATH .. "underground-belt4.png" -data.raw.item["ultimate-underground-belt"].icon_size = 64 -data.raw.item["ultimate-underground-belt"].icon_mipmaps = nil -data.raw.item["ultimate-underground-belt"].stack_size = 100 -data.raw["underground-belt"]["ultimate-underground-belt"].localised_name = {"entity-name.nullius-underground-belt-4"} -data.raw["underground-belt"]["ultimate-underground-belt"].max_distance = 19 -data.raw["underground-belt"]["ultimate-underground-belt"].next_upgrade = nil -data.raw["underground-belt"]["ultimate-underground-belt"].icon = ENTICONPATH .. "underground-belt4.png" -data.raw["underground-belt"]["ultimate-underground-belt"].icon_size = 64 -data.raw["underground-belt"]["ultimate-underground-belt"].icon_mipmaps = nil -data.raw["underground-belt"]["ultimate-underground-belt"].minable.mining_time = 1 -data.raw.item["ultimate-splitter"].subgroup = "splitter" -data.raw.item["ultimate-splitter"].order = "nullius-de" -data.raw.item["ultimate-splitter"].icon = ENTICONPATH .. "splitter4.png" -data.raw.item["ultimate-splitter"].icon_size = 64 -data.raw.item["ultimate-splitter"].icon_mipmaps = nil -data.raw["splitter"]["ultimate-splitter"].localised_name = {"entity-name.nullius-splitter-4"} -data.raw["splitter"]["ultimate-splitter"].next_upgrade = nil -data.raw["splitter"]["ultimate-splitter"].icon = ENTICONPATH .. "splitter4.png" -data.raw["splitter"]["ultimate-splitter"].icon_size = 64 -data.raw["splitter"]["ultimate-splitter"].icon_mipmaps = nil -data.raw["splitter"]["ultimate-splitter"].minable.mining_time = 1.5 +data.raw.item["bob-ultimate-transport-belt"].subgroup = "belt" +data.raw.item["bob-ultimate-transport-belt"].order = "nullius-be" +data.raw.item["bob-ultimate-transport-belt"].icon = ENTICONPATH .. "belt4.png" +data.raw.item["bob-ultimate-transport-belt"].icon_size = 64 +data.raw.item["bob-ultimate-transport-belt"].stack_size = 200 +data.raw["transport-belt"]["bob-ultimate-transport-belt"].localised_name = {"entity-name.nullius-belt-4"} +data.raw["transport-belt"]["bob-ultimate-transport-belt"].next_upgrade = nil +data.raw["transport-belt"]["bob-ultimate-transport-belt"].icon = ENTICONPATH .. "belt4.png" +data.raw["transport-belt"]["bob-ultimate-transport-belt"].icon_size = 64 +data.raw["transport-belt"]["bob-ultimate-transport-belt"].minable.mining_time = 0.4 +data.raw.item["bob-ultimate-underground-belt"].subgroup = "belt" +data.raw.item["bob-ultimate-underground-belt"].order = "nullius-ce" +data.raw.item["bob-ultimate-underground-belt"].icon = ENTICONPATH .. "underground-belt4.png" +data.raw.item["bob-ultimate-underground-belt"].icon_size = 64 +data.raw.item["bob-ultimate-underground-belt"].stack_size = 100 +data.raw["underground-belt"]["bob-ultimate-underground-belt"].localised_name = {"entity-name.nullius-underground-belt-4"} +data.raw["underground-belt"]["bob-ultimate-underground-belt"].max_distance = 19 +data.raw["underground-belt"]["bob-ultimate-underground-belt"].next_upgrade = nil +data.raw["underground-belt"]["bob-ultimate-underground-belt"].icon = ENTICONPATH .. "underground-belt4.png" +data.raw["underground-belt"]["bob-ultimate-underground-belt"].icon_size = 64 +data.raw["underground-belt"]["bob-ultimate-underground-belt"].minable.mining_time = 1 +data.raw.item["bob-ultimate-splitter"].subgroup = "splitter" +data.raw.item["bob-ultimate-splitter"].order = "nullius-de" +data.raw.item["bob-ultimate-splitter"].icon = ENTICONPATH .. "splitter4.png" +data.raw.item["bob-ultimate-splitter"].icon_size = 64 +data.raw["splitter"]["bob-ultimate-splitter"].localised_name = {"entity-name.nullius-splitter-4"} +data.raw["splitter"]["bob-ultimate-splitter"].next_upgrade = nil +data.raw["splitter"]["bob-ultimate-splitter"].icon = ENTICONPATH .. "splitter4.png" +data.raw["splitter"]["bob-ultimate-splitter"].icon_size = 64 +data.raw["splitter"]["bob-ultimate-splitter"].minable.mining_time = 1.5 data.raw.item["inserter"].subgroup = "inserter" data.raw.item["inserter"].order = "nullius-b" @@ -346,117 +342,128 @@ data.raw["inserter"]["inserter"].order = "nullius-b" data.raw["inserter"]["inserter"].localised_name = {"entity-name.nullius-inserter-1"} data.raw["inserter"]["inserter"].rotation_speed = 0.0166667 data.raw["inserter"]["inserter"].extension_speed = 0.04 -data.raw["inserter"]["inserter"].energy_per_rotation = "12.5KJ" -data.raw["inserter"]["inserter"].energy_per_movement = "1.875KJ" +data.raw["inserter"]["inserter"].energy_per_rotation = "12.5kJ" +data.raw["inserter"]["inserter"].energy_per_movement = "1.875kJ" data.raw["inserter"]["inserter"].energy_source.drain = "1kW" data.raw["inserter"]["inserter"].minable.mining_time = 0.4 -data.raw["inserter"]["inserter"].next_upgrade = "turbo-inserter" +data.raw["inserter"]["inserter"].next_upgrade = "bob-turbo-inserter" data.raw["inserter"]["inserter"].resistances = { { type = "impact", decrease = 100, percent = 90 } } - -data.raw.item["turbo-inserter"].subgroup = "inserter" -data.raw.item["turbo-inserter"].order = "nullius-c" -data.raw.item["turbo-inserter"].localised_name = {"entity-name.nullius-inserter-2"} -data.raw.item["turbo-inserter"].stack_size = 100 -data.raw["inserter"]["turbo-inserter"].order = "nullius-c" -data.raw["inserter"]["turbo-inserter"].localised_name = {"entity-name.nullius-inserter-2"} -data.raw["inserter"]["turbo-inserter"].rotation_speed = 0.0333333 -data.raw["inserter"]["turbo-inserter"].extension_speed = 0.08 -data.raw["inserter"]["turbo-inserter"].energy_per_rotation = "10.25KJ" -data.raw["inserter"]["turbo-inserter"].energy_per_movement = "1.5625KJ" -data.raw["inserter"]["turbo-inserter"].energy_source.drain = "2kW" -data.raw["inserter"]["turbo-inserter"].minable.mining_time = 0.6 -data.raw["inserter"]["turbo-inserter"].next_upgrade = "stack-inserter" -data.raw["inserter"]["turbo-inserter"].resistances = { +data.raw["inserter"]["inserter"].localised_description = {"entity-description.inserterToggleInfo"} +-- data.raw["inserter"]["inserter"].custom_tooltip_fields = { --Potential alternative +-- { +-- name = {"", "Toggle long inserter"}, +-- value = {"", "Shift+L"} +-- } +-- } + +data.raw.item["bob-turbo-inserter"].subgroup = "inserter" +data.raw.item["bob-turbo-inserter"].order = "nullius-c" +data.raw.item["bob-turbo-inserter"].localised_name = {"entity-name.nullius-inserter-2"} +data.raw.item["bob-turbo-inserter"].stack_size = 100 +data.raw["inserter"]["bob-turbo-inserter"].order = "nullius-c" +data.raw["inserter"]["bob-turbo-inserter"].localised_name = {"entity-name.nullius-inserter-2"} +data.raw["inserter"]["bob-turbo-inserter"].rotation_speed = 0.0333333 +data.raw["inserter"]["bob-turbo-inserter"].extension_speed = 0.08 +data.raw["inserter"]["bob-turbo-inserter"].energy_per_rotation = "10.25kJ" +data.raw["inserter"]["bob-turbo-inserter"].energy_per_movement = "1.5625kJ" +data.raw["inserter"]["bob-turbo-inserter"].energy_source.drain = "2kW" +data.raw["inserter"]["bob-turbo-inserter"].minable.mining_time = 0.6 +data.raw["inserter"]["bob-turbo-inserter"].next_upgrade = "bulk-inserter" +data.raw["inserter"]["bob-turbo-inserter"].resistances = { { type = "impact", decrease = 100, percent = 90 } } - -data.raw.item["turbo-filter-inserter"].subgroup = "inserter" -data.raw.item["turbo-filter-inserter"].order = "nullius-d" -data.raw.item["turbo-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-2"} -data.raw.item["turbo-filter-inserter"].stack_size = 100 -data.raw["inserter"]["turbo-filter-inserter"].order = "nullius-d" -data.raw["inserter"]["turbo-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-2"} -data.raw["inserter"]["turbo-filter-inserter"].rotation_speed = 0.0333333 -data.raw["inserter"]["turbo-filter-inserter"].extension_speed = 0.08 -data.raw["inserter"]["turbo-filter-inserter"].energy_per_rotation = "10.25KJ" -data.raw["inserter"]["turbo-filter-inserter"].energy_per_movement = "1.5625KJ" -data.raw["inserter"]["turbo-filter-inserter"].energy_source.drain = "2kW" -data.raw["inserter"]["turbo-filter-inserter"].minable.mining_time = 0.6 -data.raw["inserter"]["turbo-filter-inserter"].next_upgrade = "stack-filter-inserter" -data.raw["inserter"]["turbo-filter-inserter"].resistances = { +data.raw["inserter"]["bob-turbo-inserter"].localised_description = {"entity-description.inserterToggleInfo"} + +-- data.raw.item["turbo-filter-inserter"].subgroup = "inserter" +-- data.raw.item["turbo-filter-inserter"].order = "nullius-d" +-- data.raw.item["turbo-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-2"} +-- data.raw.item["turbo-filter-inserter"].stack_size = 100 +-- data.raw["inserter"]["turbo-filter-inserter"].order = "nullius-d" +-- data.raw["inserter"]["turbo-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-2"} +-- data.raw["inserter"]["turbo-filter-inserter"].rotation_speed = 0.0333333 +-- data.raw["inserter"]["turbo-filter-inserter"].extension_speed = 0.08 +-- data.raw["inserter"]["turbo-filter-inserter"].energy_per_rotation = "10.25kJ" +-- data.raw["inserter"]["turbo-filter-inserter"].energy_per_movement = "1.5625kJ" +-- data.raw["inserter"]["turbo-filter-inserter"].energy_source.drain = "2kW" +-- data.raw["inserter"]["turbo-filter-inserter"].minable.mining_time = 0.6 +-- data.raw["inserter"]["turbo-filter-inserter"].next_upgrade = "bulk-filter-inserter" +-- data.raw["inserter"]["turbo-filter-inserter"].resistances = { +-- { type = "impact", decrease = 100, percent = 90 } +-- } + +data.raw.item["bulk-inserter"].subgroup = "inserter" +data.raw.item["bulk-inserter"].order = "nullius-e" +data.raw.item["bulk-inserter"].localised_name = {"entity-name.nullius-inserter-3"} +data.raw.item["bulk-inserter"].stack_size = 100 +data.raw["inserter"]["bulk-inserter"].order = "nullius-e" +data.raw["inserter"]["bulk-inserter"].localised_name = {"entity-name.nullius-inserter-3"} +data.raw["inserter"]["bulk-inserter"].rotation_speed = 0.0333333 +data.raw["inserter"]["bulk-inserter"].extension_speed = 0.08 +data.raw["inserter"]["bulk-inserter"].energy_per_rotation = "20.5kJ" +data.raw["inserter"]["bulk-inserter"].energy_per_movement = "3.125kJ" +data.raw["inserter"]["bulk-inserter"].energy_source.drain = "4kW" +data.raw["inserter"]["bulk-inserter"].minable.mining_time = 0.8 +data.raw["inserter"]["bulk-inserter"].next_upgrade = "bob-express-bulk-inserter" +data.raw["inserter"]["bulk-inserter"].resistances = { { type = "impact", decrease = 100, percent = 90 } } +data.raw["inserter"]["bulk-inserter"].localised_description = {"entity-description.inserterToggleInfo"} -data.raw.item["stack-inserter"].subgroup = "inserter" -data.raw.item["stack-inserter"].order = "nullius-e" -data.raw.item["stack-inserter"].localised_name = {"entity-name.nullius-inserter-3"} -data.raw.item["stack-inserter"].stack_size = 100 -data.raw["inserter"]["stack-inserter"].order = "nullius-e" -data.raw["inserter"]["stack-inserter"].localised_name = {"entity-name.nullius-inserter-3"} -data.raw["inserter"]["stack-inserter"].rotation_speed = 0.0333333 -data.raw["inserter"]["stack-inserter"].extension_speed = 0.08 -data.raw["inserter"]["stack-inserter"].energy_per_rotation = "20.5KJ" -data.raw["inserter"]["stack-inserter"].energy_per_movement = "3.125KJ" -data.raw["inserter"]["stack-inserter"].energy_source.drain = "4kW" -data.raw["inserter"]["stack-inserter"].minable.mining_time = 0.8 -data.raw["inserter"]["stack-inserter"].next_upgrade = "express-stack-inserter" -data.raw["inserter"]["stack-inserter"].resistances = { - { type = "impact", decrease = 100, percent = 90 } -} data.raw.recipe["inserter"].order = "x" -data.raw.item["stack-filter-inserter"].subgroup = "inserter" -data.raw.item["stack-filter-inserter"].order = "nullius-f" -data.raw.item["stack-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-3"} -data.raw.item["stack-filter-inserter"].stack_size = 100 -data.raw["inserter"]["stack-filter-inserter"].order = "nullius-f" -data.raw["inserter"]["stack-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-3"} -data.raw["inserter"]["stack-filter-inserter"].rotation_speed = 0.0333333 -data.raw["inserter"]["stack-filter-inserter"].extension_speed = 0.08 -data.raw["inserter"]["stack-filter-inserter"].energy_per_rotation = "20.5KJ" -data.raw["inserter"]["stack-filter-inserter"].energy_per_movement = "3.125KJ" -data.raw["inserter"]["stack-filter-inserter"].energy_source.drain = "4kW" -data.raw["inserter"]["stack-filter-inserter"].minable.mining_time = 0.8 -data.raw["inserter"]["stack-filter-inserter"].next_upgrade = "express-stack-filter-inserter" -data.raw["inserter"]["stack-filter-inserter"].resistances = { - { type = "impact", decrease = 100, percent = 90 } -} - -data.raw.item["express-stack-inserter"].subgroup = "inserter" -data.raw.item["express-stack-inserter"].order = "nullius-g" -data.raw.item["express-stack-inserter"].localised_name = {"entity-name.nullius-inserter-4"} -data.raw.item["express-stack-inserter"].stack_size = 100 -data.raw["inserter"]["express-stack-inserter"].order = "nullius-g" -data.raw["inserter"]["express-stack-inserter"].localised_name = {"entity-name.nullius-inserter-4"} -data.raw["inserter"]["express-stack-inserter"].rotation_speed = 0.0666666 -data.raw["inserter"]["express-stack-inserter"].extension_speed = 0.16 -data.raw["inserter"]["express-stack-inserter"].energy_per_rotation = "21KJ" -data.raw["inserter"]["express-stack-inserter"].energy_per_movement = "3.125KJ" -data.raw["inserter"]["express-stack-inserter"].energy_source.drain = "6kW" -data.raw["inserter"]["express-stack-inserter"].minable.mining_time = 1 -data.raw["inserter"]["express-stack-inserter"].next_upgrade = nil -data.raw["inserter"]["express-stack-inserter"].resistances = { - { type = "impact", decrease = 100, percent = 90 } -} - -data.raw.item["express-stack-filter-inserter"].subgroup = "inserter" -data.raw.item["express-stack-filter-inserter"].order = "nullius-h" -data.raw.item["express-stack-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-4"} -data.raw.item["express-stack-filter-inserter"].stack_size = 100 -data.raw["inserter"]["express-stack-filter-inserter"].order = "nullius-h" -data.raw["inserter"]["express-stack-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-4"} -data.raw["inserter"]["express-stack-filter-inserter"].rotation_speed = 0.0666666 -data.raw["inserter"]["express-stack-filter-inserter"].extension_speed = 0.16 -data.raw["inserter"]["express-stack-filter-inserter"].energy_per_rotation = "21KJ" -data.raw["inserter"]["express-stack-filter-inserter"].energy_per_movement = "3.125KJ" -data.raw["inserter"]["express-stack-filter-inserter"].energy_source.drain = "6kW" -data.raw["inserter"]["express-stack-filter-inserter"].minable.mining_time = 1 -data.raw["inserter"]["express-stack-filter-inserter"].next_upgrade = nil -data.raw["inserter"]["express-stack-filter-inserter"].resistances = { +-- data.raw.item["bulk-filter-inserter"].subgroup = "inserter" +-- data.raw.item["bulk-filter-inserter"].order = "nullius-f" +-- data.raw.item["bulk-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-3"} +-- data.raw.item["bulk-filter-inserter"].stack_size = 100 +-- data.raw["inserter"]["bulk-filter-inserter"].order = "nullius-f" +-- data.raw["inserter"]["bulk-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-3"} +-- data.raw["inserter"]["bulk-filter-inserter"].rotation_speed = 0.0333333 +-- data.raw["inserter"]["bulk-filter-inserter"].extension_speed = 0.08 +-- data.raw["inserter"]["bulk-filter-inserter"].energy_per_rotation = "20.5kJ" +-- data.raw["inserter"]["bulk-filter-inserter"].energy_per_movement = "3.125kJ" +-- data.raw["inserter"]["bulk-filter-inserter"].energy_source.drain = "4kW" +-- data.raw["inserter"]["bulk-filter-inserter"].minable.mining_time = 0.8 +-- data.raw["inserter"]["bulk-filter-inserter"].next_upgrade = "express-bulk-filter-inserter" +-- data.raw["inserter"]["bulk-filter-inserter"].resistances = { +-- { type = "impact", decrease = 100, percent = 90 } +-- } + +data.raw.item["bob-express-bulk-inserter"].subgroup = "inserter" +data.raw.item["bob-express-bulk-inserter"].order = "nullius-g" +data.raw.item["bob-express-bulk-inserter"].localised_name = {"entity-name.nullius-inserter-4"} +data.raw.item["bob-express-bulk-inserter"].stack_size = 100 +data.raw["inserter"]["bob-express-bulk-inserter"].order = "nullius-g" +data.raw["inserter"]["bob-express-bulk-inserter"].localised_name = {"entity-name.nullius-inserter-4"} +data.raw["inserter"]["bob-express-bulk-inserter"].rotation_speed = 0.0666666 +data.raw["inserter"]["bob-express-bulk-inserter"].extension_speed = 0.16 +data.raw["inserter"]["bob-express-bulk-inserter"].energy_per_rotation = "21kJ" +data.raw["inserter"]["bob-express-bulk-inserter"].energy_per_movement = "3.125kJ" +data.raw["inserter"]["bob-express-bulk-inserter"].energy_source.drain = "6kW" +data.raw["inserter"]["bob-express-bulk-inserter"].minable.mining_time = 1 +data.raw["inserter"]["bob-express-bulk-inserter"].next_upgrade = nil +data.raw["inserter"]["bob-express-bulk-inserter"].resistances = { { type = "impact", decrease = 100, percent = 90 } } +data.raw["inserter"]["bob-express-bulk-inserter"].localised_description = {"entity-description.inserterToggleInfo"} + +-- data.raw.item["express-bulk-filter-inserter"].subgroup = "inserter" +-- data.raw.item["express-bulk-filter-inserter"].order = "nullius-h" +-- data.raw.item["express-bulk-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-4"} +-- data.raw.item["express-bulk-filter-inserter"].stack_size = 100 +-- data.raw["inserter"]["express-bulk-filter-inserter"].order = "nullius-h" +-- data.raw["inserter"]["express-bulk-filter-inserter"].localised_name = {"entity-name.nullius-filter-inserter-4"} +-- data.raw["inserter"]["express-bulk-filter-inserter"].rotation_speed = 0.0666666 +-- data.raw["inserter"]["express-bulk-filter-inserter"].extension_speed = 0.16 +-- data.raw["inserter"]["express-bulk-filter-inserter"].energy_per_rotation = "21kJ" +-- data.raw["inserter"]["express-bulk-filter-inserter"].energy_per_movement = "3.125kJ" +-- data.raw["inserter"]["express-bulk-filter-inserter"].energy_source.drain = "6kW" +-- data.raw["inserter"]["express-bulk-filter-inserter"].minable.mining_time = 1 +-- data.raw["inserter"]["express-bulk-filter-inserter"].next_upgrade = nil +-- data.raw["inserter"]["express-bulk-filter-inserter"].resistances = { +-- { type = "impact", decrease = 100, percent = 90 } +-- } data.raw["rail-planner"]["rail"].subgroup = "railway" data.raw["rail-planner"]["rail"].order = "nullius-d" @@ -476,7 +483,9 @@ data.raw["rail-chain-signal"]["rail-chain-signal"].minable.mining_time = 0.8 data.raw.item["rail-chain-signal"].subgroup = "railway" data.raw.item["rail-chain-signal"].order = "nullius-g" data.raw["straight-rail"]["straight-rail"].minable.mining_time = 0.5 -data.raw["curved-rail"]["curved-rail"].minable.mining_time = 0.6 +data.raw["legacy-curved-rail"]["legacy-curved-rail"].minable.mining_time = 0.6 +data.raw["curved-rail-a"]["curved-rail-a"].minable.mining_time = 0.6 +data.raw["curved-rail-b"]["curved-rail-b"].minable.mining_time = 0.6 data.raw.item["storage-tank"].subgroup = "tanks" data.raw.item["storage-tank"].order = "nullius-bcb" @@ -502,12 +511,11 @@ data.raw["radar"]["radar"].minable.mining_time = 0.6 data.raw["repair-tool"]["repair-pack"].icon = "__base__/graphics/icons/repair-pack.png" data.raw["repair-tool"]["repair-pack"].icon_size = 64 -data.raw["repair-tool"]["repair-pack"].icon_mipmaps = 4 data.raw["repair-tool"]["repair-pack"].subgroup = "tool-upgrades" data.raw["repair-tool"]["repair-pack"].order = "nullius-bb" data.raw.recipe["repair-pack"].order = "x" -data.raw["character"]["character"].localised_name = {"", {"item-name.nullius-android"}, " ", 1} +data.raw["character"]["character"].localised_name = {"", {"item-name.nullius-android"}, " ", tostring(1)} data.raw["character"]["character"].animations[2].armors = {"nullius-chassis-2", "nullius-chassis-3"} data.raw["character"]["character"].animations[3].armors = @@ -535,6 +543,7 @@ data.raw["item-subgroup"]["terrain"].group = "intermediate-products" data.raw["item-subgroup"]["terrain"].order = "nc" data.raw["item-subgroup"]["smelting-machine"].order = "f" data.raw["item-subgroup"]["raw-material"].order = "b" +data.raw["item-subgroup"]["circuit-network"].group = "logistics" data.raw["item-subgroup"]["circuit-network"].order = "e" data.raw["item-subgroup"]["logistic-network"].order = "ae" @@ -657,7 +666,7 @@ data.raw["electric-pole"]["big-electric-pole"].pictures.layers = { shift = util.by_pixel(0, -51), scale = 0.5 }, - data.raw["electric-pole"]["big-electric-pole"].pictures.layers[2].hr_version + data.raw["electric-pole"]["big-electric-pole"].pictures.layers[2] } data.raw["electric-pole"]["big-electric-pole"].resistances = {{ type = "impact", decrease = 100, percent = 90 }} @@ -665,7 +674,7 @@ data.raw["electric-pole"]["big-electric-pole"].minable.mining_time = 1.2 data.raw["electric-pole"]["small-electric-pole"].pictures.layers = { { - filename = ENTITYPATH .. "poles/hr-pole1.png", + filename = ENTITYPATH .. "poles/pole1.png", priority = "extra-high", width = 72, height = 220, @@ -681,7 +690,7 @@ data.raw["electric-pole"]["small-electric-pole"].minable.mining_time = 0.6 data.raw["electric-pole"]["medium-electric-pole"].pictures.layers = { { - filename = ENTITYPATH .. "poles/hr-pole2.png", + filename = ENTITYPATH .. "poles/pole2.png", priority = "extra-high", width = 72, height = 220, @@ -753,77 +762,77 @@ data.raw["container"]["steel-chest"].resistances = data.raw["container"]["iron-chest"].resistances data.raw["container"]["steel-chest"].minable.mining_time = 0.8 -data.raw.item["logistic-chest-storage"].localised_name = +data.raw.item["storage-chest"].localised_name = {"entity-name.nullius-small-storage-chest-2"} -data.raw.item["logistic-chest-storage"].localised_description = +data.raw.item["storage-chest"].localised_description = {"entity-description.nullius-storage-chest"} -data.raw["logistic-container"]["logistic-chest-storage"].localised_name = +data.raw["logistic-container"]["storage-chest"].localised_name = {"entity-name.nullius-small-storage-chest-2"} -data.raw["logistic-container"]["logistic-chest-storage"].localised_description = +data.raw["logistic-container"]["storage-chest"].localised_description = {"entity-description.nullius-storage-chest"} -data.raw["logistic-container"]["logistic-chest-storage"].max_health = 400 -data.raw["logistic-container"]["logistic-chest-storage"].resistances = +data.raw["logistic-container"]["storage-chest"].max_health = 400 +data.raw["logistic-container"]["storage-chest"].resistances = data.raw["container"]["wooden-chest"].resistances -data.raw["logistic-container"]["logistic-chest-storage"].minable.mining_time = 1 +data.raw["logistic-container"]["storage-chest"].minable.mining_time = 1 -data.raw.item["logistic-chest-passive-provider"].localised_name = +data.raw.item["passive-provider-chest"].localised_name = {"entity-name.nullius-small-supply-chest-2"} -data.raw.item["logistic-chest-passive-provider"].localised_description = +data.raw.item["passive-provider-chest"].localised_description = {"entity-description.nullius-supply-chest"} -data.raw["logistic-container"]["logistic-chest-passive-provider"].localised_name = +data.raw["logistic-container"]["passive-provider-chest"].localised_name = {"entity-name.nullius-small-supply-chest-2"} -data.raw["logistic-container"]["logistic-chest-passive-provider"].localised_description = +data.raw["logistic-container"]["passive-provider-chest"].localised_description = {"entity-description.nullius-supply-chest"} -data.raw["logistic-container"]["logistic-chest-passive-provider"].max_health = 400 -data.raw["logistic-container"]["logistic-chest-passive-provider"].resistances = +data.raw["logistic-container"]["passive-provider-chest"].max_health = 400 +data.raw["logistic-container"]["passive-provider-chest"].resistances = data.raw["container"]["wooden-chest"].resistances -data.raw["logistic-container"]["logistic-chest-passive-provider"].minable.mining_time = 1 +data.raw["logistic-container"]["passive-provider-chest"].minable.mining_time = 1 -data.raw.item["logistic-chest-requester"].localised_name = +data.raw.item["requester-chest"].localised_name = {"entity-name.nullius-small-demand-chest-2"} -data.raw.item["logistic-chest-requester"].localised_description = +data.raw.item["requester-chest"].localised_description = {"entity-description.nullius-request-slots", - {"entity-description.nullius-demand-chest"}, 10} -data.raw["logistic-container"]["logistic-chest-requester"].localised_name = + {"entity-description.nullius-demand-chest"}, tostring(10)} +data.raw["logistic-container"]["requester-chest"].localised_name = {"entity-name.nullius-small-demand-chest-2"} -data.raw["logistic-container"]["logistic-chest-requester"].localised_description = - data.raw.item["logistic-chest-requester"].localised_description -data.raw["logistic-container"]["logistic-chest-requester"].max_health = 400 -data.raw["logistic-container"]["logistic-chest-requester"].resistances = +data.raw["logistic-container"]["requester-chest"].localised_description = + data.raw.item["requester-chest"].localised_description +data.raw["logistic-container"]["requester-chest"].max_health = 400 +data.raw["logistic-container"]["requester-chest"].resistances = data.raw["container"]["wooden-chest"].resistances -data.raw["logistic-container"]["logistic-chest-requester"].minable.mining_time = 1 +data.raw["logistic-container"]["requester-chest"].minable.mining_time = 1 -data.raw.item["logistic-chest-buffer"].localised_name = +data.raw.item["buffer-chest"].localised_name = {"entity-name.nullius-small-buffer-chest-2"} -data.raw.item["logistic-chest-buffer"].localised_description = +data.raw.item["buffer-chest"].localised_description = {"entity-description.nullius-request-slots", - {"entity-description.nullius-buffer-chest"}, 6} -data.raw["logistic-container"]["logistic-chest-buffer"].localised_name = + {"entity-description.nullius-buffer-chest"}, tostring(6)} +data.raw["logistic-container"]["buffer-chest"].localised_name = {"entity-name.nullius-small-buffer-chest-2"} -data.raw["logistic-container"]["logistic-chest-buffer"].localised_description = - data.raw.item["logistic-chest-buffer"].localised_description -data.raw["logistic-container"]["logistic-chest-buffer"].max_health = 400 -data.raw["logistic-container"]["logistic-chest-buffer"].resistances = +data.raw["logistic-container"]["buffer-chest"].localised_description = + data.raw.item["buffer-chest"].localised_description +data.raw["logistic-container"]["buffer-chest"].max_health = 400 +data.raw["logistic-container"]["buffer-chest"].resistances = data.raw["container"]["wooden-chest"].resistances -data.raw["logistic-container"]["logistic-chest-buffer"].minable.mining_time = 1 +data.raw["logistic-container"]["buffer-chest"].minable.mining_time = 1 -data.raw.item["logistic-chest-active-provider"].localised_name = +data.raw.item["active-provider-chest"].localised_name = {"entity-name.nullius-small-dispatch-chest-2"} -data.raw.item["logistic-chest-active-provider"].localised_description = +data.raw.item["active-provider-chest"].localised_description = {"entity-description.nullius-dispatch-chest"} -data.raw["logistic-container"]["logistic-chest-active-provider"].localised_name = +data.raw["logistic-container"]["active-provider-chest"].localised_name = {"entity-name.nullius-small-dispatch-chest-2"} -data.raw["logistic-container"]["logistic-chest-active-provider"].localised_description = +data.raw["logistic-container"]["active-provider-chest"].localised_description = {"entity-description.nullius-dispatch-chest"} -data.raw["logistic-container"]["logistic-chest-active-provider"].max_health = 400 -data.raw["logistic-container"]["logistic-chest-active-provider"].resistances = +data.raw["logistic-container"]["active-provider-chest"].max_health = 400 +data.raw["logistic-container"]["active-provider-chest"].resistances = data.raw["container"]["wooden-chest"].resistances -data.raw["logistic-container"]["logistic-chest-active-provider"].minable.mining_time = 1 +data.raw["logistic-container"]["active-provider-chest"].minable.mining_time = 1 data.raw.item["pipe"].localised_name = {"entity-name.nullius-pipe-1"} data.raw.item["pipe"].localised_description = - {"entity-description.nullius-pipe", 40, 2290, 450} + {"entity-description.nullius-pipe"} data.raw["pipe"]["pipe"].localised_name = {"entity-name.nullius-pipe-1"} data.raw["pipe"]["pipe"].localised_description = data.raw.item["pipe"].localised_description @@ -831,7 +840,7 @@ data.raw["pipe"]["pipe"].minable.mining_time = 0.2 data.raw.item["pipe-to-ground"].localised_name = {"entity-name.nullius-underground-pipe-1"} data.raw.item["pipe-to-ground"].localised_description = - {"entity-description.nullius-underground-pipe", 40} + {"entity-description.nullius-underground-pipe"} data.raw["pipe-to-ground"]["pipe-to-ground"].localised_name = {"entity-name.nullius-underground-pipe-1"} data.raw["pipe-to-ground"]["pipe-to-ground"].localised_description = @@ -841,6 +850,9 @@ data.raw["pipe"]["pipe"].resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", decrease = 20, percent = 50 } } +data.raw["pipe"]["pipe"].pictures = pipepics("__boblogistics__/graphics/entity/pipe/iron/") + + data.raw["pipe-to-ground"]["pipe-to-ground"].resistances = data.raw["pipe"]["pipe"].resistances data.raw["pipe-to-ground"]["pipe-to-ground"].collision_box = @@ -870,6 +882,7 @@ data.raw["pump"]["pump"].resistances = { { type = "impact", decrease = 100, percent = 90 }, { type = "fire", decrease = 20, percent = 50 } } +--data.raw["pump"]["pump"].flow_scaling = false data.raw["mining-drill"]["burner-mining-drill"].resource_categories = {"unused-resource"} data.raw["mining-drill"]["electric-mining-drill"].resource_categories = {"unused-resource"} @@ -940,6 +953,63 @@ for tilename,landfill in pairs(landfill_tiles) do local tile = data.raw.tile[tilename] if ((tile ~= nil) and (tile.placeable_by == nil)) then tile.placeable_by = {item=landfill, count=1} - tile.can_be_part_of_blueprint = true + tile.can_be_part_of_blueprint = true + tile.minable = { + mining_time = 1, + result = landfill + } + tile.is_foundation = true + end +end +data.raw.tile["landfill"].minable = { + mining_time = 1, + result = "nullius-land-fill-gravel" +} +data.raw.tile["landfill"].is_foundation = true + +if settings.startup["nullius-hide-void-alt"].value then + local void_buildings = {"nullius-chimney-1","nullius-chimney-2","nullius-chimney-3","nullius-outfall-1","nullius-outfall-2","nullius-outfall-3"} + for _, building in pairs(void_buildings) do + table.insert(data.raw.furnace[building].flags, "hide-alt-info") + end +end + +data.raw["utility-constants"]["default"].max_fluid_flow = 500 + +data.raw["artillery-flare"]["artillery-flare"].shot_category = "artillery-shell" --regular remote will only fire artillery shells +data.raw["custom-input"]["give-artillery-targeting-remote"].enabled = false +data.raw["custom-input"]["give-discharge-defense-remote"].enabled = false +data.raw["shortcut"]["give-artillery-targeting-remote"] = nil --.hidden = true +data.raw["shortcut"]["give-discharge-defense-remote"] = nil --.hidden = true + +local scTechs = { + ["construction-robotics"] = nil, --"nullius-construction-robot-1" -- we have bots at the start + ["personal-roboport-equipment"] = nil, + ["electronics"] = nil, + ["circuit-network"] = nil, + ["exoskeleton-equipment"] = "nullius-cybernetics-4", + ["spidertron"] = "nullius-personal-transportation-4" +} +for _, sc in pairs(data.raw.shortcut) do + if sc.technology_to_unlock ~= nil then + sc.technology_to_unlock = scTechs[sc.technology_to_unlock] end end + +data.raw["cargo-landing-pad"]["cargo-landing-pad"].localised_name = {"item-name.nullius-landing-pad"} +--data.raw["cargo-landing-pad"]["cargo-landing-pad"].hidden_in_factoriopedia = true +data.raw.item["cargo-landing-pad"].subgroup = "space" +data.raw.item["cargo-landing-pad"].order = "nullius-c" + +data.raw["inserter"]["inserter"].filter_count = 0 + +data.raw["offshore-pump"]["offshore-pump"] = nil +data.raw["item"]["offshore-pump"].place_result = nil + +-- Parameter recipes and items: +for n = 0, 9 do + local pr = data.raw.recipe["parameter-" .. n] + pr.order = "nullius-" .. pr.order + local pi = data.raw.item["parameter-" .. n] + pi.order = "nullius-" .. pi.order +end \ No newline at end of file diff --git a/nullius/prototypes/override_final.lua b/nullius/prototypes/override_final.lua index 56c5323..251d2fa 100644 --- a/nullius/prototypes/override_final.lua +++ b/nullius/prototypes/override_final.lua @@ -17,10 +17,10 @@ data.raw.resource["uranium-ore"].minable.fluid_amount = nil data.raw.resource["uranium-ore"].minable.required_fluid = nil data.raw.item["rocket-fuel"].icon = "__base__/graphics/icons/rocket-fuel.png" data.raw.item["rocket-fuel"].icon_size = 64 -data.raw.item["copper-cable"].icon = "__angelssmelting__/graphics/icons/wire-coil-tin.png" -data.raw.item["copper-cable"].icon_size = 64 +data.raw.item["copper-cable"].icon = nil --"__angelssmeltinggraphics__/graphics/icons/wire-coil-tin.png" +-- data.raw.item["copper-cable"].icon_size = 64 data.raw.item["copper-cable"].icons = {{ - icon = "__angelssmelting__/graphics/icons/wire-coil-tin.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-coil-tin.png", icon_size = 64 }} data.raw.item["copper-cable"].subgroup = "electronic-intermediate" @@ -28,31 +28,33 @@ data.raw.item["copper-cable"].order = "nullius-d" data.raw.item["storage-tank"].stack_size = 50 +data.raw.item["storage-tank"].icon = nil data.raw.item["storage-tank"].icons = {{ icon = "__base__/graphics/icons/storage-tank.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }} +data.raw["storage-tank"]["storage-tank"].icon = nil data.raw["storage-tank"]["storage-tank"].icons = data.raw.item["storage-tank"].icons -data.raw["storage-tank"]["storage-tank"].fluid_box.height = 4.25 -data.raw["storage-tank"]["storage-tank"].fluid_box.base_area = 35.29411765 +data.raw["storage-tank"]["storage-tank"].fluid_box.volume = 15000 data.raw["storage-tank"]["storage-tank"].pictures = util.table.deepcopy(data.raw["storage-tank"]["nullius-medium-tank-3"].pictures) data.raw["storage-tank"]["storage-tank"].pictures.picture.sheets[1].tint = {0.9, 0.8, 0.6} +data.raw.item["radar"].icon = nil if mods["reskins-bobs"] then data.raw.item["radar"].icons = { { icon = "__reskins-bobs__/graphics/icons/warfare/radar/radar-icon-base.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }, { icon = "__reskins-bobs__/graphics/icons/warfare/radar/radar-icon-mask.png", - icon_size = 64, icon_mipmaps = 4, tint = tiercolor("yellow") + icon_size = 64, tint = tiercolor("yellow") }, { icon = "__reskins-bobs__/graphics/icons/warfare/radar/radar-icon-highlights.png", - icon_size = 64, icon_mipmaps = 4, tint = {1, 1, 1, 0} + icon_size = 64, tint = {1, 1, 1, 0} } } label_icon("radar", 1, "yellow") @@ -61,13 +63,13 @@ data.raw["radar"]["radar"].pictures = else data.raw.item["radar"].icons = {{ icon = "__base__/graphics/icons/radar.png", - icon_size = 64, icon_mipmaps = 4, + icon_size = 64, tint = {0.9, 0.9, 0.65} }} data.raw["radar"]["radar"].pictures.layers[1].tint = {0.9, 0.9, 0.65} -data.raw["radar"]["radar"].pictures.layers[1].hr_version.tint = {0.9, 0.9, 0.65} end data.raw.item["radar"].stack_size = 20 +data.raw["radar"]["radar"].icon = nil data.raw["radar"]["radar"].icons = data.raw.item["radar"].icons data.raw["radar"]["radar"].fast_replaceable_group = "sensor-node" data.raw["radar"]["radar"].next_upgrade = "nullius-sensor-node-2" @@ -83,6 +85,7 @@ data.raw.item["big-electric-pole"].localised_name = {"entity-name.nullius-pylon- data.raw.item["big-electric-pole"].subgroup = "electric-pole" data.raw.item["big-electric-pole"].order = "nullius-cb" data.raw.item["big-electric-pole"].stack_size = 50 +data.raw.item["big-electric-pole"].icon = nil data.raw.item["big-electric-pole"].icons = {{ icon = ENTICONPATH .. "large-pole-1.png", icon_size = 64 @@ -90,6 +93,7 @@ data.raw.item["big-electric-pole"].icons = {{ label_icon("big-electric-pole", 1, "yellow") data.raw["electric-pole"]["big-electric-pole"].localised_name = data.raw.item["big-electric-pole"].localised_name +data.raw["electric-pole"]["big-electric-pole"].icon = nil data.raw["electric-pole"]["big-electric-pole"].icons = data.raw.item["big-electric-pole"].icons data.raw["electric-pole"]["big-electric-pole"].maximum_wire_distance = 32.5 @@ -104,12 +108,14 @@ data.raw.item["small-electric-pole"].localised_name = {"entity-name.nullius-powe data.raw.item["small-electric-pole"].subgroup = "electric-pole" data.raw.item["small-electric-pole"].order = "nullius-bb" data.raw.item["small-electric-pole"].stack_size = 100 +data.raw.item["small-electric-pole"].icon = nil data.raw.item["small-electric-pole"].icons = {{ icon = ENTICONPATH .. "pole1.png", icon_size = 64 }} label_icon("small-electric-pole", 1, "yellow") data.raw["electric-pole"]["small-electric-pole"].localised_name = data.raw.item["small-electric-pole"].localised_name +data.raw["electric-pole"]["small-electric-pole"].icon = nil data.raw["electric-pole"]["small-electric-pole"].icons = data.raw.item["small-electric-pole"].icons data.raw["electric-pole"]["small-electric-pole"].maximum_wire_distance = 8.5 @@ -121,12 +127,14 @@ data.raw.item["medium-electric-pole"].localised_name = {"entity-name.nullius-pow data.raw.item["medium-electric-pole"].subgroup = "electric-pole" data.raw.item["medium-electric-pole"].order = "nullius-bc" data.raw.item["medium-electric-pole"].stack_size = 100 +data.raw.item["medium-electric-pole"].icon = nil data.raw.item["medium-electric-pole"].icons = {{ icon = ENTICONPATH .. "pole2.png", icon_size = 64 }} label_icon("medium-electric-pole", 2, "red") data.raw["electric-pole"]["medium-electric-pole"].localised_name = data.raw.item["medium-electric-pole"].localised_name +data.raw["electric-pole"]["medium-electric-pole"].icon = nil data.raw["electric-pole"]["medium-electric-pole"].icons = data.raw.item["medium-electric-pole"].icons data.raw["electric-pole"]["medium-electric-pole"].maximum_wire_distance = 11.5 @@ -138,12 +146,14 @@ data.raw.item["substation"].localised_name = {"entity-name.nullius-substation-1" data.raw.item["substation"].subgroup = "electric-pole" data.raw.item["substation"].order = "nullius-db" data.raw.item["substation"].stack_size = 50 +data.raw.item["substation"].icon = nil data.raw.item["substation"].icons = {{ icon = ENTICONPATH .. "substation1.png", icon_size = 64 }} label_icon("substation", 1, "yellow") data.raw["electric-pole"]["substation"].localised_name = data.raw.item["substation"].localised_name +data.raw["electric-pole"]["substation"].icon = nil data.raw["electric-pole"]["substation"].icons = data.raw.item["substation"].icons data.raw["electric-pole"]["substation"].collision_box = {{-0.65, -0.65}, {0.65, 0.65}} data.raw["electric-pole"]["substation"].maximum_wire_distance = 24.5 @@ -151,97 +161,108 @@ data.raw["electric-pole"]["substation"].supply_area_distance = 12 data.raw["electric-pole"]["substation"].fast_replaceable_group = "pylon" data.raw["electric-pole"]["substation"].next_upgrade = "nullius-substation-2" - +data.raw.item["wooden-chest"].icon = nil data.raw.item["wooden-chest"].icons = {{ icon = ENTICONPATH .. "chest1.png", icon_size = 64 }} data.raw.item["wooden-chest"].subgroup = "storage" data.raw.item["wooden-chest"].order = "nullius-bb" data.raw.item["wooden-chest"].stack_size = 100 +data.raw.item["iron-chest"].icon = nil data.raw.item["iron-chest"].icons = {{ icon = ENTICONPATH .. "chest2.png", icon_size = 64 }} data.raw.item["iron-chest"].subgroup = "storage" data.raw.item["iron-chest"].order = "nullius-bc" data.raw.item["iron-chest"].stack_size = 100 +data.raw.item["steel-chest"].icon = nil data.raw.item["steel-chest"].icons = {{ icon = ENTICONPATH .. "chest3s.png", icon_size = 64 }} data.raw.item["steel-chest"].subgroup = "storage" data.raw.item["steel-chest"].order = "nullius-bd" data.raw.item["steel-chest"].stack_size = 100 +data.raw["container"]["wooden-chest"].icon = nil data.raw["container"]["wooden-chest"].icons = data.raw.item["wooden-chest"].icons data.raw["container"]["wooden-chest"].inventory_size = 10 +data.raw["container"]["iron-chest"].icon = nil data.raw["container"]["iron-chest"].icons = data.raw.item["iron-chest"].icons data.raw["container"]["iron-chest"].inventory_size = 20 +data.raw["container"]["steel-chest"].icon = nil data.raw["container"]["steel-chest"].icons = data.raw.item["steel-chest"].icons data.raw["container"]["steel-chest"].inventory_size = 30 data.raw["container"]["wooden-chest"].next_upgrade = "iron-chest" data.raw["container"]["iron-chest"].next_upgrade = "steel-chest" data.raw["container"]["steel-chest"].next_upgrade = nil - -data.raw.item["logistic-chest-storage"].icons = +data.raw.item["storage-chest"].icon = nil +data.raw.item["storage-chest"].icons = {{ icon = ENTICONPATH .. "chest-storage1.png", icon_size = 64 }} -data.raw.item["logistic-chest-storage"].subgroup = "small-logistic-storage" -data.raw.item["logistic-chest-storage"].order = "nullius-bc" -data.raw.item["logistic-chest-storage"].stack_size = 100 +data.raw.item["storage-chest"].subgroup = "small-logistic-storage" +data.raw.item["storage-chest"].order = "nullius-bc" +data.raw.item["storage-chest"].stack_size = 100 -data.raw.item["logistic-chest-passive-provider"].icons = +data.raw.item["passive-provider-chest"].icon = nil +data.raw.item["passive-provider-chest"].icons = {{ icon = ENTICONPATH .. "chest-supply1.png", icon_size = 64 }} -data.raw.item["logistic-chest-passive-provider"].subgroup = "small-logistic-storage" -data.raw.item["logistic-chest-passive-provider"].order = "nullius-cc" -data.raw.item["logistic-chest-passive-provider"].stack_size = 100 +data.raw.item["passive-provider-chest"].subgroup = "small-logistic-storage" +data.raw.item["passive-provider-chest"].order = "nullius-cc" +data.raw.item["passive-provider-chest"].stack_size = 100 -data.raw.item["logistic-chest-requester"].icons = +data.raw.item["requester-chest"].icon = nil +data.raw.item["requester-chest"].icons = {{ icon = ENTICONPATH .. "chest-demand1.png", icon_size = 64 }} -data.raw.item["logistic-chest-requester"].subgroup = "small-logistic-storage" -data.raw.item["logistic-chest-requester"].order = "nullius-dc" -data.raw.item["logistic-chest-requester"].stack_size = 100 +data.raw.item["requester-chest"].subgroup = "small-logistic-storage" +data.raw.item["requester-chest"].order = "nullius-dc" +data.raw.item["requester-chest"].stack_size = 100 -data.raw.item["logistic-chest-buffer"].icons = +data.raw.item["buffer-chest"].icon = nil +data.raw.item["buffer-chest"].icons = {{ icon = ENTICONPATH .. "chest-buffer1.png", icon_size = 64 }} -data.raw.item["logistic-chest-buffer"].subgroup = "small-logistic-storage" -data.raw.item["logistic-chest-buffer"].order = "nullius-ec" -data.raw.item["logistic-chest-buffer"].stack_size = 100 +data.raw.item["buffer-chest"].subgroup = "small-logistic-storage" +data.raw.item["buffer-chest"].order = "nullius-ec" +data.raw.item["buffer-chest"].stack_size = 100 -data.raw.item["logistic-chest-active-provider"].icons = +data.raw.item["active-provider-chest"].icon = nil +data.raw.item["active-provider-chest"].icons = {{ icon = ENTICONPATH .. "chest-dispatch1.png", icon_size = 64 }} -data.raw.item["logistic-chest-active-provider"].subgroup = "small-logistic-storage" -data.raw.item["logistic-chest-active-provider"].order = "nullius-fc" -data.raw.item["logistic-chest-active-provider"].stack_size = 100 - -data.raw["logistic-container"]["logistic-chest-storage"].icons = - data.raw.item["logistic-chest-storage"].icons -data.raw["logistic-container"]["logistic-chest-storage"].inventory_size = 30 -data.raw["logistic-container"]["logistic-chest-passive-provider"].icons = - data.raw.item["logistic-chest-passive-provider"].icons -data.raw["logistic-container"]["logistic-chest-passive-provider"].inventory_size = 30 -data.raw["logistic-container"]["logistic-chest-requester"].icons = - data.raw.item["logistic-chest-requester"].icons -data.raw["logistic-container"]["logistic-chest-requester"].inventory_size = 30 -data.raw["logistic-container"]["logistic-chest-requester"].max_logistic_slots = 10 -data.raw["logistic-container"]["logistic-chest-buffer"].icons = - data.raw.item["logistic-chest-buffer"].icons -data.raw["logistic-container"]["logistic-chest-buffer"].inventory_size = 30 -data.raw["logistic-container"]["logistic-chest-buffer"].max_logistic_slots = 6 -data.raw["logistic-container"]["logistic-chest-active-provider"].icons = - data.raw.item["logistic-chest-active-provider"].icons -data.raw["logistic-container"]["logistic-chest-active-provider"].inventory_size = 30 -data.raw["logistic-container"]["logistic-chest-storage"].next_upgrade = nil -data.raw["logistic-container"]["logistic-chest-passive-provider"].next_upgrade = nil -data.raw["logistic-container"]["logistic-chest-requester"].next_upgrade = nil -data.raw["logistic-container"]["logistic-chest-buffer"].next_upgrade = nil -data.raw["logistic-container"]["logistic-chest-active-provider"].next_upgrade = nil +data.raw.item["active-provider-chest"].subgroup = "small-logistic-storage" +data.raw.item["active-provider-chest"].order = "nullius-fc" +data.raw.item["active-provider-chest"].stack_size = 100 + +data.raw["logistic-container"]["storage-chest"].icon = nil +data.raw["logistic-container"]["storage-chest"].icons = + data.raw.item["storage-chest"].icons +data.raw["logistic-container"]["storage-chest"].inventory_size = 30 +data.raw["logistic-container"]["passive-provider-chest"].icon = nil +data.raw["logistic-container"]["passive-provider-chest"].icons = + data.raw.item["passive-provider-chest"].icons +data.raw["logistic-container"]["passive-provider-chest"].inventory_size = 30 +data.raw["logistic-container"]["requester-chest"].icon = nil +data.raw["logistic-container"]["requester-chest"].icons = + data.raw.item["requester-chest"].icons +data.raw["logistic-container"]["requester-chest"].inventory_size = 30 +data.raw["logistic-container"]["requester-chest"].max_logistic_slots = 10 +data.raw["logistic-container"]["buffer-chest"].icon = nil +data.raw["logistic-container"]["buffer-chest"].icons = + data.raw.item["buffer-chest"].icons +data.raw["logistic-container"]["buffer-chest"].inventory_size = 30 +data.raw["logistic-container"]["buffer-chest"].max_logistic_slots = 6 +data.raw["logistic-container"]["active-provider-chest"].icon = nil +data.raw["logistic-container"]["active-provider-chest"].icons = + data.raw.item["active-provider-chest"].icons +data.raw["logistic-container"]["active-provider-chest"].inventory_size = 30 +data.raw["logistic-container"]["storage-chest"].next_upgrade = nil +data.raw["logistic-container"]["passive-provider-chest"].next_upgrade = nil +data.raw["logistic-container"]["requester-chest"].next_upgrade = nil +data.raw["logistic-container"]["buffer-chest"].next_upgrade = nil +data.raw["logistic-container"]["active-provider-chest"].next_upgrade = nil data.raw["pipe"]["pipe"].next_upgrade = "nullius-pipe-2" data.raw["pipe-to-ground"]["pipe-to-ground"].next_upgrade = "nullius-underground-pipe-2" -data.raw["pipe"]["pipe"].fluid_box.height = 2 -data.raw["pipe"]["pipe"].fluid_box.base_area = 2 -data.raw["pipe-to-ground"]["pipe-to-ground"].fluid_box.height = 2 -data.raw["pipe-to-ground"]["pipe-to-ground"].fluid_box.base_area = 2 -data.raw["pipe-to-ground"]["pipe-to-ground"].fluid_box.max_underground_distance = 11 +data.raw["pipe"]["pipe"].fluid_box.volume = 400 +data.raw["pipe-to-ground"]["pipe-to-ground"].fluid_box.pipe_connections[2].max_underground_distance = 11 data.raw.item["pipe"].stack_size = 200 data.raw.item["pipe-to-ground"].stack_size = 100 @@ -249,7 +270,7 @@ data.raw.item["pipe-to-ground"].stack_size = 100 data.raw.item["pump"].stack_size = 50 data.raw["pump"]["pump"].fast_replaceable_group = "pump" data.raw["pump"]["pump"].next_upgrade = nil -data.raw["pump"]["pump"].fluid_box.height = 10 +data.raw["pump"]["pump"].fluid_box.volume = 1000 data.raw["pump"]["pump"].pumping_speed = 200 data.raw.pump["nullius-pump-2"].collision_mask = data.raw.pump.pump.collision_mask data.raw.pump["nullius-pump-2"].collision_box = data.raw.pump.pump.collision_box @@ -265,7 +286,7 @@ data.raw.item["oil-refinery"].subgroup = "hidden" if mods["reskins-library"] then data.raw.item["pump"].icons = {{ icon = "__base__/graphics/icons/pump.png", - icon_size = 64, icon_mipmaps = 4 + icon_size = 64, }} end data.raw.pump.pump.animations = @@ -287,8 +308,8 @@ data.raw["mining-drill"]["nullius-geothermal-build-3"].collision_box = for _,fluid in pairs(data.raw.fluid) do local barrel_name = fluid.name .. "-barrel" if (string.sub(fluid.name, 1, 8) == "nullius-") and - data.raw.recipe["fill-" .. fluid.name .. "-barrel"] then - local fill_name = "fill-" .. barrel_name + data.raw.recipe[fluid.name .. "-barrel"] then + local fill_name = barrel_name local empty_name = "empty-" .. barrel_name local subgroup = fluid.subgroup data.raw.item[barrel_name].subgroup = "fill-" .. subgroup @@ -369,8 +390,10 @@ for _,character in pairs(data.raw["character"]) do character.subgroup = "armor" end -for _,tip in pairs(data.raw["tips-and-tricks-item"]) do - if (string.sub(tip.name, 1, 7) == "angels-") then - data.raw["tips-and-tricks-item"][tip.name] = nil +if mods["angelsrefining"] then + for _,tip in pairs(data.raw["tips-and-tricks-item"]) do + if (string.sub(tip.name, 1, 7) == "angels-") then + data.raw["tips-and-tricks-item"][tip.name] = nil + end end -end +end \ No newline at end of file diff --git a/nullius/prototypes/override_final_only.lua b/nullius/prototypes/override_final_only.lua index d0fec2e..d22aea9 100644 --- a/nullius/prototypes/override_final_only.lua +++ b/nullius/prototypes/override_final_only.lua @@ -16,7 +16,7 @@ data.raw["container"]["steel-chest"].picture = { layers = { scale = 0.5 }, { - filename = BASEENTITY .. "infinity-chest/hr-infinity-chest-shadow.png", + filename = BASEENTITY .. "infinity-chest/infinity-chest-shadow.png", priority = "extra-high", width = 116, height = 48, @@ -30,6 +30,6 @@ data.raw["container"]["steel-chest"].picture = { layers = { for _,character in pairs(data.raw["character"]) do if ((character.name ~= "character") and (character.name ~= "nullius-android-2")) then - table.insert(character.flags,"hidden") + character.hidden = true end end diff --git a/nullius/prototypes/override_mod.lua b/nullius/prototypes/override_mod.lua index c4a9d6b..baa57ae 100644 --- a/nullius/prototypes/override_mod.lua +++ b/nullius/prototypes/override_mod.lua @@ -2,6 +2,24 @@ local ICONPATH = "__nullius__/graphics/icons/" local ENTITYPATH = "__nullius__/graphics/entity/" +if mods["elevated-rails"] then + data.raw["item"]["rail-support"].subgroup = "railway" + data.raw["item"]["rail-support"].order = "nullius-dm" + data.raw["item"]["rail-support"].localised_name = {"entity-name.nullius-rail-pylon"} + data.raw["rail-support"]["rail-support"].subgroup = "railway" + data.raw["rail-support"]["rail-support"].order = "nullius-dm" + data.raw["rail-support"]["rail-support"].localised_name = {"entity-name.nullius-rail-pylon"} + data.raw["rail-planner"]["rail-ramp"].subgroup = "railway" + data.raw["rail-planner"]["rail-ramp"].order = "nullius-dn" + data.raw["rail-ramp"]["rail-ramp"].subgroup = "railway" + data.raw["rail-ramp"]["rail-ramp"].order = "nullius-dn" +table.insert( + data.raw.technology["nullius-freight-transportation-2"].prerequisites, + "nullius-elevated-rails" +) +end + + if mods["LogisticTrainNetwork"] then data.raw["train-stop"]["logistic-train-stop"].subgroup = "railway" data.raw["train-stop"]["logistic-train-stop"].order = "nullius-ecb" @@ -156,17 +174,6 @@ data.raw.technology["factory-interior-upgrade-display"].unit = { } table.insert(data.raw.technology["nullius-packaging-5"].prerequisites,"factory-interior-upgrade-display") -data.raw.technology["factory-preview"].order = "nullius-e" -data.raw.technology["factory-preview"].prerequisites = { - "factory-interior-upgrade-display", "nullius-checkpoint-large-beacon"} -data.raw.technology["factory-preview"].unit = { - count = 8*factory_mult, time = 35, - ingredients = { - {"nullius-geology-pack", 1}, {"nullius-climatology-pack", 1}, - {"nullius-mechanical-pack", 1}, {"nullius-electrical-pack", 1}, - {"nullius-chemical-pack", 1}} -} - if mods["factorissimo-2-notnotmelon"] then data.raw.technology["factory-recursion-t1"].prerequisites = { "factory-architecture-t2", "nullius-packaging-4"} @@ -208,48 +215,51 @@ data.raw.technology["factory-recursion-t2"].unit = { } table.insert(data.raw.technology["nullius-logistics-4"].prerequisites,"factory-recursion-t2") -data.raw.pipe["factory-fluid-dummy-connector-"..defines.direction.south].fluid_box.height = 5 -data.raw.pipe["factory-fluid-dummy-connector-"..defines.direction.north].fluid_box.height = 5 -data.raw.pipe["factory-fluid-dummy-connector-"..defines.direction.east].fluid_box.height = 5 -data.raw.pipe["factory-fluid-dummy-connector-"..defines.direction.west].fluid_box.height = 5 - data.raw["storage-tank"]["factory-1"].minable.mining_time = 4 data.raw["storage-tank"]["factory-2"].minable.mining_time = 6 data.raw["storage-tank"]["factory-3"].minable.mining_time = 8 -data.raw.technology["factory-architecture-t1"].localised_name = {"", {"technology-name.nullius-architecture"}, " ", 1} -data.raw.technology["factory-architecture-t2"].localised_name = {"", {"technology-name.nullius-architecture"}, " ", 2} -data.raw.technology["nullius-architecture-1"].localised_name = {"", {"technology-name.nullius-architecture"}, " ", 3} -data.raw.technology["factory-architecture-t3"].localised_name = {"", {"technology-name.nullius-architecture"}, " ", 4} +data.raw.technology["factory-architecture-t1"].localised_name = {"", {"technology-name.nullius-architecture"}, " ", tostring(1)} +data.raw.technology["factory-architecture-t2"].localised_name = {"", {"technology-name.nullius-architecture"}, " ", tostring(2)} +data.raw.technology["nullius-architecture-1"].localised_name = {"", {"technology-name.nullius-architecture"}, " ", tostring(3)} +data.raw.technology["factory-architecture-t3"].localised_name = {"", {"technology-name.nullius-architecture"}, " ", tostring(4)} + +for _, item in pairs({"factory-1", "factory-2"}) do + for i, flag in pairs(data.raw.item[item].flags) do + if flag == "not-stackable" then + table.remove(data.raw.item[item].flags, i) + end + end +end end -if mods["bobinserters"] and (settings.startup["bobmods-inserters-long2"].value == true) then -data.raw.technology["long-inserters-1"].order = "nullius-ce" -data.raw.technology["long-inserters-1"].prerequisites = {"nullius-automation"} -data.raw.technology["long-inserters-1"].unit = { count = 3, +if (mods["bobinserters"] or mods["quick-adjustable-inserters"] )and (settings.startup["bobmods-inserters-long2"].value == true) then +data.raw.technology["bob-long-inserters-1"].order = "nullius-ce" +data.raw.technology["bob-long-inserters-1"].prerequisites = {"nullius-automation"} +data.raw.technology["bob-long-inserters-1"].unit = { count = 3, ingredients = {{"nullius-mechanical-pack", 1}}, time = 8 } -table.insert(data.raw.technology["nullius-aesthetics-1"].prerequisites,"long-inserters-2") +table.insert(data.raw.technology["nullius-aesthetics-1"].prerequisites,"bob-long-inserters-2") -data.raw.technology["long-inserters-2"].order = "nullius-dd" -data.raw.technology["long-inserters-2"].prerequisites = {"nullius-maintenance"} -data.raw.technology["long-inserters-2"].unit = { count = 20, +data.raw.technology["bob-long-inserters-2"].order = "nullius-dd" +data.raw.technology["bob-long-inserters-2"].prerequisites = {"nullius-maintenance"} +data.raw.technology["bob-long-inserters-2"].unit = { count = 20, ingredients = {{"nullius-mechanical-pack", 1}, {"nullius-electrical-pack", 1}}, time = 20 } else -data.raw.technology["long-inserters-1"].order = "nullius-dd" -data.raw.technology["long-inserters-1"].localised_name = {"technology-name.nullius-long-inserters"} -data.raw.technology["long-inserters-1"].localised_description = {"technology-description.nullius-long-inserters"} -data.raw.technology["long-inserters-1"].prerequisites = {"nullius-lubrication", "nullius-mass-production-1"} -data.raw.technology["long-inserters-1"].unit = { count = 8, +data.raw.technology["bob-long-inserters-1"].order = "nullius-dd" +data.raw.technology["bob-long-inserters-1"].localised_name = {"technology-name.nullius-long-inserters"} +data.raw.technology["bob-long-inserters-1"].localised_description = {"technology-description.nullius-long-inserters"} +data.raw.technology["bob-long-inserters-1"].prerequisites = {"nullius-lubrication", "nullius-mass-production-1"} +data.raw.technology["bob-long-inserters-1"].unit = { count = 8, ingredients = {{"nullius-mechanical-pack", 1}}, time = 6 } end -data.raw.technology["long-inserters-1"].ignore_tech_cost_multiplier = true +data.raw.technology["bob-long-inserters-1"].ignore_tech_cost_multiplier = true if mods["miniloader"] then @@ -342,8 +352,8 @@ end data.raw.technology["nullius-mass-production-1"].prerequisites = { "nullius-miniloader-1", "nullius-checkpoint-mineral-dust"} -if mods["bobinserters"] and (settings.startup["bobmods-inserters-long2"].value == true) then -table.insert(data.raw.technology["long-inserters-2"].prerequisites,"nullius-miniloader-2") +if (mods["bobinserters"] or mods["quick-adjustable-inserters"]) and (settings.startup["bobmods-inserters-long2"].value == true) then +table.insert(data.raw.technology["bob-long-inserters-2"].prerequisites,"nullius-miniloader-2") else table.insert(data.raw.technology["nullius-mineral-processing-2"].prerequisites,"nullius-miniloader-2") end @@ -369,7 +379,7 @@ AAILoaders.make_tier{ ingredients = {{"automation-science-pack", 1}} } }, - recipe = { ingredients = {{"transport-belt", 1}}, energy_required = 2 } + recipe = { ingredients = {{type = "item", name = "transport-belt", amount = 1}}, energy_required = 2 } } AAILoaders.make_tier{ @@ -387,14 +397,14 @@ AAILoaders.make_tier{ {"logistic-science-pack", 1}, {"chemical-science-pack", 1}} } }, - recipe = { ingredients = {{"transport-belt", 1}}, energy_required = 2 } + recipe = { ingredients = {{type = "item", name ="transport-belt", amount = 1}}, energy_required = 2 } } -data.raw["loader-1x1"]["aai-basic-loader"].localised_name = {"", {"entity-name.aai-loader"}, " ", 1} -data.raw["loader-1x1"]["aai-loader"].localised_name = {"", {"entity-name.aai-loader"}, " ", 2} -data.raw["loader-1x1"]["aai-fast-loader"].localised_name = {"", {"entity-name.aai-loader"}, " ", 3} -data.raw["loader-1x1"]["aai-express-loader"].localised_name = {"", {"entity-name.aai-loader"}, " ", 4} -data.raw["loader-1x1"]["aai-ultimate-loader"].localised_name = {"", {"entity-name.aai-loader"}, " ", 5} +data.raw["loader-1x1"]["aai-basic-loader"].localised_name = {"", {"entity-name.aai-loader"}, " ", "1"} +data.raw["loader-1x1"]["aai-loader"].localised_name = {"", {"entity-name.aai-loader"}, " ", "2"} +data.raw["loader-1x1"]["aai-fast-loader"].localised_name = {"", {"entity-name.aai-loader"}, " ", "3"} +data.raw["loader-1x1"]["aai-express-loader"].localised_name = {"", {"entity-name.aai-loader"}, " ", "4"} +data.raw["loader-1x1"]["aai-ultimate-loader"].localised_name = {"", {"entity-name.aai-loader"}, " ", "5"} data.raw["loader-1x1"]["aai-basic-loader"].localised_description = {"entity-description.nullius-loader"} data.raw["loader-1x1"]["aai-loader"].localised_description = {"entity-description.nullius-loader"} data.raw["loader-1x1"]["aai-fast-loader"].localised_description = {"entity-description.nullius-loader"} @@ -456,12 +466,13 @@ data.raw.technology["nullius-loader-5"].icons = data.raw.technology["aai-ultimat if (data.raw["loader-1x1"]["aai-turbo-loader"] ~= nil) then data.raw["loader-1x1"]["aai-turbo-loader"].next_upgrade = nil +data.raw["loader-1x1"]["aai-turbo-loader"].hidden_in_factoriopedia = true end table.insert(data.raw.technology["nullius-mechanical-separation"].prerequisites,"nullius-loader-1") table.insert(data.raw.technology["nullius-checkpoint-mass-production"].prerequisites,"nullius-loader-2") -if mods["bobinserters"] and (settings.startup["bobmods-inserters-long2"].value == true) then -table.insert(data.raw.technology["long-inserters-2"].prerequisites,"nullius-loader-3") +if (mods["bobinserters"] or mods["quick-adjustable-inserters"]) and (settings.startup["bobmods-inserters-long2"].value == true) then +table.insert(data.raw.technology["bob-long-inserters-2"].prerequisites,"nullius-loader-3") else table.insert(data.raw.technology["nullius-mineral-processing-2"].prerequisites,"nullius-loader-3") end @@ -470,50 +481,51 @@ table.insert(data.raw.technology["nullius-inserter-capacity-5"].prerequisites,"n end -if mods["bobinserters"] then +if mods["bobinserters"] or mods["quick-adjustable-inserters"] then if (settings.startup["bobmods-inserters-long2"].value == true) then -data.raw.technology["near-inserters"].prerequisites = {"long-inserters-1", "nullius-checkpoint-steel-ingot"} -data.raw.technology["near-inserters"].order = "nullius-cf" -data.raw.technology["near-inserters"].ignore_tech_cost_multiplier = true -data.raw.technology["near-inserters"].unit = { count = 3, +data.raw.technology["bob-near-inserters"].prerequisites = {"bob-long-inserters-1", "nullius-checkpoint-steel-ingot"} +data.raw.technology["bob-near-inserters"].order = "nullius-cf" +data.raw.technology["bob-near-inserters"].ignore_tech_cost_multiplier = true +data.raw.technology["bob-near-inserters"].unit = { count = 3, ingredients = {{"nullius-mechanical-pack", 1}}, time = 8 } -table.insert(data.raw.technology["nullius-toolmaking-2"].prerequisites,"near-inserters") +table.insert(data.raw.technology["nullius-toolmaking-2"].prerequisites,"bob-near-inserters") else -data.raw.technology["near-inserters"].prerequisites = {"nullius-maintenance"} -data.raw.technology["near-inserters"].order = "nullius-dg" -data.raw.technology["near-inserters"].unit = { count = 20, +data.raw.technology["bob-near-inserters"].prerequisites = {"nullius-maintenance"} +data.raw.technology["bob-near-inserters"].order = "nullius-dg" +data.raw.technology["bob-near-inserters"].unit = { count = 20, ingredients = {{"nullius-mechanical-pack", 1}, {"nullius-electrical-pack", 1}}, time = 25 } -table.insert(data.raw.technology["nullius-aesthetics-1"].prerequisites,"near-inserters") +table.insert(data.raw.technology["nullius-aesthetics-1"].prerequisites,"bob-near-inserters") end -data.raw.technology["more-inserters-1"].order = "nullius-df" -data.raw.technology["more-inserters-1"].unit = { count = 70, +data.raw.technology["bob-more-inserters-1"].order = "nullius-df" +data.raw.technology["bob-more-inserters-1"].unit = { count = 70, ingredients = {{"nullius-mechanical-pack", 1}, {"nullius-electrical-pack", 1}}, time = 30 } -data.raw.technology["more-inserters-1"].prerequisites = { +data.raw.technology["bob-more-inserters-1"].prerequisites = { "nullius-metalworking-2", "nullius-locomotion-1"} -table.insert(data.raw.technology["nullius-cybernetics-2"].prerequisites,"more-inserters-1") +table.insert(data.raw.technology["nullius-cybernetics-2"].prerequisites,"bob-more-inserters-1") if settings.startup["bobmods-inserters-more2"].value == true then -data.raw.technology["more-inserters-2"].order = "nullius-ek" -data.raw.technology["more-inserters-2"].unit = { count = 300, +data.raw.technology["bob-more-inserters-2"].order = "nullius-ek" +data.raw.technology["bob-more-inserters-2"].unit = { count = 300, ingredients = { {"nullius-mechanical-pack", 1}, {"nullius-electrical-pack", 1}, {"nullius-chemical-pack", 1} }, time = 35 } -data.raw.technology["more-inserters-2"].prerequisites = {"nullius-logistics-3"} -table.insert(data.raw.technology["nullius-inserter-capacity-1"].prerequisites,"more-inserters-2") +data.raw.technology["bob-more-inserters-2"].prerequisites = {"nullius-logistics-3"} +table.insert(data.raw.technology["nullius-inserter-capacity-1"].prerequisites,"bob-more-inserters-2") end end if mods["train-pubsub"] then +data.raw["item-subgroup"]["transport"].group = "logistics" data.raw.technology["train-manager"].order = "nullius-dl" data.raw.technology["train-manager"].unit = { count = 300, @@ -605,145 +617,164 @@ if mods["underground-pipe-pack"] then data.raw.item["one-to-one-forward-t2-pipe"].subgroup = "nullius-surface-junction" data.raw.item["one-to-one-forward-t2-pipe"].order = "nullius-bb" data.raw.item["one-to-one-forward-t2-pipe"].localised_name = - {"", {"item-name.nullius-surface-two-way-junction"}, " ", 1} + {"", {"item-name.nullius-surface-two-way-junction"}, " ", tostring(1)} data.raw.item["one-to-one-forward-t2-pipe"].localised_description = - {"", {"item-description.nullius-surface-two-way-junction"}, - {"item-description.nullius-pressure-2"}, {"item-description.nullius-underground-ctrl-r"}} + {"", {"item-description.nullius-surface-two-way-junction"},{"item-description.nullius-underground-ctrl-r"}} +data.raw.recipe["nullius-surface-two-way-junction-1"].localised_name = data.raw.item["one-to-one-forward-t2-pipe"].localised_name + data.raw.item["one-to-two-perpendicular-t2-pipe"].subgroup = "nullius-surface-junction" data.raw.item["one-to-two-perpendicular-t2-pipe"].order = "nullius-bc" data.raw.item["one-to-two-perpendicular-t2-pipe"].localised_name = - {"", {"item-name.nullius-surface-three-way-junction"}, " ", 1} + {"", {"item-name.nullius-surface-three-way-junction"}, " ", tostring(1)} data.raw.item["one-to-two-perpendicular-t2-pipe"].localised_description = - {"", {"item-description.nullius-surface-three-way-junction"}, - {"item-description.nullius-pressure-2"}, {"item-description.nullius-underground-ctrl-r"}} + {"", {"item-description.nullius-surface-three-way-junction"},{"item-description.nullius-underground-ctrl-r"}} +data.raw.recipe["nullius-surface-three-way-junction-1"].localised_name = data.raw.item["one-to-two-perpendicular-t2-pipe"].localised_name + data.raw.item["one-to-three-forward-t2-pipe"].subgroup = "nullius-surface-junction" data.raw.item["one-to-three-forward-t2-pipe"].order = "nullius-bd" data.raw.item["one-to-three-forward-t2-pipe"].localised_name = - {"", {"item-name.nullius-surface-four-way-junction"}, " ", 1} + {"", {"item-name.nullius-surface-four-way-junction"}, " ", tostring(1)} data.raw.item["one-to-three-forward-t2-pipe"].localised_description = - {"", {"item-description.nullius-surface-four-way-junction"}, - {"item-description.nullius-pressure-2"}, {"item-description.nullius-underground-ctrl-r"}} + {"", {"item-description.nullius-surface-four-way-junction"},{"item-description.nullius-underground-ctrl-r"}} +data.raw.recipe["nullius-surface-four-way-junction-1"].localised_name = data.raw.item["one-to-three-forward-t2-pipe"].localised_name + data.raw.item["underground-i-t2-pipe"].subgroup = "nullius-underground-junction" data.raw.item["underground-i-t2-pipe"].order = "nullius-bb" data.raw.item["underground-i-t2-pipe"].localised_name = - {"", {"item-name.nullius-underground-straight-junction"}, " ", 1} + {"", {"item-name.nullius-underground-straight-junction"}, " ", tostring(1)} data.raw.item["underground-i-t2-pipe"].localised_description = - {"", {"item-description.nullius-underground-straight-junction"}, - {"item-description.nullius-pressure-2"}} + {"", {"item-description.nullius-underground-straight-junction"}} +data.raw.recipe["nullius-underground-straight-junction-1"].localised_name = data.raw.item["underground-i-t2-pipe"].localised_name + data.raw.item["underground-L-t2-pipe"].subgroup = "nullius-underground-junction" data.raw.item["underground-L-t2-pipe"].order = "nullius-bc" data.raw.item["underground-L-t2-pipe"].localised_name = - {"", {"item-name.nullius-underground-elbow-junction"}, " ", 1} + {"", {"item-name.nullius-underground-elbow-junction"}, " ", tostring(1)} data.raw.item["underground-L-t2-pipe"].localised_description = - {"", {"item-description.nullius-underground-elbow-junction"}, - {"item-description.nullius-pressure-2"}} + {"", {"item-description.nullius-underground-elbow-junction"}} +data.raw.recipe["nullius-underground-elbow-junction-1"].localised_name = data.raw.item["underground-L-t2-pipe"].localised_name + data.raw.item["underground-t-t2-pipe"].subgroup = "nullius-underground-junction" data.raw.item["underground-t-t2-pipe"].order = "nullius-bd" data.raw.item["underground-t-t2-pipe"].localised_name = - {"", {"item-name.nullius-underground-three-way-junction"}, " ", 1} + {"", {"item-name.nullius-underground-three-way-junction"}, " ", tostring(1)} data.raw.item["underground-t-t2-pipe"].localised_description = - {"", {"item-description.nullius-underground-three-way-junction"}, - {"item-description.nullius-pressure-2"}} + {"", {"item-description.nullius-underground-three-way-junction"}} +data.raw.recipe["nullius-underground-three-way-junction-1"].localised_name = data.raw.item["underground-t-t2-pipe"].localised_name data.raw.item["one-to-one-forward-t3-pipe"].subgroup = "nullius-surface-junction" data.raw.item["one-to-one-forward-t3-pipe"].order = "nullius-cb" data.raw.item["one-to-one-forward-t3-pipe"].localised_name = - {"", {"item-name.nullius-surface-two-way-junction"}, " ", 2} + {"", {"item-name.nullius-surface-two-way-junction"}, " ", tostring(2)} data.raw.item["one-to-one-forward-t3-pipe"].localised_description = - {"", {"item-description.nullius-surface-two-way-junction"}, - {"item-description.nullius-pressure-3"}, {"item-description.nullius-underground-ctrl-r"}} + {"", {"item-description.nullius-surface-two-way-junction"},{"item-description.nullius-underground-ctrl-r"}} +data.raw.recipe["nullius-surface-two-way-junction-2"].localised_name = data.raw.item["one-to-one-forward-t3-pipe"].localised_name + data.raw.item["one-to-two-perpendicular-t3-pipe"].subgroup = "nullius-surface-junction" data.raw.item["one-to-two-perpendicular-t3-pipe"].order = "nullius-cc" data.raw.item["one-to-two-perpendicular-t3-pipe"].localised_name = - {"", {"item-name.nullius-surface-three-way-junction"}, " ", 2} + {"", {"item-name.nullius-surface-three-way-junction"}, " ", tostring(2)} data.raw.item["one-to-two-perpendicular-t3-pipe"].localised_description = - {"", {"item-description.nullius-surface-three-way-junction"}, - {"item-description.nullius-pressure-3"}, {"item-description.nullius-underground-ctrl-r"}} + {"", {"item-description.nullius-surface-three-way-junction"},{"item-description.nullius-underground-ctrl-r"}} +data.raw.recipe["nullius-surface-three-way-junction-2"].localised_name = data.raw.item["one-to-two-perpendicular-t3-pipe"].localised_name + data.raw.item["one-to-three-forward-t3-pipe"].subgroup = "nullius-surface-junction" data.raw.item["one-to-three-forward-t3-pipe"].order = "nullius-cd" data.raw.item["one-to-three-forward-t3-pipe"].localised_name = - {"", {"item-name.nullius-surface-four-way-junction"}, " ", 2} + {"", {"item-name.nullius-surface-four-way-junction"}, " ", tostring(2)} data.raw.item["one-to-three-forward-t3-pipe"].localised_description = - {"", {"item-description.nullius-surface-four-way-junction"}, - {"item-description.nullius-pressure-3"}, {"item-description.nullius-underground-ctrl-r"}} + {"", {"item-description.nullius-surface-four-way-junction"},{"item-description.nullius-underground-ctrl-r"}} +data.raw.recipe["nullius-surface-four-way-junction-2"].localised_name = data.raw.item["one-to-three-forward-t3-pipe"].localised_name + data.raw.item["underground-i-t3-pipe"].subgroup = "nullius-underground-junction" data.raw.item["underground-i-t3-pipe"].order = "nullius-cb" data.raw.item["underground-i-t3-pipe"].localised_name = - {"", {"item-name.nullius-underground-straight-junction"}, " ", 2} + {"", {"item-name.nullius-underground-straight-junction"}, " ", tostring(2)} data.raw.item["underground-i-t3-pipe"].localised_description = - {"", {"item-description.nullius-underground-straight-junction"}, - {"item-description.nullius-pressure-3"}} + {"", {"item-description.nullius-underground-straight-junction"}} +data.raw.recipe["nullius-underground-straight-junction-2"].localised_name = data.raw.item["underground-i-t3-pipe"].localised_name + data.raw.item["underground-L-t3-pipe"].subgroup = "nullius-underground-junction" data.raw.item["underground-L-t3-pipe"].order = "nullius-cc" data.raw.item["underground-L-t3-pipe"].localised_name = - {"", {"item-name.nullius-underground-elbow-junction"}, " ", 2} + {"", {"item-name.nullius-underground-elbow-junction"}, " ", tostring(2)} data.raw.item["underground-L-t3-pipe"].localised_description = - {"", {"item-description.nullius-underground-elbow-junction"}, - {"item-description.nullius-pressure-3"}} + {"", {"item-description.nullius-underground-elbow-junction"}} +data.raw.recipe["nullius-underground-elbow-junction-2"].localised_name = data.raw.item["underground-L-t3-pipe"].localised_name + data.raw.item["underground-t-t3-pipe"].subgroup = "nullius-underground-junction" data.raw.item["underground-t-t3-pipe"].order = "nullius-cd" data.raw.item["underground-t-t3-pipe"].localised_name = - {"", {"item-name.nullius-underground-three-way-junction"}, " ", 2} + {"", {"item-name.nullius-underground-three-way-junction"}, " ", tostring(2)} data.raw.item["underground-t-t3-pipe"].localised_description = - {"", {"item-description.nullius-underground-three-way-junction"}, - {"item-description.nullius-pressure-3"}} + {"", {"item-description.nullius-underground-three-way-junction"}} +data.raw.recipe["nullius-underground-three-way-junction-2"].localised_name = data.raw.item["underground-t-t3-pipe"].localised_name + data.raw.item["one-to-one-forward-pipe"].subgroup = "nullius-surface-junction" data.raw.item["one-to-one-forward-pipe"].order = "nullius-db" data.raw.item["one-to-one-forward-pipe"].localised_name = - {"", {"item-name.nullius-surface-two-way-junction"}, " ", 3} + {"", {"item-name.nullius-surface-two-way-junction"}, " ", tostring(3)} data.raw.item["one-to-one-forward-pipe"].localised_description = - {"", {"item-description.nullius-surface-two-way-junction"}, - {"item-description.nullius-pressure-4"}, {"item-description.nullius-underground-ctrl-r"}} + {"", {"item-description.nullius-surface-two-way-junction"},{"item-description.nullius-underground-ctrl-r"}} +data.raw.recipe["nullius-surface-two-way-junction-3"].localised_name = data.raw.item["one-to-one-forward-pipe"].localised_name + data.raw.item["one-to-two-perpendicular-pipe"].subgroup = "nullius-surface-junction" data.raw.item["one-to-two-perpendicular-pipe"].order = "nullius-dc" data.raw.item["one-to-two-perpendicular-pipe"].localised_name = - {"", {"item-name.nullius-surface-three-way-junction"}, " ", 3} + {"", {"item-name.nullius-surface-three-way-junction"}, " ", tostring(3)} data.raw.item["one-to-two-perpendicular-pipe"].localised_description = - {"", {"item-description.nullius-surface-three-way-junction"}, - {"item-description.nullius-pressure-4"}, {"item-description.nullius-underground-ctrl-r"}} + {"", {"item-description.nullius-surface-three-way-junction"},{"item-description.nullius-underground-ctrl-r"}} +data.raw.recipe["nullius-surface-three-way-junction-3"].localised_name = data.raw.item["one-to-two-perpendicular-pipe"].localised_name + data.raw.item["one-to-three-forward-pipe"].subgroup = "nullius-surface-junction" data.raw.item["one-to-three-forward-pipe"].order = "nullius-dd" data.raw.item["one-to-three-forward-pipe"].localised_name = - {"", {"item-name.nullius-surface-four-way-junction"}, " ", 3} + {"", {"item-name.nullius-surface-four-way-junction"}, " ", tostring(3)} data.raw.item["one-to-three-forward-pipe"].localised_description = - {"", {"item-description.nullius-surface-four-way-junction"}, - {"item-description.nullius-pressure-4"}, {"item-description.nullius-underground-ctrl-r"}} + {"", {"item-description.nullius-surface-four-way-junction"},{"item-description.nullius-underground-ctrl-r"}} +data.raw.recipe["nullius-surface-four-way-junction-3"].localised_name = data.raw.item["one-to-three-forward-pipe"].localised_name + data.raw.item["one-to-four-pipe"].subgroup = "nullius-surface-junction" data.raw.item["one-to-four-pipe"].order = "nullius-de" data.raw.item["one-to-four-pipe"].localised_name = - {"", {"item-name.nullius-surface-five-way-junction"}, " ", 3} + {"", {"item-name.nullius-surface-five-way-junction"}, " ", tostring(3)} data.raw.item["one-to-four-pipe"].localised_description = - {"", {"item-description.nullius-surface-five-way-junction"}, - {"item-description.nullius-pressure-4"}} + {"", {"item-description.nullius-surface-five-way-junction"}} +data.raw.recipe["nullius-surface-five-way-junction-3"].localised_name = data.raw.item["one-to-four-pipe"].localised_name + data.raw.item["underground-i-pipe"].subgroup = "nullius-underground-junction" data.raw.item["underground-i-pipe"].order = "nullius-db" data.raw.item["underground-i-pipe"].localised_name = - {"", {"item-name.nullius-underground-straight-junction"}, " ", 3} + {"", {"item-name.nullius-underground-straight-junction"}, " ", tostring(3)} data.raw.item["underground-i-pipe"].localised_description = - {"", {"item-description.nullius-underground-straight-junction"}, - {"item-description.nullius-pressure-4"}} + {"", {"item-description.nullius-underground-straight-junction"}} +data.raw.recipe["nullius-underground-straight-junction-3"].localised_name = data.raw.item["underground-i-pipe"].localised_name + data.raw.item["underground-L-pipe"].subgroup = "nullius-underground-junction" data.raw.item["underground-L-pipe"].order = "nullius-dc" data.raw.item["underground-L-pipe"].localised_name = - {"", {"item-name.nullius-underground-elbow-junction"}, " ", 3} + {"", {"item-name.nullius-underground-elbow-junction"}, " ", tostring(3)} data.raw.item["underground-L-pipe"].localised_description = - {"", {"item-description.nullius-underground-elbow-junction"}, - {"item-description.nullius-pressure-4"}} + {"", {"item-description.nullius-underground-elbow-junction"}} +data.raw.recipe["nullius-underground-elbow-junction-3"].localised_name = data.raw.item["underground-L-pipe"].localised_name + data.raw.item["underground-t-pipe"].subgroup = "nullius-underground-junction" data.raw.item["underground-t-pipe"].order = "nullius-dd" data.raw.item["underground-t-pipe"].localised_name = - {"", {"item-name.nullius-underground-three-way-junction"}, " ", 3} + {"", {"item-name.nullius-underground-three-way-junction"}, " ", tostring(3)} data.raw.item["underground-t-pipe"].localised_description = - {"", {"item-description.nullius-underground-three-way-junction"}, - {"item-description.nullius-pressure-4"}} + {"", {"item-description.nullius-underground-three-way-junction"}} +data.raw.recipe["nullius-underground-three-way-junction-3"].localised_name = data.raw.item["underground-t-pipe"].localised_name + data.raw.item["underground-cross-pipe"].subgroup = "nullius-underground-junction" data.raw.item["underground-cross-pipe"].order = "nullius-de" data.raw.item["underground-cross-pipe"].localised_name = - {"", {"item-name.nullius-underground-four-way-junction"}, " ", 3} + {"", {"item-name.nullius-underground-four-way-junction"}, " ", tostring(3)} data.raw.item["underground-cross-pipe"].localised_description = - {"", {"item-description.nullius-underground-four-way-junction"}, - {"item-description.nullius-pressure-4"}} + {"", {"item-description.nullius-underground-four-way-junction"}} +data.raw.recipe["nullius-underground-four-way-junction-3"].localised_name = data.raw.item["underground-cross-pipe"].localised_name + data.raw.item["80-overflow-valve"].subgroup = "valves" data.raw.item["80-overflow-valve"].order = "nullius-dmb" @@ -766,7 +797,7 @@ data.raw.item["underground-mini-pump"].localised_description = {"item-description.nullius-underground-pump"} data.raw.technology["advanced-underground-piping"].localised_name = {"", - {"technology-name.advanced-underground-piping"}, " ", 1} + {"technology-name.advanced-underground-piping"}, " ", tostring(1)} data.raw.technology["advanced-underground-piping"].icon = "__underground-pipe-pack__/graphics/technology/advanced-underground-piping-t2.png" data.raw.technology["advanced-underground-piping"].prerequisites = {"nullius-checkpoint-freshwater"} @@ -815,7 +846,7 @@ data.raw.technology["advanced-underground-piping"].effects = { } data.raw.technology["advanced-underground-piping-t2"].localised_name = {"", - {"technology-name.advanced-underground-piping"}, " ", 2} + {"technology-name.advanced-underground-piping"}, " ", tostring(2)} data.raw.technology["advanced-underground-piping-t2"].localised_description = {"technology-description.advanced-underground-piping"} data.raw.technology["advanced-underground-piping-t2"].icon = @@ -858,7 +889,7 @@ data.raw.technology["advanced-underground-piping-t2"].effects = { } data.raw.technology["advanced-underground-piping-t3"].localised_name = {"", - {"technology-name.advanced-underground-piping"}, " ", 3} + {"technology-name.advanced-underground-piping"}, " ", tostring(3)} data.raw.technology["advanced-underground-piping-t3"].localised_description = {"technology-description.advanced-underground-piping"} data.raw.technology["advanced-underground-piping-t3"].icon = @@ -916,7 +947,7 @@ data.raw.pump["underground-mini-pump"].localised_name = {"item-name.nullius-underground-pump"} data.raw.pump["underground-mini-pump"].localised_description = {"item-description.nullius-underground-pump"} -data.raw.pump["underground-mini-pump"].fluid_box.height = 8 +data.raw.pump["underground-mini-pump"].fluid_box.volume = 500 data.raw.pump["underground-mini-pump"].fluid_box.pipe_connections[1].max_underground_distance=24 data.raw.pump["underground-mini-pump"].fluid_box.pipe_connections[2].max_underground_distance=24 data.raw.pump["underground-mini-pump"].energy_usage = '20kW' @@ -941,24 +972,22 @@ for _,junction in pairs(data.raw["pipe-to-ground"]) do else for _,pic in pairs(junction.pictures) do pic.tint = tint - pic.hr_version.tint = tint end for _,cover in pairs(junction.fluid_box.pipe_covers) do cover.layers[1].tint = tint - cover.layers[1].hr_version.tint = tint end - local subdir = string.sub(junction.pictures.up.filename, 1, 50) - junction.pictures.up = { layers = { + local subdir = string.sub(junction.pictures.north.filename, 1, 50) + junction.pictures.north = { layers = { { filename = subdir .. "pipe-covers/hr-pipe-cover-north.png", priority = "extra-high", width = 128, height = 128, - shift = {0, -1}, - tint = tint, + shift = {0, -1}, + tint = tint, scale = 0.5 - }, - junction.pictures.up.hr_version + }, + junction.pictures.north }} end @@ -966,14 +995,14 @@ for _,junction in pairs(data.raw["pipe-to-ground"]) do if (lvl < 4) then basename = string.sub(junction.name, 1, -8).."pipe" end - junction.localised_name = {"", {"entity-name."..basename}, " ", (lvl - 1)} + junction.localised_name = {"", {"entity-name."..basename}, " ", tostring(lvl - 1)} junction.localised_description = data.raw.item[junction.minable.result].localised_description local archetype = data.raw["pipe-to-ground"]["nullius-underground-pipe-"..lvl] - junction.fluid_box.height = archetype.fluid_box.height - junction.fluid_box.base_area = archetype.fluid_box.base_area - junction.minable.mining_time = (lvl * 0.5) + junction.fluid_box.volume = archetype.fluid_box.volume + junction.minable.mining_time = (lvl * 0.5) + junction.hidden_in_factoriopedia = true for _,connection in pairs(junction.fluid_box.pipe_connections) do if ((connection.max_underground_distance ~= nil) and @@ -985,55 +1014,24 @@ for _,junction in pairs(data.raw["pipe-to-ground"]) do end local northpipe = { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-north.png", + filename = "__base__/graphics/entity/pipe-covers/pipe-cover-north.png", width = 128, height = 128, scale = 0.5, - shift = {0, -1} + shift = {0, -1} } for i=1,9 do - local topup = data.raw["storage-tank"][i.."0-top-up-valve"] - local relief = data.raw["storage-tank"][i.."0-overflow-valve"] - topup.localised_name = {"", (i*10), "% ", {"entity-name.nullius-top-up-valve"}} - relief.localised_name = {"", (i*10), "% ", {"entity-name.nullius-relief-valve"}} + local topup = data.raw["valve"][i.."0-top-up-valve"] + local relief = data.raw["valve"][i.."0-overflow-valve"] + topup.localised_name = {"", tostring(i*10), "% ", {"entity-name.nullius-top-up-valve"}} + relief.localised_name = {"", tostring(i*10), "% ", {"entity-name.nullius-relief-valve"}} topup.localised_description = {"item-description.nullius-adjustable-top-up-valve"} relief.localised_description = {"item-description.nullius-adjustable-relief-valve"} - local theight = (i * 0.5) - topup.fluid_box.height = theight - topup.fluid_box.base_level = 0 - topup.fluid_box.base_area = 5 / theight - local rheight = 6 - theight - relief.fluid_box.height = rheight - relief.fluid_box.base_level = theight - relief.fluid_box.base_area = 5 / rheight + topup.hidden_in_factoriopedia = true + relief.hidden_in_factoriopedia = true topup.minable.mining_time = 0.8 relief.minable.mining_time = 0.8 - - topup.pictures.picture.north.layers = { - northpipe, - topup.pictures.picture.north.layers[1], - topup.pictures.picture.north.layers[2], - topup.pictures.picture.north.layers[3] - } - topup.pictures.picture.south.layers = { - northpipe, - topup.pictures.picture.south.layers[1], - topup.pictures.picture.south.layers[2], - topup.pictures.picture.south.layers[3] - } - relief.pictures.picture.north.layers = { - northpipe, - relief.pictures.picture.north.layers[1], - relief.pictures.picture.north.layers[2], - relief.pictures.picture.north.layers[3] - } - relief.pictures.picture.south.layers = { - northpipe, - relief.pictures.picture.south.layers[1], - relief.pictures.picture.south.layers[2], - relief.pictures.picture.south.layers[3] - } end end @@ -1087,10 +1085,10 @@ data.raw.recipe["induction-coil"].energy_required = 5 data.raw.recipe["induction-coil"].categories = nil data.raw.recipe["induction-coil"].category = "small-crafting" data.raw.recipe["induction-coil"].ingredients = { - {"nullius-capacitor", 5}, - {"decider-combinator", 3}, - {"copper-cable", 12}, - {"nullius-aluminum-rod", 8} + {type = "item", name = "nullius-capacitor", amount = 5}, + {type = "item", name = "decider-combinator", amount = 3}, + {type = "item", name = "copper-cable", amount = 12}, + {type = "item", name = "nullius-aluminum-rod", amount = 8} } data.raw.technology["induction-technology1"].order = "nullius-cm" @@ -1307,11 +1305,11 @@ data.raw.recipe["road"].show_amount_in_title = false data.raw.recipe["road"].always_show_products = true data.raw.recipe["road"].category = "hand-casting" data.raw.recipe["road"].energy_required = 3 -data.raw.recipe["road"].result_count = 4 +data.raw.recipe["road"].results[1].amount = 4 data.raw.recipe["road"].ingredients = { - {"nullius-rubber", 1}, - {"nullius-land-fill-sand", 1}, - {"nullius-gravel", 3} + {type = "item", name = "nullius-rubber", amount = 1}, + {type = "item", name = "nullius-land-fill-sand", amount = 1}, + {type = "item", name = "nullius-gravel", amount = 3} } data.raw.item["transport-drone"].order = "nullius-c" data.raw.item["transport-drone"].stack_size = 20 @@ -1321,12 +1319,12 @@ data.raw.recipe["transport-drone"].show_amount_in_title = false data.raw.recipe["transport-drone"].always_show_products = true data.raw.recipe["transport-drone"].category = "medium-crafting" data.raw.recipe["transport-drone"].energy_required = 10 -data.raw.recipe["transport-drone"].result_count = 3 +data.raw.recipe["transport-drone"].results[1].amount = 3 data.raw.recipe["transport-drone"].ingredients = { - {"nullius-car-1", 1}, - {"arithmetic-combinator", 5}, - {"programmable-speaker", 2}, - {"turbo-filter-inserter", 3} + {type = "item", name = "nullius-car-1", amount = 1}, + {type = "item", name = "arithmetic-combinator", amount = 5}, + {type = "item", name = "programmable-speaker", amount = 2}, + {type = "item", name = "turbo-filter-inserter", amount = 3} } data.raw.item["supply-depot"].order = "nullius-d" @@ -1336,10 +1334,10 @@ data.raw.recipe["supply-depot"].always_show_made_in = true data.raw.recipe["supply-depot"].category = "large-crafting" data.raw.recipe["supply-depot"].energy_required = 12 data.raw.recipe["supply-depot"].ingredients = { - {"nullius-large-chest-1", 1}, - {"nullius-steel-beam", 4}, - {"nullius-glass", 2}, - {"train-stop", 1} + {type = "item", name = "nullius-large-chest-1", amount = 1}, + {type = "item", name = "nullius-steel-beam", amount = 4}, + {type = "item", name = "nullius-glass", amount = 2}, + {type = "item", name = "train-stop", amount = 1} } data.raw.item["request-depot"].order = "nullius-e" data.raw.item["request-depot"].stack_size = 20 @@ -1348,8 +1346,8 @@ data.raw.recipe["request-depot"].always_show_made_in = true data.raw.recipe["request-depot"].category = "large-crafting" data.raw.recipe["request-depot"].energy_required = 6 data.raw.recipe["request-depot"].ingredients = { - {"fluid-depot", 1}, - {"nullius-hangar-1", 1} + {type = "item", name = "fluid-depot", amount = 1}, + {type = "item", name = "nullius-hangar-1", amount = 1} } data.raw.item["buffer-depot"].order = "nullius-f" data.raw.item["buffer-depot"].stack_size = 20 @@ -1359,8 +1357,8 @@ data.raw.recipe["buffer-depot"].no_productivity = true data.raw.recipe["buffer-depot"].category = "large-crafting" data.raw.recipe["buffer-depot"].energy_required = 4 data.raw.recipe["buffer-depot"].ingredients = { - {"request-depot", 1}, - {"train-stop", 1} + {type = "item", name = "request-depot", amount = 1}, + {type = "item", name = "train-stop", amount = 1} } data.raw.item["fluid-depot"].order = "nullius-g" data.raw.item["fluid-depot"].stack_size = 20 @@ -1369,9 +1367,9 @@ data.raw.recipe["fluid-depot"].always_show_made_in = true data.raw.recipe["fluid-depot"].category = "large-crafting" data.raw.recipe["fluid-depot"].energy_required = 4 data.raw.recipe["fluid-depot"].ingredients = { - {"supply-depot", 1}, - {"nullius-medium-tank-2", 1}, - {"nullius-barrel-pump-1", 1} + {type = "item", name = "supply-depot", amount = 1}, + {type = "item", name = "nullius-medium-tank-2", amount = 1}, + {type = "item", name = "nullius-barrel-pump-1", amount = 1} } data.raw.item["fuel-depot"].order = "nullius-h" data.raw.item["fuel-depot"].stack_size = 20 @@ -1380,8 +1378,8 @@ data.raw.recipe["fuel-depot"].always_show_made_in = true data.raw.recipe["fuel-depot"].category = "large-crafting" data.raw.recipe["fuel-depot"].energy_required = 4 data.raw.recipe["fuel-depot"].ingredients = { - {"buffer-depot", 1}, - {"nullius-pump-2", 2} + {type = "item", name = "buffer-depot", amount = 1}, + {type = "item", name = "nullius-pump-2", amount = 2} } data.raw.item["road-network-reader"].order = "nullius-i" @@ -1391,9 +1389,9 @@ data.raw.recipe["road-network-reader"].always_show_made_in = true data.raw.recipe["road-network-reader"].category = "small-crafting" data.raw.recipe["road-network-reader"].energy_required = 5 data.raw.recipe["road-network-reader"].ingredients = { - {"rail-chain-signal", 1}, - {"nullius-sensor-1", 1}, - {"programmable-speaker", 1} + {type = "item", name = "rail-chain-signal", amount = 1}, + {type = "item", name = "nullius-sensor-1", amount = 1}, + {type = "item", name = "programmable-speaker", amount = 1} } data.raw.item["transport-depot-reader"].order = "nullius-j" data.raw.item["transport-depot-reader"].stack_size = 50 @@ -1402,8 +1400,8 @@ data.raw.recipe["transport-depot-reader"].always_show_made_in = true data.raw.recipe["transport-depot-reader"].category = "small-crafting" data.raw.recipe["transport-depot-reader"].energy_required = 2 data.raw.recipe["transport-depot-reader"].ingredients = { - {"road-network-reader", 1}, - {"red-wire", 2} + {type = "item", name = "road-network-reader", amount = 1}, + {type = "item", name = "nullius-red-wire", amount = 2} } data.raw.item["transport-depot-writer"].order = "nullius-k" data.raw.item["transport-depot-writer"].stack_size = 50 @@ -1412,8 +1410,8 @@ data.raw.recipe["transport-depot-writer"].always_show_made_in = true data.raw.recipe["transport-depot-writer"].category = "small-crafting" data.raw.recipe["transport-depot-writer"].energy_required = 3 data.raw.recipe["transport-depot-writer"].ingredients = { - {"road-network-reader", 1}, - {"green-wire", 3} + {type = "item", name = "road-network-reader", amount = 1}, + {type = "item", name = "nullius-green-wire", amount = 3} } data.raw["assembling-machine"]["request-depot"].fluid_boxes[2].base_level = 6 @@ -1442,11 +1440,11 @@ data.raw.recipe["fast-road"].show_amount_in_title = false data.raw.recipe["fast-road"].always_show_products = true data.raw.recipe["fast-road"].category = "large-crafting" data.raw.recipe["fast-road"].energy_required = 30 -data.raw.recipe["fast-road"].result_count = 8 +data.raw.recipe["fast-road"].results[1].amount = 8 data.raw.recipe["fast-road"].ingredients = { - {"road", 50}, - {"nullius-box-black-concrete", 6}, - {"road-network-reader", 1} + {type = "item", name = "road", amount = 50}, + {type = "item", name = "nullius-box-black-concrete", amount = 6}, + {type = "item", name = "road-network-reader", amount = 1} } end @@ -1477,10 +1475,10 @@ for _, recipe in pairs(data.raw.recipe) do local order = "nullius-"..newmaterial.order local sz = string.sub(recipe.name, 11, 15) if (sz == "large") then - recipe.ingredients = {{"textplate-small-"..material, 4}} + recipe.ingredients = {{type = "item", name = "textplate-small-"..material, amount = 4}} order = order.."c" else - recipe.ingredients = {{newmaterial.material, 1}} + recipe.ingredients = {{type = "item", name = newmaterial.material, amount = 1}} order = order.."b" end @@ -1544,28 +1542,28 @@ end if mods["railway-motor-car"] then data.raw["battery-equipment"]["railway-motor-car-base"].localised_name = - {"", {"equipment-name.railway-motor-car-base"}, " ", 1} + {"", {"equipment-name.railway-motor-car-base"}, " ", tostring(1)} data.raw["item"]["railway-motor-car-base"].localised_name = - {"", {"equipment-name.railway-motor-car-base"}, " ", 1} + {"", {"equipment-name.railway-motor-car-base"}, " ", tostring(1)} data.raw["item"]["railway-motor-car-base"].subgroup = "jetpack" data.raw["item"]["railway-motor-car-base"].order = "nullius-mb" data.raw["battery-equipment"]["railway-motor-car-base"].categories = {"cybernetic"} data.raw["battery-equipment"]["railway-motor-car-nuclear"].localised_name = - {"", {"equipment-name.railway-motor-car-base"}, " ", 2} + {"", {"equipment-name.railway-motor-car-base"}, " ", tostring(2)} data.raw["item"]["railway-motor-car-nuclear"].localised_name = - {"", {"equipment-name.railway-motor-car-base"}, " ", 2} + {"", {"equipment-name.railway-motor-car-base"}, " ", tostring(2)} data.raw["item"]["railway-motor-car-nuclear"].subgroup = "jetpack" data.raw["item"]["railway-motor-car-nuclear"].order = "nullius-mc" data.raw["battery-equipment"]["railway-motor-car-nuclear"].localised_description = {"item-description.railway-motor-car-base"} data.raw["battery-equipment"]["railway-motor-car-nuclear"].categories = {"cybernetic"} data.raw["locomotive"]["railway-motor-car-base"].localised_name = - {"", {"entity-name.railway-motor-car-base"}, " ", 1} + {"", {"entity-name.railway-motor-car-base"}, " ", tostring(1)} data.raw["locomotive"]["railway-motor-car-base"].weight = 250 data.raw["locomotive"]["railway-motor-car-base"].max_power = "600kW" data.raw["locomotive"]["railway-motor-car-base"].max_speed = 1.11111111 data.raw["locomotive"]["railway-motor-car-nuclear"].localised_name = - {"", {"entity-name.railway-motor-car-base"}, " ", 2} + {"", {"entity-name.railway-motor-car-base"}, " ", tostring(2)} data.raw["locomotive"]["railway-motor-car-nuclear"].weight = 325 data.raw["locomotive"]["railway-motor-car-nuclear"].max_power = "1.2MW" data.raw["locomotive"]["railway-motor-car-nuclear"].max_speed = 2.5 @@ -1614,10 +1612,12 @@ if (mods["GCKI"] and (data.raw.item["car-key"] ~= nil)) then category = "small-crafting", energy_required = 3, ingredients = { - {"programmable-speaker", 1}, - {"arithmetic-combinator", 1} + {type = "item", name = "programmable-speaker", amount = 1}, + {type = "item", name = "arithmetic-combinator", amount = 1} }, - result = "car-key" + results = { + {type = "item", name = "car-key", amount = 1} + } } }) data.raw.item["car-key"].subgroup = "vehicle" @@ -1628,20 +1628,24 @@ end if mods["UPSFriendlyNixieTubeDisplay"] then - data.raw.item["SNTD-old-nixie-tube"].order = "nullius-sh" - data.raw.item["SNTD-nixie-tube"].order = "nullius-sh" - data.raw.item["SNTD-nixie-tube-small"].order = "nullius-sh" + data.raw.item["classic-nixie-tube"].order = "nullius-sh" + data.raw.item["reinforced-nixie-tube"].order = "nullius-sh" + data.raw.item["small-reinforced-nixie-tube"].order = "nullius-sh" - data.raw.item["SNTD-old-nixie-tube"].stack_size = 50 - data.raw.item["SNTD-nixie-tube"].stack_size = 50 - data.raw.item["SNTD-nixie-tube-small"].stack_size = 50 - - table.insert(data.raw.technology["nullius-broadcasting-1"].prerequisites,"nullius-SNTD-nixie-tubes-reinforced") -if mods["DisplayPlates"] then - data.raw.item["SNTD-old-nixie-tube"].subgroup = "display-plates" - data.raw.item["SNTD-nixie-tube-small"].subgroup = "display-plates" - data.raw.item["SNTD-nixie-tube"].subgroup = "display-plates" -end + data.raw.item["classic-nixie-tube"].stack_size = 50 + data.raw.item["reinforced-nixie-tube"].stack_size = 50 + data.raw.item["small-reinforced-nixie-tube"].stack_size = 50 + + data.raw["arithmetic-combinator"]["classic-nixie-tube-sprite"].hidden_in_factoriopedia = true + data.raw["arithmetic-combinator"]["reinforced-nixie-tube-sprite"].hidden_in_factoriopedia = true + data.raw["arithmetic-combinator"]["small-reinforced-nixie-tube-sprite"].hidden_in_factoriopedia = true + + table.insert(data.raw.technology["nullius-broadcasting-1"].prerequisites,"nullius-reinforced-nixie-tubes-reinforced") + if mods["DisplayPlates"] then + data.raw.item["classic-nixie-tube"].subgroup = "display-plates" + data.raw.item["small-reinforced-nixie-tube"].subgroup = "display-plates" + data.raw.item["reinforced-nixie-tube"].subgroup = "display-plates" + end end @@ -1669,26 +1673,28 @@ end if mods["FluidMustFlow"] then + if not settings.startup["fmf-enable-duct-auto-join"].value then + data.raw.item["duct"].subgroup = "nullius-ducts" + data.raw.item["duct"].order = "nullius-c" + data.raw.item["duct-long"].subgroup = "nullius-ducts" + data.raw.item["duct-long"].order = "nullius-d" + end data.raw.item["duct-small"].subgroup = "nullius-ducts" - data.raw.item["duct"].subgroup = "nullius-ducts" - data.raw.item["duct-long"].subgroup = "nullius-ducts" data.raw.item["duct-underground"].subgroup = "nullius-ducts" data.raw.item["duct-curve"].subgroup = "nullius-ducts" data.raw.item["duct-t-junction"].subgroup = "nullius-ducts" data.raw.item["duct-cross"].subgroup = "nullius-ducts" - data.raw.item["duct-end-point-outtake"].subgroup = "nullius-ducts" - data.raw.item["duct-end-point-intake"].subgroup = "nullius-ducts" + data.raw.item["duct-exhaust"].subgroup = "nullius-ducts" + data.raw.item["duct-intake"].subgroup = "nullius-ducts" data.raw.item["non-return-duct"].subgroup = "nullius-ducts" data.raw.item["duct-small"].order = "nullius-b" - data.raw.item["duct"].order = "nullius-c" - data.raw.item["duct-long"].order = "nullius-d" data.raw.item["duct-underground"].order = "nullius-e" data.raw.item["duct-curve"].order = "nullius-f" data.raw.item["duct-t-junction"].order = "nullius-g" data.raw.item["duct-cross"].order = "nullius-h" - data.raw.item["duct-end-point-outtake"].order = "nullius-i" - data.raw.item["duct-end-point-intake"].order = "nullius-j" + data.raw.item["duct-exhaust"].order = "nullius-i" + data.raw.item["duct-intake"].order = "nullius-j" data.raw.item["non-return-duct"].order = "nullius-k" data.raw["storage-tank"]["duct-small"].minable.mining_time = 0.8 @@ -1699,11 +1705,9 @@ if mods["FluidMustFlow"] then data.raw["storage-tank"]["duct-cross"].minable.mining_time = 2.5 data.raw["pipe-to-ground"]["duct-underground"].minable.mining_time = 2.5 data.raw["pump"]["non-return-duct"].minable.mining_time = 2 - data.raw["pump"]["duct-end-point-intake"].minable.mining_time = 3 - data.raw["pump"]["duct-end-point-outtake"].minable.mining_time = 3 + data.raw["pump"]["duct-intake"].minable.mining_time = 3 + data.raw["pump"]["duct-exhaust"].minable.mining_time = 3 - local duct_box = data.raw["pipe-to-ground"]["duct-underground"].fluid_box - duct_box.pipe_connections[2].max_underground_distance = duct_box.pipe_connections[2].max_underground_distance - 2 table.insert(data.raw.technology["nullius-barreling-3"].prerequisites,"nullius-ducts") end @@ -1745,36 +1749,36 @@ if settings.startup["RTThrowersSetting"].value then table.insert(data.raw.technology["nullius-locomotion-3"].prerequisites, "nullius-logistic-ballistics-8") - if (mods["bobinserters"] and + if ((mods["bobinserters"] or mods["quick-adjustable-inserters"]) and (settings.startup["bobmods-inserters-more2"].value == true)) then - table.insert(data.raw.technology["more-inserters-2"].prerequisites, - "nullius-logistic-ballistics-7") + table.insert(data.raw.technology["bob-more-inserters-2"].prerequisites, + "nullius-logistic-ballistics-7") else table.insert(data.raw.technology["nullius-inserter-capacity-1"].prerequisites, "nullius-logistic-ballistics-7") end - data.raw.item["PlayerLauncherItem"].subgroup = "nullius-renai-bounce" - data.raw.item["PlayerLauncherItem"].order = "nullius-b" - data.raw.item["HatchRTItem"].subgroup = "nullius-renai-bounce" - data.raw.item["HatchRTItem"].order = "nullius-cb" - data.raw.item["HatchRTItem"].stack_size = 100 - data.raw.item["RTThrower-EjectorHatchRTItem"].subgroup = "nullius-renai-bounce" - data.raw.item["RTThrower-EjectorHatchRTItem"].order = "nullius-cc" + data.raw.item["PlayerLauncher"].subgroup = "nullius-renai-bounce" + data.raw.item["PlayerLauncher"].order = "nullius-b" + data.raw.item["HatchRT"].subgroup = "nullius-renai-bounce" + data.raw.item["HatchRT"].order = "nullius-cb" + data.raw.item["HatchRT"].stack_size = 100 + data.raw.item["RTThrower-EjectorHatchRT"].subgroup = "nullius-renai-bounce" + data.raw.item["RTThrower-EjectorHatchRT"].order = "nullius-cc" data.raw.inserter["RTThrower-EjectorHatchRT"].order = "nullius-ucc" - data.raw.item["RTThrower-EjectorHatchRTItem"].stack_size = 100 - data.raw.item["OpenContainerItem"].subgroup = "nullius-renai-bounce" - data.raw.item["OpenContainerItem"].order = "nullius-db" - data.raw.item["OpenContainerItem"].stack_size = 100 + data.raw.item["RTThrower-EjectorHatchRT"].stack_size = 100 + data.raw.item["OpenContainer"].subgroup = "nullius-renai-bounce" + data.raw.item["OpenContainer"].order = "nullius-db" + data.raw.item["OpenContainer"].stack_size = 100 data.raw["container"]["OpenContainer"].inventory_size = 10 - data.raw.item["BouncePlateItem"].subgroup = "nullius-renai-bounce" - data.raw.item["BouncePlateItem"].order = "nullius-eb" - data.raw.item["DirectedBouncePlateItem"].subgroup = "nullius-renai-bounce" - data.raw.item["DirectedBouncePlateItem"].order = "nullius-ec" - data.raw.item["SignalBouncePlateItem"].subgroup = "nullius-renai-bounce" - data.raw.item["SignalBouncePlateItem"].order = "nullius-ed" - data.raw.item["DirectorBouncePlateItem"].subgroup = "nullius-renai-bounce" - data.raw.item["DirectorBouncePlateItem"].order = "nullius-ee" + data.raw.item["RTBouncePlate"].subgroup = "nullius-renai-bounce" + data.raw.item["RTBouncePlate"].order = "nullius-eb" + data.raw.item["DirectedBouncePlate"].subgroup = "nullius-renai-bounce" + data.raw.item["DirectedBouncePlate"].order = "nullius-ec" + -- data.raw.item["SignalBouncePlate"].subgroup = "nullius-renai-bounce" -- removed by renai transportation + -- data.raw.item["SignalBouncePlate"].order = "nullius-ed" + data.raw.item["DirectorBouncePlate"].subgroup = "nullius-renai-bounce" + data.raw.item["DirectorBouncePlate"].order = "nullius-ee" end if settings.startup["RTZiplineSetting"].value then @@ -1787,24 +1791,24 @@ if settings.startup["RTZiplineSetting"].value then data.raw.technology["nullius-robot-speed-5"].prerequisites = {"nullius-copper-production", "nullius-ziplining-5"} - data.raw.item["RTZiplineTerminalItem"].subgroup = "nullius-renai-zipline" - data.raw.item["RTZiplineTerminalItem"].order = "nullius-bb" - data.raw.gun["RTZiplineItem"].subgroup = "nullius-renai-zipline" - data.raw.gun["RTZiplineItem"].order = "nullius-cb" - data.raw.gun["RTZiplineItem2"].subgroup = "nullius-renai-zipline" - data.raw.gun["RTZiplineItem2"].order = "nullius-cc" - data.raw.gun["RTZiplineItem3"].subgroup = "nullius-renai-zipline" - data.raw.gun["RTZiplineItem3"].order = "nullius-cd" - data.raw.gun["RTZiplineItem4"].subgroup = "nullius-renai-zipline" - data.raw.gun["RTZiplineItem4"].order = "nullius-ce" - data.raw.gun["RTZiplineItem5"].subgroup = "nullius-renai-zipline" - data.raw.gun["RTZiplineItem5"].order = "nullius-cf" - data.raw.ammo["RTZiplineControlsItem"].subgroup = "nullius-renai-zipline" - data.raw.ammo["RTZiplineControlsItem"].order = "nullius-db" - data.raw.ammo["RTZiplineCrankControlsItem"].subgroup = "nullius-renai-zipline" - data.raw.ammo["RTZiplineCrankControlsItem"].order = "nullius-dc" - data.raw.ammo["RTProgrammableZiplineControlsItem"].subgroup = "nullius-renai-zipline" - data.raw.ammo["RTProgrammableZiplineControlsItem"].order = "nullius-dd" + data.raw.item["RTZiplineTerminal"].subgroup = "nullius-renai-zipline" + data.raw.item["RTZiplineTerminal"].order = "nullius-bb" + data.raw.gun["RTZiplineTrolley"].subgroup = "nullius-renai-zipline" + data.raw.gun["RTZiplineTrolley"].order = "nullius-cb" + data.raw.gun["RTZiplineTrolley2"].subgroup = "nullius-renai-zipline" + data.raw.gun["RTZiplineTrolley2"].order = "nullius-cc" + data.raw.gun["RTZiplineTrolley3"].subgroup = "nullius-renai-zipline" + data.raw.gun["RTZiplineTrolley3"].order = "nullius-cd" + data.raw.gun["RTZiplineTrolley4"].subgroup = "nullius-renai-zipline" + data.raw.gun["RTZiplineTrolley4"].order = "nullius-ce" + data.raw.gun["RTZiplineTrolley5"].subgroup = "nullius-renai-zipline" + data.raw.gun["RTZiplineTrolley5"].order = "nullius-cf" + data.raw.ammo["RTZiplineControls"].subgroup = "nullius-renai-zipline" + data.raw.ammo["RTZiplineControls"].order = "nullius-db" + data.raw.ammo["RTZiplineCrankControls"].subgroup = "nullius-renai-zipline" + data.raw.ammo["RTZiplineCrankControls"].order = "nullius-dc" + data.raw.ammo["RTProgrammableZiplineControls"].subgroup = "nullius-renai-zipline" + data.raw.ammo["RTProgrammableZiplineControls"].order = "nullius-dd" data.raw["electric-pole"]["RTZiplineTerminal"].minable.mining_time = 1 end @@ -1829,20 +1833,20 @@ if settings.startup["RTTrainRampSetting"].value then end elseif settings.startup["RTThrowersSetting"].value then table.insert(data.raw.technology["nullius-freight-ballistics-2"].prerequisites, - "nullius-freight-ballistics-1") + "nullius-freight-ballistics-1") end - data.raw.item["RTTrainRampItem"].subgroup = "nullius-renai-ramp" - data.raw.item["RTTrainRampItem"].order = "nullius-bb" - data.raw.item["RTMagnetTrainRampItem"].subgroup = "nullius-renai-ramp" - data.raw.item["RTMagnetTrainRampItem"].order = "nullius-bc" - data.raw.item["RTImpactUnloaderItem"].subgroup = "nullius-renai-ramp" - data.raw.item["RTImpactUnloaderItem"].order = "nullius-db" - data.raw.item["RTImpactWagonItem"].subgroup = "nullius-renai-ramp" - data.raw.item["RTImpactWagonItem"].order = "nullius-dc" - data.raw["simple-entity-with-owner"]["RTTrainRamp"].minable.mining_time = 0.8 - data.raw["simple-entity-with-owner"]["RTMagnetTrainRamp"].minable.mining_time = 1.2 - data.raw["simple-entity-with-owner"]["RTImpactUnloader"].minable.mining_time = 1 + data.raw.item["RTTrainRamp"].subgroup = "nullius-renai-ramp" + data.raw.item["RTTrainRamp"].order = "nullius-bb" + data.raw.item["RTMagnetTrainRamp"].subgroup = "nullius-renai-ramp" + data.raw.item["RTMagnetTrainRamp"].order = "nullius-bc" + data.raw.item["RTImpactUnloader"].subgroup = "nullius-renai-ramp" + data.raw.item["RTImpactUnloader"].order = "nullius-db" + data.raw.item["RTImpactWagon"].subgroup = "nullius-renai-ramp" + data.raw.item["RTImpactWagon"].order = "nullius-dc" + data.raw["rail-signal"]["RTTrainRamp"].minable.mining_time = 0.8 + data.raw["rail-signal"]["RTMagnetTrainRamp"].minable.mining_time = 1.2 + data.raw["rail-signal"]["RTImpactUnloader"].minable.mining_time = 1 data.raw["cargo-wagon"]["RTImpactWagon"].inventory_size = 50 data.raw["cargo-wagon"]["RTImpactWagon"].max_health = 800 @@ -1861,14 +1865,14 @@ if settings.startup["RTTrainRampSetting"].value then } if settings.startup["RTThrowersSetting"].value then - data.raw.item["RTTrainBouncePlateItem"].subgroup = "nullius-renai-ramp" - data.raw.item["RTTrainBouncePlateItem"].order = "nullius-cb" - data.raw.item["RTTrainBouncePlateItem"].stack_size = 20 - data.raw.item["RTTrainDirectedBouncePlateItem"].subgroup = "nullius-renai-ramp" - data.raw.item["RTTrainDirectedBouncePlateItem"].order = "nullius-cc" - data.raw.item["RTTrainDirectedBouncePlateItem"].stack_size = 20 + data.raw.item["RTTrainBouncePlate"].subgroup = "nullius-renai-ramp" + data.raw.item["RTTrainBouncePlate"].order = "nullius-cb" + data.raw.item["RTTrainBouncePlate"].stack_size = 20 + data.raw.item["RTTrainDirectedBouncePlate"].subgroup = "nullius-renai-ramp" + data.raw.item["RTTrainDirectedBouncePlate"].order = "nullius-cc" + data.raw.item["RTTrainDirectedBouncePlate"].stack_size = 20 data.raw["simple-entity-with-owner"]["RTTrainBouncePlate"].minable.mining_time = 0.6 - data.raw["constant-combinator"]["RTTrainDirectedBouncePlate"].minable.mining_time = 0.8 + data.raw["simple-entity-with-owner"]["RTTrainDirectedBouncePlate"].minable.mining_time = 0.8 end end end @@ -1993,18 +1997,18 @@ if mods["cargo-ships"] then end data.raw["electric-pole"]["floating-electric-pole"].maximum_wire_distance = 32.5 - data.raw["car"]["indep-boat"].burner.fuel_category = "vehicle" - data.raw["car"]["indep-boat"].burner.fuel_inventory_size = 1 - data.raw["car"]["indep-boat"].burner.burnt_inventory_size = 1 - data.raw["car"]["indep-boat"].burner.effectivity = 1.5 - data.raw["locomotive"]["boat_engine"].burner.fuel_category = "vehicle" - data.raw["locomotive"]["boat_engine"].burner.fuel_inventory_size = 1 - data.raw["locomotive"]["boat_engine"].burner.burnt_inventory_size = 1 - data.raw["locomotive"]["boat_engine"].burner.effectivity = 1.5 - data.raw["locomotive"]["cargo_ship_engine"].burner.fuel_category = "vehicle" - data.raw["locomotive"]["cargo_ship_engine"].burner.fuel_inventory_size = 3 - data.raw["locomotive"]["cargo_ship_engine"].burner.burnt_inventory_size = 3 - data.raw["locomotive"]["cargo_ship_engine"].burner.effectivity = 2 + data.raw["car"]["indep-boat"].energy_source.fuel_categories = {"vehicle"} + data.raw["car"]["indep-boat"].energy_source.fuel_inventory_size = 1 + data.raw["car"]["indep-boat"].energy_source.burnt_inventory_size = 1 + data.raw["car"]["indep-boat"].energy_source.effectivity = 1.5 + data.raw["locomotive"]["boat_engine"].energy_source.fuel_categories = {"vehicle"} + data.raw["locomotive"]["boat_engine"].energy_source.fuel_inventory_size = 1 + data.raw["locomotive"]["boat_engine"].energy_source.burnt_inventory_size = 1 + data.raw["locomotive"]["boat_engine"].energy_source.effectivity = 1.5 + data.raw["locomotive"]["cargo_ship_engine"].energy_source.fuel_categories = {"vehicle"} + data.raw["locomotive"]["cargo_ship_engine"].energy_source.fuel_inventory_size = 3 + data.raw["locomotive"]["cargo_ship_engine"].energy_source.burnt_inventory_size = 3 + data.raw["locomotive"]["cargo_ship_engine"].energy_source.effectivity = 2 data.raw.technology["water_transport"].order = "nullius-cn" @@ -2032,7 +2036,7 @@ if mods["cargo-ships"] then data.raw.technology["automated_water_transport"].order = "nullius-di" data.raw.technology["automated_water_transport"].prerequisites = - {"cargo_ships", "nullius-concrete-1", "nullius-weaving-1"} + {"cargo_ships", "nullius-concrete-1", "nullius-weaving-1","nullius-checkpoint-sensor"} data.raw.technology["automated_water_transport"].unit = { count = 100, time = 30, ingredients = { @@ -2052,20 +2056,20 @@ if mods["cargo-ships"] then } } - data.raw.technology["water_transport_signals"].order = "nullius-dj" - data.raw.technology["water_transport_signals"].prerequisites = - {"automated_water_transport", "nullius-checkpoint-sensor"} - data.raw.technology["water_transport_signals"].unit = { - count = 80, time = 30, - ingredients = { - {"nullius-geology-pack", 1}, {"nullius-climatology-pack", 1}, - {"nullius-mechanical-pack", 1}, {"nullius-electrical-pack", 2} - } - } + -- data.raw.technology["water_transport_signals"].order = "nullius-dj" + -- data.raw.technology["water_transport_signals"].prerequisites = + -- {"automated_water_transport", "nullius-checkpoint-sensor"} + -- data.raw.technology["water_transport_signals"].unit = { + -- count = 80, time = 30, + -- ingredients = { + -- {"nullius-geology-pack", 1}, {"nullius-climatology-pack", 1}, + -- {"nullius-mechanical-pack", 1}, {"nullius-electrical-pack", 2} + -- } + -- } data.raw.technology["oversea-energy-distribution"].order = "nullius-dk" data.raw.technology["oversea-energy-distribution"].prerequisites = - {"water_transport_signals", "tank_ship", "nullius-energy-distribution-3"} + {"water_transport", "tank_ship", "nullius-energy-distribution-3"} data.raw.technology["oversea-energy-distribution"].unit = { count = 150, time = 30, ingredients = { @@ -2092,7 +2096,7 @@ if mods["cargo-ships"] then data.raw["rail-planner"]["waterway"].order = "nullius-b" data.raw["item-with-entity-data"]["boat_engine"].order = "nullius-l" data.raw["item-with-entity-data"]["cargo_ship_engine"].order = "nullius-m" - data.raw["item-with-entity-data"]["indep-boat"].order = "nullius-i" + --data.raw["item-with-entity-data"]["indep-boat"].order = "nullius-i" data.raw["item-with-entity-data"]["boat"].order = "nullius-h" data.raw.recipe["boat"].order = "nullius-h" @@ -2150,7 +2154,7 @@ if mods["cargo-ships"] then data.raw.recipe["buoy"].energy_required = 5 data.raw.recipe["buoy"].ingredients = { {type="item", name="rail-signal", amount=1}, - {type="item", name="empty-barrel", amount=1}, + {type="item", name="barrel", amount=1}, {type="item", name="nullius-steel-cable", amount=5}, {type="item", name="concrete", amount=5}, {type="fluid", name="nullius-nitrogen", amount=250, fluidbox_index=1} @@ -2192,7 +2196,7 @@ if mods["cargo-ships"] then } - if settings.startup["deep_oil"].value then + if settings.startup["offshore_oil_enabled"].value then data.raw.technology["deep_sea_oil_extraction"].order = "nullius-dk" data.raw.technology["deep_sea_oil_extraction"].prerequisites = {"oversea-energy-distribution", "nullius-plumbing-4"} @@ -2207,7 +2211,7 @@ if mods["cargo-ships"] then data.raw.item["oil_rig"].subgroup = "water-intake" data.raw.item["oil_rig"].order = "nullius-dr" - data.raw.recipe["oil_rig"].order = "nullius-dr" + data.raw.recipe["oil_rig"].order = "nullius-dr" data.raw.recipe["oil_rig"].category = "huge-crafting" data.raw.recipe["oil_rig"].always_show_made_in = true data.raw.recipe["oil_rig"].energy_required = 60 @@ -2275,14 +2279,15 @@ if mods["Mini_Trains"] then mtl1.icon_size = nil mtl1.minable.result = "nullius-small-locomotive-1" mtl1.resistances = data.raw.locomotive["nullius-locomotive-1"].resistances - mtl1.burner = { - fuel_category = "vehicle", + mtl1.energy_source = { + type = "burner", + fuel_categories = {"vehicle"}, effectivity = 0.9, fuel_inventory_size = 1, burnt_inventory_size = 2, - smoke = data.raw.locomotive["mini-locomotive"].burner.smoke + smoke = data.raw.locomotive["mini-locomotive"].energy_source.smoke } - mtl1.pictures.layers[1].tint = {r = 0.8, g = 0.8, b = 0.6} + mtl1.pictures.rotated.layers[1].tint = {r = 0.8, g = 0.8, b = 0.6} mtl1.color = {r = 0.9, g = 0.85, b = 0} mtl1.weight = 500 mtl1.max_speed = 0.50925925925925926 @@ -2298,9 +2303,9 @@ if mods["Mini_Trains"] then mtl2.localised_description = {"entity-description.nullius-locomotive-2"} mtl2.icons = data.raw.item["nullius-small-locomotive-2"].icons mtl2.minable.result = "nullius-small-locomotive-2" - mtl2.burner.effectivity = 0.95 - mtl2.burner.fuel_inventory_size = 2 - mtl2.pictures.layers[1].tint = {r = 0.9, g = 0.7, b = 0.7} + mtl2.energy_source.effectivity = 0.95 + mtl2.energy_source.fuel_inventory_size = 2 + mtl2.pictures.rotated.layers[1].tint = {r = 0.9, g = 0.7, b = 0.7} mtl2.color = {r = 0.95, g = 0.1, b = 0} mtl2.weight = 800 mtl2.max_speed = 1.0416666666666667 @@ -2316,8 +2321,8 @@ if mods["Mini_Trains"] then mtl3.localised_description = {"entity-description.nullius-locomotive-3"} mtl3.icons = data.raw.item["nullius-small-locomotive-3"].icons mtl3.minable.result = "nullius-small-locomotive-3" - mtl3.burner.effectivity = 1 - mtl3.pictures.layers[1].tint = {r = 0.8, g = 0.8, b = 1} + mtl3.energy_source.effectivity = 1 + mtl3.pictures.rotated.layers[1].tint = {r = 0.8, g = 0.8, b = 1} mtl3.color = {r = 0.2, g = 0.3, b = 0.8} mtl3.weight = 1200 mtl3.max_speed = 1.75925925925926 @@ -2334,8 +2339,7 @@ if mods["Mini_Trains"] then mtls.icons = data.raw.item["nullius-small-solar-locomotive"].icons mtls.minable.result = "nullius-small-solar-locomotive" mtls.energy_source = {type = "void"} - mtls.burner = nil - mtls.pictures.layers[1].tint = {r = 0.8, g = 1, b = 0.8} + mtls.pictures.rotated.layers[1].tint = {r = 0.8, g = 1, b = 0.8} mtls.color = {r = 0.2, g = 0.8, b = 0.3} mtls.max_speed = 1.0416666666666667 mtls.max_power = "280kW" @@ -2351,7 +2355,7 @@ if mods["Mini_Trains"] then mtc1.minable.result = "nullius-small-cargo-wagon-1" mtc1.resistances = data.raw["cargo-wagon"]["nullius-cargo-wagon-1"].resistances mtc1.max_speed = (data.raw["cargo-wagon"]["nullius-cargo-wagon-1"].max_speed * 0.95) - mtc1.pictures.layers[1].tint = {r = 0.8, g = 0.8, b = 0.6} + mtc1.pictures.rotated.layers[1].tint = {r = 0.8, g = 0.8, b = 0.6} mtc1.color = {r = 0.9, g = 0.85, b = 0} mtc1.inventory_size = 12 mtc1.weight = 250 @@ -2366,7 +2370,7 @@ if mods["Mini_Trains"] then mtc2.minable.result = "nullius-small-cargo-wagon-2" mtc2.resistances = data.raw["cargo-wagon"]["nullius-cargo-wagon-2"].resistances mtc2.max_speed = (data.raw["cargo-wagon"]["nullius-cargo-wagon-2"].max_speed * 0.95) - mtc2.pictures.layers[1].tint = {r = 0.9, g = 0.7, b = 0.7} + mtc2.pictures.rotated.layers[1].tint = {r = 0.9, g = 0.7, b = 0.7} mtc2.color = {r = 0.95, g = 0.1, b = 0} mtc2.inventory_size = 25 mtc2.weight = 500 @@ -2381,7 +2385,7 @@ if mods["Mini_Trains"] then mtc3.minable.result = "nullius-small-cargo-wagon-3" mtc3.resistances = data.raw["cargo-wagon"]["nullius-cargo-wagon-3"].resistances mtc3.max_speed = (data.raw["cargo-wagon"]["nullius-cargo-wagon-3"].max_speed * 0.95) - mtc3.pictures.layers[1].tint = {r = 0.8, g = 0.8, b = 1} + mtc3.pictures.rotated.layers[1].tint = {r = 0.8, g = 0.8, b = 1} mtc3.color = {r = 0.2, g = 0.3, b = 0.8} mtc3.inventory_size = 50 mtc3.weight = 750 @@ -2399,7 +2403,7 @@ if mods["Mini_Trains"] then mtf1.minable.result = "nullius-small-fluid-wagon-1" mtf1.resistances = data.raw["fluid-wagon"]["nullius-fluid-wagon-1"].resistances mtf1.max_speed = (data.raw["fluid-wagon"]["nullius-fluid-wagon-1"].max_speed * 0.95) - mtf1.pictures.layers[1].tint = {r = 0.8, g = 0.8, b = 0.6} + mtf1.pictures.rotated.layers[1].tint = {r = 0.8, g = 0.8, b = 0.6} mtf1.color = {r = 0.9, g = 0.85, b = 0} mtf1.capacity = 12000 mtf1.weight = 300 @@ -2414,7 +2418,7 @@ if mods["Mini_Trains"] then mtf2.minable.result = "nullius-small-fluid-wagon-2" mtf2.resistances = data.raw["fluid-wagon"]["nullius-fluid-wagon-2"].resistances mtf2.max_speed = (data.raw["fluid-wagon"]["nullius-fluid-wagon-2"].max_speed * 0.95) - mtf2.pictures.layers[1].tint = {r = 0.9, g = 0.7, b = 0.7} + mtf2.pictures.rotated.layers[1].tint = {r = 0.9, g = 0.7, b = 0.7} mtf2.color = {r = 0.95, g = 0.1, b = 0} mtf2.capacity = 40000 mtf2.weight = 600 @@ -2429,7 +2433,7 @@ if mods["Mini_Trains"] then mtf3.minable.result = "nullius-small-fluid-wagon-3" mtf3.resistances = data.raw["fluid-wagon"]["nullius-fluid-wagon-3"].resistances mtf3.max_speed = (data.raw["fluid-wagon"]["nullius-fluid-wagon-3"].max_speed * 0.95) - mtf3.pictures.layers[1].tint = {r = 0.8, g = 0.8, b = 1} + mtf3.pictures.rotated.layers[1].tint = {r = 0.8, g = 0.8, b = 1} mtf3.color = {r = 0.2, g = 0.3, b = 0.8} mtf3.capacity = 125000 mtf3.weight = 900 @@ -2452,5 +2456,16 @@ if mods["Mini_Trains"] then data.raw.item["nullius-small-fluid-wagon-3"].place_result = "nullius-small-fluid-wagon-3" end +if mods["cybersyn"] then + data.raw.recipe["cybersyn-combinator"].ingredients = { + {type = "item", name = "arithmetic-combinator", amount = 2 }, + {type = "item", name = "copper-cable", amount = 10 }, + } +end - +if mods["cybersyn-combinator"] then + data.raw.recipe["cybersyn-constant-combinator"].ingredients = { + {type = "item", name = "constant-combinator", amount = 1 }, + {type = "item", name = "decider-combinator", amount = 1 }, + } +end \ No newline at end of file diff --git a/nullius/prototypes/override_mod_final.lua b/nullius/prototypes/override_mod_final.lua index efb3e1d..ab56d4e 100644 --- a/nullius/prototypes/override_mod_final.lua +++ b/nullius/prototypes/override_mod_final.lua @@ -1,68 +1,60 @@ local ICONPATH = "__nullius__/graphics/icons/" local ENTITYPATH = "__nullius__/graphics/entity/" -if mods["bobplates"] then -data.raw.fluid["liquid-fuel"].subgroup = "unused-fluid" -data.raw.item["liquid-fuel-barrel"].subgroup = "unused-fluid" -data.raw.recipe["fill-liquid-fuel-barrel"].subgroup = "unused-fluid" -data.raw.recipe["empty-liquid-fuel-barrel"].subgroup = "unused-fluid" -end - - if mods["reskins-bobs"] then if settings.startup["reskins-lib-icon-tier-labeling"].value == true then local icon_style = settings.startup["reskins-lib-icon-tier-labeling-style"].value if settings.startup["reskins-bobs-do-inserter-tier-labeling"].value == true then - data.raw.item["turbo-inserter"].icons[4].icon = - "__reskins-library__/graphics/icons/tiers/"..icon_style.."/2.png" - data.raw.item["turbo-inserter"].icons[5].icon = - "__reskins-library__/graphics/icons/tiers/"..icon_style.."/2.png" - data.raw.item["turbo-filter-inserter"].icons[6].icon = + data.raw.item["bob-turbo-inserter"].icons[4].icon = "__reskins-library__/graphics/icons/tiers/"..icon_style.."/2.png" - data.raw.item["turbo-filter-inserter"].icons[7].icon = + data.raw.item["bob-turbo-inserter"].icons[5].icon = "__reskins-library__/graphics/icons/tiers/"..icon_style.."/2.png" - data.raw.item["express-stack-inserter"].icons[4].icon = + -- data.raw.item["turbo-filter-inserter"].icons[6].icon = + -- "__reskins-library__/graphics/icons/tiers/"..icon_style.."/2.png" + -- data.raw.item["turbo-filter-inserter"].icons[7].icon = + -- "__reskins-library__/graphics/icons/tiers/"..icon_style.."/2.png" + data.raw.item["bob-express-bulk-inserter"].icons[4].icon = "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" - data.raw.item["express-stack-inserter"].icons[5].icon = - "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" - data.raw.item["express-stack-filter-inserter"].icons[6].icon = - "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" - data.raw.item["express-stack-filter-inserter"].icons[7].icon = + data.raw.item["bob-express-bulk-inserter"].icons[5].icon = "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" + -- data.raw.item["express-stack-filter-inserter"].icons[6].icon = + -- "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" + -- data.raw.item["express-stack-filter-inserter"].icons[7].icon = + -- "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" if (mods["RenaiTransportation"] and settings.startup["RTThrowersSetting"].value) then - data.raw.item["RTThrower-turbo-inserter-Item"].icons[4].icon = - "__reskins-library__/graphics/icons/tiers/"..icon_style.."/2.png" - data.raw.item["RTThrower-turbo-inserter-Item"].icons[5].icon = - "__reskins-library__/graphics/icons/tiers/"..icon_style.."/2.png" - data.raw.item["RTThrower-turbo-filter-inserter-Item"].icons[6].icon = + data.raw.item["RTThrower-bob-turbo-inserter-Item"].icons[4].icon = "__reskins-library__/graphics/icons/tiers/"..icon_style.."/2.png" - data.raw.item["RTThrower-turbo-filter-inserter-Item"].icons[7].icon = + data.raw.item["RTThrower-bob-turbo-inserter-Item"].icons[5].icon = "__reskins-library__/graphics/icons/tiers/"..icon_style.."/2.png" - data.raw.item["RTThrower-express-stack-inserter-Item"].icons[4].icon = + -- data.raw.item["RTThrower-turbo-filter-inserter-Item"].icons[6].icon = + -- "__reskins-library__/graphics/icons/tiers/"..icon_style.."/2.png" + -- data.raw.item["RTThrower-turbo-filter-inserter-Item"].icons[7].icon = + -- "__reskins-library__/graphics/icons/tiers/"..icon_style.."/2.png" + data.raw.item["RTThrower-bob-express-bulk-inserter-Item"].icons[4].icon = "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" - data.raw.item["RTThrower-express-stack-inserter-Item"].icons[5].icon = - "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" - data.raw.item["RTThrower-express-stack-filter-inserter-Item"].icons[6].icon = - "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" - data.raw.item["RTThrower-express-stack-filter-inserter-Item"].icons[7].icon = + data.raw.item["RTThrower-bob-express-bulk-inserter-Item"].icons[5].icon = "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" + -- data.raw.item["RTThrower-express-stack-filter-inserter-Item"].icons[6].icon = + -- "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" + -- data.raw.item["RTThrower-express-stack-filter-inserter-Item"].icons[7].icon = + -- "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" end end if settings.startup["reskins-bobs-do-belt-entity-tier-labeling"].value == true then - data.raw.item["ultimate-transport-belt"].icons[4].icon = + data.raw.item["bob-ultimate-transport-belt"].icons[4].icon = "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" - data.raw.item["ultimate-transport-belt"].icons[5].icon = + data.raw.item["bob-ultimate-transport-belt"].icons[5].icon = "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" - data.raw.item["ultimate-underground-belt"].icons[4].icon = + data.raw.item["bob-ultimate-underground-belt"].icons[4].icon = "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" - data.raw.item["ultimate-underground-belt"].icons[5].icon = + data.raw.item["bob-ultimate-underground-belt"].icons[5].icon = "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" - data.raw.item["ultimate-splitter"].icons[4].icon = + data.raw.item["bob-ultimate-splitter"].icons[4].icon = "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" - data.raw.item["ultimate-splitter"].icons[5].icon = + data.raw.item["bob-ultimate-splitter"].icons[5].icon = "__reskins-library__/graphics/icons/tiers/"..icon_style.."/4.png" end @@ -138,117 +130,74 @@ end if (mods["RenaiTransportation"] and settings.startup["RTThrowersSetting"].value) then data.raw.recipe["nullius-thrower-2"].ingredients = { - {"RTThrower-inserter-Item", 1}, - {"turbo-inserter", 1}, - {"nullius-motor-2", 1} - } - data.raw.recipe["nullius-filter-thrower-2"].ingredients = { - {"RTThrower-inserter-Item", 1}, - {"turbo-filter-inserter", 1}, - {"nullius-motor-2", 1} + {type = "item", name = "RTThrower-inserter-Item", amount = 1}, + {type = "item", name = "bob-turbo-inserter", amount = 1}, + {type = "item", name = "nullius-motor-2", amount = 1} } data.raw.recipe["nullius-thrower-3"].ingredients = { - {"RTThrower-turbo-inserter-Item", 1}, - {"stack-inserter", 2} - } - data.raw.recipe["nullius-filter-thrower-3"].ingredients = { - {"RTThrower-turbo-filter-inserter-Item", 1}, - {"stack-filter-inserter", 2} + {type = "item", name = "RTThrower-bob-turbo-inserter-Item", amount = 1}, + {type = "item", name = "bulk-inserter", amount = 2} } data.raw.recipe["nullius-thrower-4"].ingredients = { - {"RTThrower-stack-inserter-Item", 1}, - {"express-stack-inserter", 2} - } - data.raw.recipe["nullius-filter-thrower-4"].ingredients = { - {"RTThrower-stack-filter-inserter-Item", 1}, - {"express-stack-filter-inserter", 2} + {type = "item", name = "RTThrower-bulk-inserter-Item", amount = 1}, + {type = "item", name = "bob-express-bulk-inserter", amount = 2} } data.raw.recipe["nullius-ejector-hatch"].ingredients = { - {"HatchRTItem", 1}, - {"RTThrower-turbo-inserter-Item", 1}, - {"fast-underground-belt", 1} + {type = "item", name = "HatchRT", amount = 1}, + {type = "item", name = "RTThrower-bob-turbo-inserter-Item", amount = 1}, + {type = "item", name = "fast-underground-belt", amount = 1} } data.raw.recipe["nullius-player-thrower"].ingredients = { - {"RTThrower-inserter-Item", 1}, - {"nullius-steel-plate", 2} + {type = "item", name = "RTThrower-inserter-Item", amount = 1}, + {type = "item", name = "nullius-steel-plate", amount = 2} } - + data.raw.recipe["RTThrower-burner-inserter-Recipe"].enabled = false data.raw.recipe["RTThrower-inserter-Recipe"].enabled = false - data.raw.item["RTThrower-inserter-Item"].localised_name = {"entity-name.nullius-thrower", 1} - data.raw.inserter["RTThrower-inserter"].localised_name = {"entity-name.nullius-thrower", 1} + data.raw.item["RTThrower-inserter-Item"].localised_name = {"entity-name.nullius-thrower", tostring(1)} + data.raw.inserter["RTThrower-inserter"].localised_name = {"entity-name.nullius-thrower", tostring(1)} data.raw.item["RTThrower-inserter-Item"].subgroup = "nullius-renai-thrower" data.raw.item["RTThrower-inserter-Item"].order = "nullius-tbb" data.raw.inserter["RTThrower-inserter"].order = "nullius-tbb" data.raw.inserter["RTThrower-inserter"].rotation_speed = 0.0083333333 - data.raw.inserter["RTThrower-inserter"].energy_per_rotation = "56KJ" + data.raw.inserter["RTThrower-inserter"].energy_per_rotation = "56kJ" data.raw.inserter["RTThrower-inserter"].energy_per_movement = "1W" data.raw.inserter["RTThrower-inserter"].energy_source.drain = "2kW" data.raw.inserter["RTThrower-inserter"].minable.mining_time = 0.6 - data.raw.item["RTThrower-turbo-inserter-Item"].localised_name = {"entity-name.nullius-thrower", 2} - data.raw.inserter["RTThrower-turbo-inserter"].localised_name = {"entity-name.nullius-thrower", 2} - data.raw.item["RTThrower-turbo-inserter-Item"].subgroup = "nullius-renai-thrower" - data.raw.item["RTThrower-turbo-inserter-Item"].order = "nullius-tcb" - data.raw.inserter["RTThrower-turbo-inserter"].order = "nullius-tcb" - data.raw.inserter["RTThrower-turbo-inserter"].rotation_speed = 0.016666667 - data.raw.inserter["RTThrower-turbo-inserter"].energy_per_rotation = "56KJ" - data.raw.inserter["RTThrower-turbo-inserter"].energy_per_movement = "1W" - data.raw.inserter["RTThrower-turbo-inserter"].energy_source.drain = "4kW" - data.raw.inserter["RTThrower-turbo-inserter"].minable.mining_time = 0.8 - data.raw.item["RTThrower-turbo-filter-inserter-Item"].localised_name = {"entity-name.nullius-filter-thrower", 2} - data.raw.inserter["RTThrower-turbo-filter-inserter"].localised_name = {"entity-name.nullius-filter-thrower", 2} - data.raw.item["RTThrower-turbo-filter-inserter-Item"].subgroup = "nullius-renai-thrower" - data.raw.item["RTThrower-turbo-filter-inserter-Item"].order = "nullius-tcc" - data.raw.inserter["RTThrower-turbo-filter-inserter"].order = "nullius-tcc" - data.raw.inserter["RTThrower-turbo-filter-inserter"].rotation_speed = 0.016666667 - data.raw.inserter["RTThrower-turbo-filter-inserter"].energy_per_rotation = "56KJ" - data.raw.inserter["RTThrower-turbo-filter-inserter"].energy_per_movement = "1W" - data.raw.inserter["RTThrower-turbo-filter-inserter"].energy_source.drain = "4kW" - data.raw.inserter["RTThrower-turbo-filter-inserter"].minable.mining_time = 0.8 - data.raw.item["RTThrower-stack-inserter-Item"].localised_name = {"entity-name.nullius-thrower", 3} - data.raw.inserter["RTThrower-stack-inserter"].localised_name = {"entity-name.nullius-thrower", 3} - data.raw.item["RTThrower-stack-inserter-Item"].subgroup = "nullius-renai-thrower" - data.raw.item["RTThrower-stack-inserter-Item"].order = "nullius-tdb" - data.raw.inserter["RTThrower-stack-inserter"].order = "nullius-tdb" - data.raw.inserter["RTThrower-stack-inserter"].rotation_speed = 0.016666667 - data.raw.inserter["RTThrower-stack-inserter"].energy_per_rotation = "114KJ" - data.raw.inserter["RTThrower-stack-inserter"].energy_per_movement = "1W" - data.raw.inserter["RTThrower-stack-inserter"].energy_source.drain = "6kW" - data.raw.inserter["RTThrower-stack-inserter"].minable.mining_time = 1 - data.raw.item["RTThrower-stack-filter-inserter-Item"].localised_name = {"entity-name.nullius-filter-thrower", 3} - data.raw.inserter["RTThrower-stack-filter-inserter"].localised_name = {"entity-name.nullius-filter-thrower", 3} - data.raw.item["RTThrower-stack-filter-inserter-Item"].subgroup = "nullius-renai-thrower" - data.raw.item["RTThrower-stack-filter-inserter-Item"].order = "nullius-tdc" - data.raw.inserter["RTThrower-stack-filter-inserter"].order = "nullius-tdc" - data.raw.inserter["RTThrower-stack-filter-inserter"].rotation_speed = 0.016666667 - data.raw.inserter["RTThrower-stack-filter-inserter"].energy_per_rotation = "114KJ" - data.raw.inserter["RTThrower-stack-filter-inserter"].energy_per_movement = "1W" - data.raw.inserter["RTThrower-stack-filter-inserter"].energy_source.drain = "6kW" - data.raw.inserter["RTThrower-stack-filter-inserter"].minable.mining_time = 1 - data.raw.item["RTThrower-express-stack-inserter-Item"].localised_name = {"entity-name.nullius-thrower", 4} - data.raw.inserter["RTThrower-express-stack-inserter"].localised_name = {"entity-name.nullius-thrower", 4} - data.raw.item["RTThrower-express-stack-inserter-Item"].subgroup = "nullius-renai-thrower" - data.raw.item["RTThrower-express-stack-inserter-Item"].order = "nullius-teb" - data.raw.inserter["RTThrower-express-stack-inserter"].order = "nullius-teb" - data.raw.inserter["RTThrower-express-stack-inserter"].rotation_speed = 0.033333333 - data.raw.inserter["RTThrower-express-stack-inserter"].energy_per_rotation = "115KJ" - data.raw.inserter["RTThrower-express-stack-inserter"].energy_per_movement = "1W" - data.raw.inserter["RTThrower-express-stack-inserter"].energy_source.drain = "10kW" - data.raw.inserter["RTThrower-express-stack-inserter"].minable.mining_time = 1.2 - data.raw.item["RTThrower-express-stack-filter-inserter-Item"].localised_name = {"entity-name.nullius-filter-thrower", 4} - data.raw.inserter["RTThrower-express-stack-filter-inserter"].localised_name = {"entity-name.nullius-filter-thrower", 4} - data.raw.item["RTThrower-express-stack-filter-inserter-Item"].subgroup = "nullius-renai-thrower" - data.raw.item["RTThrower-express-stack-filter-inserter-Item"].order = "nullius-tec" - data.raw.inserter["RTThrower-express-stack-filter-inserter"].order = "nullius-tec" - data.raw.inserter["RTThrower-express-stack-filter-inserter"].rotation_speed = 0.033333333 - data.raw.inserter["RTThrower-express-stack-filter-inserter"].energy_per_rotation = "115KJ" - data.raw.inserter["RTThrower-express-stack-filter-inserter"].energy_per_movement = "1W" - data.raw.inserter["RTThrower-express-stack-filter-inserter"].energy_source.drain = "10kW" - data.raw.inserter["RTThrower-express-stack-filter-inserter"].minable.mining_time = 1.2 + data.raw.item["RTThrower-bob-turbo-inserter-Item"].localised_name = {"entity-name.nullius-thrower", tostring(2)} + data.raw.inserter["RTThrower-bob-turbo-inserter"].localised_name = {"entity-name.nullius-thrower", tostring(2)} + data.raw.item["RTThrower-bob-turbo-inserter-Item"].subgroup = "nullius-renai-thrower" + data.raw.item["RTThrower-bob-turbo-inserter-Item"].order = "nullius-tcb" + data.raw.inserter["RTThrower-bob-turbo-inserter"].order = "nullius-tcb" + data.raw.inserter["RTThrower-bob-turbo-inserter"].rotation_speed = 0.016666667 + data.raw.inserter["RTThrower-bob-turbo-inserter"].energy_per_rotation = "56kJ" + data.raw.inserter["RTThrower-bob-turbo-inserter"].energy_per_movement = "1W" + data.raw.inserter["RTThrower-bob-turbo-inserter"].energy_source.drain = "4kW" + data.raw.inserter["RTThrower-bob-turbo-inserter"].minable.mining_time = 0.8 + data.raw.item["RTThrower-bulk-inserter-Item"].localised_name = {"entity-name.nullius-thrower", tostring(3)} + data.raw.inserter["RTThrower-bulk-inserter"].localised_name = {"entity-name.nullius-thrower", tostring(3)} + data.raw.item["RTThrower-bulk-inserter-Item"].subgroup = "nullius-renai-thrower" + data.raw.item["RTThrower-bulk-inserter-Item"].order = "nullius-tdb" + data.raw.inserter["RTThrower-bulk-inserter"].order = "nullius-tdb" + data.raw.inserter["RTThrower-bulk-inserter"].rotation_speed = 0.016666667 + data.raw.inserter["RTThrower-bulk-inserter"].energy_per_rotation = "114kJ" + data.raw.inserter["RTThrower-bulk-inserter"].energy_per_movement = "1W" + data.raw.inserter["RTThrower-bulk-inserter"].energy_source.drain = "6kW" + data.raw.inserter["RTThrower-bulk-inserter"].minable.mining_time = 1 + data.raw.item["RTThrower-bob-express-bulk-inserter-Item"].localised_name = {"entity-name.nullius-thrower", tostring(4)} + data.raw.inserter["RTThrower-bob-express-bulk-inserter"].localised_name = {"entity-name.nullius-thrower", tostring(4)} + data.raw.item["RTThrower-bob-express-bulk-inserter-Item"].subgroup = "nullius-renai-thrower" + data.raw.item["RTThrower-bob-express-bulk-inserter-Item"].order = "nullius-teb" + data.raw.inserter["RTThrower-bob-express-bulk-inserter"].order = "nullius-teb" + data.raw.inserter["RTThrower-bob-express-bulk-inserter"].rotation_speed = 0.033333333 + data.raw.inserter["RTThrower-bob-express-bulk-inserter"].energy_per_rotation = "115kJ" + data.raw.inserter["RTThrower-bob-express-bulk-inserter"].energy_per_movement = "1W" + data.raw.inserter["RTThrower-bob-express-bulk-inserter"].energy_source.drain = "10kW" + data.raw.inserter["RTThrower-bob-express-bulk-inserter"].minable.mining_time = 1.2 data.raw.inserter["PlayerLauncher"].rotation_speed = 0.033333333 data.raw.inserter["RTThrower-EjectorHatchRT"].rotation_speed = 0.016666667 data.raw.inserter["RTThrower-EjectorHatchRT"].extension_speed = 0.04 - data.raw.inserter["RTThrower-EjectorHatchRT"].energy_per_rotation = "56KJ" + data.raw.inserter["RTThrower-EjectorHatchRT"].energy_per_rotation = "56kJ" data.raw.inserter["RTThrower-EjectorHatchRT"].energy_per_movement = "1W" data.raw.inserter["RTThrower-EjectorHatchRT"].energy_source.drain = "4kW" data.raw.inserter["RTThrower-EjectorHatchRT"].minable.mining_time = 0.75 @@ -256,22 +205,48 @@ if (mods["RenaiTransportation"] and data.raw["simple-entity-with-owner"]["HatchRT"].minable.mining_time = 0.5 data.raw.inserter["PlayerLauncher"].minable.mining_time = 0.6 data.raw["container"]["OpenContainer"].minable.mining_time = 0.5 - data.raw["simple-entity-with-owner"]["BouncePlate"].minable.mining_time = 1 - data.raw["simple-entity-with-owner"]["DirectedBouncePlate"].minable.mining_time = 1.2 - data.raw["constant-combinator"]["SignalBouncePlate"].minable.mining_time = 1.5 + data.raw["constant-combinator"]["RTBouncePlate"].minable.mining_time = 1 + data.raw["constant-combinator"]["DirectedBouncePlate"].minable.mining_time = 1.2 + -- data.raw["constant-combinator"]["SignalBouncePlate"].minable.mining_time = 1.5 --removed data.raw["constant-combinator"]["DirectorBouncePlate"].minable.mining_time = 2 - data.raw.recipe["nullius-thrower-1"].result = "RTThrower-inserter-Item" - data.raw.recipe["nullius-thrower-2"].result = "RTThrower-turbo-inserter-Item" - data.raw.recipe["nullius-filter-thrower-2"].result = "RTThrower-turbo-filter-inserter-Item" - data.raw.recipe["nullius-thrower-3"].result = "RTThrower-stack-inserter-Item" - data.raw.recipe["nullius-filter-thrower-3"].result = "RTThrower-stack-filter-inserter-Item" - data.raw.recipe["nullius-thrower-4"].result = "RTThrower-express-stack-inserter-Item" - data.raw.recipe["nullius-filter-thrower-4"].result = "RTThrower-express-stack-filter-inserter-Item" + data.raw.recipe["nullius-thrower-1"].results = { + {type = "item", name = "RTThrower-inserter-Item", amount = 1} + } + data.raw.recipe["nullius-thrower-2"].results = { + {type = "item", name = "RTThrower-bob-turbo-inserter-Item", amount = 1} + } + + data.raw.recipe["nullius-thrower-3"].results = { + {type = "item", name = "RTThrower-bulk-inserter-Item", amount = 1} + } + + data.raw.recipe["nullius-thrower-4"].results = { + {type = "item", name = "RTThrower-bob-express-bulk-inserter-Item", amount = 1} + } + + local hiddenInserterRecipes = { + "RTThrower-burner-inserter-Recipe", + "RTThrower-inserter-Recipe", + "RTThrower-bob-turbo-inserter-Recipe", + "RTThrower-bulk-inserter-Recipe", + "RTThrower-bob-express-bulk-inserter-Recipe", + "RTThrower-bob-steam-inserter-Recipe", + "RTThrower-bob-red-inserter-Recipe", + "RTThrower-long-handed-inserter-Recipe", + "RTThrower-bob-red-bulk-inserter-Recipe", + "RTThrower-fast-inserter-Recipe", + "RTThrower-bob-turbo-bulk-inserter-Recipe", + "RTThrower-bob-express-inserter-Recipe" + } + + for _, inserter in pairs(hiddenInserterRecipes) do + data.raw.recipe[inserter].hidden_in_factoriopedia = true + end end -if (mods["cargo-ships"] and settings.startup["deep_oil"].value) then +if (mods["cargo-ships"] and settings.startup["offshore_oil_enabled"].value) then data.raw.technology["deep_sea_oil_extraction"].unit = { count = 200, time = 30, ingredients = { diff --git a/nullius/prototypes/recipe_book.lua b/nullius/prototypes/recipe_book.lua index ac3e6f9..970dbda 100644 --- a/nullius/prototypes/recipe_book.lua +++ b/nullius/prototypes/recipe_book.lua @@ -18,7 +18,7 @@ group_with(data.raw.resource.coal, data.raw.item["nullius-coal"]) group_with(data.raw.lamp["nullius-lamp-1"], data.raw.item["small-lamp"]) group_with(data.raw.item["small-lamp"], data.raw.recipe["nullius-lamp-1a"]) group_with(data.raw.fluid["nullius-air"], data.raw.recipe["nullius-air-filtration"]) -group_with(data.raw.item["nullius-canister"], data.raw.recipe["nullius-empty-canister"]) +group_with(data.raw.item["nullius-canister"], data.raw.recipe["nullius-canister"]) group_with(data.raw.item["rocket-fuel"], data.raw.recipe["nullius-rocket-fuel"]) group_with(data.raw.item["stone-brick"], data.raw.recipe["nullius-stone-block"]) group_with(data.raw.item["refined-concrete"], data.raw.recipe["nullius-reinforced-concrete"]) @@ -61,7 +61,7 @@ group_with(data.raw.item["ultimate-splitter"], data.raw.recipe["nullius-splitter group_with(data.raw.item["underground-belt"], data.raw.recipe["nullius-underground-belt-1"]) group_with(data.raw.item["fast-underground-belt"], data.raw.recipe["nullius-underground-belt-2"]) group_with(data.raw.item["express-underground-belt"], data.raw.recipe["nullius-underground-belt-3"]) -group_with(data.raw.item["ultimate-underground-belt"], data.raw.recipe["nullius-underground-belt-4"]) +group_with(data.raw.item["bob-ultimate-underground-belt"], data.raw.recipe["nullius-underground-belt-4"]) group_with(data.raw.item["transport-belt"], data.raw.recipe["nullius-conveyor-belt-1"]) group_with(data.raw.item["fast-transport-belt"], data.raw.recipe["nullius-conveyor-belt-2"]) group_with(data.raw.item["express-transport-belt"], data.raw.recipe["nullius-conveyor-belt-3"]) @@ -270,8 +270,8 @@ group_with(data.raw.item["duct-small"], data.raw.recipe["nullius-duct-small"]) group_with(data.raw.item["duct-curve"], data.raw.recipe["nullius-duct-curve"]) group_with(data.raw.item["duct-t-junction"], data.raw.recipe["nullius-duct-t-junction"]) group_with(data.raw.item["duct-cross"], data.raw.recipe["nullius-duct-cross"]) -group_with(data.raw.item["duct-end-point-outtake"], data.raw.recipe["nullius-duct-end-point-outtake"]) -group_with(data.raw.item["duct-end-point-intake"], data.raw.recipe["nullius-duct-end-point-intake"]) +group_with(data.raw.item["duct-exhaust"], data.raw.recipe["nullius-duct-exhaust"]) +group_with(data.raw.item["duct-intake"], data.raw.recipe["nullius-duct-intake"]) group_with(data.raw.item["duct"], data.raw.recipe["nullius-duct"]) group_with(data.raw.item["duct-long"], data.raw.recipe["nullius-duct-long"]) group_with(data.raw.item["duct-underground"], data.raw.recipe["nullius-duct-underground"]) @@ -286,9 +286,9 @@ group_with(data.raw.item["steel-display"], data.raw.recipe["nullius-display-plat group_with(data.raw.item["copper-display-small"], data.raw.recipe["nullius-display-plate-small-plastic"]) group_with(data.raw.item["copper-display-medium"], data.raw.recipe["nullius-display-plate-medium-plastic"]) group_with(data.raw.item["copper-display"], data.raw.recipe["nullius-display-plate-large-plastic"]) -group_with(data.raw.item["SNTD-nixie-tube"], data.raw.recipe["nullius-SNTD-nixie-tube"]) -group_with(data.raw.item["SNTD-nixie-tube-small"], data.raw.recipe["nullius-SNTD-nixie-tube-small"]) -group_with(data.raw.item["SNTD-old-nixie-tube"], data.raw.recipe["nullius-SNTD-old-nixie-tube"]) +group_with(data.raw.item["reinforced-nixie-tube"], data.raw.recipe["nullius-reinforced-nixie-tube"]) +group_with(data.raw.item["small-reinforced-nixie-tube"], data.raw.recipe["nullius-small-reinforced-nixie-tube"]) +group_with(data.raw.item["classic-nixie-tube"], data.raw.recipe["nullius-classic-nixie-tube"]) group_with(data.raw.item["hs_holo_sign"], data.raw.recipe["nullius-holographic-sign"]) diff --git a/nullius/prototypes/reskin.lua b/nullius/prototypes/reskin.lua index 03f3c8e..4bd464e 100644 --- a/nullius/prototypes/reskin.lua +++ b/nullius/prototypes/reskin.lua @@ -26,16 +26,80 @@ function label_icon(name, tier, color, etype) local icon_style = settings.startup["reskins-lib-icon-tier-labeling-style"].value local icon_name = "__reskins-library__/graphics/icons/tiers/"..icon_style.."/"..tier..".png" table.insert(data.raw[etype][name].icons, { - icon = icon_name, icon_size = 64, icon_mipmaps = 4 + icon = icon_name, icon_size = 64 }) local blend = tiercolor(color) blend.a = 0.75 table.insert(data.raw[etype][name].icons, { - icon = icon_name, icon_size = 64, icon_mipmaps = 4, tint = blend + icon = icon_name, icon_size = 64, tint = blend }) end end +function add_recipe_gear_icon(icons) + if settings.startup["nullius-hide-recipe-signals"].value == true then + return icons + end + icons = table.deepcopy(icons) + table.insert(icons,{ + --icon = "__base__/graphics/icons/iron-gear-wheel.png", + icon = "__nullius__/graphics/icons/factorio-logo-gear.png", + icon_size = 64, + scale = 0.25, + shift = {-10, 10} + }) + return icons +end + +function combine_icons(icons1, icons2, scale1, scale2, shift1, shift2) + -- if type(icons2) ~= "table" then + -- icons2 = {{ + -- icon = icons2, + -- icon_size = 64 + -- }} + -- end + local combined = table.deepcopy(icons1) + for _, icon in pairs(combined) do + if (scale1 ~= nil) then + icon.scale = (icon.scale or 1) * scale1 + end + if (shift1 ~= nil) then + if (icon.shift ~= nil) then + if (icon.shift.x ~= nil) then + icon.shift.x = icon.shift.x + shift1[1] + icon.shift.y = icon.shift.y + shift1[2] + else + icon.shift[1] = icon.shift[1] + shift1[1] + icon.shift[2] = icon.shift[2] + shift1[2] + end + else + icon.shift = shift1 + end + end + end + for _, icon in pairs(icons2) do + icon = table.deepcopy(icon) + if scale2 ~= nil then + icon.scale = (icon.scale or 1) * scale2 + end + if shift2 ~= nil then + if (icon.shift ~= nil) then + if (icon.shift.x ~= nil) then + icon.shift.x = icon.shift.x + shift2[1] + icon.shift.y = icon.shift.y + shift2[2] + else + icon.shift[1] = icon.shift[1] + shift2[1] + icon.shift[2] = icon.shift[2] + shift2[2] + end + else + icon.shift = shift2 + end + end + table.insert(combined, icon) + end + return combined +end + function scale_shift(vec, scale) if (vec == nil) then return nil end vec[1] = vec[1] * scale @@ -51,34 +115,36 @@ function scale_image(img, scale, offs) return end lookup[img] = true - for _, field in pairs(img) do - scale_subtable(field, scale, offs) + for fieldName, field in pairs(img) do + if fieldName ~= "stripes" then + scale_subtable(field, scale, offs) + end end if (img.filename ~= nil) then - img.shift = scale_shift(img.shift, scale) + img.shift = scale_shift(img.shift, scale) if (img.scale ~= nil) then img.scale = img.scale * scale else img.scale = scale end - if (offs ~= nil) then - if (img.shift ~= nil) then - if (img.shift.x ~= nil) then - img.shift.x = img.shift.x + offs.x - img.shift.y = img.shift.y + offs.y - else - img.shift[1] = img.shift[1] + offs.x - img.shift[2] = img.shift[2] + offs.y - end - else - img.shift = offs - end - end + if (offs ~= nil) then + if (img.shift ~= nil) then + if (img.shift.x ~= nil) then + img.shift.x = img.shift.x + offs.x + img.shift.y = img.shift.y + offs.y + else + img.shift[1] = img.shift[1] + offs.x + img.shift[2] = img.shift[2] + offs.y + end + else + img.shift = offs + end + end end - img.north_position = scale_shift(img.north_position, scale) - img.east_position = scale_shift(img.east_position, scale) - img.south_position = scale_shift(img.south_position, scale) - img.west_position = scale_shift(img.west_position, scale) + img.north_position = scale_shift(img.north_position, scale) + img.east_position = scale_shift(img.east_position, scale) + img.south_position = scale_shift(img.south_position, scale) + img.west_position = scale_shift(img.west_position, scale) end scale_subtable(ret, scale, offs) return ret @@ -92,11 +158,5 @@ function animate_frame(frame, count, speed) ret.frame_count = 1 ret.repeat_count = count ret.animation_speed = speed - if (ret.hr_version ~= nil) then - ret.hr_version.priority = "high" - ret.hr_version.frame_count = 1 - ret.hr_version.repeat_count = count - ret.hr_version.animation_speed = speed - end return ret end diff --git a/nullius/prototypes/resource.lua b/nullius/prototypes/resource.lua index 9ad882e..74af3dd 100644 --- a/nullius/prototypes/resource.lua +++ b/nullius/prototypes/resource.lua @@ -1,7 +1,8 @@ local BASEENTITY = "__base__/graphics/entity/" -angelsmods.refining.disable_ore_override = true - +if mods["angelsrefining"] then + angelsmods.refining.disable_ore_override = true +end local resource_autoplace = require("resource-autoplace") resource_autoplace.initialize_patch_set("iron-ore", true) @@ -10,17 +11,25 @@ resource_autoplace.initialize_patch_set("nullius-sandstone", true) resource_autoplace.initialize_patch_set("nullius-limestone", false) resource_autoplace.initialize_patch_set("nullius-fumarole", false) +local nauvis_map_gen_settings = data.raw.planet["nauvis"].map_gen_settings +for _, resource in ipairs({"iron-ore", "nullius-bauxite", "nullius-sandstone", + "nullius-limestone"}) do + nauvis_map_gen_settings.autoplace_settings["entity"]["settings"][resource] = {} + nauvis_map_gen_settings.autoplace_controls[resource] = {} +end +nauvis_map_gen_settings.autoplace_settings["entity"]["settings"]["nullius-fumarole"] = {} +nauvis_map_gen_settings.autoplace_controls["nullius-geothermal"] = {} + local function make_particle(inputname, inputtint) data:extend({ { type = "optimized-particle", name = inputname.."-particle", - flags = {"not-on-map"}, life_time = 180, pictures = { { - filename = "__angelsrefining__/graphics/entity/ores-particle/ore-particle-1.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores-particle/ore-particle-1.png", priority = "extra-high", tint = inputtint, width = 5, @@ -28,7 +37,7 @@ local function make_particle(inputname, inputtint) frame_count = 1 }, { - filename = "__angelsrefining__/graphics/entity/ores-particle/ore-particle-2.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores-particle/ore-particle-2.png", priority = "extra-high", tint = inputtint, width = 7, @@ -36,7 +45,7 @@ local function make_particle(inputname, inputtint) frame_count = 1 }, { - filename = "__angelsrefining__/graphics/entity/ores-particle/ore-particle-3.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores-particle/ore-particle-3.png", priority = "extra-high", tint = inputtint, width = 6, @@ -44,7 +53,7 @@ local function make_particle(inputname, inputtint) frame_count = 1 }, { - filename = "__angelsrefining__/graphics/entity/ores-particle/ore-particle-4.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores-particle/ore-particle-4.png", priority = "extra-high", tint = inputttint, width = 9, @@ -52,7 +61,7 @@ local function make_particle(inputname, inputtint) frame_count = 1 }, { - filename = "__angelsrefining__/graphics/entity/ores-particle/ore-particle-5.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores-particle/ore-particle-5.png", priority = "extra-high", tint = inputttint, width = 5, @@ -60,7 +69,7 @@ local function make_particle(inputname, inputtint) frame_count = 1 }, { - filename = "__angelsrefining__/graphics/entity/ores-particle/ore-particle-6.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores-particle/ore-particle-6.png", priority = "extra-high", tint = inputtint, width = 6, @@ -68,7 +77,7 @@ local function make_particle(inputname, inputtint) frame_count = 1 }, { - filename = "__angelsrefining__/graphics/entity/ores-particle/ore-particle-7.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores-particle/ore-particle-7.png", priority = "extra-high", tint = inputtint, width = 7, @@ -76,7 +85,7 @@ local function make_particle(inputname, inputtint) frame_count = 1 }, { - filename = "__angelsrefining__/graphics/entity/ores-particle/ore-particle-8.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores-particle/ore-particle-8.png", priority = "extra-high", tint = inputtint, width = 6, @@ -86,56 +95,56 @@ local function make_particle(inputname, inputtint) }, shadows = { { - filename = "__angelsrefining__/graphics/entity/ores-particle/ore-particle-shadow-1.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores-particle/ore-particle-shadow-1.png", priority = "extra-high", width = 5, height = 5, frame_count = 1 }, { - filename = "__angelsrefining__/graphics/entity/ores-particle/ore-particle-shadow-2.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores-particle/ore-particle-shadow-2.png", priority = "extra-high", width = 7, height = 5, frame_count = 1 }, { - filename = "__angelsrefining__/graphics/entity/ores-particle/ore-particle-shadow-3.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores-particle/ore-particle-shadow-3.png", priority = "extra-high", width = 6, height = 7, frame_count = 1 }, { - filename = "__angelsrefining__/graphics/entity/ores-particle/ore-particle-shadow-4.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores-particle/ore-particle-shadow-4.png", priority = "extra-high", width = 9, height = 8, frame_count = 1 }, { - filename = "__angelsrefining__/graphics/entity/ores-particle/ore-particle-shadow-5.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores-particle/ore-particle-shadow-5.png", priority = "extra-high", width = 5, height = 5, frame_count = 1 }, { - filename = "__angelsrefining__/graphics/entity/ores-particle/ore-particle-shadow-6.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores-particle/ore-particle-shadow-6.png", priority = "extra-high", width = 6, height = 4, frame_count = 1 }, { - filename = "__angelsrefining__/graphics/entity/ores-particle/ore-particle-shadow-7.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores-particle/ore-particle-shadow-7.png", priority = "extra-high", width = 7, height = 8, frame_count = 1 }, { - filename = "__angelsrefining__/graphics/entity/ores-particle/ore-particle-shadow-8.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores-particle/ore-particle-shadow-8.png", priority = "extra-high", width = 6, height = 5, @@ -201,22 +210,13 @@ data:extend({ stage_counts = {15000, 9500, 5500, 2900, 1300, 400, 150, 80}, stages = { sheet = { - filename = "__angelsrefining__/graphics/entity/ores/ore-14-lr.png", - priority = "extra-high", - tint = {0.858, 0.809, 0.479}, - size = 64, - frame_count = 8, - variation_count = 8, - hr_version = - { - filename = "__angelsrefining__/graphics/entity/ores/ore-14-hr.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores/ore-14.png", priority = "extra-high", tint = {0.858, 0.809, 0.479}, size = 128, frame_count = 8, variation_count = 8, scale = 0.5 - } } }, @@ -249,22 +249,13 @@ data:extend({ stage_counts = {15000, 9500, 5500, 2900, 1300, 400, 150, 80}, stages = { sheet = { - filename = "__angelsrefining__/graphics/entity/ores/ore-12-lr.png", - priority = "extra-high", - tint = {184, 125, 73}, - size = 64, - frame_count = 8, - variation_count = 8, - hr_version = - { - filename = "__angelsrefining__/graphics/entity/ores/ore-12-hr.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores/ore-12.png", priority = "extra-high", tint = {184, 125, 73}, size = 128, frame_count = 8, variation_count = 8, scale = 0.5 - } } }, @@ -296,22 +287,13 @@ data:extend({ stage_counts = {15000, 9500, 5500, 2900, 1300, 400, 150, 80}, stages = { sheet = { - filename = "__angelsrefining__/graphics/entity/ores/ore-21-lr.png", - priority = "extra-high", - tint = {0.898, 0.773, 0.688}, - size = 64, - frame_count = 8, - variation_count = 8, - hr_version = - { - filename = "__angelsrefining__/graphics/entity/ores/ore-21-hr.png", + filename = "__angelsrefininggraphics__/graphics/entity/ores/ore-21.png", priority = "extra-high", tint = {0.898, 0.773, 0.688}, size = 128, frame_count = 8, variation_count = 8, scale = 0.5 - } } }, @@ -327,9 +309,9 @@ data:extend({ { type = "resource", name = "nullius-fumarole", - icons = data.raw.fluid["nullius-volcanic-gas"].icons, + icons = combine_icons(data.raw.fluid["nullius-volcanic-gas"].icons, {{icon = data.raw.fluid["nullius-steam"].icon, icon_size = 64}}, 0.85, 0.25, nil, {-10, -10}), map_color = {r=1, g=0.5, b=0}, - mining_visualisation_tint = {r = 1.0, g = 0.7, b = 0.4, a = 1.0}, + mining_visualisation_tint = {r = 1.0, g = 0.7, b = 0.4, a = 1.0}, map_grid = false, flags = {"placeable-neutral"}, @@ -366,7 +348,7 @@ data:extend({ stage_counts = {0}, stages = { sheet = { - filename = "__angelsrefining__/graphics/entity/patches/fissure.png", + filename = "__angelsrefininggraphics__/graphics/entity/patches/fissure.png", tint = {r = 0.65, g = 0.4, b = 0.15}, priority = "extra-high", width = 256, @@ -378,7 +360,7 @@ data:extend({ }, stages_effect = { sheet = { - filename = "__angelsrefining__/graphics/entity/patches/fissure-glow.png", + filename = "__angelsrefininggraphics__/graphics/entity/patches/fissure-glow.png", tint = {r=1, g=0.3, b=0.1}, priority = "extra-high", width = 256, @@ -413,12 +395,12 @@ data:extend({ }) -if (mods["cargo-ships"] and settings.startup["deep_oil"].value) then +if (mods["cargo-ships"] and settings.startup["offshore_oil_enabled"].value) then data:extend({ { type = "autoplace-control", - name = "deep_oil", - localised_name = {"autoplace-control-names.nullius-hydrothermal"}, + name = "offshore-oil", + localised_name = {"autoplace-control-names.nullius-hydrothermal"}, category = "resource", richness = true, order = "a-c-c" diff --git a/nullius/prototypes/resource_override.lua b/nullius/prototypes/resource_override.lua index 24cb0a9..a5f1fb3 100644 --- a/nullius/prototypes/resource_override.lua +++ b/nullius/prototypes/resource_override.lua @@ -1,18 +1,5 @@ local resource_autoplace = require("resource-autoplace") -for r, subdir in pairs(angelsmods.functions.store) do - for r, input in pairs(subdir) do - if (not input.inactive) then - if ((input.name == "coal") or (input.name == "crude-oil")) then - input.inactive = true - else - angelsmods.functions.remove_resource(input.name) - end - end - end -end - - function remove_autoplace(resource) if data.raw.resource[resource] then data.raw["autoplace-control"][resource] = nil @@ -24,6 +11,27 @@ function remove_autoplace(resource) preset.basic_settings.autoplace_controls[resource] = nil end end + data.raw.planet["nauvis"].map_gen_settings.autoplace_controls[resource] = nil + data.raw.planet["nauvis"].map_gen_settings.autoplace_settings["entity"]["settings"][resource] = nil +end + + +if mods["angelsrefining"] then + for r, subdir in pairs(angelsmods.functions.store) do + for r, input in pairs(subdir) do + if (not input.inactive) then + if ((input.name == "coal") or (input.name == "crude-oil")) then + input.inactive = true + else + angelsmods.functions.remove_resource(input.name) + end + end + end + end + + if data.raw["simple-entity"]["angels-crystal-rock"] then + data.raw["simple-entity"]["angels-crystal-rock"].autoplace = nil + end end remove_autoplace("copper-ore") @@ -31,8 +39,8 @@ remove_autoplace("uranium-ore") remove_autoplace("coal") remove_autoplace("crude-oil") -angelsmods.functions.remove_resource("stone") -angelsmods.functions.remove_resource("trees") +angelsLegacy.functions.remove_resource("stone") +angelsLegacy.functions.remove_resource("trees") data.raw["autoplace-control"]["iron-ore"].localised_name = nil @@ -101,10 +109,12 @@ data.raw["map-gen-presets"]["default"]["rail-world"].basic_settings = { ["nullius-geothermal"] = { frequency = 0.33333333333, size = 3 - } + }, + water = { + frequency = 0.5, + size = 1.5 + } }, - terrain_segmentation = "very-low", - water = "high", } data.raw["map-gen-presets"]["default"]["ribbon-world"].basic_settings = { @@ -133,21 +143,27 @@ data.raw["map-gen-presets"]["default"]["ribbon-world"].basic_settings = { frequency = 3, size = 0.5, richness = 2 - } + }, + water = { + frequency = 4, + size = 0.25 + }, }, - terrain_segmentation = 4, - water = 0.25, starting_area = 3, + property_expression_names = { + elevation = "elevation_lakes", + trees_forest_path_cutout = 1 + }, height = 128 } -if (mods["cargo-ships"] and settings.startup["deep_oil"].value) then -resource_autoplace.initialize_patch_set("deep_oil", false) +if (mods["cargo-ships"] and settings.startup["offshore_oil_enabled"].value) then +resource_autoplace.initialize_patch_set("offshore-oil", false) -data.raw.resource["deep_oil"].autoplace = +data.raw.resource["offshore-oil"].autoplace = resource_autoplace.resource_autoplace_settings { - name = "deep_oil", + name = "offshore-oil", order = "a-c-c", base_density = 8.2, base_spots_per_km2 = 1.8, @@ -159,7 +175,7 @@ data.raw.resource["deep_oil"].autoplace = has_starting_area_placement = false } -data.raw.resource["deep_oil"].minable = { +data.raw.resource["offshore-oil"].minable = { mining_time = 1, results = {{ type = "fluid", @@ -171,15 +187,15 @@ data.raw.resource["deep_oil"].minable = { }} } -data.raw.resource["deep_oil"].map_color = {r=0.7, g=0.5, b=0.3} -data.raw.resource["deep_oil"].mining_visualisation_tint = {r = 1.0, g = 0.7, b = 0.4, a = 1.0} -data.raw.resource["deep_oil"].localised_name = {"entity-name.nullius-hydrothermal-vent"} -data.raw.resource["deep_oil"].localised_description = {"entity-description.nullius-hydrothermal-vent"} +data.raw.resource["offshore-oil"].map_color = {r=0.7, g=0.5, b=0.3} +data.raw.resource["offshore-oil"].mining_visualisation_tint = {r = 1.0, g = 0.7, b = 0.4, a = 1.0} +data.raw.resource["offshore-oil"].localised_name = {"entity-name.nullius-hydrothermal-vent"} +data.raw.resource["offshore-oil"].localised_description = {"entity-description.nullius-hydrothermal-vent"} -table.insert(data.raw.resource["deep_oil"].collision_mask, 'ground-tile') +table.insert(data.raw.resource["offshore-oil"].collision_mask, 'ground-tile') -data.raw.resource["deep_oil"].stages = { sheet = { - filename = "__angelsrefining__/graphics/entity/patches/gas.png", +data.raw.resource["offshore-oil"].stages = { sheet = { + filename = "__angelsrefininggraphics__/graphics/entity/patches/gas.png", tint = {0.4, 0.2, 0, 0.4}, priority = "extra-high", width = 64, @@ -189,11 +205,11 @@ data.raw.resource["deep_oil"].stages = { sheet = { }} data.raw["map-gen-presets"]["default"]["rich-resources"].basic_settings. - autoplace_controls["deep_oil"] = { richness = "very-good"} + autoplace_controls["offshore-oil"] = { richness = "very-good"} data.raw["map-gen-presets"]["default"]["rail-world"].basic_settings. - autoplace_controls["deep_oil"] = { frequency = 0.33333333333, size = 3 } + autoplace_controls["offshore-oil"] = { frequency = 0.33333333333, size = 3 } data.raw["map-gen-presets"]["default"]["ribbon-world"].basic_settings. - autoplace_controls["deep_oil"] = { frequency = 3, size = 0.5, richness = 2 } + autoplace_controls["offshore-oil"] = { frequency = 3, size = 0.5, richness = 2 } if (not settings.startup["no_oil_for_oil_rig"].value) then data.raw.resource["nullius-fumarole"].infinite = false @@ -202,3 +218,14 @@ if (not settings.startup["no_oil_for_oil_rig"].value) then {"entity-description.nullius-fumarole-finite"} end end + +-- Alien Biomes Patch (alien biomes 0.7.4 crashes when the disable all vegetation setting is enabled) +local block_decorative_words = {"grass", "asterisk", "fluff", "garballo", "bush", "croton", "pita", "cane"} +for _, prototype in pairs(data.raw['optimized-decorative']) do + for _, word in pairs(block_decorative_words) do + if string.find(prototype.name, word) then + data.raw.planet["nauvis"].map_gen_settings.autoplace_settings["decorative"]["settings"][prototype.name] = nil + end + end +end +data.raw.planet["nauvis"].map_gen_settings.autoplace_settings["entity"]["settings"]["fish"] = nil \ No newline at end of file diff --git a/nullius/prototypes/rock.lua b/nullius/prototypes/rock.lua index ddfacba..5cc9183 100644 --- a/nullius/prototypes/rock.lua +++ b/nullius/prototypes/rock.lua @@ -1,52 +1,62 @@ local ICONPATH = "__nullius__/graphics/icons/" local ENTITYPATH = "__nullius__/graphics/entity/" +-- stolen from https://stackoverflow.com/questions/1426954/split-string-in-lua +local function split(inputstr, sep) + if sep == nil then + sep = "%s" + end + local t = {} + for str in string.gmatch(inputstr, "([^"..sep.."]+)") do + table.insert(t, str) + end + return t +end + for _,rock in pairs(data.raw["simple-entity"]) do local primary = nil local secondary = "stone" local tertiary = "nullius-mineral-dust" local locale_name = nil - if (string.sub(rock.name, 1, 5) == "rock-") then - if (string.sub(rock.name, -6, -1) == "-brown") or - (string.sub(rock.name, -4, -1) == "-red") or - (string.sub(rock.name, -10, -1) == "-dustyrose") then + + local tmp = split(rock.name, "-") + if #tmp == 3 then -- regular rock + rockColor = tmp[3] + if rockColor ~= "rock" then + if (rockColor == "brown") or (rockColor == "red") or (rockColor == "dustyrose") then primary = "nullius-bauxite" tertiary = "nullius-sand" - locale_name = "bauxite" - elseif (string.sub(rock.name, -6, -1) == "-white") then + locale_name = "bauxite" + elseif (rockColor == "white") then primary = "nullius-limestone" - locale_name = "limestone" - elseif (string.sub(rock.name, -6, -1) == "-cream") or - (string.sub(rock.name, -6, -1) == "-beige") then + locale_name = "limestone" + elseif (rockColor == "cream") or (rockColor == "beige") then primary = "nullius-limestone" secondary = "nullius-gypsum" - locale_name = "limestone" - elseif (string.sub(rock.name, -4, -1) == "-tan") then + locale_name = "limestone" + elseif (rockColor == "tan") then primary = "nullius-gypsum" secondary = "nullius-limestone" - elseif (string.sub(rock.name, -5, -1) == "-grey") then + elseif (rockColor == "grey") then primary = "stone" secondary = "nullius-sandstone" tertiary = "nullius-gravel" else primary = "iron-ore" tertiary = "nullius-gravel" - locale_name = "ironstone" + locale_name = "ironstone" end - elseif (string.sub(rock.name, 1, 10) == "sand-rock-") then + end + elseif #tmp == 4 then -- sand rock + rockColor = tmp[4] primary = "nullius-sandstone" tertiary = "nullius-sand" - locale_name = "sandstone" - if (string.sub(rock.name, -4, -1) == "-tan") or - (string.sub(rock.name, -6, -1) == "-brown") or - (string.sub(rock.name, -10, -1) == "-dustyrose") or - (string.sub(rock.name, -4, -1) == "-red") then + locale_name = "sandstone" + if (rockColor == "tan") or (rockColor == "brown") or (rockColor == "dustyrose") or (rockColor == "red") then secondary = "nullius-bauxite" - elseif (string.sub(rock.name, -5, -1) == "-grey") or - (string.sub(rock.name, -6, -1) == "-white") or - (string.sub(rock.name, -6, -1) == "-beige") then + elseif (rockColor == "grey") or (rockColor == "white") or (rockColor == "beige") then secondary = "nullius-limestone" - elseif (string.sub(rock.name, -6, -1) == "-cream") then + elseif (rockColor == "cream") then secondary = "nullius-bauxite" else secondary = "iron-ore" @@ -81,7 +91,7 @@ for _,rock in pairs(data.raw["simple-entity"]) do end end if ((amount > 2) and not foundcoal) then - table.insert(rock.minable.results, {name=secondary, amount_min=1, amount_max=amount-1}) + table.insert(rock.minable.results, {type = "item", name=secondary, amount_min=1, amount_max=amount-1}) end rock.loot = {} for _,minres in pairs(rock.minable.results) do @@ -112,23 +122,9 @@ for _,rock in pairs(data.raw["simple-entity"]) do end end - -if (data.raw["simple-entity"]["angels-crystal-rock"] ~= nil) then - data.raw["simple-entity"]["angels-crystal-rock"].minable = { - mining_particle = "stone-particle", - mining_time = 8, - results = { - {type="item", name="nullius-silica", amount=16}, - {type="item", name="nullius-alumina", amount=8} - } - } - data.raw["simple-entity"]["angels-crystal-rock"].loot = { - {item = "nullius-silica", probability = 1, count_min = 4, count_max = 12}, - {item = "nullius-alumina", probability = 1, count_min = 2, count_max = 6} - } -end -if (data.raw["simple-entity"]["sand-rock-big-white"] ~= nil) then - table.insert(data.raw["simple-entity"]["sand-rock-big-white"].minable.results, +-- From Alien Biomes +if (data.raw["simple-entity"]["sand-big-rock-white"] ~= nil) then + table.insert(data.raw["simple-entity"]["sand-big-rock-white"].minable.results, {type="item", name="nullius-soda-ash", probability=0.1, amount_min=1, amount_max=2} ) end diff --git a/nullius/prototypes/technology.lua b/nullius/prototypes/technology.lua index 825b04d..455b185 100644 --- a/nullius/prototypes/technology.lua +++ b/nullius/prototypes/technology.lua @@ -5,6 +5,26 @@ local TECHPATH = "__nullius__/graphics/technology/" local EQUIPPATH = "__nullius__/graphics/equipment/" data:extend({ + { + type = "technology", + name = "nullius-salvage-lab-wreckage", + order = "nullius-bb", + icons = { + { + icon = TECHPATH.."lab-wreckage.png", + icon_size = 252, + + }, + }, + + research_trigger = { + type = "mine-entity", + entity = "nullius-landing-lab" + }, + + ignore_tech_cost_multiplier = true, + essential = true + }, { type = "technology", name = "nullius-geology-1", @@ -13,15 +33,15 @@ data:extend({ { icon = "__base__/graphics/technology/utility-science-pack.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/stone.png", icon_size = 64, - icon_mipmaps = 4, - scale = 1.6, - shift = {0, 36}, - tint = {r=0.6, g=0.4, b=0.2, a=0.5} + + scale = 0.8, + shift = {0, 20}, + tint = {r=0.6, g=0.4, b=0.2, a=0.8} } }, effects = { @@ -35,15 +55,17 @@ data:extend({ ingredients = {}, time = 3 }, - ignore_tech_cost_multiplier = true + prerequisites = {"nullius-salvage-lab-wreckage"}, + ignore_tech_cost_multiplier = true, + essential = true }, { type = "technology", name = "nullius-iron-smelting-1", order = "nullius-bc", - icon = "__angelssmelting__/graphics/technology/smelting-iron-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/smelting-iron-tech.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -66,15 +88,15 @@ data:extend({ { icon = "__base__/graphics/technology/chemical-science-pack.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, - scale = 1.8, - shift = {0, 34}, - tint = {r=1, g=1, b=1, a=0.5} + + scale = 1, + shift = {0, 20}, + tint = {r=1, g=1, b=1, a=0.8} } }, effects = { @@ -89,7 +111,8 @@ data:extend({ time = 6 }, prerequisites = {"nullius-geology-1"}, - ignore_tech_cost_multiplier = true + ignore_tech_cost_multiplier = true, + essential = true }, { @@ -98,7 +121,7 @@ data:extend({ order = "nullius-bd", icon = "__base__/graphics/technology/steel-processing.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -131,7 +154,7 @@ data:extend({ order = "nullius-bd", icon = "__base__/graphics/technology/fluid-handling.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -159,7 +182,7 @@ data:extend({ name = "nullius-water-filtration-1", order = "nullius-bd", icon_size = 256, - icon = "__angelsrefining__/graphics/technology/water-treatment.png", + icon = "__angelsrefininggraphics__/graphics/technology/water-treatment.png", effects = { { type = "unlock-recipe", @@ -185,7 +208,7 @@ data:extend({ order = "nullius-be", icon = "__base__/graphics/technology/steel-processing.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -214,7 +237,7 @@ data:extend({ order = "nullius-be", icon = "__base__/graphics/technology/steel-axe.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-mining-speed", @@ -238,7 +261,7 @@ data:extend({ name = "nullius-masonry-1", order = "nullius-be", icon_size = 64, - icon_mipmaps = 4, + icon = "__base__/graphics/icons/stone.png", effects = { { @@ -267,7 +290,7 @@ data:extend({ name = "nullius-electrolysis-1", order = "nullius-be", icon_size = 128, - icon = "__angelspetrochem__/graphics/technology/electrolyser-tech.png", + icon = "__angelspetrochemgraphics__/graphics/technology/electrolyser-tech.png", effects = { { type = "unlock-recipe", @@ -314,7 +337,7 @@ data:extend({ name = "nullius-storage-1", order = "nullius-be", icon_size = 64, - icon_mipmaps = 4, + icon = "__base__/graphics/icons/iron-chest.png", effects = { { @@ -341,7 +364,7 @@ data:extend({ order = "nullius-bf", icon = "__base__/graphics/technology/fluid-handling.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -374,7 +397,7 @@ data:extend({ order = "nullius-bf", icon = "__base__/graphics/technology/stone-wall.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -407,7 +430,7 @@ data:extend({ order = "nullius-bf", icon = "__base__/graphics/technology/steel-axe.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-crafting-speed", @@ -430,7 +453,7 @@ data:extend({ type = "technology", name = "nullius-carbon-sequestration-1", order = "nullius-bf", - icon = "__angelspetrochem__/graphics/icons/molecules/methane.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/methane.png", icon_size = 72, effects = { { @@ -456,9 +479,9 @@ data:extend({ name = "nullius-venting-1", order = "nullius-bg", icons = {{ - icon = "__angelspetrochem__/graphics/technology/flare-stack-tech.png", + icon = "__angelspetrochemgraphics__/graphics/technology/flare-stack-tech.png", icon_size = 256, - icon_mipmaps = 4 + }}, effects = { { @@ -484,7 +507,7 @@ data:extend({ order = "nullius-bg", icon = "__base__/graphics/technology/advanced-material-processing.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -505,7 +528,7 @@ data:extend({ order = "nullius-bg", icon = "__base__/graphics/technology/plastics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -530,7 +553,7 @@ data:extend({ order = "nullius-bg", icon = "__base__/graphics/icons/coal-dark-background.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -556,7 +579,7 @@ data:extend({ order = "nullius-bh", icon = "__base__/graphics/technology/landfill.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -581,7 +604,7 @@ data:extend({ order = "nullius-bh", icon = "__base__/graphics/technology/electric-engine.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -647,15 +670,15 @@ data:extend({ { icon = "__base__/graphics/technology/automation-science-pack.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/iron-gear-wheel.png", icon_size = 64, - icon_mipmaps = 4, - scale = 1.6, - shift = {0, 40}, - tint = {r=0.6, g=1, b=1, a=0.5} + + scale = 0.9, + shift = {0, 20}, + tint = {r=0.6, g=1, b=1, a=0.7} } }, effects = { @@ -670,7 +693,8 @@ data:extend({ time = 8 }, prerequisites = {"nullius-electromagnetism-1", "nullius-metallurgy-1"}, - ignore_tech_cost_multiplier = true + ignore_tech_cost_multiplier = true, + essential = true }, { @@ -679,7 +703,7 @@ data:extend({ order = "nullius-cc", icon = "__base__/graphics/technology/oil-processing.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -700,7 +724,7 @@ data:extend({ order = "nullius-cc", icon = "__base__/graphics/technology/electric-energy-distribution-1.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -720,7 +744,7 @@ data:extend({ name = "nullius-mining-1", order = "nullius-cc", icon_size = 64, - icon_mipmaps = 4, + icon = "__base__/graphics/icons/burner-mining-drill.png", effects = { { @@ -746,7 +770,7 @@ data:extend({ order = "nullius-cc", icon = "__base__/graphics/technology/fast-inserter.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -767,7 +791,7 @@ data:extend({ order = "nullius-cc", icon = "__base__/graphics/technology/logistics-1.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -791,7 +815,7 @@ data:extend({ name = "nullius-pumping-1", order = "nullius-cc", icon_size = 64, - icon_mipmaps = 4, + icon = "__base__/graphics/icons/pump.png", effects = { { @@ -821,7 +845,7 @@ data:extend({ order = "nullius-cc", icon = "__base__/graphics/technology/steel-axe.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-mining-speed", @@ -868,11 +892,11 @@ data:extend({ { type = "technology", name = "nullius-automation", - localised_name = {"", {"technology-name.nullius-automation"}, " ", 1}, + localised_name = {"", {"technology-name.nullius-automation"}, " ", tostring(1)}, order = "nullius-cd", icon = "__base__/graphics/technology/automation-1.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -893,7 +917,7 @@ data:extend({ order = "nullius-cd", icon = "__base__/graphics/icons/oil-refinery.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -912,9 +936,8 @@ data:extend({ type = "technology", name = "nullius-metalworking-1", order = "nullius-cd", - icon = "__angelssmelting__/graphics/technology/induction-furnace-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/induction-furnace-tech.png", icon_size = 256, - icon_mipmaps = 2, effects = { { type = "unlock-recipe", @@ -936,7 +959,7 @@ data:extend({ order = "nullius-ce", icon = "__base__/graphics/technology/steel-processing.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -960,7 +983,7 @@ data:extend({ name = "nullius-mineral-processing-1", order = "nullius-ce", icon_size = 256, - icon = "__angelsrefining__/graphics/technology/ore-sorting.png", + icon = "__angelsrefininggraphics__/graphics/technology/ore-sorting.png", effects = { { type = "unlock-recipe", @@ -988,7 +1011,7 @@ data:extend({ name = "nullius-electrolysis-2", order = "nullius-ce", icon_size = 128, - icon = "__angelspetrochem__/graphics/technology/electrolyser-tech.png", + icon = "__angelspetrochemgraphics__/graphics/technology/electrolyser-tech.png", effects = { { type = "unlock-recipe", @@ -1016,7 +1039,7 @@ data:extend({ name = "nullius-water-filtration-2", order = "nullius-ce", icon_size = 256, - icon = "__angelsrefining__/graphics/technology/water-treatment.png", + icon = "__angelsrefininggraphics__/graphics/technology/water-treatment.png", effects = { { type = "unlock-recipe", @@ -1041,7 +1064,7 @@ data:extend({ name = "nullius-air-filtration-1", order = "nullius-cf", icon_size = 128, - icon = "__angelspetrochem__/graphics/technology/air-filter-tech.png", + icon = "__angelspetrochemgraphics__/graphics/technology/air-filter-tech.png", effects = { { type = "unlock-recipe", @@ -1062,7 +1085,7 @@ data:extend({ order = "nullius-cf", icon = "__base__/graphics/technology/steel-processing.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -1094,7 +1117,7 @@ data:extend({ name = "nullius-mechanical-separation", order = "nullius-cf", icon_size = 64, - icon_mipmaps = 4, + icon = "__base__/graphics/icons/splitter.png", effects = { { @@ -1115,7 +1138,7 @@ data:extend({ name = "nullius-flotation-1", order = "nullius-cf", icon_size = 256, - icon = "__angelsrefining__/graphics/technology/hydro-refining.png", + icon = "__angelsrefininggraphics__/graphics/technology/hydro-refining.png", effects = { { type = "unlock-recipe", @@ -1135,7 +1158,7 @@ data:extend({ name = "nullius-energy-storage-1", order = "nullius-cf", icon_size = 64, - icon_mipmaps = 4, + icon = "__base__/graphics/icons/steam-turbine.png", effects = { { @@ -1166,7 +1189,7 @@ data:extend({ order = "nullius-cg", icon = "__base__/graphics/technology/landfill.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -1195,7 +1218,7 @@ data:extend({ order = "nullius-cg", icon = "__base__/graphics/technology/steel-axe.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-mining-speed", @@ -1218,9 +1241,9 @@ data:extend({ type = "technology", name = "nullius-silica-processing-1", order = "nullius-cg", - icon = "__angelssmelting__/graphics/icons/powder-silica.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-silica.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -1243,9 +1266,9 @@ data:extend({ type = "technology", name = "nullius-iron-smelting-2", order = "nullius-cg", - icon = "__angelssmelting__/graphics/technology/smelting-iron-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/smelting-iron-tech.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -1297,9 +1320,9 @@ data:extend({ type = "technology", name = "nullius-illumination-1", order = "nullius-ch", - icon = "__base__/graphics/technology/optics.png", + icon = "__base__/graphics/technology/lamp.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -1324,7 +1347,7 @@ data:extend({ order = "nullius-ch", icon = "__base__/graphics/technology/fluid-handling.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -1360,7 +1383,7 @@ data:extend({ name = "nullius-chemical-engineering-1", order = "nullius-ch", icon_size = 128, - icon = "__angelspetrochem__/graphics/technology/chemical-plant-tech.png", + icon = "__angelspetrochemgraphics__/graphics/technology/chemical-plant-tech.png", effects = { { type = "unlock-recipe", @@ -1380,7 +1403,7 @@ data:extend({ name = "nullius-masonry-3", order = "nullius-ch", icon_size = 32, - icon = "__angelssmelting__/graphics/icons/silicon-crucible.png", + icon = "__angelssmeltinggraphics__/graphics/icons/silicon-crucible.png", effects = { { type = "unlock-recipe", @@ -1509,7 +1532,7 @@ data:extend({ order = "nullius-ci", icon = "__base__/graphics/technology/advanced-material-processing.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -1557,7 +1580,7 @@ data:extend({ name = "nullius-storage-2", order = "nullius-cj", icon_size = 64, - icon_mipmaps = 4, + icon = "__base__/graphics/icons/steel-chest.png", effects = { { @@ -1584,11 +1607,11 @@ data:extend({ { type = "technology", name = "nullius-aluminum-production", - localised_name = {"", {"technology-name.nullius-aluminum-production"}, " ", 1}, + localised_name = {"", {"technology-name.nullius-aluminum-production"}, " ", tostring(1)}, order = "nullius-cj", - icon = "__angelssmelting__/graphics/technology/smelting-aluminium-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/smelting-aluminium-tech.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -1621,7 +1644,7 @@ data:extend({ order = "nullius-cj", icon = "__base__/graphics/technology/armor-making.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -1644,9 +1667,9 @@ data:extend({ type = "technology", name = "nullius-silicon-production-1", order = "nullius-cj", - icon = "__angelssmelting__/graphics/technology/smelting-silicon-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/smelting-silicon-tech.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -1672,7 +1695,7 @@ data:extend({ order = "nullius-ck", icon = "__base__/graphics/technology/automation-1.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -1692,7 +1715,7 @@ data:extend({ name = "nullius-barreling-1", order = "nullius-ck", icon_size = 128, - icon = "__angelsrefining__/graphics/technology/barrel-tech.png", + icon = "__angelsrefininggraphics__/graphics/technology/barrel-tech.png", effects = { { type = "unlock-recipe", @@ -1720,7 +1743,7 @@ data:extend({ order = "nullius-ck", icon = "__base__/graphics/technology/lubricant.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -1743,7 +1766,7 @@ data:extend({ name = "nullius-aluminum-working-1", order = "nullius-ck", icon_size = 32, - icon = "__angelssmelting__/graphics/icons/plate-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/plate-aluminium.png", effects = { { type = "unlock-recipe", @@ -1774,7 +1797,7 @@ data:extend({ type = "technology", name = "nullius-insulation-1", order = "nullius-ck", - icon = "__angelssmelting__/graphics/icons/wire-coil-tin.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-coil-tin.png", icon_size = 64, effects = { { @@ -1803,7 +1826,7 @@ data:extend({ order = "nullius-cl", icon = "__base__/graphics/technology/railway.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -1819,7 +1842,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "nullius-empty-canister" + recipe = "nullius-canister" }, { type = "unlock-recipe", @@ -1844,7 +1867,7 @@ data:extend({ order = "nullius-cl", icon = "__base__/graphics/technology/electronics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -1902,24 +1925,24 @@ data:extend({ ignore_tech_cost_multiplier = true }, - { - type = "technology", - name = "nullius-chirality-1", - localised_description = {"", {"technology-description.nullius-chirality", 1, - {"technology-description.nullius-chirality-1"}}, "\n", - {"technology-description.nullius-checkpoint-mirror"}}, - order = "nullius-cm", - icon_size = 254, - icon = TECHPATH .. "chiral.png", - effects = { }, - unit = { - count = 10, - ingredients = {{"nullius-climatology-pack", 1}, {"nullius-mechanical-pack", 1}}, - time = 6 - }, - prerequisites = {"nullius-boiling-1", "long-inserters-1"}, - ignore_tech_cost_multiplier = true - }, + -- { + -- type = "technology", + -- name = "nullius-chirality-1", + -- localised_description = {"", {"technology-description.nullius-chirality", tostring(1), + -- {"technology-description.nullius-chirality-1"}}, "\n", + -- {"technology-description.nullius-checkpoint-mirror"}}, + -- order = "nullius-cm", + -- icon_size = 254, + -- icon = TECHPATH .. "chiral.png", + -- effects = { }, + -- unit = { + -- count = 10, + -- ingredients = {{"nullius-climatology-pack", 1}, {"nullius-mechanical-pack", 1}}, + -- time = 6 + -- }, + -- prerequisites = {"nullius-boiling-1", "bob-long-inserters-1"}, + -- ignore_tech_cost_multiplier = true + -- }, { type = "technology", name = "nullius-solar-thermal-power-1", @@ -1947,7 +1970,7 @@ data:extend({ order = "nullius-cm", icon = "__base__/graphics/technology/automobilism.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -1968,7 +1991,7 @@ data:extend({ order = "nullius-cm", icon = "__base__/graphics/technology/automation-1.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2029,7 +2052,7 @@ data:extend({ order = "nullius-cn", icon = "__base__/graphics/icons/steam-turbine.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2048,21 +2071,21 @@ data:extend({ { type = "technology", name = "nullius-electrical-engineering", - localised_name = {"", {"technology-name.nullius-electrical-engineering"}, " ", 1}, + localised_name = {"", {"technology-name.nullius-electrical-engineering"}, " ", tostring(1)}, order = "nullius-db", icons = { { icon = "__base__/graphics/technology/production-science-pack.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/processing-unit.png", icon_size = 64, - icon_mipmaps = 4, - scale = 1.1, - shift = {0, 34}, - tint = {r=1, g=1, b=1, a=0.5} + + scale = 0.7, + shift = {0, 20}, + tint = {r=1, g=1, b=1, a=0.8} } }, effects = { @@ -2077,7 +2100,8 @@ data:extend({ time = 4 }, prerequisites = {"nullius-electronics-1", "nullius-checkpoint-mass-production"}, - ignore_tech_cost_multiplier = true + ignore_tech_cost_multiplier = true, + essential = true }, { @@ -2086,7 +2110,7 @@ data:extend({ order = "nullius-dc", icon = "__base__/graphics/technology/personal-laser-defense-equipment.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-mining-speed", @@ -2113,7 +2137,7 @@ data:extend({ order = "nullius-dc", icon = "__base__/graphics/technology/electric-energy-distribution-1.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2145,16 +2169,12 @@ data:extend({ order = "nullius-dc", icon = "__base__/graphics/technology/fast-inserter.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", recipe = "nullius-inserter-2" }, - { - type = "unlock-recipe", - recipe = "nullius-filter-inserter-2" - } }, unit = { count = 10, @@ -2164,7 +2184,7 @@ data:extend({ ingredients = {{"nullius-mechanical-pack", 1}, {"nullius-electrical-pack", 1}}, time = 10 }, - prerequisites = {"nullius-electrical-engineering", "nullius-chirality-1"}, + prerequisites = {"nullius-electrical-engineering", "nullius-boiling-1", "bob-long-inserters-1"}, ignore_tech_cost_multiplier = true }, { @@ -2173,7 +2193,7 @@ data:extend({ order = "nullius-dc", icon = "__base__/graphics/technology/electric-engine.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2196,7 +2216,7 @@ data:extend({ order = "nullius-dc", icon = "__base__/graphics/technology/research-speed.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2220,7 +2240,7 @@ data:extend({ name = "nullius-pumping-2", order = "nullius-dd", icon_size = 64, - icon_mipmaps = 4, + icon = "__base__/graphics/icons/pump.png", effects = { { @@ -2251,15 +2271,15 @@ data:extend({ { icon = "__base__/graphics/technology/utility-science-pack.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/stone.png", icon_size = 64, - icon_mipmaps = 4, - scale = 1.6, - shift = {0, 36}, - tint = {r=0.6, g=0.4, b=0.2, a=0.5} + + scale = 0.8, + shift = {0, 20}, + tint = {r=0.6, g=0.4, b=0.2, a=0.8} } }, effects = { @@ -2275,14 +2295,15 @@ data:extend({ {"nullius-mechanical-pack", 1}, {"nullius-electrical-pack", 1}}, time = 15 }, - prerequisites = {"nullius-checkpoint-lab"} + prerequisites = {"nullius-checkpoint-lab"}, + essential = true }, { type = "technology", name = "nullius-signal-processing", order = "nullius-dd", icon_size = 64, - icon_mipmaps = 4, + icon = "__base__/graphics/icons/red-wire.png", effects = { { @@ -2310,7 +2331,7 @@ data:extend({ order = "nullius-dd", icon = "__base__/graphics/technology/logistics-2.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2341,7 +2362,7 @@ data:extend({ name = "nullius-maintenance", order = "nullius-de", icon_size = 64, - icon_mipmaps = 4, + icon = "__base__/graphics/icons/repair-pack.png", effects = { { @@ -2379,7 +2400,7 @@ data:extend({ order = "nullius-de", icon = "__base__/graphics/technology/circuit-network.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2392,7 +2413,11 @@ data:extend({ { type = "unlock-recipe", recipe = "nullius-green-wire" - } + }, + { + type = "unlock-recipe", + recipe = "nullius-display-panel" + }, }, unit = { count = 25, @@ -2409,7 +2434,7 @@ data:extend({ name = "nullius-electrolysis-3", order = "nullius-de", icon_size = 128, - icon = "__angelspetrochem__/graphics/technology/electrolyser-tech.png", + icon = "__angelspetrochemgraphics__/graphics/technology/electrolyser-tech.png", effects = { { type = "unlock-recipe", @@ -2439,7 +2464,7 @@ data:extend({ order = "nullius-de", icon = "__base__/graphics/technology/mining-productivity.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2504,7 +2529,7 @@ data:extend({ order = "nullius-de", icon = "__base__/graphics/technology/automated-rail-transportation.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2532,7 +2557,7 @@ data:extend({ order = "nullius-de", icon = "__base__/graphics/technology/automation-2.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2559,7 +2584,7 @@ data:extend({ order = "nullius-de", icon = "__base__/graphics/icons/discharge-defense-equipment-controller.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2582,7 +2607,7 @@ data:extend({ type = "technology", name = "nullius-aesthetics-1", order = "nullius-df", - icons = data.raw["selection-tool"]["nullius-rock-picker"].icons, + icons = data.raw["selection-tool"]["nullius-rock-picker"].icons, effects = { { type = "unlock-recipe", @@ -2603,9 +2628,9 @@ data:extend({ type = "technology", name = "nullius-traffic-control", order = "nullius-df", - icon = "__base__/graphics/technology/rail-signals.png", + icon = TECHPATH .. "rail-signals.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2633,7 +2658,7 @@ data:extend({ order = "nullius-df", icon = "__base__/graphics/technology/robotics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2672,7 +2697,7 @@ data:extend({ order = "nullius-df", icon = "__base__/graphics/technology/module.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2697,7 +2722,7 @@ data:extend({ name = "nullius-mineral-processing-2", order = "nullius-df", icon_size = 256, - icon = "__angelsrefining__/graphics/technology/ore-sorting.png", + icon = "__angelsrefininggraphics__/graphics/technology/ore-sorting.png", effects = { { type = "unlock-recipe", @@ -2723,7 +2748,7 @@ data:extend({ name = "nullius-energy-storage-2", order = "nullius-df", icon_size = 128, - icon = "__angelsrefining__/graphics/technology/thermal-extractor.png", + icon = "__angelsrefininggraphics__/graphics/technology/thermal-extractor.png", effects = { { type = "unlock-recipe", @@ -2771,7 +2796,7 @@ data:extend({ order = "nullius-dg", icon = "__base__/graphics/technology/oil-gathering.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2794,16 +2819,16 @@ data:extend({ order = "nullius-dg", icon = "__base__/graphics/technology/construction-robotics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", recipe = "nullius-construction-bot-1" }, - { - type = "ghost-time-to-live", - modifier = 60 * 60 * 60 * 2 - } + -- { + -- type = "ghost-time-to-live", + -- modifier = 60 * 60 * 60 * 2 + -- } }, unit = { count = 100, @@ -2850,7 +2875,7 @@ data:extend({ name = "nullius-limestone-processing-1", order = "nullius-dg", icon_size = 32, - icon = "__angelsrefining__/graphics/icons/solid-limestone.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-limestone.png", effects = { { type = "unlock-recipe", @@ -2871,9 +2896,9 @@ data:extend({ type = "technology", name = "nullius-silica-processing-2", order = "nullius-dg", - icon = "__angelssmelting__/graphics/icons/powder-silica.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-silica.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2894,7 +2919,7 @@ data:extend({ type = "technology", name = "nullius-nitrogen-chemistry-1", order = "nullius-dg", - icons = data.raw.technology["angels-nitrogen-processing-1"].icons, + icons = angelsLegacy.functions.create_gas_tech_icon("NNN"), effects = { { type = "unlock-recipe", @@ -2919,9 +2944,8 @@ data:extend({ type = "technology", name = "nullius-metalworking-2", order = "nullius-dg", - icon = "__angelssmelting__/graphics/technology/induction-furnace-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/induction-furnace-tech.png", icon_size = 256, - icon_mipmaps = 2, effects = { { type = "unlock-recipe", @@ -2964,7 +2988,7 @@ data:extend({ order = "nullius-dg", icon = "__base__/graphics/technology/module.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -2991,7 +3015,7 @@ data:extend({ order = "nullius-dh", icon = "__base__/graphics/technology/effect-transmission.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -3015,15 +3039,15 @@ data:extend({ { icon = "__base__/graphics/technology/chemical-science-pack.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, - icon_mipmaps = 4, - scale = 1.8, - shift = {0, 34}, - tint = {r=1, g=1, b=1, a=0.5} + + scale = 1, + shift = {0, 20}, + tint = {r=1, g=1, b=1, a=0.8} } }, effects = { @@ -3040,7 +3064,8 @@ data:extend({ }, time = 30 }, - prerequisites = {"nullius-checkpoint-volcanic-gas", "nullius-nitrogen-chemistry-1"} + prerequisites = {"nullius-checkpoint-volcanic-gas", "nullius-nitrogen-chemistry-1"}, + essential = true }, { type = "technology", @@ -3048,7 +3073,7 @@ data:extend({ order = "nullius-dh", icon = "__base__/graphics/technology/exoskeleton-equipment.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-running-speed", @@ -3072,9 +3097,9 @@ data:extend({ type = "technology", name = "nullius-glassmaking-1", order = "nullius-dh", - icon = "__angelssmelting__/graphics/technology/glass-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/glass-tech.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -3097,7 +3122,7 @@ data:extend({ order = "nullius-dh", icon = "__base__/graphics/technology/concrete.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -3127,7 +3152,7 @@ data:extend({ name = "nullius-weaving-1", order = "nullius-dh", icon_size = 32, - icon = "__angelssmelting__/graphics/icons/wire-silver.png", + icon = "__angelssmeltinggraphics__/graphics/icons/wire-silver.png", effects = { { type = "unlock-recipe", @@ -3153,7 +3178,7 @@ data:extend({ name = "nullius-water-filtration-3", order = "nullius-dh", icon_size = 256, - icon = "__angelsrefining__/graphics/technology/water-treatment.png", + icon = "__angelsrefininggraphics__/graphics/technology/water-treatment.png", effects = { { type = "unlock-recipe", @@ -3183,7 +3208,7 @@ data:extend({ name = "nullius-geothermal-power-1", order = "nullius-di", icon_size = 64, - icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", + icon = "__angelssmeltinggraphics__/graphics/icons/chemical-furnace.png", effects = { { type = "unlock-recipe", @@ -3210,7 +3235,7 @@ data:extend({ order = "nullius-di", icon = "__base__/graphics/technology/logistic-robotics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -3245,7 +3270,7 @@ data:extend({ order = "nullius-di", icon = "__base__/graphics/technology/landfill.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -3268,7 +3293,7 @@ data:extend({ order = "nullius-di", icon = "__base__/graphics/technology/solar-energy.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -3290,7 +3315,7 @@ data:extend({ name = "nullius-sensors-2", order = "nullius-di", icon_size = 64, - icon_mipmaps = 4, + icon = "__base__/graphics/icons/radar.png", effects = { { @@ -3337,7 +3362,7 @@ data:extend({ order = "nullius-dj", icon = "__base__/graphics/technology/oil-processing.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -3364,7 +3389,7 @@ data:extend({ order = "nullius-dj", icon = "__base__/graphics/technology/automation-2.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -3391,7 +3416,7 @@ data:extend({ type = "technology", name = "nullius-sulfur-processing-1", order = "nullius-dj", - icons = data.raw.technology["angels-sulfur-processing-1"].icons, + icons = angelsLegacy.functions.create_gas_tech_icon("SSS"), effects = { { type = "unlock-recipe", @@ -3422,7 +3447,7 @@ data:extend({ order = "nullius-dj", icon = "__base__/graphics/technology/electric-energy-distribution-2.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -3448,7 +3473,7 @@ data:extend({ name = "nullius-air-filtration-2", order = "nullius-dj", icon_size = 128, - icon = "__angelspetrochem__/graphics/technology/air-filter-tech.png", + icon = "__angelspetrochemgraphics__/graphics/technology/air-filter-tech.png", effects = { { type = "unlock-recipe", @@ -3475,7 +3500,7 @@ data:extend({ name = "nullius-flotation-2", order = "nullius-dk", icon_size = 256, - icon = "__angelsrefining__/graphics/technology/hydro-refining.png", + icon = "__angelsrefininggraphics__/graphics/technology/hydro-refining.png", effects = { { type = "unlock-recipe", @@ -3498,7 +3523,7 @@ data:extend({ order = "nullius-dk", icon = "__base__/graphics/technology/night-vision-equipment.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -3529,7 +3554,7 @@ data:extend({ order = "nullius-dk", icon = "__base__/graphics/technology/logistic-system.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -3573,7 +3598,7 @@ data:extend({ name = "nullius-barreling-2", order = "nullius-dk", icon_size = 128, - icon = "__angelsrefining__/graphics/technology/barrel-tech.png", + icon = "__angelsrefininggraphics__/graphics/technology/barrel-tech.png", effects = { { type = "unlock-recipe", @@ -3581,7 +3606,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-air-barrel" + recipe = "nullius-air-barrel" }, { type = "unlock-recipe", @@ -3589,7 +3614,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-residual-gas-barrel" + recipe = "nullius-residual-gas-barrel" }, { type = "unlock-recipe", @@ -3597,7 +3622,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-trace-gas-barrel" + recipe = "nullius-trace-gas-barrel" }, { type = "unlock-recipe", @@ -3605,7 +3630,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-volcanic-gas-barrel" + recipe = "nullius-volcanic-gas-barrel" }, { type = "unlock-recipe", @@ -3613,7 +3638,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-nitrogen-barrel" + recipe = "nullius-nitrogen-barrel" }, { type = "unlock-recipe", @@ -3621,7 +3646,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-argon-barrel" + recipe = "nullius-argon-barrel" }, { type = "unlock-recipe", @@ -3629,7 +3654,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-helium-barrel" + recipe = "nullius-helium-barrel" }, { type = "unlock-recipe", @@ -3637,7 +3662,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-carbon-dioxide-barrel" + recipe = "nullius-carbon-dioxide-barrel" }, { type = "unlock-recipe", @@ -3645,7 +3670,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-carbon-monoxide-barrel" + recipe = "nullius-carbon-monoxide-barrel" }, { type = "unlock-recipe", @@ -3653,7 +3678,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-methane-barrel" + recipe = "nullius-methane-barrel" }, { type = "unlock-recipe", @@ -3661,7 +3686,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-ethylene-barrel" + recipe = "nullius-ethylene-barrel" }, { type = "unlock-recipe", @@ -3669,7 +3694,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-propene-barrel" + recipe = "nullius-propene-barrel" }, { type = "unlock-recipe", @@ -3677,7 +3702,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-butadiene-barrel" + recipe = "nullius-butadiene-barrel" }, { type = "unlock-recipe", @@ -3685,7 +3710,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-hydrogen-barrel" + recipe = "nullius-hydrogen-barrel" }, { type = "unlock-recipe", @@ -3693,7 +3718,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-deuterium-barrel" + recipe = "nullius-deuterium-barrel" }, { type = "unlock-recipe", @@ -3701,7 +3726,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-tritium-barrel" + recipe = "nullius-tritium-barrel" }, { type = "unlock-recipe", @@ -3709,7 +3734,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-oxygen-barrel" + recipe = "nullius-oxygen-barrel" }, { type = "unlock-recipe", @@ -3717,7 +3742,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-hydrogen-chloride-barrel" + recipe = "nullius-hydrogen-chloride-barrel" }, { type = "unlock-recipe", @@ -3725,7 +3750,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-sulfur-dioxide-barrel" + recipe = "nullius-sulfur-dioxide-barrel" }, { type = "unlock-recipe", @@ -3733,7 +3758,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-ammonia-barrel" + recipe = "nullius-ammonia-barrel" }, { type = "unlock-recipe", @@ -3755,7 +3780,7 @@ data:extend({ name = "nullius-chemical-engineering-2", order = "nullius-dk", icon_size = 128, - icon = "__angelspetrochem__/graphics/technology/chemical-plant-tech.png", + icon = "__angelspetrochemgraphics__/graphics/technology/chemical-plant-tech.png", effects = { { type = "unlock-recipe", @@ -3778,7 +3803,7 @@ data:extend({ order = "nullius-dk", icon = "__base__/graphics/technology/braking-force.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "train-braking-force-bonus", @@ -3828,7 +3853,7 @@ data:extend({ order = "nullius-dl", icon = "__base__/graphics/technology/steel-axe.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-mining-speed", @@ -3859,7 +3884,7 @@ data:extend({ order = "nullius-dl", icon = "__base__/graphics/technology/fluid-handling.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -3892,32 +3917,32 @@ data:extend({ }, prerequisites = {"nullius-barreling-2", "nullius-sulfur-processing-1"} }, - { - type = "technology", - name = "nullius-chirality-2", - localised_description = {"technology-description.nullius-chirality", 2, - {"technology-description.nullius-chirality-2"}}, - order = "nullius-dl", - icon_size = 254, - icon = TECHPATH .. "chiral.png", - effects = { }, - unit = { - count = 160, - ingredients = { - {"nullius-climatology-pack", 1}, - {"nullius-mechanical-pack", 1}, {"nullius-electrical-pack", 1} - }, - time = 30 - }, - prerequisites = {"nullius-empiricism-2", "nullius-flotation-2"} - }, + -- { + -- type = "technology", + -- name = "nullius-chirality-2", + -- localised_description = {"technology-description.nullius-chirality", tostring(2), + -- {"technology-description.nullius-chirality-2"}}, + -- order = "nullius-dl", + -- icon_size = 254, + -- icon = TECHPATH .. "chiral.png", + -- effects = { }, + -- unit = { + -- count = 160, + -- ingredients = { + -- {"nullius-climatology-pack", 1}, + -- {"nullius-mechanical-pack", 1}, {"nullius-electrical-pack", 1} + -- }, + -- time = 30 + -- }, + -- prerequisites = {"nullius-empiricism-2", "nullius-flotation-2"} + -- }, { type = "technology", name = "nullius-explosives-1", order = "nullius-dg", icon = "__base__/graphics/technology/explosives.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -3925,11 +3950,15 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-chlorine-barrel" + recipe = "nullius-chlorine-barrel" }, { type = "unlock-recipe", recipe = "empty-nullius-chlorine-barrel" + }, + { + type = "cliff-deconstruction-enabled", + modifier = true } }, unit = { @@ -3948,7 +3977,7 @@ data:extend({ order = "nullius-dl", icon = "__base__/graphics/technology/worker-robots-speed.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "worker-robot-speed", @@ -3972,7 +4001,7 @@ data:extend({ order = "nullius-dl", icon = "__base__/graphics/technology/discharge-defense-equipment.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-reach-distance", @@ -4019,7 +4048,7 @@ data:extend({ order = "nullius-dl", icon = "__base__/graphics/technology/research-speed.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "laboratory-speed", @@ -4040,11 +4069,11 @@ data:extend({ { type = "technology", name = "nullius-experimental-chemistry", - localised_name = {"", {"technology-name.nullius-experimental-chemistry"}, " ", 1}, + localised_name = {"", {"technology-name.nullius-experimental-chemistry"}, " ", tostring(1)}, order = "nullius-eb", icon = "__base__/graphics/technology/logistic-science-pack.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -4059,7 +4088,8 @@ data:extend({ }, time = 30 }, - prerequisites = {"nullius-plumbing-4", "nullius-chirality-2", "nullius-checkpoint-chemical-engineering"} + prerequisites = {"nullius-plumbing-4", "nullius-empiricism-2", "nullius-flotation-2", "nullius-checkpoint-chemical-engineering"}, + essential = true }, { @@ -4067,7 +4097,7 @@ data:extend({ name = "nullius-metallurgy-3", order = "nullius-ec", icon_size = 64, - icon_mipmaps = 4, + icon = "__base__/graphics/icons/electric-furnace.png", effects = { { @@ -4095,7 +4125,7 @@ data:extend({ name = "nullius-sodium-processing", order = "nullius-ec", icon_size = 128, - icon = "__angelspetrochem__/graphics/technology/sodium-tech.png", + icon = "__angelspetrochemgraphics__/graphics/technology/sodium-tech.png", effects = { { type = "unlock-recipe", @@ -4161,13 +4191,13 @@ data:extend({ }, time = 30 }, - prerequisites = {"nullius-experimental-chemistry", "nullius-checkpoint-chirality"}, + prerequisites = {"nullius-experimental-chemistry", "nullius-empiricism-2", "nullius-flotation-2"}, }, { type = "technology", name = "nullius-nitrogen-chemistry-2", - icons = data.raw.technology["angels-nitrogen-processing-1"].icons, + icons = angelsLegacy.functions.create_gas_tech_icon("NNN"), order = "nullius-ed", effects = { { @@ -4194,9 +4224,9 @@ data:extend({ type = "technology", name = "nullius-aluminum-production-2", order = "nullius-ed", - icon = "__angelssmelting__/graphics/technology/smelting-aluminium-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/smelting-aluminium-tech.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -4252,9 +4282,9 @@ data:extend({ type = "technology", name = "nullius-iron-smelting-3", order = "nullius-ed", - icon = "__angelssmelting__/graphics/technology/smelting-iron-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/smelting-iron-tech.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -4280,7 +4310,7 @@ data:extend({ type = "technology", name = "nullius-sulfur-processing-2", order = "nullius-ed", - icons = data.raw.technology["angels-sulfur-processing-1"].icons, + icons = angelsLegacy.functions.create_gas_tech_icon("SSS"), effects = { { type = "unlock-recipe", @@ -4315,7 +4345,7 @@ data:extend({ name = "nullius-nanotechnology-1", order = "nullius-ed", icon_size = 64, - icon = "__angelsrefining__/graphics/icons/crystallizer.png", + icon = "__angelsrefininggraphics__/graphics/icons/crystallizer.png", effects = { { type = "unlock-recipe", @@ -4340,7 +4370,7 @@ data:extend({ order = "nullius-ee", icon = "__base__/graphics/technology/research-speed.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "laboratory-speed", @@ -4363,7 +4393,7 @@ data:extend({ name = "nullius-limestone-processing-3", order = "nullius-ee", icon_size = 32, - icon = "__angelssmelting__/graphics/icons/solid-lime.png", + icon = "__angelssmeltinggraphics__/graphics/icons/solid-lime.png", effects = { { type = "unlock-recipe", @@ -4429,9 +4459,9 @@ data:extend({ name = "nullius-venting-2", order = "nullius-ee", icons = {{ - icon = "__angelspetrochem__/graphics/technology/flare-stack-tech.png", + icon = "__angelspetrochemgraphics__/graphics/technology/flare-stack-tech.png", icon_size = 256, - icon_mipmaps = 4 + }}, effects = { { @@ -4502,7 +4532,7 @@ data:extend({ order = "nullius-ee", icon = "__base__/graphics/technology/plastics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -4535,7 +4565,7 @@ data:extend({ order = "nullius-ef", icon = "__base__/graphics/technology/logistic-system.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -4564,11 +4594,11 @@ data:extend({ { type = "technology", name = "nullius-ceramics", - localised_name = {"", {"technology-name.nullius-ceramics"}, " ", 1}, + localised_name = {"", {"technology-name.nullius-ceramics"}, " ", tostring(1)}, order = "nullius-ef", - icon = "__angelssmelting__/graphics/icons/powder-platinum.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-platinum.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -4598,9 +4628,9 @@ data:extend({ type = "technology", name = "nullius-glassmaking-2", order = "nullius-ef", - icon = "__angelssmelting__/graphics/technology/glass-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/glass-tech.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -4631,7 +4661,7 @@ data:extend({ name = "nullius-titanium-production-1", order = "nullius-ef", icon_size = 32, - icon = "__angelssmelting__/graphics/icons/ore-rutile.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ore-rutile.png", effects = { { type = "unlock-recipe", @@ -4657,9 +4687,9 @@ data:extend({ type = "technology", name = "nullius-weaving-2", order = "nullius-ef", - icon = "__angelssmelting__/graphics/icons/roll-zinc.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-zinc.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -4691,7 +4721,7 @@ data:extend({ order = "nullius-ef", icon = "__base__/graphics/technology/steel-processing.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -4713,24 +4743,24 @@ data:extend({ }, prerequisites = {"nullius-metalworking-3"}, }, - { - type = "technology", - name = "nullius-chirality-3", - localised_description = {"technology-description.nullius-chirality", 3, - {"technology-description.nullius-chirality-3"}}, - order = "nullius-ef", - icon_size = 254, - icon = TECHPATH .. "chiral.png", - effects = { }, - unit = { - count = 200, - ingredients = { - {"nullius-mechanical-pack", 1}, {"nullius-chemical-pack", 1} - }, - time = 30 - }, - prerequisites = {"nullius-organic-chemistry-4", "nullius-limestone-processing-3", "nullius-empiricism-3"}, - }, + -- { + -- type = "technology", + -- name = "nullius-chirality-3", + -- localised_description = {"technology-description.nullius-chirality", tostring(3), + -- {"technology-description.nullius-chirality-3"}}, + -- order = "nullius-ef", + -- icon_size = 254, + -- icon = TECHPATH .. "chiral.png", + -- effects = { }, + -- unit = { + -- count = 200, + -- ingredients = { + -- {"nullius-mechanical-pack", 1}, {"nullius-chemical-pack", 1} + -- }, + -- time = 30 + -- }, + -- prerequisites = {"nullius-organic-chemistry-4", "nullius-limestone-processing-3", "nullius-empiricism-3"}, + -- }, { type = "technology", @@ -4738,7 +4768,7 @@ data:extend({ order = "nullius-eg", icon = "__base__/graphics/technology/braking-force.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "train-braking-force-bonus", @@ -4761,9 +4791,9 @@ data:extend({ type = "technology", name = "nullius-illumination-2", order = "nullius-eg", - icon = "__base__/graphics/technology/optics.png", + icon = "__base__/graphics/technology/lamp.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -4826,15 +4856,15 @@ data:extend({ }, time = 30 }, - prerequisites = {"nullius-venting-2", "nullius-titanium-production-1", "nullius-chirality-3"} + prerequisites = {"nullius-venting-2", "nullius-titanium-production-1", "nullius-organic-chemistry-4", "nullius-limestone-processing-3", "nullius-empiricism-3"} }, { type = "technology", name = "nullius-titanium-production-2", order = "nullius-eg", - icon = "__angelssmelting__/graphics/technology/smelting-titanium-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/smelting-titanium-tech.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -4866,7 +4896,7 @@ data:extend({ order = "nullius-eg", icon = "__base__/graphics/technology/battery.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -4889,7 +4919,7 @@ data:extend({ name = "nullius-organic-chemistry-5", order = "nullius-eg", icon_size = 32, - icon = "__angelspetrochem__/graphics/icons/solid-resin.png", + icon = "__angelspetrochemgraphics__/graphics/icons/solid-resin.png", effects = { { type = "unlock-recipe", @@ -4921,7 +4951,7 @@ data:extend({ }, time = 30 }, - prerequisites = {"nullius-chirality-3", "nullius-illumination-2"} + prerequisites = {"nullius-organic-chemistry-4", "nullius-limestone-processing-3", "nullius-empiricism-3", "nullius-illumination-2"} }, { type = "technology", @@ -4929,7 +4959,7 @@ data:extend({ order = "nullius-eg", icon = "__base__/graphics/technology/toolbelt.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-inventory-slots-bonus", @@ -5243,7 +5273,7 @@ data:extend({ order = "nullius-eh", icon = "__base__/graphics/technology/power-armor.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -5290,7 +5320,7 @@ data:extend({ order = "nullius-eh", icon = "__base__/graphics/technology/electric-energy-acumulators.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -5314,7 +5344,7 @@ data:extend({ order = "nullius-eh", icon = "__base__/graphics/technology/explosives.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -5340,9 +5370,9 @@ data:extend({ type = "technology", name = "nullius-composites-1", order = "nullius-eh", - icon = "__angelssmelting__/graphics/technology/smelting-zinc-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/smelting-zinc-tech.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -5682,7 +5712,7 @@ data:extend({ order = "nullius-ei", icon = "__base__/graphics/technology/robotics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -5719,7 +5749,7 @@ data:extend({ order = "nullius-ei", icon = "__base__/graphics/technology/solar-energy.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -5741,9 +5771,9 @@ data:extend({ type = "technology", name = "nullius-electronics-2", order = "nullius-ei", - icon = "__base__/graphics/technology/advanced-electronics.png", + icon = "__base__/graphics/technology/advanced-circuit.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -5752,6 +5782,10 @@ data:extend({ { type = "unlock-recipe", recipe = "nullius-optical-cable" + }, + { + type = "unlock-recipe", + recipe = "nullius-selector-circuit" } }, unit = { @@ -5771,7 +5805,7 @@ data:extend({ order = "nullius-ei", icon = "__base__/graphics/technology/concrete.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -5803,7 +5837,7 @@ data:extend({ order = "nullius-ei", icon = "__base__/graphics/technology/personal-laser-defense-equipment.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-mining-speed", @@ -5869,6 +5903,14 @@ data:extend({ type = "unlock-recipe", recipe = "nullius-unbox-arithmetic-circuit" }, + { + type = "unlock-recipe", + recipe = "nullius-box-display-panel" + }, + { + type = "unlock-recipe", + recipe = "nullius-unbox-display-panel" + }, { type = "unlock-recipe", recipe = "nullius-box-red-wire" @@ -6175,7 +6217,7 @@ data:extend({ order = "nullius-ej", icon = "__base__/graphics/technology/logistic-robotics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -6201,20 +6243,16 @@ data:extend({ type = "technology", name = "nullius-actuation-3", order = "nullius-ej", - icon = "__base__/graphics/technology/stack-inserter.png", + icon = "__base__/graphics/technology/bulk-inserter.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", recipe = "nullius-inserter-3" }, { - type = "unlock-recipe", - recipe = "nullius-filter-inserter-3" - }, - { - type = "stack-inserter-capacity-bonus", + type = "bulk-inserter-capacity-bonus", modifier = 1 } }, @@ -6234,7 +6272,7 @@ data:extend({ order = "nullius-ej", icon = "__base__/graphics/technology/electric-energy-distribution-1.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -6266,7 +6304,7 @@ data:extend({ order = "nullius-ej", icon = "__base__/graphics/technology/fluid-handling.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -6306,7 +6344,7 @@ data:extend({ order = "nullius-ej", icon = "__base__/graphics/technology/module.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -6337,7 +6375,7 @@ data:extend({ order = "nullius-ej", icon = "__base__/graphics/technology/military.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -6401,16 +6439,16 @@ data:extend({ order = "nullius-ek", icon = "__base__/graphics/technology/construction-robotics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", recipe = "nullius-construction-bot-2" }, - { - type = "ghost-time-to-live", - modifier = 60 * 60 * 60 * 10 - } + -- { + -- type = "ghost-time-to-live", + -- modifier = 60 * 60 * 60 * 10 + -- } }, unit = { count = 600, @@ -6630,14 +6668,6 @@ data:extend({ type = "unlock-recipe", recipe = "nullius-unbox-inserter-2" }, - { - type = "unlock-recipe", - recipe = "nullius-box-filter-inserter-2" - }, - { - type = "unlock-recipe", - recipe = "nullius-unbox-filter-inserter-2" - }, { type = "unlock-recipe", recipe = "nullius-box-inserter-3" @@ -6646,14 +6676,6 @@ data:extend({ type = "unlock-recipe", recipe = "nullius-unbox-inserter-3" }, - { - type = "unlock-recipe", - recipe = "nullius-box-filter-inserter-3" - }, - { - type = "unlock-recipe", - recipe = "nullius-unbox-filter-inserter-3" - }, { type = "unlock-recipe", recipe = "nullius-box-belt-1" @@ -6827,7 +6849,7 @@ data:extend({ order = "nullius-ek", icon = "__base__/graphics/technology/braking-force.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "train-braking-force-bonus", @@ -6852,7 +6874,7 @@ data:extend({ order = "nullius-ek", icon = "__base__/graphics/technology/logistics-3.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -6883,7 +6905,7 @@ data:extend({ name = "nullius-energy-storage-3", order = "nullius-ek", icon_size = 128, - icon = "__angelsrefining__/graphics/technology/thermal-extractor.png", + icon = "__angelsrefininggraphics__/graphics/technology/thermal-extractor.png", effects = { { type = "unlock-recipe", @@ -6933,9 +6955,9 @@ data:extend({ type = "technology", name = "nullius-titanium-working", order = "nullius-ek", - icon = "__angelssmelting__/graphics/icons/roll-titanium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-titanium.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -6961,9 +6983,9 @@ data:extend({ type = "technology", name = "nullius-insulation-2", order = "nullius-ek", - icon = "__angelssmelting__/graphics/icons/roll-manganese.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-manganese.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -6984,9 +7006,9 @@ data:extend({ type = "technology", name = "nullius-aluminum-working-2", order = "nullius-ek", - icon = "__angelssmelting__/graphics/icons/powder-aluminium.png", + icon = "__angelssmeltinggraphics__/graphics/icons/powder-aluminium.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -7028,7 +7050,7 @@ data:extend({ order = "nullius-el", icon = "__base__/graphics/technology/gate.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -7038,10 +7060,10 @@ data:extend({ type = "unlock-recipe", recipe = "nullius-gate" }, - { - type = "ghost-time-to-live", - modifier = 60 * 60 * 60 * 12 - } + -- { + -- type = "ghost-time-to-live", + -- modifier = 60 * 60 * 60 * 12 + -- } }, unit = { count = 700, @@ -7060,7 +7082,7 @@ data:extend({ order = "nullius-el", icon = "__base__/graphics/technology/railway.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -7119,10 +7141,10 @@ data:extend({ order = "nullius-el", icon = "__base__/graphics/technology/inserter-capacity.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { - type = "stack-inserter-capacity-bonus", + type = "bulk-inserter-capacity-bonus", modifier = 1 } }, @@ -7142,7 +7164,7 @@ data:extend({ order = "nullius-el", icon = "__base__/graphics/technology/productivity-module-2.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -7171,7 +7193,7 @@ data:extend({ order = "nullius-em", icon = "__base__/graphics/technology/advanced-material-processing-2.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -7446,7 +7468,7 @@ data:extend({ order = "nullius-em", icon = "__base__/graphics/technology/effect-transmission.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -7474,7 +7496,7 @@ data:extend({ order = "nullius-em", icon = "__base__/graphics/technology/tank.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -7736,6 +7758,14 @@ data:extend({ type = "unlock-recipe", recipe = "nullius-unbox-train-stop" }, + { + type = "unlock-recipe", + recipe = "nullius-box-selector-circuit" + }, + { + type = "unlock-recipe", + recipe = "nullius-unbox-selector-circuit" + }, { type = "unlock-recipe", recipe = "nullius-box-underground-belt-1" @@ -8018,7 +8048,7 @@ data:extend({ order = "nullius-en", icon = "__base__/graphics/technology/worker-robots-speed.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "worker-robot-speed", @@ -8042,7 +8072,7 @@ data:extend({ order = "nullius-en", icon = "__base__/graphics/technology/landfill.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -8077,7 +8107,7 @@ data:extend({ order = "nullius-en", icon = "__base__/graphics/technology/automation-2.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -8183,6 +8213,14 @@ data:extend({ type = "unlock-recipe", recipe = "nullius-boxed-arithmetic-circuit" }, + { + type = "unlock-recipe", + recipe = "nullius-boxed-display-panel" + }, + { + type = "unlock-recipe", + recipe = "nullius-boxed-selector-circuit" + }, { type = "unlock-recipe", recipe = "nullius-boxed-power-switch" @@ -8299,18 +8337,10 @@ data:extend({ type = "unlock-recipe", recipe = "nullius-boxed-inserter-2" }, - { - type = "unlock-recipe", - recipe = "nullius-boxed-filter-inserter-2" - }, { type = "unlock-recipe", recipe = "nullius-boxed-inserter-3" }, - { - type = "unlock-recipe", - recipe = "nullius-boxed-filter-inserter-3" - }, { type = "unlock-recipe", recipe = "nullius-boxed-repair-pack" @@ -8353,7 +8383,7 @@ data:extend({ order = "nullius-en", icon = "__base__/graphics/technology/braking-force.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "train-braking-force-bonus", @@ -8379,7 +8409,7 @@ data:extend({ order = "nullius-eo", icon = "__base__/graphics/technology/steel-axe.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-mining-speed", @@ -8407,7 +8437,7 @@ data:extend({ order = "nullius-eo", icon = "__base__/graphics/technology/exoskeleton-equipment.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-running-speed", @@ -8435,7 +8465,7 @@ data:extend({ order = "nullius-eo", icon = "__base__/graphics/technology/logistic-system.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -8471,10 +8501,10 @@ data:extend({ order = "nullius-eo", icon = "__base__/graphics/technology/inserter-capacity.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { - type = "stack-inserter-capacity-bonus", + type = "bulk-inserter-capacity-bonus", modifier = 1 } }, @@ -8523,7 +8553,7 @@ data:extend({ name = "nullius-geothermal-power-2", order = "nullius-eo", icon_size = 64, - icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", + icon = "__angelssmeltinggraphics__/graphics/icons/chemical-furnace.png", effects = { { type = "unlock-recipe", @@ -8548,9 +8578,9 @@ data:extend({ { type = "technology", name = "nullius-high-pressure-chemistry", - localised_name = {"", {"technology-name.nullius-high-pressure-chemistry"}, " ", 1}, + localised_name = {"", {"technology-name.nullius-high-pressure-chemistry"}, " ", tostring(1)}, order = "nullius-eo", - icons = angelsmods.functions.create_liquid_fluid_icon(nil, + icons = angelsLegacy.functions.create_liquid_fluid_icon(nil, {element_tint["carbon"], element_tint["oxygen"], element_tint["oxygen"]} ), effects = { @@ -8633,7 +8663,7 @@ data:extend({ order = "nullius-ep", icon = "__base__/graphics/technology/braking-force.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "train-braking-force-bonus", @@ -8658,7 +8688,7 @@ data:extend({ order = "nullius-ep", icon = "__base__/graphics/technology/research-speed.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -8682,7 +8712,7 @@ data:extend({ order = "nullius-ep", icon = "__base__/graphics/technology/automation-2.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -8974,7 +9004,7 @@ data:extend({ order = "nullius-ep", icon = "__base__/graphics/technology/worker-robots-storage.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "worker-robot-storage", @@ -9027,9 +9057,8 @@ data:extend({ type = "technology", name = "nullius-packaging-6", order = "nullius-ep", - icon = "__angelssmelting__/graphics/technology/powder-mixer-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/powder-mixer-tech.png", icon_size = 256, - icon_mipmaps = 2, effects = { { type = "unlock-recipe", @@ -9052,11 +9081,11 @@ data:extend({ name = "nullius-barreling-3", order = "nullius-eq", icon_size = 128, - icon = "__angelsrefining__/graphics/technology/barrel-tech.png", + icon = "__angelsrefininggraphics__/graphics/technology/barrel-tech.png", effects = { { type = "unlock-recipe", - recipe = "fill-nullius-steam-barrel" + recipe = "nullius-steam-barrel" }, { type = "unlock-recipe", @@ -9064,7 +9093,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-compressed-nitrogen-barrel" + recipe = "nullius-compressed-nitrogen-barrel" }, { type = "unlock-recipe", @@ -9072,7 +9101,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-compressed-hydrogen-barrel" + recipe = "nullius-compressed-hydrogen-barrel" }, { type = "unlock-recipe", @@ -9080,7 +9109,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-compressed-air-barrel" + recipe = "nullius-compressed-air-barrel" }, { type = "unlock-recipe", @@ -9088,7 +9117,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-compressed-residual-gas-barrel" + recipe = "nullius-compressed-residual-gas-barrel" }, { type = "unlock-recipe", @@ -9096,7 +9125,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-compressed-argon-barrel" + recipe = "nullius-compressed-argon-barrel" }, { type = "unlock-recipe", @@ -9104,7 +9133,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-compressed-oxygen-barrel" + recipe = "nullius-compressed-oxygen-barrel" }, { type = "unlock-recipe", @@ -9112,7 +9141,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-compressed-carbon-dioxide-barrel" + recipe = "nullius-compressed-carbon-dioxide-barrel" }, { type = "unlock-recipe", @@ -9120,7 +9149,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-compressed-carbon-monoxide-barrel" + recipe = "nullius-compressed-carbon-monoxide-barrel" }, { type = "unlock-recipe", @@ -9128,7 +9157,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-compressed-methane-barrel" + recipe = "nullius-compressed-methane-barrel" }, { type = "unlock-recipe", @@ -9190,7 +9219,7 @@ data:extend({ order = "nullius-eq", icon = "__base__/graphics/technology/exoskeleton-equipment.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -9226,7 +9255,7 @@ data:extend({ order = "nullius-eq", icon = "__base__/graphics/technology/automation-2.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -9490,7 +9519,7 @@ data:extend({ order = "nullius-eq", icon = "__base__/graphics/technology/artillery.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -9517,13 +9546,13 @@ data:extend({ { icon = "__base__/graphics/technology/space-science-pack.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/tooltips/tooltip-category-nuclear.png", icon_size = 40, - scale = 2.5, - shift = {-4, 36}, + scale = 1.5, + shift = {0, 20}, tint = {r=0.6, g=0.3, b=0.2, a=1} } }, @@ -9550,7 +9579,8 @@ data:extend({ }, time = 40 }, - prerequisites = {"nullius-mass-production-7", "nullius-exploration-2", "nullius-checkpoint-lab-2"} + prerequisites = {"nullius-mass-production-7", "nullius-exploration-2", "nullius-checkpoint-lab-2"}, + essential = true }, { @@ -9559,7 +9589,7 @@ data:extend({ order = "nullius-fc", icon = "__base__/graphics/technology/electric-engine.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -9630,7 +9660,7 @@ data:extend({ order = "nullius-fd", icon = "__base__/graphics/technology/mining-productivity.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -9701,34 +9731,18 @@ data:extend({ type = "unlock-recipe", recipe = "nullius-inserter-4" }, - { - type = "unlock-recipe", - recipe = "nullius-filter-inserter-4" - }, { type = "unlock-recipe", recipe = "nullius-box-inserter-4" }, - { - type = "unlock-recipe", - recipe = "nullius-box-filter-inserter-4" - }, { type = "unlock-recipe", recipe = "nullius-unbox-inserter-4" }, - { - type = "unlock-recipe", - recipe = "nullius-unbox-filter-inserter-4" - }, { type = "unlock-recipe", recipe = "nullius-boxed-inserter-4" }, - { - type = "unlock-recipe", - recipe = "nullius-boxed-filter-inserter-4" - } }, unit = { count = 1100, @@ -9748,10 +9762,10 @@ data:extend({ order = "nullius-fe", icon = "__base__/graphics/technology/inserter-capacity.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { - type = "stack-inserter-capacity-bonus", + type = "bulk-inserter-capacity-bonus", modifier = 1 } }, @@ -9772,7 +9786,7 @@ data:extend({ order = "nullius-fe", icon = "__base__/graphics/technology/fluid-handling.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -9828,7 +9842,7 @@ data:extend({ order = "nullius-fe", icon = "__base__/graphics/technology/steel-axe.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-mining-speed", @@ -9869,7 +9883,7 @@ data:extend({ order = "nullius-ff", icon = "__base__/graphics/technology/exoskeleton-equipment.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-running-speed", @@ -9893,7 +9907,7 @@ data:extend({ order = "nullius-ff", icon = "__base__/graphics/technology/automation-3.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -10018,7 +10032,7 @@ data:extend({ order = "nullius-ff", icon = "__base__/graphics/technology/artillery-range.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "artillery-range", @@ -10096,14 +10110,15 @@ data:extend({ { icon = "__base__/graphics/technology/automation-science-pack.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/iron-gear-wheel.png", icon_size = 64, - scale = 1.6, - shift = {0, 40}, - tint = {r=0.6, g=1, b=1, a=0.5} + + scale = 0.9, + shift = {0, 20}, + tint = {r=0.6, g=1, b=1, a=0.7} } }, effects = { @@ -10124,14 +10139,15 @@ data:extend({ }, time = 40 }, - prerequisites = {"nullius-automation-3", "nullius-pumping-3", "nullius-checkpoint-logistics-3"} + prerequisites = {"nullius-automation-3", "nullius-pumping-3", "nullius-checkpoint-logistics-3"}, + essential = true }, { type = "technology", name = "nullius-water-filtration-4", order = "nullius-fg", icon_size = 256, - icon = "__angelsrefining__/graphics/technology/water-treatment.png", + icon = "__angelsrefininggraphics__/graphics/technology/water-treatment.png", effects = { { type = "unlock-recipe", @@ -10154,7 +10170,7 @@ data:extend({ name = "nullius-air-filtration-3", order = "nullius-fg", icon_size = 128, - icon = "__angelspetrochem__/graphics/technology/air-filter-tech.png", + icon = "__angelspetrochemgraphics__/graphics/technology/air-filter-tech.png", effects = { { type = "unlock-recipe", @@ -10177,7 +10193,7 @@ data:extend({ name = "nullius-mineral-processing-3", order = "nullius-fg", icon_size = 256, - icon = "__angelsrefining__/graphics/technology/ore-sorting.png", + icon = "__angelsrefininggraphics__/graphics/technology/ore-sorting.png", effects = { { type = "unlock-recipe", @@ -10200,7 +10216,7 @@ data:extend({ name = "nullius-barreling-4", order = "nullius-fg", icon_size = 128, - icon = "__angelsrefining__/graphics/technology/barrel-tech.png", + icon = "__angelsrefininggraphics__/graphics/technology/barrel-tech.png", effects = { { type = "unlock-recipe", @@ -10271,7 +10287,7 @@ data:extend({ order = "nullius-fh", icon = "__base__/graphics/technology/advanced-material-processing-2.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -10298,7 +10314,7 @@ data:extend({ name = "nullius-flotation-3", order = "nullius-fh", icon_size = 256, - icon = "__angelsrefining__/graphics/technology/hydro-refining.png", + icon = "__angelsrefininggraphics__/graphics/technology/hydro-refining.png", effects = { { type = "unlock-recipe", @@ -10322,7 +10338,7 @@ data:extend({ order = "nullius-fh", icon = "__base__/graphics/technology/oil-processing.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -10349,7 +10365,7 @@ data:extend({ name = "nullius-energy-storage-4", order = "nullius-fh", icon_size = 128, - icon = "__angelsrefining__/graphics/technology/thermal-extractor.png", + icon = "__angelsrefininggraphics__/graphics/technology/thermal-extractor.png", effects = { { type = "unlock-recipe", @@ -10406,7 +10422,7 @@ data:extend({ order = "nullius-fi", icon = "__base__/graphics/technology/worker-robots-speed.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "worker-robot-speed", @@ -10464,7 +10480,7 @@ data:extend({ name = "nullius-chemical-engineering-3", order = "nullius-fi", icon_size = 128, - icon = "__angelspetrochem__/graphics/technology/chemical-plant-tech.png", + icon = "__angelspetrochemgraphics__/graphics/technology/chemical-plant-tech.png", effects = { { type = "unlock-recipe", @@ -10581,9 +10597,8 @@ data:extend({ type = "technology", name = "nullius-metalworking-4", order = "nullius-fi", - icon = "__angelssmelting__/graphics/technology/induction-furnace-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/induction-furnace-tech.png", icon_size = 256, - icon_mipmaps = 2, effects = { { type = "unlock-recipe", @@ -10608,7 +10623,7 @@ data:extend({ order = "nullius-fj", icon = "__base__/graphics/technology/braking-force.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "train-braking-force-bonus", @@ -10631,9 +10646,9 @@ data:extend({ type = "technology", name = "nullius-aluminum-production-3", order = "nullius-fj", - icon = "__angelssmelting__/graphics/technology/smelting-aluminium-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/smelting-aluminium-tech.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -10734,7 +10749,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-compressed-helium-barrel" + recipe = "nullius-compressed-helium-barrel" }, { type = "unlock-recipe", @@ -10742,7 +10757,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-compressed-trace-gas-barrel" + recipe = "nullius-compressed-trace-gas-barrel" }, { type = "unlock-recipe", @@ -10766,7 +10781,7 @@ data:extend({ order = "nullius-fj", icon = "__base__/graphics/technology/battery.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -10809,9 +10824,9 @@ data:extend({ name = "nullius-venting-3", order = "nullius-fj", icons = {{ - icon = "__angelspetrochem__/graphics/technology/flare-stack-tech.png", + icon = "__angelspetrochemgraphics__/graphics/technology/flare-stack-tech.png", icon_size = 256, - icon_mipmaps = 4 + }}, effects = { { @@ -10842,7 +10857,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/technology/worker-robots-storage.png", icon_size = 256, - icon_mipmaps = 4, + tint = {0.6, 0.9, 1} }}, effects = { @@ -10869,7 +10884,7 @@ data:extend({ order = "nullius-fk", icon = "__base__/graphics/technology/logistic-science-pack.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -10885,7 +10900,8 @@ data:extend({ }, time = 45 }, - prerequisites = {"nullius-battery-storage-3", "nullius-calcium-production"} + prerequisites = {"nullius-battery-storage-3", "nullius-calcium-production"}, + essential = true }, { type = "technology", @@ -10893,7 +10909,7 @@ data:extend({ order = "nullius-fk", icon = "__base__/graphics/technology/oil-gathering.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -10925,7 +10941,7 @@ data:extend({ order = "nullius-fk", icon = "__base__/graphics/technology/steel-processing.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -10965,7 +10981,7 @@ data:extend({ order = "nullius-fk", icon = "__base__/graphics/technology/electric-energy-distribution-2.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -11052,10 +11068,10 @@ data:extend({ order = "nullius-fl", icon = "__base__/graphics/technology/inserter-capacity.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { - type = "stack-inserter-capacity-bonus", + type = "bulk-inserter-capacity-bonus", modifier = 1 }, { @@ -11077,9 +11093,9 @@ data:extend({ type = "technology", name = "nullius-titanium-production-3", order = "nullius-fl", - icon = "__angelssmelting__/graphics/technology/smelting-titanium-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/smelting-titanium-tech.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -11115,7 +11131,7 @@ data:extend({ order = "nullius-fl", icon = "__base__/graphics/technology/electric-energy-acumulators.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -11189,7 +11205,7 @@ data:extend({ name = "nullius-electrolysis-4", order = "nullius-fl", icon_size = 128, - icon = "__angelspetrochem__/graphics/technology/electrolyser-tech.png", + icon = "__angelspetrochemgraphics__/graphics/technology/electrolyser-tech.png", effects = { { type = "unlock-recipe", @@ -11212,9 +11228,9 @@ data:extend({ type = "technology", name = "nullius-electronics-3", order = "nullius-fm", - icon = "__base__/graphics/technology/advanced-electronics-2.png", + icon = "__base__/graphics/technology/processing-unit.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -11249,7 +11265,7 @@ data:extend({ name = "nullius-geothermal-power-3", order = "nullius-fm", icon_size = 64, - icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", + icon = "__angelssmeltinggraphics__/graphics/icons/chemical-furnace.png", effects = { { type = "unlock-recipe", @@ -11276,7 +11292,7 @@ data:extend({ name = "nullius-isotope-separation", order = "nullius-fm", icon_size = 72, - icon = "__angelspetrochem__/graphics/icons/molecules/semiheavy-water.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/semiheavy-water.png", effects = { { type = "unlock-recipe", @@ -11304,7 +11320,7 @@ data:extend({ order = "nullius-fm", icon = "__base__/graphics/technology/toolbelt.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-inventory-slots-bonus", @@ -11393,7 +11409,7 @@ data:extend({ order = "nullius-fn", icon = "__base__/graphics/technology/worker-robots-storage.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "worker-robot-storage", @@ -11418,7 +11434,7 @@ data:extend({ order = "nullius-fn", icon = "__base__/graphics/technology/research-speed.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "laboratory-speed", @@ -11442,7 +11458,7 @@ data:extend({ order = "nullius-fn", icon = "__base__/graphics/technology/logistic-system.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -11483,7 +11499,7 @@ data:extend({ order = "nullius-fo", icon = "__base__/graphics/technology/nuclear-power.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -11519,7 +11535,7 @@ data:extend({ order = "nullius-fo", icon = "__base__/graphics/technology/module.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -11618,7 +11634,7 @@ data:extend({ order = "nullius-fo", icon = "__base__/graphics/technology/logistic-system.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -11710,7 +11726,7 @@ data:extend({ order = "nullius-fp", icon = "__base__/graphics/technology/braking-force.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "train-braking-force-bonus", @@ -11734,7 +11750,7 @@ data:extend({ name = "nullius-nanotechnology-2", order = "nullius-fp", icon_size = 64, - icon = "__angelsrefining__/graphics/icons/crystallizer.png", + icon = "__angelsrefininggraphics__/graphics/icons/crystallizer.png", effects = { { type = "unlock-recipe", @@ -11758,7 +11774,7 @@ data:extend({ order = "nullius-fp", icon = "__base__/graphics/technology/robotics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -11878,7 +11894,7 @@ data:extend({ order = "nullius-fq", icon = "__base__/graphics/technology/personal-laser-defense-equipment.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-mining-speed", @@ -11909,7 +11925,7 @@ data:extend({ order = "nullius-fq", icon = "__base__/graphics/technology/electronics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -11937,7 +11953,7 @@ data:extend({ order = "nullius-fq", icon = "__base__/graphics/technology/logistic-robotics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -11977,7 +11993,7 @@ data:extend({ order = "nullius-fq", icon = "__base__/graphics/technology/construction-robotics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -11995,10 +12011,10 @@ data:extend({ type = "unlock-recipe", recipe = "nullius-unbox-construction-bot-3" }, - { - type = "ghost-time-to-live", - modifier = 60 * 60 * 60 * 24 * 6 - } + -- { + -- type = "ghost-time-to-live", + -- modifier = 60 * 60 * 60 * 24 * 6 + -- } }, unit = { count = 3400, @@ -12017,7 +12033,7 @@ data:extend({ order = "nullius-fq", icon = "__base__/graphics/technology/exoskeleton-equipment.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-running-speed", @@ -12044,15 +12060,15 @@ data:extend({ { icon = "__base__/graphics/technology/production-science-pack.png", icon_size = 256, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/processing-unit.png", icon_size = 64, - icon_mipmaps = 4, - scale = 1.1, - shift = {0, 34}, - tint = {r=1, g=1, b=1, a=0.5} + + scale = 0.7, + shift = {0, 20}, + tint = {r=1, g=1, b=1, a=0.8} } }, effects = { @@ -12074,7 +12090,8 @@ data:extend({ }, time = 55 }, - prerequisites = {"nullius-miniaturization-1", "nullius-toolmaking-8"} + prerequisites = {"nullius-miniaturization-1", "nullius-toolmaking-8"}, + essential = true }, { type = "technology", @@ -12082,10 +12099,10 @@ data:extend({ order = "nullius-fr", icon = "__base__/graphics/technology/inserter-capacity.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { - type = "stack-inserter-capacity-bonus", + type = "bulk-inserter-capacity-bonus", modifier = 1 } }, @@ -12106,7 +12123,7 @@ data:extend({ order = "nullius-fr", icon = "__base__/graphics/technology/atomic-bomb.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -12142,7 +12159,7 @@ data:extend({ order = "nullius-fr", icon = "__base__/graphics/technology/railway.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -12178,7 +12195,7 @@ data:extend({ order = "nullius-fr", icon = "__base__/graphics/technology/effect-transmission.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -12230,7 +12247,7 @@ data:extend({ order = "nullius-fs", icon = "__base__/graphics/technology/rocket-fuel.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -12259,7 +12276,8 @@ data:extend({ time = 55 }, prerequisites = {"nullius-freight-transportation-3", "nullius-demolitions-2", - "nullius-high-pressure-chemistry-2"} + "nullius-high-pressure-chemistry-2"}, + essential = true }, { type = "technology", @@ -12298,7 +12316,7 @@ data:extend({ order = "nullius-fs", icon = "__base__/graphics/technology/tank.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -12350,7 +12368,7 @@ data:extend({ order = "nullius-ft", icon = "__base__/graphics/technology/worker-robots-speed.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "worker-robot-speed", @@ -12405,7 +12423,7 @@ data:extend({ order = "nullius-ft", icon = "__base__/graphics/technology/discharge-defense-equipment.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-reach-distance", @@ -12454,7 +12472,7 @@ data:extend({ order = "nullius-fu", icon = "__base__/graphics/technology/power-armor-mk2.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -12498,7 +12516,7 @@ data:extend({ order = "nullius-fu", icon = "__base__/graphics/technology/artillery-range.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "artillery-range", @@ -12522,7 +12540,7 @@ data:extend({ order = "nullius-fu", icon = "__base__/graphics/technology/research-speed.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -12546,7 +12564,7 @@ data:extend({ order = "nullius-fu", icon = "__base__/graphics/technology/atomic-bomb.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -12591,7 +12609,7 @@ data:extend({ order = "nullius-fv", icon = "__base__/graphics/technology/landfill.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -12651,7 +12669,7 @@ data:extend({ order = "nullius-fv", icon = "__base__/graphics/technology/spidertron.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -12679,7 +12697,7 @@ data:extend({ order = "nullius-fv", icon = "__base__/graphics/technology/braking-force.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "train-braking-force-bonus", @@ -12704,7 +12722,7 @@ data:extend({ order = "nullius-fv", icon = "__base__/graphics/technology/effect-transmission.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -12771,7 +12789,7 @@ data:extend({ order = "nullius-fw", icon = "__base__/graphics/technology/concrete.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -12871,7 +12889,7 @@ data:extend({ order = "nullius-fw", icon = "__base__/graphics/technology/rocket-silo.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -12880,6 +12898,10 @@ data:extend({ { type = "unlock-recipe", recipe = "nullius-rocket" + }, + { + type = "unlock-recipe", + recipe = "nullius-landing-pad" } }, unit = { @@ -12891,7 +12913,8 @@ data:extend({ }, time = 60 }, - prerequisites = {"nullius-personal-transportation-4", "nullius-braking-8"} + prerequisites = {"nullius-personal-transportation-4", "nullius-braking-8"}, + essential = true }, { @@ -12901,7 +12924,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/technology/military-science-pack.png", icon_size = 256, - icon_mipmaps = 4, + tint = {0.75, 0.72, 0.78} }}, effects = { @@ -12926,7 +12949,8 @@ data:extend({ }, time = 60 }, - prerequisites = {"nullius-rocket-science-2", "nullius-terraforming-3", "nullius-broadcasting-4"} + prerequisites = {"nullius-rocket-science-2", "nullius-terraforming-3", "nullius-broadcasting-4"}, + essential = true }, { @@ -12937,7 +12961,7 @@ data:extend({ { icon = "__base__/graphics/technology/military-science-pack.png", icon_size = 256, - icon_mipmaps = 4, + tint = {0.75, 0.72, 0.78} }, { @@ -12970,7 +12994,8 @@ data:extend({ }, time = 60 }, - prerequisites = { "nullius-astronomy", "nullius-biochemistry-7" } + prerequisites = { "nullius-astronomy", "nullius-biochemistry-7" }, + essential = true }, { type = "technology", @@ -12980,7 +13005,7 @@ data:extend({ { icon = "__base__/graphics/technology/military-science-pack.png", icon_size = 256, - icon_mipmaps = 4, + tint = {0.75, 0.72, 0.78} }, { @@ -13013,7 +13038,8 @@ data:extend({ }, time = 60 }, - prerequisites = { "nullius-evolution-2", "nullius-optimization-6" } + prerequisites = { "nullius-evolution-2", "nullius-optimization-6" }, + essential = true }, { type = "technology", @@ -13021,7 +13047,7 @@ data:extend({ order = "nullius-gc", icon = "__base__/graphics/technology/atomic-bomb.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -13119,7 +13145,7 @@ data:extend({ order = "nullius-gc", icon = "__base__/graphics/technology/nuclear-power.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -13148,10 +13174,10 @@ data:extend({ order = "nullius-gc", icon = "__base__/graphics/technology/inserter-capacity.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { - type = "stack-inserter-capacity-bonus", + type = "bulk-inserter-capacity-bonus", modifier = 1 } }, @@ -13173,7 +13199,7 @@ data:extend({ order = "nullius-gd", icon = "__base__/graphics/technology/artillery-range.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "artillery-range", @@ -13198,7 +13224,7 @@ data:extend({ order = "nullius-gd", icon = "__base__/graphics/technology/personal-laser-defense-equipment.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-mining-speed", @@ -13226,9 +13252,9 @@ data:extend({ type = "technology", name = "nullius-copper-production", order = "nullius-gd", - icon = "__angelssmelting__/graphics/technology/smelting-copper-tech.png", + icon = "__angelssmeltinggraphics__/graphics/technology/smelting-copper-tech.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -13320,7 +13346,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "fill-nullius-pressure-steam-barrel" + recipe = "nullius-pressure-steam-barrel" }, { type = "unlock-recipe", @@ -13349,7 +13375,7 @@ data:extend({ order = "nullius-gd", icon = "__base__/graphics/technology/kovarex-enrichment-process.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -13425,7 +13451,7 @@ data:extend({ type = "technology", name = "nullius-carbon-sequestration-3", order = "nullius-gd", - icon = "__angelspetrochem__/graphics/icons/molecules/oxygen.png", + icon = "__angelspetrochemgraphics__/graphics/icons/molecules/oxygen.png", icon_size = 72, effects = { { @@ -13459,7 +13485,7 @@ data:extend({ order = "nullius-ge", icon = "__base__/graphics/technology/worker-robots-speed.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "worker-robot-speed", @@ -13544,7 +13570,7 @@ data:extend({ { icon = "__base__/graphics/icons/defender.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.95 }, { @@ -13580,7 +13606,7 @@ data:extend({ order = "nullius-ge", icon = "__base__/graphics/technology/uranium-processing.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -13607,9 +13633,9 @@ data:extend({ type = "technology", name = "nullius-electronics-4", order = "nullius-ge", - icon = "__base__/graphics/technology/advanced-electronics-2.png", + icon = "__base__/graphics/technology/processing-unit.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -13678,7 +13704,7 @@ data:extend({ order = "nullius-gf", icon = "__base__/graphics/technology/robotics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -13717,7 +13743,7 @@ data:extend({ type = "technology", name = "nullius-nitrogen-chemistry-3", order = "nullius-gf", - icons = data.raw.technology["angels-nitrogen-processing-1"].icons, + icons = angelsLegacy.functions.create_gas_tech_icon("NNN"), effects = { { type = "unlock-recipe", @@ -13747,7 +13773,7 @@ data:extend({ order = "nullius-gf", icon = "__base__/graphics/technology/solar-energy.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -13784,7 +13810,7 @@ data:extend({ order = "nullius-gf", icon = "__base__/graphics/technology/speed-module-3.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -13894,7 +13920,7 @@ data:extend({ { icon = "__base__/graphics/icons/defender.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.95 }, { @@ -13968,7 +13994,7 @@ data:extend({ order = "nullius-gg", icon = "__base__/graphics/technology/military.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -14001,7 +14027,7 @@ data:extend({ order = "nullius-gg", icon = "__base__/graphics/technology/electronics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -14030,7 +14056,7 @@ data:extend({ order = "nullius-gg", icon = "__base__/graphics/technology/logistic-robotics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -14165,7 +14191,7 @@ data:extend({ order = "nullius-gg", icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -14218,13 +14244,13 @@ data:extend({ { icon = "__base__/graphics/icons/defender.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.95 }, { icon = "__base__/graphics/icons/small-worm.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.7, shift = {4, 4} } @@ -14256,7 +14282,7 @@ data:extend({ order = "nullius-gg", icon = "__base__/graphics/technology/productivity-module-3.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -14351,10 +14377,10 @@ data:extend({ order = "nullius-gh", icon = "__base__/graphics/technology/inserter-capacity.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { - type = "stack-inserter-capacity-bonus", + type = "bulk-inserter-capacity-bonus", modifier = 1 }, { @@ -14404,7 +14430,7 @@ data:extend({ order = "nullius-gh", icon = "__base__/graphics/technology/construction-robotics.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -14440,9 +14466,9 @@ data:extend({ type = "technology", name = "nullius-weaving-3", order = "nullius-gh", - icon = "__angelssmelting__/graphics/icons/roll-zinc.png", + icon = "__angelssmeltinggraphics__/graphics/icons/roll-zinc.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -14477,7 +14503,7 @@ data:extend({ order = "nullius-gh", icon = "__base__/graphics/icons/tree-08.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -14574,13 +14600,13 @@ data:extend({ { icon = "__base__/graphics/icons/defender.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.95 }, { icon = "__base__/graphics/icons/tree-08.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.7, shift = {4, 4} } @@ -14613,7 +14639,7 @@ data:extend({ order = "nullius-gh", icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -14666,13 +14692,13 @@ data:extend({ { icon = "__base__/graphics/icons/defender.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.95 }, { icon = "__base__/graphics/icons/fish.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.7, shift = {4, 4} } @@ -14711,7 +14737,7 @@ data:extend({ { icon = "__base__/graphics/icons/tree-08.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.6, shift = {-8, -8} } @@ -14842,7 +14868,7 @@ data:extend({ order = "nullius-gi", icon = "__base__/graphics/icons/small-biter.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -14900,13 +14926,13 @@ data:extend({ { icon = "__base__/graphics/icons/defender.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.95 }, { icon = "__base__/graphics/icons/small-biter.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.7, shift = {4, 4} } @@ -14940,7 +14966,7 @@ data:extend({ order = "nullius-gi", icon = "__base__/graphics/icons/wood.png", icon_size = 64, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -15071,7 +15097,7 @@ data:extend({ order = "nullius-gi", icon = "__base__/graphics/technology/power-armor-mk2.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -15116,7 +15142,7 @@ data:extend({ order = "nullius-gi", icon = "__base__/graphics/technology/toolbelt.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-inventory-slots-bonus", @@ -15168,7 +15194,7 @@ data:extend({ order = "nullius-gj", icon = "__base__/graphics/technology/coal-liquefaction.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -15251,12 +15277,12 @@ data:extend({ { icon = "__base__/graphics/icons/fluid/lubricant.png", icon_size = 64, - icon_mipmaps = 4 + }, { icon = "__base__/graphics/icons/fluid/light-oil.png", icon_size = 64, - icon_mipmaps = 4, + scale = 0.4, shift = {-12, -10} } @@ -15339,7 +15365,7 @@ data:extend({ order = "nullius-gj", icon = "__base__/graphics/technology/exoskeleton-equipment.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-running-speed", @@ -15362,7 +15388,7 @@ data:extend({ order = "nullius-gj", icon = "__base__/graphics/technology/laser-turret.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -15562,9 +15588,9 @@ data:extend({ type = "technology", name = "nullius-artificial-intelligence-2", order = "nullius-gk", - icon = "__base__/graphics/technology/rocket-control-unit.png", + icon = TECHPATH .. "rocket-control-unit.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -15588,7 +15614,7 @@ data:extend({ order = "nullius-gl", icon = "__base__/graphics/technology/explosive-rocketry.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -15605,7 +15631,8 @@ data:extend({ }, time = 60 }, - prerequisites = {"nullius-asteroid-mining-2", "nullius-checkpoint-android-2"} + prerequisites = {"nullius-asteroid-mining-2", "nullius-checkpoint-android-2"}, + essential = true }, { type = "technology", @@ -15733,7 +15760,7 @@ data:extend({ order = "nullius-gm", icon = "__base__/graphics/technology/electric-energy-acumulators.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -15782,7 +15809,7 @@ data:extend({ order = "nullius-gm", icon = "__base__/graphics/technology/solar-energy.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -15807,7 +15834,7 @@ data:extend({ order = "nullius-gm", icon = "__base__/graphics/technology/power-armor-mk2.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", @@ -15836,7 +15863,7 @@ data:extend({ order = "nullius-gm", icon = "__base__/graphics/technology/spidertron.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "unlock-recipe", diff --git a/nullius/prototypes/upgrades.lua b/nullius/prototypes/upgrades.lua index dffde11..ea6c808 100644 --- a/nullius/prototypes/upgrades.lua +++ b/nullius/prototypes/upgrades.lua @@ -453,7 +453,7 @@ data:extend({ order = "nullius-xc", icon = "__base__/graphics/technology/research-speed.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "laboratory-speed", @@ -481,7 +481,7 @@ data:extend({ order = "nullius-xc", icon = "__base__/graphics/technology/braking-force.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "train-braking-force-bonus", @@ -509,10 +509,10 @@ data:extend({ order = "nullius-xc", icon = "__base__/graphics/technology/inserter-capacity.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { - type = "stack-inserter-capacity-bonus", + type = "bulk-inserter-capacity-bonus", modifier = 1 } }, @@ -537,7 +537,7 @@ data:extend({ order = "nullius-xc", icon = "__base__/graphics/technology/steel-axe.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-mining-speed", @@ -573,7 +573,7 @@ data:extend({ order = "nullius-xc", icon = "__base__/graphics/technology/worker-robots-speed.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "worker-robot-speed", @@ -601,7 +601,7 @@ data:extend({ order = "nullius-xc", icon = "__base__/graphics/technology/worker-robots-storage.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "worker-robot-storage", @@ -630,7 +630,7 @@ data:extend({ icons = {{ icon = "__base__/graphics/technology/worker-robots-storage.png", icon_size = 256, - icon_mipmaps = 4, + tint = {0.6, 0.9, 1} }}, effects = { @@ -658,9 +658,9 @@ data:extend({ type = "technology", name = "nullius-extermination-1", order = "nullius-xc", - icon = "__base__/graphics/technology/energy-weapons-damage.png", + icon = "__base__/graphics/technology/laser-weapons-damage.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "gun-speed", @@ -704,7 +704,7 @@ data:extend({ order = "nullius-xc", icon = "__base__/graphics/technology/artillery-range.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "artillery-range", @@ -730,9 +730,9 @@ data:extend({ type = "technology", name = "nullius-artificial-intuition-1", order = "nullius-xc", - icon = "__base__/graphics/technology/optics.png", + icon = "__base__/graphics/technology/lamp.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "laboratory-productivity", @@ -760,7 +760,7 @@ data:extend({ order = "nullius-xc", icon = "__base__/graphics/technology/toolbelt.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-inventory-slots-bonus", @@ -788,7 +788,7 @@ data:extend({ order = "nullius-xc", icon = "__base__/graphics/technology/discharge-defense-equipment.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-reach-distance", @@ -827,7 +827,7 @@ data:extend({ order = "nullius-xc", icon = "__base__/graphics/technology/exoskeleton-equipment.png", icon_size = 256, - icon_mipmaps = 4, + effects = { { type = "character-running-speed", diff --git a/nullius/scripts/alignment.lua b/nullius/scripts/alignment.lua index 946a0cd..4d6b117 100644 --- a/nullius/scripts/alignment.lua +++ b/nullius/scripts/alignment.lua @@ -17,18 +17,18 @@ local ALIGN_ABSORB_UNSHARE = 15 local function lookup_force(force) if ((force == nil) or (not force.valid)) then return nil end - return global.nullius_align_factions[force.name] + return storage.nullius_align_factions[force.name] end local function init_faction(force, name) local entry = { name = name, has_transmitter = false, tags = { }} - global.nullius_align_factions[force.name] = entry + storage.nullius_align_factions[force.name] = entry init_broken() end local function create_faction(player) local name = "faction-" .. player.name - local faction = global.nullius_align_factions[name] + local faction = storage.nullius_align_factions[name] if (faction ~= nil) then return faction end faction = game.create_force(name) if ((faction == nil) or (not faction.valid)) then @@ -40,26 +40,26 @@ end function init_alignment() - if (global.nullius_alignment == nil) then - global.nullius_alignment = (game.is_multiplayer() and + if (storage.nullius_alignment == nil) then + storage.nullius_alignment = (game.is_multiplayer() and settings.startup["nullius-alignment"].value) end - if (not global.nullius_alignment) then - global.nullius_align_factions = nil - global.nullius_align_queue_head = nil - global.nullius_align_queue_tail = nil - global.nullius_align_lobby = nil - global.nullius_align_invite_status = nil - global.nullius_align_satellite_winner = nil - elseif (global.nullius_align_factions == nil) then - global.nullius_align_factions = { } - global.nullius_align_invite_status = { } - global.nullius_align_landing_distance = 32 - global.nullius_align_landing_sites = { } - global.nullius_align_landing_sites[1] = {x = 0, y = 0} - global.nullius_align_landing_count = 1 - global.nullius_align_satellite_winner = nil + if (not storage.nullius_alignment) then + storage.nullius_align_factions = nil + storage.nullius_align_queue_head = nil + storage.nullius_align_queue_tail = nil + storage.nullius_align_lobby = nil + storage.nullius_align_invite_status = nil + storage.nullius_align_satellite_winner = nil + elseif (storage.nullius_align_factions == nil) then + storage.nullius_align_factions = { } + storage.nullius_align_invite_status = { } + storage.nullius_align_landing_distance = 32 + storage.nullius_align_landing_sites = { } + storage.nullius_align_landing_sites[1] = {x = 0, y = 0} + storage.nullius_align_landing_count = 1 + storage.nullius_align_satellite_winner = nil end end @@ -67,20 +67,20 @@ function init_alignment_force(force) for i = 1, 7 do local tech = force.technologies["nullius-alignment-" .. i] if ((tech ~= nil) and tech.valid) then - tech.enabled = global.nullius_alignment + tech.enabled = storage.nullius_alignment end end end local function teleport_lobby(player) - local lobby = global.nullius_align_lobby + local lobby = storage.nullius_align_lobby if (lobby == nil) then lobby = blank_surface(player.surface, "orbit") lobby.request_to_generate_chunks({0, 0}, 4) lobby.force_generate_chunk_requests() lobby.always_day = true - global.nullius_align_lobby = lobby + storage.nullius_align_lobby = lobby player.force.chart(lobby, {{-120, -120}, {120, 120}}) end player.teleport(player.position, lobby, true) @@ -99,9 +99,9 @@ local function generate_corner(surface, x, y) end local function chunk_generated(event) - if (global.nullius_alignment ~= true) then return end + if (storage.nullius_alignment ~= true) then return end local surface = event.surface - if (surface ~= global.nullius_align_lobby) then return end + if (surface ~= storage.nullius_align_lobby) then return end local x = event.area.left_top.x local y = event.area.left_top.y generate_corner(surface, x, y) @@ -114,12 +114,12 @@ script.on_event(defines.events.on_chunk_generated, chunk_generated) local function align_add_queue(entry) - if (global.nullius_align_queue_tail == nil) then - global.nullius_align_queue_head = entry + if (storage.nullius_align_queue_tail == nil) then + storage.nullius_align_queue_head = entry else - global.nullius_align_queue_tail.next = entry + storage.nullius_align_queue_tail.next = entry end - global.nullius_align_queue_tail = entry + storage.nullius_align_queue_tail = entry end function align_player_created(player) @@ -150,7 +150,7 @@ local function faction_has_tech(force, techname) end local function faction_has_crafted(force, itemname, amount) - local stats = force.item_production_statistics + local stats = force.get_item_production_statistics("nauvis") local count = stats.get_input_count("nullius-" .. itemname) return (count >= amount) end @@ -190,7 +190,7 @@ local function convert_player_faction(player, force) end function align_player_join(player) - if (not global.nullius_alignment) then return end + if (not storage.nullius_alignment) then return end local force = player.force for i = 1, 200 do local entry = lookup_force(force) @@ -225,13 +225,13 @@ local function schedule_absorb_faction(oldforce, newforce, target) }) end -function align_satellite_launch(rocket) - if (not global.nullius_alignment) then return end - if (global.nullius_align_satellite_winner ~= nil) then return end +function align_satellite_launch(rocket) --todo: rename as pod and test if it works + if (not storage.nullius_alignment) then return end + if (storage.nullius_align_satellite_winner ~= nil) then return end local newforce = rocket.force local entry = lookup_force(newforce) if (entry == nil) then return end - global.nullius_align_satellite_winner = { force = newforce, + storage.nullius_align_satellite_winner = { force = newforce, surface = rocket.surface, position = { x = rocket.position.x, y = (rocket.position.y + 256) } } @@ -309,7 +309,7 @@ local function get_tech_progress(force, tech) (tech.name == force.current_research.name)) then progress = force.research_progress else - progress = force.get_saved_technology_progress(tech.name) + progress = force.technologies[tech.name].saved_progress end if ((progress ~= nil) and (progress > 0)) then return progress end return 0 @@ -333,7 +333,7 @@ local function merge_faction_techs(oldforce, newforce, surface, pos) if (tech.name == newforce.current_research.name) then newforce.research_progress = progress else - newforce.set_saved_technology_progress(tech.name, progress) + newforce.technologies[tech.name].saved_progress = progress end else if (not newtech.researched) then newtech.researched = true end @@ -365,7 +365,7 @@ local function merge_faction_techs(oldforce, newforce, surface, pos) chest_width = chest_entry[3] end end - local chest_proto = game.entity_prototypes[chest_name] + local chest_proto = prototypes.entity[chest_name] if ((chest_proto == nil) or (not chest_proto.valid) or ((chest_proto.type ~= "container") and (chest_proto.type ~= "logistic-container"))) then @@ -389,7 +389,7 @@ local function merge_faction_techs(oldforce, newforce, surface, pos) item_name = "nullius-box-" .. string.sub(item_name, 9, -1) amount = math.floor((amount + 3) / 5) end - local item_proto = game.item_prototypes[item_name] + local item_proto = prototypes.item[item_name] if ((item_proto ~= nil) and item_proto.valid and item_proto.stackable and (item_proto.stack_size >= 5)) then while (amount > 0) do @@ -456,7 +456,7 @@ end local function align_update_transmitter(entry) - local winner = global.nullius_align_satellite_winner + local winner = storage.nullius_align_satellite_winner if (winner ~= nil) then local force = lookup_force(winner.force) if (force ~= nil) then @@ -469,12 +469,12 @@ local function align_update_transmitter(entry) end end - if (global.nullius_align_transmitters ~= nil) then + if (storage.nullius_align_transmitters ~= nil) then local lst = { } local num = 0 - for bi, transmitter in pairs(global.nullius_align_transmitters) do + for bi, transmitter in pairs(storage.nullius_align_transmitters) do if ((transmitter.entity == nil) or (not transmitter.entity.valid)) then - global.nullius_align_transmitters[bi] = nil + storage.nullius_align_transmitters[bi] = nil else num = num + 1 lst[num] = transmitter @@ -512,7 +512,7 @@ end local function evaluate_search_position(pos, surface) local closest_dist = nil - for _,site in pairs(global.nullius_align_landing_sites) do + for _,site in pairs(storage.nullius_align_landing_sites) do local dx = (pos.x - site.x) local dy = (pos.y - site.y) local dist = ((dx * dx) + (dy * dy)) @@ -532,8 +532,8 @@ local function evaluate_search_position(pos, surface) end local function align_update_search(entry) - local dist = global.nullius_align_landing_distance - global.nullius_align_landing_distance = (dist + 1) + local dist = storage.nullius_align_landing_distance + storage.nullius_align_landing_distance = (dist + 1) local best_score = nil local best_pos = nil for i = 1, 6 do @@ -555,9 +555,9 @@ local function align_update_search(entry) player = entry.player, surface = entry.surface, cposition = best_pos, tposition = tpos, count = 0 }) - local ind = (global.nullius_align_landing_count + 1) - global.nullius_align_landing_count = ind - global.nullius_align_landing_sites[ind] = best_pos + local ind = (storage.nullius_align_landing_count + 1) + storage.nullius_align_landing_count = ind + storage.nullius_align_landing_sites[ind] = best_pos local fillsurface = landfill_surface(entry.surface) fillsurface.request_to_generate_chunks(tpos, 3) entry.surface.request_to_generate_chunks(tpos, 5) @@ -774,7 +774,7 @@ local resource_table = { density = 85, radius = 18, depth = 8 }, { name = "nullius-sandstone", amount = 150, density = 90, radius = 17, depth = 8 }, - { name = "lambent-nil-phosphorite", mod = "lambent-nil", + { name = "nullius-phosphorite", mod = "lambent-nil", amount = 10, density = 25, radius = 4, depth = 2 } } @@ -941,16 +941,16 @@ end function update_align() - if (not global.nullius_alignment) then return end - local head = global.nullius_align_queue_head + if (not storage.nullius_alignment) then return end + local head = storage.nullius_align_queue_head if (head == nil) then return end if ((head.delay ~= nil) and (game.tick < head.delay)) then - if (head == global.nullius_align_queue_tail) then return end - global.nullius_align_queue_head = head.next + if (head == storage.nullius_align_queue_tail) then return end + storage.nullius_align_queue_head = head.next head.next = nil align_add_queue(head) - head = global.nullius_align_queue_head + head = storage.nullius_align_queue_head if ((head.delay ~= nil) and (game.tick < head.delay)) then return end end @@ -988,10 +988,10 @@ function update_align() end if (ret) then - if (head == global.nullius_align_queue_tail) then - global.nullius_align_queue_tail = nil + if (head == storage.nullius_align_queue_tail) then + storage.nullius_align_queue_tail = nil end - global.nullius_align_queue_head = head.next + storage.nullius_align_queue_head = head.next end end @@ -1084,7 +1084,7 @@ end local function align_effect_transponder(source) - if (not global.nullius_alignment) then return end + if (not storage.nullius_alignment) then return end local source_entry = lookup_force(source.force) if (source_entry == nil) then return end if (not check_entity_player(source)) then return end @@ -1123,7 +1123,7 @@ local function align_set_invite_status(source, target, id) {"alignment.align-no-identification"}}) return false end - global.nullius_align_invite_status[source.player.index] = { + storage.nullius_align_invite_status[source.player.index] = { target = target.player, ident = id, tick = game.tick, tforce = target.force, sforce = source.force } @@ -1131,7 +1131,7 @@ local function align_set_invite_status(source, target, id) end local function align_get_invite_status(entity, other) - local invite = global.nullius_align_invite_status[entity.player.index] + local invite = storage.nullius_align_invite_status[entity.player.index] if ((invite == nil) or (invite.sforce ~= entity.force)) then return nil end if (game.tick > (invite.tick + 36000)) then return nil end if (invite.target ~= other.player) then return nil end @@ -1148,8 +1148,8 @@ local function align_match_invite_status(target, source) local oldforce = target.force convert_player_faction(target.player, source.force) check_faction_empty(oldforce, source.force, target) - global.nullius_align_invite_status[target.player.index] = nil - global.nullius_align_invite_status[source.player.index] = nil + storage.nullius_align_invite_status[target.player.index] = nil + storage.nullius_align_invite_status[source.player.index] = nil end local function align_effect_identification(target, source) @@ -1166,7 +1166,7 @@ end function align_effect(event, suffix) - if (not global.nullius_alignment) then return end + if (not storage.nullius_alignment) then return end local target = check_entity_force(event.target_entity) local source = check_entity_force(event.source_entity) if ((target == nil) or (source == nil)) then return end @@ -1184,32 +1184,32 @@ end function build_transmitter(entity) - if (not global.nullius_alignment) then return end - if (global.nullius_align_transmitters == nil) then - global.nullius_align_transmitters = { } + if (not storage.nullius_alignment) then return end + if (storage.nullius_align_transmitters == nil) then + storage.nullius_align_transmitters = { } end - global.nullius_align_transmitters[entity.unit_number] = { + storage.nullius_align_transmitters[entity.unit_number] = { entity = entity, force = entity.force } - script.register_on_entity_destroyed(entity) + script.register_on_object_destroyed(entity) local force_entry = lookup_force(entity.force) if (force_entry == nil) then return end force_entry.has_transmitter = true end function remove_transmitter(unit) - if (global.nullius_align_transmitters == nil) then return end - local trans_entry = global.nullius_align_transmitters[unit] + if (storage.nullius_align_transmitters == nil) then return end + local trans_entry = storage.nullius_align_transmitters[unit] if (trans_entry == nil) then return end - global.nullius_align_transmitters[unit] = nil + storage.nullius_align_transmitters[unit] = nil local force_entry = lookup_force(trans_entry.force) if (force_entry == nil) then return end force_entry.has_transmitter = false - for u, e in pairs(global.nullius_align_transmitters) do + for u, e in pairs(storage.nullius_align_transmitters) do if ((e == nil) or (e.force == nil) or (not e.force.valid) or (e.entity == nil) or (not e.entity.valid)) then - global.nullius_align_transmitters[u] = nil + storage.nullius_align_transmitters[u] = nil elseif (f == force) then force_entry.has_transmitter = true return diff --git a/nullius/scripts/beacon.lua b/nullius/scripts/beacon.lua index 6862e3b..28a96d2 100644 --- a/nullius/scripts/beacon.lua +++ b/nullius/scripts/beacon.lua @@ -14,7 +14,7 @@ function update_small_beacon(entity) local count = 0 for _,field in pairs(fields) do if (field.valid) then - local unit = global.nullius_interference_fields[field.unit_number] + local unit = storage.nullius_interference_fields[field.unit_number] if ((unit ~= nil) and (unique[unit] == nil)) then unique[unit] = true count = count + 1 @@ -32,20 +32,20 @@ function update_small_beacon(entity) local proxies = entity.surface.find_entities_filtered{area=bound, type = "item-request-proxy"} for _,proxy in pairs(proxies) do - if (proxy.valid and (proxy.proxy_target == entity) and - (proxy.item_requests ~= nil)) then - local found = false - modrequest = { } - for modind, modval in pairs(proxy.item_requests) do - modrequest[modind] = modval - found = true + if (proxy.valid and (proxy.proxy_target == entity) and + (proxy.item_requests ~= nil)) then + local found = false + modrequest = {} + for _, req in pairs(proxy.insert_plan) do + table.insert(modrequest, {id = table.deepcopy(req.id), items = table.deepcopy(req.items)}) + found = true + end + if (not found) then + modrequest = nil + end + proxy.destroy() + break end - if (not found) then - modrequest = nil - end - proxy.destroy() - break - end end local newname = "nullius-beacon-"..tier @@ -60,11 +60,11 @@ function update_small_beacon(entity) was_upgrade = entity.get_upgrade_target() end - global.nullius_in_beacon_replace = true + storage.nullius_in_beacon_replace = true local newentity = entity.surface.create_entity{name = newname, force = oldforce, position = entity.position, spill = false, fast_replace = true, create_build_effect_smoke = false} - global.nullius_in_beacon_replace = nil + storage.nullius_in_beacon_replace = nil if (newentity == nil) then return end if (was_deconstruct and (oldforce ~= nil)) then @@ -105,15 +105,15 @@ function create_interference(entity, dir, xoffs, yoffs, xsz, ysz) local ret = create_collision_box(entity.surface, entity.position, entity.force, "nullius-beacon-interference-"..dir, xoffs, yoffs, xsz, ysz, "layer-42") - global.nullius_interference_fields[ret.unit_number] = entity.unit_number + storage.nullius_interference_fields[ret.unit_number] = entity.unit_number return ret end function build_large_beacon(entity) - if (global.nullius_beacons == nil) then - global.nullius_beacons = { } - global.nullius_interference_fields = { } + if (storage.nullius_beacons == nil) then + storage.nullius_beacons = { } + storage.nullius_interference_fields = { } end local entry = { @@ -126,28 +126,28 @@ function build_large_beacon(entity) entry.interference[3] = create_interference(entity, "vertical", 8, 6, 6, 8) entry.interference[4] = create_interference(entity, "vertical", -8, -6, 6, 8) - global.nullius_beacons[entity.unit_number] = entry - script.register_on_entity_destroyed(entity) + storage.nullius_beacons[entity.unit_number] = entry + script.register_on_object_destroyed(entity) update_small_beacons(entity.position, entity.surface) end function build_beacon(entity) - if (global.nullius_in_beacon_replace ~= nil) then return end + if (storage.nullius_in_beacon_replace ~= nil) then return end if (string.sub(entity.name, 9, 21) == "large-beacon-") then build_large_beacon(entity) - elseif (global.nullius_interference_fields ~= nil) then + elseif (storage.nullius_interference_fields ~= nil) then update_small_beacon(entity) end end function remove_beacon(unit) - if (global.nullius_beacons == nil) then return false end - local entry = global.nullius_beacons[unit] + if (storage.nullius_beacons == nil) then return false end + local entry = storage.nullius_beacons[unit] if (entry == nil) then return false end - global.nullius_beacons[unit] = nil + storage.nullius_beacons[unit] = nil for _,field in pairs(entry.interference) do if (field.valid) then - global.nullius_interference_fields[field.unit_number] = nil + storage.nullius_interference_fields[field.unit_number] = nil field.destroy() end end diff --git a/nullius/scripts/body.lua b/nullius/scripts/body.lua index 3372260..e22c368 100644 --- a/nullius/scripts/body.lua +++ b/nullius/scripts/body.lua @@ -8,8 +8,8 @@ function add_chart_tag(player, character) end local name = nil - if (global.nullius_android_name ~= nil) then - name = global.nullius_android_name[character.unit_number] + if (storage.nullius_android_name ~= nil) then + name = storage.nullius_android_name[character.unit_number] end if (name == nil) then name = player.name @@ -19,12 +19,12 @@ function add_chart_tag(player, character) {position=character.position, icon={type="item", name=icon}, text=name, last_user=player}) if (ctag ~= nil) then - if (global.nullius_tag_android == nil) then - global.nullius_tag_android = {} - global.nullius_android_tag = {} + if (storage.nullius_tag_android == nil) then + storage.nullius_tag_android = {} + storage.nullius_android_tag = {} end - global.nullius_tag_android[ctag.tag_number] = character - global.nullius_android_tag[character.unit_number] = ctag + storage.nullius_tag_android[ctag.tag_number] = character + storage.nullius_android_tag[character.unit_number] = ctag end end @@ -45,16 +45,16 @@ function switch_body(player, target) target_vehicle = target.vehicle end - if (global.nullius_android_tag ~= nil) then - local tag = global.nullius_android_tag[target.unit_number] + if (storage.nullius_android_tag ~= nil) then + local tag = storage.nullius_android_tag[target.unit_number] if (tag ~= nil) then - global.nullius_android_tag[target.unit_number] = nil + storage.nullius_android_tag[target.unit_number] = nil if (tag.valid) then - if (global.nullius_android_name == nil) then - global.nullius_android_name = {} + if (storage.nullius_android_name == nil) then + storage.nullius_android_name = {} end - global.nullius_android_name[target.unit_number] = tag.text - global.nullius_tag_android[tag.tag_number] = nil + storage.nullius_android_name[target.unit_number] = tag.text + storage.nullius_tag_android[tag.tag_number] = nil tag.destroy() end end @@ -71,13 +71,13 @@ function switch_body(player, target) end if ((player.force ~= nil) and player.force.valid) then - if (global.nullius_switch_body_count == nil) then - global.nullius_switch_body_count = { } + if (storage.nullius_switch_body_count == nil) then + storage.nullius_switch_body_count = { } end - local count = global.nullius_switch_body_count[player.force.name] + local count = storage.nullius_switch_body_count[player.force.name] if (count == nil) then count = 0 end count = count + 1 - global.nullius_switch_body_count[player.force.name] = count + storage.nullius_switch_body_count[player.force.name] = count end player.set_controller{type=defines.controllers.character, character=target} @@ -106,8 +106,8 @@ function switch_body(player, target) add_chart_tag(player, oldchar) end - if (global.nullius_body_queue ~= nil) then - local queue = global.nullius_body_queue[player.index] + if (storage.nullius_body_queue ~= nil) then + local queue = storage.nullius_body_queue[player.index] if (queue ~= nil) then queue.last_index = target.unit_number end @@ -130,14 +130,14 @@ function update_queue(player, oldchar) return end - if (global.nullius_body_queue == nil) then - global.nullius_body_queue = {} + if (storage.nullius_body_queue == nil) then + storage.nullius_body_queue = {} end - local queue = global.nullius_body_queue[player.index] + local queue = storage.nullius_body_queue[player.index] if (queue == nil) then queue = {} queue.nodes = {} - global.nullius_body_queue[player.index] = queue + storage.nullius_body_queue[player.index] = queue end local node1 = queue.nodes[oldchar.unit_number] if ((node1 == nil) or (node1.next == nil) or (node1.next.prev ~= node1)) then @@ -188,8 +188,8 @@ function upload_mind(player, target) end function cycle_body(player, rev) - if (global.nullius_body_queue == nil) then return end - local queue = global.nullius_body_queue[player.index] + if (storage.nullius_body_queue == nil) then return end + local queue = storage.nullius_body_queue[player.index] if (queue == nil) then return end if (player.character == nil) then return end @@ -206,7 +206,7 @@ function cycle_body(player, rev) node = node.next end if (node == nil) then - global.nullius_body_queue[player.index] = nil + storage.nullius_body_queue[player.index] = nil return end @@ -217,7 +217,7 @@ function cycle_body(player, rev) local nn = node.next if ((nn == nil) or (np == nil) or (nn.prev == nil) or (np.next == nil) or (nn == node) or (np == node)) then - global.nullius_body_queue[player.index] = nil + storage.nullius_body_queue[player.index] = nil return end if ((body == nil) or (not body.valid) or (body.type ~= "character")) then @@ -254,13 +254,13 @@ script.on_event("nullius-next-body", function(event) end) script.on_event(defines.events.on_chart_tag_removed, function(event) - if ((global.nullius_tag_android ~= nil) and + if ((storage.nullius_tag_android ~= nil) and (event.tag ~= nil) and event.tag.valid) then - local android = global.nullius_tag_android[event.tag.tag_number] + local android = storage.nullius_tag_android[event.tag.tag_number] if (android ~= nil) then - global.nullius_tag_android[event.tag.tag_number] = nil + storage.nullius_tag_android[event.tag.tag_number] = nil if (android.valid) then - global.nullius_android_tag[android.unit_number] = nil + storage.nullius_android_tag[android.unit_number] = nil if (event.player_index ~= nil) then local player = game.players[event.player_index] if (player ~= nil) then @@ -276,26 +276,26 @@ function change_character_entity(oldunit, newchar) local newunit = newchar.unit_number if ((oldunit == nil) or (newunit == oldunit)) then return end - if ((global.nullius_android_tag ~= nil) and - (global.nullius_tag_android ~= nil)) then - local tag = global.nullius_android_tag[oldunit] + if ((storage.nullius_android_tag ~= nil) and + (storage.nullius_tag_android ~= nil)) then + local tag = storage.nullius_android_tag[oldunit] if ((tag ~= nil) and tag.valid and (tag.tag_number ~= nil)) then - global.nullius_android_tag[oldunit] = nil - global.nullius_android_tag[newunit] = tag - global.nullius_tag_android[tag.tag_number] = newchar + storage.nullius_android_tag[oldunit] = nil + storage.nullius_android_tag[newunit] = tag + storage.nullius_tag_android[tag.tag_number] = newchar end - if (global.nullius_android_name ~= nil) then - local name = global.nullius_android_name[oldunit] + if (storage.nullius_android_name ~= nil) then + local name = storage.nullius_android_name[oldunit] if (name ~= nil) then - global.nullius_android_name[oldunit] = nil - global.nullius_android_name[newunit] = name + storage.nullius_android_name[oldunit] = nil + storage.nullius_android_name[newunit] = name end end end - if (global.nullius_body_queue ~= nil) then - for _,queue in pairs(global.nullius_body_queue) do + if (storage.nullius_body_queue ~= nil) then + for _,queue in pairs(storage.nullius_body_queue) do local node = queue.nodes[oldunit] if (node ~= nil) then node.body = newchar @@ -316,8 +316,8 @@ script.on_event(defines.events.on_player_respawned, function(event) local newchar = player.character if ((newchar == nil) or (not newchar.valid)) then return end - if (global.nullius_body_queue == nil) then return end - local queue = global.nullius_body_queue[player.index] + if (storage.nullius_body_queue == nil) then return end + local queue = storage.nullius_body_queue[player.index] if (queue == nil) then return end if (queue.nodes[newchar.unit_number] ~= nil) then return end @@ -332,8 +332,8 @@ end) function rematerialize_body(event) local player = game.players[event.player_index] update_player_upgrades(player) - if (global.nullius_body_queue == nil) then return end - local queue = global.nullius_body_queue[player.index] + if (storage.nullius_body_queue == nil) then return end + local queue = storage.nullius_body_queue[player.index] if (queue == nil) then return end local newchar = player.character diff --git a/nullius/scripts/build.lua b/nullius/scripts/build.lua index 7be2eb7..b54a091 100644 --- a/nullius/scripts/build.lua +++ b/nullius/scripts/build.lua @@ -1,14 +1,14 @@ function entity_added(entity, handbuilt) if (entity.type == "spider-vehicle") then - mecha_added(entity) + mecha_added(entity) return end if (string.sub(entity.name, 1, 8) ~= "nullius-") then if (entity.name == "entity-ghost") then local result = check_pipette(handbuilt) if (result ~= nil) then entity = result end - check_mirror(entity) - end + --check_mirror(entity) + end return end @@ -64,10 +64,10 @@ end function entity_hand_built(event) - entity_added(event.created_entity, event) + entity_added(event.entity, event) end function entity_bot_built(event) - entity_added(event.created_entity, nil) + entity_added(event.entity, nil) end function entity_raised(event) entity_added(event.entity, nil) @@ -96,7 +96,7 @@ script.on_event(defines.events.script_raised_revive, entity_raised) script.on_event(defines.events.on_player_mined_entity, entity_mined) script.on_event(defines.events.on_robot_mined_entity, entity_mined) script.on_event(defines.events.on_entity_died, entity_died) -script.on_event(defines.events.on_entity_destroyed, entity_destroyed) +script.on_event(defines.events.on_object_destroyed, entity_destroyed) function update_tick() @@ -113,6 +113,8 @@ function update_tick() update_grass() elseif (tickmod1 == 9) then update_align() + elseif (tickmod1 == 10) then + check_fixing_machines() elseif (tickmod1 == 11) then local tickmod2 = (game.tick % 15) if (tickmod2 == 2) then diff --git a/nullius/scripts/checkpoint.lua b/nullius/scripts/checkpoint.lua index 4ff2559..429507b 100644 --- a/nullius/scripts/checkpoint.lua +++ b/nullius/scripts/checkpoint.lua @@ -42,7 +42,7 @@ local checkpoint_data = { ["freight-transportation"] = {{ CHK_ITEM, STT_CONSUME, 2, {{"nullius-hydrogen-canister"}} }, { CHK_ITEM, STT_CONSUME, 1, {{"nullius-water-canister"}} }}, ["lubricant"] = {{ CHK_FLUID, STT_PRODUCE, 250, {{"nullius-lubricant"}} }}, - ["plumbing"] = {{ CHK_BUILD, STT_NET, 10, {{"nullius-pump-1"}} }, + ["plumbing"] = {{ CHK_BUILD, STT_NET, 1, {{"nullius-pump-1"}} }, { CHK_BUILD, STT_NET, 10, {{"nullius-medium-tank-2"}} }, { CHK_BUILD, STT_NET, 6, {{"nullius-relief-valve"}} }}, @@ -51,7 +51,7 @@ local checkpoint_data = { ["sensor"] = {{ CHK_ITEM, STT_CONSUME, 100, {{"nullius-sensor-1"}} }}, ["freight-logistics"] = {{ CHK_BUILD, STT_NET, 1, {{"nullius-locomotive-1"}} }, { CHK_BUILD, STT_NET, 2, {{"train-stop"}} }, - { CHK_BUILD, STT_NET, 150, {{"straight-rail"},{"curved-rail",4}} }}, + { CHK_BUILD, STT_NET, 150, {{"straight-rail"}}}},--,{"curved-rail-a",4}} }}, ["limestone"] = {{ CHK_ITEM, STT_PRODUCE, 500, {{"nullius-limestone"}} }}, ["optimization"] = {{ CHK_ITEM, STT_PRODUCE, 5, {{"nullius-haste-module-1"}} }, { CHK_ITEM, STT_PRODUCE, 5, {{"nullius-efficiency-module-1"}} }}, @@ -61,14 +61,14 @@ local checkpoint_data = { { CHK_ITEM, STT_PRODUCE, 6, {{"nullius-robot-frame-1"}} }}, ["logistic-robot"] = {{ CHK_ITEM, STT_PRODUCE, 8, {{"nullius-logistic-bot-1"}} }, { CHK_BUILD, STT_NET, 2, {{"nullius-small-supply-chest-1"}} }}, - ["logistics"] = {{ CHK_BUILD, STT_NET, 10, {{"turbo-inserter"}} }, + ["logistics"] = {{ CHK_BUILD, STT_NET, 10, {{"bob-turbo-inserter"}} }, { CHK_BUILD, STT_NET, 10, {{"fast-underground-belt"}} }}, ["concrete"] = {{ CHK_ITEM, STT_PRODUCE, 1000, {{"concrete"}} }}, ["heat-pipe"] = {{ CHK_ITEM, STT_PRODUCE, 50, {{"nullius-heat-pipe-1"}} }}, ["chemical-engineering"] = {{ CHK_BUILD, STT_NET, 10, {{"nullius-chemical-plant-2"}} }}, - ["chirality"] = {{ CHK_BUILD, STT_NET, 2, {{"nullius-mirror-surge-electrolyzer-2"}} }, - { CHK_BUILD, STT_NET, 2, {{"nullius-mirror-flotation-cell-2"}} }, - { CHK_BUILD, STT_NET, 2, {{"nullius-mirror-combustion-chamber-2"}} }}, + -- ["chirality"] = {{ CHK_BUILD, STT_NET, 2, {{"nullius-mirror-surge-electrolyzer-2"}} }, + -- { CHK_BUILD, STT_NET, 2, {{"nullius-mirror-flotation-cell-2"}} }, + -- { CHK_BUILD, STT_NET, 2, {{"nullius-mirror-combustion-chamber-2"}} }}, ["propene"] = {{ CHK_FLUID, STT_CONSUME, 300000, {{"nullius-propene"}} }}, ["titanium-ingot"] = {{ CHK_ITEM, STT_PRODUCE, 100, {{"nullius-titanium-ingot"}} }}, @@ -87,7 +87,7 @@ local checkpoint_data = { { CHK_BUILD, STT_NET, 4, {{"nullius-relay-construction-2"}} }}, ["large-tank"] = {{ CHK_BUILD, STT_NET, 4, {{"nullius-large-tank-2"}} }}, ["substation"] = {{ CHK_BUILD, STT_NET, 4, {{"nullius-substation-2"}} }}, - ["logistics-2"] = {{ CHK_BUILD, STT_NET, 40, {{"stack-inserter"}} }, + ["logistics-2"] = {{ CHK_BUILD, STT_NET, 40, {{"bulk-inserter"}} }, { CHK_BUILD, STT_NET, 40, {{"express-underground-belt"}} }}, ["lab-2"] = {{ CHK_BUILD, STT_NET, 10, {{"nullius-lab-2"}} }}, ["productivity-module"] = {{ CHK_ITEM, STT_PRODUCE, 50, {{"nullius-productivity-module-1"}} }}, @@ -102,8 +102,8 @@ local checkpoint_data = { ["large-miner"] = {{ CHK_BUILD, STT_NET, 50, {{"nullius-large-miner-1"}} }}, ["filter"] = {{ CHK_ITEM, STT_PRODUCE, 100, {{"nullius-filter-2"}, {"nullius-box-filter-2", 5}} }}, - ["pumping"] = {{ CHK_BUILD, STT_NET, 40, {{"nullius-pump-2"}} }}, - ["logistics-3"] = {{ CHK_BUILD, STT_NET, 10, {{"ultimate-splitter"}} }}, + ["pumping"] = {{ CHK_BUILD, STT_NET, 5, {{"nullius-pump-2"}} }}, + ["logistics-3"] = {{ CHK_BUILD, STT_NET, 10, {{"bob-ultimate-splitter"}} }}, ["automation"] = {{ CHK_BUILD, STT_NET, 20, {{"nullius-large-assembler-2"}} }}, ["mining"] = {{ CHK_ITEM, STT_CONSUME, 1200000, {{"iron-ore"},{"nullius-box-iron-ore",5}} }, { CHK_ITEM, STT_CONSUME, 900000, {{"nullius-sandstone"},{"nullius-box-sandstone",5}} }, @@ -174,17 +174,17 @@ local broken_data = { } function init_broken() - if ((global.nullius_broken_status == nil) or - (not global.nullius_alignment)) then - global.nullius_broken_status = {} + if ((storage.nullius_broken_status == nil) or + (not storage.nullius_alignment)) then + storage.nullius_broken_status = {} end - if (global.nullius_alignment) then + if (storage.nullius_alignment) then broken_data["align-transponder"] = 1 end for suffix, count in pairs(broken_data) do local ind = "nullius-broken-" .. suffix - local cur = (global.nullius_broken_status[ind] or 0) - global.nullius_broken_status[ind] = (count + cur) + local cur = (storage.nullius_broken_status[ind] or 0) + storage.nullius_broken_status[ind] = (count + cur) end end @@ -209,20 +209,20 @@ function reset_checkpoints(force) end end - if ((global.nullius_broken_status ~= nil) and - (not global.nullius_alignment)) then + if ((storage.nullius_broken_status ~= nil) and + (not storage.nullius_alignment)) then for suffix, count in pairs(broken_data) do local broken_name = "nullius-broken-" .. suffix - if (not broken_disabled(broken_name)) then - checknum = checknum + 1 - checkset[checknum] = {name=broken_name, category=CAT_BROKEN, - reqs={{ CHK_ITEM, STT_CONSUME, count, {{ broken_name }} }}} + if (not broken_disabled(broken_name)) then + checknum = checknum + 1 + checkset[checknum] = {name=broken_name, category=CAT_BROKEN, + reqs={{ CHK_ITEM, STT_CONSUME, count, {{ broken_name }} }}} + end end - end end - global.checkpoint_list[force.index] = checkset - global.checkpoint_number[force.index] = checknum + storage.checkpoint_list[force.index] = checkset + storage.checkpoint_number[force.index] = checknum end function init_force_checkpoints(force) @@ -241,8 +241,8 @@ function init_force_checkpoints(force) end function update_checkpoint_list(techname) - if (global.checkpoint_prereqs == nil) then return end - if (global.checkpoint_prereqs[techname] == true) then + if (storage.checkpoint_prereqs == nil) then return end + if (storage.checkpoint_prereqs[techname] == true) then for _, force in pairs(game.forces) do if (force.research_enabled) then reset_checkpoints(force) @@ -255,15 +255,15 @@ function init_checkpoint_prereqs() local prereqs = { } for suffix, check in pairs(checkpoint_data) do local techname = "nullius-checkpoint-" .. suffix - local tech = game.technology_prototypes[techname] + local tech = prototypes.technology[techname] for _, prereq in pairs(tech.prerequisites) do prereqs[prereq.name] = true end end - global.checkpoint_prereqs = prereqs - global.checkpoint_list = { } - global.checkpoint_number = { } + storage.checkpoint_prereqs = prereqs + storage.checkpoint_list = { } + storage.checkpoint_number = { } end @@ -271,22 +271,22 @@ local function count_req_list(list, stats, calc) local count = 0 for _,item in pairs(list) do local itemname = item[1] - local value = 0 + local value = 0 if (calc == STT_PRODUCE) then value = stats.get_input_count(itemname) elseif (calc == STT_CONSUME) then value = stats.get_output_count(itemname) elseif (calc == STT_NET) then value = stats.get_input_count(itemname) - stats.get_output_count(itemname) - if (item[3] ~= nil) then - if (value < item[3]) then - item[3] = value - else - value = value - item[3] - end - elseif (value < 0) then - item[3] = value - end + if (item[3] ~= nil) then + if (value < item[3]) then + item[3] = value + else + value = value - item[3] + end + elseif (value < 0) then + item[3] = value + end end if (item[2] ~= nil) then value = (value * item[2]) end count = count + value @@ -303,27 +303,27 @@ local function test_checkpoint_req(force, req) local list = req[4] local stats = nil if (ctyp == CHK_ITEM) then - stats = force.item_production_statistics + stats = force.get_item_production_statistics("nauvis") elseif (ctyp == CHK_FLUID) then - stats = force.fluid_production_statistics + stats = force.get_fluid_production_statistics("nauvis") elseif (ctyp == CHK_BUILD) then - stats = force.entity_build_count_statistics + stats = force.get_entity_build_count_statistics("nauvis") elseif (ctyp == CHK_OBJECTIVE) then - if (global.nullius_mission_status == nil) then return 0 end - if (global.nullius_mission_complete) then return 1 end + if (storage.nullius_mission_status == nil) then return 0 end + if (storage.nullius_mission_complete) then return 1 end return math.min(1, math.max(0, - (global.nullius_mission_status[calc] / goal))) + (storage.nullius_mission_status[calc] / goal))) elseif (ctyp == CHK_SPECIAL) then if (calc == 1) then - if (global.nullius_switch_body_count == nil) then return 0 end - local count = global.nullius_switch_body_count[force.name] + if (storage.nullius_switch_body_count == nil) then return 0 end + local count = storage.nullius_switch_body_count[force.name] if (count == nil) then return 0 end return math.min(1, math.max(0, (count / goal))) elseif (calc == 2) then local count = count_req_list(list[1], - force.fluid_production_statistics, STT_CONSUME) + + force.get_fluid_production_statistics("nauvis"), STT_CONSUME) + count_req_list(list[2], - force.item_production_statistics, STT_PRODUCE) + force.get_item_production_statistics("nauvis"), STT_PRODUCE) return math.min(math.max((count / goal), 0), 1) else return 0 @@ -337,25 +337,25 @@ local function test_checkpoint_req(force, req) end local function update_checkpoint_force(force, tick) - local num = global.checkpoint_number[force.index] + local num = storage.checkpoint_number[force.index] if ((num == nil) or (num < 1)) then return end local ind = (tick % num) + 1 - local lst = global.checkpoint_list[force.index] + local lst = storage.checkpoint_list[force.index] local check = lst[ind] local tech = nil if (check.category == CAT_BROKEN) then if (broken_disabled(check.name)) then reset_checkpoints(force) - return - end + return + end else tech = force.technologies[check.name] if (tech == nil) then return end if ((not tech.enabled) or tech.researched) then reset_checkpoints(force) - return - end + return + end end local progress = 0 @@ -367,48 +367,48 @@ local function update_checkpoint_force(force, tick) if ((progress >= count) or (count < 1)) then if (tech ~= nil) then - if ((force.current_research == nil) or - (force.current_research.name ~= tech.name)) then - force.print({"technology-description.nullius-complete-checkpoint", - "[technology="..tech.name.."]"}, {1, 0.75, 0.4}) - end - if (force.research_queue_enabled and (force.current_research ~= nil) and - (force.current_research.name ~= tech.name)) then - -- When checkpoint is in research queue, researching item - -- clears anything else in queue that has it as a dependency. - -- Try to restore the original queue afterwards. - local saved_queue = { } - local saved_count = 1 - local found = nil - for ind,q in pairs(force.research_queue) do - if (ind > 1) then - if (q.name == tech.name) then - found = saved_count - else - saved_count = saved_count + 1 - saved_queue[saved_count] = q - end - else - saved_queue[1] = q - end - end - tech.researched = true - if ((found ~= nil) and (found < saved_count)) then - force.research_queue = saved_queue - end + if ((force.current_research == nil) or + (force.current_research.name ~= tech.name)) then + force.print({"technology-description.nullius-complete-checkpoint", + "[technology="..tech.name.."]"}, {1, 0.75, 0.4}) + end + if ((force.current_research ~= nil) and (force.current_research.name ~= tech.name)) then + -- When checkpoint is in research queue, researching item + -- clears anything else in queue that has it as a dependency. + -- Try to restore the original queue afterwards. + local saved_queue = { } + local saved_count = 1 + local found = nil + for ind,q in pairs(force.research_queue) do + if (ind > 1) then + if (q.name == tech.name) then + found = saved_count + else + saved_count = saved_count + 1 + saved_queue[saved_count] = q + end + else + saved_queue[1] = q + end + end + tech.researched = true + if ((found ~= nil) and (found < saved_count)) then + force.research_queue = saved_queue + end + else + tech.researched = true + end else - tech.researched = true + broken_finished_delayed(check.name) end - else - broken_finished(check.name) - end elseif (tech ~= nil) then progress = (progress / count) if ((force.current_research ~= nil) and (force.current_research.name == tech.name)) then - force.research_progress = progress + force.research_progress = progress else - force.set_saved_technology_progress(tech, progress) + -- force.set_saved_technology_progress(tech, progress) + force.technologies[tech.name].saved_progress = progress end end end diff --git a/nullius/scripts/drone.lua b/nullius/scripts/drone.lua index 5e5aca4..db300d5 100644 --- a/nullius/scripts/drone.lua +++ b/nullius/scripts/drone.lua @@ -241,7 +241,7 @@ function miner_effect(event, ore, size, richness, goal_ind, goal_amount) local c = tile_center(event) local a = area_bound(c, (size+2)) local threshold = size * size * 0.14063 - tiles = s.find_tiles_filtered{area=a, position=c, radius=(size+0.5), collision_mask="ground-tile"} + tiles = s.find_tiles_filtered{area=a, position=c, radius=(size+0.5), collision_mask="ground_tile"} for i, t in pairs(tiles) do local dx = (t.position.x - c.x) local dy = (t.position.y - c.y) @@ -276,7 +276,7 @@ end local function count_resource(event, name, limit, objective) if ((event.source_entity ~= nil) and event.source_entity.valid and - (global.nullius_mission_status ~= nil)) then + (storage.nullius_mission_status ~= nil)) then local s = game.surfaces[event.surface_index] local total = 0 local entities = s.find_entities_filtered{name=name, @@ -308,7 +308,7 @@ function petroleum_effect(event) local angle = 2 * math.pi * math.random() local distance = (math.random() * 32) + (math.random() * 24) - 28 local p = {x = c.x + (math.cos(angle) * distance), y = c.y + (math.sin(angle) * distance)} - local overlap_water = s.count_tiles_filtered{area=area_bound(p, 2), limit=2, collision_mask="water-tile"} + local overlap_water = s.count_tiles_filtered{area=area_bound(p, 2), limit=2, collision_mask="water_tile"} local overlap_obstacle = s.count_entities_filtered{area=area_bound(p, 4), limit=2} if ((overlap_obstacle > 0) or (overlap_water > 0)) then if ((n % 3) == 0) then @@ -347,7 +347,7 @@ function algaculture_effect(event) local s = game.surfaces[event.surface_index] local c = tile_center(event) local a = area_bound(c, 80) - local land_count = s.count_tiles_filtered{area=a, position=c, radius=80, limit=12000, collision_mask="ground-tile"} + local land_count = s.count_tiles_filtered{area=a, position=c, radius=80, limit=12000, collision_mask="ground_tile"} local land_bonus = 1.0 + (math.min(land_count, 12000) / 6000) local nearby_count = count_decoratives(s, a, 120, "nullius-algae") local algae_count = math.floor((((500 * math.random()) + 250) * land_bonus) / (math.min(nearby_count, 120) + 30)) @@ -442,20 +442,20 @@ function horticulture_effect(event) local center = area_center(event) surface.request_to_generate_chunks(center, 6) - if (global.nullius_grass_queue == nil) then - global.nullius_grass_queue = { } - global.nullius_grass_head = 1 - global.nullius_grass_tail = 0 - global.nullius_grass_timer = 0 + if (storage.nullius_grass_queue == nil) then + storage.nullius_grass_queue = { } + storage.nullius_grass_head = 1 + storage.nullius_grass_tail = 0 + storage.nullius_grass_timer = 0 end - global.nullius_grass_tail = global.nullius_grass_tail + 1 + storage.nullius_grass_tail = storage.nullius_grass_tail + 1 local fillsurface = landfill_surface(surface) fillsurface.request_to_generate_chunks(center, 4) local force = nil if ((event.source_entity ~= nil) and event.source_entity.valid) then force = event.source_entity.force end - global.nullius_grass_queue[global.nullius_grass_tail] = { + storage.nullius_grass_queue[storage.nullius_grass_tail] = { surface = surface, center = center, fillsurface = fillsurface, force = force } @@ -489,7 +489,7 @@ function arboriculture_effect(event) area=area_bound(p, 1.2), limit=2} if ((overlap_obstacle < 1) or (math.random() < 0.4)) then local near_tiles = s.find_tiles_filtered{area=area_bound(p, 1.8), - radius=1.6, collision_mask="ground-tile"} + radius=1.6, collision_mask="ground_tile"} local near_num = 0 for _,nt in pairs(near_tiles) do near_num = near_num + 1 @@ -550,13 +550,13 @@ end function entomology_effect(event) scout_effect(event, 3) - if (global.nullius_mission_status == nil) then return end + if (storage.nullius_mission_status == nil) then return end local s = game.surfaces[event.surface_index] local c = tile_center(event) local attempt_count = 8 + (math.random() * 9) - if (global.nullius_mission_status[2] < 35) then - attempt_count = attempt_count - (34 - global.nullius_mission_status[2]) + if (storage.nullius_mission_status[2] < 35) then + attempt_count = attempt_count - (34 - storage.nullius_mission_status[2]) end for _ = 1, attempt_count do @@ -576,7 +576,7 @@ function entomology_effect(event) if ((overlap_worm < 1) and (overlap_water < 3)) then local a = area_bound(p, 25) local grass_count = s.count_tiles_filtered{area=a, position=p, radius=24, limit=1000, - collision_mask="ground-tile", name={"grass-1", "grass-2", "grass-3", "grass-4"}} + collision_mask="ground_tile", name={"grass-1", "grass-2", "grass-3", "grass-4"}} local tree_count = s.count_entities_filtered{area=a, position=p, radius=24, limit=12, type="tree"} local worm_count = count_decoratives(s, a, 10, "worms-decal") worm_count = worm_count + s.count_entities_filtered{limit=10, area=a, @@ -587,8 +587,8 @@ function entomology_effect(event) if (rv < odds) then local change_ground = false local status = 0 - if (global.nullius_mission_status ~= nil) then - status = global.nullius_mission_status[6] + if (storage.nullius_mission_status ~= nil) then + status = storage.nullius_mission_status[6] if (status == nil) then status = 0 end status = math.max(0, math.min(100, status)) end @@ -615,7 +615,7 @@ function entomology_effect(event) if (change_ground) then local near_tiles = s.find_tiles_filtered{area=o, - position=p, radius=5.4, collision_mask="ground-tile"} + position=p, radius=5.4, collision_mask="ground_tile"} for _,nt in pairs(near_tiles) do local dx = nt.position.x - p.x local dy = nt.position.y - p.y @@ -672,7 +672,7 @@ end function aquaculture_effect(event) scout_effect(event, 3) - if (global.nullius_mission_status == nil) then return end + if (storage.nullius_mission_status == nil) then return end local s = game.surfaces[event.surface_index] local c = tile_center(event) @@ -680,15 +680,15 @@ function aquaculture_effect(event) local algae_count = count_decoratives(s, a, 40, "nullius-algae") local fish_count = s.count_entities_filtered{area=a, limit=40, type="fish"} local attempt_count = ((((math.random() * 31) + (6 * algae_count)) / (10 + fish_count)) - 3) / 2 - if (global.nullius_mission_status[2] < 68) then - attempt_count = attempt_count - ((68 - global.nullius_mission_status[2]) / 2) + if (storage.nullius_mission_status[2] < 68) then + attempt_count = attempt_count - ((68 - storage.nullius_mission_status[2]) / 2) end for _ = 1, attempt_count do local angle = 2 * math.pi * math.random() local distance = (math.random() * 96) + (math.random() * 48) - 72 local p = {x = c.x + (math.cos(angle) * distance), y = c.y + (math.sin(angle) * distance)} - local overlap_land = s.count_tiles_filtered{area=area_bound(p, 1), limit=2, collision_mask="ground-tile"} + local overlap_land = s.count_tiles_filtered{area=area_bound(p, 1), limit=2, collision_mask="ground_tile"} local overlap_obstacle = s.count_entities_filtered{area=area_bound(p, 1.5), limit=2} if ((overlap_obstacle < 1) and (overlap_land < 1)) then s.create_entity({name="fish", amount=1, position=p}) @@ -703,7 +703,7 @@ end function husbandry_effect(event) scout_effect(event, 4) - if (global.nullius_mission_status == nil) then return end + if (storage.nullius_mission_status == nil) then return end local s = game.surfaces[event.surface_index] local c = tile_center(event) @@ -742,19 +742,18 @@ function husbandry_effect(event) position=c, radius=64, limit=4, name="nullius-fumarole"}) local penalty = 2.5 * (8 + fumarole_count) * (3 + nest_count) local bonus = (math.sqrt(fish_count * tree_count) * - (global.nullius_mission_status[2] - 55) / 30) + (storage.nullius_mission_status[2] - 55) / 30) local odds = math.sqrt(math.max(0, ((bonus / penalty) - 0.1))) - 0.2 if (math.random() > odds) then return end local nest = s.create_entity{name="biter-spawner", amount=1, position=c} if (nest == nil) then return end - local old_status = global.nullius_mission_status[8] + local old_status = storage.nullius_mission_status[8] if (old_status == nil) then old_status = 0 end if (old_status == 0) then game.forces["enemy"].reset_evolution() - elseif (game.forces["enemy"].evolution_factor < 0.8) then - game.forces["enemy"].evolution_factor = - game.forces["enemy"].evolution_factor + 0.01 + elseif (game.forces["enemy"].get_evolution_factor() < 0.8) then + game.forces["enemy"].set_evolution_factor(game.forces["enemy"].get_evolution_factor() + 0.01) end local source = event.source_entity @@ -762,19 +761,19 @@ function husbandry_effect(event) local force = source.force if (force == nil) then return end local new_status = 100 - if (not global.nullius_mission_complete) then + if (not storage.nullius_mission_complete) then local new_count = s.count_entities_filtered{name="biter-spawner", limit=500} set_mission_goal(8, new_count, force) - new_status = global.nullius_mission_status[8] + new_status = storage.nullius_mission_status[8] end - local invasions = global.nullius_invasions + local invasions = storage.nullius_invasions if (invasions == nil) then invasions = 0 end - local cooldown = global.nullius_invasion_cooldown + local cooldown = storage.nullius_invasion_cooldown if (cooldown ~= nil) then - global.nullius_invasion_cooldown = cooldown - 1 - if (global.nullius_invasion_cooldown < 1) then - global.nullius_invasion_cooldown = nil + storage.nullius_invasion_cooldown = cooldown - 1 + if (storage.nullius_invasion_cooldown < 1) then + storage.nullius_invasion_cooldown = nil end return end @@ -835,7 +834,7 @@ function husbandry_effect(event) limit=2, name={"deepwater", "water", "water-shallow", "deepwater-green", "water-green", "water-mud"}} local overlap_entity = s.count_entities_filtered{area=box, - limit=2, collision_mask = "object-layer"} + limit=2, collision_mask = "object"} if ((overlap_water < 1) and (overlap_entity < 1)) then local unit = s.create_entity{name=unitname, amount=1, position=p} if ((unit ~= nil) and unit.valid) then @@ -859,8 +858,8 @@ function husbandry_effect(event) end local target = source local assassinate = false - global.nullius_invasions = invasions - global.nullius_invasion_cooldown = cooldown + storage.nullius_invasions = invasions + storage.nullius_invasion_cooldown = cooldown if (math.random() < player_odds) then local pcount = 0 diff --git a/nullius/scripts/equipment.lua b/nullius/scripts/equipment.lua index 858650b..2d3bda7 100644 --- a/nullius/scripts/equipment.lua +++ b/nullius/scripts/equipment.lua @@ -101,12 +101,12 @@ local function check_coprocessor_tier(bonuses, armorinv, tier, limit) local upgrade = upgrade_data[suffix] if ((upgrade ~= nil) and (upgrade[1] ~= nil) and (upgrade[1][1] == ind1)) then - global.nullius_in_update_equipment = true + storage.nullius_in_update_equipment = true local pos = equip.position local newname = "nullius-deactivated-" .. suffix grid.take{equipment=equip, position=pos} grid.put{name=newname, position=pos} - global.nullius_in_update_equipment = false + storage.nullius_in_update_equipment = false end end end @@ -125,7 +125,7 @@ end function update_player_upgrades(player) if (player.character == nil) then return end - if (global.nullius_in_update_equipment) then return end + if (storage.nullius_in_update_equipment) then return end local bonuses = { 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 } local drain = 0 @@ -142,40 +142,42 @@ function update_player_upgrades(player) local armor = armorinv[i] if (armor.valid_for_read and (armor.grid ~= nil)) then for _,equip in pairs(armor.grid.equipment) do - local name = equip.name - if (string.sub(name, 1, 8) == "nullius-") then - local midfix = string.sub(name, 9, 16) - if (midfix == "upgrade-") then - local suffix = string.sub(name, 17, -1) - local upgrade = upgrade_data[suffix] - if (upgrade ~= nil) then - for _,bonus in pairs(upgrade) do - local ind = bonus[1] - bonuses[ind] = bonuses[ind] + bonus[2] - if (ind == UPG_COST) then - costnum = costnum + 1 - if (costlist == nil) then costlist = { } end - costlist[costnum] = equip - end - end - end - elseif (midfix == "refueler") then - refueler = true - end - end - - drain = drain + equip.prototype.energy_source.drain - if (equip.prototype.energy_production > 0) then - production = production + equip.prototype.energy_production - if (equip.burner ~= nil) then - local burninv = equip.burner.inventory - if ((burninv ~= nil) and burninv.valid) then - generatornum = generatornum + 1 - if (generators == nil) then generators = { } end - generators[generatornum] = equip - end + if equip.type ~= "equipment-ghost" then + local name = equip.name + if (string.sub(name, 1, 8) == "nullius-") then + local midfix = string.sub(name, 9, 16) + if (midfix == "upgrade-") then + local suffix = string.sub(name, 17, -1) + local upgrade = upgrade_data[suffix] + if (upgrade ~= nil) then + for _,bonus in pairs(upgrade) do + local ind = bonus[1] + bonuses[ind] = bonuses[ind] + bonus[2] + if (ind == UPG_COST) then + costnum = costnum + 1 + if (costlist == nil) then costlist = { } end + costlist[costnum] = equip + end + end + end + elseif (midfix == "refueler") then + refueler = true + end + end + + drain = drain + equip.prototype.energy_source.drain + if (equip.prototype.energy_production > 0) then + production = production + equip.prototype.energy_production + if (equip.burner ~= nil) then + local burninv = equip.burner.inventory + if ((burninv ~= nil) and burninv.valid) then + generatornum = generatornum + 1 + if (generators == nil) then generators = { } end + generators[generatornum] = equip + end + end + end end - end end end end @@ -240,12 +242,12 @@ function update_player_upgrades(player) local unit = player.character.unit_number if (costlist ~= nil) then - if (global.nullius_crafting_equipment == nil) then - global.nullius_crafting_equipment = { } + if (storage.nullius_crafting_equipment == nil) then + storage.nullius_crafting_equipment = { } end local curr = nil - if (global.nullius_crafting_equipment[unit] ~= nil) then - curr = global.nullius_crafting_equipment[unit].current + if (storage.nullius_crafting_equipment[unit] ~= nil) then + curr = storage.nullius_crafting_equipment[unit].current end local totalcost = (bonuses[UPG_COST] * 1000 * (1 + scale_multiple(bonuses[UPG_COST_MULT], 1))) @@ -254,23 +256,23 @@ function update_player_upgrades(player) end local prodbonus = bonuses[UPG_CRAFT_PROD] if (prodbonus <= 0) then prodbonus = nil end - global.nullius_crafting_equipment[unit] = { + storage.nullius_crafting_equipment[unit] = { cost = totalcost, lst = costlist, current = curr, mod = craftmod, prod = prodbonus } - elseif (global.nullius_crafting_equipment ~= nil) then - global.nullius_crafting_equipment[unit] = nil + elseif (storage.nullius_crafting_equipment ~= nil) then + storage.nullius_crafting_equipment[unit] = nil end if (refueler and (generators ~= nil)) then - if (global.nullius_generator_equipment == nil) then - global.nullius_generator_equipment = { } + if (storage.nullius_generator_equipment == nil) then + storage.nullius_generator_equipment = { } end - global.nullius_generator_equipment[unit] = { + storage.nullius_generator_equipment[unit] = { character = player.character, lst = generators } - elseif (global.nullius_generator_equipment ~= nil) then - global.nullius_generator_equipment[unit] = nil + elseif (storage.nullius_generator_equipment ~= nil) then + storage.nullius_generator_equipment[unit] = nil end end @@ -289,7 +291,7 @@ end local function equipment_placed(event) if ((event.equipment.name == "nullius-refueler") or (event.equipment.type == "generator-equipment")) then - global.nullius_refueler_inserted_tick = event.tick + storage.nullius_refueler_inserted_tick = event.tick end armor_changed(event) end @@ -297,7 +299,7 @@ end local function equipment_removed(event) if ((event.equipment == "nullius-refueler") or (string.sub(event.equipment, 1, 17) == "nullius-portable-")) then - global.nullius_refueler_inserted_tick = event.tick + storage.nullius_refueler_inserted_tick = event.tick end armor_changed(event) end @@ -308,20 +310,20 @@ script.on_event(defines.events.on_player_armor_inventory_changed, armor_changed) function equipment_installed(event) - if (global.nullius_in_update_equipment) then return end + if (storage.nullius_in_update_equipment) then return end local grid = event.grid local eq = event.equipment if ((eq == nil) or (grid == nil)) then return end if (string.sub(eq.name, 1, 8) ~= "nullius-") then return end if (string.sub(eq.name, 9, 24) == "charged-battery-") then - global.nullius_in_update_equipment = true + storage.nullius_in_update_equipment = true local pos = eq.position local newname = "nullius-battery-" .. string.sub(eq.name, 25, -1) grid.take{equipment=eq, position=pos} local eq2 = grid.put{name=newname, position=pos} eq2.energy = eq2.max_energy - global.nullius_in_update_equipment = false + storage.nullius_in_update_equipment = false end end @@ -416,12 +418,12 @@ end script.on_event(defines.events.on_pre_player_crafted_item, function(event) - if (global.nullius_crafting_equipment == nil) then return end + if (storage.nullius_crafting_equipment == nil) then return end local player = game.players[event.player_index] if (player == nil) then return end local character = player.character if (character == nil) then return end - local equipment = global.nullius_crafting_equipment[character.unit_number] + local equipment = storage.nullius_crafting_equipment[character.unit_number] if (equipment == nil) then return end local recipe = event.recipe @@ -441,19 +443,19 @@ script.on_event(defines.events.on_pre_player_crafted_item, script.on_event(defines.events.on_player_crafted_item, function(event) - if ((global.nullius_broken_status ~= nil) and + if ((storage.nullius_broken_status ~= nil) and (string.sub(event.recipe.name, 1, 15) == "nullius-broken-")) then broken_crafted(event.recipe.name) end - if (global.nullius_crafting_equipment == nil) then return end + if (storage.nullius_crafting_equipment == nil) then return end local recipe = event.recipe if (not event.item_stack.valid_for_read) then return end local player = game.players[event.player_index] if (player == nil) then return end local character = player.character if (character == nil) then return end - local equipment = global.nullius_crafting_equipment[character.unit_number] + local equipment = storage.nullius_crafting_equipment[character.unit_number] if (equipment == nil) then return end if (recipe.products[1] == nil) then return end local itemname = event.item_stack.name @@ -477,8 +479,7 @@ script.on_event(defines.events.on_player_crafted_item, local num = math.floor(odds) if ((odds - num) > math.random()) then num = num + 1 end if (num >= 1) then - local tab = global.nullius_productivity_recipes - if ((tab ~= nil) and (tab[recipe.name] == true)) then + if recipe.prototype.allowed_effects["productivity"] then player.insert({name=event.item_stack.name, count=num}) end end @@ -502,22 +503,9 @@ script.on_event(defines.events.on_player_crafted_item, end ) - -function init_productivity_recipes() - local newprod = { } - local proto = game.item_prototypes["nullius-productivity-module-1"] - if ((proto ~= nil) and (proto.limitations ~= nil)) then - for _,name in pairs(proto.limitations) do - newprod[name] = true - end - end - global.nullius_productivity_recipes = newprod -end - - function update_generators() - if (global.nullius_generator_equipment == nil) then return end - for i,e in pairs(global.nullius_generator_equipment) do + if (storage.nullius_generator_equipment == nil) then return end + for i,e in pairs(storage.nullius_generator_equipment) do local c = e.character if ((c == nil) and (e.mech ~= nil)) then c = e.mech.entity @@ -531,15 +519,15 @@ function update_generators() if ((burninv ~= nil) and burninv.valid) then local content = burninv.get_contents() local lastfuel = nil - for fuelname,_ in pairs(content) do - lastfuel = fuelname - local fuelnum = burninv.get_insertable_count(fuelname) + for _,fuel in pairs(content) do + lastfuel = fuel.name + local fuelnum = burninv.get_insertable_count(fuel.name) if (fuelnum > 0) then - fuelnum = c.remove_item({name=fuelname, count=fuelnum}) + fuelnum = c.remove_item({name=fuel.name, count=fuelnum}) if (fuelnum > 0) then - local actual = burninv.insert({name=fuelname, count=fuelnum}) + local actual = burninv.insert({name=fuel.name, count=fuelnum}) if (actual < fuelnum) then - c.insert({name=fuelname, count=(fuelnum - actual)}) + c.insert({name=fuel.name, count=(fuelnum - actual)}) end end end @@ -581,11 +569,11 @@ function update_generators() if ((spentinv ~= nil) and spentinv.valid and (not spentinv.is_empty())) then local spent = spentinv.get_contents() - for itemname,itemcount in pairs(spent) do - if (c.can_insert({name=itemname, count=itemcount})) then - local diff = c.insert({name=itemname, count=itemcount}) + for _,item in pairs(spent) do + if (c.can_insert({name=item.name, count=item.count})) then + local diff = c.insert({name=item.name, count=item.count}) if (diff > 0) then - spentinv.remove({name=itemname, count=diff}) + spentinv.remove({name=item.name, count=diff}) end end end @@ -607,32 +595,32 @@ function update_generators() return end else - global.nullius_generator_equipment[i] = nil + storage.nullius_generator_equipment[i] = nil end end end function insert_mecha_list(e) - if (global.nullius_mecha_list == nil) then - global.nullius_mecha_list = { } - elseif (global.nullius_mecha_list[e.unit_number] ~= nil) then + if (storage.nullius_mecha_list == nil) then + storage.nullius_mecha_list = { } + elseif (storage.nullius_mecha_list[e.unit_number] ~= nil) then return end local newlst = { entity = e, tick = -1, unit = e.unit_number } - if (global.nullius_mecha_head ~= nil) then - newlst.prev = global.nullius_mecha_head + if (storage.nullius_mecha_head ~= nil) then + newlst.prev = storage.nullius_mecha_head newlst.next = newlst.prev.next newlst.next.prev = newlst newlst.prev.next = newlst else newlst.next = newlst newlst.prev = newlst - global.nullius_mecha_head = newlst + storage.nullius_mecha_head = newlst end - global.nullius_mecha_list[newlst.unit] = newlst + storage.nullius_mecha_list[newlst.unit] = newlst end function mecha_added(entity) @@ -646,7 +634,7 @@ function mecha_added(entity) end function find_all_mechas() - global.nullius_refueler_inserted_tick = 1 + storage.nullius_refueler_inserted_tick = 1 for _,surface in pairs(game.surfaces) do local mechs = surface.find_entities_filtered{type="spider-vehicle"} for _,mecha in pairs(mechs) do @@ -679,30 +667,30 @@ function check_mecha_equipment(node) if (refueler and (generators ~= nil)) then local new_entry = { mech = node, lst = generators } - if (global.nullius_generator_equipment == nil) then - global.nullius_generator_equipment = { } + if (storage.nullius_generator_equipment == nil) then + storage.nullius_generator_equipment = { } else - local old_entry = global.nullius_generator_equipment[node.unit] + local old_entry = storage.nullius_generator_equipment[node.unit] if (old_entry ~= nil) then new_entry.last_reactor_fuel = old_entry.last_reactor_fuel new_entry.last_generator_fuel = old_entry.last_generator_fuel end end - global.nullius_generator_equipment[node.unit] = new_entry - elseif (global.nullius_generator_equipment ~= nil) then - global.nullius_generator_equipment[node.unit] = nil + storage.nullius_generator_equipment[node.unit] = new_entry + elseif (storage.nullius_generator_equipment ~= nil) then + storage.nullius_generator_equipment[node.unit] = nil end end function update_mechas() - if (global.nullius_mecha_head == nil) then return end - if (global.nullius_refueler_inserted_tick == nil) then return end - local node = global.nullius_mecha_head.next + if (storage.nullius_mecha_head == nil) then return end + if (storage.nullius_refueler_inserted_tick == nil) then return end + local node = storage.nullius_mecha_head.next if (not node.entity.valid) then - global.nullius_mecha_list[node.unit] = nil - if (node == global.nullius_mecha_head) then - global.nullius_mecha_list = nil - global.nullius_mecha_head = nil + storage.nullius_mecha_list[node.unit] = nil + if (node == storage.nullius_mecha_head) then + storage.nullius_mecha_list = nil + storage.nullius_mecha_head = nil else node.next.prev = node.prev node.prev.next = node.next @@ -710,8 +698,8 @@ function update_mechas() return end - global.nullius_mecha_head = node - if (node.tick <= global.nullius_refueler_inserted_tick) then + storage.nullius_mecha_head = node + if (node.tick <= storage.nullius_refueler_inserted_tick) then node.tick = game.tick check_mecha_equipment(node) end diff --git a/nullius/scripts/geothermal.lua b/nullius/scripts/geothermal.lua index 1b7a4d3..8f3a2b2 100644 --- a/nullius/scripts/geothermal.lua +++ b/nullius/scripts/geothermal.lua @@ -1,10 +1,10 @@ function init_geothermal() - global.nullius_stirling_buckets = {} + storage.nullius_stirling_buckets = {} for i=0,442 do - global.nullius_stirling_buckets[i] = { } - global.nullius_stirling_buckets[i][1] = { } - global.nullius_stirling_buckets[i][2] = { } - global.nullius_stirling_buckets[i][3] = { } + storage.nullius_stirling_buckets[i] = { } + storage.nullius_stirling_buckets[i][1] = { } + storage.nullius_stirling_buckets[i][2] = { } + storage.nullius_stirling_buckets[i][3] = { } end end @@ -12,9 +12,11 @@ function destroy_stirling_engine(entry) if ((entry.heat ~= nil) and (entry.heat.valid)) then entry.heat.destroy() end - rendering.destroy(entry.turbine) + + entry.turbine.destroy() if (entry.shadow ~= 0) then - rendering.destroy(entry.shadow) + rendering.get_object_by_id(entry.shadow).destroy() + --entry.shadow.destroy() end end @@ -51,17 +53,18 @@ function update_engine(e, threshold, ratio, limit, speed) e.last_offset = offs e.last_speed = aspeed - rendering.set_animation_speed(e.turbine, aspeed) - rendering.set_animation_offset(e.turbine, offs) + e.turbine.animation_speed = aspeed + e.turbine.animation_offset = offs if (e.shadow ~= 0) then - rendering.destroy(e.shadow) + -- rendering.destroy(e.shadow) + rendering.get_object_by_id(e.shadow).destroy() e.shadow = 0 end end end function update_geothermal() - local bucket = global.nullius_stirling_buckets[game.tick % 443] + local bucket = storage.nullius_stirling_buckets[game.tick % 443] for i,e in pairs(bucket[1]) do if (e.electric.valid) then update_engine(e, 120, 200000, 13333.33, 0.5) @@ -131,14 +134,14 @@ function build_stirling_engine(entity, level) entity.electric_buffer_size = (bsz * 1000000) end - script.register_on_entity_destroyed(entity) + script.register_on_object_destroyed(entity) local turbine = rendering.draw_animation{ animation = "nullius-stirling-"..orientation.."-turbine-"..level, target = position, surface = surface, animation_speed = 0, render_layer = "lower-object-above-shadow"} local unit = entity.unit_number - local bucket = global.nullius_stirling_buckets[unit % 443] + local bucket = storage.nullius_stirling_buckets[unit % 443] bucket[level][unit] = { electric = entity, heat = heat, @@ -150,7 +153,7 @@ function build_stirling_engine(entity, level) end function remove_stirling_unit(unit, died, level) - local bucket = global.nullius_stirling_buckets[unit % 443] + local bucket = storage.nullius_stirling_buckets[unit % 443] local entry = bucket[level][unit] if entry == nil then return end @@ -176,7 +179,7 @@ function remove_stirling_engine(entity, died, level) end function destroyed_stirling_engine(unit) - local bucket = global.nullius_stirling_buckets[unit % 443] + local bucket = storage.nullius_stirling_buckets[unit % 443] for lvl=1,3 do local entry = bucket[lvl][unit] if (entry ~= nil) then @@ -203,5 +206,5 @@ function build_thermal_tank(entity, level) local surface = entity.surface entity.destroy() surface.create_entity{name = "nullius-thermal-tank-"..dirname.."-"..level, - position = position, force = force, direction = direction} + position = position, force = force, direction = direction, fast_replace = true} end diff --git a/nullius/scripts/informatron.lua b/nullius/scripts/informatron.lua index f796da3..077dc5f 100644 --- a/nullius/scripts/informatron.lua +++ b/nullius/scripts/informatron.lua @@ -57,8 +57,6 @@ function nullius_info_page_content(page_name, player_index, element) element.add{type="label", name="header_1", caption={"nullius.page_fluids_header_1"}, style="heading_1_label"} element.add{type="label", name="text_2", caption={"nullius.page_fluids_text_2"}} - element.add{type="label", name="text_3", caption={"nullius.page_fluids_text_3"}} - element.add{type="label", name="text_4", caption={"nullius.page_fluids_text_4"}} element.add{type="label", name="header_2", caption={"nullius.page_fluids_header_2"}, style="heading_1_label"} element.add{type="label", name="text_5", caption={"nullius.page_fluids_text_5"}} diff --git a/nullius/scripts/landfill.lua b/nullius/scripts/landfill.lua index 686851e..a4d2251 100644 --- a/nullius/scripts/landfill.lua +++ b/nullius/scripts/landfill.lua @@ -136,7 +136,7 @@ local function landfill_map(fillname, goalname) end if ((variation == nil) or (variation < 1) or (variation > 9)) then - local proto = game.tile_prototypes[goalname] + local proto = prototypes.tile[goalname] if (proto ~= nil) then variation = (proto.layer % 9) + 1 else @@ -190,7 +190,7 @@ local function landfill_map(fillname, goalname) end end - if ((newname == nil) or (game.tile_prototypes[newname] == nil)) then + if ((newname == nil) or (prototypes.tile[newname] == nil)) then newname = fillname end return newname @@ -221,13 +221,16 @@ function blank_surface(surface, newname) richness = 0 } - for tn, _ in pairs(game.tile_prototypes) do + for tn, _ in pairs(prototypes.tile) do if tn:find("water") then mapgen.property_expression_names["tile:"..tn..":probability"] = -200 end end game.create_surface(newname, mapgen) + for _, force in pairs(game.forces) do + force.set_surface_hidden(newname, true) + end return game.surfaces[newname] end @@ -527,13 +530,13 @@ function built_tiles(event, entity) for _,t in pairs(event.tiles) do local row = grid[t.position.x] - if (row ~= nil) then - local cell = row[t.position.y] - if (cell ~= nil) then - cell.change = true - cell.oldname = t.old_tile.name + if (row ~= nil) then + local cell = row[t.position.y] + if (cell ~= nil) then + cell.change = true + cell.oldname = t.old_tile.name + end end - end end local newtiles = { } @@ -541,50 +544,50 @@ function built_tiles(event, entity) for _,t in pairs(filltiles) do local tx = t.position.x local row = grid[tx] - if (row ~= nil) then - local ty = t.position.y - local cell = row[ty] - if ((cell ~= nil) and (cell.change or (cell.coast ~= nil))) then - local water = false - local adjacent = false - for i=-1,1 do - if (not water) then - local r = grid[tx+i] - if (r == nil) then - water = true - else - for j=-1,1 do - local c = r[ty+j] - if (c == nil) then - water = true - elseif (c.change) then - adjacent = true - elseif (c.oldname:find("water")) then - water = true - end + if (row ~= nil) then + local ty = t.position.y + local cell = row[ty] + if ((cell ~= nil) and (cell.change or (cell.coast ~= nil))) then + local water = false + local adjacent = false + for i=-1,1 do + if (not water) then + local r = grid[tx+i] + if (r == nil) then + water = true + else + for j=-1,1 do + local c = r[ty+j] + if (c == nil) then + water = true + elseif (c.change) then + adjacent = true + elseif (c.oldname:find("water")) then + water = true + end + end + end end - end - end - end + end local newname = nil if (water) then - if (cell.change) then - newname = coastname - end - elseif (cell.change or adjacent) then - if (cell.coast ~= nil) then - newname = landfill_map(cell.coast, t.name) - else - newname = landfill_map(tilename, t.name) - end - end - if (newname ~= nil) then - newind = newind + 1 - newtiles[newind] = { name = newname, position = t.position } - end + if (cell.change) then + newname = coastname + end + elseif (cell.change or adjacent) then + if (cell.coast ~= nil) then + newname = landfill_map(cell.coast, t.name) + else + newname = landfill_map(tilename, t.name) + end + end + if (newname ~= nil) then + newind = newind + 1 + newtiles[newind] = { name = newname, position = t.position } + end + end end - end end for tx,row in pairs(grid) do @@ -599,56 +602,55 @@ function built_tiles(event, entity) depth = 3 elseif (oname == "water-green") then depth = 2 - green = true + green = true elseif (oname == "deepwater-green") then depth = 3 - green = true + green = true end - if (depth > 1) then + if (depth > 1) then local proximity = 3 - if (depth > 2) then - for i=-2,2 do - local r = grid[tx+i] - if (r ~= nil) then - for j=-2,2 do - local c = r[ty+j] - if ((c ~= nil) and c.change) then - if ((i > -2) and (i < 2) and (j > -2) and (j < 2)) then - proximity = 1 - elseif (proximity > 2) then - proximity = 2 - end - end - end + if (depth > 2) then + for i=-2,2 do + local r = grid[tx+i] + if (r ~= nil) then + for j=-2,2 do + local c = r[ty+j] + if ((c ~= nil) and c.change) then + if ((i > -2) and (i < 2) and (j > -2) and (j < 2)) then + proximity = 1 + elseif (proximity > 2) then + proximity = 2 + end + end + end + end end - end - else - for i=-1,1 do - local r = grid[tx+i] - if (r ~= nil) then - for j=-1,1 do - local c = r[ty+j] - if ((c ~= nil) and c.change) then - proximity = 1 - end - end - end - end - end - - if (proximity < 3) then - local newname = nil - if (proximity > 1) then - newname = ((green and "water-green") or "water") else - newname = ((green and "water-mud") or "water-shallow") + for i=-1,1 do + local r = grid[tx+i] + if (r ~= nil) then + for j=-1,1 do + local c = r[ty+j] + if ((c ~= nil) and c.change) then + proximity = 1 + end + end + end + end end - newind = newind + 1 + if (proximity < 3) then + local newname = nil + if (proximity > 1) then + newname = ((green and "water-green") or "water") + else + newname = ((green and "water-mud") or "water-shallow") + end + newind = newind + 1 newtiles[newind] = { name = newname, position = cell.position } + end end - end - end + end end end @@ -685,7 +687,7 @@ function beach_tile(oldtile) local variation = tonumber(string.sub(oldtile, -1, -1)) local newvar = math.floor((variation + 1) / 2) local sandname = (string.sub(oldtile, 1, -7) .. "sand-" .. newvar) - if (game.tile_prototypes[sandname] ~= nil) then + if (prototypes.tile[sandname] ~= nil) then return sandname end end @@ -1105,7 +1107,7 @@ function grass_area(surface, center, fillsurface) local grass_matrix = init_grass_matrix() local land_tiles = surface.find_tiles_filtered{ - area=a128, collision_mask="ground-tile"} + area=a128, collision_mask="ground_tile"} local candidates = { } local candtiles = { } local candnum = 0 @@ -1258,9 +1260,9 @@ end function update_grass() - if (global.nullius_grass_queue == nil) then return end + if (storage.nullius_grass_queue == nil) then return end if ((game.tick % 3) ~= 1) then return end - local q = global.nullius_grass_queue[global.nullius_grass_head] + local q = storage.nullius_grass_queue[storage.nullius_grass_head] local qx = q.center.x / 32 local qy = q.center.y / 32 local fs = q.fillsurface @@ -1271,10 +1273,10 @@ function update_grass() local chunkbound = {x=(qx+i), y=(qy+j)} if (not (fs.is_chunk_generated(chunkbound) and qs.is_chunk_generated(chunkbound))) then - if (global.nullius_grass_timer < 20) then - global.nullius_grass_timer = global.nullius_grass_timer + 1 + if (storage.nullius_grass_timer < 20) then + storage.nullius_grass_timer = storage.nullius_grass_timer + 1 else - global.nullius_grass_timer = 0 + storage.nullius_grass_timer = 0 fs.force_generate_chunk_requests() end return @@ -1290,10 +1292,10 @@ function update_grass() bump_mission_goal(4, score, q.force) end - global.nullius_grass_queue[global.nullius_grass_head] = nil - global.nullius_grass_head = global.nullius_grass_head + 1 - global.nullius_grass_timer = 0 - if (global.nullius_grass_head > global.nullius_grass_tail) then - global.nullius_grass_queue = nil + storage.nullius_grass_queue[storage.nullius_grass_head] = nil + storage.nullius_grass_head = storage.nullius_grass_head + 1 + storage.nullius_grass_timer = 0 + if (storage.nullius_grass_head > storage.nullius_grass_tail) then + storage.nullius_grass_queue = nil end end diff --git a/nullius/scripts/landing.lua b/nullius/scripts/landing.lua index f17c6d4..1fad405 100644 --- a/nullius/scripts/landing.lua +++ b/nullius/scripts/landing.lua @@ -97,7 +97,7 @@ end function landing_site(surface, loc, frc) for _, entity in pairs (surface.find_entities_filtered{ area = {{loc.x - 32, loc.y - 24}, {loc.x + 32, loc.y + 24}}, - force = "neutral", collision_mask = "player-layer"}) do + force = "neutral", collision_mask = "player"}) do if entity.valid then entity.destroy() end @@ -128,7 +128,7 @@ function landing_site(surface, loc, frc) local can_place = surface.can_place_entity{ name = part.name, position = part_position, force = frc, forced = true, - build_check_type = defines.build_check_type.ghost_place } + build_check_type = defines.build_check_type.ghost_place }--todo: check this if (can_place and ((part.min_separation == nil) or (surface.count_entities_filtered{position = part_position, radius = part.min_separation, limit = 1, diff --git a/nullius/scripts/migrate.lua b/nullius/scripts/migrate.lua index 5cb04e9..fd6cd63 100644 --- a/nullius/scripts/migrate.lua +++ b/nullius/scripts/migrate.lua @@ -1,6 +1,6 @@ function init_legacy_recipes(force) - if (global.nullius_legacy == nil) then return end - local legacy = global.nullius_legacy[force.index] + if (storage.nullius_legacy == nil) then return end + local legacy = storage.nullius_legacy[force.index] if (legacy == nil) then return end for recipename, techname in pairs(legacy) do if (force.technologies[techname].researched and @@ -12,13 +12,13 @@ end local function legacy_recipe(force, techname, recipename) if (not force.technologies[techname].researched) then return end - if (global.nullius_legacy == nil) then - global.nullius_legacy = { } + if (storage.nullius_legacy == nil) then + storage.nullius_legacy = { } end - if (global.nullius_legacy[force.index] == nil) then - global.nullius_legacy[force.index] = { } + if (storage.nullius_legacy[force.index] == nil) then + storage.nullius_legacy[force.index] = { } end - global.nullius_legacy[force.index]["nullius-legacy-"..recipename] = techname + storage.nullius_legacy[force.index]["nullius-legacy-"..recipename] = techname end local function legacy_recipe_all(techname, recipename) @@ -146,6 +146,33 @@ function migrate_version(event) local version = parse_version(version_info.old_version) if (version == nil) then return end + if(version >= 20000) then return end + for _,bucket in pairs(storage.nullius_turbine_buckets) do + for _,t in pairs(bucket.turbines) do + t.blade = rendering.get_object_by_id(t.blade) + t.shadow = rendering.get_object_by_id(t.shadow) + end + end + for _,engine_bucket in pairs(storage.nullius_stirling_buckets) do + for _,level in pairs(engine_bucket) do + for _,unit in pairs(level) do + unit.turbine = rendering.get_object_by_id(unit.turbine) + end + end + end + for _,force in pairs(game.forces) do + if force.technologies["nullius-geology-1"].researched then + force.technologies["nullius-salvage-lab-wreckage"].researched = true + end + end + for _,surface in pairs(game.surfaces) do + if string.sub(surface.name, 1, 17) == "nullius-landfill-" then + for _, force in pairs(game.forces) do + force.set_surface_hidden(surface.name, true) + end + end + end + if (version >= 10901) then return end legacy_recipe_all("nullius-lithium-production", "lithium-chloride") legacy_recipe_all("nullius-lithium-production", "boxed-lithium-chloride") @@ -174,16 +201,16 @@ function migrate_version(event) "nullius-genetic-archive-1", "nullius-genetic-archive-2" }) if (version >= 10700) then return end - global.nullius_alignment = false + storage.nullius_alignment = false init_alignment() added_techs({"nullius-nuclear-power-2", "nullius-evolution-1", "nullius-evolution-2", "nullius-evolution-3", "nullius-evolution-4"}) if (version >= 10600) then return end - if ((global.nullius_mission_status ~= nil) and - (global.nullius_mission_count[13] == nil)) then - global.nullius_mission_count[12] = 0 - global.nullius_mission_status[12] = 0 + if ((storage.nullius_mission_status ~= nil) and + (storage.nullius_mission_count[13] == nil)) then + storage.nullius_mission_count[12] = 0 + storage.nullius_mission_status[12] = 0 end legacy_recipe_all("nullius-organic-chemistry-6", "plastic-pex") legacy_recipe_all("nullius-organic-chemistry-6", "boxed-plastic-pex") diff --git a/nullius/scripts/mirror.lua b/nullius/scripts/mirror.lua index b5dc35a..7d34872 100644 --- a/nullius/scripts/mirror.lua +++ b/nullius/scripts/mirror.lua @@ -7,7 +7,7 @@ rotate_right = { function update_build_statistics(entity, force, deconstruct) - force.entity_build_count_statistics.on_flow(entity.name, + force.get_entity_build_count_statistics("nauvis").on_flow(entity.name, ((deconstruct and -1) or 1)) end @@ -31,35 +31,35 @@ end function replace_fluid_entity(entity, newname, force, dir) - if (game.entity_prototypes[newname] == nil) then return nil end + if (prototypes.entity[newname] == nil) then return nil end if (dir == nil) then dir = entity.direction end if (entity.type == "entity-ghost") then local pos = entity.position - local surface = entity.surface - local requests = entity.item_requests - local recipe = nil - if (entity.ghost_type == "assembling-machine") then - recipe = entity.get_recipe() - end - entity.destroy() + local surface = entity.surface + local requests = entity.insert_plan + local recipe = nil + if (entity.ghost_type == "assembling-machine") then + recipe = entity.get_recipe() + end + entity.destroy() entity = surface.create_entity{ name = "entity-ghost", force = force, direction = dir, - position = pos, inner_name = newname, - fast_replace = true, create_build_effect_smoke = false} + position = pos, inner_name = newname, + fast_replace = true, create_build_effect_smoke = false} if ((entity ~= nil) and entity.valid) then - entity.item_requests = requests - if (recipe ~= nil) then entity.set_recipe(recipe) end - end + entity.insert_plan = requests + if (recipe ~= nil) then entity.set_recipe(recipe) end + end else local contents = save_fluid_contents(entity) update_build_statistics(entity, force, true) entity = entity.surface.create_entity{ - name = newname, force = force, direction = dir, + name = newname, force = force, direction = dir, position = entity.position, spill = false, raise_built = true, fast_replace = true, create_build_effect_smoke = false} if ((entity ~= nil) and entity.valid) then restore_fluid_contents(entity, contents) - update_build_statistics(entity, force, false) + update_build_statistics(entity, force, false) end end if ((entity ~= nil) and entity.valid and (dir ~= entity.direction)) then @@ -69,65 +69,65 @@ function replace_fluid_entity(entity, newname, force, dir) end -local function mirror_tier(suffix) - if ((suffix == "combustion-chamber") or (suffix == "heat-exchanger") or - (suffix == "boiler") or (suffix == "chimney")) then - return 1 - elseif ((suffix == "priority-electrolyzer") or - (suffix == "flotation-cell") or - (suffix == "surge-electrolyzer") or (suffix == "hydro-plant")) then - return 2 - elseif ((suffix == "distillery") or (suffix == "chemical-plant") or - (suffix == "nanofabricator")) then - return 3 - end - return 0 -end - -local function mirror_event(event) - local player = game.players[event.player_index] - if ((player == nil) or (not player.valid)) then return end - local target = player.selected - if ((target == nil) or (not target.valid)) then return end - - local name = target.name - local local_name = target.localised_name - if (target.type == "entity-ghost") then - name = target.ghost_name - local_name = target.ghost_localised_name - end - - if (string.sub(name, 1, 8) ~= "nullius-") then return end - local ismirror = (string.sub(name, 9, 15) == "mirror-") - local offs = ((ismirror and 16) or 9) - local suffix = string.sub(name, offs, -3) - - local dir = nil - local tier = mirror_tier(suffix) - if (tier == 0) then - return - elseif ((tier == 2) and (suffix == "flotation-cell")) then - dir = rotate_right[target.direction] - end - - local force = (target.force or player.force) - if ((force == nil) or (not force.valid)) then return end - local tech = force.technologies["nullius-chirality-" .. tier] - if ((tech == nil) or (not tech.valid)) then return end - if (not tech.researched) then - player.print({"technology-description.nullius-mirror-requirement", - tech.localised_name, local_name}) - return - end - - local newname = ("nullius-" .. ((ismirror and "") or "mirror-") .. - string.sub(name, offs, -1)) - replace_fluid_entity(target, newname, force, dir) -end - -script.on_event("nullius-mirror", function(event) - mirror_event(event) -end) +-- local function mirror_tier(suffix) +-- if ((suffix == "combustion-chamber") or (suffix == "heat-exchanger") or +-- (suffix == "boiler") or (suffix == "chimney")) then +-- return 1 +-- elseif ((suffix == "priority-electrolyzer") or +-- (suffix == "flotation-cell") or +-- (suffix == "surge-electrolyzer") or (suffix == "hydro-plant")) then +-- return 2 +-- elseif ((suffix == "distillery") or (suffix == "chemical-plant") or +-- (suffix == "nanofabricator")) then +-- return 3 +-- end +-- return 0 +-- end + +-- local function mirror_event(event) +-- local player = game.players[event.player_index] +-- if ((player == nil) or (not player.valid)) then return end +-- local target = player.selected +-- if ((target == nil) or (not target.valid)) then return end + +-- local name = target.name +-- local local_name = target.localised_name +-- if (target.type == "entity-ghost") then +-- name = target.ghost_name +-- local_name = target.ghost_localised_name +-- end + +-- if (string.sub(name, 1, 8) ~= "nullius-") then return end +-- local ismirror = (string.sub(name, 9, 15) == "mirror-") +-- local offs = ((ismirror and 16) or 9) +-- local suffix = string.sub(name, offs, -3) + +-- local dir = nil +-- local tier = mirror_tier(suffix) +-- if (tier == 0) then +-- return +-- elseif ((tier == 2) and (suffix == "flotation-cell")) then +-- dir = rotate_right[target.direction] +-- end + +-- local force = (target.force or player.force) +-- if ((force == nil) or (not force.valid)) then return end +-- local tech = force.technologies["nullius-chirality-" .. tier] +-- if ((tech == nil) or (not tech.valid)) then return end +-- if (not tech.researched) then +-- player.print({"technology-description.nullius-mirror-requirement", +-- tech.localised_name, local_name}) +-- return +-- end + +-- local newname = ("nullius-" .. ((ismirror and "") or "mirror-") .. +-- string.sub(name, offs, -1)) +-- replace_fluid_entity(target, newname, force, dir) +-- end + +-- script.on_event("nullius-mirror", function(event) +-- mirror_event(event) +-- end) local function mineable_result(proto) @@ -145,7 +145,7 @@ local function match_pipette(pipette, player, event) if (not (pipette.entity.valid and pipette.item.valid)) then return nil end local iname = pipette.item.name local ename = pipette.entity.name - local entity = event.created_entity + local entity = event.entity if (player.is_cursor_empty()) then return nil end if (player.is_cursor_blueprint()) then return nil end @@ -172,24 +172,24 @@ local function match_pipette(pipette, player, event) end function check_pipette(event) - if ((event == nil) or (global.nullius_pipette == nil)) then return nil end + if ((event == nil) or (storage.nullius_pipette == nil)) then return nil end local player = game.players[event.player_index] if ((player == nil) or (not player.valid)) then return nil end - local pipette = global.nullius_pipette[player.index] + local pipette = storage.nullius_pipette[player.index] if (pipette == nil) then return nil end local ret = match_pipette(pipette, player, event) if (ret ~= nil) then return ret end - global.nullius_pipette[player.index] = nil + storage.nullius_pipette[player.index] = nil return nil end function pipette_event(event) local player = game.players[event.player_index] if ((player == nil) or (not player.valid)) then return end - if (global.nullius_pipette == nil) then - global.nullius_pipette = { } + if (storage.nullius_pipette == nil) then + storage.nullius_pipette = { } end - global.nullius_pipette[player.index] = nil + storage.nullius_pipette[player.index] = nil local target = player.selected if ((target == nil) or (not target.valid)) then return end @@ -207,7 +207,7 @@ function pipette_event(event) if (item.place_result.name == proto.name) then return end if (string.sub(proto.name, 1, 8) ~= "nullius-") then return end - global.nullius_pipette[player.index] = { + storage.nullius_pipette[player.index] = { item = item, entity = proto, tick = event.tick @@ -217,22 +217,22 @@ end script.on_event(defines.events.on_player_pipette, pipette_event) -function check_mirror(entity) - if ((entity == nil) or (not entity.valid)) then return end - if (entity.type ~= "entity-ghost") then return end - local name = entity.ghost_name - if (string.sub(name, 1, 15) ~= "nullius-mirror-") then return end - local suffix = string.sub(name, 16, -3) - local tier = mirror_tier(suffix) - if (tier == 0) then return end - - local force = entity.force - if ((force == nil) or (not force.valid)) then return end - local tech = force.technologies["nullius-chirality-" .. tier] - if ((tech == nil) or (not tech.valid)) then return end - if (tech.researched) then return end - - local newname = ("nullius-" .. string.sub(name, 16, -1)) - replace_fluid_entity(entity, newname, force, nil) -end +-- function check_mirror(entity) +-- if ((entity == nil) or (not entity.valid)) then return end +-- if (entity.type ~= "entity-ghost") then return end +-- local name = entity.ghost_name +-- if (string.sub(name, 1, 15) ~= "nullius-mirror-") then return end +-- local suffix = string.sub(name, 16, -3) +-- local tier = mirror_tier(suffix) +-- if (tier == 0) then return end + +-- local force = entity.force +-- if ((force == nil) or (not force.valid)) then return end +-- local tech = force.technologies["nullius-chirality-" .. tier] +-- if ((tech == nil) or (not tech.valid)) then return end +-- if (tech.researched) then return end + +-- local newname = ("nullius-" .. string.sub(name, 16, -1)) +-- replace_fluid_entity(entity, newname, force, nil) +-- end diff --git a/nullius/scripts/mission.lua b/nullius/scripts/mission.lua index 6bf42ca..f57979f 100644 --- a/nullius/scripts/mission.lua +++ b/nullius/scripts/mission.lua @@ -23,7 +23,7 @@ function update_mission_panel(player) player.gui.left.nullius_mission_panel.destroy() end - if (global.nullius_mission_show[player.index]) then + if (storage.nullius_mission_show[player.index]) then local gui = player.gui.left.add({type = "frame", name = "nullius_mission_panel", direction = "vertical"}) gui.style.bottom_padding = 8 @@ -33,18 +33,18 @@ function update_mission_panel(player) gui.add({type = "table", name = "table", column_count = 1}) gui.table.add({type = "label", name = "mission_overall", caption = {"", objective_locale(14), ": ", - global.nullius_mission_status[14], "%"}, + storage.nullius_mission_status[14], "%"}, tooltip = {"objective-description.nullius-overall"}}) - local oxygen = global.nullius_mission_status[2] + local oxygen = storage.nullius_mission_status[2] for i = 1, 13 do local str = nil - if (global.nullius_mission_status[i] < 100) then + if (storage.nullius_mission_status[i] < 100) then str = {"", objective_locale(i), ": ", - global.nullius_mission_status[i], "%"} + storage.nullius_mission_status[i], "%"} elseif ((i >= 3) and (i <= 5) and (oxygen < 100) and (oxygen >= (i * 8))) then - local s = math.floor(global.nullius_mission_status[i] + 0.5) + local s = math.floor(storage.nullius_mission_status[i] + 0.5) local m = s - 100 if (i == 3) then m = (m / 100) @@ -59,7 +59,7 @@ function update_mission_panel(player) local r = 0.96 - (0.7 * m) + a local g = 0.96 - (0.7 * (1 - m)) + a str = {"", "[color="..r..","..g..",0.4]", objective_locale(i), ": ", - math.floor(global.nullius_mission_status[i] + 0.5), "%[/color]"} + math.floor(storage.nullius_mission_status[i] + 0.5), "%[/color]"} end if (str ~= nil) then @@ -67,8 +67,8 @@ function update_mission_panel(player) name = "mission_"..objective_name[i], caption = str, tooltip = {"objective-description.nullius-"..objective_name[i]}}) if ((i == 2) and (oxygen >= 16) and - (global.nullius_vent_total ~= nil)) then - local total = math.floor(global.nullius_vent_total / 1000) + (storage.nullius_vent_total ~= nil)) then + local total = math.floor(storage.nullius_vent_total / 1000) local m = total local suffix = "kilo" local scale = math.abs(total) @@ -100,14 +100,14 @@ function update_mission_panel(player) end function update_mission_player(player) - if (global.nullius_mission_status ~= nil) then - if (global.nullius_mission_complete) then - global.nullius_mission_show[player.index] = false + if (storage.nullius_mission_status ~= nil) then + if (storage.nullius_mission_complete) then + storage.nullius_mission_show[player.index] = false if mod_gui.get_button_flow(player).nullius_mission_button then mod_gui.get_button_flow(player).nullius_mission_button.destroy() end - elseif (global.nullius_mission_show[player.index] == nil) then - global.nullius_mission_show[player.index] = true + elseif (storage.nullius_mission_show[player.index] == nil) then + storage.nullius_mission_show[player.index] = true if mod_gui.get_button_flow(player).nullius_mission_button then mod_gui.get_button_flow(player).nullius_mission_button.destroy() end @@ -126,34 +126,34 @@ local function update_mission_global() end function init_mission_global() - if (global.nullius_mission_status == nil) then return end + if (storage.nullius_mission_status == nil) then return end for i = 1, 14 do - if (global.nullius_mission_count[i] == nil) then - global.nullius_mission_count[i] = 0 - global.nullius_mission_status[i] = 0 + if (storage.nullius_mission_count[i] == nil) then + storage.nullius_mission_count[i] = 0 + storage.nullius_mission_status[i] = 0 end end update_mission_global() end function set_mission_goal(goal, amount, force) - if (global.nullius_mission_complete) then return end + if (storage.nullius_mission_complete) then return end local mission_target = {10, 125, 1800, 12000000, 32000, 750, 320, 60, 2500000, 20, 12, 3000000, 12000000} - local count = global.nullius_mission_count - local status = global.nullius_mission_status + local count = storage.nullius_mission_count + local status = storage.nullius_mission_status local oldstatus = status[goal] count[goal] = math.min(math.max(amount, 0), (mission_target[goal] * 4)) status[goal] = (math.floor(100 * - ((100 * count[goal]) / mission_target[goal])) / 100) + ((100 * count[goal]) / mission_target[goal])) / 100) -- only shows 2 digits after the dot if ((goal >= 3) and (goal <= 5)) then local algae_oxygen = (40 * count[3]) / (count[3] + (mission_target[3] / 2)) local grass_oxygen = (30 * count[4]) / (count[4] + (mission_target[4] / 2)) local tree_oxygen = (30 * count[5]) / (count[5] + (mission_target[5] / 2)) local total_oxygen = algae_oxygen + grass_oxygen + tree_oxygen - global.nullius_oxygen_bio_target = (108 * total_oxygen) / (150 - total_oxygen) + storage.nullius_oxygen_bio_target = (108 * total_oxygen) / (150 - total_oxygen) end local finished = false @@ -168,17 +168,17 @@ function set_mission_goal(goal, amount, force) objective_locale(goal)}, {1, 0.75, 0.4}) end - local overall = global.nullius_mission_status[2] + local overall = storage.nullius_mission_status[2] for i = 1, 13 do - overall = overall + math.min(100, global.nullius_mission_status[i]) + overall = overall + math.min(100, storage.nullius_mission_status[i]) end - global.nullius_mission_status[14] = (math.floor(100 * (overall / 14)) / 100) + storage.nullius_mission_status[14] = (math.floor(100 * (overall / 14)) / 100) if (finished and (force ~= nil)) then - global.nullius_mission_complete = true + storage.nullius_mission_complete = true end update_mission_global() - if (global.nullius_mission_complete) then + if (storage.nullius_mission_complete) then if remote.interfaces["better-victory-screen"] and remote.interfaces["better-victory-screen"]["trigger_victory"] then remote.call("better-victory-screen", "trigger_victory", force) @@ -193,7 +193,7 @@ end function bump_mission_goal(goal, amount, force) if (amount ~= 0) then create_mission(force) - set_mission_goal(goal, (global.nullius_mission_count[goal] + amount), force) + set_mission_goal(goal, (storage.nullius_mission_count[goal] + amount), force) end end @@ -213,36 +213,36 @@ local oxygen_equivalent = { } function update_oxygen() - if (global.nullius_mission_status == nil) then return end - if (global.nullius_mission_complete) then return end - local prev_status = global.nullius_mission_status[2] + if (storage.nullius_mission_status == nil) then return end + if (storage.nullius_mission_complete) then return end + local prev_status = storage.nullius_mission_status[2] if (prev_status >= 100) then return end - local current = (((global.nullius_oxygen_bio_current * 8191) + - global.nullius_oxygen_bio_target) / 8192) - global.nullius_oxygen_bio_current = current + local current = (((storage.nullius_oxygen_bio_current * 8191) + + storage.nullius_oxygen_bio_target) / 8192) + storage.nullius_oxygen_bio_current = current local vent_best = 0 local vent_force = nil - local vent_total = global.nullius_oxygen_legacy + local vent_total = storage.nullius_oxygen_legacy for _, force in pairs(game.forces) do - if (force.research_enabled) then - local stats = force.fluid_production_statistics - local vent_score = 0 - for gasname,multiplier in pairs(oxygen_equivalent) do - vent_score = (vent_score + ((stats.get_input_count(gasname) - - stats.get_output_count(gasname)) * multiplier)) - end - vent_total = vent_total + vent_score - if ((vent_force == nil) or (vent_score > vent_best)) then - vent_best = vent_score - vent_force = force - end + if (force.research_enabled) then + local stats = force.get_fluid_production_statistics("nauvis") + local vent_score = 0 + for gasname,multiplier in pairs(oxygen_equivalent) do + vent_score = (vent_score + ((stats.get_input_count(gasname) - + stats.get_output_count(gasname)) * multiplier)) + end + vent_total = vent_total + vent_score + if ((vent_force == nil) or (vent_score > vent_best)) then + vent_best = vent_score + vent_force = force + end end end if (vent_force == nil) then return end - global.nullius_vent_total = vent_total + storage.nullius_vent_total = vent_total if (vent_total > 0) then vent_total = math.sqrt(vent_total) / 1600 else @@ -261,7 +261,7 @@ function migrate_oxygen() local consumed = 0 for _, force in pairs(game.forces) do if (force.research_enabled) then - local stats = force.fluid_production_statistics + local stats = force.get_fluid_production_statistics("nauvis") for gasname,multiplier in pairs(oxygen_equivalent) do produced = produced + stats.get_input_count(gasname) consumed = consumed + stats.get_output_count(gasname) @@ -269,36 +269,36 @@ function migrate_oxygen() end end - global.nullius_oxygen_legacy = math.max(0, (((2 * consumed) - produced)/3)) - if (global.nullius_mission_status == nil) then return end - global.nullius_oxygen_bio_target = (global.nullius_mission_count[2] / 1.5) - global.nullius_oxygen_bio_current = (global.nullius_oxygen_bio_target / 2) - - if (global.nullius_mission_complete) then return end - if (global.nullius_mission_status[2] >= 100) then return end - local score = (global.nullius_oxygen_bio_current + - (math.sqrt(global.nullius_oxygen_legacy) / 1800)) - global.nullius_mission_count[2] = math.min(score, 150) - global.nullius_mission_status[2] = (math.floor(100 * + storage.nullius_oxygen_legacy = math.max(0, (((2 * consumed) - produced)/3)) + if (storage.nullius_mission_status == nil) then return end + storage.nullius_oxygen_bio_target = (storage.nullius_mission_count[2] / 1.5) + storage.nullius_oxygen_bio_current = (storage.nullius_oxygen_bio_target / 2) + + if (storage.nullius_mission_complete) then return end + if (storage.nullius_mission_status[2] >= 100) then return end + local score = (storage.nullius_oxygen_bio_current + + (math.sqrt(storage.nullius_oxygen_legacy) / 1800)) + storage.nullius_mission_count[2] = math.min(score, 150) + storage.nullius_mission_status[2] = (math.floor(100 * math.min(99, (score / 1.8))) / 100) end function create_mission(force) - if (global.nullius_mission_status == nil) then - global.nullius_mission_status = {} - global.nullius_mission_count = {} - global.nullius_mission_show = {} - global.nullius_mission_complete = false - global.nullius_oxygen_bio_current = 0 - global.nullius_oxygen_bio_target = 0 - if (global.nullius_oxygen_legacy == nil) then - global.nullius_oxygen_legacy = 0 + if (storage.nullius_mission_status == nil) then + storage.nullius_mission_status = {} + storage.nullius_mission_count = {} + storage.nullius_mission_show = {} + storage.nullius_mission_complete = false + storage.nullius_oxygen_bio_current = 0 + storage.nullius_oxygen_bio_target = 0 + if (storage.nullius_oxygen_legacy == nil) then + storage.nullius_oxygen_legacy = 0 end for i = 1, 14 do - global.nullius_mission_count[i] = 0 - global.nullius_mission_status[i] = 0 + storage.nullius_mission_count[i] = 0 + storage.nullius_mission_status[i] = 0 end update_mission_global() @@ -310,15 +310,20 @@ function create_mission(force) end end -function rocket_launched(event) - local rocket = event.rocket - if (rocket and rocket.valid) then +function cargo_pod_finished(event) + local pod = event.cargo_pod + if (pod and pod.valid) then create_mission(force) - local payload = rocket.get_inventory(defines.inventory.rocket).get_contents() - if (payload["nullius-probe"] ~= nil) then - bump_mission_goal(1, 1, rocket.force) - elseif (payload["nullius-align-concordance-satellite"] ~= nil) then - align_satellite_launch(rocket) + local inv = pod.get_inventory(defines.inventory.item_main) + local payload = inv.get_contents() + for _, slot in pairs(payload) do + if slot.name == "nullius-probe" then + bump_mission_goal(1, 1, pod.force) + break + elseif slot.name == "nullius-align-concordance-satellite" then + align_satellite_launch(pod) + break + end end end end @@ -326,14 +331,14 @@ end function gui_clicked(event) if event.element.valid and event.element.name == "nullius_mission_button" then local player = game.players[event.player_index] - if (global.nullius_mission_show[event.player_index]) then - global.nullius_mission_show[event.player_index] = false + if (storage.nullius_mission_show[event.player_index]) then + storage.nullius_mission_show[event.player_index] = false else - global.nullius_mission_show[event.player_index] = true + storage.nullius_mission_show[event.player_index] = true end update_mission_player(player) end end -script.on_event(defines.events.on_rocket_launched, rocket_launched) +script.on_event(defines.events.on_cargo_pod_finished_ascending, cargo_pod_finished) script.on_event(defines.events.on_gui_click, gui_clicked) diff --git a/nullius/scripts/solar.lua b/nullius/scripts/solar.lua index f42dbd9..ced488a 100644 --- a/nullius/scripts/solar.lua +++ b/nullius/scripts/solar.lua @@ -1,8 +1,8 @@ function init_solar() - if (global.nullius_solar_buckets == nil) then - global.nullius_solar_buckets = {} + if (storage.nullius_solar_buckets == nil) then + storage.nullius_solar_buckets = {} for i=0,540 do - global.nullius_solar_buckets[i] = {} + storage.nullius_solar_buckets[i] = {} end end end @@ -14,10 +14,10 @@ local solar_values = { } function update_solar() - if (global.nullius_solar_buckets == nil) then return end + if (storage.nullius_solar_buckets == nil) then return end local tick = game.tick * 382 for j=0,1 do - local bucket = global.nullius_solar_buckets[(tick + j) % 541] + local bucket = storage.nullius_solar_buckets[(tick + j) % 541] for i,t in pairs(bucket) do if (t.collector.valid) then local surface = t.collector.surface @@ -57,7 +57,7 @@ end function build_solar_collector(entity, level) if ((level < 1) or (level > 3)) then return end init_solar() - local bucket = global.nullius_solar_buckets[entity.unit_number % 541] + local bucket = storage.nullius_solar_buckets[entity.unit_number % 541] bucket[entity.unit_number] = { collector = entity, level = level @@ -65,7 +65,7 @@ function build_solar_collector(entity, level) end function remove_solar_collector(entity, died, level) - if (global.nullius_solar_buckets == nil) then return end - local bucket = global.nullius_solar_buckets[entity.unit_number % 541] + if (storage.nullius_solar_buckets == nil) then return end + local bucket = storage.nullius_solar_buckets[entity.unit_number % 541] bucket[entity.unit_number] = nil end diff --git a/nullius/scripts/startup.lua b/nullius/scripts/startup.lua index 3605f80..9142139 100644 --- a/nullius/scripts/startup.lua +++ b/nullius/scripts/startup.lua @@ -11,37 +11,91 @@ end function broken_disabled(name) - if (global.nullius_broken_status == nil) then return true end - local count = global.nullius_broken_status[name] + if (storage.nullius_broken_status == nil) then return true end + local count = storage.nullius_broken_status[name] if ((count == nil) or (count < 1)) then return true end return false end -function broken_finished(name) - global.nullius_broken_status[name] = nil +function check_fixing_machines() + if storage.fixing_machines == nil then return end + for i,entry in pairs(storage.fixing_machines) do + if entry.machine.valid then + local machine_recipe = entry.machine.get_recipe() + if machine_recipe and machine_recipe.name == entry.recipe then + if entry.machine.products_finished > entry.finished then + broken_finished(machine_recipe.name) + table.remove(storage.fixing_machines,i) + end + else -- recipe changed before product finished + table.remove(storage.fixing_machines,i) + end + else + table.remove(storage.fixing_machines,i) + end + end + if #storage.fixing_machines == 0 then + storage.fixing_machines = nil + end +end + +function broken_finished_delayed(name) + local machines = game.surfaces["nauvis"].find_entities_filtered{type = "assembling-machine"} -- check only appropriate machines ? + for _,machine in pairs(machines) do + local recipe = machine.get_recipe() + if recipe ~= nil then + if string.sub(recipe.name, 1, 15) == "nullius-broken-" then + if storage.fixing_machines == nil then storage.fixing_machines = {} end + for i,entry in pairs(storage.fixing_machines) do -- prevent duplicates + if entry.machine == machine then + if entry.machine.get_recipe().name == entry.recipe then return + else + table.remove(storage.fixing_machines,i) + end + end + end + table.insert(storage.fixing_machines, {machine = machine, recipe = table.deepcopy(recipe.name), finished = machine.products_finished}) + return + end + else + for i,entry in pairs(storage.fixing_machines or {}) do + if entry.machine == machine then + table.remove(storage.fixing_machines,i) + return + end + end + end + end +end + +function broken_finished(name, notHandCrafted) + -- if notHandCrafted then + + -- end + storage.nullius_broken_status[name] = nil for _, force in pairs(game.forces) do force.recipes[name].enabled = false end if (script.active_mods["Companion_Drones"] and - (global.nullius_companion_fix == nil)) then + (storage.nullius_companion_fix == nil)) then fuel_companion_drones(game.surfaces[1]) - global.nullius_companion_fix = true + storage.nullius_companion_fix = true end end function broken_crafted(name) - if (global.nullius_broken_status == nil) then + if (storage.nullius_broken_status == nil) then return end - local count = global.nullius_broken_status[name] + local count = storage.nullius_broken_status[name] if (count == nil) then return end if (count < 2) then broken_finished(name) else - global.nullius_broken_status[name] = (count - 1) + storage.nullius_broken_status[name] = (count - 1) end end @@ -52,12 +106,15 @@ local function init_tech(force) if ((string.sub(tech.name, 1, 8) ~= "nullius-") and (string.sub(tech.order, 1, 8) ~= "nullius-")) then tech.enabled = false + elseif not tech.enabled then + log("Re enabling tech: " .. tech.name) + tech.enabled = true end end - if ((global.nullius_alignment ~= true) and (force.name == "player") and + if ((storage.nullius_alignment ~= true) and (force.name == "player") and force.technologies["nullius-experimental-chemistry"].researched) then - global.nullius_broken_status = nil + storage.nullius_broken_status = nil end for _, recipe in pairs(force.recipes) do @@ -114,7 +171,6 @@ local function reset_config() end init_checkpoint_prereqs() - init_productivity_recipes() update_railloader_bulk() end @@ -122,14 +178,14 @@ script.on_init( function() init_wind() init_geothermal() - reset_config() + reset_config() if (remote.interfaces["freeplay"] ~= nil) then remote.call("freeplay", "set_skip_intro", true) remote.call("freeplay", "set_disable_crashsite", true) remote.call("freeplay", "set_chart_distance", 250) end init_mission_global() - on_load_mod_interface() + on_load_mod_interface() end ) @@ -143,15 +199,15 @@ script.on_configuration_changed( function(event) migrate_version(event) reset_config() - init_alignment() + init_alignment() init_techs() init_mission_global() - update_all_upgrades() + update_all_upgrades() end ) local function chart_starting_area() - local r = (global.nullius_alignment or 250) + local r = (storage.nullius_alignment or 250) local force = game.forces.player local surface = game.surfaces[1] local origin = force.get_spawn_position(surface) @@ -201,7 +257,7 @@ function equip_player(player) player.insert({name="nullius-grid-battery-1", count=6}) player.insert({name="small-electric-pole", count=15}) player.insert({name="nullius-small-miner-1", count=2}) - if (global.nullius_alignment) then + if (storage.nullius_alignment) then player.insert({name="nullius-broken-align-transponder", count=1}) end end @@ -209,15 +265,14 @@ end script.on_event(defines.events.on_player_created, function(event) local player = game.players[event.player_index] - player.remove_item{name = "burner-ore-crusher", count = 1} local intro = {"nullius-intro"} - if (not global.init_landing) then + if (not storage.init_landing) then init_alignment() - global.init_landing = true + storage.init_landing = true local surface = player.surface surface.daytime = 0.7 - if (global.nullius_alignment) then + if (storage.nullius_alignment) then intro = align_first_player_created(player) else init_broken() @@ -226,7 +281,7 @@ script.on_event(defines.events.on_player_created, landing_site(surface, {x=-5, y=-6}, player.force) equip_player(player) end - elseif (global.nullius_alignment) then + elseif (storage.nullius_alignment) then intro = align_player_created(player) else equip_player(player) @@ -246,8 +301,8 @@ script.on_event(defines.events.on_player_created, script.on_event(defines.events.on_research_finished, function(event) local techname = event.research.name - if ((global.nullius_broken_status ~= nil) and - (not global.nullius_alignment)) then + if ((storage.nullius_broken_status ~= nil) and + (not storage.nullius_alignment)) then if (techname == "nullius-experimental-chemistry") then init_techs() elseif (techname == "nullius-distillation-1") then @@ -257,3 +312,10 @@ script.on_event(defines.events.on_research_finished, update_checkpoint_list(techname) end ) + +commands.add_command("flip_valves", nil, function(command) + for _, v in pairs(game.surfaces["nauvis"].find_entities_filtered{type = "valve"}) do + v.rotate() + v.rotate() + end +end) \ No newline at end of file diff --git a/nullius/scripts/turbine.lua b/nullius/scripts/turbine.lua index 7d7174d..7da98c8 100644 --- a/nullius/scripts/turbine.lua +++ b/nullius/scripts/turbine.lua @@ -5,7 +5,6 @@ local connector_offset = { [defines.direction.west] = {x = -2.15, y = 0} } - local function turbine_priority(name) local priority = string.sub(name, -9, -2) if (priority == "-backup-") then @@ -33,9 +32,9 @@ function build_turbine(entity) if (not (entity.valid and entity.supports_direction)) then return end local entry = { } - if (global.nullius_turbines == nil) then - global.nullius_turbines = { } - elseif (global.nullius_turbines[entity.unit_number] == entry) then + if (storage.nullius_turbines == nil) then + storage.nullius_turbines = { } + elseif (storage.nullius_turbines[entity.unit_number] == entry) then return end @@ -49,8 +48,8 @@ function build_turbine(entity) local priority = turbine_priority(entity.name) if ((typestr == nil) or (priority == nil)) then return end - script.register_on_entity_destroyed(entity) - global.nullius_turbines[entity.unit_number] = entry + script.register_on_object_destroyed(entity) + storage.nullius_turbines[entity.unit_number] = entry local pos = entity.position entry.connector = entity.surface.create_entity{ @@ -65,9 +64,9 @@ function build_turbine(entity) if (priority == "exhaust") then local revdir = rotate_right[rotate_right[dir]] - local roffs = connector_offset[revdir] + local roffs = connector_offset[revdir] entry.vent = entity.surface.create_entity{ - name = "nullius-turbine-vent" .. "-" .. tier, + name = "nullius-turbine-vent" .. "-" .. tier, force = entity.force, direction = revdir, position = {x = (pos.x + roffs.x), y = (pos.y + roffs.y)}} end @@ -80,10 +79,10 @@ local function destroy_if_valid(entity) end function remove_turbine(unit) - if (global.nullius_turbines == nil) then return false end - local entry = global.nullius_turbines[unit] + if (storage.nullius_turbines == nil) then return false end + local entry = storage.nullius_turbines[unit] if (entry == nil) then return false end - global.nullius_turbines[unit] = nil + storage.nullius_turbines[unit] = nil destroy_if_valid(entry.connector) destroy_if_valid(entry.generator) destroy_if_valid(entry.vent) @@ -95,11 +94,11 @@ local function replace_turbine(entity, force, newname) local furnace_contents = save_fluid_contents(entity) local connector_contents = nil local generator_contents = nil - local entry = global.nullius_turbines[entity.unit_number] + local entry = storage.nullius_turbines[entity.unit_number] if (entry ~= nil) then connector_contents = save_fluid_contents(entry.connector) - generator_contents = save_fluid_contents(entry.generator) - remove_turbine(entity.unit_number) + generator_contents = save_fluid_contents(entry.generator) + remove_turbine(entity.unit_number) end if (newname ~= nil) then @@ -114,7 +113,7 @@ local function replace_turbine(entity, force, newname) build_turbine(entity) restore_fluid_contents(entity, furnace_contents) - local newentry = global.nullius_turbines[entity.unit_number] + local newentry = storage.nullius_turbines[entity.unit_number] if (newentry ~= nil) then restore_fluid_contents(newentry.connector, connector_contents) restore_fluid_contents(newentry.generator, generator_contents) @@ -147,9 +146,9 @@ end local function scan_surge_priority(name) local offs = 9 - if (string.sub(name, 9, 15) == "mirror-") then - offs = 16 - end + -- if (string.sub(name, 9, 15) == "mirror-") then + -- offs = 16 + -- end local offs2 = offs + 5 local priority = string.sub(name, offs, offs2) if (priority == "surge-") then @@ -253,10 +252,10 @@ function entity_paste_event(event) if (string.sub(tname, 9, 16) == "turbine-") then if (string.sub(sname, 9, 16) ~= "turbine-") then return end - local ttyp = turbine_type(tname) + local ttyp = turbine_type(tname) local tpri = turbine_priority(tname) if ((ttyp == nil) or (tpri == nil)) then return end - local spri = turbine_priority(sname) + local spri = turbine_priority(sname) if ((spri == nil) or (spri == tpri)) then return end local newname = "nullius-turbine-" .. ttyp .. "-" .. @@ -268,36 +267,35 @@ function entity_paste_event(event) end elseif (is_surge_entity(tname) and is_surge_entity(sname)) then local tsurge = scan_surge_priority(tname) - local ssurge = scan_surge_priority(sname) + local ssurge = scan_surge_priority(sname) if ((tsurge == nil) or (ssurge == nil)) then return end - if (tsurge.priority == ssurge.priority) then return end + if (tsurge.priority == ssurge.priority) then return end toggle_surge(target, tname, force) elseif (is_hangar_entity(tname) and is_hangar_entity(sname)) then local thang = scan_hangar_name(tname) - local shang = scan_hangar_name(sname) - if (thang.iscon == shang.iscon) then return end - toggle_hangar(target, tname, force) + local shang = scan_hangar_name(sname) + if (thang.iscon == shang.iscon) then return end + toggle_hangar(target, tname, force) end end script.on_event(defines.events.on_entity_settings_pasted, entity_paste_event) - function dolly_moved_entity(event) - if (global.nullius_turbines == nil) then return end + if (storage.nullius_turbines == nil) then return end if (event == nil) then return end local entity = event.moved_entity if ((entity == nil) or (not entity.valid)) then return end if (string.sub(entity.name, 1, 16) ~= "nullius-turbine-") then return end - local entry = global.nullius_turbines[entity.unit_number] + local entry = storage.nullius_turbines[entity.unit_number] if (entry == nil) then return end replace_turbine(entity, force, nil) end function convert_all_turbines() - if (global.nullius_turbines == nil) then - global.nullius_turbines = { } + if (storage.nullius_turbines == nil) then + storage.nullius_turbines = { } end for _,surface in pairs(game.surfaces) do local turbines = surface.find_entities_filtered{name= diff --git a/nullius/scripts/wind.lua b/nullius/scripts/wind.lua index 514d505..26da65c 100644 --- a/nullius/scripts/wind.lua +++ b/nullius/scripts/wind.lua @@ -7,25 +7,25 @@ local multiplier = (settings.startup["nullius-wind-turbine-energy-multiplier"].v local base_wind_power = {1500000*multiplier, 4000000*multiplier, 12000000*multiplier} function init_wind() - global.nullius_wind_orientation = 4 - global.nullius_wind_factor = 0.7 - global.nullius_wind_speed = 0.4 - global.nullius_wind_momentum = 0 - - global.nullius_base_power = { } - global.nullius_current_power = { } - global.nullius_animation_speed = { } + storage.nullius_wind_orientation = 4 + storage.nullius_wind_factor = 0.7 + storage.nullius_wind_speed = 0.4 + storage.nullius_wind_momentum = 0 + + storage.nullius_base_power = { } + storage.nullius_current_power = { } + storage.nullius_animation_speed = { } for i=1,3 do - global.nullius_current_power[i] = global.nullius_wind_speed * base_wind_power[i] - global.nullius_animation_speed[i] = global.nullius_wind_speed * (0.6 + (i * 0.2)) + storage.nullius_current_power[i] = storage.nullius_wind_speed * base_wind_power[i] + storage.nullius_animation_speed[i] = storage.nullius_wind_speed * (0.6 + (i * 0.2)) end - global.nullius_turbine_buckets = {} + storage.nullius_turbine_buckets = {} for i=1,921 do - global.nullius_turbine_buckets[i] = { + storage.nullius_turbine_buckets[i] = { turbines = { }, - orientation = global.nullius_wind_orientation, - last_speed = global.nullius_animation_speed[((i - 1) % 3) + 1], + orientation = storage.nullius_wind_orientation, + last_speed = storage.nullius_animation_speed[((i - 1) % 3) + 1], last_offset = ((i - 1) * 24) / 921.0 } end @@ -47,31 +47,31 @@ function recalculate_wind() local wave = discretize((wave1 * 1.2) + wave2 + wave3 + (wave4 * 0.75)) local noise = (math.random() * 3) + (math.random() * 5) - local momentum = discretize((global.nullius_wind_momentum * 0.9985) + + local momentum = discretize((storage.nullius_wind_momentum * 0.9985) + (math.random() * 0.16) - 0.08) local target = (wave + noise + momentum - 0.1) / 6 local delta = discretize((math.random() * 0.25) + 0.05) - local factor = discretize(global.nullius_wind_factor * (1 - delta) + (delta * target)) - global.nullius_wind_factor = factor - global.nullius_wind_momentum = momentum + local factor = discretize(storage.nullius_wind_factor * (1 - delta) + (delta * target)) + storage.nullius_wind_factor = factor + storage.nullius_wind_momentum = momentum if (factor <= 0) then - global.nullius_wind_speed = 0 + storage.nullius_wind_speed = 0 elseif (factor >= 1.25) then - global.nullius_wind_speed = 1 + storage.nullius_wind_speed = 1 elseif (factor >= 1) then - global.nullius_wind_speed = discretize((factor * 0.4) + 0.5) + storage.nullius_wind_speed = discretize((factor * 0.4) + 0.5) else - global.nullius_wind_speed = discretize(factor * factor * 0.9) + storage.nullius_wind_speed = discretize(factor * factor * 0.9) end - surface.wind_speed = (global.nullius_wind_speed / 20) + surface.wind_speed = (storage.nullius_wind_speed / 20) for i=1,3 do - global.nullius_current_power[i] = global.nullius_wind_speed * base_wind_power[i] - global.nullius_animation_speed[i] = discretize(global.nullius_wind_speed * (0.6 + (i * 0.2))) + storage.nullius_current_power[i] = storage.nullius_wind_speed * base_wind_power[i] + storage.nullius_animation_speed[i] = discretize(storage.nullius_wind_speed * (0.6 + (i * 0.2))) end - global.nullius_wind_orientation = math.floor((surface.wind_orientation * 8) % 8) + storage.nullius_wind_orientation = math.floor((surface.wind_orientation * 8) % 8) end function destroy_turbine(entry) @@ -88,13 +88,13 @@ function destroy_turbine(entry) entry.collision_box4.destroy() end - rendering.destroy(entry.blade) - rendering.destroy(entry.shadow) + entry.blade.destroy() + entry.shadow.destroy() end function update_turbines(ind, level) - local bucket = global.nullius_turbine_buckets[ind] - local orientation = global.nullius_wind_orientation + local bucket = storage.nullius_turbine_buckets[ind] + local orientation = storage.nullius_wind_orientation if (bucket.orientation ~= orientation) then bucket.orientation = orientation local blade_animation = "nullius-wind-blade-"..level.."-"..orientation @@ -102,14 +102,14 @@ function update_turbines(ind, level) for _,t in pairs(bucket.turbines) do if (t.base.valid) then - rendering.set_animation(t.blade, blade_animation) - rendering.set_animation(t.shadow, shadow_animation) + t.blade.animation = blade_animation + t.shadow.animation = shadow_animation end end end - local power = global.nullius_current_power[level] - local aspeed = global.nullius_animation_speed[level] + local power = storage.nullius_current_power[level] + local aspeed = storage.nullius_animation_speed[level] local tick = game.tick local frame = (tick * aspeed) local expected = ((tick * bucket.last_speed) + bucket.last_offset) @@ -122,10 +122,11 @@ function update_turbines(ind, level) for i,t in pairs(bucket.turbines) do if (t.base.valid) then t.base.power_production = power - rendering.set_animation_speed(t.blade, aspeed) - rendering.set_animation_speed(t.shadow, aspeed) - rendering.set_animation_offset(t.blade, offs) - rendering.set_animation_offset(t.shadow, offs) + + t.blade.animation_speed = aspeed + t.shadow.animation_speed = aspeed + t.blade.animation_offset = offs + t.shadow.animation_offset = offs else destroy_turbine(t) bucket.turbines[i] = nil @@ -162,8 +163,8 @@ function build_wind_turbine(entity, level) local newentity = surface.create_entity{ name = "nullius-wind-base-"..level, position = position, force = force} - newentity.power_production = global.nullius_current_power[level] - script.register_on_entity_destroyed(newentity) + newentity.power_production = storage.nullius_current_power[level] + script.register_on_object_destroyed(newentity) local collision1 = create_wind_collision(surface, position, force, "horizontal", 14.5, 17, 16, 13.5) local collision2 = create_wind_collision(surface, position, force, "vertical", 17, -14.5, 13.5, 16) @@ -171,7 +172,7 @@ function build_wind_turbine(entity, level) local collision4 = create_wind_collision(surface, position, force, "vertical", -17, 14.5, 13.5, 16) local ind = level + ((newentity.unit_number % 307) * 3) - local bucket = global.nullius_turbine_buckets[ind] + local bucket = storage.nullius_turbine_buckets[ind] local scale = 0.4 + (level * 0.2) bucket.turbines[newentity.unit_number] = { @@ -199,7 +200,7 @@ end function remove_wind_unit(unit, died, level) local ind = level + ((unit % 307) * 3) - local bucket = global.nullius_turbine_buckets[ind] + local bucket = storage.nullius_turbine_buckets[ind] local entry = bucket.turbines[unit] if entry == nil then return end @@ -229,7 +230,7 @@ end function destroyed_wind_turbine(unit) local offset = ((unit % 307) * 3) for lvl=1,3 do - local entry = global.nullius_turbine_buckets[lvl + offset].turbines[unit] + local entry = storage.nullius_turbine_buckets[lvl + offset].turbines[unit] if (entry ~= nil) then remove_wind_unit(unit, false, lvl) return true diff --git a/nullius/settings-updates.lua b/nullius/settings-updates.lua index f57938f..6478b4a 100644 --- a/nullius/settings-updates.lua +++ b/nullius/settings-updates.lua @@ -74,6 +74,7 @@ if data.raw['int-setting']['bobmods-logistics-pipeperlevel'] then end if data.raw['int-setting']['bobmods-logistics-fluidwagonbase'] then data.raw['int-setting']['bobmods-logistics-fluidwagonbase'].hidden = true + data.raw['int-setting']['bobmods-logistics-fluidwagonbase'].default_value = 25 data.raw['int-setting']['bobmods-logistics-fluidwagonbase'].allowed_values = {25} end if data.raw['int-setting']['bobmods-logistics-storagetankbase'] then @@ -81,6 +82,9 @@ if data.raw['int-setting']['bobmods-logistics-storagetankbase'] then data.raw['int-setting']['bobmods-logistics-storagetankbase'].allowed_values = {25} end +if not data.raw['string-setting'] then + data.raw['string-setting'] = {} +end if data.raw['string-setting']['alien-biomes-disable-vegetation'] then data.raw['string-setting']['alien-biomes-disable-vegetation'].hidden = true @@ -135,47 +139,6 @@ for _, setting in pairs(biome_grass_color) do end end - -if data.raw['string-setting']['angels-enable-auto-barreling'] then - data.raw['string-setting']['angels-enable-auto-barreling'].hidden = true - data.raw['string-setting']['angels-enable-auto-barreling'].default_value = "Disabled" - data.raw['string-setting']['angels-enable-auto-barreling'].allowed_values = {"Disabled"} -end - -if data.raw['bool-setting']['angels-enable-converter'] then - data.raw['bool-setting']['angels-enable-converter'].hidden = true - data.raw['bool-setting']['angels-enable-converter'].forced_value = true -end -if data.raw['bool-setting']['angels-hide-converter'] then - data.raw['bool-setting']['angels-hide-converter'].hidden = true - data.raw['bool-setting']['angels-hide-converter'].forced_value = true -end -if data.raw['bool-setting']['angels-enable-acids'] then - data.raw['bool-setting']['angels-enable-acids'].hidden = true - data.raw['bool-setting']['angels-enable-acids'].forced_value = true -end - -if data.raw['bool-setting']['angels-disable-bobs-electrolysers'] then - data.raw['bool-setting']['angels-disable-bobs-electrolysers'].hidden = true - data.raw['bool-setting']['angels-disable-bobs-electrolysers'].forced_value = true -end -if data.raw['bool-setting']['angels-disable-vanilla-chemical-plants'] then - data.raw['bool-setting']['angels-disable-vanilla-chemical-plants'].hidden = true - data.raw['bool-setting']['angels-disable-vanilla-chemical-plants'].forced_value = true -end -if data.raw['bool-setting']['angels-disable-bobs-chemical-plants'] then - data.raw['bool-setting']['angels-disable-bobs-chemical-plants'].hidden = true - data.raw['bool-setting']['angels-disable-bobs-chemical-plants'].forced_value = true -end -if data.raw['bool-setting']['angels-disable-bobs-distilleries'] then - data.raw['bool-setting']['angels-disable-bobs-distilleries'].hidden = true - data.raw['bool-setting']['angels-disable-bobs-distilleries'].forced_value = true -end -if data.raw['bool-setting']['angels-show-chemical-formula'] then - data.raw['bool-setting']['angels-show-chemical-formula'].hidden = true - data.raw['bool-setting']['angels-show-chemical-formula'].forced_value = true -end - if data.raw['bool-setting']['bobmods-plates-cheapersteel'] then data.raw['bool-setting']['bobmods-plates-cheapersteel'].hidden = true data.raw['bool-setting']['bobmods-plates-cheapersteel'].forced_value = true @@ -229,69 +192,6 @@ if data.raw['int-setting']['bobmods-plates-inventorysize'] then data.raw['int-setting']['bobmods-plates-inventorysize'].allowed_values = {80} end -if data.raw['bool-setting']['angels-enable-hide-void'] then - data.raw['bool-setting']['angels-enable-hide-void'].hidden = true - data.raw['bool-setting']['angels-enable-hide-void'].forced_value = true -end -if data.raw['bool-setting']['angels-enable-auto-barreling'] then - data.raw['bool-setting']['angels-enable-auto-barreling'].hidden = true - data.raw['bool-setting']['angels-enable-auto-barreling'].forced_value = false -end -if data.raw['bool-setting']['angels-tryptophobia-friendly-stiratite'] then - data.raw['bool-setting']['angels-tryptophobia-friendly-stiratite'].hidden = true - data.raw['bool-setting']['angels-tryptophobia-friendly-stiratite'].forced_value = false -end -if data.raw['bool-setting']['angels-starting-resource-ore1'] then - data.raw['bool-setting']['angels-starting-resource-ore1'].hidden = true - data.raw['bool-setting']['angels-starting-resource-ore1'].forced_value = true -end -if data.raw['bool-setting']['angels-starting-resource-ore3'] then - data.raw['bool-setting']['angels-starting-resource-ore3'].hidden = true - data.raw['bool-setting']['angels-starting-resource-ore3'].forced_value = true -end -if data.raw['bool-setting']['angels-starting-resource-ore5'] then - data.raw['bool-setting']['angels-starting-resource-ore5'].hidden = true - data.raw['bool-setting']['angels-starting-resource-ore5'].forced_value = true -end -if data.raw['bool-setting']['angels-starting-resource-ore6'] then - data.raw['bool-setting']['angels-starting-resource-ore6'].hidden = true - data.raw['bool-setting']['angels-starting-resource-ore6'].forced_value = true -end -if data.raw['bool-setting']['angels-starting-resource-ore2'] then - data.raw['bool-setting']['angels-starting-resource-ore2'].hidden = true - data.raw['bool-setting']['angels-starting-resource-ore2'].forced_value = false -end -if data.raw['bool-setting']['angels-starting-resource-ore4'] then - data.raw['bool-setting']['angels-starting-resource-ore4'].hidden = true - data.raw['bool-setting']['angels-starting-resource-ore4'].forced_value = false -end - -if data.raw['double-setting']['angels-marathon-buildingmulti'] then - data.raw['double-setting']['angels-marathon-buildingmulti'].hidden = true - data.raw['double-setting']['angels-marathon-buildingmulti'].allowed_values = {2} -end -if data.raw['double-setting']['angels-marathon-buildingtime'] then - data.raw['double-setting']['angels-marathon-buildingtime'].hidden = true - data.raw['double-setting']['angels-marathon-buildingtime'].allowed_values = {2} -end -if data.raw['double-setting']['angels-marathon-rawmulti'] then - data.raw['double-setting']['angels-marathon-rawmulti'].hidden = true - data.raw['double-setting']['angels-marathon-rawmulti'].allowed_values = {1} -end - -if data.raw['double-setting']['angels-marathon-intermediatemulti'] then - data.raw['double-setting']['angels-marathon-intermediatemulti'].hidden = true - data.raw['double-setting']['angels-marathon-intermediatemulti'].allowed_values = {1} -end -if data.raw['double-setting']['angels-starting-resource-base'] then - data.raw['double-setting']['angels-starting-resource-base'].hidden = true - data.raw['double-setting']['angels-starting-resource-base'].allowed_values = {40000} -end -if data.raw['int-setting']['angels-pavement-stack-size'] then - data.raw['int-setting']['angels-pavement-stack-size'].hidden = true - data.raw['int-setting']['angels-pavement-stack-size'].allowed_values = {200} -end - if data.raw['string-setting']['fuel-fluid'] then data.raw['string-setting']['fuel-fluid'].hidden = true data.raw['string-setting']['fuel-fluid'].default_value = "nullius-steam" @@ -410,3 +310,107 @@ if data.raw['bool-setting']['aai-loaders-fit-assemblers'] then data.raw['bool-setting']['aai-loaders-fit-assemblers'].hidden = true data.raw['bool-setting']['aai-loaders-fit-assemblers'].forced_value = false end + + +------- angels compatibility settings ------------------ +if data.raw['string-setting']['angels-enable-auto-barreling'] then + data.raw['string-setting']['angels-enable-auto-barreling'].hidden = true + data.raw['string-setting']['angels-enable-auto-barreling'].default_value = "Disabled" + data.raw['string-setting']['angels-enable-auto-barreling'].allowed_values = {"Disabled"} +end + +if data.raw['bool-setting']['angels-enable-converter'] then + data.raw['bool-setting']['angels-enable-converter'].hidden = true + data.raw['bool-setting']['angels-enable-converter'].forced_value = true +end +if data.raw['bool-setting']['angels-hide-converter'] then + data.raw['bool-setting']['angels-hide-converter'].hidden = true + data.raw['bool-setting']['angels-hide-converter'].forced_value = true +end +if data.raw['bool-setting']['angels-enable-acids'] then + data.raw['bool-setting']['angels-enable-acids'].hidden = true + data.raw['bool-setting']['angels-enable-acids'].forced_value = true +end + +if data.raw['bool-setting']['angels-disable-bobs-electrolysers'] then + data.raw['bool-setting']['angels-disable-bobs-electrolysers'].hidden = true + data.raw['bool-setting']['angels-disable-bobs-electrolysers'].forced_value = true +end +if data.raw['bool-setting']['angels-disable-vanilla-chemical-plants'] then + data.raw['bool-setting']['angels-disable-vanilla-chemical-plants'].hidden = true + data.raw['bool-setting']['angels-disable-vanilla-chemical-plants'].forced_value = true +end +if data.raw['bool-setting']['angels-disable-bobs-chemical-plants'] then + data.raw['bool-setting']['angels-disable-bobs-chemical-plants'].hidden = true + data.raw['bool-setting']['angels-disable-bobs-chemical-plants'].forced_value = true +end +if data.raw['bool-setting']['angels-disable-bobs-distilleries'] then + data.raw['bool-setting']['angels-disable-bobs-distilleries'].hidden = true + data.raw['bool-setting']['angels-disable-bobs-distilleries'].forced_value = true +end +if data.raw['bool-setting']['angels-show-chemical-formula'] then + data.raw['bool-setting']['angels-show-chemical-formula'].hidden = true + data.raw['bool-setting']['angels-show-chemical-formula'].forced_value = true +end +if data.raw['bool-setting']['angels-enable-hide-void'] then + data.raw['bool-setting']['angels-enable-hide-void'].hidden = true + data.raw['bool-setting']['angels-enable-hide-void'].forced_value = true +end +if data.raw['bool-setting']['angels-enable-auto-barreling'] then + data.raw['bool-setting']['angels-enable-auto-barreling'].hidden = true + data.raw['bool-setting']['angels-enable-auto-barreling'].forced_value = false +end +if data.raw['bool-setting']['angels-tryptophobia-friendly-stiratite'] then + data.raw['bool-setting']['angels-tryptophobia-friendly-stiratite'].hidden = true + data.raw['bool-setting']['angels-tryptophobia-friendly-stiratite'].forced_value = false +end +if data.raw['bool-setting']['angels-starting-resource-ore1'] then + data.raw['bool-setting']['angels-starting-resource-ore1'].hidden = true + data.raw['bool-setting']['angels-starting-resource-ore1'].forced_value = true +end +if data.raw['bool-setting']['angels-starting-resource-ore3'] then + data.raw['bool-setting']['angels-starting-resource-ore3'].hidden = true + data.raw['bool-setting']['angels-starting-resource-ore3'].forced_value = true +end +if data.raw['bool-setting']['angels-starting-resource-ore5'] then + data.raw['bool-setting']['angels-starting-resource-ore5'].hidden = true + data.raw['bool-setting']['angels-starting-resource-ore5'].forced_value = true +end +if data.raw['bool-setting']['angels-starting-resource-ore6'] then + data.raw['bool-setting']['angels-starting-resource-ore6'].hidden = true + data.raw['bool-setting']['angels-starting-resource-ore6'].forced_value = true +end +if data.raw['bool-setting']['angels-starting-resource-ore2'] then + data.raw['bool-setting']['angels-starting-resource-ore2'].hidden = true + data.raw['bool-setting']['angels-starting-resource-ore2'].forced_value = false +end +if data.raw['bool-setting']['angels-starting-resource-ore4'] then + data.raw['bool-setting']['angels-starting-resource-ore4'].hidden = true + data.raw['bool-setting']['angels-starting-resource-ore4'].forced_value = false +end + +if data.raw['double-setting']['angels-marathon-buildingmulti'] then + data.raw['double-setting']['angels-marathon-buildingmulti'].hidden = true + data.raw['double-setting']['angels-marathon-buildingmulti'].allowed_values = {2} +end +if data.raw['double-setting']['angels-marathon-buildingtime'] then + data.raw['double-setting']['angels-marathon-buildingtime'].hidden = true + data.raw['double-setting']['angels-marathon-buildingtime'].allowed_values = {2} +end +if data.raw['double-setting']['angels-marathon-rawmulti'] then + data.raw['double-setting']['angels-marathon-rawmulti'].hidden = true + data.raw['double-setting']['angels-marathon-rawmulti'].allowed_values = {1} +end + +if data.raw['double-setting']['angels-marathon-intermediatemulti'] then + data.raw['double-setting']['angels-marathon-intermediatemulti'].hidden = true + data.raw['double-setting']['angels-marathon-intermediatemulti'].allowed_values = {1} +end +if data.raw['double-setting']['angels-starting-resource-base'] then + data.raw['double-setting']['angels-starting-resource-base'].hidden = true + data.raw['double-setting']['angels-starting-resource-base'].allowed_values = {40000} +end +if data.raw['int-setting']['angels-pavement-stack-size'] then + data.raw['int-setting']['angels-pavement-stack-size'].hidden = true + data.raw['int-setting']['angels-pavement-stack-size'].allowed_values = {200} +end diff --git a/nullius/settings.lua b/nullius/settings.lua index 9abe13d..2b9a653 100644 --- a/nullius/settings.lua +++ b/nullius/settings.lua @@ -13,5 +13,31 @@ data:extend({ minimum_value = 0.01, maximum_value = 100.0, hidden = true + }, + { + type = "bool-setting", + name = "nullius-hide-void-alt", + setting_type = "startup", + default_value = false + }, + { + type = "bool-setting", + name = "nullius-hide-recipe-signals", + setting_type = "startup", + default_value = false + }, + { + type = "bool-setting", + name = "nullius-match-wind-turbine-activity-sound", + setting_type = "startup", + default_value = true + }, + { + type = "double-setting", + name = "nullius-wind-turbine-volume", + setting_type = "startup", + default_value = 1.0, + minimum_value = 0.0, + maximum_value = 1.0, } }) \ No newline at end of file diff --git a/safefill/changelog.txt b/safefill/changelog.txt index 7964145..b375e5f 100644 --- a/safefill/changelog.txt +++ b/safefill/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 2.0.0 +Date: 18.12.2025 + Features: + - Updated to 2.0 +--------------------------------------------------------------------------------------------------- Version: 1.0.11 Date: 11.12.2022 Changes: diff --git a/safefill/control.lua b/safefill/control.lua index 1fa9f30..44a37de 100644 --- a/safefill/control.lua +++ b/safefill/control.lua @@ -4,7 +4,7 @@ function entity_built_tile(event, entity) return end local tilename = string.sub(event.tile.order, 18) - local tile = game.tile_prototypes[tilename] + local tile = prototypes.tile[tilename] if (tile == nil) then return end @@ -27,8 +27,8 @@ function entity_built_tile(event, entity) if (t.old_tile.mineable_properties.minable) then newtilename = "dirt-1" if (curt.hidden_tile ~= nil) then - local ht = game.tile_prototypes[curt.hidden_tile] - if ((ht ~= nil) and (not ht.collision_mask["water-tile"])) then + local ht = prototypes.tile[curt.hidden_tile] + if ((ht ~= nil) and (not ht.collision_mask["water_tile"])) then newtilename = ht.name end end @@ -42,7 +42,7 @@ function entity_built_tile(event, entity) end s.set_tiles(newtiles2, true, false) - local item = game.item_prototypes[event.tile.name] + local item = prototypes.item[event.tile.name] if (item == nil) then return end @@ -76,11 +76,11 @@ function script_built_tile(event) local new_count = 0 for _,t in pairs(event.tiles) do if (string.sub(t.name, 1, 9) == "safefill-") then - local tile = game.tile_prototypes[t.name] + local tile = prototypes.tile[t.name] if ((tile ~= nil) and (string.sub(tile.order, 1, 17) == "c[watersafefill]-")) then local tilename = string.sub(tile.order, 18) - if (game.tile_prototypes[tilename] ~= nil) then + if (prototypes.tile[tilename] ~= nil) then new_count = new_count + 1 newtiles1[new_count] = {name = tilename, position = t.position} end @@ -118,7 +118,7 @@ local fillname = { } function entity_built(event) - local entity = event.created_entity + local entity = event.entity if (entity.name == "tile-ghost") then local tilename = entity.ghost_name local safetile = fillname[tilename] diff --git a/safefill/data.lua b/safefill/data.lua index b6d719b..a65e04e 100644 --- a/safefill/data.lua +++ b/safefill/data.lua @@ -32,6 +32,13 @@ if settings.startup["safefill-green-water"].value then end +for i = 1,4 do + data:extend({{ + type = "collision-layer", + name = "water_layer_"..tostring(i) + }}) +end + local recipe_count = 0 local recipes = { } @@ -54,7 +61,9 @@ function create_waterfill(suffix, tilename, suborder, active, layer) show_amount_in_title = false, always_show_products = true, always_show_made_in = true, - result = safename + results = { + {type = "item", name = safename, amount = 1} + } } if (settings.startup["safefill-cost"].value == "expensive") then @@ -79,11 +88,18 @@ function create_waterfill(suffix, tilename, suborder, active, layer) localised = tile.localised_name end - local cond = "water-tile" + local cond = "water_tile" if settings.startup["safefill-water-on-water"].value and (layer > 0) then - local lnum = (layer + 43) - cond = "layer-"..lnum - table.insert(tile.collision_mask, cond) + cond = "water_layer_"..layer + tile.collision_mask.layers[cond] = true + end + + local minableWater = nil + if settings.startup["safefill-minable-water"].value then + minableWater = { + mining_time = 1, + result = safename + } end data:extend({ @@ -98,27 +114,31 @@ function create_waterfill(suffix, tilename, suborder, active, layer) place_as_tile = { result = safename, condition_size = 1, - condition = {cond} + condition = {layers = { + [cond] = true + }} } }, { type = "tile", name = safename, - localised_name = localised, + localised_name = localised, order = "c[watersafefill]-"..tilename, - collision_mask = {"ground-tile"}, + collision_mask = {layers = {ground_tile = true}}, layer = data.raw.tile[tilename].layer, variants = { main = data.raw.tile[tilename].variants.main, empty_transitions = true }, map_color = data.raw.tile[tilename].map_color, - pollution_absorption_per_second = data.raw.tile[tilename].pollution_absorption_per_second + minable = minableWater, + pollution_absorption_per_second = data.raw.tile[tilename].pollution_absorption_per_second }, - recipe + recipe }) tile.placeable_by = {item = safename, count = 1} + tile.minable = minableWater end @@ -134,10 +154,10 @@ if (settings.startup["safefill-cost"].value == "expensive") then data.raw.recipe["safefill-medium"].energy_required = 5 data.raw.recipe["safefill-deep"].energy_required = 4 if mods["nullius"] then - data.raw.recipe["safefill-shallow"].ingredients = {{"concrete",4}, - {"cliff-explosives",1}, {type="item", name="nullius-saline-barrel", amount=50}} + data.raw.recipe["safefill-shallow"].ingredients = {{type = "item", name = "concrete", amount = 4}, + {type = "item", name = "cliff-explosives", amount = 1}, {type="item", name="nullius-saline-barrel", amount=50}} if do_shallow then - data.raw.recipe["safefill-medium"].ingredients = {{"safefill-shallow",1}, + data.raw.recipe["safefill-medium"].ingredients = {{type = "item", name = "safefill-shallow", amount = 1}, {type="item", name="nullius-saline-barrel", amount=40}} data.raw.recipe["safefill-medium"].results = { {type="item", name="safefill-medium", amount=1}, @@ -145,32 +165,32 @@ if (settings.startup["safefill-cost"].value == "expensive") then } else data.raw.recipe["safefill-medium"].energy_required = 15 - data.raw.recipe["safefill-medium"].ingredients = {{"concrete",4}, - {"cliff-explosives",1}, {type="item", name="nullius-saline-barrel", amount=80}} + data.raw.recipe["safefill-medium"].ingredients = {{type = "item", name = "concrete", amount = 4}, + {type = "item", name = "cliff-explosives", amount = 1}, {type="item", name="nullius-saline-barrel", amount=80}} data.raw.recipe["safefill-medium"].results = { {type="item", name="safefill-medium", amount=1}, {type="item", name="empty-barrel", amount=77, catalyst_amount=77} } end - data.raw.recipe["safefill-deep"].ingredients = {{"safefill-medium",1}, + data.raw.recipe["safefill-deep"].ingredients = {{type = "item", name = "safefill-medium", amount = 1}, {type="item", name="nullius-saline-barrel", amount=40}} data.raw.recipe["safefill-medium"].main_product = "safefill-medium" else - data.raw.recipe["safefill-shallow"].ingredients = {{"concrete",4}, - {"cliff-explosives",1}, {type="item", name="water-barrel", amount=50}} + data.raw.recipe["safefill-shallow"].ingredients = {{type = "item", name = "concrete", amount = 4}, + {type = "item", name = "cliff-explosives", amount = 1}, {type="item", name="water-barrel", amount=50}} if do_shallow then - data.raw.recipe["safefill-medium"].ingredients = {{"safefill-shallow",2}} + data.raw.recipe["safefill-medium"].ingredients = {{type = "item", name = "safefill-shallow", amount = 2}} else data.raw.recipe["safefill-medium"].energy_required = 15 - data.raw.recipe["safefill-medium"].ingredients = {{"concrete",6}, - {"cliff-explosives",2}, {type="item", name="water-barrel", amount=80}} + data.raw.recipe["safefill-medium"].ingredients = {{type = "item", name = "concrete", amount = 6}, + {type = "item", name = "cliff-explosives", amount = 2}, {type="item", name="water-barrel", amount=80}} data.raw.recipe["safefill-medium"].results = { {type="item", name="safefill-medium", amount=1}, {type="item", name="empty-barrel", amount=77, catalyst_amount=77} } data.raw.recipe["safefill-medium"].main_product = "safefill-medium" end - data.raw.recipe["safefill-deep"].ingredients = {{"safefill-medium",1}, + data.raw.recipe["safefill-deep"].ingredients = {{type = "item", name = "safefill-medium", amount = 1}, {type="item", name="water-barrel", amount=40}} end data.raw.recipe["safefill-shallow"].results = { @@ -189,61 +209,61 @@ elseif (settings.startup["safefill-cost"].value == "cheap") then data.raw.recipe["safefill-deep"].energy_required = 1 if mods["nullius"] then data.raw.recipe["safefill-shallow"].ingredients = { - {"stone-brick",1}, {type="fluid", name="nullius-saline", amount=500}} + {type = "item", name = "stone-brick", amount = 1}, {type="fluid", name="nullius-saline", amount=500}} if do_shallow then - data.raw.recipe["safefill-medium"].ingredients = {{"safefill-shallow",1}, + data.raw.recipe["safefill-medium"].ingredients = {{type = "item", name = "safefill-shallow", amount = 1}, {type="fluid", name="nullius-saline", amount=500}} else data.raw.recipe["safefill-medium"].energy_required = 4 - data.raw.recipe["safefill-medium"].ingredients = {{"stone-brick",1}, + data.raw.recipe["safefill-medium"].ingredients = {{type = "item", name = "stone-brick", amount = 1}, {type="fluid", name="nullius-saline", amount=1000}} end - data.raw.recipe["safefill-deep"].ingredients = {{"safefill-medium",1}, + data.raw.recipe["safefill-deep"].ingredients = {{type = "item", name = "safefill-medium", amount = 1}, {type="fluid", name="nullius-saline", amount=500}} else data.raw.recipe["safefill-shallow"].ingredients = { - {"stone-brick",1}, {type="fluid", name="water", amount=500}} + {type = "item", name = "stone-brick", amount = 1}, {type="fluid", name="water", amount=500}} if do_shallow then - data.raw.recipe["safefill-medium"].ingredients = {{"safefill-shallow",2}} + data.raw.recipe["safefill-medium"].ingredients = {{type = "item", name = "safefill-shallow", amount = 2}} else data.raw.recipe["safefill-medium"].energy_required = 4 data.raw.recipe["safefill-medium"].ingredients = { - {"stone-brick",1}, {type="fluid", name="water", amount=1000}} + {type = "item", name = "stone-brick", amount = 1}, {type="fluid", name="water", amount=1000}} end - data.raw.recipe["safefill-deep"].ingredients = {{"safefill-medium",1}, + data.raw.recipe["safefill-deep"].ingredients = {{type = "item", name = "safefill-medium", amount = 1}, {type="fluid", name="water", amount=500}} end else - data.raw.recipe["safefill-shallow"].result_count = 4 + data.raw.recipe["safefill-shallow"].results[1].amount = 4 data.raw.recipe["safefill-shallow"].energy_required = 10 data.raw.recipe["safefill-medium"].energy_required = 3 data.raw.recipe["safefill-deep"].energy_required = 2 if mods["nullius"] then - data.raw.recipe["safefill-shallow"].ingredients = {{"concrete",4}, - {"cliff-explosives",1}, {type="fluid", name="nullius-saline", amount=2500}} + data.raw.recipe["safefill-shallow"].ingredients = {{type = "item", name = "concrete", amount = 4}, + {type = "item", name = "cliff-explosives", amount = 1}, {type="fluid", name="nullius-saline", amount=2500}} if do_shallow then - data.raw.recipe["safefill-medium"].ingredients = {{"safefill-shallow",1}, + data.raw.recipe["safefill-medium"].ingredients = {{type = "item", name = "safefill-shallow", amount = 1}, {type="fluid", name="nullius-saline", amount=1000}} else - data.raw.recipe["safefill-medium"].result_count = 4 + data.raw.recipe["safefill-medium"].results[1].amount = 4 data.raw.recipe["safefill-medium"].energy_required = 12 - data.raw.recipe["safefill-medium"].ingredients = {{"concrete",4}, - {"cliff-explosives",1}, {type="fluid", name="nullius-saline", amount=5000}} + data.raw.recipe["safefill-medium"].ingredients = {{type = "item", name = "concrete", amount = 4}, + {type = "item", name = "cliff-explosives", amount = 1}, {type="fluid", name="nullius-saline", amount=5000}} end - data.raw.recipe["safefill-deep"].ingredients = {{"safefill-medium",1}, + data.raw.recipe["safefill-deep"].ingredients = {{type = "item", name = "safefill-medium", amount = 1}, {type="fluid", name="nullius-saline", amount=1000}} else - data.raw.recipe["safefill-shallow"].ingredients = {{"concrete",4}, - {"cliff-explosives",1}, {type="fluid", name="water", amount=2500}} + data.raw.recipe["safefill-shallow"].ingredients = {{type = "item", name = "concrete", amount = 4}, + {type = "item", name = "cliff-explosives", amount = 1}, {type="fluid", name="water", amount=2500}} if do_shallow then - data.raw.recipe["safefill-medium"].ingredients = {{"safefill-shallow",2}} + data.raw.recipe["safefill-medium"].ingredients = {{type = "item", name = "safefill-shallow", amount = 2}} else - data.raw.recipe["safefill-medium"].result_count = 2 + data.raw.recipe["safefill-medium"].results[1].amount = 2 data.raw.recipe["safefill-medium"].energy_required = 12 - data.raw.recipe["safefill-medium"].ingredients = {{"concrete",4}, - {"cliff-explosives",1}, {type="fluid", name="water", amount=2500}} + data.raw.recipe["safefill-medium"].ingredients = {{type = "item", name = "concrete", amount = 4}, + {type = "item", name = "cliff-explosives", amount = 1}, {type="fluid", name="water", amount=2500}} end - data.raw.recipe["safefill-deep"].ingredients = {{"safefill-medium",1}, + data.raw.recipe["safefill-deep"].ingredients = {{type = "item", name = "safefill-medium", amount = 1}, {type="fluid", name="water", amount=1000}} end end @@ -264,11 +284,11 @@ if settings.startup["safefill-green-water"].value then data.raw.recipe["safefill-deepgreen"].energy_required = 4 if mods["nullius"] then data.raw.recipe["safefill-mud"].ingredients = { - {"nullius-land-fill-gravel",1}, {"cliff-explosives",1}, + {type = "item", name = "nullius-land-fill-gravel", amount = 1}, {type = "item", name = "cliff-explosives", amount = 1}, {type="item", name="nullius-sludge-barrel", amount=5}, {type="item", name="nullius-seawater-barrel", amount=45}} if do_shallow then - data.raw.recipe["safefill-green"].ingredients = {{"safefill-mud",1}, + data.raw.recipe["safefill-green"].ingredients = {{type = "item", name = "safefill-mud", amount = 1}, {type="item", name="nullius-wastewater-barrel", amount=40}} data.raw.recipe["safefill-green"].results = { {type="item", name="safefill-green", amount=1}, @@ -277,7 +297,7 @@ if settings.startup["safefill-green-water"].value then else data.raw.recipe["safefill-green"].energy_required = 12 data.raw.recipe["safefill-green"].ingredients = { - {"nullius-land-fill-gravel",1}, {"cliff-explosives",1}, + {type = "item", name = "nullius-land-fill-gravel", amount = 1}, {type = "item", name = "cliff-explosives", amount = 1}, {type="item", name="nullius-sludge-barrel", amount=5}, {type="item", name="nullius-wastewater-barrel", amount=75}} data.raw.recipe["safefill-green"].results = { @@ -285,25 +305,25 @@ if settings.startup["safefill-green-water"].value then {type="item", name="empty-barrel", amount=77, catalyst_amount=77} } end - data.raw.recipe["safefill-deepgreen"].ingredients = {{"safefill-green",1}, + data.raw.recipe["safefill-deepgreen"].ingredients = {{type = "item", name = "safefill-green", amount = 1}, {type="item", name="nullius-wastewater-barrel", amount=40}} data.raw.recipe["safefill-green"].main_product = "safefill-green" else - data.raw.recipe["safefill-mud"].ingredients = {{"landfill",1}, - {"cliff-explosives",1}, {type="item", name="water-barrel", amount=50}} + data.raw.recipe["safefill-mud"].ingredients = {{type = "item", name = "landfill", amount = 1}, + {type = "item", name = "cliff-explosives", amount = 1}, {type="item", name="water-barrel", amount=50}} if do_shallow then - data.raw.recipe["safefill-green"].ingredients = {{"safefill-mud",2}} + data.raw.recipe["safefill-green"].ingredients = {{type = "item", name = "safefill-mud", amount = 2}} else data.raw.recipe["safefill-green"].energy_required = 12 - data.raw.recipe["safefill-green"].ingredients = {{"landfill",2}, - {"cliff-explosives",2}, {type="item", name="water-barrel", amount=80}} + data.raw.recipe["safefill-green"].ingredients = {{type = "item", name = "landfill", amount = 2}, + {type = "item", name = "cliff-explosives", amount = 2}, {type="item", name="water-barrel", amount=80}} data.raw.recipe["safefill-green"].results = { {type="item", name="safefill-green", amount=1}, {type="item", name="empty-barrel", amount=77, catalyst_amount=77} } data.raw.recipe["safefill-green"].main_product = "safefill-green" end - data.raw.recipe["safefill-deepgreen"].ingredients = {{"safefill-green",1}, + data.raw.recipe["safefill-deepgreen"].ingredients = {{type = "item", name = "safefill-green", amount = 1}, {type="item", name="water-barrel", amount=40}} end data.raw.recipe["safefill-mud"].results = { @@ -321,68 +341,68 @@ if settings.startup["safefill-green-water"].value then data.raw.recipe["safefill-green"].energy_required = 2 data.raw.recipe["safefill-deepgreen"].energy_required = 1 if mods["nullius"] then - data.raw.recipe["safefill-mud"].ingredients = {{"nullius-gravel",1}, + data.raw.recipe["safefill-mud"].ingredients = {{type = "item", name = "nullius-gravel", amount = 1}, {type="fluid", name="nullius-sludge", amount=50}, {type="fluid", name="nullius-seawater", amount=400}} if do_shallow then - data.raw.recipe["safefill-green"].ingredients = {{"safefill-mud",1}, + data.raw.recipe["safefill-green"].ingredients = {{type = "item", name = "safefill-mud", amount = 1}, {type="fluid", name="nullius-wastewater", amount=500}} else data.raw.recipe["safefill-green"].energy_required = 3 - data.raw.recipe["safefill-green"].ingredients = {{"nullius-gravel",1}, + data.raw.recipe["safefill-green"].ingredients = {{type = "item", name = "nullius-gravel", amount = 1}, {type="fluid", name="nullius-sludge", amount=50}, {type="fluid", name="nullius-wastewater", amount=800}} end - data.raw.recipe["safefill-deepgreen"].ingredients = {{"safefill-green",1}, + data.raw.recipe["safefill-deepgreen"].ingredients = {{type = "item", name = "safefill-green", amount = 1}, {type="fluid", name="nullius-wastewater", amount=500}} else data.raw.recipe["safefill-mud"].ingredients = { - {"stone",2}, {type="fluid", name="water", amount=500}} + {type = "item", name = "stone", amount = 2}, {type="fluid", name="water", amount=500}} if do_shallow then - data.raw.recipe["safefill-green"].ingredients = {{"safefill-mud",2}} + data.raw.recipe["safefill-green"].ingredients = {{type = "item", name = "safefill-mud", amount = 2}} else data.raw.recipe["safefill-green"].energy_required = 3 data.raw.recipe["safefill-green"].ingredients = { - {"stone",3}, {type="fluid", name="water", amount=1000}} + {type = "item", name = "stone", amount = 3}, {type="fluid", name="water", amount=1000}} end - data.raw.recipe["safefill-deepgreen"].ingredients = {{"safefill-green",1}, + data.raw.recipe["safefill-deepgreen"].ingredients = {{type = "item", name = "safefill-green", amount = 1}, {type="fluid", name="water", amount=500}} end else - data.raw.recipe["safefill-mud"].result_count = 4 + data.raw.recipe["safefill-mud"].results[1].amount = 4 data.raw.recipe["safefill-mud"].energy_required = 8 data.raw.recipe["safefill-green"].energy_required = 3 data.raw.recipe["safefill-deepgreen"].energy_required = 2 if mods["nullius"] then data.raw.recipe["safefill-mud"].ingredients = { - {"nullius-land-fill-gravel",1}, {"cliff-explosives",1}, + {type = "item", name = "nullius-land-fill-gravel",amount = 1}, {type = "item", name = "cliff-explosives", amount = 1}, {type="fluid", name="nullius-sludge", amount=200}, {type="fluid", name="nullius-seawater", amount=2000}} if do_shallow then - data.raw.recipe["safefill-green"].ingredients = {{"safefill-mud",1}, + data.raw.recipe["safefill-green"].ingredients = {{type = "item", name = "safefill-mud", amount = 1}, {type="fluid", name="nullius-wastewater", amount=1000}} else data.raw.recipe["safefill-green"].energy_required = 10 - data.raw.recipe["safefill-green"].result_count = 4 + data.raw.recipe["safefill-green"].results[1].amount = 4 data.raw.recipe["safefill-green"].ingredients = { - {"nullius-land-fill-gravel",1}, {"cliff-explosives",1}, + {type = "item", name = "nullius-land-fill-gravel",amount = 1}, {type = "item", name = "cliff-explosives", amount = 1}, {type="fluid", name="nullius-sludge", amount=200}, {type="fluid", name="nullius-wastewater", amount=4500}} end - data.raw.recipe["safefill-deepgreen"].ingredients = {{"safefill-green",1}, + data.raw.recipe["safefill-deepgreen"].ingredients = {{type = "item", name = "safefill-green", amount = 1}, {type="fluid", name="nullius-wastewater", amount=1000}} else - data.raw.recipe["safefill-mud"].ingredients = {{"landfill",1}, - {"cliff-explosives",1}, {type="fluid", name="water", amount=2500}} + data.raw.recipe["safefill-mud"].ingredients = {{type = "item", name = "landfill", amount = 1}, + {type = "item", name = "cliff-explosives", amount = 1}, {type="fluid", name="water", amount=2500}} if do_shallow then - data.raw.recipe["safefill-green"].ingredients = {{"safefill-mud",2}} + data.raw.recipe["safefill-green"].ingredients = {{type = "item", name = "safefill-mud", amount = 2}} else data.raw.recipe["safefill-green"].energy_required = 10 - data.raw.recipe["safefill-green"].result_count = 2 - data.raw.recipe["safefill-green"].ingredients = {{"landfill",1}, - {"cliff-explosives",1}, {type="fluid", name="water", amount=2500}} + data.raw.recipe["safefill-green"].results[1].amount = 2 + data.raw.recipe["safefill-green"].ingredients = {{type = "item", name = "landfill", amount = 1}, + {type = "item", name = "cliff-explosives", amount = 1}, {type="fluid", name="water", amount=2500}} end - data.raw.recipe["safefill-deepgreen"].ingredients = {{"safefill-green",1}, + data.raw.recipe["safefill-deepgreen"].ingredients = {{type = "item", name = "safefill-green", amount = 1}, {type="fluid", name="water", amount=1000}} end end diff --git a/safefill/info.json b/safefill/info.json index 7ea8f0e..218f1ac 100644 --- a/safefill/info.json +++ b/safefill/info.json @@ -1,7 +1,7 @@ { "name": "safefill", - "version": "1.0.11", - "factorio_version": "1.1", + "version": "2.0.0", + "factorio_version": "2.0", "title": "Safe Waterfill", "author": "Anachrony", "description": "Create water like landfill, without destroying things on land. \n\nUnlike most waterfill mods, this will not destroy any land-based entities, like structures, vehicles, resources, trees, or yourself. Only land with nothing on it will be replaced. Offers a choice of 6 different types of water.", diff --git a/safefill/locale/en/safefill.cfg b/safefill/locale/en/safefill.cfg index 5181c36..7014c86 100644 --- a/safefill/locale/en/safefill.cfg +++ b/safefill/locale/en/safefill.cfg @@ -6,12 +6,14 @@ safefill-green-water=Green water safefill-cost=Recipe cost safefill-depth=Depths enabled safefill-water-on-water=Water on water +safefill-minable-water=Waterfill removable [mod-setting-description] safefill-green-water=Allow placement of green water and mud tiles. safefill-cost=Adjust production cost and technology prerequisites. safefill-depth=Configure the subset of supported water depths. safefill-water-on-water=Allow non-shallow water to be placed over other water. +safefill-minable-water=Allow waterfill to be removed by right click [technology-name] nullius-irrigation=Irrigation diff --git a/safefill/locale/pl/safefill.cfg b/safefill/locale/pl/safefill.cfg index 088232a..6e3c84c 100644 --- a/safefill/locale/pl/safefill.cfg +++ b/safefill/locale/pl/safefill.cfg @@ -6,29 +6,31 @@ safefill-green-water=Brudna woda safefill-cost=Koszt schematu safefill-depth=Wybór głębokości safefill-water-on-water=Woda na wodzie +safefill-minable-water=Podnoszenie wypełnienia wodą [mod-setting-description] safefill-green-water=Pozwala na stawianie zanieczyszczonej wody oraz błota. safefill-cost=Zmień koszt produkcji oraz wymogi technoliczne. safefill-depth=Skonfiguruj zestaw głębokości. safefill-water-on-water=Pozwól na postawienie nie płytkich pól wody na innych polach wody. +safefill-minable-water=Zezwól na usuwanie wypełnienia wodą poprzez kliknięcie prawym przyciskiem myszy. [technology-name] nullius-irrigation=Irygacja [technology-description] -nullius-irrigation=Pozwala na stawianie różynch pól wody. +nullius-irrigation=Umożliwia bezpośrednie umieszczanie nowych zbiorników wodnych. [item-name] -safefill-shallow=Płytka woda -safefill-medium=Nabrzeże -safefill-deep=Głęboka woda -safefill-mud=Błoto -safefill-green=Zanieczyszczona woda -safefill-deepgreen=Głęboka zanieczyszczona woda +safefill-shallow=Wypełnienie plytką wodą +safefill-medium=Wypełnienie średnią wodą +safefill-deep=Wypełnienie głęboką wodą +safefill-mud=Wypełnienie błotem +safefill-green=Wypełnienie zieloną wodą +safefill-deepgreen=Wypełnienie głęboką zieloną wodą [tile-name] -shallow-muddy-water=Błoto +shallow-muddy-water=Płytka błotnista woda [string-mod-setting] safefill-cost-cheap=Tani @@ -38,4 +40,4 @@ safefill-depth-all-depths=Wszystkie głębokości safefill-depth-shallow-only=Tylko płytkie safefill-depth-no-shallow=Brak płytkich safefill-depth-no-deep=Brak głębokich -safefill-depth-medium-only=Tylko nabrzeża +safefill-depth-medium-only=Tylko średnich diff --git a/safefill/settings.lua b/safefill/settings.lua index ea2f4b2..dbdd2f8 100644 --- a/safefill/settings.lua +++ b/safefill/settings.lua @@ -20,13 +20,20 @@ data:extend({ name = "safefill-green-water", setting_type = "startup", default_value = true, - order = "d" + order = "d" }, { type = "bool-setting", name = "safefill-water-on-water", setting_type = "startup", default_value = true, - order = "e" + order = "e" + }, + { + type = "bool-setting", + name = "safefill-minable-water", + setting_type = "startup", + default_value = false, + order = "f" } }) diff --git a/train-upgrader/changelog.txt b/train-upgrader/changelog.txt index bc981c6..e061948 100644 --- a/train-upgrader/changelog.txt +++ b/train-upgrader/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 2.0.0 +Date: 18.12.2025 + Features: + - Updated to 2.0 +--------------------------------------------------------------------------------------------------- Version: 1.0.5 Date: 29.07.2023 Translation: diff --git a/train-upgrader/info.json b/train-upgrader/info.json index dbd259a..9bd173e 100644 --- a/train-upgrader/info.json +++ b/train-upgrader/info.json @@ -1,12 +1,12 @@ { "name": "train-upgrader", - "version": "1.0.5", - "factorio_version": "1.1", + "version": "2.0.0", + "factorio_version": "2.0", "title": "Train Upgrader", "author": "Anachrony", "description": "Easily automate the replacement of large numbers of active locomotives and wagons in your rail system. Useful in combination with mods that add multiple tiers of locomotives or wagons.", "homepage": "https://discord.gg/tZY2Rkte8Y", "dependencies": [ - "base >= 1.1.43" + "base >= 2.0.72" ] } diff --git a/train-upgrader/locale/pl/train-upgrader.cfg b/train-upgrader/locale/pl/train-upgrader.cfg new file mode 100644 index 0000000..86b26d4 --- /dev/null +++ b/train-upgrader/locale/pl/train-upgrader.cfg @@ -0,0 +1,16 @@ +[mod-description] +train-upgrader=Łatwa automatyzacja wymiany dużej liczby aktywnych lokomotyw i wagonów w systemie kolejowym. Przydatne w połączeniu z modyfikacjami, które dodają wiele poziomów lokomotyw lub wagonów. + +[entity-name] +tu-supplier=Dostawca modernizacji pociągów +tu-receiver=Odbiorca modernizacji pociągów + +[entity-description] +tu-supplier=Umieść obok przystanku kolejowego, wraz z odbiorcą. Umieść nowe lokomotywy, wagony lub paliwo w tej skrzyni. Zautomatyzowane pociągi w sieci kolejowej, które nie korzystają jeszcze z tego poziomu taboru, będą podróżować do tej stacji, aby zastąpić przestarzały tabor typem znajdującym się w tej skrzyni. Pociągi korzystające z innego rodzaju paliwa będą je wymieniać. +tu-receiver=Umieść obok przystanku kolejowego, wraz z dostawcą. Wszystko, co zostanie wymienione przez dostawcę, trafi do tej skrzyni. Możesz filtrować miejsca w skrzyni, aby dopasować je tylko do określonych lokomotyw lub wagonów, jeśli nie chcesz, aby wszystkie typy zostały wymienione. + +[technology-name] +tu-rail-modernization=Modernizacja kolei + +[technology-description] +tu-rail-modernization=Automatyczna wymiana starszych modeli taboru kolejowego. diff --git a/train-upgrader/prototypes/entity.lua b/train-upgrader/prototypes/entity.lua index e6137b1..adb13db 100644 --- a/train-upgrader/prototypes/entity.lua +++ b/train-upgrader/prototypes/entity.lua @@ -16,7 +16,7 @@ supplier.picture = { layers = { scale = 0.5 }, { - filename = "__base__/graphics/entity/infinity-chest/hr-infinity-chest-shadow.png", + filename = "__base__/graphics/entity/infinity-chest/infinity-chest-shadow.png", priority = "extra-high", width = 116, height = 48, diff --git a/train-upgrader/prototypes/item.lua b/train-upgrader/prototypes/item.lua index 023890b..67d4077 100644 --- a/train-upgrader/prototypes/item.lua +++ b/train-upgrader/prototypes/item.lua @@ -6,7 +6,7 @@ data:extend({ icon = "__train-upgrader__/graphics/icon/supplier.png", icon_size = 64 }}, - subgroup = "train-transport", + subgroup = "train-transport", order = "a[train-system]-tub[tu-supplier]", place_result = "tu-supplier", stack_size = 20 @@ -18,7 +18,7 @@ data:extend({ icon = "__train-upgrader__/graphics/icon/receiver.png", icon_size = 64 }}, - subgroup = "train-transport", + subgroup = "train-transport", order = "a[train-system]-tuc[tu-receiver]", place_result = "tu-receiver", stack_size = 20 diff --git a/train-upgrader/prototypes/nullius.lua b/train-upgrader/prototypes/nullius.lua index 7908da0..f01d16d 100644 --- a/train-upgrader/prototypes/nullius.lua +++ b/train-upgrader/prototypes/nullius.lua @@ -19,13 +19,13 @@ recipe_receiver.order = item_receiver.order recipe_supplier.always_show_made_in = true recipe_receiver.always_show_made_in = true recipe_supplier.ingredients = { - {"nullius-large-supply-chest-1", 1}, - {"nullius-relay-2", 1}, - {"nullius-construction-bot-2", 1} + {type = "item", name = "nullius-large-supply-chest-1", amount = 1}, + {type = "item", name = "nullius-relay-2", amount = 1}, + {type = "item", name = "nullius-construction-bot-2", amount = 1} } recipe_receiver.ingredients = { - {"nullius-large-demand-chest-1", 1}, - {"rail-chain-signal", 1} + {type = "item", name = "nullius-large-demand-chest-1", amount = 1}, + {type = "item", name = "rail-chain-signal", amount = 1} } local tech = data.raw.technology["tu-rail-modernization"] diff --git a/train-upgrader/prototypes/recipe.lua b/train-upgrader/prototypes/recipe.lua index 13043dd..bba233d 100644 --- a/train-upgrader/prototypes/recipe.lua +++ b/train-upgrader/prototypes/recipe.lua @@ -1,25 +1,29 @@ data:extend({ - { - type = "recipe", - name = "tu-supplier", - enabled = false, - energy_required = 5, - ingredients = { - {"logistic-chest-passive-provider", 1}, - {"rail-signal", 1}, - {"construction-robot", 1} - }, - result = "tu-supplier" - }, - { - type = "recipe", - name = "tu-receiver", - enabled = false, - energy_required = 4, - ingredients = { - {"logistic-chest-storage", 1}, - {"rail-chain-signal", 1} - }, - result = "tu-receiver" - } + { + type = "recipe", + name = "tu-supplier", + enabled = false, + energy_required = 5, + ingredients = { + { type = "item", name = "passive-provider-chest", amount = 1 }, + { type = "item", name = "rail-signal", amount = 1 }, + { type = "item", name = "construction-robot", amount = 1 }, + }, + results = { + { type = "item", name = "tu-supplier", amount = 1 }, + }, + }, + { + type = "recipe", + name = "tu-receiver", + enabled = false, + energy_required = 4, + ingredients = { + { type = "item", name = "storage-chest", amount = 1 }, + { type = "item", name = "rail-chain-signal", amount = 1 }, + }, + results = { + { type = "item", name = "tu-receiver", amount = 1 }, + }, + }, }) diff --git a/train-upgrader/prototypes/tech.lua b/train-upgrader/prototypes/tech.lua index 3d97fea..1f0273d 100644 --- a/train-upgrader/prototypes/tech.lua +++ b/train-upgrader/prototypes/tech.lua @@ -14,13 +14,13 @@ data:extend({ recipe = "tu-receiver" } }, - prerequisites = {"rail-signals", "construction-robotics"}, + prerequisites = {"automated-rail-transportation", "construction-robotics"}, unit = { count = 100, ingredients = { {"automation-science-pack", 1}, {"logistic-science-pack", 1}, - {"chemical-science-pack", 1} + {"chemical-science-pack", 1} }, time = 30 }, diff --git a/train-upgrader/scripts/build.lua b/train-upgrader/scripts/build.lua index 8bc872d..be64542 100644 --- a/train-upgrader/scripts/build.lua +++ b/train-upgrader/scripts/build.lua @@ -3,10 +3,10 @@ function scan_stop(ts) type = "container", name = {"tu-supplier", "tu-receiver"}} if ((chests == nil) or (chests[1] == nil)) then return end - if (global.unit_table == nil) then - global.unit_table = { } + if (storage.unit_table == nil) then + storage.unit_table = { } else - local entry = global.unit_table[ts.unit_number] + local entry = storage.unit_table[ts.unit_number] if (entry ~= nil) then delete_station(entry) end @@ -15,7 +15,7 @@ function scan_stop(ts) local unit_list = { } for _, chest in pairs(chests) do if (chest.valid) then - local entry = global.unit_table[chest.unit_number] + local entry = storage.unit_table[chest.unit_number] if (entry == nil) then unit_list[chest.unit_number] = chest end @@ -37,7 +37,7 @@ function scan_stop(ts) end if ((supplier_number < 1) or (receiver_number < 1)) then return end - script.register_on_entity_destroyed(ts) + script.register_on_object_destroyed(ts) init_station(ts, unit_list, supplier_list, receiver_list) end @@ -52,7 +52,7 @@ function entity_added(entity) if (entity.type == "train-stop") then scan_stop(entity) elseif (string.sub(entity.name, 1, 3) == "tu-") then - script.register_on_entity_destroyed(entity) + script.register_on_object_destroyed(entity) local stops = entity.surface.find_entities_filtered{type = "train-stop", area = entity_box(entity, 2.9)} if ((stops == nil) or (stops[2] ~= nil)) then return end @@ -73,13 +73,13 @@ function destroy_station(station, unit) end function destroy_unit(unit) - if (global.unit_table == nil) then return end - destroy_station(global.unit_table[unit], unit) + if (storage.unit_table == nil) then return end + destroy_station(storage.unit_table[unit], unit) end function entity_built(event) - entity_added(event.created_entity) + entity_added(event.entity) end function entity_raised(event) entity_added(event.entity) @@ -102,4 +102,4 @@ end script.on_event(defines.events.on_player_mined_entity, entity_removed) script.on_event(defines.events.on_robot_mined_entity, entity_removed) script.on_event(defines.events.on_entity_died, entity_removed) -script.on_event(defines.events.on_entity_destroyed, entity_destroyed) \ No newline at end of file +script.on_event(defines.events.on_object_destroyed, entity_destroyed) \ No newline at end of file diff --git a/train-upgrader/scripts/station.lua b/train-upgrader/scripts/station.lua index 40ccb7b..4b46b4d 100644 --- a/train-upgrader/scripts/station.lua +++ b/train-upgrader/scripts/station.lua @@ -90,35 +90,37 @@ function init_station(entity, unit_list, supplier_list, receiver_list) train_count = 0, train_index = 0, last_refresh = 0, hold = false, pending = { } } for u, _ in pairs(unit_list) do - global.unit_table[u] = entry + storage.unit_table[u] = entry end - if (global.station_head == nil) then + if (storage.station_head == nil) then entry.next = entry - entry.prev = entry - global.station_head = entry + entry.prev = entry + storage.station_head = entry else - entry.prev = global.station_head - entry.next = entry.prev.next - entry.prev.next = entry - entry.next.prev = entry + entry.prev = storage.station_head + entry.next = entry.prev.next + entry.prev.next = entry + entry.next.prev = entry end - local stops = entity.force.get_train_stops{name = entity.backer_name} + --local stops = entity.force.get_train_stops{name = entity.backer_name} + local stops = game.train_manager.get_train_stops{force = entity.force, station_name = entity.backer_name} + if (stops[2] ~= nil) then entry.old_name = entity.backer_name - entity.backer_name = "Train_Updater_" .. entity.unit_number + entity.backer_name = "Train_Updater_" .. entity.unit_number end end function delete_station(station, no_rename) if (station.next == station) then - global.station_head = nil + storage.station_head = nil else station.next.prev = station.prev station.prev.next = station.next - if (global.station_head == station) then - global.station_head = station.next + if (storage.station_head == station) then + storage.station_head = station.next end end station.next = nil @@ -128,7 +130,7 @@ function delete_station(station, no_rename) release_train_schedule(pend.train, station) end for unit, entity in pairs(station.units) do - global.unit_table[unit] = nil + storage.unit_table[unit] = nil end if ((station.old_name ~= nil) and (not no_rename) and diff --git a/train-upgrader/scripts/tick.lua b/train-upgrader/scripts/tick.lua index 79c235d..e382d0a 100644 --- a/train-upgrader/scripts/tick.lua +++ b/train-upgrader/scripts/tick.lua @@ -73,7 +73,8 @@ function update_train_set(station) station.train_index = station.train_index + 1 if (station.train_index <= station.train_count) then return false end if (game.tick < (station.last_refresh + 900)) then return true end - station.train_set = station.stop.surface.get_trains(station.stop.force) + --station.train_set = station.stop.surface.get_trains(station.stop.force) + station.train_set = game.train_manager.get_trains{force = station.stop.force, surface = station.stop.surface} station.train_index = 0 station.train_count = 0 station.last_refresh = game.tick @@ -95,9 +96,9 @@ function update_station(station) end function update_tick() - if (global.station_head == nil) then return end - global.station_head = global.station_head.next - update_station(global.station_head) + if (storage.station_head == nil) then return end + storage.station_head = storage.station_head.next + update_station(storage.station_head) end script.on_nth_tick(23, update_tick) diff --git a/train-upgrader/scripts/upgrade.lua b/train-upgrader/scripts/upgrade.lua index 8eb250a..2cbac7a 100644 --- a/train-upgrader/scripts/upgrade.lua +++ b/train-upgrader/scripts/upgrade.lua @@ -21,13 +21,13 @@ function different_box(box1, box2) end function equal_mask(car1, car2) - local mask1 = car1.collision_mask - local mask2 = car2.collision_mask - for layer, _ in pairs(mask1) do - if (mask2[layer] ~= true) then return false end + local mask1 = car1.collision_mask.layers + local mask2 = car2.collision_mask.layers + for layer, value in pairs(mask1) do + if (mask2[layer] ~= value) then return false end end - for layer, _ in pairs(mask2) do - if (mask1[layer] ~= true) then return false end + for layer, value in pairs(mask2) do + if (mask1[layer] ~= value) then return false end end return true end @@ -165,22 +165,31 @@ function restore_inventory(car, contents, station) end end - for itemname, amount in pairs(entry.contents) do - local inserted = inv.insert({name=itemname, count=amount}) + for key, inv_slot in pairs(entry.contents) do + itemname = inv_slot.name + amount = inv_slot.count + quality = inv_slot.quality + local inserted = inv.insert({name=itemname, count=amount, quality = quality}) local remaining = amount - inserted - if (remaining < 1) then remaining = nil end - entry.contents[itemname] = remaining + if (remaining < 1) then + entry.contents[key] = nil + else + entry.contents[key].count = remaining + end end end - for itemname, amount in pairs(entry.contents) do - for _,s in pairs(station.receivers) do - local receiver = s.get_inventory(defines.inventory.chest) - if ((receiver ~= nil) and receiver.can_insert(itemname)) then - amount = amount - receiver.insert({name=itemname, count=amount}) - if (amount < 1) then break end - end - end + for _, inv_slot in pairs(entry.contents) do + itemname = inv_slot.name + amount = inv_slot.count + quality = inv_slot.quality + for _,s in pairs(station.receivers) do + local receiver = s.get_inventory(defines.inventory.chest) + if ((receiver ~= nil) and receiver.can_insert({name=itemname, count=1, quality = quality})) then + amount = amount - receiver.insert({name=itemname, count=amount, quality = quality}) + if (amount < 1) then break end + end + end end end end @@ -226,7 +235,7 @@ function restore_grid(grid, contents, station, doit) local receiver = s.get_inventory(defines.inventory.chest) if ((receiver ~= nil) and receiver.can_insert(take_name) and (receiver.insert({name=take_name}) > 0)) then - break; + break end end end @@ -236,14 +245,14 @@ function restore_grid(grid, contents, station, doit) local burn = neweq.burner if ((eq.fuel ~= nil) and (burn.inventory ~= nil) and burn.inventory.valid) then - for itemname, amount in pairs(eq.fuel) do - burn.inventory.insert({name=itemname, count=amount}) - end + for _, entry in pairs(eq.fuel) do + burn.inventory.insert({name=entry.name, count=entry.count,quality=entry.quality}) + end end if ((eq.burnt ~= nil) and (burn.burnt_result_inventory ~= nil) and burn.burnt_result_inventory.valid) then - for itemname, amount in pairs(eq.burnt) do - burn.burnt_result_inventory.insert({name=itemname, count=amount}) + for _, entry in pairs(eq.burnt) do + burn.burnt_result_inventory.insert({name=entry.name, count=entry.count,quality=entry.quality}) end end end @@ -334,7 +343,7 @@ function replace_fuel(carriage, fuel_supply, station, doit) local skip = true for new_fuel, new_num in pairs(fuel_supply) do local threshold = math.max(1, math.min(20, - (game.item_prototypes[new_fuel].stack_size * 0.5))) + (prototypes.item[new_fuel].stack_size * 0.5))) if (new_num < threshold) then fuel_supply[new_fuel] = nil else @@ -353,7 +362,7 @@ function replace_fuel(carriage, fuel_supply, station, doit) for new_fuel, new_num in pairs(fuel_supply) do local insertable = burn_inv.get_insertable_count(new_fuel) local amount = math.min(insertable, new_num) - local new_proto = game.item_prototypes[new_fuel] + local new_proto = prototypes.item[new_fuel] local value = (amount * new_proto.fuel_value * new_proto.fuel_acceleration_multiplier * new_proto.fuel_top_speed_multiplier) @@ -381,7 +390,7 @@ function replace_fuel(carriage, fuel_supply, station, doit) local fuel_contents = burn_inv.get_contents() for old_fuel, old_num in pairs(fuel_contents) do - local old_proto = game.item_prototypes[old_fuel] + local old_proto = prototypes.item[old_fuel] if ((fuel_supply[old_fuel] == nil) and (old_proto ~= nil)) then local stack = { name = old_fuel, count = old_num } local burnt_stack = nil @@ -445,8 +454,11 @@ function try_upgrade_one_carriage(carriage, train, station, doit) local supply_inv = s.get_inventory(defines.inventory.chest) if (supply_inv ~= nil) then local supply_contents = supply_inv.get_contents() - for supply_name,supply_count in pairs(supply_contents) do - local item_proto = game.item_prototypes[supply_name] + for _,inv_slot in pairs(supply_contents) do + supply_name = inv_slot.name + supply_count = inv_slot.count + -- TODO: manage quality too + local item_proto = prototypes.item[supply_name] if (item_proto ~= nil) then if (upgradeable and (item_proto.place_result ~= nil) and compatible_carriage(carriage, item_proto.place_result)) then