diff --git a/.gitignore b/.gitignore index c4a61b45a..dc77040df 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.dat mod-list.json .idea/ +.vscode/ diff --git a/angelsaddons-cab/changelog.txt b/angelsaddons-cab/changelog.txt index 6d1862ad6..31582a9e9 100644 --- a/angelsaddons-cab/changelog.txt +++ b/angelsaddons-cab/changelog.txt @@ -1,4 +1,19 @@ --------------------------------------------------------------------------------------------------- +Version: 0.2.7 +Date:?? + Changes: + - Changed and expanded locale strings and text descriptions (489) +--------------------------------------------------------------------------------------------------- +Version: 0.2.6 +Date: 27.11.2020 + Changes: + - Patched load-order issue when playing without angels +--------------------------------------------------------------------------------------------------- +Version: 0.2.5 +Date: 26.11.2020 + Changes: + - Update to Factorio version 1.1 +--------------------------------------------------------------------------------------------------- Version: 0.2.4 Date: 29.10.2020 Changes: diff --git a/angelsaddons-cab/info.json b/angelsaddons-cab/info.json index 73841d64d..57bf48932 100644 --- a/angelsaddons-cab/info.json +++ b/angelsaddons-cab/info.json @@ -1,14 +1,14 @@ { "name": "angelsaddons-cab", - "version": "0.2.4", - "factorio_version": "1.0", + "version": "0.2.7", + "factorio_version": "1.1", "title": "Angel's Addons - C.A.B.", "author": "Arch666Angel, lovely_santa", "contact": "", "homepage": "", "description": "Adds another type of Crawler.", "dependencies": [ - "base >= 0.18.27", - "? angelsindustries >= 0.4.1" + "? angelsindustries >= 0.4.9", + "base >= 1.1.0" ] } diff --git a/angelsaddons-cab/locale/en/cab.cfg b/angelsaddons-cab/locale/en/cab.cfg index cbd3c93ba..ff04d6140 100644 --- a/angelsaddons-cab/locale/en/cab.cfg +++ b/angelsaddons-cab/locale/en/cab.cfg @@ -2,7 +2,7 @@ angels-cab=C.A.B. [entity-description] -angels-cab=Crawler Autonomous Base +angels-cab=Crawler Autonomous Base. Enter the vehicle and activate deployment charges to deploy the __ENTITY__angels-cab__. When deployed it will provide electric energy from its own grid to nearby buildings. [item-name] angels-cab-deploy=__ENTITY__angels-cab__ deploy diff --git a/angelsaddons-cab/prototypes/entities/cab.lua b/angelsaddons-cab/prototypes/entities/cab.lua index da2462d21..984421734 100644 --- a/angelsaddons-cab/prototypes/entities/cab.lua +++ b/angelsaddons-cab/prototypes/entities/cab.lua @@ -464,8 +464,8 @@ data:extend( } } }, - subgroup = "angels-cab", - order = "d[cannon-shell]-a[basic]", + subgroup = mods["angelsindustries"] and "angels-vehicle-car" or "angels-cab", + order = mods["angelsindustries"] and "b[crawlers]-c" or "d[cannon-shell]-a[basic]", stack_size = 200 }, { @@ -499,8 +499,8 @@ data:extend( } } }, - subgroup = "angels-cab", - order = "d[cannon-shell]-a[basic]", + subgroup = mods["angelsindustries"] and "angels-vehicle-car" or "angels-cab", + order = mods["angelsindustries"] and "b[crawlers]-d" or "d[cannon-shell]-a[basic]", stack_size = 200 }, { diff --git a/angelsaddons-cab/prototypes/entities/equipment.lua b/angelsaddons-cab/prototypes/entities/equipment.lua index ac9782801..fa7c0eea1 100644 --- a/angelsaddons-cab/prototypes/entities/equipment.lua +++ b/angelsaddons-cab/prototypes/entities/equipment.lua @@ -54,8 +54,8 @@ data:extend{{ icon = "__angelsaddons-cab__/graphics/icons/cab-energy-interface-mk1.png", icon_size = 32, placed_as_equipment_result = string.format(energyInterface.name, "-mk1"), - subgroup = "angels-cab", - order = "e[angels-cab-energy-interface]-a", + subgroup = mods["angelsindustries"] and "angels-vehicle-car" or "angels-cab", + order = mods["angelsindustries"] and "b[crawlers]-e" or "e[angels-cab-energy-interface]-a", stack_size = 50, default_request_amount = 10 }} diff --git a/angelsaddons-liquidrobot/info.json b/angelsaddons-liquidrobot/info.json index 23aa3818c..ef55def0f 100644 --- a/angelsaddons-liquidrobot/info.json +++ b/angelsaddons-liquidrobot/info.json @@ -1,7 +1,7 @@ { "name": "angelsaddons-liquidrobot", "version": "0.2.1", - "factorio_version": "0.18", + "factorio_version": "1.1", "title": "Angel's Addons - Liquid Cargo Bot", "author": "Arch666Angel", "contact": "", diff --git a/angelsaddons-liquidrobot/prototypes/entities/liquid-robot-generator.lua b/angelsaddons-liquidrobot/prototypes/entities/liquid-robot-generator.lua index 60f6cb0ff..67a28eb93 100644 --- a/angelsaddons-liquidrobot/prototypes/entities/liquid-robot-generator.lua +++ b/angelsaddons-liquidrobot/prototypes/entities/liquid-robot-generator.lua @@ -1,4 +1,4 @@ -local sounds = require("__base__/prototypes/entity/demo-sounds") +local sounds = require("__base__/prototypes/entity/sounds") function make_fluid_robot() local result = {} diff --git a/angelsaddons-liquidrobot/prototypes/entities/liquid-robot.lua b/angelsaddons-liquidrobot/prototypes/entities/liquid-robot.lua index 41cc7949d..4cb33b795 100644 --- a/angelsaddons-liquidrobot/prototypes/entities/liquid-robot.lua +++ b/angelsaddons-liquidrobot/prototypes/entities/liquid-robot.lua @@ -1,4 +1,4 @@ -local sounds = require("__base__/prototypes/entity/demo-sounds") +local sounds = require("__base__/prototypes/entity/sounds") data:extend( { diff --git a/angelsaddons-mobility/changelog.txt b/angelsaddons-mobility/changelog.txt index c5f0fb370..4362b565c 100644 --- a/angelsaddons-mobility/changelog.txt +++ b/angelsaddons-mobility/changelog.txt @@ -1,4 +1,25 @@ --------------------------------------------------------------------------------------------------- +Version: 0.0.7 +Date: ?? + Changes: + - Added HQ tier numbering icons + - Changed and expanded locale strings and text descriptions (489) +--------------------------------------------------------------------------------------------------- +Version: 0.0.6 +Date: 20.01.2021 + Bugfixes: + - Fixed that braking force was not increasing per tier +--------------------------------------------------------------------------------------------------- +Version: 0.0.5 +Date: 27.11.2020 + Bugfixes: + - Fixed bug on start-up load order introduced in last patch +--------------------------------------------------------------------------------------------------- +Version: 0.0.4 +Date: 26.11.2020 + Bugfixes: + - Updated to factorio version 1.1 +--------------------------------------------------------------------------------------------------- Version: 0.0.3 Date: 29.10.2020 Changes: diff --git a/angelsaddons-mobility/graphics/icons/num_1.png b/angelsaddons-mobility/graphics/icons/num_1.png deleted file mode 100644 index 4c74e0341..000000000 Binary files a/angelsaddons-mobility/graphics/icons/num_1.png and /dev/null differ diff --git a/angelsaddons-mobility/graphics/icons/num_2.png b/angelsaddons-mobility/graphics/icons/num_2.png deleted file mode 100644 index 58601a0f8..000000000 Binary files a/angelsaddons-mobility/graphics/icons/num_2.png and /dev/null differ diff --git a/angelsaddons-mobility/graphics/icons/num_3.png b/angelsaddons-mobility/graphics/icons/num_3.png deleted file mode 100644 index 291e844b7..000000000 Binary files a/angelsaddons-mobility/graphics/icons/num_3.png and /dev/null differ diff --git a/angelsaddons-mobility/graphics/icons/num_4.png b/angelsaddons-mobility/graphics/icons/num_4.png deleted file mode 100644 index ef93f45aa..000000000 Binary files a/angelsaddons-mobility/graphics/icons/num_4.png and /dev/null differ diff --git a/angelsaddons-mobility/graphics/icons/num_5.png b/angelsaddons-mobility/graphics/icons/num_5.png deleted file mode 100644 index 6bdfe44e0..000000000 Binary files a/angelsaddons-mobility/graphics/icons/num_5.png and /dev/null differ diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-1-outline.png b/angelsaddons-mobility/graphics/icons/numerals/num-1-outline.png new file mode 100644 index 000000000..c5ed12047 Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-1-outline.png differ diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-1.png b/angelsaddons-mobility/graphics/icons/numerals/num-1.png new file mode 100644 index 000000000..6f25a75da Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-1.png differ diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-2-outline.png b/angelsaddons-mobility/graphics/icons/numerals/num-2-outline.png new file mode 100644 index 000000000..e733c5567 Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-2-outline.png differ diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-2.png b/angelsaddons-mobility/graphics/icons/numerals/num-2.png new file mode 100644 index 000000000..aac23f47c Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-2.png differ diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-3-outline.png b/angelsaddons-mobility/graphics/icons/numerals/num-3-outline.png new file mode 100644 index 000000000..137cbb67a Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-3-outline.png differ diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-3.png b/angelsaddons-mobility/graphics/icons/numerals/num-3.png new file mode 100644 index 000000000..693fe81a1 Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-3.png differ diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-4-outline.png b/angelsaddons-mobility/graphics/icons/numerals/num-4-outline.png new file mode 100644 index 000000000..4df5a8984 Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-4-outline.png differ diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-4.png b/angelsaddons-mobility/graphics/icons/numerals/num-4.png new file mode 100644 index 000000000..7c0d40c55 Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-4.png differ diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-5-outline.png b/angelsaddons-mobility/graphics/icons/numerals/num-5-outline.png new file mode 100644 index 000000000..e8216997a Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-5-outline.png differ diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-5.png b/angelsaddons-mobility/graphics/icons/numerals/num-5.png new file mode 100644 index 000000000..53fb265d1 Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-5.png differ diff --git a/angelsaddons-mobility/info.json b/angelsaddons-mobility/info.json index 66e7b801a..9fd5ec915 100644 --- a/angelsaddons-mobility/info.json +++ b/angelsaddons-mobility/info.json @@ -1,15 +1,15 @@ { "name": "angelsaddons-mobility", - "version": "0.0.3", - "factorio_version": "1.0", + "version": "0.0.7", + "factorio_version": "1.1", "title": "Angel's Addons - Mass Transit", "author": "Arch666Angel, lovely_santa", "contact": "https://discord.gg/ff5p6KE", "homepage": "https://forums.factorio.com/viewforum.php?f=185", "description": "A combination mod of the various themed trains.", "dependencies": [ - "base >= 1.0.0", - - "? angelsindustries >= 0.4.5" + "base >= 1.1.0", + "(?) angelsrefining >= 0.11.20", + "? angelsindustries >= 0.4.9" ] } diff --git a/angelsaddons-mobility/locale/en/crawlertrain.cfg b/angelsaddons-mobility/locale/en/crawlertrain.cfg index 162dba0d5..8ba809d9b 100644 --- a/angelsaddons-mobility/locale/en/crawlertrain.cfg +++ b/angelsaddons-mobility/locale/en/crawlertrain.cfg @@ -25,8 +25,21 @@ crawler-wagon=Crawler cargo wagon [technology-name] angels-crawler-train=Crawler train +[entity-description] +crawler-locomotive=Locomotive with the "Crawler" aesthetic. +crawler-locomotive-wagon=Locomotive with the air resistance of a cargo wagon. +crawler-bot-wagon=Can be equipped with a vehicle roboport for mobile construction works. + +crawler-locomotive-1-2=Locomotive with the "Crawler" aesthetic. +crawler-locomotive-wagon-2=Locomotive with the air resistance of a cargo wagon. +crawler-bot-wagon-2=Can be equipped with a vehicle roboport for mobile construction works. + +crawler-locomotive-1-3=Locomotive with the "Crawler" aesthetic. +crawler-locomotive-wagon-3=Locomotive with the air resistance of a cargo wagon. +crawler-bot-wagon-3=Can be equipped with a vehicle roboport for mobile construction works. + [technology-description] -angels-crawler-train=Crawler construction trains. +angels-crawler-train=Trains with the "Crawler" aesthetic, come with robot wagons for mobile construction works. [mod-setting-name] angels-crawlertrain-tier-amount=Crawler train tiers (0 for off) diff --git a/angelsaddons-mobility/locale/en/petrotrain.cfg b/angelsaddons-mobility/locale/en/petrotrain.cfg index ecd7ca5b0..5701488e1 100644 --- a/angelsaddons-mobility/locale/en/petrotrain.cfg +++ b/angelsaddons-mobility/locale/en/petrotrain.cfg @@ -22,6 +22,22 @@ petro-tank2=PetroChem oil fluid wagon [technology-name] angels-petro-train=PetroChem trains +[entity-description] +petro-locomotive-1=Locomotive with the "Petrochemical" aesthetic. +petro-tank1=High-capacity fluid wagon with an aesthetic suitable for gasses. +petro-tank2=High-capacity fluid wagon with an aesthetic suitable for liquids. + +petro-locomotive-1-2=Locomotive with the "Petrochemical" aesthetic. +petro-tank1-2=High-capacity fluid wagon with an aesthetic suitable for gasses. +petro-tank2-2=High-capacity fluid wagon with an aesthetic suitable for liquids. + +petro-locomotive-1-3=Locomotive with the "Petrochemical" aesthetic. +petro-tank1-3=High-capacity fluid wagon with an aesthetic suitable for gasses. +petro-tank2-3=High-capacity fluid wagon with an aesthetic suitable for liquids. + +[technology-description] +angels-petro-train=Trains with the "Petrochemical" aesthetic, come with high-capacity fluid wagons for liquids or gasses. + [mod-setting-name] angels-petrotrain-tier-amount=Petrochem train tiers (0 for off) diff --git a/angelsaddons-mobility/locale/en/smeltingtrain.cfg b/angelsaddons-mobility/locale/en/smeltingtrain.cfg index 00e10faab..49bbc0c80 100644 --- a/angelsaddons-mobility/locale/en/smeltingtrain.cfg +++ b/angelsaddons-mobility/locale/en/smeltingtrain.cfg @@ -22,6 +22,19 @@ smelting-wagon-1=Smelting cargo wagon [technology-name] angels-smelting-train=Smelting trains +[entity-description] +smelting-locomotive-1=Locomotive with the "Smelting" aesthetic. +smelting-locomotive-tender=Locomotive with the air resistance of a cargo wagon. + +smelting-locomotive-1-2=Locomotive with the "Smelting" aesthetic. +smelting-locomotive-tender-2=Locomotive with the air resistance of a cargo wagon. + +smelting-locomotive-1-3=Locomotive with the "Smelting" aesthetic. +smelting-locomotive-tender-3=Locomotive with the air resistance of a cargo wagon. + +[technology-description] +angels-smelting-train=Trains with the "Smelting" aesthetic, come with high-capacity cargo wagons. + [mod-setting-name] angels-smeltingtrain-tier-amount=Smelting train tiers (0 for off) diff --git a/angelsaddons-mobility/prototypes/train-functions.lua b/angelsaddons-mobility/prototypes/train-functions.lua index a30c11bd6..021e8a150 100644 --- a/angelsaddons-mobility/prototypes/train-functions.lua +++ b/angelsaddons-mobility/prototypes/train-functions.lua @@ -163,6 +163,26 @@ local function generate_train_recipe(item, add_unlock) data:extend(entries) end +local add_tier_number = mods["angelsrefining"] and + angelsmods.functions.add_number_icon_layer or + function(icon_layers, number_tier, number_tint) + local icon_size_scale = ((icon_layers[1] or {}).icon_size or 32) * ((icon_layers[1] or {}).scale or 1) / 32 + local new_icon_layers = util.table.deepcopy(icon_layers) + table.insert(new_icon_layers, { + icon = "__angelsaddons-mobility__/graphics/icons/numerals/num-"..number_tier.."-outline.png", + icon_size = 64, icon_mipmaps = 2, + tint = {0, 0, 0, 255}, + scale = 0.5 * icon_size_scale + }) + table.insert(new_icon_layers, { + icon = "__angelsaddons-mobility__/graphics/icons/numerals/num-"..number_tier..".png", + icon_size = 64, icon_mipmaps = 2, + tint = number_tint, + scale = 0.5 * icon_size_scale + }) + return new_icon_layers + end + local function generate_train_items(item) local entries = {} local type = set_type(item.name) @@ -179,19 +199,17 @@ local function generate_train_items(item) copy.localised_name = {"", {"item-name." .. item.name}, " MK" .. i} copy.localised_description = {"item-description." .. item.name} copy.place_result = name - copy.icons = { + copy.icons = item.icons or { { icon = item.icon, - icon_size = item.icon_size - }, - { - icon = "__angelsaddons-mobility__/graphics/icons/num_" .. i .. ".png", - tint = angelsmods.addons.mobility[type].number_tint, - scale = 0.32, - shift = {12, -12} + icon_size = item.icon_size, + icon_mipmaps = item.icon_mipmaps } } copy.icon = nil + copy.icon_size = nil + copy.icon_mipmaps = nil + copy.icons = add_tier_number(copy.icons, i, angelsmods.addons.mobility[type].number_tint) table.insert(entries, copy) end else @@ -219,25 +237,24 @@ local function generate_train_entities(item) copy.name = name copy.localised_name = {"", {"entity-name." .. item.name}, " MK" .. i} - copy.icons = { + copy.icons = item.icons or { { icon = item.icon, - icon_size = item.icon_size - }, - { - icon = "__angelsaddons-mobility__/graphics/icons/num_" .. i .. ".png", - tint = angelsmods.addons.mobility[type].number_tint, - scale = 0.32, - shift = {12, -12} + icon_size = item.icon_size, + icon_mipmaps = item.icon_mipmaps } } copy.icon = nil + copy.icon_size = nil + copy.icon_mipmaps = nil + copy.icons = add_tier_number(copy.icons, i, angelsmods.addons.mobility[type].number_tint) copy.minable.result = name copy.max_health = item.max_health * multiplier copy.max_speed = item.max_speed * multiplier copy.friction_force = item.friction_force / multiplier copy.air_resistance = item.air_resistance / multiplier copy.weight = item.weight * multiplier + copy.braking_force = item.braking_force * (multiplier * 2 - 1) if item.type == "locomotive" then copy.max_power = (tonumber(item.max_power:match("%d[%d.]*")) * multiplier) .. "kW" copy.reversing_power_modifier = item.reversing_power_modifier * multiplier diff --git a/angelsaddons-nilaus/changelog.txt b/angelsaddons-nilaus/changelog.txt index db43bcba5..1a8056b01 100644 --- a/angelsaddons-nilaus/changelog.txt +++ b/angelsaddons-nilaus/changelog.txt @@ -1,4 +1,14 @@ --------------------------------------------------------------------------------------------------- +Version: 0.3.12 +Date: 27.11.2020 + Changes: + - Patched to work without angels (after oversight in last patch) +--------------------------------------------------------------------------------------------------- +Version: 0.3.11 +Date: 26.11.2020 + Changes: + - Updated to factorio version 1.1 +--------------------------------------------------------------------------------------------------- Version: 0.3.10 Date: 17.07.2020 Changes: diff --git a/angelsaddons-nilaus/info.json b/angelsaddons-nilaus/info.json index caf50fdf0..86aa19e2e 100644 --- a/angelsaddons-nilaus/info.json +++ b/angelsaddons-nilaus/info.json @@ -1,13 +1,13 @@ { "name": "angelsaddons-nilaus", - "version": "0.3.10", - "factorio_version": "0.18", + "version": "0.3.12", + "factorio_version": "1.1", "title": "Angel's Addons - Decorations - Nilaus", "author": "Arch666Angel", "contact": "", "homepage": "https://forums.factorio.com/viewtopic.php?f=185&t=30962", "description": "", "dependencies": [ - "base >= 0.18.27" + "base >= 1.1.0" ] -} \ No newline at end of file +} diff --git a/angelsaddons-shred/changelog.txt b/angelsaddons-shred/changelog.txt index 9de93358a..ac8635bef 100644 --- a/angelsaddons-shred/changelog.txt +++ b/angelsaddons-shred/changelog.txt @@ -1,4 +1,24 @@ --------------------------------------------------------------------------------------------------- +Version: 0.2.7 +Date: 9.12.2020 + Bugfixes: + - Fixed typo in changelog for version 2.6 +--------------------------------------------------------------------------------------------------- +Version: 0.2.6 +Date: 27.11.2020 + Bugfixes: + - Fixed startup error related to the removeal of rocket silo launch stats window +--------------------------------------------------------------------------------------------------- +Version: 0.2.5 +Date: 27.11.2020 + Changes: + - Patched to work without angels (after oversight in last patch) +--------------------------------------------------------------------------------------------------- +Version: 0.2.4 +Date: 26.11.2020 + Changes: + - Updated to factorio version 1.1 +--------------------------------------------------------------------------------------------------- Version: 0.2.3 Date: 17.07.2020 Changes: diff --git a/angelsaddons-shred/control.lua b/angelsaddons-shred/control.lua index 1de20c0fd..a91db35cc 100644 --- a/angelsaddons-shred/control.lua +++ b/angelsaddons-shred/control.lua @@ -48,7 +48,7 @@ script.on_init(function() entity.minable = false end end - +--[[ if remote.interfaces["silo_script"] and settings.startup["deco-shred-create-shrine-offer"].value then for _,decoName in pairs({ "shred", @@ -65,4 +65,5 @@ script.on_init(function() end end end + ]]-- end) diff --git a/angelsaddons-shred/info.json b/angelsaddons-shred/info.json index ef47523eb..75141882c 100644 --- a/angelsaddons-shred/info.json +++ b/angelsaddons-shred/info.json @@ -1,13 +1,13 @@ { "name": "angelsaddons-shred", - "version": "0.2.3", - "factorio_version": "0.18", + "version": "0.2.7", + "factorio_version": "1.1", "title": "Angel's Addons - Decorations - Shred", "author": "Arch666Angel", "contact": "", "homepage": "https://forums.factorio.com/viewtopic.php?f=185&t=30962", "description": "", "dependencies": [ - "base >= 0.18.27" + "base >= 1.1.0" ] -} \ No newline at end of file +} diff --git a/angelsaddons-shred/prototypes/items/shrine-offering.lua b/angelsaddons-shred/prototypes/items/shrine-offering.lua index cd7416a18..a383bec44 100644 --- a/angelsaddons-shred/prototypes/items/shrine-offering.lua +++ b/angelsaddons-shred/prototypes/items/shrine-offering.lua @@ -1,5 +1,5 @@ require "util" -require "silo-script" +--require "silo-script" if settings.startup["deco-shred-create-shrine-offer"].value then for _, decoName in pairs( diff --git a/angelsaddons-storage/changelog.txt b/angelsaddons-storage/changelog.txt index ab8ee3e63..e56396bba 100644 --- a/angelsaddons-storage/changelog.txt +++ b/angelsaddons-storage/changelog.txt @@ -1,4 +1,27 @@ --------------------------------------------------------------------------------------------------- +Version: 0.0.5 +Date: ?? + Changes: + - Added setting to disable logitics silos and ore silos independently (499) + - Warehouses now prerequisite on ore silos if both are enabled (428) + - Pressure tank now always prerequisite on fluid handling + - Changed recipes of ore silos when playing with angels refining (340) + - Changed some recipes of logistics silos when playing with angels industries (340) + - Changed some recipes of logistics warehouses when playing with angels industries (340) + - Changed slot count for active providers to match the storage variant + - Changed ore silo pick-up result to be just the regular silo (541) + - Changed and expanded locale strings and text descriptions (489) +--------------------------------------------------------------------------------------------------- +Version: 0.0.4 +Date: 27.11.2020 + Changes: + - Patched to work without angels (after oversight in last patch) +--------------------------------------------------------------------------------------------------- +Version: 0.0.3 +Date: 26.11.2020 + Changes: + - Updated to Factorio version 1.1 +--------------------------------------------------------------------------------------------------- Version: 0.0.2 Date: 29.10.2020 Changes: diff --git a/angelsaddons-storage/data-updates.lua b/angelsaddons-storage/data-updates.lua index d5fe6834c..79bd34516 100644 --- a/angelsaddons-storage/data-updates.lua +++ b/angelsaddons-storage/data-updates.lua @@ -1,41 +1,3 @@ ---pressure tanks -require("prototypes.pressure-tanks-override") ---warehouses -if angelsmods.addons.storage.icon_scaling then - if angelsmods.addons.storage.oresilos then - data.raw["container"]["silo"].scale_info_icons = true - data.raw["container"]["silo-ore1"].scale_info_icons = true - data.raw["container"]["silo-ore2"].scale_info_icons = true - data.raw["container"]["silo-ore3"].scale_info_icons = true - data.raw["container"]["silo-ore4"].scale_info_icons = true - data.raw["container"]["silo-ore5"].scale_info_icons = true - data.raw["container"]["silo-ore6"].scale_info_icons = true - data.raw["container"]["silo-coal"].scale_info_icons = true - data.raw["logistic-container"]["silo-active-provider"].scale_info_icons = true - data.raw["logistic-container"]["silo-passive-provider"].scale_info_icons = true - data.raw["logistic-container"]["silo-requester"].scale_info_icons = true - data.raw["logistic-container"]["silo-storage"].scale_info_icons = true - data.raw["logistic-container"]["silo-buffer"].scale_info_icons = true - end - if angelsmods.addons.storage.warehouses then - data.raw["container"]["angels-warehouse"].scale_info_icons = true - data.raw["logistic-container"]["angels-warehouse-passive-provider"].scale_info_icons = true - data.raw["logistic-container"]["angels-warehouse-active-provider"].scale_info_icons = true - data.raw["logistic-container"]["angels-warehouse-storage"].scale_info_icons = true - data.raw["logistic-container"]["angels-warehouse-requester"].scale_info_icons = true - data.raw["logistic-container"]["angels-warehouse-buffer"].scale_info_icons = true - end -end ---ore-silo tech update -if angelsmods and angelsmods.refining then - angelsmods.functions.OV.add_prereq("ore-silos", "ore-crushing") -end ---update subgroup locations -if angelsmods.industries then - data.raw["item-subgroup"]["angels-silo"].group = "angels-logistics" - data.raw["item-subgroup"]["angels-silo"].order = "ac[chests-silo]" - data.raw["item-subgroup"]["angels-warehouse"].group = "angels-logistics" - data.raw["item-subgroup"]["angels-warehouse"].order = "ad[chests-warehouse]" - data.raw["item-subgroup"]["angels-ore-silo"].group = "angels-logistics" - data.raw["item-subgroup"]["angels-ore-silo"].order = "ac[chests-silo]" -end \ No newline at end of file +require("prototypes.overrides.fluid-tanks") +require("prototypes.overrides.silos") +require("prototypes.overrides.warehouses") diff --git a/angelsaddons-storage/data.lua b/angelsaddons-storage/data.lua index a68c552f9..2765ec7ca 100644 --- a/angelsaddons-storage/data.lua +++ b/angelsaddons-storage/data.lua @@ -2,22 +2,27 @@ angelsmods = angelsmods or {} angelsmods.addons = angelsmods.addons or {} angelsmods.addons.storage = angelsmods.addons.storage or {} angelsmods.addons.storage.icon_scaling = settings.startup["angels-enable-storage-icon-scaling"].value + -- pressure tank trigger angelsmods.addons.storage.inlinetank = mods["angelspetrochem"] and true or angelsmods.addons.storage.pressuretanks or settings.startup["angels-enable-inline-tank"].value angelsmods.addons.storage.pressuretank = angelsmods.addons.storage.pressuretanks or settings.startup["angels-enable-pressure-tank"].value -- warehouse trigger angelsmods.addons.storage.warehouses = angelsmods.addons.storage.warehouses or settings.startup["angels-enable-warehouses"].value ---ore-silo trigger -angelsmods.addons.storage.oresilos = angelsmods.addons.storage.oresilos or settings.startup["angels-enable-silos"].value +-- silo triggers +angelsmods.addons.storage.silos = angelsmods.addons.storage.silos or settings.startup["angels-enable-silos"].value +angelsmods.addons.storage.oresilos = angelsmods.addons.storage.oresilos or settings.startup["angels-enable-oresilos"].value --categories require("prototypes.storage-categories") --buildings -require("prototypes.buildings.basic-storage") -require("prototypes.buildings.logistic-storage") +require("prototypes.buildings.fluid-tanks") +require("prototypes.buildings.silos") +require("prototypes.buildings.warehouses") --recipes -require("prototypes.recipes.pressure-tanks") +require("prototypes.recipes.fluid-tanks") +require("prototypes.recipes.silos") require("prototypes.recipes.warehouses") -require("prototypes.recipes.ore-silos") --technology -require("prototypes.technology.storage-technology") \ No newline at end of file +require("prototypes.technology.fluid-tanks") +require("prototypes.technology.silos") +require("prototypes.technology.warehouses") \ No newline at end of file diff --git a/angelsaddons-storage/info.json b/angelsaddons-storage/info.json index 7b1ebc3f8..9b6f91549 100644 --- a/angelsaddons-storage/info.json +++ b/angelsaddons-storage/info.json @@ -1,15 +1,16 @@ { "name": "angelsaddons-storage", - "version": "0.0.2", - "factorio_version": "1.0", + "version": "0.0.5", + "factorio_version": "1.1", "title": "Angel's Addons - Storage Options", "author": "Arch666Angel", "contact": "https://discord.gg/ff5p6KE", "homepage": "https://forums.factorio.com/viewforum.php?f=185", "description": "Adds pressure tanks (extremely large tanks), warehouses and silos.", "dependencies": [ - "base >= 1.0.0", + "base >= 1.1.0", - "? angelspetrochem >= 0.9.13" + "(?) angelsfining", + "? angelspetrochem >= 0.9.17" ] } diff --git a/angelsaddons-storage/locale/en/storage.cfg b/angelsaddons-storage/locale/en/storage.cfg index 8d7be8cd8..e8390251d 100644 --- a/angelsaddons-storage/locale/en/storage.cfg +++ b/angelsaddons-storage/locale/en/storage.cfg @@ -61,9 +61,40 @@ pressure-tanks=Pressure tanks [mod-setting-name] angels-enable-storage-icon-scaling=Enable icon scaling on silos and warehouses -angels-enable-silos=Enable all silos (ore coloured ones, and logistic variants) +angels-enable-silos=Enable Angel's silos +angels-enable-oresilos=Enable Angel's ore themed silos angels-enable-warehouses=Enable Angel's warehouses angels-enable-pressure-tank=Enable pressure fluid tanks [mod-setting-description] angels-enable-storage-icon-scaling=Icons on silos and warehouses scale to size of the silos and warehouses, instead of being small. + +[technology-description] +ore-silos=Large containers for long-term storage. +logistic-silos=Silos for the logistic network. + +angels-warehouses=Huge containers for long-term storage. +angels-logistic-warehouses=Warehouses for the logistic network. + +pressure-tanks=Pressurized storage tank with high capacity for liquids or gasses. + +[entity-description] +silo-ore1=Silo with a "Saphirite" aesthetic. +silo-ore2=Silo with a "Jivolite" aesthetic. +silo-ore3=Silo with a "Stiratite" aesthetic. +silo-ore4=Silo with a "Crotinnium" aesthetic. +silo-ore5=Silo with a "Rubyte" aesthetic. +silo-ore6=Silo with a "Bobmonium" aesthetic. +silo-coal=Silo with a "Coal" aesthetic. + +silo-active-provider=Sends its content to the logistic network. +silo-passive-provider=Makes its content available to the logistic network. +silo-requester=Requests specified items from the logistic network. +silo-storage=Long-term storage for the logistic network. +silo-buffer=Requests specified items to be available for personal logistics and automated construction. + +angels-warehouse-passive-provider=Sends its content to the logistic network. +angels-warehouse-active-provider=Makes its content available to the logistic network. +angels-warehouse-storage=Long-term storage for the logistic network. +angels-warehouse-requester=Requests specified items from the logistic network. +angels-warehouse-buffer=Requests specified items to be available for personal logistics and automated construction. diff --git a/angelsaddons-storage/prototypes/buildings/basic-storage.lua b/angelsaddons-storage/prototypes/buildings/fluid-tanks.lua similarity index 67% rename from angelsaddons-storage/prototypes/buildings/basic-storage.lua rename to angelsaddons-storage/prototypes/buildings/fluid-tanks.lua index 9ac5698c8..b2ecce019 100644 --- a/angelsaddons-storage/prototypes/buildings/basic-storage.lua +++ b/angelsaddons-storage/prototypes/buildings/fluid-tanks.lua @@ -1,138 +1,38 @@ -if angelsmods.addons.storage.oresilos then - data:extend( - { --silos - { - type = "item", - name = "silo", - icon = "__angelsaddons-storage__/graphics/icons/silo.png", - icon_size = 32, - subgroup = "angels-silo", - order = "a", - place_result = "silo", - stack_size = 10, - }, - { - type = "container", - name = "silo", - icon = "__angelsaddons-storage__/graphics/icons/silo.png", - icon_size = 32, - flags = {"placeable-neutral", "player-creation"}, - minable = {mining_time = 1, result = "silo"}, - max_health = 300, - corpse = "small-remnants", - open_sound = { filename = "__base__/sound/metallic-chest-open.ogg", volume=0.65 }, - close_sound = { filename = "__base__/sound/metallic-chest-close.ogg", volume = 0.7 }, - resistances = - { - { - type = "fire", - percent = 90 - } - }, - collision_box = {{-1.9, -1.9}, {1.9, 1.9}}, - selection_box = {{-2, -2}, {2, 2}}, - fast_replaceable_group = "silo", - inventory_size = 256, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - picture = - { - filename = "__angelsaddons-storage__/graphics/entity/silo.png", - priority = "extra-high", - width = 192, - height = 192, - shift = {0, 0} - }, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, - circuit_wire_max_distance = default_circuit_wire_max_distance - }, - } - ) -end -if angelsmods.addons.storage.warehouses then +if angelsmods.addons.storage.pressuretank then + --PRESSURE TANKS data:extend( { { type = "item", - name = "angels-warehouse", - icon = "__angelsaddons-storage__/graphics/icons/warehouse.png", + name = "angels-pressure-tank-1", + icon = "__angelsaddons-storage__/graphics/icons/pressure-tank-1.png", icon_size = 32, - subgroup = "angels-warehouse", - order = "a[angels-warehouse]", - place_result = "angels-warehouse", + subgroup = "angels-fluid-tanks", + order = "e", + place_result = "angels-pressure-tank-1", stack_size = 10, }, - { - type = "container", - name = "angels-warehouse", - icon = "__angelsaddons-storage__/graphics/icons/warehouse.png", - icon_size = 32, - flags = {"placeable-neutral", "player-creation"}, - minable = {mining_time = 1, result = "angels-warehouse"}, - max_health = 300, - corpse = "small-remnants", - open_sound = { filename = "__base__/sound/metallic-chest-open.ogg", volume=0.65 }, - close_sound = { filename = "__base__/sound/metallic-chest-close.ogg", volume = 0.7 }, - resistances = - { - { - type = "fire", - percent = 90 - } - }, - collision_box = {{-2.9, -2.9}, {2.9, 2.9}}, - selection_box = {{-3, -3}, {3, 3}}, - fast_replaceable_group = "angels-warehouse", - inventory_size = 768, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - picture = - { - filename = "__angelsaddons-storage__/graphics/entity/warehouse.png", - priority = "extra-high", - width = 256, - height = 288, - shift = {0, -0.5} - }, - circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, - circuit_wire_max_distance = default_circuit_wire_max_distance - }, - } - ) -end -if angelsmods.addons.storage.inlinetank and (not mods["angelspetrochem"]) then - data:extend( - { - { - type = "item", - name = "angels-storage-tank-3", - icon = "__angelsaddons-storage__/graphics/icons/storage-tank-3.png", - icon_size = 32, - subgroup = "storage", - order = "b[fluid]-b[inline-storage-tank]", - place_result = "angels-storage-tank-3", - stack_size = 10, - }, { type = "storage-tank", - name = "angels-storage-tank-3", - icon = "__angelsaddons-storage__/graphics/icons/storage-tank-3.png", + name = "angels-pressure-tank-1", + icon = "__angelsaddons-storage__/graphics/icons/pressure-tank-1.png", icon_size = 32, - flags = {"placeable-player", "player-creation"}, - minable = {hardness = 0.2, mining_time = 3, result = "angels-storage-tank-3"}, + flags = {"placeable-player", "player-creation", "not-rotatable"}, + minable = {hardness = 0.2, mining_time = 3, result = "angels-pressure-tank-1"}, max_health = 500, corpse = "medium-remnants", - collision_box = {{-0.9, -0.9}, {0.9, 0.9}}, - selection_box = {{-1, -1}, {1, 1}}, - two_direction_only = false, + collision_box = {{-2.3, -2.3}, {2.3, 2.3}}, + selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, fluid_box = { - base_area = 200, + base_area = 3500, pipe_covers = pipecoverspictures(), pipe_connections = { - { position = {0.5, -1.5} }, - { position = {0.5, 1.5} }, + { position = {0, -3} }, + { position = {3, 0} }, + { position = {-3, 0} }, + { position = {0, 3} }, }, }, window_bounding_box = {{-0.125, 0.6875}, {0.1875, 1.1875}}, @@ -142,61 +42,62 @@ if angelsmods.addons.storage.inlinetank and (not mods["angelspetrochem"]) then { sheet = { - filename = "__angelsaddons-storage__/graphics/entity/storage-tank-3.png", + filename = "__angelsaddons-storage__/graphics/entity/pressure-tank-1.png", priority = "extra-high", - frames = 4, - width = 256, - height = 320, - scale = 0.495, - shift = {0, -0.5} + frames = 1, + width = 224, + height = 224, + shift = {0, 0} } }, fluid_background = { - filename = "__angelsaddons-storage__/graphics/entity/blank.png", + filename = "__base__/graphics/entity/storage-tank/fluid-background.png", priority = "extra-high", - width = 1, - height = 1 + width = 32, + height = 15 }, window_background = { - filename = "__angelsaddons-storage__/graphics/entity/blank.png", + filename = "__base__/graphics/entity/storage-tank/window-background.png", priority = "extra-high", - width = 1, - height = 1 + width = 17, + height = 24 }, flow_sprite = { - filename = "__angelsaddons-storage__/graphics/entity/blank.png", + filename = "__base__/graphics/entity/pipe/fluid-flow-low-temperature.png", priority = "extra-high", - width = 1, - height = 1 + width = 160, + height = 20 }, gas_flow = { - filename = "__angelsaddons-storage__/graphics/entity/blank.png", + filename = "__base__/graphics/entity/pipe/steam.png", priority = "extra-high", - width = 1, - height = 1, - frame_count = 1, + line_length = 10, + width = 24, + height = 15, + frame_count = 60, axially_symmetrical = false, direction_count = 1, animation_speed = 0.25, hr_version = { - filename = "__angelsaddons-storage__/graphics/entity/blank.png", + filename = "__base__/graphics/entity/pipe/hr-steam.png", priority = "extra-high", - width = 1, - height = 1, - frame_count = 1, + line_length = 10, + width = 48, + height = 30, + frame_count = 60, axially_symmetrical = false, - direction_count = 1, animation_speed = 0.25, + direction_count = 1 } } }, flow_length_in_ticks = 360, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, working_sound = { sound = { @@ -209,44 +110,45 @@ if angelsmods.addons.storage.inlinetank and (not mods["angelspetrochem"]) then circuit_wire_connection_points = circuit_connector_definitions["storage-tank"].points, circuit_connector_sprites = circuit_connector_definitions["storage-tank"].sprites, circuit_wire_max_distance = default_circuit_wire_max_distance - } + }, } ) end -if angelsmods.addons.storage.pressuretank then + +if angelsmods.addons.storage.inlinetank and (not mods["angelspetrochem"]) then + --INLINE TANKS data:extend( { { type = "item", - name = "angels-pressure-tank-1", - icon = "__angelsaddons-storage__/graphics/icons/pressure-tank-1.png", + name = "angels-storage-tank-3", + icon = "__angelsaddons-storage__/graphics/icons/storage-tank-3.png", icon_size = 32, - subgroup = "angels-fluid-tanks", - order = "e", - place_result = "angels-pressure-tank-1", + subgroup = "storage", + order = "b[fluid]-b[inline-storage-tank]", + place_result = "angels-storage-tank-3", stack_size = 10, - }, + }, { type = "storage-tank", - name = "angels-pressure-tank-1", - icon = "__angelsaddons-storage__/graphics/icons/pressure-tank-1.png", + name = "angels-storage-tank-3", + icon = "__angelsaddons-storage__/graphics/icons/storage-tank-3.png", icon_size = 32, - flags = {"placeable-player", "player-creation", "not-rotatable"}, - minable = {hardness = 0.2, mining_time = 3, result = "angels-pressure-tank-1"}, + flags = {"placeable-player", "player-creation"}, + minable = {hardness = 0.2, mining_time = 3, result = "angels-storage-tank-3"}, max_health = 500, corpse = "medium-remnants", - collision_box = {{-2.3, -2.3}, {2.3, 2.3}}, - selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, + collision_box = {{-0.9, -0.9}, {0.9, 0.9}}, + selection_box = {{-1, -1}, {1, 1}}, + two_direction_only = false, fluid_box = { - base_area = 3500, + base_area = 200, pipe_covers = pipecoverspictures(), pipe_connections = { - { position = {0, -3} }, - { position = {3, 0} }, - { position = {-3, 0} }, - { position = {0, 3} }, + { position = {0.5, -1.5} }, + { position = {0.5, 1.5} }, }, }, window_bounding_box = {{-0.125, 0.6875}, {0.1875, 1.1875}}, @@ -256,62 +158,61 @@ if angelsmods.addons.storage.pressuretank then { sheet = { - filename = "__angelsaddons-storage__/graphics/entity/pressure-tank-1.png", + filename = "__angelsaddons-storage__/graphics/entity/storage-tank-3.png", priority = "extra-high", - frames = 1, - width = 224, - height = 224, - shift = {0, 0} + frames = 4, + width = 256, + height = 320, + scale = 0.495, + shift = {0, -0.5} } }, fluid_background = { - filename = "__base__/graphics/entity/storage-tank/fluid-background.png", + filename = "__angelsaddons-storage__/graphics/entity/blank.png", priority = "extra-high", - width = 32, - height = 15 + width = 1, + height = 1 }, window_background = { - filename = "__base__/graphics/entity/storage-tank/window-background.png", + filename = "__angelsaddons-storage__/graphics/entity/blank.png", priority = "extra-high", - width = 17, - height = 24 + width = 1, + height = 1 }, flow_sprite = { - filename = "__base__/graphics/entity/pipe/fluid-flow-low-temperature.png", + filename = "__angelsaddons-storage__/graphics/entity/blank.png", priority = "extra-high", - width = 160, - height = 20 + width = 1, + height = 1 }, gas_flow = { - filename = "__base__/graphics/entity/pipe/steam.png", + filename = "__angelsaddons-storage__/graphics/entity/blank.png", priority = "extra-high", - line_length = 10, - width = 24, - height = 15, - frame_count = 60, + width = 1, + height = 1, + frame_count = 1, axially_symmetrical = false, direction_count = 1, animation_speed = 0.25, hr_version = { - filename = "__base__/graphics/entity/pipe/hr-steam.png", + filename = "__angelsaddons-storage__/graphics/entity/blank.png", priority = "extra-high", - line_length = 10, - width = 48, - height = 30, - frame_count = 60, + width = 1, + height = 1, + frame_count = 1, axially_symmetrical = false, + direction_count = 1, animation_speed = 0.25, - direction_count = 1 } } }, flow_length_in_ticks = 360, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, working_sound = { sound = { @@ -324,7 +225,7 @@ if angelsmods.addons.storage.pressuretank then circuit_wire_connection_points = circuit_connector_definitions["storage-tank"].points, circuit_connector_sprites = circuit_connector_definitions["storage-tank"].sprites, circuit_wire_max_distance = default_circuit_wire_max_distance - }, + } } ) -end +end \ No newline at end of file diff --git a/angelsaddons-storage/prototypes/buildings/logistic-storage.lua b/angelsaddons-storage/prototypes/buildings/logistic-storage.lua deleted file mode 100644 index df67cb17f..000000000 --- a/angelsaddons-storage/prototypes/buildings/logistic-storage.lua +++ /dev/null @@ -1,93 +0,0 @@ -if angelsmods.addons.storage.warehouses then - local log_names = { - ["aprovider"] = {order = "i", stacks = 418, mode = "active-provider"}, - ["pprovider"] = {order = "j", stacks = 512, mode = "passive-provider"}, - ["storage"] = {order = "k", stacks = 768, mode = "storage", slots = 1}, - ["buffer"] = {order = "l", stacks = 512, mode = "buffer", slots = 20}, - ["requester"] = {order = "m", stacks = 418, mode = "requester", slots = 20} - } - local warehouse_add = {} - for name,stat in pairs(log_names) do - local cont_add, item_add = nil, nil - cont_add = table.deepcopy(data.raw.container["angels-warehouse"]) - cont_add.name = "angels-warehouse-"..stat.mode - cont_add.type = "logistic-container" - cont_add.icon = "__angelsaddons-storage__/graphics/icons/warehouse-log-"..name..".png" - cont_add.picture.filename = "__angelsaddons-storage__/graphics/entity/warehouse-log-"..name..".png" - cont_add.minable.result = "angels-warehouse-"..stat.mode - cont_add.logistic_mode = stat.mode - cont_add.inventory_size = stat.stacks - if stat.slots then - cont_add.logistic_slots_count = stat.slots - end - - item_add = table.deepcopy(data.raw.item["angels-warehouse"]) - item_add.name = "angels-warehouse-"..stat.mode - item_add.icon = "__angelsaddons-storage__/graphics/icons/warehouse-log-"..name..".png" - item_add.order = "a[warehouse]-"..stat.order.."["..stat.mode.."]" - item_add.place_result = "angels-warehouse-"..stat.mode - - warehouse_add[#warehouse_add+1] = cont_add - warehouse_add[#warehouse_add+1] = item_add - end - data:extend(warehouse_add) -end - -if angelsmods.addons.storage.oresilos then - local ore_silo = {"ore1","ore2","ore3","ore4","ore5","ore6","coal"} - --if mods["angelsrefining"] and mods["bobplates"] then --special vanilla check? manipulate above table to not have ore 5/6 in spec vanilla - local silo_add = {} - --ore silos - for order,name in pairs(ore_silo) do - local cont_add, item_add = {}, {nil} - cont_add = table.deepcopy(data.raw.container.silo) - cont_add.name = "silo-"..name - cont_add.icon = "__angelsaddons-storage__/graphics/icons/silo-"..name..".png" - cont_add.picture.filename = "__angelsaddons-storage__/graphics/entity/silo-"..name..".png" - cont_add.minable.result = "silo-"..name - - item_add = table.deepcopy(data.raw.item.silo) - item_add.name = "silo-"..name - item_add.icon = "__angelsaddons-storage__/graphics/icons/silo-"..name..".png" - item_add.order = "a[ore]-"..order.."["..name.."]" - item_add.place_result = "silo-"..name - item_add.subgroup = "angels-ore-silo" - - silo_add[#silo_add+1] = cont_add - silo_add[#silo_add+1] = item_add - end - --end - --LOGISTICS - local log_names = { - ["aprovider"] = {order = "i", stacks = 209, mode = "active-provider"}, - ["pprovider"] = {order = "j", stacks = 256, mode = "passive-provider"}, - ["storage"] = {order = "k", stacks = 384, mode = "storage", slots = 1}, - ["buffer"] = {order = "l", stacks = 256, mode = "buffer", slots = 12}, - ["requester"] = {order = "m", stacks = 209, mode = "requester", slots = 12} - } - for name,stat in pairs(log_names) do - local cont_add, item_add = nil, nil - cont_add = table.deepcopy(data.raw.container.silo) - cont_add.name = "silo-"..stat.mode - cont_add.type = "logistic-container" - cont_add.icon = "__angelsaddons-storage__/graphics/icons/silo-log-"..name..".png" - cont_add.picture.filename = "__angelsaddons-storage__/graphics/entity/silo-log-"..name..".png" - cont_add.minable.result = "silo-"..stat.mode - cont_add.logistic_mode = stat.mode - cont_add.inventory_size = stat.stacks - if stat.slots then - cont_add.logistic_slots_count = stat.slots - end - - item_add = table.deepcopy(data.raw.item.silo) - item_add.name = "silo-"..stat.mode - item_add.icon = "__angelsaddons-storage__/graphics/icons/silo-log-"..name..".png" - item_add.order = "a[silo]-"..stat.order.."["..stat.mode.."]" - item_add.place_result = "silo-"..stat.mode - - silo_add[#silo_add+1] = cont_add - silo_add[#silo_add+1] = item_add - end - data:extend(silo_add) -end - diff --git a/angelsaddons-storage/prototypes/buildings/silos.lua b/angelsaddons-storage/prototypes/buildings/silos.lua new file mode 100644 index 000000000..1ee48e291 --- /dev/null +++ b/angelsaddons-storage/prototypes/buildings/silos.lua @@ -0,0 +1,119 @@ +if angelsmods.addons.storage.silos or angelsmods.addons.storage.oresilos then + ----------------------------------------------------------------------------- + -- REGULAR SILO ------------------------------------------------------------- + ----------------------------------------------------------------------------- + data:extend( + { + { + type = "item", + name = "silo", + icon = "__angelsaddons-storage__/graphics/icons/silo.png", + icon_size = 32, + subgroup = "angels-silo", + order = "a", + place_result = "silo", + stack_size = 10, + }, + { + type = "container", + name = "silo", + icon = "__angelsaddons-storage__/graphics/icons/silo.png", + icon_size = 32, + flags = {"placeable-neutral", "player-creation"}, + minable = {mining_time = 1, result = "silo"}, + max_health = 300, + corpse = "small-remnants", + open_sound = { filename = "__base__/sound/metallic-chest-open.ogg", volume=0.65 }, + close_sound = { filename = "__base__/sound/metallic-chest-close.ogg", volume = 0.7 }, + resistances = + { + { + type = "fire", + percent = 90 + } + }, + collision_box = {{-1.9, -1.9}, {1.9, 1.9}}, + selection_box = {{-2, -2}, {2, 2}}, + fast_replaceable_group = "silo", + inventory_size = 256, + vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + picture = + { + filename = "__angelsaddons-storage__/graphics/entity/silo.png", + priority = "extra-high", + width = 192, + height = 192, + shift = {0, 0} + }, + circuit_wire_connection_point = circuit_connector_definitions["chest"].points, + circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + circuit_wire_max_distance = default_circuit_wire_max_distance + }, + } + ) +end + +if angelsmods.addons.storage.oresilos then + ----------------------------------------------------------------------------- + -- ORE SILOS ---------------------------------------------------------------- + ----------------------------------------------------------------------------- + local ore_silo = {"ore1","ore2","ore3","ore4","ore5","ore6","coal"} + local silo_add = {} + for order,name in pairs(ore_silo) do + local cont_add, item_add = {}, {nil} + cont_add = table.deepcopy(data.raw.container.silo) + cont_add.name = "silo-"..name + cont_add.icon = "__angelsaddons-storage__/graphics/icons/silo-"..name..".png" + cont_add.picture.filename = "__angelsaddons-storage__/graphics/entity/silo-"..name..".png" + --cont_add.minable.result = "silo-"..name --want to actually return the silo + + item_add = table.deepcopy(data.raw.item.silo) + item_add.name = "silo-"..name + item_add.icon = "__angelsaddons-storage__/graphics/icons/silo-"..name..".png" + item_add.order = "a[ore]-"..order.."["..name.."]" + item_add.place_result = "silo-"..name + item_add.subgroup = "angels-ore-silo" + + silo_add[#silo_add+1] = cont_add + silo_add[#silo_add+1] = item_add + end + data:extend(silo_add) +end + +if angelsmods.addons.storage.silos then + ----------------------------------------------------------------------------- + -- LOGISTIC SILOS ----------------------------------------------------------- + ----------------------------------------------------------------------------- + local log_names = { + ["aprovider"] = {order = "i", stacks = 384, mode = "active-provider"}, + ["pprovider"] = {order = "j", stacks = 256, mode = "passive-provider"}, + ["storage"] = {order = "k", stacks = 384, mode = "storage", slots = 1}, + ["buffer"] = {order = "l", stacks = 256, mode = "buffer"}, + ["requester"] = {order = "m", stacks = 209, mode = "requester"} + } + local silo_add = {} + for name,stat in pairs(log_names) do + local cont_add, item_add = nil, nil + cont_add = table.deepcopy(data.raw.container.silo) + cont_add.name = "silo-"..stat.mode + cont_add.type = "logistic-container" + cont_add.icon = "__angelsaddons-storage__/graphics/icons/silo-log-"..name..".png" + cont_add.picture.filename = "__angelsaddons-storage__/graphics/entity/silo-log-"..name..".png" + cont_add.minable.result = "silo-"..stat.mode + cont_add.logistic_mode = stat.mode + cont_add.inventory_size = stat.stacks + if stat.slots then + cont_add.max_logistic_slots = stat.slots + end + + item_add = table.deepcopy(data.raw.item.silo) + item_add.name = "silo-"..stat.mode + item_add.icon = "__angelsaddons-storage__/graphics/icons/silo-log-"..name..".png" + item_add.order = "a[silo]-"..stat.order.."["..stat.mode.."]" + item_add.place_result = "silo-"..stat.mode + + silo_add[#silo_add+1] = cont_add + silo_add[#silo_add+1] = item_add + end + data:extend(silo_add) +end diff --git a/angelsaddons-storage/prototypes/buildings/warehouses.lua b/angelsaddons-storage/prototypes/buildings/warehouses.lua new file mode 100644 index 000000000..1eefdd356 --- /dev/null +++ b/angelsaddons-storage/prototypes/buildings/warehouses.lua @@ -0,0 +1,90 @@ +if angelsmods.addons.storage.warehouses then + ----------------------------------------------------------------------------- + -- REGULAR WAREHOUSE -------------------------------------------------------- + ----------------------------------------------------------------------------- + data:extend( + { + { + type = "item", + name = "angels-warehouse", + icon = "__angelsaddons-storage__/graphics/icons/warehouse.png", + icon_size = 32, + subgroup = "angels-warehouse", + order = "a[angels-warehouse]", + place_result = "angels-warehouse", + stack_size = 10, + }, + { + type = "container", + name = "angels-warehouse", + icon = "__angelsaddons-storage__/graphics/icons/warehouse.png", + icon_size = 32, + flags = {"placeable-neutral", "player-creation"}, + minable = {mining_time = 1, result = "angels-warehouse"}, + max_health = 300, + corpse = "small-remnants", + open_sound = { filename = "__base__/sound/metallic-chest-open.ogg", volume=0.65 }, + close_sound = { filename = "__base__/sound/metallic-chest-close.ogg", volume = 0.7 }, + resistances = + { + { + type = "fire", + percent = 90 + } + }, + collision_box = {{-2.9, -2.9}, {2.9, 2.9}}, + selection_box = {{-3, -3}, {3, 3}}, + fast_replaceable_group = "angels-warehouse", + inventory_size = 768, + vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + picture = + { + filename = "__angelsaddons-storage__/graphics/entity/warehouse.png", + priority = "extra-high", + width = 256, + height = 288, + shift = {0, -0.5} + }, + circuit_wire_connection_point = circuit_connector_definitions["chest"].points, + circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, + circuit_wire_max_distance = default_circuit_wire_max_distance + }, + } + ) + + ----------------------------------------------------------------------------- + -- LOGISTIC WAREHOUSES ------------------------------------------------------ + ----------------------------------------------------------------------------- + local log_names = { + ["aprovider"] = {order = "i", stacks = 768, mode = "active-provider"}, + ["pprovider"] = {order = "j", stacks = 512, mode = "passive-provider"}, + ["storage"] = {order = "k", stacks = 768, mode = "storage", slots = 1}, + ["buffer"] = {order = "l", stacks = 512, mode = "buffer"}, + ["requester"] = {order = "m", stacks = 418, mode = "requester"} + } + local warehouse_add = {} + for name,stat in pairs(log_names) do + local cont_add, item_add = nil, nil + cont_add = table.deepcopy(data.raw.container["angels-warehouse"]) + cont_add.name = "angels-warehouse-"..stat.mode + cont_add.type = "logistic-container" + cont_add.icon = "__angelsaddons-storage__/graphics/icons/warehouse-log-"..name..".png" + cont_add.picture.filename = "__angelsaddons-storage__/graphics/entity/warehouse-log-"..name..".png" + cont_add.minable.result = "angels-warehouse-"..stat.mode + cont_add.logistic_mode = stat.mode + cont_add.inventory_size = stat.stacks + if stat.slots then + cont_add.max_logistic_slots = stat.slots + end + + item_add = table.deepcopy(data.raw.item["angels-warehouse"]) + item_add.name = "angels-warehouse-"..stat.mode + item_add.icon = "__angelsaddons-storage__/graphics/icons/warehouse-log-"..name..".png" + item_add.order = "a[warehouse]-"..stat.order.."["..stat.mode.."]" + item_add.place_result = "angels-warehouse-"..stat.mode + + warehouse_add[#warehouse_add+1] = cont_add + warehouse_add[#warehouse_add+1] = item_add + end + data:extend(warehouse_add) +end diff --git a/angelsaddons-storage/prototypes/pressure-tanks-override.lua b/angelsaddons-storage/prototypes/overrides/fluid-tanks.lua similarity index 84% rename from angelsaddons-storage/prototypes/pressure-tanks-override.lua rename to angelsaddons-storage/prototypes/overrides/fluid-tanks.lua index 170a6ac98..40937b86f 100644 --- a/angelsaddons-storage/prototypes/pressure-tanks-override.lua +++ b/angelsaddons-storage/prototypes/overrides/fluid-tanks.lua @@ -8,6 +8,5 @@ if angelsmods.addons.storage.pressuretank then else data.raw["item"]["angels-pressure-tank-1"].subgroup = "storage" data.raw["item"]["angels-pressure-tank-1"].order = "b[fluid]-a[storage-tank]-a[angels]" - data.raw["technology"]["pressure-tanks"].prerequisites = {"fluid-handling"} end end \ No newline at end of file diff --git a/angelsaddons-storage/prototypes/overrides/silos.lua b/angelsaddons-storage/prototypes/overrides/silos.lua new file mode 100644 index 000000000..7c20a1590 --- /dev/null +++ b/angelsaddons-storage/prototypes/overrides/silos.lua @@ -0,0 +1,69 @@ +if angelsmods.addons.storage.icon_scaling then + if angelsmods.addons.storage.silos or angelsmods.addons.storage.oresilos then + data.raw["container"]["silo"].scale_info_icons = true + end + if angelsmods.addons.storage.silos then + data.raw["logistic-container"]["silo-active-provider"].scale_info_icons = true + data.raw["logistic-container"]["silo-passive-provider"].scale_info_icons = true + data.raw["logistic-container"]["silo-requester"].scale_info_icons = true + data.raw["logistic-container"]["silo-storage"].scale_info_icons = true + data.raw["logistic-container"]["silo-buffer"].scale_info_icons = true + end + if angelsmods.addons.storage.oresilos then + data.raw["container"]["silo-ore1"].scale_info_icons = true + data.raw["container"]["silo-ore2"].scale_info_icons = true + data.raw["container"]["silo-ore3"].scale_info_icons = true + data.raw["container"]["silo-ore4"].scale_info_icons = true + data.raw["container"]["silo-ore5"].scale_info_icons = true + data.raw["container"]["silo-ore6"].scale_info_icons = true + data.raw["container"]["silo-coal"].scale_info_icons = true + end +end + +--OVERRIDE FOR ANGELS +--REFINING +if angelsmods.addons.storage.oresilos and angelsmods.refining then + angelsmods.functions.OV.add_prereq("ore-silos", "ore-crushing") + for refinery_product_name, ore_name in pairs{ + ["saphirite"] = "ore1", + ["jivolite"] = "ore2", + ["stiratite"] = "ore3", + ["crotinnium"] = "ore4", + ["rubyte"] = "ore5", + ["bobmonium"] = "ore6" + } do + if angelsmods.trigger.refinery_products[refinery_product_name] then + angelsmods.functions.OV.patch_recipes{ + { + name = "silo-"..ore_name, + ingredients = { + {type = "item", name = "angels-"..ore_name.."-crushed", amount = 10} + } + } + } + else + angelsmods.functions.add_flag("silo-"..ore_name, "hidden") + angelsmods.functions.OV.disable_recipe("silo-"..ore_name) + end + end + angelsmods.functions.OV.patch_recipes{ + { + name = "silo-coal", + ingredients = { + {type = "item", name = angelsmods.petrochem and "coal-crushed" or "coal", amount = 10} + } + } + } + if angelsmods.petrochem then + angelsmods.functions.OV.add_prereq("ore-silos", "angels-coal-processing") + end + angelsmods.functions.OV.execute() +end + +--INDUSTRIES +if angelsmods.industries then + data.raw["item-subgroup"]["angels-silo"].group = "angels-logistics" + data.raw["item-subgroup"]["angels-silo"].order = "ac[chests-silo]" + data.raw["item-subgroup"]["angels-ore-silo"].group = "angels-logistics" + data.raw["item-subgroup"]["angels-ore-silo"].order = "ac[chests-silo]" +end \ No newline at end of file diff --git a/angelsaddons-storage/prototypes/overrides/warehouses.lua b/angelsaddons-storage/prototypes/overrides/warehouses.lua new file mode 100644 index 000000000..195920066 --- /dev/null +++ b/angelsaddons-storage/prototypes/overrides/warehouses.lua @@ -0,0 +1,17 @@ +if angelsmods.addons.storage.icon_scaling then + if angelsmods.addons.storage.warehouses then + data.raw["container"]["angels-warehouse"].scale_info_icons = true + data.raw["logistic-container"]["angels-warehouse-passive-provider"].scale_info_icons = true + data.raw["logistic-container"]["angels-warehouse-active-provider"].scale_info_icons = true + data.raw["logistic-container"]["angels-warehouse-storage"].scale_info_icons = true + data.raw["logistic-container"]["angels-warehouse-requester"].scale_info_icons = true + data.raw["logistic-container"]["angels-warehouse-buffer"].scale_info_icons = true + end +end + +--OVERRIDE FOR ANGELS +--INDUSTRIES +if angelsmods.industries then + data.raw["item-subgroup"]["angels-warehouse"].group = "angels-logistics" + data.raw["item-subgroup"]["angels-warehouse"].order = "ad[chests-warehouse]" +end \ No newline at end of file diff --git a/angelsaddons-storage/prototypes/recipes/pressure-tanks.lua b/angelsaddons-storage/prototypes/recipes/fluid-tanks.lua similarity index 95% rename from angelsaddons-storage/prototypes/recipes/pressure-tanks.lua rename to angelsaddons-storage/prototypes/recipes/fluid-tanks.lua index 77b9ce20c..15be3ddab 100644 --- a/angelsaddons-storage/prototypes/recipes/pressure-tanks.lua +++ b/angelsaddons-storage/prototypes/recipes/fluid-tanks.lua @@ -1,7 +1,7 @@ if angelsmods.addons.storage.pressuretank then + --PRESSURE TANKS data:extend( { - --PRESSURE TANKS { type = "recipe", name = "angels-pressure-tank-1", @@ -18,10 +18,11 @@ if angelsmods.addons.storage.pressuretank then } ) end + if angelsmods.addons.storage.inlinetank and (not mods["angelspetrochem"]) then + --INLINE TANKS data:extend( { - --INLINE TANKS { type = "recipe", name = "angels-storage-tank-3", diff --git a/angelsaddons-storage/prototypes/recipes/ore-silos.lua b/angelsaddons-storage/prototypes/recipes/ore-silos.lua deleted file mode 100644 index 121370c6d..000000000 --- a/angelsaddons-storage/prototypes/recipes/ore-silos.lua +++ /dev/null @@ -1,150 +0,0 @@ -if angelsmods.addons.storage.oresilos then -data:extend( - { - --ORE SILOS - { - type = "recipe", - name = "silo", - energy_required = 5, - enabled = false, - ingredients = { - {type = "item", name = "iron-plate", amount = 20}, - {type = "item", name = "steel-plate", amount = 10}, - {type = "item", name = "stone-brick", amount = 20} - }, - result = "silo" - }, - { - type = "recipe", - name = "silo-ore1", - energy_required = 0.5, - enabled = false, - ingredients = { - {type = "item", name = "silo", amount = 1} - }, - result = "silo-ore1" - }, - { - type = "recipe", - name = "silo-ore2", - energy_required = 0.5, - enabled = false, - ingredients = { - {type = "item", name = "silo", amount = 1} - }, - result = "silo-ore2" - }, - { - type = "recipe", - name = "silo-ore3", - energy_required = 0.5, - enabled = false, - ingredients = { - {type = "item", name = "silo", amount = 1} - }, - result = "silo-ore3" - }, - { - type = "recipe", - name = "silo-ore4", - energy_required = 0.5, - enabled = false, - ingredients = { - {type = "item", name = "silo", amount = 1} - }, - result = "silo-ore4" - }, - { - type = "recipe", - name = "silo-ore5", - energy_required = 0.5, - enabled = false, - ingredients = { - {type = "item", name = "silo", amount = 1} - }, - result = "silo-ore5" - }, - { - type = "recipe", - name = "silo-ore6", - energy_required = 0.5, - enabled = false, - ingredients = { - {type = "item", name = "silo", amount = 1} - }, - result = "silo-ore6" - }, - { - type = "recipe", - name = "silo-coal", - energy_required = 0.5, - enabled = false, - ingredients = { - {type = "item", name = "silo", amount = 1} - }, - result = "silo-coal" - }, - --LOGISTIC SILOS - { - type = "recipe", - name = "silo-passive-provider", - energy_required = 5, - enabled = false, - ingredients = { - {type = "item", name = "silo", amount = 1}, - {type = "item", name = "steel-plate", amount = 10}, - {type = "item", name = "advanced-circuit", amount = 10} - }, - result = "silo-passive-provider" - }, - { - type = "recipe", - name = "silo-active-provider", - energy_required = 5, - enabled = false, - ingredients = { - {type = "item", name = "silo", amount = 1}, - {type = "item", name = "steel-plate", amount = 10}, - {type = "item", name = "advanced-circuit", amount = 10} - }, - result = "silo-active-provider" - }, - { - type = "recipe", - name = "silo-requester", - energy_required = 5, - enabled = false, - ingredients = { - {type = "item", name = "silo", amount = 1}, - {type = "item", name = "steel-plate", amount = 10}, - {type = "item", name = "advanced-circuit", amount = 10} - }, - result = "silo-requester" - }, - { - type = "recipe", - name = "silo-storage", - energy_required = 5, - enabled = false, - ingredients = { - {type = "item", name = "silo", amount = 1}, - {type = "item", name = "steel-plate", amount = 10}, - {type = "item", name = "advanced-circuit", amount = 10} - }, - result = "silo-storage" - }, - { - type = "recipe", - name = "silo-buffer", - energy_required = 5, - enabled = false, - ingredients = { - {type = "item", name = "silo", amount = 1}, - {type = "item", name = "steel-plate", amount = 10}, - {type = "item", name = "advanced-circuit", amount = 10} - }, - result = "silo-buffer" - } - } -) -end \ No newline at end of file diff --git a/angelsaddons-storage/prototypes/recipes/silos.lua b/angelsaddons-storage/prototypes/recipes/silos.lua new file mode 100644 index 000000000..6052f2718 --- /dev/null +++ b/angelsaddons-storage/prototypes/recipes/silos.lua @@ -0,0 +1,171 @@ +if angelsmods.addons.storage.silos or angelsmods.addons.storage.oresilos then + ----------------------------------------------------------------------------- + -- REGULAR SILO ------------------------------------------------------------- + ----------------------------------------------------------------------------- + data:extend( + { + { + type = "recipe", + name = "silo", + energy_required = 5, + enabled = false, + ingredients = { + {type = "item", name = "iron-plate", amount = 20}, + {type = "item", name = "steel-plate", amount = 10}, + {type = "item", name = "stone-brick", amount = 20} + }, + result = "silo" + }, + } + ) +end + +if angelsmods.addons.storage.oresilos then + ----------------------------------------------------------------------------- + -- ORE SILOS ---------------------------------------------------------------- + ----------------------------------------------------------------------------- + data:extend( + { + { + type = "recipe", + name = "silo-ore1", + energy_required = 0.5, + enabled = false, + ingredients = { + {type = "item", name = "silo", amount = 1} + }, + result = "silo-ore1" + }, + { + type = "recipe", + name = "silo-ore2", + energy_required = 0.5, + enabled = false, + ingredients = { + {type = "item", name = "silo", amount = 1} + }, + result = "silo-ore2" + }, + { + type = "recipe", + name = "silo-ore3", + energy_required = 0.5, + enabled = false, + ingredients = { + {type = "item", name = "silo", amount = 1} + }, + result = "silo-ore3" + }, + { + type = "recipe", + name = "silo-ore4", + energy_required = 0.5, + enabled = false, + ingredients = { + {type = "item", name = "silo", amount = 1} + }, + result = "silo-ore4" + }, + { + type = "recipe", + name = "silo-ore5", + energy_required = 0.5, + enabled = false, + ingredients = { + {type = "item", name = "silo", amount = 1} + }, + result = "silo-ore5" + }, + { + type = "recipe", + name = "silo-ore6", + energy_required = 0.5, + enabled = false, + ingredients = { + {type = "item", name = "silo", amount = 1} + }, + result = "silo-ore6" + }, + { + type = "recipe", + name = "silo-coal", + energy_required = 0.5, + enabled = false, + ingredients = { + {type = "item", name = "silo", amount = 1} + }, + result = "silo-coal" + } + } + ) +end + +if angelsmods.addons.storage.silos then + ----------------------------------------------------------------------------- + -- LOGISTIC SILOS ----------------------------------------------------------- + ----------------------------------------------------------------------------- + data:extend( + { + { + type = "recipe", + name = "silo-passive-provider", + energy_required = 5, + enabled = false, + ingredients = { + {type = "item", name = "silo", amount = 1}, + {type = "item", name = "steel-plate", amount = 10}, + {type = "item", name = mods["angelsindustries"] and "electronic-circuit" or "advanced-circuit", amount = 10} + }, + result = "silo-passive-provider" + }, + { + type = "recipe", + name = "silo-active-provider", + energy_required = 5, + enabled = false, + ingredients = { + {type = "item", name = "silo", amount = 1}, + {type = "item", name = "steel-plate", amount = 10}, + {type = "item", name = "advanced-circuit", amount = 10} + }, + result = "silo-active-provider" + }, + { + type = "recipe", + name = "silo-requester", + energy_required = 5, + enabled = false, + ingredients = { + {type = "item", name = "silo", amount = 1}, + {type = "item", name = "steel-plate", amount = 10}, + {type = "item", name = mods["angelsindustries"] and "electronic-circuit" or "advanced-circuit", amount = 10} + }, + result = "silo-requester" + }, + { + type = "recipe", + name = "silo-storage", + energy_required = 5, + enabled = false, + ingredients = { + {type = "item", name = "silo", amount = 1}, + {type = "item", name = "steel-plate", amount = 10}, + {type = "item", name = mods["angelsindustries"] and "electronic-circuit" or "advanced-circuit", amount = 10} + }, + result = "silo-storage" + }, + { + type = "recipe", + name = "silo-buffer", + energy_required = 5, + enabled = false, + ingredients = { + {type = "item", name = "silo", amount = 1}, + {type = "item", name = "steel-plate", amount = 10}, + {type = "item", name = "advanced-circuit", amount = 10} + }, + result = "silo-buffer" + } + } + ) +end \ No newline at end of file diff --git a/angelsaddons-storage/prototypes/recipes/warehouses.lua b/angelsaddons-storage/prototypes/recipes/warehouses.lua index d69e69fc5..ad0f166f9 100644 --- a/angelsaddons-storage/prototypes/recipes/warehouses.lua +++ b/angelsaddons-storage/prototypes/recipes/warehouses.lua @@ -1,97 +1,107 @@ if angelsmods.addons.storage.warehouses then + ----------------------------------------------------------------------------- + -- REGULAR WAREHOUSE -------------------------------------------------------- + ----------------------------------------------------------------------------- data:extend( - { - --WAREHOUSES { - type = "recipe", - name = "angels-warehouse", - energy_required = 10, - enabled = false, - ingredients = { - {type = "item", name = "steel-plate", amount = 50}, - {type = "item", name = "iron-plate", amount = 100}, - {type = "item", name = "stone-brick", amount = 100} + { + type = "recipe", + name = "angels-warehouse", + energy_required = 10, + enabled = false, + ingredients = { + {type = "item", name = "steel-plate", amount = 50}, + {type = "item", name = "iron-plate", amount = 100}, + {type = "item", name = "stone-brick", amount = 100} + }, + result = "angels-warehouse", + icon_size = 32, + subgroup = "angels-warehouse", + order = "a" }, - result = "angels-warehouse", - icon_size = 32, - subgroup = "angels-warehouse", - order = "a" - }, + } + ) + + ----------------------------------------------------------------------------- + -- LOGISTIC WAREHOUSES ------------------------------------------------------ + ----------------------------------------------------------------------------- + data:extend( { - type = "recipe", - name = "angels-warehouse-passive-provider", - energy_required = 10, - enabled = false, - ingredients = { - {type = "item", name = "steel-plate", amount = 20}, - {type = "item", name = "angels-warehouse", amount = 1}, - {type = "item", name = "advanced-circuit", amount = 20} + { + type = "recipe", + name = "angels-warehouse-passive-provider", + energy_required = 10, + enabled = false, + ingredients = { + {type = "item", name = "steel-plate", amount = 20}, + {type = "item", name = "angels-warehouse", amount = 1}, + {type = "item", name = mods["angelsindustries"] and "electronic-circuit" or "advanced-circuit", amount = 20} + }, + result = "angels-warehouse-passive-provider", + icon_size = 32, + subgroup = "angels-warehouse", + order = "c" }, - result = "angels-warehouse-passive-provider", - icon_size = 32, - subgroup = "angels-warehouse", - order = "c" - }, - { - type = "recipe", - name = "angels-warehouse-active-provider", - energy_required = 10, - enabled = false, - ingredients = { - {type = "item", name = "steel-plate", amount = 20}, - {type = "item", name = "angels-warehouse", amount = 1}, - {type = "item", name = "advanced-circuit", amount = 20} + { + type = "recipe", + name = "angels-warehouse-active-provider", + energy_required = 10, + enabled = false, + ingredients = { + {type = "item", name = "steel-plate", amount = 20}, + {type = "item", name = "angels-warehouse", amount = 1}, + {type = "item", name = "advanced-circuit", amount = 20} + }, + result = "angels-warehouse-active-provider", + icon_size = 32, + subgroup = "angels-warehouse", + order = "b" }, - result = "angels-warehouse-active-provider", - icon_size = 32, - subgroup = "angels-warehouse", - order = "b" - }, - { - type = "recipe", - name = "angels-warehouse-storage", - energy_required = 10, - enabled = false, - ingredients = { - {type = "item", name = "steel-plate", amount = 20}, - {type = "item", name = "angels-warehouse", amount = 1}, - {type = "item", name = "advanced-circuit", amount = 20} + { + type = "recipe", + name = "angels-warehouse-storage", + energy_required = 10, + enabled = false, + ingredients = { + {type = "item", name = "steel-plate", amount = 20}, + {type = "item", name = "angels-warehouse", amount = 1}, + {type = "item", name = mods["angelsindustries"] and "electronic-circuit" or "advanced-circuit", amount = 20} + }, + result = "angels-warehouse-storage", + icon_size = 32, + subgroup = "angels-warehouse", + order = "d" }, - result = "angels-warehouse-storage", - icon_size = 32, - subgroup = "angels-warehouse", - order = "d" - }, - { - type = "recipe", - name = "angels-warehouse-requester", - energy_required = 10, - enabled = false, - ingredients = { - {type = "item", name = "steel-plate", amount = 20}, - {type = "item", name = "angels-warehouse", amount = 1}, - {type = "item", name = "advanced-circuit", amount = 20} - }, - result = "angels-warehouse-requester", - icon_size = 32, - subgroup = "angels-warehouse", - order = "f" - }, - { - type = "recipe", - name = "angels-warehouse-buffer", - energy_required = 10, - enabled = false, - ingredients = { - {type = "item", name = "steel-plate", amount = 20}, - {type = "item", name = "angels-warehouse", amount = 1}, - {type = "item", name = "advanced-circuit", amount = 20} + { + type = "recipe", + name = "angels-warehouse-requester", + energy_required = 10, + enabled = false, + ingredients = { + {type = "item", name = "steel-plate", amount = 20}, + {type = "item", name = "angels-warehouse", amount = 1}, + {type = "item", name = mods["angelsindustries"] and "electronic-circuit" or "advanced-circuit", amount = 20} + }, + result = "angels-warehouse-requester", + icon_size = 32, + subgroup = "angels-warehouse", + order = "f" }, - result = "angels-warehouse-buffer", - icon_size = 32, - subgroup = "angels-warehouse", - order = "e" + { + type = "recipe", + name = "angels-warehouse-buffer", + energy_required = 10, + enabled = false, + ingredients = { + {type = "item", name = "steel-plate", amount = 20}, + {type = "item", name = "angels-warehouse", amount = 1}, + {type = "item", name = "advanced-circuit", amount = 20} + }, + result = "angels-warehouse-buffer", + icon_size = 32, + subgroup = "angels-warehouse", + order = "e" + } } - } -) + ) end \ No newline at end of file diff --git a/angelsaddons-storage/prototypes/technology/fluid-tanks.lua b/angelsaddons-storage/prototypes/technology/fluid-tanks.lua new file mode 100644 index 000000000..ce3df7ab4 --- /dev/null +++ b/angelsaddons-storage/prototypes/technology/fluid-tanks.lua @@ -0,0 +1,37 @@ +if angelsmods.addons.storage.inlinetank and (not mods["angelspetrochem"]) then + local tech = data.raw.technology["fluid-handling"] + if tech and tech.effects then + table.insert(tech.effects, {type = "unlock-recipe", recipe = "angels-storage-tank-3"}) + end +end + +if angelsmods.addons.storage.pressuretank then + data:extend( + { + { + type = "technology", + name = "pressure-tanks", + icon = "__angelsaddons-storage__/graphics/technology/pressure-tank-tech.png", + icon_size = 128, + prerequisites = { + "fluid-handling" + }, + effects = { + { + type = "unlock-recipe", + recipe = "angels-pressure-tank-1" + } + }, + unit = { + count = 50, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1} + }, + time = 15 + }, + order = "c-a" + } + } + ) +end \ No newline at end of file diff --git a/angelsaddons-storage/prototypes/technology/silos.lua b/angelsaddons-storage/prototypes/technology/silos.lua new file mode 100644 index 000000000..4eb8a2644 --- /dev/null +++ b/angelsaddons-storage/prototypes/technology/silos.lua @@ -0,0 +1,106 @@ +if angelsmods.addons.storage.silos or angelsmods.addons.storage.oresilos then + data:extend( + { + { + type = "technology", + name = "ore-silos", + icon = "__angelsaddons-storage__/graphics/technology/silo-tech.png", + icon_size = 128, + prerequisites = { + "steel-processing" + }, + effects = { + { + type = "unlock-recipe", + recipe = "silo" + }, + angelsmods.addons.storage.oresilos and { + type = "unlock-recipe", + recipe = "silo-ore1" + } or nil, + angelsmods.addons.storage.oresilos and { + type = "unlock-recipe", + recipe = "silo-ore2" + } or nil, + angelsmods.addons.storage.oresilos and { + type = "unlock-recipe", + recipe = "silo-ore3" + } or nil, + angelsmods.addons.storage.oresilos and { + type = "unlock-recipe", + recipe = "silo-ore4" + } or nil, + angelsmods.addons.storage.oresilos and { + type = "unlock-recipe", + recipe = "silo-ore5" + } or nil, + angelsmods.addons.storage.oresilos and { + type = "unlock-recipe", + recipe = "silo-ore6" + } or nil, + angelsmods.addons.storage.oresilos and { + type = "unlock-recipe", + recipe = "silo-coal" + } or nil + }, + unit = { + count = 30, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1} + }, + time = 15 + }, + order = "c-a" + }, + } + ) +end + +if angelsmods.addons.storage.silos then + data:extend( + { + { + type = "technology", + name = "logistic-silos", + icon = "__angelsaddons-storage__/graphics/technology/logistic-silo-tech.png", + icon_size = 128, + prerequisites = { + "logistic-system", + "ore-silos" + }, + effects = { + { + type = "unlock-recipe", + recipe = "silo-passive-provider" + }, + { + type = "unlock-recipe", + recipe = "silo-active-provider" + }, + { + type = "unlock-recipe", + recipe = "silo-requester" + }, + { + type = "unlock-recipe", + recipe = "silo-storage" + }, + { + type = "unlock-recipe", + recipe = "silo-buffer" + } + }, + unit = { + count = 50, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1} + }, + time = 15 + }, + order = "c-a" + } + } + ) +end \ No newline at end of file diff --git a/angelsaddons-storage/prototypes/technology/storage-technology.lua b/angelsaddons-storage/prototypes/technology/storage-technology.lua deleted file mode 100644 index d5bf9e751..000000000 --- a/angelsaddons-storage/prototypes/technology/storage-technology.lua +++ /dev/null @@ -1,206 +0,0 @@ -if angelsmods.addons.storage.warehouses then - data:extend( - { - { - type = "technology", - name = "angels-warehouses", - icon = "__angelsaddons-storage__/graphics/technology/warehouses.png", - icon_size = 128, - prerequisites = { - "steel-processing" - }, - effects = { - { - type = "unlock-recipe", - recipe = "angels-warehouse" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "angels-logistic-warehouses", - icon = "__angelsaddons-storage__/graphics/technology/warehouses-logistics.png", - icon_size = 128, - prerequisites = { - "angels-warehouses", - "logistic-system" - }, - effects = { - { - type = "unlock-recipe", - recipe = "angels-warehouse-passive-provider" - }, - { - type = "unlock-recipe", - recipe = "angels-warehouse-active-provider" - }, - { - type = "unlock-recipe", - recipe = "angels-warehouse-storage" - }, - { - type = "unlock-recipe", - recipe = "angels-warehouse-requester" - }, - { - type = "unlock-recipe", - recipe = "angels-warehouse-buffer" - } - }, - unit = { - count = 75, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1}, - {type = "item", name = "chemical-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - } - } -) -end -if angelsmods.addons.storage.inlinetank and (not mods["angelspetrochem"]) then - local tech = data.raw.technology["fluid-handling"] - if tech and tech.effects then - table.insert(tech.effects, {type = "unlock-recipe", recipe = "angels-storage-tank-3"}) - end -end -if angelsmods.addons.storage.pressuretank then - data:extend( - { - { - type = "technology", - name = "pressure-tanks", - icon = "__angelsaddons-storage__/graphics/technology/pressure-tank-tech.png", - icon_size = 128, - prerequisites = { - "angels-fluid-control" - }, - effects = { - { - type = "unlock-recipe", - recipe = "angels-pressure-tank-1" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - } - } -) -end -if angelsmods.addons.storage.oresilos then - data:extend( - { - { - type = "technology", - name = "ore-silos", - icon = "__angelsaddons-storage__/graphics/technology/silo-tech.png", - icon_size = 128, - prerequisites = { - "steel-processing" - }, - effects = { - { - type = "unlock-recipe", - recipe = "silo" - }, - { - type = "unlock-recipe", - recipe = "silo-ore1" - }, - { - type = "unlock-recipe", - recipe = "silo-ore2" - }, - { - type = "unlock-recipe", - recipe = "silo-ore3" - }, - { - type = "unlock-recipe", - recipe = "silo-ore4" - }, - { - type = "unlock-recipe", - recipe = "silo-ore5" - }, - { - type = "unlock-recipe", - recipe = "silo-ore6" - }, - { - type = "unlock-recipe", - recipe = "silo-coal" - } - }, - unit = { - count = 30, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "logistic-silos", - icon = "__angelsaddons-storage__/graphics/technology/logistic-silo-tech.png", - icon_size = 128, - prerequisites = { - "logistic-system", - "ore-silos" - }, - effects = { - { - type = "unlock-recipe", - recipe = "silo-passive-provider" - }, - { - type = "unlock-recipe", - recipe = "silo-active-provider" - }, - { - type = "unlock-recipe", - recipe = "silo-requester" - }, - { - type = "unlock-recipe", - recipe = "silo-storage" - }, - { - type = "unlock-recipe", - recipe = "silo-buffer" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1}, - {type = "item", name = "chemical-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - } - } -) -end \ No newline at end of file diff --git a/angelsaddons-storage/prototypes/technology/warehouses.lua b/angelsaddons-storage/prototypes/technology/warehouses.lua new file mode 100644 index 000000000..8a8f40724 --- /dev/null +++ b/angelsaddons-storage/prototypes/technology/warehouses.lua @@ -0,0 +1,71 @@ +if angelsmods.addons.storage.warehouses then + data:extend( + { + { + type = "technology", + name = "angels-warehouses", + icon = "__angelsaddons-storage__/graphics/technology/warehouses.png", + icon_size = 128, + prerequisites = { + (angelsmods.addons.storage.silos or angelsmods.addons.storage.oresilos) and "ore-silos" or "steel-processing" + }, + effects = { + { + type = "unlock-recipe", + recipe = "angels-warehouse" + } + }, + unit = { + count = 50, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1} + }, + time = 15 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-logistic-warehouses", + icon = "__angelsaddons-storage__/graphics/technology/warehouses-logistics.png", + icon_size = 128, + prerequisites = { + "angels-warehouses", + "logistic-system" + }, + effects = { + { + type = "unlock-recipe", + recipe = "angels-warehouse-passive-provider" + }, + { + type = "unlock-recipe", + recipe = "angels-warehouse-active-provider" + }, + { + type = "unlock-recipe", + recipe = "angels-warehouse-storage" + }, + { + type = "unlock-recipe", + recipe = "angels-warehouse-requester" + }, + { + type = "unlock-recipe", + recipe = "angels-warehouse-buffer" + } + }, + unit = { + count = 75, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1} + }, + time = 15 + }, + order = "c-a" + } + } + ) +end diff --git a/angelsaddons-storage/settings-updates.lua b/angelsaddons-storage/settings-updates.lua index 7ab601174..3548e5a90 100644 --- a/angelsaddons-storage/settings-updates.lua +++ b/angelsaddons-storage/settings-updates.lua @@ -1,12 +1,3 @@ -local function hide_setting(setting_type, setting_name, setting_default) - if data.raw[setting_type] and data.raw[setting_type][setting_name] then - data.raw[setting_type][setting_name].hidden = true - if setting_default ~= nil then - data.raw[setting_type][setting_name].default_value = setting_default - end - end -end - if mods["angelspetrochem"] then - hide_setting("bool-setting", "angels-enable-inline-tank") + angelsmods.settings.hide_setting("bool-setting", "angels-enable-inline-tank") end \ No newline at end of file diff --git a/angelsaddons-storage/settings.lua b/angelsaddons-storage/settings.lua index a96ffbdb9..1e855e104 100644 --- a/angelsaddons-storage/settings.lua +++ b/angelsaddons-storage/settings.lua @@ -1,40 +1,47 @@ data:extend( { + { + type = "bool-setting", + name = "angels-enable-oresilos", + setting_type = "startup", + default_value = mods["angelsrefining"] and true or false, + order = "a-a", + }, { type = "bool-setting", name = "angels-enable-silos", setting_type = "startup", default_value = true, - order = "a", - }, - { + order = "a-b", + }, + { type = "bool-setting", name = "angels-enable-warehouses", setting_type = "startup", default_value = true, order = "b", - }, - { + }, + { type = "bool-setting", name = "angels-enable-inline-tank", setting_type = "startup", default_value = true, order = "c-a", - }, - { + }, + { type = "bool-setting", name = "angels-enable-pressure-tank", setting_type = "startup", default_value = true, order = "c-b", - }, - { + }, + { type = "bool-setting", name = "angels-enable-storage-icon-scaling", setting_type = "startup", default_value = false, order = "d", - }, + }, } ) diff --git a/angelsbioprocessing/changelog.txt b/angelsbioprocessing/changelog.txt index 3ee2c2ad0..559bf735b 100644 --- a/angelsbioprocessing/changelog.txt +++ b/angelsbioprocessing/changelog.txt @@ -1,4 +1,37 @@ --------------------------------------------------------------------------------------------------- +Version: 0.7.18 +Date: ?? + Changes: + - Tweaked some technology tree prerequisites as cleanup (428) + - Added agricultural module support with bobs modules + - Allow agricultural modules on advanced garden cultivation recipes + - Allow agricultural modules on advanced tree cultivation recipes + - Allow agricultural modules on all regular tree growing recipes + - Regular tree growing increases yield of trees + - Biome specific tree recipes increase bio yield (resin, rubber, plastic), but not trees! + - Advanced garden cultivation recipes can now only be made in biome specific gardens + - Moved mineralised water unlock from brown to green algae technology (496) + - Moved algae farms 2 and 3 deeper into the tech tree (503) + - In component mode, decreased the cost of algae farm 2 from tier 3 to tier 2 blocks (503) + - Split plant and fish pressing in two techs to account for the ceramic filter (428) + - Hide unused items (plant milk and bio wooden board) (523) + - Changed and expanded locale strings and text descriptions (489) + Bugfixes: + - Fixed bob modules category icon did not fit the category box size (483) + - Fixed bob modules tech icons did not fit the tech box (483) + - Fixed that agrecultural modules could be inserted in labs and mining drills (479) + - Fixed agricultural modules would not upgrade correctly + - Fixed agricultural modules all used the same tech icon (493) + - Fixed angels fishes were not set as consumable items (490) + - Fixed with bobs modules that the module 2 and 3 technologies would have wrong icon_size (508) + - Added bio-tile to this mod from industries + - Still needs recipe and tech-unlock +--------------------------------------------------------------------------------------------------- +Version: 0.7.17 +Date: 26.11.2020 + Changes: + - Updated to work with factorio version 1.1 +--------------------------------------------------------------------------------------------------- Version: 0.7.16 Date: 16.11.2020 Changes: diff --git a/angelsbioprocessing/control.lua b/angelsbioprocessing/control.lua new file mode 100644 index 000000000..06e19ce7b --- /dev/null +++ b/angelsbioprocessing/control.lua @@ -0,0 +1,185 @@ +-- control behaviour to prevent agriculture modules from being used in research labs +local angels_bio_modules = { + ["angels-bio-yield-module"] = true, + ["angels-bio-yield-module-2"] = true, + ["angels-bio-yield-module-3"] = true, + ["angels-bio-yield-module-4"] = true, + ["angels-bio-yield-module-5"] = true, + ["angels-bio-yield-module-6"] = true, + ["angels-bio-yield-module-7"] = true, + ["angels-bio-yield-module-8"] = true +} + +function on_ghost_build(ghost_entity) + if not (ghost_entity and ghost_entity.valid) then return end + local item_request_proxy = ghost_entity.item_requests + for module_name, _ in pairs(angels_bio_modules) do + item_request_proxy[module_name] = nil + end + ghost_entity.item_requests = item_request_proxy +end + +script.on_event(defines.events.on_built_entity, function(event) + on_ghost_build(event.created_entity) +end, { + {filter = "ghost_type", type = "lab"}, + {filter = "ghost_type", type = "mining-drill"} +}) + +script.on_event(defines.events.on_robot_built_entity, function(event) + on_ghost_build(event.created_entity) +end, { + {filter = "ghost_type", type = "lab"}, + {filter = "ghost_type", type = "mining-drill"} +}) + +script.on_event(defines.events.on_entity_cloned, function(event) + on_ghost_build(event.source) -- you never know where the source came from... + on_ghost_build(event.destination) +end, { + {filter = "ghost_type", type = "lab"}, + {filter = "ghost_type", type = "mining-drill"} +}) + +script.on_event(defines.events.script_raised_revive, function(event) + on_ghost_build(event.entity) +end, { + {filter = "ghost_type", type = "lab"}, + {filter = "ghost_type", type = "mining-drill"} +}) + +script.on_event(defines.events.script_raised_built, function(event) + on_ghost_build(event.entity) +end, { + {filter = "ghost_type", type = "lab"}, + {filter = "ghost_type", type = "mining-drill"} +}) + +script.on_event(defines.events.on_player_fast_transferred, function(event) + if not event.from_player then return end + + local entity = event.entity + if not (entity.type == "lab" or entity.type == "mining-drill") then return end + + local player = game.get_player(event.player_index) + local player_cursor_stack = player.cursor_stack + if not player_cursor_stack then return end + + local module_inventory = entity.get_module_inventory() + if not module_inventory then return end + + local module_inventory_content = module_inventory.get_contents() + for module_name, module_count in pairs(module_inventory_content) do + if angels_bio_modules[module_name] then -- module_count > 0 + local remaining = module_inventory.remove{ + name = module_name, + count = module_count + } + if player_cursor_stack.valid_for_read then + if player_cursor_stack.name == module_name then + local player_cursor_stack_count = player_cursor_stack.count + player_cursor_stack.set_stack{name=module_name, count=player_cursor_stack_count + remaining} + remaining = player_cursor_stack.count - player_cursor_stack_count + end + else + if player_cursor_stack.can_set_stack{name=module_name, count=1} then + player_cursor_stack.set_stack{name=module_name, count=remaining} + if player_cursor_stack.valid_for_read and player_cursor_stack.name == module_name then + remaining = remaining - player_cursor_stack.count + end + end + end + if remaining > 0 then + remaining = remaining - player.insert{ + name = module_name, + count = remaining + } + if remaining > 0 then + player.surface.spill_item_stack(player.position, { + name = module_name, + count = remaining + }, true, entity.force, false) + end + end + end + end +end) + +script.on_event(defines.events.on_player_cursor_stack_changed, function(event) + local player = game.get_player(event.player_index) + local opened_entity = player.opened + if not (opened_entity and opened_entity.valid and opened_entity.object_name ~= 'LuaEquipmentGrid' and + (opened_entity.type == "lab" or opened_entity.type == "mining-drill")) then return end + + local player_cursor_stack = player.cursor_stack + if not player_cursor_stack then return end + + local module_inventory = opened_entity.get_module_inventory() + if not module_inventory then return end + + local module_inventory_content = module_inventory.get_contents() + for module_name, module_count in pairs(module_inventory_content) do + if angels_bio_modules[module_name] then -- count > 0 + local remaining = module_inventory.remove{ + name = module_name, + count = module_count + } + if player_cursor_stack.valid_for_read then + if player_cursor_stack.name == module_name then + local player_cursor_stack_count = player_cursor_stack.count + player_cursor_stack.set_stack{name=module_name, count=player_cursor_stack_count + remaining} + remaining = remaining - (player_cursor_stack.count - player_cursor_stack_count) + end + else + if player_cursor_stack.can_set_stack{name=module_name, count=1} then + player_cursor_stack.set_stack{name=module_name, count=remaining} + if player_cursor_stack.valid_for_read and player_cursor_stack.name == module_name then + remaining = remaining - player_cursor_stack.count + end + end + end + if remaining > 0 then + remaining = remaining - player.insert{ + name = module_name, + count = remaining + } + if remaining > 0 then + player.surface.spill_item_stack(player.position, { + name = module_name, + count = remaining + }, true, opened_entity.force, false) + end + end + end + end +end) + +script.on_event(defines.events.on_player_main_inventory_changed, function(event) + local player = game.get_player(event.player_index) + local opened_entity = player.opened + if not (opened_entity and opened_entity.valid and opened_entity.object_name ~= 'LuaEquipmentGrid' and + (opened_entity.type == "lab" or opened_entity.type == "mining-drill")) then return end + + local module_inventory = opened_entity.get_module_inventory() + if not module_inventory then return end + + local module_inventory_content = module_inventory.get_contents() + for module_name, module_count in pairs(module_inventory_content) do + if angels_bio_modules[module_name] then -- count > 0 + local remaining = module_inventory.remove{ + name = module_name, + count = module_count + } + remaining = remaining - player.insert{ + name = module_name, + count = remaining + } + if remaining > 0 then + player.surface.spill_item_stack(player.position, { + name = module_name, + count = remaining + }, true, opened_entity.force, false) + end + end + end +end) diff --git a/angelsbioprocessing/data-updates.lua b/angelsbioprocessing/data-updates.lua index e8a1d5c73..ba50ed6fa 100644 --- a/angelsbioprocessing/data-updates.lua +++ b/angelsbioprocessing/data-updates.lua @@ -8,5 +8,22 @@ angelsmods.functions.add_flag("bio-hogger-3", "hidden") angelsmods.functions.add_flag("bio-hogger-4", "hidden") angelsmods.functions.add_flag("bio-hogger-5", "hidden") angelsmods.functions.add_flag("bio-refugium-hogger", "hidden") +angelsmods.functions.OV.hide_recipe({ + "hogger-hogging-1", + "hogger-hogging-2", + "hogger-hogging-3", + "hogger-hogging-4", + "hogger-hogging-5", + "hogger-breeding-1", + "hogger-breeding-2", + "hogger-breeding-3", + "hogger-breeding-4", + "hogger-breeding-5", + "bio-refugium-hogger", + "hogger-butchery-1", + "hogger-butchery-2", + "hogger-butchery-3", + "hogger-butchery-4", + "hogger-butchery-5"}) angelsmods.functions.OV.execute() diff --git a/angelsbioprocessing/data.lua b/angelsbioprocessing/data.lua index 98b67bf0d..49dae690d 100644 --- a/angelsbioprocessing/data.lua +++ b/angelsbioprocessing/data.lua @@ -1,7 +1,7 @@ --INITIALIZE angelsmods = angelsmods or {} angelsmods.bioprocessing = angelsmods.bioprocessing or {} -angelsmods.bioprocessing.number_tint = {r = 0.2, g = 1, b = 0.2, a = 0} +angelsmods.bioprocessing.number_tint = {r = 0.2, g = 1, b = 0.2, a = 1} --TRIGGER CHECKS angelsmods.triggers = angelsmods.triggers or {} @@ -67,6 +67,7 @@ require("prototypes.buildings.hatchery") require("prototypes.buildings.butchery") require("prototypes.buildings.gardens") require("prototypes.buildings.trees") +require("prototypes.buildings.bio-tile") --require("prototypes.buildings.puffer-spawner") require("prototypes.buildings.puffer-nest") require("prototypes.buildings.alien-fish") diff --git a/angelsindustries/graphics/entity/tile-bio/bio-tile-corner-inner.png b/angelsbioprocessing/graphics/entity/tile-bio/bio-tile-corner-inner.png similarity index 100% rename from angelsindustries/graphics/entity/tile-bio/bio-tile-corner-inner.png rename to angelsbioprocessing/graphics/entity/tile-bio/bio-tile-corner-inner.png diff --git a/angelsindustries/graphics/entity/tile-bio/bio-tile-corner-o.png b/angelsbioprocessing/graphics/entity/tile-bio/bio-tile-corner-o.png similarity index 100% rename from angelsindustries/graphics/entity/tile-bio/bio-tile-corner-o.png rename to angelsbioprocessing/graphics/entity/tile-bio/bio-tile-corner-o.png diff --git a/angelsindustries/graphics/entity/tile-bio/bio-tile-corner-outer.png b/angelsbioprocessing/graphics/entity/tile-bio/bio-tile-corner-outer.png similarity index 100% rename from angelsindustries/graphics/entity/tile-bio/bio-tile-corner-outer.png rename to angelsbioprocessing/graphics/entity/tile-bio/bio-tile-corner-outer.png diff --git a/angelsindustries/graphics/entity/tile-bio/bio-tile-corner-u.png b/angelsbioprocessing/graphics/entity/tile-bio/bio-tile-corner-u.png similarity index 100% rename from angelsindustries/graphics/entity/tile-bio/bio-tile-corner-u.png rename to angelsbioprocessing/graphics/entity/tile-bio/bio-tile-corner-u.png diff --git a/angelsindustries/graphics/entity/tile-bio/bio-tile-side.png b/angelsbioprocessing/graphics/entity/tile-bio/bio-tile-side.png similarity index 100% rename from angelsindustries/graphics/entity/tile-bio/bio-tile-side.png rename to angelsbioprocessing/graphics/entity/tile-bio/bio-tile-side.png diff --git a/angelsindustries/graphics/entity/tile-bio/bio-tile-small.png b/angelsbioprocessing/graphics/entity/tile-bio/bio-tile-small.png similarity index 100% rename from angelsindustries/graphics/entity/tile-bio/bio-tile-small.png rename to angelsbioprocessing/graphics/entity/tile-bio/bio-tile-small.png diff --git a/angelsbioprocessing/graphics/icons/bobmodules/orange-module-1.png b/angelsbioprocessing/graphics/icons/bobmodules/orange-module-1.png new file mode 100644 index 000000000..2bc239e8b Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/orange-module-1.png differ diff --git a/angelsbioprocessing/graphics/icons/bobmodules/orange-module-2.png b/angelsbioprocessing/graphics/icons/bobmodules/orange-module-2.png new file mode 100644 index 000000000..e41cbce15 Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/orange-module-2.png differ diff --git a/angelsbioprocessing/graphics/icons/bobmodules/orange-module-3.png b/angelsbioprocessing/graphics/icons/bobmodules/orange-module-3.png new file mode 100644 index 000000000..927ac8709 Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/orange-module-3.png differ diff --git a/angelsbioprocessing/graphics/icons/bobmodules/orange-module-4.png b/angelsbioprocessing/graphics/icons/bobmodules/orange-module-4.png new file mode 100644 index 000000000..a157bda01 Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/orange-module-4.png differ diff --git a/angelsbioprocessing/graphics/icons/bobmodules/orange-module-5.png b/angelsbioprocessing/graphics/icons/bobmodules/orange-module-5.png new file mode 100644 index 000000000..8f599fe9c Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/orange-module-5.png differ diff --git a/angelsbioprocessing/graphics/icons/bobmodules/orange-module-6.png b/angelsbioprocessing/graphics/icons/bobmodules/orange-module-6.png new file mode 100644 index 000000000..7290d2e2e Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/orange-module-6.png differ diff --git a/angelsbioprocessing/graphics/icons/bobmodules/orange-module-7.png b/angelsbioprocessing/graphics/icons/bobmodules/orange-module-7.png new file mode 100644 index 000000000..58305c1fb Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/orange-module-7.png differ diff --git a/angelsbioprocessing/graphics/icons/bobmodules/orange-module-8.png b/angelsbioprocessing/graphics/icons/bobmodules/orange-module-8.png new file mode 100644 index 000000000..af7488d9a Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/orange-module-8.png differ diff --git a/angelsbioprocessing/graphics/icons/bobmodules/purple-module-1.png b/angelsbioprocessing/graphics/icons/bobmodules/purple-module-1.png new file mode 100644 index 000000000..4389af856 Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/purple-module-1.png differ diff --git a/angelsbioprocessing/graphics/icons/bobmodules/purple-module-2.png b/angelsbioprocessing/graphics/icons/bobmodules/purple-module-2.png new file mode 100644 index 000000000..c0c062891 Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/purple-module-2.png differ diff --git a/angelsbioprocessing/graphics/icons/bobmodules/purple-module-3.png b/angelsbioprocessing/graphics/icons/bobmodules/purple-module-3.png new file mode 100644 index 000000000..1622fe04e Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/purple-module-3.png differ diff --git a/angelsbioprocessing/graphics/icons/bobmodules/purple-module-4.png b/angelsbioprocessing/graphics/icons/bobmodules/purple-module-4.png new file mode 100644 index 000000000..1d5ccefa8 Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/purple-module-4.png differ diff --git a/angelsbioprocessing/graphics/icons/bobmodules/purple-module-5.png b/angelsbioprocessing/graphics/icons/bobmodules/purple-module-5.png new file mode 100644 index 000000000..63da78c46 Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/purple-module-5.png differ diff --git a/angelsbioprocessing/graphics/icons/bobmodules/purple-module-6.png b/angelsbioprocessing/graphics/icons/bobmodules/purple-module-6.png new file mode 100644 index 000000000..fad0a4abf Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/purple-module-6.png differ diff --git a/angelsbioprocessing/graphics/icons/bobmodules/purple-module-7.png b/angelsbioprocessing/graphics/icons/bobmodules/purple-module-7.png new file mode 100644 index 000000000..4077a6fe5 Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/purple-module-7.png differ diff --git a/angelsbioprocessing/graphics/icons/bobmodules/purple-module-8.png b/angelsbioprocessing/graphics/icons/bobmodules/purple-module-8.png new file mode 100644 index 000000000..6e152a1d9 Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/purple-module-8.png differ diff --git a/angelsbioprocessing/graphics/icons/bobmodules/purple-module.png b/angelsbioprocessing/graphics/icons/bobmodules/purple-module.png new file mode 100644 index 000000000..1bc93f28f Binary files /dev/null and b/angelsbioprocessing/graphics/icons/bobmodules/purple-module.png differ diff --git a/angelsbioprocessing/info.json b/angelsbioprocessing/info.json index 6e6da66e5..9f55cd57a 100644 --- a/angelsbioprocessing/info.json +++ b/angelsbioprocessing/info.json @@ -1,19 +1,16 @@ { "name": "angelsbioprocessing", - "version": "0.7.16", - "factorio_version": "1.0", - "title": "Angel's Bio Processing", + "version": "0.7.18", + "factorio_version": "1.1", + "title": "Angel's Bioprocessing", "author": "Arch666Angel", "contact": "https://discord.gg/ff5p6KE", "homepage": "https://forums.factorio.com/viewforum.php?f=185", "description": "Adds ways to recycle and process waste products through biological means and make use of biological processes and farming.", "dependencies": [ - "base >= 1.0.0", - - "angelsrefining >= 0.11.18", - "angelspetrochem >= 0.9.16", - "angelssmelting >= 0.6.13", - + "angelsrefining >= 0.11.20", + "angelspetrochem >= 0.9.18", + "angelssmelting >= 0.6.15", "? bobenemies >= 0.18.5" ] } diff --git a/angelsbioprocessing/locale/en/bio-processing.cfg b/angelsbioprocessing/locale/en/bio-processing.cfg index 984c2f491..d091a481b 100644 --- a/angelsbioprocessing/locale/en/bio-processing.cfg +++ b/angelsbioprocessing/locale/en/bio-processing.cfg @@ -8,10 +8,10 @@ temperate-farm=Temperate-environment farm desert-farm=Desert-environment farm swamp-farm=Swamp-environment farm -composter=Composter seed-extractor=Seed extractor -bio-press=Press -bio-processor=Bio processor +composter=Composter +bio-processor=Bioprocessor +bio-press=Oil press nutrient-extractor=Nutrient extractor temperate-garden=Temperate garden @@ -42,6 +42,43 @@ alien-fish-1=Levac fish alien-fish-2=Dorflurp jellyfish alien-fish-3=Santa ray +[entity-description] +algae-farm=A place to grow algae in a controlled aquaculture. +algae-farm-2=A place to grow algae in a controlled aquaculture. +algae-farm-3=A place to grow algae in a controlled aquaculture. + +crop-farm=A field to sow seeds and grow crops as well as gardens. +temperate-farm=A field to sow seeds and grow crops as well as gardens. Maintains temperate climate conditions for specialized plants. +desert-farm=A field to sow seeds and grow crops as well as gardens. Maintains dry climate conditions for specialized plants. +swamp-farm=A field to sow seeds and grow crops as well as gardens. Maintains wet climate conditions for specialized plants. + +seed-extractor=Extracts seeds from plants, as well as gardens. Can also produce alien plant-life samples from gardens. +composter=Turns any organic material into compost. +bio-processor=Turns harvested plants into organic intermeditate products. +bio-press=Extracts oil from organic material. +nutrient-extractor=Produces nutrient pulp from organic material. + +temperate-garden=Source of alien plant-life samples and of seeds specialized for temperate climate. +desert-garden=Source of alien plant-life samples and of seeds specialized for dry climate. +swamp-garden=Source of alien plant-life samples and of seeds specialized for wet climate. +puffer-nest=The puffers native to this planet exhale useful gasses. + +temperate-tree=Rare type of tree rich in organic resin. +desert-tree=Rare type of tree rich in organic rubber. +swamp-tree=Rare type of tree rich in organic polymers. + +bio-generator-temperate-1=Turns seedlings into tree seeds. Specialized for temperate climate conditions. +bio-generator-desert-1=Turns seedlings into tree seeds. Specialized for dry climate conditions. +bio-generator-swamp-1=Turns seedlings into tree seeds. Specialized for wet climate conditions. +bio-arboretum-1=Protected place to grow and harvest trees. + +bio-hatchery=A cozy place where puffer eggs can hatch. +bio-refugium-biter=Fenced in safely from the outside world, biters can be grown here. +bio-refugium-fish=More than just decoration, can be made home to a variety of fish. +bio-refugium-hogger=Dirt digging hogger feel right at home here. +bio-refugium-puffer=It stinks, but puffers feel right at home in this gas filled tower. +bio-butchery=Slaughters animals and thus produces meat. + [item-name] algae-green=Green algae cellulose-fiber=Cellulose fiber @@ -53,6 +90,7 @@ solid-saw=Timborer's saw blade solid-crystal-tipped-saw=Crystal-tipped saw blade solid-crystal-full-saw=Crystal saw blade solid-tree=Tree +bio-tile=Biologically active tile algae-brown=Brown algae solid-alginic-acid=Alginic acid @@ -70,7 +108,7 @@ solid-calcium-carbonate=Calcium carbonate petri-dish=Petri dish alien-bacteria=Alien bacteria alien-pre-artifact=Alien pre-artifact -substrate-dish=Substrate dish +substrate-dish=Petri dish with growth medium paste-silver=Silver paste paste-titanium=Titanium paste @@ -160,19 +198,19 @@ swamp-5=Mushredtato swamp-5-seed=Mushredtato seed swamp-5-seed-dormant=Dormant mushredtato seed -token-bio=Alien plant life sample +token-bio=Alien plant-life sample solid-beans=Beans solid-corn=Corn -solid-leafs=Leafs +solid-leafs=Leaves solid-nuts=Nuts solid-pips=Pips solid-fruit=Fruits solid-flour=Flour -temperate-upgrade=Temperate environment kit -desert-upgrade=Desert environment kit -swamp-upgrade=Swamp environment kit +temperate-upgrade=Temperate-environment kit +desert-upgrade=Desert-environment kit +swamp-upgrade=Swamp-environment kit bio-puffer-1=Gaseous puffer bio-puffer-2=Rancid puffer @@ -185,8 +223,8 @@ bio-puffer-egg-2=Rancid puffer egg bio-puffer-egg-3=Blazing puffer egg bio-puffer-egg-4=Acidic puffer egg bio-puffer-egg-5=Corrosive puffer egg -bio-puffer-egg-shell=Puffer egg shell remains -bio-puffer-egg-shell-powder=Puffer egg shell powder +bio-puffer-egg-shell=Puffer egg-shell remains +bio-puffer-egg-shell-powder=Puffer egg-shell powder bio-hogger-1=AA hogger bio-hogger-2=BB hogger @@ -215,7 +253,7 @@ biter-big-egg=Big biter egg bio-raw-meat=Raw meat bio-alien-processed-meat=Alien-processed meat -seeded-dish=Seeded dish +seeded-dish=Inoculated Petri dish crystal-seed=Crystal seed crystal-enhancer=Crystal enhancer crystal-grindstone=Crystal grindstone @@ -252,6 +290,47 @@ crystal-full-harmonic=Harmonic crystal angels-bio-yield-module=Agriculture module angels-bio-yield-module-2=Agriculture module 2 angels-bio-yield-module-3=Agriculture module 3 +angels-bio-yield-module-4=Agriculture module 4 +angels-bio-yield-module-5=Agriculture module 5 +angels-bio-yield-module-6=Agriculture module 6 +angels-bio-yield-module-7=Agriculture module 7 +angels-bio-yield-module-8=Agriculture module 8 + +[item-description] +solid-saw="He saw, he cut, and he shattered." + +temperate-1=Wil. Plant from a place where no man has gone before. +temperate-2=Fluffy. Makes you want to go to bed. +temperate-3=Sour. Best served in a hot sauce. +temperate-4=Adaptive. Can be used for a variety of things. +temperate-5=Tasty. Very generous range of flavours. + +desert-1=Sweet. Gets you all fuzzy and warm around your heart. +desert-2=Organized. Grows in ordered lines. +desert-3=Productive. Will always arrange itself in orderly lines. +desert-4=Zealous. Always dynamic. +desert-5=Salty. Has to be handled with care. + +swamp-1=Nutty. Makes you slightly mad. +swamp-2=Lively. Seem to be growing disregarding the conditions. +swamp-3=Commanding. Don't use too much. +swamp-4=Binary. It grows or it does not, nothing in between. +swamp-5=Spicy. Seems to yell at you. + +solid-nuclear-fertilizer=This doesn't sound healty... we might start to glow at night! + +raw-fish=A friendly reminder to those who knew Factorio before an Angel stopped by. +alien-fish-1-raw=The least deadly fish on this alien planet. +alien-fish-2-raw=Oblivious of their surroundings, very frugal beings. +alien-fish-3-raw=Lovely fish at first sight, but don't anger them. + +bio-raw-meat=It tastes like chicken... + +bio-tile=A biologically active tile which gives fast run speed and absorbs pollution + +angels-bio-yield-module=A module that increases productivity, but only usable for agricultural processes. +angels-bio-yield-module-2=A module that increases productivity, but only usable for agricultural processes. +angels-bio-yield-module-3=A module that increases productivity, but only usable for agricultural processes. [fluid-name] alien-spores=Alien spores @@ -284,7 +363,7 @@ liquid-fish-oil=Fish oil [recipe-name] algae-green=Green algae farming -algae-green-simple=Basic green algae farming +algae-green-simple=Basic algae farming cellulose-fiber-algae=Cellulose fiber extraction paste-from-sodium-hydroxide=Paste from sodium hydroxide paste-from-gas-chlor-methane=Paste from chloromethane gas @@ -296,13 +375,14 @@ wood-pellets=Wood pellets wood-bricks=Wood bricks gas-carbon-dioxide-from-wood=Carbon dioxide gas from wood gas-methanol-from-wood=Methanol gas from wood -sulfite-pulping=Sulfite pulping: cellulose pulp, brown liquor -brown-liquor-recovery=Brown liquor recovery: sodium sulfate, nitric waste water -kraft-cooking-washing=Kraft process pulping: cellulose pulp, black liquor -kraft-causting=Kraft process causting: limestone, white liquor -paper-bleaching-1=Paper bleaching 1: paper -paper-bleaching-2=Paper bleaching 2: paper, sodium hypochlorate -paper-bleaching-3=Paper bleaching 3: paper, sodium carbonate, sulfuric waste water +sulfite-pulping=Sulfite pulping +brown-liquor-recovery=Brown liquor recycling +kraft-cooking-washing=Kraft process pulping +kraft-recovery=Kraft process recovery +kraft-causting=Kraft process causting +paper-bleaching-1=Paper bleaching 1 +paper-bleaching-2=Paper bleaching 2 +paper-bleaching-3=Paper bleaching 3 tree-arboretum-0=Rare tree cultivation temperate-tree-arboretum-1=Temperate tree cultivation @@ -351,21 +431,21 @@ sorting-swamp-3=Saundsrcress processing sorting-swamp-4=Nexeflax processing sorting-swamp-5=Mushredtato processing -nutrients-refining-1=Biomass refining 1: fuel oil, acetone, synthesis gas -nutrients-refining-2=Biomass refining 2: fuel oil, glycerol -nutrients-refining-3=Biomass refining 3: acetone, ethanol, butane +nutrients-refining-1=Biomass refining 1 +nutrients-refining-2=Biomass refining 2 +nutrients-refining-3=Biomass refining 3 liquid-raw-vegetable-oil-filtering-1=Vegetable oil filtration 1 liquid-raw-vegetable-oil-filtering-2=Vegetable oil filtration 2 -liquid-vegetable-oil-refining=Vegetable oil refining: fuel oil, mineral oil +liquid-vegetable-oil-refining=Vegetable oil refining liquid-raw-fish-oil-filtering-1=Fish oil filtration 1 liquid-raw-fish-oil-filtering-2=Fish oil filtration 2 -liquid-fish-oil-refining=Fish oil refining: fermentation base, lubricant -advanced-liquid-fish-oil-refining=Advanced fish oil refining: fermentation base, mineral oil +liquid-fish-oil-refining=Fish oil refining +advanced-liquid-fish-oil-refining=Advanced fish oil refining -anaerobic-fermentation=Anaerobic fermentation: ethanol, compost -aerobic-fermentation=Aerobic fermentation: acetic acid, compost +anaerobic-fermentation=Anaerobic fermentation +aerobic-fermentation=Aerobic fermentation puffer-puffing-1=Gaseous puffing puffer-puffing-2=Rancid puffing @@ -445,20 +525,23 @@ crystal-powder-from-splinter=Crystal splinter milling crystal-powder-from-shard=Crystal shard milling crystal-powder-from-full=Crystal milling +[tile-name] +bio-tile=Biologically active tile + [recipe-category-name] -bio-processing=Bio processing +bio-processing=Bioprocessing [item-group-name] -bio-processing-nauvis=Bio processing nauvis -bio-processing-vegetables=Bio processing vegetabilis -bio-processing-alien=Bio processing animalis +bio-processing-nauvis=Bioprocessing nauvis +bio-processing-vegetables=Bioprocessing vegetabilis +bio-processing-alien=Bioprocessing animalis [technology-name] -bio-processing-green=Green algae processing -bio-processing-brown=Brown algae processing +bio-processing-brown=Basic algae processing +bio-processing-green=Advanced algae processing bio-processing-blue=Blue algae processing bio-processing-red=Red algae processing -bio-processing-alien=Alien bio processing +bio-processing-alien=Alien microbe processing bio-processing-crystal-splinter=Crystal splinter processing bio-processing-crystal-shard=Crystal shard processing bio-processing-crystal-full=Crystal processing @@ -474,18 +557,18 @@ bio-temperate-farming=Temperate farming bio-temperate-farm=Temperate farming environment bio-swamp-farming=Swamp farming bio-swamp-farm=Swamp farming environment -bio-nutrient-paste=Nutrient paste -bio-pressing=Plant pressing -bio-pressing-fish=Fish pressing +bio-nutrient-paste=Nutrient extraction +bio-pressing=Oil pressing of plants +bio-pressing-fish=Oil pressing of fish bio-fermentation=Fermentation processes bio-plastic=Bio-plastics bio-paper=Paper making bio-wood-processing=Wood processing bio-arboretum=Arboretum +bio-arboretum-desert=Desert arboretum bio-arboretum-temperate=Temperate arboretum bio-arboretum-swamp=Swamp arboretum -bio-arboretum-desert=Desert arboretum bio-refugium-fish=Fish refugium bio-refugium-hatchery=Hatchery @@ -498,56 +581,53 @@ angels-bio-yield-module=Agriculture module angels-bio-yield-module-2=Agriculture module 2 angels-bio-yield-module-3=Agriculture module 3 -[item-description] -composter=Used to turn any organic material into compost. -solid-saw="He saw, he cut, and he shattered." - -temperate-1=Wil. Plant from a place where no man has gone before. -temperate-2=Fluffy. Makes you want to go to bed. -temperate-3=Sour. Best served in a hot sauce. -temperate-4=Adaptive. Can be used for a variety of things. -temperate-5=Tasty. Very generous range of flavours. - -desert-1=Sweet. Gets you all fuzzy and warm around your heart. -desert-2=Organized. Grows in ordered lines. -desert-3=Productive. Will always arrange itself in orderly lines. -desert-4=Zealous. Always dynamic. -desert-5=Salty. Has to be handled with care. - -swamp-1=Nutty. Makes you slightly mad. -swamp-2=Lively. Seem to be growing disregarding the conditions. -swamp-3=Commanding. Don't use too much. -swamp-4=Binary. It grows or it does not, nothing in between. -swamp-5=Spicy. Seems to yell at you. - -solid-nuclear-fertilizer=This doesn't sound healty... we might start to glow at night! - -raw-fish=A friendly reminder to who knew Factorio before an Angel stopped by. -alien-fish-1-raw=The least deadly fish on this planet. -alien-fish-2-raw=Oblivious of their surroundings, very frugal beings. -alien-fish-3-raw=Lovely fish at first sight, but don't anger them. - -bio-raw-meat=It tastes like chicken... - -angels-bio-yield-module=Machine will have higher yields, which will increase productivity. -angels-bio-yield-module-2=Machine will have higher yields, which will increase productivity. -angels-bio-yield-module-3=Machine will have higher yields, which will increase productivity. +[technology-description] + +bio-processing-brown=Algae are rich in fibres and inorganic salts. +bio-processing-green=More efficient ways to produce and process algae. +bio-processing-red=Red algae are rich in calcareous compounds. +bio-processing-blue=Blue algae are rich in nitric compounds. +bio-processing-alien=Inoculation and processing of microbial cultures. +bio-processing-crystal-splinter=Splinters of crystals made from a combination of organic and inorganic material. +bio-processing-crystal-shard=Shards of crystals made from a combination of organic and inorganic material. +bio-processing-crystal-full=Crystals made from a combination of organic and inorganic material. +bio-processing-paste=A paste from cellulose can act as growth medium for microbial cultures. + +gardens=Allows you to extract seeds and plant-life samples from gardens growing on this alien planet. +angels-garden-mutations=Artificial mutation of gardens via radioactive material. +bio-farm=Basic technology for growing and processing crops. +bio-farm-alien=Enhanced fertilizer with additional nutrients from microorganisms native to this planet. +bio-desert-farming=Grow and process crops specialized for dry climate conditions. +bio-desert-farm=Specialized farming equipment for dry climate conditions. +bio-temperate-farming=Grow and process crops specialized for temperate climate conditions. +bio-temperate-farm=Specialized farming equipment for temperate climate conditions. +bio-swamp-farming=Grow and process crops specialized for wet climate conditions. +bio-swamp-farm=Specialized farming equipment for wet climate conditions. +bio-nutrient-paste=Nutrient pulp serves as food for animals, as well as a renewable precursor for petrochemicals. +bio-pressing=Plants as a source for oil products. +bio-pressing-fish=Fish as a source for oil products. +bio-fermentation=Alcoholic and acidic fermentation of organic material. +bio-plastic=Production of plastic from renewable sources. + +bio-paper=Solid material made of organic fibres. +bio-wood-processing=Various uses for wood and cellulose. +bio-arboretum=Cultivation of trees and automated production of wood. +bio-arboretum-desert=Extraction of bio-rubber from rare trees growing on this alien planet. +bio-arboretum-temperate=Extraction of bio-resin from rare trees growing on this alien planet. +bio-arboretum-swamp=Extraction of bio-plastic from rare trees growing on this alien planet. + +bio-refugium-fish=Domestication of the wild fish that live on this alien planet. +bio-refugium-hatchery=Technology to hatch the eggs of puffers that live on this alien planet. +bio-refugium-butchery=Production of meat from animals. +bio-refugium-puffer=Domestication and processing of puffers that live on this alien planet. +bio-refugium-biter=Domestication and processing of biters that live on this alien planet. +bio-refugium-hogger=Domestication of hoggers that live on this alien planet. + +angels-bio-yield-module=Specialized module that increases the yield of agricultural processes. [item-limitation] angels-yield-module-usable-only-on-agriculture=Agriculture modules can only be used for agricultural processes. -[entity-description] -bio-refugium-biter=Fenced in safely from the outside world, biters can be grown here. -bio-refugium-fish=More than just decoration, can be made home to a variety of fish. -bio-refugium-hogger=Dirt digging hogger feel right at home here. -bio-refugium-puffer=It stinks, but puffers feel right at home in this gas filled tower. - [recipe-description] -temperate-garden-a=Temperate seed extraction -temperate-garden-b=Advanced temperate seed extraction -desert-garden-a=Desert seed extraction -desert-garden-b=Advanced desert seed extraction -swamp-garden-a=Swamp seed extraction -swamp-garden-b=Advanced swamp seed extraction diff --git a/angelsbioprocessing/migrations/angelsbioprocessing_0.7.18.json b/angelsbioprocessing/migrations/angelsbioprocessing_0.7.18.json new file mode 100644 index 000000000..5d2ef8d6e --- /dev/null +++ b/angelsbioprocessing/migrations/angelsbioprocessing_0.7.18.json @@ -0,0 +1,7 @@ +{ + "technology": + [ + ["bio-pressing", "bio-pressing-1"], + ["bio-pressing-fish", "bio-pressing-fish-1"] + ] +} \ No newline at end of file diff --git a/angelsbioprocessing/migrations/angelsbioprocessing_0.7.18.lua b/angelsbioprocessing/migrations/angelsbioprocessing_0.7.18.lua new file mode 100644 index 000000000..ca6af8e44 --- /dev/null +++ b/angelsbioprocessing/migrations/angelsbioprocessing_0.7.18.lua @@ -0,0 +1,49 @@ +-- prevent agriculture modules from being used in research labs +local angels_bio_modules = { + ["angels-bio-yield-module"] = true, + ["angels-bio-yield-module-2"] = true, + ["angels-bio-yield-module-3"] = true +} + +for _, surface in pairs(game.surfaces) do + local entities = surface.find_entities_filtered{type = {"lab", "mining-drill"}} + for _, entity in pairs(entities) do + local module_inventory = entity.get_module_inventory() + if module_inventory then + local module_inventory_content = module_inventory.get_contents() + for module_name, module_count in pairs(module_inventory_content) do + if angels_bio_modules[module_name] then -- module_count > 0 + surface.spill_item_stack(entity.position, { + name = module_name, + count = module_inventory.remove{ + name = module_name, + count = module_count + } + }, true, entity.force, false) + end + end + end + end + local ghost_entities = surface.find_entities_filtered{ghost_type = {"lab", "mining-drill"}} + for _, ghost_entity in pairs(ghost_entities) do + if not (ghost_entity and ghost_entity.valid) then return end + local item_request_proxy = ghost_entity.item_requests + for module_name, _ in pairs(angels_bio_modules) do + item_request_proxy[module_name] = nil + end + ghost_entity.item_requests = item_request_proxy + end +end + +for _, force in pairs(game.forces) do + for newTech, existingTech in pairs{ + ["bio-pressing-2"] = "bio-pressing-1", + ["bio-pressing-fish-2"] = "bio-pressing-fish-1" + } do + if force.technologies[newTech ] and force.technologies[newTech ].prototype.enabled and + force.technologies[existingTech] and force.technologies[existingTech].prototype.enabled + then + force.technologies[newTech].researched = force.technologies[existingTech].researched + end + end +end \ No newline at end of file diff --git a/angelsbioprocessing/prototypes/bio-processing-category.lua b/angelsbioprocessing/prototypes/bio-processing-category.lua index 0615eb23f..dae998436 100644 --- a/angelsbioprocessing/prototypes/bio-processing-category.lua +++ b/angelsbioprocessing/prototypes/bio-processing-category.lua @@ -12,14 +12,26 @@ data:extend( type = "recipe-category", name = "temperate-farming", }, + { + type = "recipe-category", + name = "advanced-temperate-farming", + }, { type = "recipe-category", name = "desert-farming", }, + { + type = "recipe-category", + name = "advanced-desert-farming", + }, { type = "recipe-category", name = "swamp-farming", }, + { + type = "recipe-category", + name = "advanced-swamp-farming", + }, { type = "recipe-category", name = "bio-fuel", diff --git a/angelsbioprocessing/prototypes/bio-processing-override.lua b/angelsbioprocessing/prototypes/bio-processing-override.lua index aeca8291c..6d94ce980 100644 --- a/angelsbioprocessing/prototypes/bio-processing-override.lua +++ b/angelsbioprocessing/prototypes/bio-processing-override.lua @@ -22,7 +22,7 @@ data.raw["item"]["wood"].order = "a[wood]" --REFINING if angelsmods.refining then --MOVE UNLOCKS - OV.add_unlock("bio-processing-brown", "water-mineralized") + OV.add_unlock("bio-processing-green", "water-mineralized") OV.remove_unlock("water-treatment", "water-mineralized") end @@ -144,259 +144,6 @@ if bobmods then OV.add_unlock("bio-paper-1", "wooden-board-paper") end - if bobmods.greenhouse then - -- move the subgroup - data.raw["item-subgroup"]["bob-greenhouse-items"].group = "bio-processing-nauvis" - data.raw["item-subgroup"]["bob-greenhouse-items"].order = "i" - - -- update fertilizer - OV.global_replace_item("fertiliser", "solid-fertilizer") - angelsmods.functions.add_flag("fertiliser", "hidden") - data.raw.recipe["bob-fertiliser"].subgroup = "bio-wood" - data.raw.recipe["bob-fertiliser"].order = "a[support]-cb" - - -- update the seedling - data.raw.item["seedling"].subgroup = "bio-arboretum-swamp" - data.raw.item["seedling"].order = "a" - - -- update greenhouse - data.raw.item["bob-greenhouse"].subgroup = "bio-processing-buildings-nauvis-a" - data.raw.item["bob-greenhouse"].order = "c[arboretum]-b" - - -- patch bobs wood production - OV.patch_recipes( - { - { - name = "bob-seedling", - subgroup = "bob-greenhouse-items", - order = "a[seedling]", - category = "seed-extractor" - }, - { - name = "bob-basic-greenhouse-cycle", - subgroup = "bob-greenhouse-items", - order = "b[greenhouse-cycle]-a[basic]", - energy_required = 60, - --results = - --{ {"!!"}, - -- { type = "item", name = "solid-tree", amount = 2 }, - -- { type = "item", name = "solid-tree", amount = 1, probability = 1/3 } - --}, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__bobgreenhouse__/graphics/icons/seedling.png", - shift = {-12, 12}, - scale = 0.35 - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32 - }, - { - name = "bob-advanced-greenhouse-cycle", - subgroup = "bob-greenhouse-items", - order = "b[greenhouse-cycle]-b[advanced]", - energy_required = 45, - --results = - --{ {"!!"}, - -- { type = "item", name = "solid-tree", amount = 4 }, - -- { type = "item", name = "solid-tree", amount = 1, probability = 2/3 } - --}, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__bobgreenhouse__/graphics/icons/seedling.png", - shift = {-12, 12}, - scale = 0.35 - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32 - } - } - ) - -- manually patch the result as the recipe builder is failing - data.raw.recipe["bob-basic-greenhouse-cycle"].normal.result = nil - data.raw.recipe["bob-basic-greenhouse-cycle"].normal.results = { - {type = "item", name = "solid-tree", amount_min = 2, amount_max = 4} - } - data.raw.recipe["bob-basic-greenhouse-cycle"].expensive.result = nil - data.raw.recipe["bob-basic-greenhouse-cycle"].expensive.results = { - {type = "item", name = "solid-tree", amount = 2} - } - data.raw.recipe["bob-advanced-greenhouse-cycle"].normal.result = nil - data.raw.recipe["bob-advanced-greenhouse-cycle"].normal.results = { - {type = "item", name = "solid-tree", amount_min = 4, amount_max = 8} - } - data.raw.recipe["bob-advanced-greenhouse-cycle"].expensive.result = nil - data.raw.recipe["bob-advanced-greenhouse-cycle"].expensive.results = { - {type = "item", name = "solid-tree", amount = 4} - } - - -- also update the other tree icons - OV.patch_recipes( - { - { - name = "tree-arboretum-1", - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__angelsbioprocessing__/graphics/icons/tree-seed.png", - shift = {-12, 12}, - scale = 0.35 - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32 - }, - { - name = "tree-arboretum-2", - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__angelsbioprocessing__/graphics/icons/tree-seed.png", - shift = {-12, 12}, - scale = 0.35 - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32 - }, - { - name = "tree-arboretum-3", - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__angelsbioprocessing__/graphics/icons/tree-seed.png", - shift = {-12, 12}, - scale = 0.35 - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32 - } - } - ) - - -- make sure the seed extractor can be unlocked early on - if bobmods and bobmods.electronics then - OV.patch_recipes( - { - { - name = "seed-extractor", - ingredients = { - {name = "electronic-circuit", amount = 0}, - {name = "basic-circuit-board", amount = 4} - } - } - } - ) - end - - -- allow manually creating wood without a sawblade (because nerfed bob greenhouse) - data:extend( - { - { - type = "recipe", - name = "wood-sawing-manual", - category = "angels-manual-crafting", - always_show_made_in = true, - enabled = false, - energy_required = 1 / 3, - ingredients = { - {type = "item", name = "solid-tree", amount = 1} - }, - results = { - {type = "item", name = "wood", amount = 5} - }, - icons = { - { - icon = "__base__/graphics/icons/wood.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__angelsbioprocessing__/graphics/icons/hand.png", - scale = 0.35, - shift = {-12, -12} - } - }, - icon_size = 32, - subgroup = "bio-processing-wood", - order = "a[wood]-a[manual]" - } - } - ) - - -- alter angels wood production to require seedlings - OV.patch_recipes( - { - {name = "tree-generator-1", ingredients = {{type = "item", name = "seedling", amount = 4}}}, - {name = "tree-generator-2", ingredients = {{type = "item", name = "seedling", amount = 6}}}, - {name = "tree-generator-3", ingredients = {{type = "item", name = "seedling", amount = 8}}}, - {name = "temperate-tree-generator-1", ingredients = {{type = "item", name = "seedling", amount = 4}}}, - {name = "temperate-tree-generator-2", ingredients = {{type = "item", name = "seedling", amount = 6}}}, - {name = "temperate-tree-generator-3", ingredients = {{type = "item", name = "seedling", amount = 8}}}, - {name = "swamp-tree-generator-1", ingredients = {{type = "item", name = "seedling", amount = 4}}}, - {name = "swamp-tree-generator-2", ingredients = {{type = "item", name = "seedling", amount = 6}}}, - {name = "swamp-tree-generator-3", ingredients = {{type = "item", name = "seedling", amount = 8}}}, - {name = "desert-tree-generator-1", ingredients = {{type = "item", name = "seedling", amount = 4}}}, - {name = "desert-tree-generator-2", ingredients = {{type = "item", name = "seedling", amount = 6}}}, - {name = "desert-tree-generator-3", ingredients = {{type = "item", name = "seedling", amount = 8}}} - } - ) - - -- update tech - OV.add_prereq("bob-greenhouse", "gardens") - OV.add_unlock("bob-greenhouse", "wood-sawing-manual") - OV.add_prereq("bio-arboretum-1", "bob-greenhouse") - end end --ADDED RECIPES FOR BOBS ARTIFACTS @@ -404,6 +151,8 @@ require("prototypes.overrides.bio-processing-override-bob-artifacts") --OTHER BOB OVERRIDES require("prototypes.overrides.bio-processing-override-bob") +require("prototypes.overrides.bio-processing-override-bobmodules") +require("prototypes.overrides.bio-processing-override-bobgreenhouse") --ENABLE PRODUCTIVITY --angelsmods.functions.allow_productivity("slag-processing-1") @@ -414,6 +163,7 @@ angelsmods.functions.allow_productivity("bio-plastic-1") angelsmods.functions.allow_productivity("bio-plastic-2") angelsmods.functions.allow_productivity("bio-rubber") +-- plant growing angelsmods.functions.allow_bio_productivity("temperate-1") angelsmods.functions.allow_bio_productivity("temperate-2") angelsmods.functions.allow_bio_productivity("temperate-3") @@ -428,4 +178,25 @@ angelsmods.functions.allow_bio_productivity("swamp-1") angelsmods.functions.allow_bio_productivity("swamp-2") angelsmods.functions.allow_bio_productivity("swamp-3") angelsmods.functions.allow_bio_productivity("swamp-4") -angelsmods.functions.allow_bio_productivity("swamp-5") \ No newline at end of file +angelsmods.functions.allow_bio_productivity("swamp-5") + +-- garden growing +angelsmods.functions.allow_bio_productivity("temperate-garden-cultivating-b") +angelsmods.functions.allow_bio_productivity("desert-garden-cultivating-b") +angelsmods.functions.allow_bio_productivity("swamp-garden-cultivating-b") + +-- tree growing +angelsmods.functions.allow_bio_productivity("tree-arboretum-1") +angelsmods.functions.allow_bio_productivity("tree-arboretum-2") +angelsmods.functions.allow_bio_productivity("tree-arboretum-3") +angelsmods.functions.allow_bio_productivity("temperate-tree-arboretum-1") +angelsmods.functions.allow_bio_productivity("temperate-tree-arboretum-2") +angelsmods.functions.allow_bio_productivity("desert-tree-arboretum-1") +angelsmods.functions.allow_bio_productivity("desert-tree-arboretum-2") +angelsmods.functions.allow_bio_productivity("swamp-tree-arboretum-1") +angelsmods.functions.allow_bio_productivity("swamp-tree-arboretum-2") + +-- special tree growing +angelsmods.functions.allow_bio_productivity("temperate-tree-arboretum-0") +angelsmods.functions.allow_bio_productivity("desert-tree-arboretum-0") +angelsmods.functions.allow_bio_productivity("swamp-tree-arboretum-0") diff --git a/angelsbioprocessing/prototypes/buildings/algae-farm.lua b/angelsbioprocessing/prototypes/buildings/algae-farm.lua index 6fa9289e9..5143cd686 100644 --- a/angelsbioprocessing/prototypes/buildings/algae-farm.lua +++ b/angelsbioprocessing/prototypes/buildings/algae-farm.lua @@ -3,18 +3,13 @@ data:extend( { type = "item", name = "algae-farm", - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png" + icons = angelsmods.functions.add_number_icon_layer({ + { + icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.bioprocessing.number_tint), subgroup = "bio-processing-buildings-nauvis-a", order = "a[algae]-a", place_result = "algae-farm", @@ -23,8 +18,13 @@ data:extend( { type = "assembling-machine", name = "algae-farm", - icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer({ + { + icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 1, angelsmods.bioprocessing.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "algae-farm"}, max_health = 300, @@ -98,18 +98,13 @@ data:extend( { type = "item", name = "algae-farm-2", - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png" + icons = angelsmods.functions.add_number_icon_layer({ + { + icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.bioprocessing.number_tint), subgroup = "bio-processing-buildings-nauvis-a", order = "a[algae]-b", place_result = "algae-farm-2", @@ -118,8 +113,13 @@ data:extend( { type = "assembling-machine", name = "algae-farm-2", - icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer({ + { + icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 2, angelsmods.bioprocessing.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "algae-farm-2"}, max_health = 300, @@ -194,18 +194,13 @@ data:extend( { type = "item", name = "algae-farm-3", - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png" + icons = angelsmods.functions.add_number_icon_layer({ + { + icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.bioprocessing.number_tint), subgroup = "bio-processing-buildings-nauvis-a", order = "a[algae]-c", place_result = "algae-farm-3", @@ -214,8 +209,13 @@ data:extend( { type = "assembling-machine", name = "algae-farm-3", - icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer({ + { + icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 3, angelsmods.bioprocessing.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "algae-farm-3"}, max_health = 300, diff --git a/angelsindustries/prototypes/entities/bio-tile.lua b/angelsbioprocessing/prototypes/buildings/bio-tile.lua similarity index 63% rename from angelsindustries/prototypes/entities/bio-tile.lua rename to angelsbioprocessing/prototypes/buildings/bio-tile.lua index f4f9f1092..b206eef0b 100644 --- a/angelsindustries/prototypes/entities/bio-tile.lua +++ b/angelsbioprocessing/prototypes/buildings/bio-tile.lua @@ -5,11 +5,22 @@ data:extend( { type = "item", name = "bio-tile", - icon = "__angelssmelting__/graphics/icons/brick-clay.png", - icon_size = 32, + icons = { --temp use base version of landfill as the icon + { + icon= "__base__/graphics/technology/landfill.png", + icon_size = 256, + icon_mipmaps = 4 + }, + { + icon = "__angelssmelting__/graphics/icons/brick-clay.png", + icon_size = 32, + scale = 0.4375 * 1.6, + shift = {9, 9} + } + }, subgroup = "angels-stone", order = "f", - stack_size = 1000, + stack_size = angelsmods.trigger.pavement_stack_size, place_as_tile = { result = "bio-tile", condition_size = 4, @@ -26,42 +37,42 @@ data:extend( walking_speed_modifier = 1.5, layer = 80, decorative_removal_probability = 1, - pollution_absorption_per_second = 0, + pollution_absorption_per_second = 0.000008, variants = { main = { { - picture = "__angelsindustries__/graphics/entity/tile-bio/bio-tile-small.png", + picture = "__angelsbioprocessing__/graphics/entity/tile-bio/bio-tile-small.png", count = 16, scale = 0.5, size = 1 } }, inner_corner = { - picture = "__angelsindustries__/graphics/entity/tile-bio/bio-tile-corner-inner.png", + picture = "__angelsbioprocessing__/graphics/entity/tile-bio/bio-tile-corner-inner.png", width = 128, height = 128, scale = 0.5, count = 1 }, outer_corner = { - picture = "__angelsindustries__/graphics/entity/tile-bio/bio-tile-corner-outer.png", + picture = "__angelsbioprocessing__/graphics/entity/tile-bio/bio-tile-corner-outer.png", width = 128, height = 128, scale = 0.5, count = 1 }, side = { - picture = "__angelsindustries__/graphics/entity/tile-bio/bio-tile-side.png", + picture = "__angelsbioprocessing__/graphics/entity/tile-bio/bio-tile-side.png", scale = 0.5, count = 4 }, u_transition = { - picture = "__angelsindustries__/graphics/entity/tile-bio/bio-tile-corner-u.png", + picture = "__angelsbioprocessing__/graphics/entity/tile-bio/bio-tile-corner-u.png", scale = 0.5, count = 1 }, o_transition = { - picture = "__angelsindustries__/graphics/entity/tile-bio/bio-tile-corner-o.png", + picture = "__angelsbioprocessing__/graphics/entity/tile-bio/bio-tile-corner-o.png", scale = 0.5, count = 1 } diff --git a/angelsbioprocessing/prototypes/buildings/crop-farm.lua b/angelsbioprocessing/prototypes/buildings/crop-farm.lua index 3c91ffe32..603e7a016 100644 --- a/angelsbioprocessing/prototypes/buildings/crop-farm.lua +++ b/angelsbioprocessing/prototypes/buildings/crop-farm.lua @@ -120,7 +120,7 @@ data:extend( module_slots = 2 }, allowed_effects = {"consumption", "speed", "productivity", "pollution"}, - crafting_categories = {"temperate-farming"}, + crafting_categories = {"temperate-farming", "advanced-temperate-farming"}, crafting_speed = 2, energy_source = { @@ -212,7 +212,7 @@ data:extend( module_slots = 2 }, allowed_effects = {"consumption", "speed", "productivity", "pollution"}, - crafting_categories = {"desert-farming"}, + crafting_categories = {"desert-farming", "advanced-desert-farming"}, crafting_speed = 2, energy_source = { @@ -304,7 +304,7 @@ data:extend( module_slots = 2 }, allowed_effects = {"consumption", "speed", "productivity", "pollution"}, - crafting_categories = {"swamp-farming"}, + crafting_categories = {"swamp-farming", "advanced-swamp-farming"}, crafting_speed = 2, energy_source = { diff --git a/angelsbioprocessing/prototypes/buildings/puffer-spawner.lua b/angelsbioprocessing/prototypes/buildings/puffer-spawner.lua index afe2daf43..e27328f11 100644 --- a/angelsbioprocessing/prototypes/buildings/puffer-spawner.lua +++ b/angelsbioprocessing/prototypes/buildings/puffer-spawner.lua @@ -1,4 +1,4 @@ -local enemy_autoplace = require ("__base__/prototypes/entity/demo-enemy-autoplace-utils") +local enemy_autoplace = require ("__base__/prototypes/entity/enemy-autoplace-utils") data:extend( { diff --git a/angelsbioprocessing/prototypes/items/bio-module.lua b/angelsbioprocessing/prototypes/items/bio-module.lua index 40f3cc6f2..424d8b4c7 100644 --- a/angelsbioprocessing/prototypes/items/bio-module.lua +++ b/angelsbioprocessing/prototypes/items/bio-module.lua @@ -27,7 +27,7 @@ data:extend( icon_size = 64, icon_mipmaps = 4, subgroup = "module", category = "productivity", - tier = 1, + tier = 2, order = "d[yield]-a[angels-bio-yield-module-2]", stack_size = 50, effect = @@ -46,7 +46,7 @@ data:extend( icon_size = 64, icon_mipmaps = 4, subgroup = "module", category = "productivity", - tier = 1, + tier = 3, order = "d[yield]-a[angels-bio-yield-module-3]", stack_size = 50, effect = @@ -62,4 +62,12 @@ data:extend( angelsmods.functions.add_bio_productivity_module("angels-bio-yield-module") angelsmods.functions.add_bio_productivity_module("angels-bio-yield-module-2") -angelsmods.functions.add_bio_productivity_module("angels-bio-yield-module-3") \ No newline at end of file +angelsmods.functions.add_bio_productivity_module("angels-bio-yield-module-3") +if mods["bobmodules"] then + -- adding in data stage already to be safe... + angelsmods.functions.add_bio_productivity_module("angels-bio-yield-module-4") + angelsmods.functions.add_bio_productivity_module("angels-bio-yield-module-5") + angelsmods.functions.add_bio_productivity_module("angels-bio-yield-module-6") + angelsmods.functions.add_bio_productivity_module("angels-bio-yield-module-7") + angelsmods.functions.add_bio_productivity_module("angels-bio-yield-module-8") +end \ No newline at end of file diff --git a/angelsbioprocessing/prototypes/items/bio-processing-wood-paper.lua b/angelsbioprocessing/prototypes/items/bio-processing-wood-paper.lua index 64f538435..90d44b314 100644 --- a/angelsbioprocessing/prototypes/items/bio-processing-wood-paper.lua +++ b/angelsbioprocessing/prototypes/items/bio-processing-wood-paper.lua @@ -1,6 +1,6 @@ data:extend( { - { + --[[{ type = "item", name = "circuit-wood-fiber-board", icon = "__angelsbioprocessing__/graphics/icons/wood-fiber-board.png", @@ -8,7 +8,7 @@ data:extend( subgroup = "bio-processing-wood", order = "c[circuit-wood-fiber-board]", stack_size = 200, - }, + },]] { type = "item", name = "cellulose-fiber", diff --git a/angelsbioprocessing/prototypes/items/bio-refugium-fish.lua b/angelsbioprocessing/prototypes/items/bio-refugium-fish.lua index 4b37c9707..849c804ac 100644 --- a/angelsbioprocessing/prototypes/items/bio-refugium-fish.lua +++ b/angelsbioprocessing/prototypes/items/bio-refugium-fish.lua @@ -42,6 +42,7 @@ data:extend( attack_parameters = { type = "projectile", + activation_type = "consume", ammo_category = "capsule", cooldown = 30, range = 0, @@ -80,6 +81,7 @@ data:extend( attack_parameters = { type = "projectile", + activation_type = "consume", ammo_category = "capsule", cooldown = 30, range = 0, @@ -118,6 +120,7 @@ data:extend( attack_parameters = { type = "projectile", + activation_type = "consume", ammo_category = "capsule", cooldown = 30, range = 0, @@ -186,4 +189,4 @@ data:extend( stack_size = 200, } } -) \ No newline at end of file +) diff --git a/angelsbioprocessing/prototypes/items/crop-farming-processing.lua b/angelsbioprocessing/prototypes/items/crop-farming-processing.lua index d118f0f71..d2bb66421 100644 --- a/angelsbioprocessing/prototypes/items/crop-farming-processing.lua +++ b/angelsbioprocessing/prototypes/items/crop-farming-processing.lua @@ -104,7 +104,7 @@ data:extend( pressure_to_speed_ratio = 0.4, flow_to_energy_ratio = 0.59, }, - { + --[[{ type = "item", name = "solid-flour", icon = "__angelsbioprocessing__/graphics/icons/solid-flour.png", @@ -126,7 +126,7 @@ data:extend( flow_color = {r = 245/255, g = 245/255, b = 245/255}, pressure_to_speed_ratio = 0.4, flow_to_energy_ratio = 0.59, - }, + },]] { type = "fluid", name = "gas-ethanol", diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua index 74a4ab744..74210f807 100644 --- a/angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua +++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua @@ -3,7 +3,7 @@ if angelsmods.industries and angelsmods.industries.overhaul then OV.modify_output("algae-brown-burning", {"solid-lithium", 1}) -- OV.remove_unlock("bio-paper-1", "circuit-paper-board") - + OV.modify_input("bio-tile",{type = "item", name = "solid-glass-mixture", amount = 1}) -- MODULES OV.modify_input("speed-module", {"crystal-splinter-blue"}) OV.modify_input("speed-module-2", {"crystal-shard-blue"}) @@ -28,7 +28,10 @@ if angelsmods.industries and angelsmods.industries.overhaul then OV.modify_input("beacon", {"crystal-full-harmonic"}) OV.add_prereq("effect-transmission", "bio-processing-crystal-full") elseif mods["bobplates"] then + OV.modify_input("bio-tile",{type = "item", name = "solid-glass-mixture", amount = 1}) -- nothing to change else + OV.modify_input("bio-tile",{type = "item", name = "steel-plate", amount = 1}) OV.disable_recipe("algae-brown-burning") end +OV.add_unlock("bio-farm-2","bio-tile") \ No newline at end of file diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-bob.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-bob.lua index ad3b27d30..daffbc4f7 100644 --- a/angelsbioprocessing/prototypes/overrides/bio-processing-override-bob.lua +++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-bob.lua @@ -5,317 +5,52 @@ if mods["bobtech"] and settings.startup["bobmods-burnerphase"].value then OV.add_prereq("bio-wood-processing", "automation-science-pack") end --- everything below this should be rewritten and organized as it's becomming a mess -if bobmods then - - if mods["bobgreenhouse"] then - OV.add_prereq("bob-fertiliser", "bio-farm-2") - end - - if mods["bobplates"] then - -- CATEGORY - if data.raw["item-group"]["bob-gems"] then - if angelsmods.industries and angelsmods.industries.overhaul then - -- gems group - data.raw["item-group"]["bob-gems"].icon = nil - data.raw["item-group"]["bob-gems"].icon_size = nil - data.raw["item-group"]["bob-gems"].icons = { - { - icon = "__bobplates__/graphics/icons/technology/gems.png", - icon_size = 64 - }, - { - icon = "__angelsrefining__/graphics/icons/bobs-logo.png", - icon_size = 1080, - scale = 64/1080 * 0.35, - shift = {20, -20} - }, - } - data.raw["item-group"]["bob-gems"].order = "lb[bobs]-c[gems]" - data.raw["item-group"]["bob-gems"].inventory_order = "lb[bobs]-c[gems]" - end - - -- gems subgroups - data.raw["item-subgroup"]["bio-biter-processing-crystal-splinter"].group = "bob-gems" - data.raw["item-subgroup"]["bio-biter-processing-crystal-splinter"].order = "7"..data.raw["item-subgroup"]["bio-biter-processing-crystal-splinter"].order - data.raw["item-subgroup"]["bio-biter-processing-crystal-shard"].group = "bob-gems" - data.raw["item-subgroup"]["bio-biter-processing-crystal-shard"].order = "7"..data.raw["item-subgroup"]["bio-biter-processing-crystal-shard"].order - data.raw["item-subgroup"]["bio-biter-processing-crystal-full"].group = "bob-gems" - data.raw["item-subgroup"]["bio-biter-processing-crystal-full"].order = "7"..data.raw["item-subgroup"]["bio-biter-processing-crystal-full"].order - - move_item("crystal-grindstone", "bio-biter-processing-crystal-splinter", "d") - move_item("crystal-grindstone", "bob-gems-cut", "h-4", "recipe") - end - - -- GEMS - OV.add_prereq("gem-processing-1", "geode-crystallization-1") - OV.add_prereq("bio-processing-alien-3", "gem-processing-1") - - -- CRYSTALS - OV.modify_input("crystal-grindstone", {"grinding-wheel", "iron-plate"}) - OV.add_prereq("bio-processing-crystal-splinter-1", "grinding") - end - - if mods["bobmodules"] then - -- CATEGORY +if mods["bobplates"] then + -- CATEGORY + if data.raw["item-group"]["bob-gems"] then if angelsmods.industries and angelsmods.industries.overhaul then - -- modules group - data.raw["item-group"]["bobmodules"].icon = nil - data.raw["item-group"]["bobmodules"].icon_size = nil - data.raw["item-group"]["bobmodules"].icons = { + -- gems group + data.raw["item-group"]["bob-gems"].icon = nil + data.raw["item-group"]["bob-gems"].icon_size = nil + data.raw["item-group"]["bob-gems"].icons = { { - icon = "__base__/graphics/technology/module.png", - icon_size = 128 + icon = "__bobplates__/graphics/icons/technology/gems.png", + icon_size = 64 }, { icon = "__angelsrefining__/graphics/icons/bobs-logo.png", icon_size = 1080, - scale = 128/1080 * 0.35, - shift = {40, -40} - }, - } - data.raw["item-group"]["bobmodules"].order = "lb[bobs]-d[modules]" - data.raw["item-group"]["bobmodules"].inventory_order = "lb[bobs]-d[modules]" - - -- modules subgroups - data.raw["item-subgroup"]["module-intermediates"].order = "f-0-a" - data:extend( - { - { - type = "item-subgroup", - name = "module-intermediates-2", - group = "bobmodules", - order = "f-0-b" - }, - { - type = "item-subgroup", - name = "module-intermediates-3", - group = "bobmodules", - order = "f-0-c" + scale = 64/1080 * 0.35, + shift = {20, -20} }, } - ) - data.raw["item"]["module-contact"].subgroup = "module-intermediates-2" - data.raw["tool"]["module-circuit-board"].subgroup = "module-intermediates-3" - data.raw["item"]["module-processor-board-2"].subgroup = "module-intermediates-2" - data.raw["item"]["module-processor-board-3"].subgroup = "module-intermediates-3" - data.raw["item"]["speed-processor-2"].subgroup = "module-intermediates-2" - data.raw["item"]["speed-processor-3"].subgroup = "module-intermediates-3" - data.raw["item"]["effectivity-processor-2"].subgroup = "module-intermediates-2" - data.raw["item"]["effectivity-processor-3"].subgroup = "module-intermediates-3" - data.raw["item"]["productivity-processor-2"].subgroup = "module-intermediates-2" - data.raw["item"]["productivity-processor-3"].subgroup = "module-intermediates-3" - data.raw["item"]["pollution-clean-processor-2"].subgroup = "module-intermediates-2" - data.raw["item"]["pollution-clean-processor-3"].subgroup = "module-intermediates-3" - data.raw["item"]["pollution-create-processor-2"].subgroup = "module-intermediates-2" - data.raw["item"]["pollution-create-processor-3"].subgroup = "module-intermediates-3" - end - - -- MODULES - if angelsmods.industries and angelsmods.industries.overhaul then - OV.patch_recipes({ - { name = "speed-module", ingredients = { {type="item", name="crystal-splinter-blue", amount = 0} } }, - { name = "speed-module-2", ingredients = { {type="item", name="crystal-shard-blue", amount = 0} } }, - { name = "speed-module-3", ingredients = { {type="item", name="crystal-full-blue", amount = 0} } }, - { name = "productivity-module", ingredients = { {type="item", name="crystal-splinter-red", amount = 0} } }, - { name = "productivity-module-2", ingredients = { {type="item", name="crystal-shard-red", amount = 0} } }, - { name = "productivity-module-3", ingredients = { {type="item", name="crystal-full-red", amount = 0} } }, - { name = "effectivity-module", ingredients = { {type="item", name="crystal-splinter-green", amount = 0} } }, - { name = "effectivity-module-2", ingredients = { {type="item", name="crystal-shard-green", amount = 0} } }, - { name = "effectivity-module-3", ingredients = { {type="item", name="crystal-full-green", amount = 0} } }, - }) - OV.remove_prereq("speed-module", "bio-processing-crystal-splinter-1") - OV.remove_prereq("productivity-module", "bio-processing-crystal-splinter-1") - OV.remove_prereq("effectivity-module", "bio-processing-crystal-splinter-1") - OV.remove_prereq("speed-module-2", "bio-processing-crystal-shard-1") - OV.remove_prereq("productivity-module-2", "bio-processing-crystal-shard-1") - OV.remove_prereq("effectivity-module-2", "bio-processing-crystal-shard-1") - OV.remove_prereq("speed-module-3", "bio-processing-crystal-full") - OV.remove_prereq("productivity-module-3", "bio-processing-crystal-full") - OV.remove_prereq("effectivity-module-3", "bio-processing-crystal-full") + data.raw["item-group"]["bob-gems"].order = "lb[bobs]-c[gems]" + data.raw["item-group"]["bob-gems"].inventory_order = "lb[bobs]-c[gems]" end - OV.patch_recipes({ - { name = "speed-processor", ingredients = { {type="item", name="crystal-splinter-blue", amount = 1} } }, - { name = "speed-processor-2", ingredients = { {type="item", name="crystal-shard-blue", amount = 1} } }, - { name = "speed-processor-3", ingredients = { {type="item", name="crystal-full-blue", amount = 1} } }, - { name = "productivity-processor", ingredients = { {type="item", name="crystal-splinter-red", amount = 1} } }, - { name = "productivity-processor-2", ingredients = { {type="item", name="crystal-shard-red", amount = 1} } }, - { name = "productivity-processor-3", ingredients = { {type="item", name="crystal-full-red", amount = 1} } }, - { name = "effectivity-processor", ingredients = { {type="item", name="crystal-splinter-green", amount = 1} } }, - { name = "effectivity-processor-2", ingredients = { {type="item", name="crystal-shard-green", amount = 1} } }, - { name = "effectivity-processor-3", ingredients = { {type="item", name="crystal-full-green", amount = 1} } }, - { name = "pollution-clean-processor", ingredients = { {type="item", name="crystal-splinter-harmonic", amount = 1} } }, - { name = "pollution-clean-processor-2", ingredients = { {type="item", name="crystal-shard-harmonic", amount = 1} } }, - { name = "pollution-clean-processor-3", ingredients = { {type="item", name="crystal-full-harmonic", amount = 1} } }, - { name = "pollution-create-processor", ingredients = { {type="item", name="crystal-splinter-harmonic", amount = 1} } }, - { name = "pollution-create-processor-2", ingredients = { {type="item", name="crystal-shard-harmonic", amount = 1} } }, - { name = "pollution-create-processor-3", ingredients = { {type="item", name="crystal-full-harmonic", amount = 1} } }, - }) - - OV.add_prereq("modules", "bio-processing-crystal-splinter-1") - data:extend( - { - { - type = "technology", - name = "modules-2", - icon_size = 128, - icon = "__base__/graphics/technology/module.png", - prerequisites = - { - "modules", - "advanced-electronics-2", - "bio-processing-crystal-shard-1", - }, - effects = - { - { - type = "unlock-recipe", - recipe = "module-processor-board-2", - }, - { - type = "unlock-recipe", - recipe = "speed-processor-2" - }, - { - type = "unlock-recipe", - recipe = "effectivity-processor-2" - }, - { - type = "unlock-recipe", - recipe = "productivity-processor-2" - }, - { - type = "unlock-recipe", - recipe = "pollution-clean-processor-2" - }, - { - type = "unlock-recipe", - recipe = "pollution-create-processor-2" - } - }, - unit = - { - count = 100, - ingredients = - { - {type="item", name="automation-science-pack", amount = 1}, - {type="item", name="logistic-science-pack", amount = 1}, - {type="item", name="chemical-science-pack", amount = 1} - }, - time = 30 - }, - order = "i-a" - }, - } - ) - OV.remove_unlock("speed-module-3", "speed-processor-2") - OV.remove_unlock("productivity-module-3", "productivity-processor-2") - OV.remove_unlock("effectivity-module-3", "effectivity-processor-2") - OV.remove_unlock("pollution-clean-module-3", "pollution-clean-processor-2") - OV.remove_unlock("pollution-create-module-3", "pollution-create-processor-2") - OV.add_prereq("speed-module-3", "modules-2") - OV.add_prereq("productivity-module-3", "modules-2") - OV.add_prereq("effectivity-module-3", "modules-2") - OV.add_prereq("pollution-clean-module-3", "modules-2") - OV.add_prereq("pollution-create-module-3", "modules-2") - OV.remove_unlock("advanced-electronics-2", "module-processor-board-2") - data:extend( - { - { - type = "technology", - name = "modules-3", - icon_size = 128, - icon = "__base__/graphics/technology/module.png", - prerequisites = - { - "modules-2", - "bio-processing-crystal-full", - }, - effects = - { - { - type = "unlock-recipe", - recipe = "module-processor-board-3", - }, - { - type = "unlock-recipe", - recipe = "speed-processor-3" - }, - { - type = "unlock-recipe", - recipe = "effectivity-processor-3" - }, - { - type = "unlock-recipe", - recipe = "productivity-processor-3" - }, - { - type = "unlock-recipe", - recipe = "pollution-clean-processor-3" - }, - { - type = "unlock-recipe", - recipe = "pollution-create-processor-3" - } - }, - unit = - { - count = 100, - ingredients = - { - {type="item", name="automation-science-pack", amount = 1}, - {type="item", name="logistic-science-pack", amount = 1}, - {type="item", name="chemical-science-pack", amount = 1}, - {type="item", name="production-science-pack", amount = 1} - }, - time = 30 - }, - order = "i-a" - }, - } - ) - OV.remove_unlock("speed-module-6", "speed-processor-3") - OV.remove_unlock("productivity-module-6", "productivity-processor-3") - OV.remove_unlock("effectivity-module-6", "effectivity-processor-3") - OV.remove_unlock("pollution-clean-module-6", "pollution-clean-processor-3") - OV.remove_unlock("pollution-create-module-6", "pollution-create-processor-3") - OV.add_prereq("speed-module-6", "modules-3") - OV.add_prereq("productivity-module-6", "modules-3") - OV.add_prereq("effectivity-module-6", "modules-3") - OV.add_prereq("pollution-clean-module-6", "modules-3") - OV.add_prereq("pollution-create-module-6", "modules-3") - if data.raw.technology["advanced-electronics-3"] then - OV.remove_unlock("advanced-electronics-3", "module-processor-board-3") - OV.add_prereq("modules-3", "advanced-electronics-3") - OV.remove_prereq("speed-module-6", "advanced-electronics-3") - OV.remove_prereq("productivity-module-6", "advanced-electronics-3") - OV.remove_prereq("effectivity-module-6", "advanced-electronics-3") - OV.remove_prereq("pollution-clean-module-6", "advanced-electronics-3") - OV.remove_prereq("pollution-create-module-6", "advanced-electronics-3") - else - OV.remove_unlock("advanced-electronics-2", "module-processor-board-3") - end - - -- BEACONS - if angelsmods.industries and angelsmods.industries.overhaul then - OV.patch_recipes({ - { name = "beacon", ingredients = { {type="item", name="crystal-full-harmonic", amount = 0} } }, - }) - OV.remove_prereq("effect-transmission", "bio-processing-crystal-full") - end + -- gems subgroups + data.raw["item-subgroup"]["bio-biter-processing-crystal-splinter"].group = "bob-gems" + data.raw["item-subgroup"]["bio-biter-processing-crystal-splinter"].order = "7"..data.raw["item-subgroup"]["bio-biter-processing-crystal-splinter"].order + data.raw["item-subgroup"]["bio-biter-processing-crystal-shard"].group = "bob-gems" + data.raw["item-subgroup"]["bio-biter-processing-crystal-shard"].order = "7"..data.raw["item-subgroup"]["bio-biter-processing-crystal-shard"].order + data.raw["item-subgroup"]["bio-biter-processing-crystal-full"].group = "bob-gems" + data.raw["item-subgroup"]["bio-biter-processing-crystal-full"].order = "7"..data.raw["item-subgroup"]["bio-biter-processing-crystal-full"].order + + move_item("crystal-grindstone", "bio-biter-processing-crystal-splinter", "d") + move_item("crystal-grindstone", "bob-gems-cut", "h-4", "recipe") + end - OV.patch_recipes({ - { name = "beacon", ingredients = { {type="item", name="crystal-splinter-harmonic", amount = 1} } }, - { name = "beacon-2", ingredients = { {type="item", name="crystal-shard-harmonic", amount = 1} } }, - { name = "beacon-3", ingredients = { {type="item", name="crystal-full-harmonic", amount = 1} } }, - }) + -- GEMS + OV.add_prereq("gem-processing-1", "geode-crystallization-1") + OV.add_prereq("bio-processing-alien-3", "gem-processing-1") - OV.add_prereq("effect-transmission", "modules") - OV.add_prereq("effect-transmission-2", "modules-2") - OV.add_prereq("effect-transmission-3", "modules-3") - end + -- CRYSTALS + OV.modify_input("crystal-grindstone", {"grinding-wheel", "iron-plate"}) + OV.add_prereq("bio-processing-crystal-splinter-1", "grinding") +end +-- everything below this should be rewritten and organized as it's becomming a mess +if bobmods then OV.patch_recipes({ { name = "bob-coal-from-wood", ingredients = { {type="item", name="wood", amount = 5} } }, }) diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobgreenhouse.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobgreenhouse.lua new file mode 100644 index 000000000..9b402a554 --- /dev/null +++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobgreenhouse.lua @@ -0,0 +1,234 @@ +local OV = angelsmods.functions.OV +local move_item = angelsmods.functions.move_item + +if mods["bobgreenhouse"] then + + ----------------------------------------------------------------------------- + -- CATEGORY ----------------------------------------------------------------- + ----------------------------------------------------------------------------- + data.raw["item-subgroup"]["bob-greenhouse-items"].group = "bio-processing-nauvis" + data.raw["item-subgroup"]["bob-greenhouse-items"].order = "i" + + ----------------------------------------------------------------------------- + -- FERTILIEZR --------------------------------------------------------------- + ----------------------------------------------------------------------------- + OV.global_replace_item("fertiliser", "solid-fertilizer") + angelsmods.functions.add_flag("fertiliser", "hidden") + + data.raw.recipe["bob-fertiliser"].subgroup = "bio-wood" + data.raw.recipe["bob-fertiliser"].order = "a[support]-cb" + + OV.add_prereq("bob-fertiliser", "bio-farm-2") + + ----------------------------------------------------------------------------- + -- INTEGRATE BOBS WOOD PROCESSING ------------------------------------------- + ----------------------------------------------------------------------------- + move_item("seedling", "bio-arboretum-swamp", "a") + move_item("bob-greenhouse", "bio-processing-buildings-nauvis-a", "c[arboretum]-b") + + OV.patch_recipes( + { + { + name = "bob-seedling", + subgroup = "bio-wood", + order = "c[seedling]", + category = "seed-extractor" + }, + { + name = "bob-basic-greenhouse-cycle", + subgroup = "bio-arboretum", + order = "b[arboretum]-b[tree-generation]-a[basic-greenhouse]", + energy_required = 60, + --results = + --{ {"!!"}, + -- { type = "item", name = "solid-tree", amount = 2 }, + -- { type = "item", name = "solid-tree", amount = 1, probability = 1/3 } + --}, + icons = angelsmods.functions.add_number_icon_layer({ + { + icon = "__angelsbioprocessing__/graphics/icons/tree.png", + icon_size = 64, + scale = 0.5 + }, + { + icon = "__bobgreenhouse__/graphics/icons/seedling.png", + icon_size = 32, + shift = {-12, 12}, + scale = 0.35 + } + }, 1, angelsmods.bioprocessing.number_tint) + }, + { + name = "bob-advanced-greenhouse-cycle", + subgroup = "bio-arboretum", + order = "b[arboretum]-b[tree-generation]-b[advanced-greenhouse]", + energy_required = 45, + --results = + --{ {"!!"}, + -- { type = "item", name = "solid-tree", amount = 4 }, + -- { type = "item", name = "solid-tree", amount = 1, probability = 2/3 } + --}, + icons = angelsmods.functions.add_number_icon_layer({ + { + icon = "__angelsbioprocessing__/graphics/icons/tree.png", + icon_size = 64, + scale = 0.5 + }, + { + icon = "__bobgreenhouse__/graphics/icons/seedling.png", + icon_size = 32, + shift = {-12, 12}, + scale = 0.35 + } + }, 1, angelsmods.bioprocessing.number_tint) + } + } + ) + -- manually patch the result as the recipe builder is failing + data.raw.recipe["bob-basic-greenhouse-cycle"].normal.result = nil + data.raw.recipe["bob-basic-greenhouse-cycle"].normal.results = { + {type = "item", name = "solid-tree", amount_min = 2, amount_max = 4} + } + data.raw.recipe["bob-basic-greenhouse-cycle"].expensive.result = nil + data.raw.recipe["bob-basic-greenhouse-cycle"].expensive.results = { + {type = "item", name = "solid-tree", amount = 2} + } + data.raw.recipe["bob-advanced-greenhouse-cycle"].normal.result = nil + data.raw.recipe["bob-advanced-greenhouse-cycle"].normal.results = { + {type = "item", name = "solid-tree", amount_min = 4, amount_max = 8} + } + data.raw.recipe["bob-advanced-greenhouse-cycle"].expensive.result = nil + data.raw.recipe["bob-advanced-greenhouse-cycle"].expensive.results = { + {type = "item", name = "solid-tree", amount = 4} + } + + -- also update the other tree icons + OV.patch_recipes( + { + { + name = "tree-arboretum-1", + order = "b[arboretum]-b[tree-generation]-c", + icons = angelsmods.functions.add_number_icon_layer({ + { + icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png", + icon_size = 64, + scale = 0.5 + }, + { + icon = "__angelsbioprocessing__/graphics/icons/tree-seed.png", + icon_size = 32, + shift = {-12, 12}, + scale = 0.35 + } + }, 1, angelsmods.bioprocessing.number_tint) + }, + { + name = "tree-arboretum-2", + order = "b[arboretum]-b[tree-generation]-d", + icons = angelsmods.functions.add_number_icon_layer({ + { + icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png", + icon_size = 64, + scale = 0.5 + }, + { + icon = "__angelsbioprocessing__/graphics/icons/tree-seed.png", + icon_size = 32, + shift = {-12, 12}, + scale = 0.35 + } + }, 2, angelsmods.bioprocessing.number_tint) + }, + { + name = "tree-arboretum-3", + order = "b[arboretum]-b[tree-generation]-e", + icons = angelsmods.functions.add_number_icon_layer({ + { + icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png", + icon_size = 64, + scale = 0.5 + }, + { + icon = "__angelsbioprocessing__/graphics/icons/tree-seed.png", + icon_size = 32, + shift = {-12, 12}, + scale = 0.35 + } + }, 3, angelsmods.bioprocessing.number_tint) + } + } + ) + + -- make sure the seed extractor can be unlocked early on + if bobmods and bobmods.electronics then + OV.patch_recipes( + { + { + name = "seed-extractor", + ingredients = { + {name = "electronic-circuit", amount = 0}, + {name = "basic-circuit-board", amount = 4} + } + } + } + ) + end + + -- allow manually creating wood without a sawblade (because nerfed bob greenhouse) + data:extend( + { + { + type = "recipe", + name = "wood-sawing-manual", + category = "angels-manual-crafting", + always_show_made_in = true, + enabled = false, + energy_required = 1 / 3, + ingredients = { + {type = "item", name = "solid-tree", amount = 1} + }, + results = { + {type = "item", name = "wood", amount = 5} + }, + icons = { + { + icon = "__base__/graphics/icons/wood.png", + icon_size = 64, + scale = 0.5 + }, + { + icon = "__angelsbioprocessing__/graphics/icons/hand.png", + scale = 0.35, + shift = {-12, -12} + } + }, + icon_size = 32, + subgroup = "bio-processing-wood", + order = "a[wood]-a[manual]" + } + } + ) + + -- alter angels wood production to require seedlings + OV.patch_recipes( + { + {name = "tree-generator-1", ingredients = {{type = "item", name = "seedling", amount = 4}}}, + {name = "tree-generator-2", ingredients = {{type = "item", name = "seedling", amount = 6}}}, + {name = "tree-generator-3", ingredients = {{type = "item", name = "seedling", amount = 8}}}, + {name = "temperate-tree-generator-1", ingredients = {{type = "item", name = "seedling", amount = 4}}}, + {name = "temperate-tree-generator-2", ingredients = {{type = "item", name = "seedling", amount = 6}}}, + {name = "temperate-tree-generator-3", ingredients = {{type = "item", name = "seedling", amount = 8}}}, + {name = "swamp-tree-generator-1", ingredients = {{type = "item", name = "seedling", amount = 4}}}, + {name = "swamp-tree-generator-2", ingredients = {{type = "item", name = "seedling", amount = 6}}}, + {name = "swamp-tree-generator-3", ingredients = {{type = "item", name = "seedling", amount = 8}}}, + {name = "desert-tree-generator-1", ingredients = {{type = "item", name = "seedling", amount = 4}}}, + {name = "desert-tree-generator-2", ingredients = {{type = "item", name = "seedling", amount = 6}}}, + {name = "desert-tree-generator-3", ingredients = {{type = "item", name = "seedling", amount = 8}}} + } + ) + + -- update tech + OV.add_prereq("bob-greenhouse", "gardens") + OV.add_unlock("bob-greenhouse", "wood-sawing-manual") + OV.add_prereq("bio-arboretum-1", "bob-greenhouse") +end \ No newline at end of file diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobmodules.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobmodules.lua new file mode 100644 index 000000000..1711f943d --- /dev/null +++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobmodules.lua @@ -0,0 +1,504 @@ +local OV = angelsmods.functions.OV +local move_item = angelsmods.functions.move_item + +if mods["bobmodules"] then + ----------------------------------------------------------------------------- + -- EXISTING MODULES CATEGORY ------------------------------------------------ + ----------------------------------------------------------------------------- + if angelsmods.industries and angelsmods.industries.overhaul then + -- modules group + data.raw["item-group"]["bobmodules"].icon = nil + data.raw["item-group"]["bobmodules"].icon_size = nil + data.raw["item-group"]["bobmodules"].icons = { + { + icon = "__base__/graphics/technology/module.png", + icon_size = 256, + icon_mipmaps = 4, + scale = 0.25 + }, + { + icon = "__angelsrefining__/graphics/icons/bobs-logo.png", + icon_size = 1080, + icon_mipmaps = 1, + scale = 64/1080 * 0.35, + shift = {20, -20} + }, + } + data.raw["item-group"]["bobmodules"].order = "lb[bobs]-d[modules]" + data.raw["item-group"]["bobmodules"].inventory_order = "lb[bobs]-d[modules]" + + -- modules subgroups + data.raw["item-subgroup"]["module-intermediates"].order = "f-0-a" + data:extend( + { + { + type = "item-subgroup", + name = "module-intermediates-2", + group = "bobmodules", + order = "f-0-b" + }, + { + type = "item-subgroup", + name = "module-intermediates-3", + group = "bobmodules", + order = "f-0-c" + }, + } + ) + data.raw["item"]["module-contact"].subgroup = "module-intermediates-2" + data.raw["tool"]["module-circuit-board"].subgroup = "module-intermediates-3" + data.raw["item"]["module-processor-board-2"].subgroup = "module-intermediates-2" + data.raw["item"]["module-processor-board-3"].subgroup = "module-intermediates-3" + data.raw["item"]["speed-processor-2"].subgroup = "module-intermediates-2" + data.raw["item"]["speed-processor-3"].subgroup = "module-intermediates-3" + data.raw["item"]["effectivity-processor-2"].subgroup = "module-intermediates-2" + data.raw["item"]["effectivity-processor-3"].subgroup = "module-intermediates-3" + data.raw["item"]["productivity-processor-2"].subgroup = "module-intermediates-2" + data.raw["item"]["productivity-processor-3"].subgroup = "module-intermediates-3" + data.raw["item"]["pollution-clean-processor-2"].subgroup = "module-intermediates-2" + data.raw["item"]["pollution-clean-processor-3"].subgroup = "module-intermediates-3" + data.raw["item"]["pollution-create-processor-2"].subgroup = "module-intermediates-2" + data.raw["item"]["pollution-create-processor-3"].subgroup = "module-intermediates-3" + end + + ----------------------------------------------------------------------------- + -- EXISTING MODULES RECIPES ------------------------------------------------- + ----------------------------------------------------------------------------- + if angelsmods.industries and angelsmods.industries.overhaul then + OV.patch_recipes({ + { name = "speed-module", ingredients = { {type="item", name="crystal-splinter-blue", amount = 0} } }, + { name = "speed-module-2", ingredients = { {type="item", name="crystal-shard-blue", amount = 0} } }, + { name = "speed-module-3", ingredients = { {type="item", name="crystal-full-blue", amount = 0} } }, + { name = "productivity-module", ingredients = { {type="item", name="crystal-splinter-red", amount = 0} } }, + { name = "productivity-module-2", ingredients = { {type="item", name="crystal-shard-red", amount = 0} } }, + { name = "productivity-module-3", ingredients = { {type="item", name="crystal-full-red", amount = 0} } }, + { name = "effectivity-module", ingredients = { {type="item", name="crystal-splinter-green", amount = 0} } }, + { name = "effectivity-module-2", ingredients = { {type="item", name="crystal-shard-green", amount = 0} } }, + { name = "effectivity-module-3", ingredients = { {type="item", name="crystal-full-green", amount = 0} } }, + }) + OV.remove_prereq("speed-module", "bio-processing-crystal-splinter-1") + OV.remove_prereq("productivity-module", "bio-processing-crystal-splinter-1") + OV.remove_prereq("effectivity-module", "bio-processing-crystal-splinter-1") + OV.remove_prereq("speed-module-2", "bio-processing-crystal-shard-1") + OV.remove_prereq("productivity-module-2", "bio-processing-crystal-shard-1") + OV.remove_prereq("effectivity-module-2", "bio-processing-crystal-shard-1") + OV.remove_prereq("speed-module-3", "bio-processing-crystal-full") + OV.remove_prereq("productivity-module-3", "bio-processing-crystal-full") + OV.remove_prereq("effectivity-module-3", "bio-processing-crystal-full") + end + + OV.patch_recipes({ + { name = "speed-processor", ingredients = { {type="item", name="crystal-splinter-blue", amount = 1} } }, + { name = "speed-processor-2", ingredients = { {type="item", name="crystal-shard-blue", amount = 1} } }, + { name = "speed-processor-3", ingredients = { {type="item", name="crystal-full-blue", amount = 1} } }, + { name = "productivity-processor", ingredients = { {type="item", name="crystal-splinter-red", amount = 1} } }, + { name = "productivity-processor-2", ingredients = { {type="item", name="crystal-shard-red", amount = 1} } }, + { name = "productivity-processor-3", ingredients = { {type="item", name="crystal-full-red", amount = 1} } }, + { name = "effectivity-processor", ingredients = { {type="item", name="crystal-splinter-green", amount = 1} } }, + { name = "effectivity-processor-2", ingredients = { {type="item", name="crystal-shard-green", amount = 1} } }, + { name = "effectivity-processor-3", ingredients = { {type="item", name="crystal-full-green", amount = 1} } }, + { name = "pollution-clean-processor", ingredients = { {type="item", name="crystal-splinter-harmonic", amount = 1} } }, + { name = "pollution-clean-processor-2", ingredients = { {type="item", name="crystal-shard-harmonic", amount = 1} } }, + { name = "pollution-clean-processor-3", ingredients = { {type="item", name="crystal-full-harmonic", amount = 1} } }, + { name = "pollution-create-processor", ingredients = { {type="item", name="crystal-splinter-harmonic", amount = 1} } }, + { name = "pollution-create-processor-2", ingredients = { {type="item", name="crystal-shard-harmonic", amount = 1} } }, + { name = "pollution-create-processor-3", ingredients = { {type="item", name="crystal-full-harmonic", amount = 1} } }, + }) + + ----------------------------------------------------------------------------- + -- EXISTING MODULES TECHNOLOGY ---------------------------------------------- + ----------------------------------------------------------------------------- + -- tier 1 modules + OV.add_prereq("modules", "bio-processing-crystal-splinter-1") + + -- tier 2 modules + data:extend( + { + { + type = "technology", + name = "modules-2", + icon = "__base__/graphics/technology/module.png", + icon_size = 256, + icon_mipmaps = 4, + upgrade = true, + prerequisites = + { + "modules", + "advanced-electronics-2", + "bio-processing-crystal-shard-1", + }, + effects = + { + { + type = "unlock-recipe", + recipe = "module-processor-board-2", + }, + { + type = "unlock-recipe", + recipe = "speed-processor-2" + }, + { + type = "unlock-recipe", + recipe = "effectivity-processor-2" + }, + { + type = "unlock-recipe", + recipe = "productivity-processor-2" + }, + { + type = "unlock-recipe", + recipe = "pollution-clean-processor-2" + }, + { + type = "unlock-recipe", + recipe = "pollution-create-processor-2" + } + }, + unit = + { + count = 100, + ingredients = + { + {type="item", name="automation-science-pack", amount = 1}, + {type="item", name="logistic-science-pack", amount = 1}, + {type="item", name="chemical-science-pack", amount = 1} + }, + time = 30 + }, + order = "i-a" + }, + } + ) + OV.remove_unlock("speed-module-3", "speed-processor-2") + OV.remove_unlock("productivity-module-3", "productivity-processor-2") + OV.remove_unlock("effectivity-module-3", "effectivity-processor-2") + OV.remove_unlock("pollution-clean-module-3", "pollution-clean-processor-2") + OV.remove_unlock("pollution-create-module-3", "pollution-create-processor-2") + OV.add_prereq("speed-module-3", "modules-2") + OV.add_prereq("productivity-module-3", "modules-2") + OV.add_prereq("effectivity-module-3", "modules-2") + OV.add_prereq("pollution-clean-module-3", "modules-2") + OV.add_prereq("pollution-create-module-3", "modules-2") + OV.remove_unlock("advanced-electronics-2", "module-processor-board-2") + + -- tier 3 modules + data:extend( + { + { + type = "technology", + name = "modules-3", + icon = "__base__/graphics/technology/module.png", + icon_size = 256, + icon_mipmaps = 4, + upgrade = true, + prerequisites = + { + "modules-2", + "bio-processing-crystal-full", + }, + effects = + { + { + type = "unlock-recipe", + recipe = "module-processor-board-3", + }, + { + type = "unlock-recipe", + recipe = "speed-processor-3" + }, + { + type = "unlock-recipe", + recipe = "effectivity-processor-3" + }, + { + type = "unlock-recipe", + recipe = "productivity-processor-3" + }, + { + type = "unlock-recipe", + recipe = "pollution-clean-processor-3" + }, + { + type = "unlock-recipe", + recipe = "pollution-create-processor-3" + } + }, + unit = + { + count = 100, + ingredients = + { + {type="item", name="automation-science-pack", amount = 1}, + {type="item", name="logistic-science-pack", amount = 1}, + {type="item", name="chemical-science-pack", amount = 1}, + {type="item", name="production-science-pack", amount = 1} + }, + time = 30 + }, + order = "i-a" + }, + } + ) + OV.remove_unlock("speed-module-6", "speed-processor-3") + OV.remove_unlock("productivity-module-6", "productivity-processor-3") + OV.remove_unlock("effectivity-module-6", "effectivity-processor-3") + OV.remove_unlock("pollution-clean-module-6", "pollution-clean-processor-3") + OV.remove_unlock("pollution-create-module-6", "pollution-create-processor-3") + OV.add_prereq("speed-module-6", "modules-3") + OV.add_prereq("productivity-module-6", "modules-3") + OV.add_prereq("effectivity-module-6", "modules-3") + OV.add_prereq("pollution-clean-module-6", "modules-3") + OV.add_prereq("pollution-create-module-6", "modules-3") + if data.raw.technology["advanced-electronics-3"] then + OV.remove_unlock("advanced-electronics-3", "module-processor-board-3") + OV.add_prereq("modules-3", "advanced-electronics-3") + OV.remove_prereq("speed-module-6", "advanced-electronics-3") + OV.remove_prereq("productivity-module-6", "advanced-electronics-3") + OV.remove_prereq("effectivity-module-6", "advanced-electronics-3") + OV.remove_prereq("pollution-clean-module-6", "advanced-electronics-3") + OV.remove_prereq("pollution-create-module-6", "advanced-electronics-3") + else + OV.remove_unlock("advanced-electronics-2", "module-processor-board-3") + end + + ----------------------------------------------------------------------------- + -- BIO YIELD MODULES -------------------------------------------------------- + ----------------------------------------------------------------------------- + -- existing tiers 1.1 - 1.3 + data:extend( + { + { + type = "item-subgroup", + name = "bio-yield-module", + group = "bobmodules", + order = "f-9" + }, + } + ) + data.raw.module["angels-bio-yield-module"].icon = "__angelsbioprocessing__/graphics/icons/bobmodules/orange-module-1.png" + data.raw.module["angels-bio-yield-module"].icon_size = 32 + data.raw.module["angels-bio-yield-module"].icon_mipmaps = 1 + move_item("angels-bio-yield-module", "bio-yield-module", "b-y-1", "module") + data.raw.module["angels-bio-yield-module-2"].icon = "__angelsbioprocessing__/graphics/icons/bobmodules/orange-module-2.png" + data.raw.module["angels-bio-yield-module-2"].icon_size = 32 + data.raw.module["angels-bio-yield-module-2"].icon_mipmaps = 1 + move_item("angels-bio-yield-module-2", "bio-yield-module", "b-y-2", "module") + data.raw.module["angels-bio-yield-module-3"].icon = "__angelsbioprocessing__/graphics/icons/bobmodules/orange-module-3.png" + data.raw.module["angels-bio-yield-module-3"].icon_size = 32 + data.raw.module["angels-bio-yield-module-3"].icon_mipmaps = 1 + move_item("angels-bio-yield-module-3", "bio-yield-module", "b-y-3", "module") + OV.patch_recipes({ + { + name = "angels-bio-yield-module", + ingredients = { + {"!!"}, + --{type = "item", name = "solder", amount = 1}, + {type="item", name="productivity-module", amount = 1}, + {type="item", name="effectivity-module", amount = 1}, + {type = "item", name = "token-bio", amount = 1} + } + }, + { + name = "angels-bio-yield-module-2", + ingredients = { + {"!!"}, + --{type = "item", name = "solder", amount = 2}, + {type="item", name="productivity-module-2", amount = 1}, + {type="item", name="effectivity-module-2", amount = 1}, + {type = "item", name = "token-bio", amount = 1} + } + }, + { + name = "angels-bio-yield-module-3", + ingredients = { + {"!!"}, + --{type = "item", name = "solder", amount = 3}, + {type="item", name="productivity-module-3", amount = 1}, + {type="item", name="effectivity-module-3", amount = 1}, + {type = "item", name = "token-bio", amount = 1} + } + } + }) + --adding solder when bobplates is active +if mods["bobplates"] then + OV.patch_recipes({ + { + name = "angels-bio-yield-module", + ingredients = { + {type = "item", name = "solder", amount = 1} + } + }, + { + name = "angels-bio-yield-module-2", + ingredients = { + {type = "item", name = "solder", amount = 2} + } + }, + { + name = "angels-bio-yield-module-3", + ingredients = { + {type = "item", name = "solder", amount = 3} + } + } + }) +end + data.raw.technology["angels-bio-yield-module"].icon = "__angelsbioprocessing__/graphics/icons/bobmodules/orange-module-1.png" + data.raw.technology["angels-bio-yield-module"].icon_size = 32 + data.raw.technology["angels-bio-yield-module"].icon_mipmaps = 1 + data.raw.technology["angels-bio-yield-module-2"].icon = "__angelsbioprocessing__/graphics/icons/bobmodules/orange-module-2.png" + data.raw.technology["angels-bio-yield-module-2"].icon_size = 32 + data.raw.technology["angels-bio-yield-module-2"].icon_mipmaps = 1 + data.raw.technology["angels-bio-yield-module-3"].icon = "__angelsbioprocessing__/graphics/icons/bobmodules/orange-module-3.png" + data.raw.technology["angels-bio-yield-module-3"].icon_size = 32 + data.raw.technology["angels-bio-yield-module-3"].icon_mipmaps = 1 + if data.raw.technology["module-merging"] ~= nil then + OV.add_prereq("angels-bio-yield-module", "module-merging") + end + for i = 1,3 do + local ingredients = {{"token-bio", 1}} + local ingredients_added = {["token-bio"] = true} + for _, tech_name in pairs{ + i > 1 and "productivity-module-"..i or "productivity-module", + i > 1 and "effectivity-module-"..i or "effectivity-module", + } do + for _, ingredient in pairs(data.raw.technology[tech_name].unit.ingredients) do + if not ingredients_added[ingredient.name or ingredient[1]] then + ingredients_added[ingredient.name or ingredient[1]] = true + table.insert(ingredients, util.table.deepcopy(ingredient)) + end + end + end + data.raw.technology[i > 1 and "angels-bio-yield-module-"..i or "angels-bio-yield-module"].unit = { + count = data.raw.technology[i > 1 and "productivity-module-"..i or "productivity-module"].unit.count, + ingredients = ingredients, + time = data.raw.technology[i > 1 and "productivity-module-"..i or "productivity-module"].unit.time + } + end + + -- addtional tiers 2.1 - 3.2 + for i = 4,8 do + local ingredients = {{"token-bio", 1}} + local ingredients_added = {["token-bio"] = true} + for _, tech_name in pairs{ + "productivity-module-"..i, + "effectivity-module-"..i, + } do + for _, ingredient in pairs(data.raw.technology[tech_name].unit.ingredients) do + if not ingredients_added[ingredient.name or ingredient[1]] then + ingredients_added[ingredient.name or ingredient[1]] = true + table.insert(ingredients, util.table.deepcopy(ingredient)) + end + end + end + local solder_amount = i + if i > 4 then + solder_amount = solder_amount + 1 + if i == 8 then + solder_amount = solder_amount + 1 + end + end + data:extend( + { + { + type = "module", + name = "angels-bio-yield-module-"..i, + localised_description = {"item-description.angels-bio-yield-module-"..i}, + icon = "__angelsbioprocessing__/graphics/icons/bobmodules/orange-module-"..i..".png", + icon_size = 32, icon_mipmaps = 1, + subgroup = "bio-yield-module", + category = "productivity", + tier = i, + order = "b-y-"..i, + stack_size = 50, + effect = + { + productivity = {bonus = 0.15}, + pollution = {bonus = 0.15} -- extra pollution absorption + }, + limitation = {}, + limitation_message_key = "angels-yield-module-usable-only-on-agriculture" + }, + { + type = "recipe", + name = "angels-bio-yield-module-"..i, + enabled = false, + ingredients = + { + --{type = "item", name = "solder", amount = solder_amount}, + {type = "item", name = "productivity-module-"..i, amount = 1}, + {type = "item", name = "effectivity-module-"..i, amount = 1}, + {type = "item", name = "token-bio", amount = 1} + }, + energy_required = 15, + result = "angels-bio-yield-module-"..i + }, + { + type = "technology", + name = "angels-bio-yield-module-"..i, + icon = "__angelsbioprocessing__/graphics/icons/bobmodules/orange-module-"..i..".png", + icon_size = 32, icon_mipmaps = 1, + order = "c-a", + upgrade = true, + prerequisites = { + "angels-bio-yield-module-"..i-1, + "productivity-module-"..i, + "effectivity-module-"..i, + }, + effects = { + { + type = "unlock-recipe", + recipe = "angels-bio-yield-module-"..i + } + }, + unit = { + count = data.raw.technology["productivity-module-"..i].unit.count, + ingredients = ingredients, + time = data.raw.technology["productivity-module-"..i].unit.time + } + } + } + ) + angelsmods.functions.add_bio_productivity_module("angels-bio-yield-module-"..i) + --adding solder when bobplates is active + if mods["bobplates"] then + OV.patch_recipes({ + { + name = "angels-bio-yield-module-" .. i, + ingredients = { + {type = "item", name = "solder", amount = solder_amount} + } + } + }) + end + end + for i = 1,8 do + local name = "angels-bio-yield-module" + if i > 1 then name = name .. "-" .. i end + data.raw.module[name].effect = { + productivity = {bonus = 0.075 * i}, + pollution = {bonus = 0.075 * i} -- extra pollution absorption + } + end + + table.insert(data.raw.lab["lab-module"].inputs, "token-bio") + + ----------------------------------------------------------------------------- + -- BEACONS ------------------------------------------------------------------ + ----------------------------------------------------------------------------- + if angelsmods.industries and angelsmods.industries.overhaul then + OV.patch_recipes({ + { name = "beacon", ingredients = { {type="item", name="crystal-full-harmonic", amount = 0} } }, + }) + OV.remove_prereq("effect-transmission", "bio-processing-crystal-full") + end + + OV.patch_recipes({ + { name = "beacon", ingredients = { {type="item", name="crystal-splinter-harmonic", amount = 1} } }, + { name = "beacon-2", ingredients = { {type="item", name="crystal-shard-harmonic", amount = 1} } }, + { name = "beacon-3", ingredients = { {type="item", name="crystal-full-harmonic", amount = 1} } }, + }) + + OV.add_prereq("effect-transmission", "modules") + OV.add_prereq("effect-transmission-2", "modules-2") + OV.add_prereq("effect-transmission-3", "modules-3") +end diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-algae.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-algae.lua index 9047ba117..4610b6b36 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-processing-algae.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-processing-algae.lua @@ -66,26 +66,26 @@ data:extend( icon_size = 32, order = "c[solid-alginic-acid]" }, - -- { - -- type = "recipe", - -- name = "circuit-wood-fiber-board", - -- icon = "__angelsbioprocessing__/graphics/icons/wood-fiber-board.png", - -- category = "advanced-crafting", - -- subgroup = "bio-processing-brown", - -- enabled = false, - -- energy_required = 4, - -- ingredients = - -- { - -- {type="item", name="cellulose-fiber", amount=4}, - -- {type="item", name="solid-alginic-acid", amount=1}, - -- }, - -- results= - -- { - -- {type="item", name="circuit-wood-fiber-board", amount=3}, - -- }, - -- icon_size = 32, - -- order = "c[circuit-wood-fiber-board]", - -- }, + --[[{ + type = "recipe", + name = "circuit-wood-fiber-board", + icon = "__angelsbioprocessing__/graphics/icons/wood-fiber-board.png", + category = "advanced-crafting", + subgroup = "bio-processing-brown", + enabled = false, + energy_required = 4, + ingredients = + { + {type="item", name="cellulose-fiber", amount=4}, + {type="item", name="solid-alginic-acid", amount=1}, + }, + results= + { + {type="item", name="circuit-wood-fiber-board", amount=3}, + }, + icon_size = 32, + order = "c[circuit-wood-fiber-board]", + },]] --GREEN { @@ -103,18 +103,13 @@ data:extend( {type = "item", name = "algae-green", amount = 25}, {type = "item", name = "algae-brown", amount = 5} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/algae-green.png" + icons = angelsmods.functions.add_number_icon_layer({ + { + icon = "__angelsbioprocessing__/graphics/icons/algae-green.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.bioprocessing.number_tint), order = "aa[algae-farming]" }, { @@ -131,18 +126,13 @@ data:extend( results = { {type = "item", name = "algae-green", amount = 50} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/algae-green.png" + icons = angelsmods.functions.add_number_icon_layer({ + { + icon = "__angelsbioprocessing__/graphics/icons/algae-green.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.bioprocessing.number_tint), order = "ab[algae-farming]" }, { diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-entity-angels.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-entity-angels.lua index a847f3408..39bf30d38 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-processing-entity-angels.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-processing-entity-angels.lua @@ -114,10 +114,10 @@ angelsmods.functions.RB.build( enabled = false, ingredients = { {type = "item", name = "algaefarm-2", amount = 1}, - {type = "item", name = "t1-plate", amount = 11}, - {type = "item", name = "t1-circuit", amount = 4}, - {type = "item", name = "t1-brick", amount = 11}, - {type = "item", name = "t1-pipe", amount = 18} + {type = "item", name = "t2-plate", amount = 11}, + {type = "item", name = "t2-circuit", amount = 4}, + {type = "item", name = "t2-brick", amount = 11}, + {type = "item", name = "t2-pipe", amount = 18} }, result = "algae-farm-2" }, @@ -126,10 +126,10 @@ angelsmods.functions.RB.build( enabled = false, ingredients = { {type = "item", name = "algaefarm-2", amount = 1}, - {type = "item", name = "t1-plate", amount = 11 * buildingmulti}, - {type = "item", name = "t1-circuit", amount = 4 * buildingmulti}, - {type = "item", name = "t1-brick", amount = 11 * buildingmulti}, - {type = "item", name = "t1-pipe", amount = 18 * buildingmulti} + {type = "item", name = "t2-plate", amount = 11 * buildingmulti}, + {type = "item", name = "t2-circuit", amount = 4 * buildingmulti}, + {type = "item", name = "t2-brick", amount = 11 * buildingmulti}, + {type = "item", name = "t2-pipe", amount = 18 * buildingmulti} }, result = "algae-farm-2" } @@ -142,10 +142,10 @@ angelsmods.functions.RB.build( enabled = false, ingredients = { {type = "item", name = "algaefarm-3", amount = 1}, - {type = "item", name = "t2-plate", amount = 11}, - {type = "item", name = "t2-circuit", amount = 4}, - {type = "item", name = "t2-brick", amount = 11}, - {type = "item", name = "t2-pipe", amount = 18} + {type = "item", name = "t4-plate", amount = 11}, + {type = "item", name = "t4-circuit", amount = 4}, + {type = "item", name = "t4-brick", amount = 11}, + {type = "item", name = "t4-pipe", amount = 18} }, result = "algae-farm-3" }, @@ -154,10 +154,10 @@ angelsmods.functions.RB.build( enabled = false, ingredients = { {type = "item", name = "algaefarm-3", amount = 1}, - {type = "item", name = "t2-plate", amount = 11 * buildingmulti}, - {type = "item", name = "t2-circuit", amount = 4 * buildingmulti}, - {type = "item", name = "t2-brick", amount = 11 * buildingmulti}, - {type = "item", name = "t2-pipe", amount = 18 * buildingmulti} + {type = "item", name = "t4-plate", amount = 11 * buildingmulti}, + {type = "item", name = "t4-circuit", amount = 4 * buildingmulti}, + {type = "item", name = "t4-brick", amount = 11 * buildingmulti}, + {type = "item", name = "t4-pipe", amount = 18 * buildingmulti} }, result = "algae-farm-3" } diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-entity.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-entity.lua index 89980c613..44d5ee07c 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-processing-entity.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-processing-entity.lua @@ -230,6 +230,19 @@ data:extend( {type = "item", name = "iron-plate", amount = 1} }, result = "bio-butchery" + }, + { + type = "recipe", + name = "bio-tile", + energy_required = 1, + enabled = false, + ingredients = { + {type = "item", name = "reinforced-concrete-brick", amount = 1}, + {type = "item", name = "token-bio", amount = 2}, + {type = "item", name = "solid-soil", amount = 1}, + --{type = "item", name = "steel-plate", amount = 1} + }, + result = "bio-tile" } } ) diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-paper.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-paper.lua index a2546ec37..d8271315c 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-processing-paper.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-processing-paper.lua @@ -122,18 +122,9 @@ data:extend( results = { {type = "item", name = "solid-wood-pulp", amount = 20} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/solid-wood-pulp.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-wood-pulp"), + 1, angelsmods.bioprocessing.number_tint), order = "aa" }, --T2 SULFITE PROCESS @@ -201,18 +192,9 @@ data:extend( {type = "item", name = "solid-wood-pulp", amount = 25}, {type = "fluid", name = "liquid-brown-liquor", amount = 75} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/solid-wood-pulp.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-wood-pulp"), + 2, angelsmods.bioprocessing.number_tint), order = "ab" }, --T3 KRAFT PROCESS (SULFATE PROCESS) @@ -288,18 +270,9 @@ data:extend( {type = "fluid", name = "liquid-black-liquor", amount_min = 35, amount_max = 40} }, always_show_products = true, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/solid-wood-pulp.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-wood-pulp"), + 3, angelsmods.bioprocessing.number_tint), order = "ac" }, --PAPER BLEACHING @@ -318,18 +291,9 @@ data:extend( }, --main_product = "solid-paper", allow_decomposition = false, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/solid-paper.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-paper"), + 1, angelsmods.bioprocessing.number_tint), order = "ba" }, { @@ -350,18 +314,9 @@ data:extend( }, --main_product = "solid-paper", allow_decomposition = false, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/solid-paper.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-paper"), + 2, angelsmods.bioprocessing.number_tint), order = "bb" }, { @@ -385,18 +340,9 @@ data:extend( }, --main_product = "solid-paper", allow_decomposition = false, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/solid-paper.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-paper"), + 3, angelsmods.bioprocessing.number_tint), order = "bc" } } diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-wood.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-wood.lua index 37d1ff09e..df174caff 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-processing-wood.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-processing-wood.lua @@ -15,18 +15,9 @@ data:extend( results = { {type = "item", name = "tree-seed", amount = 4} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-seed.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("tree-seed"), + 1, angelsmods.bioprocessing.number_tint), order = "a[generator]-a" }, { @@ -44,18 +35,9 @@ data:extend( results = { {type = "item", name = "tree-seed", amount = 6} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-seed.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("tree-seed"), + 2, angelsmods.bioprocessing.number_tint), order = "a[generator]-b" }, { @@ -74,18 +56,9 @@ data:extend( results = { {type = "item", name = "tree-seed", amount = 8} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-seed.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("tree-seed"), + 3, angelsmods.bioprocessing.number_tint), order = "a[generator]-c" }, -- SPECIAL TREE GENERATION @@ -141,20 +114,9 @@ data:extend( results = { {type = "item", name = "solid-tree", amount = 4} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-tree"), + 1, angelsmods.bioprocessing.number_tint), crafting_machine_tint = { primary = {r = 100 / 255, g = 100 / 255, b = 100 / 255, a = 1} }, @@ -176,20 +138,9 @@ data:extend( results = { {type = "item", name = "solid-tree", amount = 6} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-tree"), + 2, angelsmods.bioprocessing.number_tint), crafting_machine_tint = { primary = {r = 100 / 255, g = 100 / 255, b = 100 / 255, a = 1} }, @@ -212,20 +163,9 @@ data:extend( results = { {type = "item", name = "solid-tree", amount = 8} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-tree"), + 3, angelsmods.bioprocessing.number_tint), crafting_machine_tint = { primary = {r = 100 / 255, g = 100 / 255, b = 100 / 255, a = 1} }, @@ -302,20 +242,9 @@ data:extend( }, main_product = "wood", allow_decomposition = false, - icons = { - { - icon = "__base__/graphics/icons/wood.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("wood"), + 1, angelsmods.bioprocessing.number_tint), order = "a[wood]-b[iron-saw]" -- order a[wood]-a[manual] reserved for manual wood crafting (bob greenhouse) }, { @@ -335,20 +264,9 @@ data:extend( }, main_product = "wood", allow_decomposition = false, - icons = { - { - icon = "__base__/graphics/icons/wood.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("wood"), + 2, angelsmods.bioprocessing.number_tint), order = "a[wood]-c[crystal-tipped-saw]" }, { @@ -368,20 +286,9 @@ data:extend( }, main_product = "wood", allow_decomposition = false, - icons = { - { - icon = "__base__/graphics/icons/wood.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("wood"), + 3, angelsmods.bioprocessing.number_tint), order = "a[wood]-d[crystal-full-saw]" }, -- TEMPERATE WOOD GENERATOR @@ -399,18 +306,9 @@ data:extend( results = { {type = "item", name = "tree-temperate-seed", amount = 4} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-temperate-seed.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("tree-temperate-seed"), + 1, angelsmods.bioprocessing.number_tint), order = "a[generator]-a" }, { @@ -428,18 +326,9 @@ data:extend( results = { {type = "item", name = "tree-temperate-seed", amount = 6} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-temperate-seed.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("tree-temperate-seed"), + 2, angelsmods.bioprocessing.number_tint), order = "a[generator]-b" }, { @@ -458,18 +347,9 @@ data:extend( results = { {type = "item", name = "tree-temperate-seed", amount = 8} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-temperate-seed.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("tree-temperate-seed"), + 3, angelsmods.bioprocessing.number_tint), order = "a[generator]-c" }, -- TEMPERATE WOOD ARBORETUM @@ -524,22 +404,11 @@ data:extend( }, results = { {type = "item", name = "bio-resin", amount = 4}, - {type = "item", name = "solid-tree", amount = 2} + {type = "item", name = "solid-tree", amount = 2, catalyst_amount = 2} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-temperate.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("temperate-tree"), + 1, angelsmods.bioprocessing.number_tint), crafting_machine_tint = { primary = {r = 0 / 255, g = 100 / 255, b = 0 / 255, a = 1} }, @@ -560,22 +429,11 @@ data:extend( }, results = { {type = "item", name = "bio-resin", amount = 7}, - {type = "item", name = "solid-tree", amount = 3} + {type = "item", name = "solid-tree", amount = 3, catalyst_amount = 3} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-temperate.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("temperate-tree"), + 2, angelsmods.bioprocessing.number_tint), crafting_machine_tint = { primary = {r = 0 / 255, g = 100 / 255, b = 0 / 255, a = 1} }, @@ -686,18 +544,9 @@ data:extend( results = { {type = "item", name = "tree-swamp-seed", amount = 4} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-swamp-seed.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("tree-swamp-seed"), + 1, angelsmods.bioprocessing.number_tint), crafting_machine_tint = { primary = {r = 0 / 255, g = 0 / 255, b = 100 / 255, a = 1} }, @@ -718,18 +567,9 @@ data:extend( results = { {type = "item", name = "tree-swamp-seed", amount = 6} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-swamp-seed.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("tree-swamp-seed"), + 2, angelsmods.bioprocessing.number_tint), crafting_machine_tint = { primary = {r = 0 / 255, g = 0 / 255, b = 100 / 255, a = 1} }, @@ -751,18 +591,9 @@ data:extend( results = { {type = "item", name = "tree-swamp-seed", amount = 8} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-swamp-seed.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("tree-swamp-seed"), + 3, angelsmods.bioprocessing.number_tint), crafting_machine_tint = { primary = {r = 0 / 255, g = 0 / 255, b = 100 / 255, a = 1} }, @@ -820,22 +651,11 @@ data:extend( }, results = { {type = "item", name = "bio-plastic", amount = 4}, - {type = "item", name = "solid-tree", amount = 2} + {type = "item", name = "solid-tree", amount = 2, catalyst_amount = 2} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-swamp.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("swamp-tree"), + 1, angelsmods.bioprocessing.number_tint), crafting_machine_tint = { primary = {r = 0 / 255, g = 0 / 255, b = 100 / 255, a = 1} }, @@ -856,22 +676,11 @@ data:extend( }, results = { {type = "item", name = "bio-plastic", amount = 7}, - {type = "item", name = "solid-tree", amount = 3} - }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-swamp.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } + {type = "item", name = "solid-tree", amount = 3, catalyst_amount = 3} }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("swamp-tree"), + 2, angelsmods.bioprocessing.number_tint), crafting_machine_tint = { primary = {r = 0 / 255, g = 0 / 255, b = 100 / 255, a = 1} }, @@ -935,18 +744,9 @@ data:extend( results = { {type = "item", name = "tree-desert-seed", amount = 4} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-desert-seed.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("tree-desert-seed"), + 1, angelsmods.bioprocessing.number_tint), crafting_machine_tint = { primary = {r = 100 / 255, g = 100 / 255, b = 0 / 255, a = 1} }, @@ -967,18 +767,9 @@ data:extend( results = { {type = "item", name = "tree-desert-seed", amount = 6} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-desert-seed.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("tree-desert-seed"), + 2, angelsmods.bioprocessing.number_tint), crafting_machine_tint = { primary = {r = 100 / 255, g = 100 / 255, b = 0 / 255, a = 1} }, @@ -1000,18 +791,9 @@ data:extend( results = { {type = "item", name = "tree-desert-seed", amount = 8} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-desert-seed.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("tree-desert-seed"), + 3, angelsmods.bioprocessing.number_tint), crafting_machine_tint = { primary = {r = 100 / 255, g = 100 / 255, b = 0 / 255, a = 1} }, @@ -1069,22 +851,11 @@ data:extend( }, results = { {type = "item", name = "bio-rubber", amount = 4}, - {type = "item", name = "solid-tree", amount = 2} + {type = "item", name = "solid-tree", amount = 2, catalyst_amount = 2} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-desert.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("desert-tree"), + 1, angelsmods.bioprocessing.number_tint), crafting_machine_tint = { primary = {r = 100 / 255, g = 100 / 255, b = 0 / 255, a = 1} }, @@ -1105,22 +876,11 @@ data:extend( }, results = { {type = "item", name = "bio-rubber", amount = 7}, - {type = "item", name = "solid-tree", amount = 3} + {type = "item", name = "solid-tree", amount = 3, catalyst_amount = 3} }, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/tree-desert.png", - icon_size = 64, - scale = 0.5 - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("desert-tree"), + 2, angelsmods.bioprocessing.number_tint), crafting_machine_tint = { primary = {r = 100 / 255, g = 100 / 255, b = 0 / 255, a = 1} }, diff --git a/angelsbioprocessing/prototypes/recipes/bio-refugium-fish.lua b/angelsbioprocessing/prototypes/recipes/bio-refugium-fish.lua index e82f74669..3e6129bf8 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-refugium-fish.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-refugium-fish.lua @@ -580,18 +580,9 @@ data:extend( {type = "item", name = "crystal-splinter-raw", amount = 1, probability = 0.4} }, always_show_products = true, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/crystal-splinter-raw.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("crystal-splinter-raw"), + 1, angelsmods.bioprocessing.number_tint), order = "a[crystalization]-a" }, { @@ -609,18 +600,9 @@ data:extend( {type = "item", name = "crystal-splinter-raw", amount = 1} }, always_show_products = true, - icons = { - { - icon = "__angelsbioprocessing__/graphics/icons/crystal-splinter-raw.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("crystal-splinter-raw"), + 2, angelsmods.bioprocessing.number_tint), order = "a[crystalization]-b" } } diff --git a/angelsbioprocessing/prototypes/recipes/bio-refugium-puffer.lua b/angelsbioprocessing/prototypes/recipes/bio-refugium-puffer.lua index 513dd64fc..9891a0add 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-refugium-puffer.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-refugium-puffer.lua @@ -1016,20 +1016,9 @@ data:extend( {type = "item", name = "crystal-shard-raw", amount = 1, probability = 0.4} }, always_show_products = true, - icons = - { - { - icon = "__angelsbioprocessing__/graphics/icons/crystal-shard-raw.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = - {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("crystal-shard-raw"), + 1, angelsmods.bioprocessing.number_tint), order = "a[crystalization]-a" }, { @@ -1051,20 +1040,9 @@ data:extend( {type = "item", name = "crystal-shard-raw", amount = 1} }, always_show_products = true, - icons = - { - { - icon = "__angelsbioprocessing__/graphics/icons/crystal-shard-raw.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = - {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("crystal-shard-raw"), + 2, angelsmods.bioprocessing.number_tint), order = "a[crystalization]-b" } } diff --git a/angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua b/angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua index ec0632dd2..70878f0c2 100644 --- a/angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua +++ b/angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua @@ -59,7 +59,7 @@ data:extend( { type = "recipe", name = "temperate-garden-cultivating-b", - category = "temperate-farming", + category = "advanced-temperate-farming", subgroup = "farming-temperate-seed", enabled = false, energy_required = 60, @@ -252,7 +252,7 @@ data:extend( { type = "recipe", name = "desert-garden-cultivating-b", - category = "desert-farming", + category = "advanced-desert-farming", subgroup = "farming-desert-seed", enabled = false, energy_required = 60, @@ -445,7 +445,7 @@ data:extend( { type = "recipe", name = "swamp-garden-cultivating-b", - category = "swamp-farming", + category = "advanced-swamp-farming", subgroup = "farming-swamp-seed", enabled = false, energy_required = 60, diff --git a/angelsbioprocessing/prototypes/recipes/crop-farming-processing-fermentation.lua b/angelsbioprocessing/prototypes/recipes/crop-farming-processing-fermentation.lua index 3de5b7634..e01baeef2 100644 --- a/angelsbioprocessing/prototypes/recipes/crop-farming-processing-fermentation.lua +++ b/angelsbioprocessing/prototypes/recipes/crop-farming-processing-fermentation.lua @@ -248,11 +248,7 @@ data:extend( nil, {{255, 255, 255}, {255, 255, 255}}, { - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - tint = angelsmods.bioprocessing.number_tint - } + angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.bioprocessing.number_tint) } ), order = "e" @@ -305,11 +301,7 @@ data:extend( nil, {{255, 255, 255}, {255, 255, 255}}, { - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - tint = angelsmods.bioprocessing.number_tint - } + angelsmods.functions.add_number_icon_layer({}, 2, angelsmods.bioprocessing.number_tint) } ), order = "g" diff --git a/angelsbioprocessing/prototypes/technology/bio-module.lua b/angelsbioprocessing/prototypes/technology/bio-module.lua index 7c93001f6..b6ae77c4d 100644 --- a/angelsbioprocessing/prototypes/technology/bio-module.lua +++ b/angelsbioprocessing/prototypes/technology/bio-module.lua @@ -5,6 +5,7 @@ data:extend( name = "angels-bio-yield-module", icon = "__angelsbioprocessing__/graphics/technology/module-bio-productivity-1-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "productivity-module", @@ -30,8 +31,9 @@ data:extend( { type = "technology", name = "angels-bio-yield-module-2", - icon = "__angelsbioprocessing__/graphics/technology/module-bio-productivity-1-tech.png", + icon = "__angelsbioprocessing__/graphics/technology/module-bio-productivity-2-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "angels-bio-yield-module", @@ -58,8 +60,9 @@ data:extend( { type = "technology", name = "angels-bio-yield-module-3", - icon = "__angelsbioprocessing__/graphics/technology/module-bio-productivity-1-tech.png", + icon = "__angelsbioprocessing__/graphics/technology/module-bio-productivity-3-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "angels-bio-yield-module-2", diff --git a/angelsbioprocessing/prototypes/technology/bio-processing-algae.lua b/angelsbioprocessing/prototypes/technology/bio-processing-algae.lua index fd1293145..7d94ced9e 100644 --- a/angelsbioprocessing/prototypes/technology/bio-processing-algae.lua +++ b/angelsbioprocessing/prototypes/technology/bio-processing-algae.lua @@ -54,10 +54,6 @@ data:extend( type = "unlock-recipe", recipe = "algae-green" }, - { - type = "unlock-recipe", - recipe = "algae-farm-2" - }, { type = "unlock-recipe", recipe = "gas-methanol-from-wood" @@ -94,7 +90,7 @@ data:extend( effects = { { type = "unlock-recipe", - recipe = "algae-farm-3" + recipe = "algae-farm-2" }, { type = "unlock-recipe", @@ -128,6 +124,10 @@ data:extend( "bio-processing-red" }, effects = { + { + type = "unlock-recipe", + recipe = "algae-farm-3" + }, { type = "unlock-recipe", recipe = "algae-blue" diff --git a/angelsbioprocessing/prototypes/technology/bio-processing-alien.lua b/angelsbioprocessing/prototypes/technology/bio-processing-alien.lua index 558117071..de7135f28 100644 --- a/angelsbioprocessing/prototypes/technology/bio-processing-alien.lua +++ b/angelsbioprocessing/prototypes/technology/bio-processing-alien.lua @@ -64,6 +64,7 @@ data:extend( name = "bio-processing-alien-1", icon = "__angelsbioprocessing__/graphics/technology/algae-farm-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-refugium-fish-1", @@ -108,6 +109,7 @@ data:extend( name = "bio-processing-alien-2", icon = "__angelsbioprocessing__/graphics/technology/algae-farm-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-processing-alien-1", @@ -143,6 +145,7 @@ data:extend( name = "bio-processing-alien-3", icon = "__angelsbioprocessing__/graphics/technology/algae-farm-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-processing-alien-2", @@ -165,6 +168,7 @@ data:extend( name = "bio-processing-crystal-splinter-1", icon = "__angelsbioprocessing__/graphics/technology/crystal.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-refugium-fish-1", @@ -210,6 +214,7 @@ data:extend( name = "bio-processing-crystal-splinter-2", icon = "__angelsbioprocessing__/graphics/technology/crystal.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-processing-crystal-splinter-1", @@ -243,6 +248,7 @@ data:extend( name = "bio-processing-crystal-splinter-3", icon = "__angelsbioprocessing__/graphics/technology/crystal.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-processing-crystal-splinter-2", @@ -277,6 +283,7 @@ data:extend( name = "bio-processing-crystal-shard-1", icon = "__angelsbioprocessing__/graphics/technology/crystal.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-processing-alien-1", @@ -284,7 +291,7 @@ data:extend( "bio-refugium-puffer-2", "bio-processing-crystal-splinter-1", "ore-powderizer", - "geode-crystallization-2" + "geode-processing-2" }, effects = { { @@ -331,6 +338,7 @@ data:extend( name = "bio-processing-crystal-shard-2", icon = "__angelsbioprocessing__/graphics/technology/crystal.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-processing-alien-2", diff --git a/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua b/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua index 3e9d8fa64..dd3e23f52 100644 --- a/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua +++ b/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua @@ -34,7 +34,8 @@ data:extend( prerequisites = { "bio-wood-processing", - "angels-coal-processing" + "angels-coal-processing", + "advanced-material-processing" }, effects = { @@ -70,6 +71,7 @@ data:extend( prerequisites = { "bio-wood-processing-2", + "angels-coal-processing-3" }, effects = { @@ -97,6 +99,7 @@ data:extend( }, }, icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { @@ -160,6 +163,7 @@ data:extend( }, }, icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { @@ -210,6 +214,7 @@ data:extend( }, }, icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { @@ -256,6 +261,7 @@ data:extend( } }, icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { @@ -280,6 +286,10 @@ data:extend( { type = "unlock-recipe", recipe = "bio-resin-resin-liquification" + }, + { + type = "unlock-recipe", + recipe = "solid-resin" } }, unit = @@ -302,6 +312,7 @@ data:extend( } }, icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { @@ -343,6 +354,7 @@ data:extend( } }, icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { @@ -380,6 +392,7 @@ data:extend( } }, icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { @@ -401,6 +414,10 @@ data:extend( type = "unlock-recipe", recipe = "bio-plastic" }, + { + type = "unlock-recipe", + recipe = "solid-plastic" + } }, unit = { @@ -422,6 +439,7 @@ data:extend( } }, icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { @@ -441,7 +459,7 @@ data:extend( { type = "unlock-recipe", recipe = "bio-plastic-tree" - }, + } }, unit = { @@ -463,6 +481,7 @@ data:extend( } }, icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { @@ -500,6 +519,7 @@ data:extend( } }, icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { @@ -521,6 +541,10 @@ data:extend( type = "unlock-recipe", recipe = "bio-rubber" }, + { + type = "unlock-recipe", + recipe = "solid-rubber" + } }, unit = { @@ -542,6 +566,7 @@ data:extend( } }, icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { @@ -583,6 +608,7 @@ data:extend( } }, icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { @@ -616,6 +642,7 @@ data:extend( name = "bio-paper-1", icon = "__angelsbioprocessing__/graphics/technology/paper-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { @@ -646,11 +673,14 @@ data:extend( name = "bio-paper-2", icon = "__angelsbioprocessing__/graphics/technology/paper-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-paper-1", + "chlorine-processing-1", "angels-nitrogen-processing-1", + "angels-sulfur-processing-2", }, effects = { @@ -686,6 +716,7 @@ data:extend( name = "bio-paper-3", icon = "__angelsbioprocessing__/graphics/technology/paper-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { diff --git a/angelsbioprocessing/prototypes/technology/bio-refugium.lua b/angelsbioprocessing/prototypes/technology/bio-refugium.lua index b1a9fe2f7..f7787fb1f 100644 --- a/angelsbioprocessing/prototypes/technology/bio-refugium.lua +++ b/angelsbioprocessing/prototypes/technology/bio-refugium.lua @@ -6,11 +6,12 @@ data:extend( name = "bio-refugium-fish-1", icon = "__angelsbioprocessing__/graphics/technology/bio-refugium-fish-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-nutrient-paste", "water-treatment-3", - "angels-advanced-chemistry-1" + --"angels-advanced-chemistry-1" }, effects = { { @@ -52,10 +53,12 @@ data:extend( name = "bio-refugium-fish-2", icon = "__angelsbioprocessing__/graphics/technology/bio-refugium-fish-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-refugium-fish-1", - "bio-refugium-butchery-1" + "bio-refugium-butchery-1", + "bio-processing-green" }, effects = { { @@ -135,6 +138,7 @@ data:extend( name = "bio-refugium-puffer-1", icon = "__angelsbioprocessing__/graphics/technology/bio-refugium-puffer-breeding-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-refugium-hatchery", @@ -189,6 +193,7 @@ data:extend( name = "bio-refugium-puffer-2", icon = "__angelsbioprocessing__/graphics/technology/bio-refugium-puffer-breeding-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-refugium-puffer-1", @@ -231,6 +236,7 @@ data:extend( name = "bio-refugium-puffer-3", icon = "__angelsbioprocessing__/graphics/technology/bio-refugium-puffer-breeding-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-refugium-puffer-2", @@ -273,6 +279,7 @@ data:extend( name = "bio-refugium-puffer-4", icon = "__angelsbioprocessing__/graphics/technology/bio-refugium-puffer-breeding-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-refugium-puffer-3", @@ -317,6 +324,7 @@ data:extend( name = "bio-refugium-biter-1", icon = "__angelsbioprocessing__/graphics/technology/bio-refugium-biter-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-farm-alien", @@ -373,6 +381,7 @@ data:extend( name = "bio-refugium-biter-2", icon = "__angelsbioprocessing__/graphics/technology/bio-refugium-biter-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-refugium-biter-1", @@ -419,6 +428,7 @@ data:extend( name = "bio-refugium-biter-3", icon = "__angelsbioprocessing__/graphics/technology/bio-refugium-biter-tech.png", icon_size = 128, + upgrade = true, order = "c-a", prerequisites = { "bio-refugium-biter-2", @@ -554,6 +564,7 @@ data:extend( name = "bio-refugium-butchery-1", icon = "__angelsbioprocessing__/graphics/technology/bio-refugium-butchery-tech.png", icon_size = 160, + upgrade = true, order = "c-a", prerequisites = { "bio-refugium-fish-1" @@ -594,6 +605,7 @@ data:extend( name = "bio-refugium-butchery-2", icon = "__angelsbioprocessing__/graphics/technology/bio-refugium-butchery-tech.png", icon_size = 160, + upgrade = true, order = "c-a", prerequisites = { "bio-refugium-butchery-1", diff --git a/angelsbioprocessing/prototypes/technology/crop-farming.lua b/angelsbioprocessing/prototypes/technology/crop-farming.lua index 47b9f251b..679eaf614 100644 --- a/angelsbioprocessing/prototypes/technology/crop-farming.lua +++ b/angelsbioprocessing/prototypes/technology/crop-farming.lua @@ -599,7 +599,8 @@ data:extend( icon_size = 128, order = "c-a", prerequisites = { - "bio-farm-1" + "bio-farm-1", + "gas-processing" }, effects = { { @@ -654,7 +655,7 @@ data:extend( }, { type = "technology", - name = "bio-pressing", + name = "bio-pressing-1", icon = "__angelsbioprocessing__/graphics/technology/press-tech.png", icon_size = 128, order = "c-a", @@ -684,10 +685,6 @@ data:extend( type = "unlock-recipe", recipe = "liquid-raw-vegetable-oil-filtering-1" }, - { - type = "unlock-recipe", - recipe = "liquid-raw-vegetable-oil-filtering-2" - }, { type = "unlock-recipe", recipe = "liquid-vegetable-oil-refining" @@ -704,14 +701,41 @@ data:extend( }, { type = "technology", - name = "bio-pressing-fish", + name = "bio-pressing-2", + icon = "__angelsbioprocessing__/graphics/technology/press-tech.png", + icon_size = 128, + order = "c-a", + prerequisites = { + "bio-pressing-1", + "slag-processing-2" + }, + effects = { + { + type = "unlock-recipe", + recipe = "liquid-raw-vegetable-oil-filtering-2" + } + }, + unit = { + count = 75, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1} + }, + time = 30 + } + }, + { + type = "technology", + name = "bio-pressing-fish-1", icon = "__angelsbioprocessing__/graphics/technology/press-tech.png", icon_size = 128, order = "c-a", prerequisites = { - "bio-pressing", + "bio-pressing-1", "bio-refugium-fish-1", "bio-fermentation", + "thermal-water-extraction" }, effects = { { @@ -740,11 +764,32 @@ data:extend( }, { type = "unlock-recipe", - recipe = "liquid-raw-fish-oil-filtering-2" + recipe = "liquid-fish-oil-refining" }, + }, + unit = { + count = 40, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1} + }, + time = 30 + } + }, + { + type = "technology", + name = "bio-pressing-fish-2", + icon = "__angelsbioprocessing__/graphics/technology/press-tech.png", + icon_size = 128, + order = "c-a", + prerequisites = { + "bio-pressing-fish-1", + "bio-pressing-2" + }, + effects = { { type = "unlock-recipe", - recipe = "liquid-fish-oil-refining" + recipe = "liquid-raw-fish-oil-filtering-2" }, { type = "unlock-recipe", @@ -752,10 +797,11 @@ data:extend( } }, unit = { - count = 40, + count = 75, ingredients = { {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1} + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1} }, time = 30 } @@ -767,7 +813,8 @@ data:extend( icon_size = 128, order = "c-a", prerequisites = { - "bio-farm-1" + "bio-farm-1", + "angels-sulfur-processing-1" }, effects = { -- { @@ -812,6 +859,7 @@ data:extend( order = "c-a", prerequisites = { "bio-fermentation", + "bio-nutrient-paste", "plastics" }, effects = { @@ -834,6 +882,10 @@ data:extend( { type = "unlock-recipe", recipe = "bio-plastic-1" + }, + { + type = "unlock-recipe", + recipe = "solid-plastic" } }, unit = { diff --git a/angelsexploration/changelog.txt b/angelsexploration/changelog.txt index 00d18bb72..3ae949957 100644 --- a/angelsexploration/changelog.txt +++ b/angelsexploration/changelog.txt @@ -1,4 +1,15 @@ --------------------------------------------------------------------------------------------------- +Version: 0.3.10 +Date: ?? + Bugfixes: + - Fixed collision box and drawing box of the mammoth heavy tank (476) + - Fixed that turret technology did not depend on military (549) +--------------------------------------------------------------------------------------------------- +Version: 0.3.9 +Date: 26.11.2020 + Changes: + - Migrate to factorio version 1.1 +--------------------------------------------------------------------------------------------------- Version: 0.3.8 Date: 29.10.2020 Changes: diff --git a/angelsexploration/info.json b/angelsexploration/info.json index a383e5903..5e13b1008 100644 --- a/angelsexploration/info.json +++ b/angelsexploration/info.json @@ -1,22 +1,19 @@ { "name": "angelsexploration", - "version": "0.3.8", - "factorio_version": "1.0", + "version": "0.3.10", + "factorio_version": "1.1", "title": "Angel's Exploration (BETA)", "author": "Arch666Angel", "contact": "", "homepage": "https://forums.factorio.com/viewforum.php?f=185", "description": "", "dependencies": [ - "base >= 0.18.36", - - "angelsrefining >= 0.11.17", - "angelspetrochem >= 0.9.15", - "angelssmelting >= 0.6.12", - "angelsbioprocessing >= 0.7.15", - "angelsindustries >= 0.4.7", - + "angelsrefining >= 0.11.19", + "angelspetrochem >= 0.9.17", + "angelssmelting >= 0.6.14", + "angelsbioprocessing >= 0.7.17", + "angelsindustries >= 0.4.9", "? bobenemies >= 0.18.5", "? bobwarfare >= 0.18.6" ] -} \ No newline at end of file +} diff --git a/angelsexploration/prototypes/entities/bio-turret.lua b/angelsexploration/prototypes/entities/bio-turret.lua index d8f10225c..818df13f0 100644 --- a/angelsexploration/prototypes/entities/bio-turret.lua +++ b/angelsexploration/prototypes/entities/bio-turret.lua @@ -1,6 +1,6 @@ require "util" local math3d = require "math3d" -local sounds = require("__base__.prototypes.entity.demo-sounds") +local sounds = require("__base__.prototypes.entity.sounds") local bio_turret_make_color = function(r_, g_, b_, a_) return {r = r_ * a_, g = g_ * a_, b = b_ * a_, a = a_} diff --git a/angelsexploration/prototypes/entities/vehicles.lua b/angelsexploration/prototypes/entities/vehicles.lua index b9d97c610..5d7615a38 100644 --- a/angelsexploration/prototypes/entities/vehicles.lua +++ b/angelsexploration/prototypes/entities/vehicles.lua @@ -49,7 +49,7 @@ data:extend( range = 20, sound = heavy_gunshot --[[{ { - filename="__base__/prototypes/entity/demo-sounds/heavy_gunshot.ogg",--make_heavy_gunshot_sounds() + filename="__base__/prototypes/entity/sounds/heavy_gunshot.ogg",--make_heavy_gunshot_sounds() volume=1.0, } },]] @@ -146,8 +146,9 @@ data:extend( percent = 30 } }, - collision_box = {{-1.5, -2.25}, {1.5, 2.25}}, - selection_box = {{-1.5, -2.25}, {1.5, 2.25}}, + collision_box = {{-1.55, -1.5}, {1.55, 3}}, + selection_box = {{-1.55, -1.5}, {1.55, 3}}, + drawing_box = {{-1.55, -3}, {1.55, 3}}, effectivity = 0.7, braking_power = "1000kW", burner = { diff --git a/angelsexploration/prototypes/exploration-override.lua b/angelsexploration/prototypes/exploration-override.lua index 9b695e863..4bbc5213d 100644 --- a/angelsexploration/prototypes/exploration-override.lua +++ b/angelsexploration/prototypes/exploration-override.lua @@ -30,7 +30,7 @@ if angelsmods.industries then } } ) - OV.add_prereq("turrets", "military") + OV.add_prereq("gun-turret", "military") if bobmods and bobmods.warfare then -- sniper turret diff --git a/angelsexploration/prototypes/technology/exploration-technology.lua b/angelsexploration/prototypes/technology/exploration-technology.lua index d87ad123c..ab7823af2 100644 --- a/angelsexploration/prototypes/technology/exploration-technology.lua +++ b/angelsexploration/prototypes/technology/exploration-technology.lua @@ -7,7 +7,7 @@ data:extend( icon = "__angelsexploration__/graphics/technology/heavy-tank-tech.png", icon_size = 128, prerequisites = { - "tanks" + "tank" --"angels-vequipment-1", }, effects = { @@ -136,7 +136,7 @@ data:extend( { type = "technology", name = "angels-heavy-uranium-ammo", - icon_size = 128, + icon_size = 256, icon = "__base__/graphics/technology/uranium-ammo.png", prerequisites = { "uranium-ammo", diff --git a/angelsexploration/settings-updates.lua b/angelsexploration/settings-updates.lua index 3a3967242..bf335686c 100644 --- a/angelsexploration/settings-updates.lua +++ b/angelsexploration/settings-updates.lua @@ -1,12 +1,3 @@ -local function hide_setting(setting_type, setting_name, setting_default) - if data.raw[setting_type] and data.raw[setting_type][setting_name] then - data.raw[setting_type][setting_name].hidden = true - if setting_default ~= nil then - data.raw[setting_type][setting_name].default_value = setting_default - end - end -end - if mods["angelsrefining"] then - hide_setting("bool-setting", "angels-enable-biters") + angelsmods.settings.hide_setting("bool-setting", "angels-enable-biters") end diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index 0d8e77bb4..95215a223 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -1,4 +1,53 @@ --------------------------------------------------------------------------------------------------- +Version: 0.4.12 +Date: ?? + Changes: + - Changed and expanded locale strings and text descriptions (489) + - Regular mode: + - Ordered vehicle belt immunity equipment (477) + - Integrated bobs plutonium nucleosynthesis (486) + - Unlock red and green wires with the (previously empty) electronics technology + - Component mode: + - Partially integrated bobs locomotives, cargo and fluid wagons (not artillery) a bit (478) + - Moved Bio-tile data to angelsbioprocessing + Bugfixes: + - Regular mode: + - Fixed the ordering of bobs vehicle roboport antenna (480) + - Fixed the vehicle repair roboport would unlock after the vehicle construction port (500) + - Component mode: + - Fixed that some science technologies would unlock block components + - Fixed boblogistics (inserter overhaul off) recipes to use angels components, not bobs (526) + - Fixed boblogistics (w/out bobplates) calling the wrong tin plate (453) + - Thanks to @lavafl0w on git for the partial fix which i built off + - Fixed battery 6 use and tech when not active under some conditions (453) + - Fixed lab not being craftable without science mode. + - Fixed that boblogistics' tier 1 robots did not use their appropriate intermediates (532) + - Fixed that not all bob train recipes did not require their previous tier s ingredient (537) + - Science mode: + - Fixed the technologies from the storage addon had the wrong data core + - Fixed the base game lab was visible in the bonus UI (505) + - Fixed science tiers on steam engines and boilers of bobs power (519) + - Fixed science tiers on heat pipes and heat sources of bobs power (519) + - Fixed science tiers on fluid burning generators of bobs power (502) + - Fixed the selection and collision box of the main lab did not align (539) + - Fixed that speed, productivity, effectivity, and agriculture module 3 couldnt be researched due to no lab taking all required science packs. removed Yellow science analyzer from required packs. +--------------------------------------------------------------------------------------------------- +Version: 0.4.11 +Date: 11.01.2021 + Bugfixes: + - Fixed crash related to ghosting tech unlocks not conforming to standards (516) +--------------------------------------------------------------------------------------------------- +Version: 0.4.10 +Date: 26.11.2020 + Bugfixes: + - Fixed crash caused by missing crash site lab sprites +--------------------------------------------------------------------------------------------------- +Version: 0.4.9 +Date: 26.11.2020 + Changes: + - Updated for factorio version 1.1 + - Fixed technology icon sizes +--------------------------------------------------------------------------------------------------- Version: 0.4.8 Date: 16.11.2020 Bugfixes: diff --git a/angelsindustries/control.lua b/angelsindustries/control.lua index e67dace2e..6bbcea9af 100644 --- a/angelsindustries/control.lua +++ b/angelsindustries/control.lua @@ -2,36 +2,32 @@ global.crash_site_created = false global.is_lab_given = false local main_lab = { - [0] = "angels-main-lab-0", -- crash site, equivalent to next tier - [1] = "angels-main-lab-1", - [2] = "angels-main-lab-2", - [3] = "angels-main-lab-3", - [4] = "angels-main-lab-4", - [5] = "angels-main-lab-5", - [6] = "angels-main-lab-6", - [7] = "angels-main-lab-7" + [0] = 'angels-main-lab-0', -- crash site, equivalent to next tier + [1] = 'angels-main-lab-1', + [2] = 'angels-main-lab-2', + [3] = 'angels-main-lab-3', + [4] = 'angels-main-lab-4', + [5] = 'angels-main-lab-5', + [6] = 'angels-main-lab-6', + [7] = 'angels-main-lab-7' } local function remove_lab_from_inv(inventory) - if inventory then - local items = game.item_prototypes - for key, lab in pairs(main_lab) do - if items[lab] and inventory.get_item_count(lab) > 0 then - inventory.remove {name = lab} - global.is_lab_given = false - return true - end + if inventory then + local items = game.item_prototypes + for key, lab in pairs(main_lab) do + if items[lab] and inventory.get_item_count(lab) > 0 then + inventory.remove{name = lab} + global.is_lab_given = false + return true + end + end end - end end local function table_contains(table, value) - for key, val in pairs(table) do - if val == value then - return true - end - end - return false + for key, val in pairs(table) do if val == value then return true end end + return false end local function initialize_crash_site() @@ -39,20 +35,25 @@ local function initialize_crash_site() -- angels science mode local surface = game.surfaces["nauvis"] if surface and surface.valid then - local crash_site_entity = surface.find_entities_filtered{ + local crash_site_entity = + surface.find_entities_filtered { type = "container", name = "crash-site-spaceship", limit = 1 }[1] if crash_site_entity and crash_site_entity.valid then - local created_entity = surface.create_entity{ + local created_entity = + surface.create_entity { name = main_lab[0], - position = surface.find_non_colliding_position( - --[[name]]main_lab[0], - --[[center]]{crash_site_entity.position.x - 15, crash_site_entity.position.y}, - --[[radius]]15 + 15, - --[[precision]]0.5, - --[[force_to_tile_center]]true + position = surface.find_non_colliding_position --[[name]]( + main_lab[0] --[[center]], + { + crash_site_entity.position.x - 15, + crash_site_entity.position.y + } --[[radius]], + 15 + 15 --[[precision]], + 0.5 --[[force_to_tile_center]], + true ), force = "player", raise_build = false, -- I don't see why we should raise this? @@ -65,179 +66,373 @@ local function initialize_crash_site() -- create explosions for k = 1, 3 do local bbox = created_entity.bounding_box - local explosions = surface.create_entity{ + local explosions = + surface.create_entity { name = "crash-site-explosion-smoke", position = { - x = (bbox.left_top.x + bbox.right_bottom.x) / 2 + (bbox.right_bottom.x - bbox.left_top.x) * (math.random() - 0.5), - y = (bbox.left_top.y + bbox.right_bottom.y) / 2 + (bbox.right_bottom.y - bbox.left_top.y) * (math.random() - 0.5) + x = (bbox.left_top.x + bbox.right_bottom.x) / 2 + + (bbox.right_bottom.x - bbox.left_top.x) * (math.random() - 0.5), + y = (bbox.left_top.y + bbox.right_bottom.y) / 2 + + (bbox.right_bottom.y - bbox.left_top.y) * (math.random() - 0.5) } } - explosions.time_to_live = math.random(60 * 20, 60 * 30) - math.min((8 + (math.random() * 40)) * 100, 15 * 60) + explosions.time_to_live = + math.random(60 * 20, 60 * 30) - math.min((8 + (math.random() * 40)) * 100, 15 * 60) explosions.time_to_next_effect = math.random(30) end -- create fires for k = 1, 2 do local bbox = created_entity.bounding_box - surface.create_entity{ + surface.create_entity { name = "crash-site-fire-flame", position = { - x = (bbox.left_top.x + bbox.right_bottom.x) / 2 + (bbox.right_bottom.x - bbox.left_top.x) * (math.random() - 0.5), - y = (bbox.left_top.y + bbox.right_bottom.y) / 2 + (bbox.right_bottom.y - bbox.left_top.y) * (math.random() - 0.5) + x = (bbox.left_top.x + bbox.right_bottom.x) / 2 + + (bbox.right_bottom.x - bbox.left_top.x) * (math.random() - 0.5), + y = (bbox.left_top.y + bbox.right_bottom.y) / 2 + + (bbox.right_bottom.y - bbox.left_top.y) * (math.random() - 0.5) } } - local smoke = surface.create_entity{ + local smoke = + surface.create_entity { name = "crash-site-fire-smoke", position = { - x = (bbox.left_top.x + bbox.right_bottom.x) / 2 + (bbox.right_bottom.x - bbox.left_top.x) * (math.random() - 0.5), - y = (bbox.left_top.y + bbox.right_bottom.y) / 2 + (bbox.right_bottom.y - bbox.left_top.y) * (math.random() - 0.5) + x = (bbox.left_top.x + bbox.right_bottom.x) / 2 + + (bbox.right_bottom.x - bbox.left_top.x) * (math.random() - 0.5), + y = (bbox.left_top.y + bbox.right_bottom.y) / 2 + + (bbox.right_bottom.y - bbox.left_top.y) * (math.random() - 0.5) } } - smoke.time_to_live = math.random(60 * 20, 60 * 30) - math.min((8 + (math.random() * 40)) * 100, 15 * 60) + smoke.time_to_live = + math.random(60 * 20, 60 * 30) - math.min((8 + (math.random() * 40)) * 100, 15 * 60) smoke.time_to_next_effect = math.random(30) end - end - end end - end - global.crash_site_created = true + global.crash_site_created = true end -script.on_event(defines.events.on_player_created, function(event) - if not global.crash_site_created then - initialize_crash_site() +script.on_event( + defines.events.on_player_created, + function(event) + if not global.crash_site_created then + initialize_crash_site() + end end -end) +) -script.on_event(defines.events.on_player_respawned, function(event) - local player = game.players[event.player_index] +script.on_event( + defines.events.on_player_respawned, + function(event) + local player = game.players[event.player_index] - if not global.is_lab_given and game.entity_prototypes[main_lab[1]] then - if player and player.valid then - global.is_lab_given = player.insert {name = main_lab[0], count = 1} > 0 + if not global.is_lab_given and game.entity_prototypes[main_lab[1]] then + if player and player.valid then + global.is_lab_given = player.insert {name = main_lab[0], count = 1} > 0 + end end - end - local force = player and player.force - if force then - local available = force.technologies["angels-hidden-ghosting"] and force.technologies["angels-hidden-ghosting"].researched or false - player.set_shortcut_available("toggle-ghosting", available) - if available then - player.set_shortcut_toggled("toggle-ghosting", force.ghost_time_to_live == 0) + local force = player and player.force + if force then + local available = + force.technologies["angels-hidden-ghosting"] and + force.technologies["angels-hidden-ghosting"].researched or + false + player.set_shortcut_available("toggle-ghosting", available) + if available then + player.set_shortcut_toggled("toggle-ghosting", force.ghost_time_to_live == 0) + end end end -end) - -script.on_event(defines.events.on_entity_died, function(event) - if game.entity_prototypes[main_lab[1]] then - local etype = event.entity.type - if table_contains(main_lab, event.entity.name) then - global.is_lab_given = false - elseif etype == "container" or etype == "logistic-container" then - remove_lab_from_inv(event.entity.get_inventory(defines.inventory.chest)) - elseif etype == "construction-robot" or etype == "logistic-robot" then - remove_lab_from_inv(event.entity.get_inventory(defines.inventory.robot_cargo)) +) + +script.on_event( + defines.events.on_entity_died, + function(event) + if game.entity_prototypes[main_lab[1]] then + local etype = event.entity.type + if table_contains(main_lab, event.entity.name) then + global.is_lab_given = false + elseif etype == "container" or etype == "logistic-container" then + remove_lab_from_inv(event.entity.get_inventory(defines.inventory.chest)) + elseif etype == "construction-robot" or etype == "logistic-robot" then + remove_lab_from_inv(event.entity.get_inventory(defines.inventory.robot_cargo)) + end end end -end) +) -script.on_event(defines.events.on_pre_player_died, function(event) - if game.entity_prototypes[main_lab[1]] then - remove_lab_from_inv(game.players[event.player_index].get_main_inventory()) +script.on_event( + defines.events.on_pre_player_died, + function(event) + if game.entity_prototypes[main_lab[1]] then + remove_lab_from_inv(game.players[event.player_index].get_main_inventory()) + end end -end) +) ---------------- --- GHOSTING --- ---------------- -local function unlock(force, shortcut) - for _, p in pairs(force.players) do - p.set_shortcut_available(shortcut, true) - end -end -script.on_event(defines.events.on_research_finished, function(event) - local research = event.research - if research.name == "angels-construction-robots" then - local unlocks = { - "undo", - "copy", - "cut", - "paste", - "import-string", - "give-blueprint", - "give-blueprint-book", - "give-deconstruction-planner", - "give-upgrade-planner" +script.on_event( + defines.events.on_research_finished, + function(event) + local research = event.research + -- moved this first module to data stage by changing unlock tech to angels-hidden-ghosting + --[[if research.name == "angels-construction-robots" then +local unlocks = { +"undo", +"copy", +"cut", +"paste", +"import-string", +"give-blueprint", +"give-blueprint-book", +"give-deconstruction-planner", +"give-upgrade-planner" +} +for _, shortcut in pairs(unlocks) do +unlock(event.research.force, shortcut) +end +end]] + local ghosting = { + ["angels-ghosting-construction-robots"] = true, + ["angels-ghosting-angels-construction-robots"] = true } - for _, shortcut in pairs(unlocks) do - unlock(event.research.force, shortcut) + if ghosting[research.name] then + research.force.technologies["angels-hidden-ghosting"].researched = true + local ghosting = { + ["angels-ghosting-construction-robots"] = true, + ["angels-ghosting-angels-construction-robots"] = true + } + if ghosting[research.name] then + research.force.technologies["angels-hidden-ghosting"].researched = true + for _, fplayer in pairs(research.force.players) do + fplayer.set_shortcut_available("toggle-ghosting", true) + fplayer.set_shortcut_toggled("toggle-ghosting", true) + end + ghosting[research.name] = nil + for tech in pairs(ghosting) do + if research.force.technologies[tech] then + if not research.force.technologies[tech].researched then + research.force.technologies[tech].researched = true + research.force.technologies[tech].enabled = false + end + end + end + else -- not a ghosting tech (but could be the final prerequisite in order to be researchable) + -- this makes sure only 1 will be available for research, the others will be disabled + local already_available = false + for tech, _ in pairs(ghosting) do + if + research.force.technologies[tech] and (not research.force.technologies[tech].researched) + then + local available = true + for _, prereq in pairs(research.force.technologies[tech].prerequisites or {}) do + if not prereq.researched then + available = false + end + end + if available then -- shows up as researchable + if already_available then + research.force.technologies[tech].enabled = false + else + already_available = true + end + end + end + end + end end end +) - local ghosting = { - ["angels-ghosting-construction-robots"] = true, - ["angels-ghosting-angels-construction-robots"] = true - } - if ghosting[research.name] then - research.force.technologies["angels-hidden-ghosting"].researched = true - - for _, fplayer in pairs(research.force.players) do - fplayer.set_shortcut_available("toggle-ghosting", true) - fplayer.set_shortcut_toggled("toggle-ghosting", true) +-- toggle ghosting +script.on_event( + {defines.events.on_lua_shortcut, "toggle-ghosting"}, + function(event) + if event.prototype_name and event.prototype_name ~= "toggle-ghosting" then + return end + local input = event.prototype_name or event.input_name + local player = game.players[event.player_index] + if player and player.valid then + local force = player.force + local toggled = force.ghost_time_to_live == 0 + force.ghost_time_to_live = toggled and 60 * 60 * 60 * 24 * 7 or 0 - ghosting[research.name] = nil - for tech in pairs(ghosting) do - if research.force.technologies[tech] then - if not research.force.technologies[tech].researched then - research.force.technologies[tech].researched = true - research.force.technologies[tech].enabled = false - end + for _, fplayer in pairs(force.players) do + fplayer.set_shortcut_toggled(input, toggled) end end + end +) - else -- not a ghosting tech (but could be the final prerequisite in order to be researchable) - -- this makes sure only 1 will be available for research, the others will be disabled - local already_available = false - for tech,_ in pairs(ghosting) do - if research.force.technologies[tech] and (not research.force.technologies[tech].researched) then +-- Vehicle burner equipment - local available = true - for _,prereq in pairs(research.force.technologies[tech].prerequisites or {}) do - if not prereq.researched then - available = false - end - end +script.on_init( + function(event) + global.vehicle_burners = {} + global.current_car = {} + end +) + +script.on_configuration_changed( + function(event) + if global.vehicle_burners == nil then + global.vehicle_burners = {} + end + if global.current_car == nil then + global.current_car = {} + end + end +) + +script.on_event( + defines.events.on_gui_opened, + function(event) + if + event.gui_type == defines.gui_type.entity and event.entity ~= nil and + event.entity.type == "car" + then + global.current_car = event.entity + end + end +) - if available then -- shows up as researchable - if already_available then - --research.force.technologies[tech].researched = true - research.force.technologies[tech].enabled = false +script.on_event( + defines.events.on_gui_closed, + function(event) + if + event.gui_type == defines.gui_type.entity and event.entity.type == "car" and + global.current_car == event.entity + then + global.current_car = {} + end + end +) + +script.on_event( + defines.events.on_player_placed_equipment, + function(event) + if event.equipment.name == "angels-burner-generator-vequip" and next(global.current_car) ~= nil then + global.vehicle_burners[global.current_car.unit_number] = { + vehicle = global.current_car, + burner = event.equipment, + grid = event.grid + } + end + end +) + +script.on_event( + defines.events.on_player_removed_equipment, + function(event) + if event.equipment == "angels-burner-generator-vequip" and next(global.current_car) ~= nil then + global.vehicle_burners[global.current_car.unit_number] = nil + end + end +) + +script.on_nth_tick( + 60, + function() + if next(global.vehicle_burners) ~= nil then + for v, vehicle in pairs(global.vehicle_burners) do + local inv = vehicle.burner.burner.inventory.get_item_count() + if inv < 3 then + local car_inv = vehicle.vehicle.get_inventory(defines.inventory.car_trunk) + local car_content = car_inv.get_contents() + local burner = vehicle.burner.burner + if burner.currently_burning ~= nil then + if car_content[burner.currently_burning.name] ~= nil then + local car = vehicle.vehicle.get_inventory(defines.inventory.car_trunk) + local amount = burner.inventory.get_insertable_count(burner.currently_burning.name) + local removed = + car.remove( + { + name = burner.currently_burning.name, + count = amount + } + ) + burner.inventory.insert( + { + name = burner.currently_burning.name, + count = removed + } + ) + else + local highest_fuel + for i, item in pairs(car_content) do + if + game.item_prototypes[i] ~= nil and + burner.fuel_categories[game.item_prototypes[i].fuel_category] ~= nil and + game.item_prototypes[i].fuel_value ~= nil + then + if + highest_fuel ~= nil and i ~= highest_fuel and + game.item_prototypes[i].fuel_value > + game.item_prototypes[highest_fuel].fuel_value + then + highest_fuel = i + elseif highest_fuel == nil then + highest_fuel = i + end + end + end + if highest_fuel ~= nil then + local car = vehicle.vehicle.get_inventory(defines.inventory.car_trunk) + local amount = burner.inventory.get_insertable_count(highest_fuel) + local removed = car.remove({name = highest_fuel, count = amount}) + burner.inventory.insert({name = highest_fuel, count = removed}) + end + end else - already_available = true + local highest_fuel + for i, item in pairs(car_content) do + if + game.item_prototypes[i] ~= nil and + burner.fuel_categories[game.item_prototypes[i].fuel_category] ~= nil and + game.item_prototypes[i].fuel_value ~= nil + then + if + highest_fuel ~= nil and i ~= highest_fuel and + game.item_prototypes[i].fuel_value > + game.item_prototypes[highest_fuel].fuel_value + then + highest_fuel = i + elseif highest_fuel == nil then + highest_fuel = i + end + end + end + if highest_fuel ~= nil then + local car = vehicle.vehicle.get_inventory(defines.inventory.car_trunk) + local amount = burner.inventory.get_insertable_count(highest_fuel) + local removed = + car.remove( + { + name = highest_fuel, + count = amount + } + ) + burner.inventory.insert({name = highest_fuel, count = removed}) + end end end - end end end +) -end) - -script.on_event({defines.events.on_lua_shortcut, - "toggle-ghosting" }, function(event) - if event.prototype_name and event.prototype_name ~= "toggle-ghosting" then return end - local input = event.prototype_name or event.input_name - local player = game.players[event.player_index] - if player and player.valid then - local force = player.force - local toggled = force.ghost_time_to_live == 0 - force.ghost_time_to_live = toggled and 60 * 60 * 60 * 24 * 7 or 0 - - for _, fplayer in pairs(force.players) do - fplayer.set_shortcut_toggled(input, toggled) +script.on_event( + defines.events.on_entity_died, + function(event) + if event.entity.type == "car" then + if global.vehicle_burners[event.entity.unit_number] ~= nil then + global.vehicle_burners[event.entity.unit_number] = nil + end end end -end) +) diff --git a/angelsindustries/data-final-fixes.lua b/angelsindustries/data-final-fixes.lua index f08360104..74d43a2af 100644 --- a/angelsindustries/data-final-fixes.lua +++ b/angelsindustries/data-final-fixes.lua @@ -90,8 +90,8 @@ if angelsmods.industries.components then --set ingredient return on building pickup if angelsmods.industries.return_ingredients then add_minable_results() - OV.execute() end + OV.execute() end --OTHER OVERRIDES diff --git a/angelsindustries/data.lua b/angelsindustries/data.lua index 175797f27..092846b72 100644 --- a/angelsindustries/data.lua +++ b/angelsindustries/data.lua @@ -1,7 +1,7 @@ --INITIALIZE angelsmods = angelsmods or {} angelsmods.industries = angelsmods.industries or {} -angelsmods.industries.number_tint = {r = 1, g = 0, b = 1, a = 0} +angelsmods.industries.number_tint = {r = 1, g = 0, b = 1, a = 1} angelsmods.industries.tech_exceptions = angelsmods.industries.tech_exceptions or {} --TRIGGER CHECKS @@ -101,7 +101,6 @@ require("prototypes.buildings.angels-logistics-robot-cargo") --ENTITIES require("prototypes.entities.crawler") require("prototypes.entities.equipment") -require("prototypes.entities.bio-tile") --RECIPES require("prototypes.recipes.equipment-recipes") require("prototypes.recipes.logistics-entity") diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-broken-shadow.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-broken-shadow.png new file mode 100644 index 000000000..475dc3f3b Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-broken-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-broken.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-broken.png new file mode 100644 index 000000000..b215c8e83 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-broken.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-ground.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-ground.png new file mode 100644 index 000000000..753b8e022 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-repaired-light.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-repaired-light.png new file mode 100644 index 000000000..40b3c3a74 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-repaired-light.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-repaired-shadow.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-repaired-shadow.png new file mode 100644 index 000000000..edd225db4 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-repaired-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-repaired.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-repaired.png new file mode 100644 index 000000000..bd50b447e Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-1-repaired.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-broken-shadow.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-broken-shadow.png new file mode 100644 index 000000000..dd1733238 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-broken-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-broken.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-broken.png new file mode 100644 index 000000000..bf540afb0 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-broken.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-ground.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-ground.png new file mode 100644 index 000000000..38c876026 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-repaired-light.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-repaired-light.png new file mode 100644 index 000000000..37617b84a Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-repaired-light.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-repaired-shadow.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-repaired-shadow.png new file mode 100644 index 000000000..9dc96498d Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-repaired-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-repaired.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-repaired.png new file mode 100644 index 000000000..d0bd84310 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/crash-site-assembling-machine-2-repaired.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-broken-shadow.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-broken-shadow.png new file mode 100644 index 000000000..3d4ed16a9 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-broken-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-broken.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-broken.png new file mode 100644 index 000000000..d6ead677f Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-broken.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-ground.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-ground.png new file mode 100644 index 000000000..ae69e5e97 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-repaired-light.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-repaired-light.png new file mode 100644 index 000000000..085050f3a Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-repaired-light.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-repaired-shadow.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-repaired-shadow.png new file mode 100644 index 000000000..3f2c1e8e0 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-repaired-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-repaired.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-repaired.png new file mode 100644 index 000000000..6c7f2c190 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-1-repaired.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-broken-shadow.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-broken-shadow.png new file mode 100644 index 000000000..a6d80ecf5 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-broken-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-broken.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-broken.png new file mode 100644 index 000000000..0010758cb Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-broken.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-ground.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-ground.png new file mode 100644 index 000000000..3f6832a3d Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-repaired-light.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-repaired-light.png new file mode 100644 index 000000000..d0160b334 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-repaired-light.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-repaired-shadow.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-repaired-shadow.png new file mode 100644 index 000000000..f1ebfe671 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-repaired-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-repaired.png b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-repaired.png new file mode 100644 index 000000000..922b6594c Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-assembling-machine/hr-crash-site-assembling-machine-2-repaired.png differ diff --git a/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-1-ground.png b/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-1-ground.png new file mode 100644 index 000000000..ee17ed2b6 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-1-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-1-shadow.png b/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-1-shadow.png new file mode 100644 index 000000000..590b27343 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-1-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-1.png b/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-1.png new file mode 100644 index 000000000..68ded4edf Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-1.png differ diff --git a/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-2-ground.png b/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-2-ground.png new file mode 100644 index 000000000..9eb64bc51 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-2-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-2-shadow.png b/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-2-shadow.png new file mode 100644 index 000000000..5ef4249de Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-2-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-2.png b/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-2.png new file mode 100644 index 000000000..8646bbf9f Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-chests/crash-site-chest-2.png differ diff --git a/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-1-ground.png b/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-1-ground.png new file mode 100644 index 000000000..81f4ab3e0 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-1-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-1-shadow.png b/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-1-shadow.png new file mode 100644 index 000000000..bfdbc7452 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-1-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-1.png b/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-1.png new file mode 100644 index 000000000..7d5b339c9 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-1.png differ diff --git a/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-2-ground.png b/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-2-ground.png new file mode 100644 index 000000000..2e332e61d Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-2-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-2-shadow.png b/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-2-shadow.png new file mode 100644 index 000000000..c2b6e9497 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-2-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-2.png b/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-2.png new file mode 100644 index 000000000..e98f6693a Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-chests/hr-crash-site-chest-2.png differ diff --git a/angelsindustries/graphics/entity/crash-site-generator/crash-site-electric-pole.png b/angelsindustries/graphics/entity/crash-site-generator/crash-site-electric-pole.png new file mode 100644 index 000000000..7ed3aebcf Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-generator/crash-site-electric-pole.png differ diff --git a/angelsindustries/graphics/entity/crash-site-generator/crash-site-generator-beams.png b/angelsindustries/graphics/entity/crash-site-generator/crash-site-generator-beams.png new file mode 100644 index 000000000..abf14eada Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-generator/crash-site-generator-beams.png differ diff --git a/angelsindustries/graphics/entity/crash-site-generator/crash-site-generator-ground.png b/angelsindustries/graphics/entity/crash-site-generator/crash-site-generator-ground.png new file mode 100644 index 000000000..6c567febf Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-generator/crash-site-generator-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-generator/crash-site-generator-shadow.png b/angelsindustries/graphics/entity/crash-site-generator/crash-site-generator-shadow.png new file mode 100644 index 000000000..d59a37632 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-generator/crash-site-generator-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-generator/crash-site-generator.png b/angelsindustries/graphics/entity/crash-site-generator/crash-site-generator.png new file mode 100644 index 000000000..8daee2693 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-generator/crash-site-generator.png differ diff --git a/angelsindustries/graphics/entity/crash-site-generator/hr-crash-site-generator-beams.png b/angelsindustries/graphics/entity/crash-site-generator/hr-crash-site-generator-beams.png new file mode 100644 index 000000000..e6c78dde9 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-generator/hr-crash-site-generator-beams.png differ diff --git a/angelsindustries/graphics/entity/crash-site-generator/hr-crash-site-generator-ground.png b/angelsindustries/graphics/entity/crash-site-generator/hr-crash-site-generator-ground.png new file mode 100644 index 000000000..8b21719dd Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-generator/hr-crash-site-generator-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-generator/hr-crash-site-generator-shadow.png b/angelsindustries/graphics/entity/crash-site-generator/hr-crash-site-generator-shadow.png new file mode 100644 index 000000000..33c6552c4 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-generator/hr-crash-site-generator-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-generator/hr-crash-site-generator.png b/angelsindustries/graphics/entity/crash-site-generator/hr-crash-site-generator.png new file mode 100644 index 000000000..c0e6e35b8 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-generator/hr-crash-site-generator.png differ diff --git a/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-broken-shadow.png b/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-broken-shadow.png new file mode 100644 index 000000000..ebaf1b770 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-broken-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-broken.png b/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-broken.png new file mode 100644 index 000000000..fb6e6546b Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-broken.png differ diff --git a/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-ground.png b/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-ground.png new file mode 100644 index 000000000..6a55b2be4 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-repaired-beams.png b/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-repaired-beams.png new file mode 100644 index 000000000..cfa0eb2ea Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-repaired-beams.png differ diff --git a/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-repaired-shadow.png b/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-repaired-shadow.png new file mode 100644 index 000000000..0a1412a24 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-repaired-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-repaired.png b/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-repaired.png new file mode 100644 index 000000000..b8a127e6a Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-lab/crash-site-lab-repaired.png differ diff --git a/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-broken-shadow.png b/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-broken-shadow.png new file mode 100644 index 000000000..76f7cadf1 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-broken-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-broken.png b/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-broken.png new file mode 100644 index 000000000..06d551c4e Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-broken.png differ diff --git a/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-ground.png b/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-ground.png new file mode 100644 index 000000000..3bd4b7ff2 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired-beams.png b/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired-beams.png new file mode 100644 index 000000000..5e5d06b79 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired-beams.png differ diff --git a/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired-shadow.png b/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired-shadow.png new file mode 100644 index 000000000..3bfb681e2 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired.png b/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired.png new file mode 100644 index 000000000..f66ea5fef Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-ground.png new file mode 100644 index 000000000..1da534b6d Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-shadow.png new file mode 100644 index 000000000..2cca027c1 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-1-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-1-ground.png new file mode 100644 index 000000000..e0d287fb4 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-1-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-1-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-1-shadow.png new file mode 100644 index 000000000..843268696 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-1-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-1.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-1.png new file mode 100644 index 000000000..d17083f13 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-1.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-2-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-2-ground.png new file mode 100644 index 000000000..cf2a37f16 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-2-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-2-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-2-shadow.png new file mode 100644 index 000000000..0473001bd Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-2-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-2.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-2.png new file mode 100644 index 000000000..21f18e5aa Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-big-2.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-1-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-1-ground.png new file mode 100644 index 000000000..96d31c2ba Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-1-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-1-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-1-shadow.png new file mode 100644 index 000000000..1d16077fa Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-1-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-1.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-1.png new file mode 100644 index 000000000..35a5f7d22 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-1.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-2-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-2-ground.png new file mode 100644 index 000000000..f845db4e7 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-2-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-2-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-2-shadow.png new file mode 100644 index 000000000..4476a745b Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-2-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-2.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-2.png new file mode 100644 index 000000000..f11fe4be9 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-2.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-3-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-3-ground.png new file mode 100644 index 000000000..8d6a12dcd Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-3-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-3-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-3-shadow.png new file mode 100644 index 000000000..68fff68c3 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-3-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-3.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-3.png new file mode 100644 index 000000000..59f5cdd5a Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-medium-3.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-1-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-1-ground.png new file mode 100644 index 000000000..ccbbe295d Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-1-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-1-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-1-shadow.png new file mode 100644 index 000000000..27efe28fa Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-1-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-1.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-1.png new file mode 100644 index 000000000..79eb3dbc8 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-1.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-2-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-2-ground.png new file mode 100644 index 000000000..973f829c1 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-2-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-2-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-2-shadow.png new file mode 100644 index 000000000..2f3fb4972 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-2-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-2.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-2.png new file mode 100644 index 000000000..12b400f85 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-2.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-3-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-3-ground.png new file mode 100644 index 000000000..e44bec588 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-3-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-3-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-3-shadow.png new file mode 100644 index 000000000..2302d32ee Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-3-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-3.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-3.png new file mode 100644 index 000000000..87f4a860b Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-3.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-4-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-4-ground.png new file mode 100644 index 000000000..6f4e9af19 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-4-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-4-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-4-shadow.png new file mode 100644 index 000000000..bc8a896d9 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-4-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-4.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-4.png new file mode 100644 index 000000000..28c3badaa Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-4.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-5-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-5-ground.png new file mode 100644 index 000000000..d3097d139 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-5-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-5-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-5-shadow.png new file mode 100644 index 000000000..59a84c995 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-5-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-5.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-5.png new file mode 100644 index 000000000..f8f190115 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-5.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-6-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-6-ground.png new file mode 100644 index 000000000..d4e1f5804 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-6-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-6-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-6-shadow.png new file mode 100644 index 000000000..73f13b076 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-6-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-6.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-6.png new file mode 100644 index 000000000..db4fada7b Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship-wreck-small-6.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship.png b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship.png new file mode 100644 index 000000000..0d58eeb16 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/hr-spaceship.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-ground.png new file mode 100644 index 000000000..2235e5848 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-shadow.png new file mode 100644 index 000000000..f5c83980b Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-1-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-1-ground.png new file mode 100644 index 000000000..e76794bb2 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-1-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-1-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-1-shadow.png new file mode 100644 index 000000000..cb967c029 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-1-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-1.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-1.png new file mode 100644 index 000000000..660d00db9 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-1.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-2-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-2-ground.png new file mode 100644 index 000000000..a644784c8 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-2-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-2-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-2-shadow.png new file mode 100644 index 000000000..a242ece84 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-2-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-2.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-2.png new file mode 100644 index 000000000..73b52931e Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-big-2.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-1-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-1-ground.png new file mode 100644 index 000000000..3109898cd Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-1-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-1-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-1-shadow.png new file mode 100644 index 000000000..4e88d963d Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-1-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-1.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-1.png new file mode 100644 index 000000000..792d98740 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-1.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-2-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-2-ground.png new file mode 100644 index 000000000..dcaeab8d4 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-2-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-2-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-2-shadow.png new file mode 100644 index 000000000..f6e51ca7f Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-2-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-2.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-2.png new file mode 100644 index 000000000..a657aed68 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-2.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-3-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-3-ground.png new file mode 100644 index 000000000..fbb4b53eb Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-3-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-3-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-3-shadow.png new file mode 100644 index 000000000..ec8d9eee1 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-3-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-3.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-3.png new file mode 100644 index 000000000..951f29f78 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-medium-3.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-1-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-1-ground.png new file mode 100644 index 000000000..fa9db90a1 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-1-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-1-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-1-shadow.png new file mode 100644 index 000000000..b0c1407ec Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-1-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-1.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-1.png new file mode 100644 index 000000000..7ba27124e Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-1.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-2-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-2-ground.png new file mode 100644 index 000000000..d32079168 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-2-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-2-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-2-shadow.png new file mode 100644 index 000000000..c3fc39468 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-2-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-2.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-2.png new file mode 100644 index 000000000..8107ba189 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-2.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-3-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-3-ground.png new file mode 100644 index 000000000..462e1d023 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-3-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-3-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-3-shadow.png new file mode 100644 index 000000000..5868d045a Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-3-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-3.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-3.png new file mode 100644 index 000000000..4c0a958af Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-3.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-4-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-4-ground.png new file mode 100644 index 000000000..eaeea75cf Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-4-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-4-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-4-shadow.png new file mode 100644 index 000000000..f736c4064 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-4-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-4.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-4.png new file mode 100644 index 000000000..c0fe8e12b Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-4.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-5-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-5-ground.png new file mode 100644 index 000000000..5c71a69cc Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-5-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-5-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-5-shadow.png new file mode 100644 index 000000000..65a23bdd8 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-5-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-5.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-5.png new file mode 100644 index 000000000..0087c11db Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-5.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-6-ground.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-6-ground.png new file mode 100644 index 000000000..dc580d133 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-6-ground.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-6-shadow.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-6-shadow.png new file mode 100644 index 000000000..fbc428df8 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-6-shadow.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-6.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-6.png new file mode 100644 index 000000000..731a13b49 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship-wreck-small-6.png differ diff --git a/angelsindustries/graphics/entity/crash-site-spaceship/spaceship.png b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship.png new file mode 100644 index 000000000..e9f2314e2 Binary files /dev/null and b/angelsindustries/graphics/entity/crash-site-spaceship/spaceship.png differ diff --git a/angelsindustries/graphics/icons/battery_component_frame.png b/angelsindustries/graphics/icons/battery_component_frame.png index d5c3d36bb..56912ad8a 100644 Binary files a/angelsindustries/graphics/icons/battery_component_frame.png and b/angelsindustries/graphics/icons/battery_component_frame.png differ diff --git a/angelsindustries/graphics/icons/crash-site-assembling-machine-1-broken.png b/angelsindustries/graphics/icons/crash-site-assembling-machine-1-broken.png new file mode 100644 index 000000000..261363e54 Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-assembling-machine-1-broken.png differ diff --git a/angelsindustries/graphics/icons/crash-site-assembling-machine-1-repaired.png b/angelsindustries/graphics/icons/crash-site-assembling-machine-1-repaired.png new file mode 100644 index 000000000..c59d0a9e6 Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-assembling-machine-1-repaired.png differ diff --git a/angelsindustries/graphics/icons/crash-site-assembling-machine-2-broken.png b/angelsindustries/graphics/icons/crash-site-assembling-machine-2-broken.png new file mode 100644 index 000000000..9e5dbad60 Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-assembling-machine-2-broken.png differ diff --git a/angelsindustries/graphics/icons/crash-site-assembling-machine-2-repaired.png b/angelsindustries/graphics/icons/crash-site-assembling-machine-2-repaired.png new file mode 100644 index 000000000..043f722cf Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-assembling-machine-2-repaired.png differ diff --git a/angelsindustries/graphics/icons/crash-site-chest.png b/angelsindustries/graphics/icons/crash-site-chest.png new file mode 100644 index 000000000..9b8d6c129 Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-chest.png differ diff --git a/angelsindustries/graphics/icons/crash-site-electric-pole.png b/angelsindustries/graphics/icons/crash-site-electric-pole.png new file mode 100644 index 000000000..fffe675a3 Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-electric-pole.png differ diff --git a/angelsindustries/graphics/icons/crash-site-generator.png b/angelsindustries/graphics/icons/crash-site-generator.png new file mode 100644 index 000000000..20a063577 Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-generator.png differ diff --git a/angelsindustries/graphics/icons/crash-site-lab-broken.png b/angelsindustries/graphics/icons/crash-site-lab-broken.png new file mode 100644 index 000000000..70ea08b7b Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-lab-broken.png differ diff --git a/angelsindustries/graphics/icons/crash-site-lab-repaired.png b/angelsindustries/graphics/icons/crash-site-lab-repaired.png new file mode 100644 index 000000000..93891f0aa Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-lab-repaired.png differ diff --git a/angelsindustries/graphics/icons/crash-site-spaceship-wreck-big-1.png b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-big-1.png new file mode 100644 index 000000000..7ec9f03a8 Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-big-1.png differ diff --git a/angelsindustries/graphics/icons/crash-site-spaceship-wreck-big-2.png b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-big-2.png new file mode 100644 index 000000000..148c41c88 Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-big-2.png differ diff --git a/angelsindustries/graphics/icons/crash-site-spaceship-wreck-medium-1.png b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-medium-1.png new file mode 100644 index 000000000..187874846 Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-medium-1.png differ diff --git a/angelsindustries/graphics/icons/crash-site-spaceship-wreck-medium-2.png b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-medium-2.png new file mode 100644 index 000000000..8d4090791 Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-medium-2.png differ diff --git a/angelsindustries/graphics/icons/crash-site-spaceship-wreck-medium-3.png b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-medium-3.png new file mode 100644 index 000000000..9bd655fb8 Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-medium-3.png differ diff --git a/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-1.png b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-1.png new file mode 100644 index 000000000..401fab617 Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-1.png differ diff --git a/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-2.png b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-2.png new file mode 100644 index 000000000..45e8c448f Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-2.png differ diff --git a/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-3.png b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-3.png new file mode 100644 index 000000000..26c4607d0 Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-3.png differ diff --git a/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-4.png b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-4.png new file mode 100644 index 000000000..ac5907fb6 Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-4.png differ diff --git a/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-5.png b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-5.png new file mode 100644 index 000000000..a58e21b97 Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-5.png differ diff --git a/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-6.png b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-6.png new file mode 100644 index 000000000..cfbb5012e Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-spaceship-wreck-small-6.png differ diff --git a/angelsindustries/graphics/icons/crash-site-spaceship.png b/angelsindustries/graphics/icons/crash-site-spaceship.png new file mode 100644 index 000000000..80afbee0b Binary files /dev/null and b/angelsindustries/graphics/icons/crash-site-spaceship.png differ diff --git a/angelsindustries/info.json b/angelsindustries/info.json index d821a9dbc..ce642b6df 100644 --- a/angelsindustries/info.json +++ b/angelsindustries/info.json @@ -1,25 +1,21 @@ { "name": "angelsindustries", - "version": "0.4.8", - "factorio_version": "1.0", + "version": "0.4.12", + "factorio_version": "1.1", "title": "Angel's Industries", "author": "Arch666Angel", "contact": "https://discord.gg/ff5p6KE", "homepage": "https://forums.factorio.com/viewforum.php?f=185", "description": "Adds industrial equipment as well as the tools you need to expand and grow your base. Adds extra components [BETA] and a tech [ALPHA] overhaul.", "dependencies": [ - "base >= 1.0.0", - - "angelsrefining >= 0.11.18", - "angelspetrochem >= 0.9.16", - "angelssmelting >= 0.6.13", - "angelsbioprocessing >= 0.7.16", - + "angelsrefining >= 0.11.20", + "angelspetrochem >= 0.9.18", + "angelssmelting >= 0.6.15", + "angelsbioprocessing >= 0.7.18", "(?) bobassembly >= 0.18.6", "(?) boblogistics >= 1.0.0", "(?) bobtech >= 0.18.3", "(?) bobrevamp >= 0.18.5", - "(?) aai-industry >= 0.4.12" ] } diff --git a/angelsindustries/locale/en/components.cfg b/angelsindustries/locale/en/components.cfg index 5cfd7b4b8..4925b765b 100644 --- a/angelsindustries/locale/en/components.cfg +++ b/angelsindustries/locale/en/components.cfg @@ -7,6 +7,14 @@ angels-assembling-machine-small-3=Small assembling machine 3 angels-assembling-machine-big-3=Big assembling machine 3 angels-assembling-machine-0=Assembling machine 0 +[entity-description] +angels-assembling-machine-small-1=A faster, 2×2 assembling machine. +angels-assembling-machine-big-1=A slower, 4×4 assembling machine. +angels-assembling-machine-small-2=A faster, 2×2 assembling machine. +angels-assembling-machine-big-2=A slower, 4×4 assembling machine. +angels-assembling-machine-small-3=A faster, 2×2 assembling machine. +angels-assembling-machine-big-3=A slower, 4×4 assembling machine. + [item-name] circuit-grey-board=Grey board circuit-red-board=Red board @@ -253,17 +261,21 @@ angels-rocket-shield-array=Rocket defences ; compatibility techs angels-glass-melting=Basic glass smelting -[item-description] -angels-assembling-machine-small-1=A faster, 2×2 assembling machine. -angels-assembling-machine-big-1=A slower, 4×4 assembling machine. -angels-assembling-machine-small-2=A faster, 2×2 assembling machine. -angels-assembling-machine-big-2=A slower, 4×4 assembling machine. -angels-assembling-machine-small-3=A faster, 2×2 assembling machine. -angels-assembling-machine-big-3=A slower, 4×4 assembling machine. - [technology-description] -angels-rocket=It's about time we focused on our breathtaking exit off this forsaken planet... +angels-basic-blocks=Basic blocks for the construction of buildings. +angels-advanced-blocks=Advanced blocks for the construction of buildings. + +angels-components-mechanical=Mechanical components serve as moving parts for machines. +angels-components-construction=Construction components ensure stability of machines. +angels-components-weapons-basic=Basic components for the construction of weaponry. +angels-components-weapons-advanced=Advanced components for the construction of weaponry. +angels-components-cabling=Cabling components for the transfer of electricity and of signals. +angels-components-batteries=Containers filled with chemicals that can store and release electric energy. + +angels-rocket=It is about time we focused on our breathtaking exit off this forsaken planet... angels-rocket-hull=Research a lightweight, but durable hull design to push your rocket past max Q. angels-rocket-ion-thruster=Research that little push in the back required to lift you past the horizon. angels-rocket-fusion-reactor=A precious reactor, required to keep all the life supports going 24/7, so you can keep playing! -angels-rocket-shield-array=Just a safety measure... There are alien forces on this planet, why wouldn't there be any in deep space? +angels-rocket-shield-array=Just a safety measure... There are alien forces on this planet, why would there not be any in deep space? + +angels-glass-melting=First method of producing molten glass. diff --git a/angelsindustries/locale/en/logistic.cfg b/angelsindustries/locale/en/logistic.cfg index 73672780e..5e75fc029 100644 --- a/angelsindustries/locale/en/logistic.cfg +++ b/angelsindustries/locale/en/logistic.cfg @@ -26,7 +26,36 @@ angels-logistic-chest-buffer=Big buffer chest angels-crawler=Crawler construction vehicle -angels-lamp=Crawler light +angels-lamp=Crawler lamp + +[entity-description] +cargo-robot=A slow logistic robot that can carry a stack of items. +cargo-robot-2=A slow logistic robot that can carry a large stack of items. +;cargo-roboport=This item should be hidden. +cargo-hub=Early roboport with increased charging capabilities. +cargo-box=Early roboport with large storage capacity for robots, but limited charging capabilities. +angels-construction-robot=An early but slow construction robot. + +angels-relay-station=Extends the supply area of the logistic network and provides charging points for robots. +angels-relay-station-2=Extends the supply area of the logistic network and provides charging points for robots. +angels-relay-station-3=Extends the supply area of the logistic network and provides charging points for robots. Also provides minimal storage for robots. +angels-charging-station=Provides charging points for robots with considerable recharge power. +angels-zone-expander=Extends supply zone of the logistic network without requiring any electricity. +angels-zone-expander-2=Extends supply zone of the logistic network without requiring any electricity. +angels-zone-expander-3=Extends supply zone of the logistic network without requiring any electricity. +angels-construction-zone-expander=Extends the construction zone of the logistic network. +angels-construction-zone-expander-2=Extends the construction zone of the logistic network. +angels-construction-zone-expander-3=Extends the construction zone of the logistic network. Also provides minimal charging for robots. + +angels-logistic-chest-passive-provider=Makes its content available to the logistic network. +angels-logistic-chest-requester=Requests specified items from the logistic network. +angels-logistic-chest-active-provider=Sends its content to the logistic network. +angels-logistic-chest-storage=Long-term storage for the logistic network. +angels-logistic-chest-buffer=Requests specified items to be available for personal logistics and automated construction. + +angels-crawler=Slow vehicle with huge trunk storage. Can be equipped with a vehicle roboport for mobile construction works. + +angels-lamp=Lamp with "Crawler" aesthetics. [item-name] @@ -38,6 +67,14 @@ angels-construction-roboport-vequip=Vehicle construction roboport angels-heavy-energy-shield-vequip=Vehicle heavy shield generator angels-rocket-defense-equipment-vequip=Vehicle rocket defense +[equipment-description] +angels-burner-generator-vequip=Basic method to power vehicle equipment via burnable fuel. +angels-fusion-reactor-vequip=Advanced method to power vehicle equipment permanently. +angels-repair-roboport-vequip=Roboport optimized for repair of the vehicle itself, without interfering too much with nearby ghosts. +angels-construction-roboport-vequip=Roboport for mobile construction works from the vehicle trunk inventory. +angels-heavy-energy-shield-vequip=Protection for vehicles. +angels-rocket-defense-equipment-vequip=Automatic defense system for vehicles. + [recipe-category-name] [item-group-name] @@ -57,6 +94,10 @@ angels-ghosting-angels-construction-robots=Ghosted entities on destruction angels-hidden-ghosting=Ghosted entities on destruction [technology-description] +angels-construction-robots=Early but slow robots for construction works. +cargo-robots=Early but slow robots for logistic tasks. Can carry many items at once. +angels-crawler=Slow vehicle with huge trunk storage. Can be equipped with a vehicle roboport for mobile construction works. +angels-vequipment=Basic technology to provide power to vehicle equipment grids. angels-ghosting-angels-construction-robots=This technology unlocks a toggle to enable and disable the creation of ghosts when entities are destroyed by external forces. By default the ghosting is enabled after researching it. [mod-setting-name] diff --git a/angelsindustries/locale/en/nuclear-power.cfg b/angelsindustries/locale/en/nuclear-power.cfg index 18e9be7b0..b63be2f8c 100644 --- a/angelsindustries/locale/en/nuclear-power.cfg +++ b/angelsindustries/locale/en/nuclear-power.cfg @@ -48,6 +48,6 @@ angels-thorium-power=Thorium-plutonium-based power systems angels-fusion-power=Deuterium fusion-based power systems [technology-description] -angels-plutonium-power=All that is required to use all of that U-238. Convert it to plutonium-240 through breeder cycles. +angels-plutonium-power=All that is required to use up excess uranium-238. Convert it to plutonium-240 through breeder cycles. angels-thorium-power=All that is required to use thorium-based power cycles. If you have excess plutonium-240 or curium-245, you may as well get an energy boost. -angels-fusion-power=All that is needed to seed and maintain fusion power through the use of muons and deuterium. +angels-fusion-power=All that is required to seed and maintain fusion power through the use of muons and deuterium. diff --git a/angelsindustries/locale/en/science.cfg b/angelsindustries/locale/en/science.cfg index ea40eb94f..7f8a3b477 100644 --- a/angelsindustries/locale/en/science.cfg +++ b/angelsindustries/locale/en/science.cfg @@ -23,6 +23,19 @@ angels-war-lab-1=Warfare tech laboratory 1 angels-war-lab-2=Warfare tech laboratory 2 angels-war-lab-3=Warfare tech laboratory 3 +[entity-description] +angels-lab-inputs=[font=default-semibold][color=1,0.9,0.75]Inputs:[/color][/font] __1__ +angels-main-lab-crash-site=Contains all the knowledge you've gathered in the past. You should try to rebuild it to its former glory. +angels-main-lab=Performs key technology research. +angels-main-lab-warning=[img=utility/warning_icon] You only have one of these! Take good care of it! If you do lose it, kill yourself and you'll get a new one. +angels-basic-lab=Performs basic technology research, as well as technologies that do not fit in other categories. +angels-energy-lab=Performs energy technology research. +angels-enhance-lab=Performs enhancement technology research. +angels-exploration-lab=Performs exploration technology research. +angels-logistic-lab=Performs logistic technology research. +angels-processing-lab=Performs processing technology research. +angels-war-lab=Performs warfare technology research. + [item-name] angels-science-pack-grey=Grey science analyzer angels-science-pack-red=Red science analyzer @@ -55,6 +68,30 @@ science-force-analyzer=Force analyzer science-harmonics-analyzer=Harmonics analyzer science-gravitational-analyzer=Gravitational analyzer +[item-description] +angels-science-pack-grey=Used for grey-tier science. +angels-science-pack-red=Used for red-tier science. +angels-science-pack-green=Used for green-tier science. +angels-science-pack-orange=Used for orange-tier science. +angels-science-pack-blue=Used for blue-tier science. +angels-science-pack-yellow=Used for yellow-tier science. + +datacore-basic=Data for basic research. +datacore-exploration-1=Data for basic exploration research. +datacore-exploration-2=Data for advanced exploration research. +datacore-enhance-1=Data for basic enhancement research. +datacore-enhance-2=Data for advanced enhancement research. +datacore-energy-1=Data for basic energy research. +datacore-energy-2=Data for advanced energy research. +datacore-logistic-1=Data for basic logistic research. +datacore-logistic-2=Data for advanced logistic research. +datacore-processing-1=Data for basic processing research. +datacore-processing-2=Data for advanced processing research. +datacore-war-1=Data for basic warfare research. +datacore-war-2=Data for advanced warfare research. + +science-pack-remaining-amount-key=Remaining + [equipment-name] [recipe-name] @@ -67,11 +104,11 @@ angels-tech=Angel's Technology [item-subgroup-name] [technology-name] -tech-red-packs=Red science packs (automation) -tech-green-packs=Green science packs (key logistics) -tech-orange-packs=Orange science packs (petrochemicals) -tech-blue-packs=Blue science packs (advanced logistics) -tech-yellow-packs=Yellow science packs (mid-game) +tech-red-packs=Red science: automation +tech-green-packs=Green science: transport +tech-orange-packs=Orange science: petrochemistry +tech-blue-packs=Blue science: logistics +tech-yellow-packs=Yellow science: late-game tech-red-circuit=Red electronics tech-green-circuit=Green electronics @@ -95,39 +132,31 @@ tech-specialised-labs-advanced-processing=Advanced processing technology tech-specialised-labs-basic-war=Basic warfare technology tech-specialised-labs-advanced-war=Advanced warfare technology -[entity-description] -angels-lab-inputs=[font=default-semibold][color=1,0.9,0.75]Inputs:[/color][/font] __1__ -angels-main-lab-crash-site=Contains all the knowledge you've gathered in the past. You should try to rebuild it to it's former glory. -angels-main-lab=Used for key technology research. -angels-main-lab-warning=[img=utility/warning_icon] You only have one of these! Take good care of it! If you do lose it, kill yourself and you'll get a new one. -angels-basic-lab=Used for basic research, or research that do not fit in other categories. -angels-energy-lab=Used for energy research. -angels-enhance-lab=Used for enhancement research. -angels-exploration-lab=Used for exploration research. -angels-logistic-lab=Used for logistic research. -angels-processing-lab=Used for processing research. -angels-war-lab=Used for warfare research. +[technology-description] +tech-red-packs=Red-tier science with a focus on essential automation. +tech-green-packs=Green-tier science with a focus on essential transport. +tech-orange-packs=Orange-tier science with a focus on petrochemical processing. +tech-blue-packs=Blue-tier science with a focus on advanced logistics. +tech-yellow-packs=Yellow-tier science with a focus on late-game utilities. -[item-description] -angels-science-pack-grey=Used for grey-tier science. -angels-science-pack-red=Used for red-tier science. -angels-science-pack-green=Used for green tier science. -angels-science-pack-orange=Used for orange tier science. -angels-science-pack-blue=Used for blue tier science. -angels-science-pack-yellow=Used for yellow tier science. - -datacore-basic=Data for basic research. -datacore-exploration-1=Data for basic exploration research. -datacore-exploration-2=Data for advanced exploration research. -datacore-enhance-1=Data for basic enhancement research. -datacore-enhance-2=Data for advanced enhancement research. -datacore-energy-1=Data for basic energy research. -datacore-energy-2=Data for advanced energy research. -datacore-logistic-1=Data for basic logistic research. -datacore-logistic-2=Data for advanced logistic research. -datacore-processing-1=Data for basic processing research. -datacore-processing-2=Data for advanced processing research. -datacore-war-1=Data for basic warfare research. -datacore-war-2=Data for advanced warfare research. +tech-red-circuit=Red-tier electronics for processing of signals. +tech-green-circuit=Green-tier electronics for processing of signals. +tech-orange-circuit=Orange-tier electronics for processing of signals. +tech-blue-circuit=Blue-tier electronics for processing of signals. +tech-yellow-circuit=Yellow-tier electronics for processing of signals. -science-pack-remaining-amount-key=Remaining +tech-specialised-labs=Key technology for automated research. +tech-specialised-labs-basic=More efficient research practices for basic technology research. +tech-specialised-labs-advanced=Most advanced research parctices that make use of space science. +tech-specialised-labs-basic-exploration=Key technology for exploration research. +tech-specialised-labs-advanced-exploration=Advanced technology for exploration research. +tech-specialised-labs-basic-energy=Key technology for energy research. +tech-specialised-labs-advanced-energy=Advanced technology for energy research. +tech-specialised-labs-basic-enhance=Key technology for enhancement research. +tech-specialised-labs-advanced-enhance=Advanced technology for enhancement research. +tech-specialised-labs-basic-logistic=Key technology for logistic research. +tech-specialised-labs-advanced-logistic=Advanced technology for logistic research. +tech-specialised-labs-basic-processing=Key technology for processing research. +tech-specialised-labs-advanced-processing=Advanced technology for processing research. +tech-specialised-labs-basic-war=Key technology for warfare research. +tech-specialised-labs-advanced-war=Advanced technology for warfare research. diff --git a/angelsindustries/prototypes/angels-industries-category.lua b/angelsindustries/prototypes/angels-industries-category.lua index ba292399e..954637901 100644 --- a/angelsindustries/prototypes/angels-industries-category.lua +++ b/angelsindustries/prototypes/angels-industries-category.lua @@ -50,13 +50,14 @@ data:extend( icons = { { icon = "__base__/graphics/item-group/intermediate-products.png", - icon_size = 64 + icon_size = 128, + icon_mipmaps = 2 }, { icon = "__angelsrefining__/graphics/icons/void.png", icon_size = 32, - scale = 64 / 32 * 0.35, - shift = {20, -20} + scale = 128 / 32 * 0.35, + shift = {40, -40} } } }, @@ -519,11 +520,13 @@ data:extend( group = "angels-logistics", order = "cb[bots]" }, + -- order "d-a[armor]-aa" reserved for bobs characters + -- order "d-a[armor]-ab" reserved for bobs characters { type = "item-subgroup", name = "angels-personal-equipment-armor", group = "angels-logistics", - order = "d-a[armor]" + order = "d-a[armor]-b" }, { type = "item-subgroup", @@ -595,15 +598,22 @@ data:extend( type = "item-subgroup", name = "angels-vehicle-train-other", group = "angels-vehicles", - order = "c" + order = "ca" }, + { + type = "item-subgroup", + name = "angels-vehicle-spidertron", + group = "angels-vehicles", + order = "cba" + }, + -- order cbb reserved for bobwarfare (see override) + -- order da reserved for CAB (see addon cab-category) { type = "item-subgroup", name = "angels-vehicle-equipment", group = "angels-vehicles", order = "db" }, - -- order da reserved for CAB (see addon cab-category) -- order dc reserved for bobvehicleequipment (see override) --------------------------------------------------------------------------- -- ANGELS WARFARE --------------------------------------------------------- diff --git a/angelsindustries/prototypes/angels-industries-override.lua b/angelsindustries/prototypes/angels-industries-override.lua index f63c72775..442963fed 100644 --- a/angelsindustries/prototypes/angels-industries-override.lua +++ b/angelsindustries/prototypes/angels-industries-override.lua @@ -12,46 +12,20 @@ end --UPDATE RECIPES FOR ENTITIES --OV.execute() require("prototypes.overrides.components-entity-update") + + --UPDATE NON-BLOCK COMPONENTS require("prototypes.overrides.components-recipe-update") require("prototypes.overrides.components-productivity-update") require("prototypes.overrides.components-block-update") OV.execute() +--UPDATE NUCLEAR OVERHAUL require("prototypes.overrides.overhaul-nuclear-power") ---MODIFY ASSEMBLING MACHINES ---data.raw["item"]["assembling-machine-1"].subgroup = "angels-assemblers-medium" ---data.raw["item"]["assembling-machine-1"].order = "a" ---data.raw["item"]["assembling-machine-2"].subgroup = "angels-assemblers-medium" ---data.raw["item"]["assembling-machine-2"].order = "a" ---data.raw["item"]["assembling-machine-3"].subgroup = "angels-assemblers-medium" ---data.raw["item"]["assembling-machine-3"].order = "a" ---OV.add_unlock("automation", "angels-assembling-machine-small-1") ---OV.add_unlock("automation", "angels-assembling-machine-big-1") ---OV.add_unlock("automation-2", "angels-assembling-machine-small-2") ---OV.add_unlock("automation-2", "angels-assembling-machine-big-2") ---OV.add_unlock("automation-3", "angels-assembling-machine-small-3") ---OV.add_unlock("automation-3", "angels-assembling-machine-big-3") ---data.raw["assembling-machine"]["assembling-machine-1"].ingredient_count = 2 ---data.raw["assembling-machine"]["assembling-machine-2"].ingredient_count = 3 ---data.raw["assembling-machine"]["assembling-machine-3"].ingredient_count = 4 ---data.raw["item"]["assembling-machine-1"].subgroup = "angels-assemblers-medium" ---data.raw["item"]["assembling-machine-2"].subgroup = "angels-assemblers-medium" ---data.raw["item"]["assembling-machine-3"].subgroup = "angels-assemblers-medium" - -if angelsmods.industries.tech then - data.raw["item"]["satellite"].rocket_launch_product = { - type = "item", - name = "science-gravitational-analyzer", - amount = 1000 - } - data.raw.technology["space-science-pack"].icon = "__angelsindustries__/graphics/technology/tech-white.png" - data.raw.technology["space-science-pack"].icon_size = 128 - OV.add_unlock("space-science-pack", "angels-science-pack-white") - OV.add_unlock("space-science-pack", "angels-main-lab-7") - OV.global_replace_item("lab", "angels-basic-lab-2") -end - +--UPDATE TECHNOLOGY require("prototypes.overrides.tech-mod-update") +OV.execute() + require("prototypes.overrides.tech-productivity-update") +OV.execute() diff --git a/angelsindustries/prototypes/angels-logistics-ghosting.lua b/angelsindustries/prototypes/angels-logistics-ghosting.lua index c0915ec6d..6751b9f18 100644 --- a/angelsindustries/prototypes/angels-logistics-ghosting.lua +++ b/angelsindustries/prototypes/angels-logistics-ghosting.lua @@ -4,7 +4,7 @@ data:extend( type = "custom-input", name = "toggle-ghosting", key_sequence = "ALT + G", - consuming = "none", + consuming = "game-only", action = "lua" }, { @@ -106,3 +106,19 @@ data:extend( } } ) +--update unlock techs for shortcuts +local unlocks = { + "undo", + "copy", + "cut", + "paste", + "import-string", + "give-blueprint", + "give-blueprint-book", + "give-deconstruction-planner", + "give-upgrade-planner" +} +for _,i in pairs(unlocks) do + local scut = data.raw.shortcut[i] + scut.technology_to_unlock = "angels-hidden-ghosting" +end diff --git a/angelsindustries/prototypes/buildings/angels-labs-basic.lua b/angelsindustries/prototypes/buildings/angels-labs-basic.lua index f7d6bb394..fd5eb2005 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-basic.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-basic.lua @@ -5,306 +5,284 @@ local function create_rich_text_icons(inputs) end return rich_text_icons end + if angelsmods.industries.tech then -data:extend( - { - --BASIC LABs + data:extend( { - type = "item", - name = "angels-basic-lab", - icons = { - { - icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } + --BASIC LABs + { + type = "item", + name = "angels-basic-lab", + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 1, angelsmods.industries.number_tint), + subgroup = "angels-labs-1", + order = "g[angels-basic-lab]", + place_result = "angels-basic-lab", + stack_size = 10 }, - icon_size = 32, - subgroup = "angels-labs-1", - order = "g[angels-basic-lab]", - place_result = "angels-basic-lab", - stack_size = 10 - }, - { - type = "lab", - name = "angels-basic-lab", - localised_description = { - "", - {"entity-description.angels-basic-lab"}, - "\n", - { - "entity-description.angels-lab-inputs", - create_rich_text_icons { - "angels-science-pack-grey", - "datacore-basic" + { + type = "lab", + name = "angels-basic-lab", + localised_description = { + "", + {"entity-description.angels-basic-lab"}, + "\n", + { + "entity-description.angels-lab-inputs", + create_rich_text_icons { + "angels-science-pack-grey", + "datacore-basic" + } } - } - }, - icons = { - { - icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png" }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 1, result = "angels-basic-lab"}, - max_health = 150, - corpse = "big-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}}, - light = {intensity = 0.75, size = 8}, - on_animation = { - filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab.png", - width = 160, - height = 160, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - shift = {0, 0} - }, - off_animation = { - filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab-off.png", - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} - }, - working_sound = { - sound = { - filename = "__base__/sound/lab.ogg", - volume = 0.7 + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 1, angelsmods.industries.number_tint), + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 1, result = "angels-basic-lab"}, + max_health = 150, + corpse = "big-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}}, + light = {intensity = 0.75, size = 8}, + on_animation = { + filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab.png", + width = 160, + height = 160, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + shift = {0, 0} }, - apparent_volume = 1 - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input" - }, - energy_usage = "100kW", - researching_speed = 1.5, - inputs = { - "angels-science-pack-grey", - "datacore-basic" - }, - module_specification = { - module_slots = 2, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} - } - }, - { - type = "item", - name = "angels-basic-lab-2", - icons = { - { - icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png" + off_animation = { + filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab-off.png", + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - subgroup = "angels-labs-2", - order = "g[angels-basic-lab]", - place_result = "angels-basic-lab-2", - stack_size = 10 - }, - { - type = "lab", - name = "angels-basic-lab-2", - localised_description = { - "", - {"entity-description.angels-basic-lab"}, - "\n", - { - "entity-description.angels-lab-inputs", - create_rich_text_icons { - "angels-science-pack-red", - "angels-science-pack-green", - "angels-science-pack-orange", - "angels-science-pack-blue", - "angels-science-pack-yellow", - "datacore-basic" - } - } - }, - icons = { - { - icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png" + working_sound = { + sound = { + filename = "__base__/sound/lab.ogg", + volume = 0.7 + }, + apparent_volume = 1 }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 1, result = "angels-basic-lab-2"}, - max_health = 150, - corpse = "big-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}}, - light = {intensity = 0.75, size = 8}, - on_animation = { - filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab.png", - width = 160, - height = 160, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - shift = {0, 0} - }, - off_animation = { - filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab-off.png", - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} - }, - working_sound = { - sound = { - filename = "__base__/sound/lab.ogg", - volume = 0.7 + energy_source = { + type = "electric", + usage_priority = "secondary-input" }, - apparent_volume = 1 - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input" - }, - energy_usage = "150kW", - researching_speed = 2, - inputs = { - "angels-science-pack-red", - "angels-science-pack-green", - "angels-science-pack-orange", - "angels-science-pack-blue", - "angels-science-pack-yellow", - "datacore-basic" - }, - module_specification = { - module_slots = 2, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} - } - }, - { - type = "item", - name = "angels-basic-lab-3", - icons = { - { - icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png" + energy_usage = "100kW", + researching_speed = 1.5, + inputs = { + "angels-science-pack-grey", + "datacore-basic" }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} + module_specification = { + module_slots = 2, + max_entity_info_module_icons_per_row = 3, + max_entity_info_module_icon_rows = 1, + module_info_icon_shift = {0, 0.9} } }, - icon_size = 32, - subgroup = "angels-labs-3", - order = "g[angels-basic-lab]", - place_result = "angels-basic-lab-3", - stack_size = 10 - }, - { - type = "lab", - name = "angels-basic-lab-3", - localised_description = { - "", - {"entity-description.angels-basic-lab"}, - "\n", - { - "entity-description.angels-lab-inputs", - create_rich_text_icons { - "angels-science-pack-white", - "datacore-basic" - } - } + { + type = "item", + name = "angels-basic-lab-2", + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 2, angelsmods.industries.number_tint), + subgroup = "angels-labs-2", + order = "g[angels-basic-lab]", + place_result = "angels-basic-lab-2", + stack_size = 10 }, - icons = { - { - icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png" + { + type = "lab", + name = "angels-basic-lab-2", + localised_description = { + "", + {"entity-description.angels-basic-lab"}, + "\n", + { + "entity-description.angels-lab-inputs", + create_rich_text_icons { + "angels-science-pack-red", + "angels-science-pack-green", + "angels-science-pack-orange", + "angels-science-pack-blue", + "angels-science-pack-yellow", + "datacore-basic" + } + } + }, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 2, angelsmods.industries.number_tint), + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 1, result = "angels-basic-lab-2"}, + max_health = 150, + corpse = "big-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}}, + light = {intensity = 0.75, size = 8}, + on_animation = { + filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab.png", + width = 160, + height = 160, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + shift = {0, 0} + }, + off_animation = { + filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab-off.png", + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + }, + working_sound = { + sound = { + filename = "__base__/sound/lab.ogg", + volume = 0.7 + }, + apparent_volume = 1 + }, + energy_source = { + type = "electric", + usage_priority = "secondary-input" }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} + energy_usage = "150kW", + researching_speed = 2, + inputs = { + "angels-science-pack-red", + "angels-science-pack-green", + "angels-science-pack-orange", + "angels-science-pack-blue", + "angels-science-pack-yellow", + "datacore-basic" + }, + module_specification = { + module_slots = 2, + max_entity_info_module_icons_per_row = 3, + max_entity_info_module_icon_rows = 1, + module_info_icon_shift = {0, 0.9} } }, - icon_size = 32, - flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 1, result = "angels-basic-lab-3"}, - max_health = 150, - corpse = "big-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}}, - light = {intensity = 0.75, size = 8}, - on_animation = { - filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab.png", - width = 160, - height = 160, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - shift = {0, 0} - }, - off_animation = { - filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab-off.png", - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} + { + type = "item", + name = "angels-basic-lab-3", + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 3, angelsmods.industries.number_tint), + subgroup = "angels-labs-3", + order = "g[angels-basic-lab]", + place_result = "angels-basic-lab-3", + stack_size = 10 }, - working_sound = { - sound = { - filename = "__base__/sound/lab.ogg", - volume = 0.7 + { + type = "lab", + name = "angels-basic-lab-3", + localised_description = { + "", + {"entity-description.angels-basic-lab"}, + "\n", + { + "entity-description.angels-lab-inputs", + create_rich_text_icons { + "angels-science-pack-white", + "datacore-basic" + } + } }, - apparent_volume = 1 - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input" - }, - energy_usage = "200kW", - researching_speed = 2.5, - inputs = { - "angels-science-pack-white", - "datacore-basic" - }, - module_specification = { - module_slots = 3, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 3, angelsmods.industries.number_tint), + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 1, result = "angels-basic-lab-3"}, + max_health = 150, + corpse = "big-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}}, + light = {intensity = 0.75, size = 8}, + on_animation = { + filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab.png", + width = 160, + height = 160, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + shift = {0, 0} + }, + off_animation = { + filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab-off.png", + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + }, + working_sound = { + sound = { + filename = "__base__/sound/lab.ogg", + volume = 0.7 + }, + apparent_volume = 1 + }, + energy_source = { + type = "electric", + usage_priority = "secondary-input" + }, + energy_usage = "200kW", + researching_speed = 2.5, + inputs = { + "angels-science-pack-white", + "datacore-basic" + }, + module_specification = { + module_slots = 3, + max_entity_info_module_icons_per_row = 3, + max_entity_info_module_icon_rows = 1, + module_info_icon_shift = {0, 0.9} + } } } - } -) -angelsmods.triggers.lab_ignore_token["angels-basic-lab"] = true -angelsmods.triggers.lab_ignore_token["angels-basic-lab-2"] = true -angelsmods.triggers.lab_ignore_token["angels-basic-lab-3"] = true + ) + + angelsmods.triggers.lab_ignore_token["angels-basic-lab"] = true + angelsmods.triggers.lab_ignore_token["angels-basic-lab-2"] = true + angelsmods.triggers.lab_ignore_token["angels-basic-lab-3"] = true end \ No newline at end of file diff --git a/angelsindustries/prototypes/buildings/angels-labs-energy.lua b/angelsindustries/prototypes/buildings/angels-labs-energy.lua index f31d02ff6..1ebf1ee7f 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-energy.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-energy.lua @@ -5,276 +5,253 @@ local function create_rich_text_icons(inputs) end return rich_text_icons end + if angelsmods.industries.tech then -data:extend( - { - --ENERGY LAB + data:extend( { - type = "item", - name = "angels-energy-lab-1", - icons = { - { - icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } + --ENERGY LAB + { + type = "item", + name = "angels-energy-lab-1", + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 1, angelsmods.industries.number_tint), + subgroup = "angels-labs-1", + order = "c[angels-energy-lab-1]", + place_result = "angels-energy-lab-1", + stack_size = 10 }, - icon_size = 32, - subgroup = "angels-labs-1", - order = "c[angels-energy-lab-1]", - place_result = "angels-energy-lab-1", - stack_size = 10 - }, - { - type = "lab", - name = "angels-energy-lab-1", - localised_description = {"", - {"entity-description.angels-energy-lab"}, "\n", - {"entity-description.angels-lab-inputs", create_rich_text_icons{ + { + type = "lab", + name = "angels-energy-lab-1", + localised_description = {"", + {"entity-description.angels-energy-lab"}, "\n", + {"entity-description.angels-lab-inputs", create_rich_text_icons{ + "angels-science-pack-red", + "angels-science-pack-green", + "angels-science-pack-orange", + "datacore-energy-1" + }} + }, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 1, angelsmods.industries.number_tint), + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 1, result = "angels-energy-lab-1"}, + max_health = 150, + corpse = "big-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}}, + light = {intensity = 0.75, size = 8}, + on_animation = { + filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab.png", + width = 160, + height = 160, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + shift = {0, 0} + }, + off_animation = { + filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab-off.png", + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + }, + working_sound = { + sound = { + filename = "__base__/sound/lab.ogg", + volume = 0.7 + }, + apparent_volume = 1 + }, + energy_source = { + type = "electric", + usage_priority = "secondary-input" + }, + energy_usage = "125kW", + researching_speed = 1, + inputs = { "angels-science-pack-red", "angels-science-pack-green", "angels-science-pack-orange", "datacore-energy-1" - }} - }, - icons = { - { - icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png" }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} + module_specification = { + module_slots = 2, + max_entity_info_module_icons_per_row = 3, + max_entity_info_module_icon_rows = 1, + module_info_icon_shift = {0, 0.9} } }, - icon_size = 32, - flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 1, result = "angels-energy-lab-1"}, - max_health = 150, - corpse = "big-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}}, - light = {intensity = 0.75, size = 8}, - on_animation = { - filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab.png", - width = 160, - height = 160, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - shift = {0, 0} + { + type = "item", + name = "angels-energy-lab-2", + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 2, angelsmods.industries.number_tint), + subgroup = "angels-labs-2", + order = "c[angels-energy-lab-2]", + place_result = "angels-energy-lab-2", + stack_size = 10 }, - off_animation = { - filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab-off.png", - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} - }, - working_sound = { - sound = { - filename = "__base__/sound/lab.ogg", - volume = 0.7 + { + type = "lab", + name = "angels-energy-lab-2", + localised_description = {"", + {"entity-description.angels-energy-lab"}, "\n", + {"entity-description.angels-lab-inputs", create_rich_text_icons{ + "angels-science-pack-blue", + "angels-science-pack-yellow", + "datacore-energy-2" + }} }, - apparent_volume = 1 - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input" - }, - energy_usage = "125kW", - researching_speed = 1, - inputs = { - "angels-science-pack-red", - "angels-science-pack-green", - "angels-science-pack-orange", - "datacore-energy-1" - }, - module_specification = { - module_slots = 2, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} - } - }, - { - type = "item", - name = "angels-energy-lab-2", - icons = { - { - icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png" + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 2, angelsmods.industries.number_tint), + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 1, result = "angels-energy-lab-2"}, + max_health = 150, + corpse = "big-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}}, + light = {intensity = 0.75, size = 8}, + on_animation = { + filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab.png", + width = 160, + height = 160, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + shift = {0, 0} }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - subgroup = "angels-labs-2", - order = "c[angels-energy-lab-2]", - place_result = "angels-energy-lab-2", - stack_size = 10 - }, - { - type = "lab", - name = "angels-energy-lab-2", - localised_description = {"", - {"entity-description.angels-energy-lab"}, "\n", - {"entity-description.angels-lab-inputs", create_rich_text_icons{ + off_animation = { + filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab-off.png", + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + }, + energy_source = { + type = "electric", + usage_priority = "secondary-input" + }, + energy_usage = "250kW", + researching_speed = 2, + inputs = { "angels-science-pack-blue", "angels-science-pack-yellow", "datacore-energy-2" - }} - }, - icons = { - { - icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png" }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} + module_specification = { + module_slots = 2, + max_entity_info_module_icons_per_row = 3, + max_entity_info_module_icon_rows = 1, + module_info_icon_shift = {0, 0.9} } }, - icon_size = 32, - flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 1, result = "angels-energy-lab-2"}, - max_health = 150, - corpse = "big-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}}, - light = {intensity = 0.75, size = 8}, - on_animation = { - filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab.png", - width = 160, - height = 160, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - shift = {0, 0} - }, - off_animation = { - filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab-off.png", - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input" - }, - energy_usage = "250kW", - researching_speed = 2, - inputs = { - "angels-science-pack-blue", - "angels-science-pack-yellow", - "datacore-energy-2" + { + type = "item", + name = "angels-energy-lab-3", + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 3, angelsmods.industries.number_tint), + subgroup = "angels-labs-3", + order = "c[angels-energy-lab-3]", + place_result = "angels-energy-lab-3", + stack_size = 10 }, - module_specification = { - module_slots = 2, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} - } - }, - { - type = "item", - name = "angels-energy-lab-3", - icons = { - { - icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png" + { + type = "lab", + name = "angels-energy-lab-3", + localised_description = {"", + {"entity-description.angels-energy-lab"}, "\n", + {"entity-description.angels-lab-inputs", create_rich_text_icons{ + "angels-science-pack-white", + "datacore-energy-2" + }} }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - subgroup = "angels-labs-3", - order = "c[angels-energy-lab-3]", - place_result = "angels-energy-lab-3", - stack_size = 10 - }, - { - type = "lab", - name = "angels-energy-lab-3", - localised_description = {"", - {"entity-description.angels-energy-lab"}, "\n", - {"entity-description.angels-lab-inputs", create_rich_text_icons{ + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 3, angelsmods.industries.number_tint), + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 1, result = "angels-energy-lab-3"}, + max_health = 150, + corpse = "big-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}}, + light = {intensity = 0.75, size = 8}, + on_animation = { + filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab.png", + width = 160, + height = 160, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + shift = {0, 0} + }, + off_animation = { + filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab-off.png", + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + }, + energy_source = { + type = "electric", + usage_priority = "secondary-input" + }, + energy_usage = "300kW", + researching_speed = 3, + inputs = { "angels-science-pack-white", "datacore-energy-2" - }} - }, - icons = { - { - icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png" }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} + module_specification = { + module_slots = 3, + max_entity_info_module_icons_per_row = 3, + max_entity_info_module_icon_rows = 1, + module_info_icon_shift = {0, 0.9} } - }, - icon_size = 32, - flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 1, result = "angels-energy-lab-3"}, - max_health = 150, - corpse = "big-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}}, - light = {intensity = 0.75, size = 8}, - on_animation = { - filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab.png", - width = 160, - height = 160, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - shift = {0, 0} - }, - off_animation = { - filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab-off.png", - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input" - }, - energy_usage = "300kW", - researching_speed = 3, - inputs = { - "angels-science-pack-white", - "datacore-energy-2" - }, - module_specification = { - module_slots = 3, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} } } - } -) + ) -angelsmods.triggers.lab_ignore_token["angels-energy-lab-1"] = true -angelsmods.triggers.lab_ignore_token["angels-energy-lab-2"] = true -angelsmods.triggers.lab_ignore_token["angels-energy-lab-3"] = true + angelsmods.triggers.lab_ignore_token["angels-energy-lab-1"] = true + angelsmods.triggers.lab_ignore_token["angels-energy-lab-2"] = true + angelsmods.triggers.lab_ignore_token["angels-energy-lab-3"] = true end \ No newline at end of file diff --git a/angelsindustries/prototypes/buildings/angels-labs-enhance.lua b/angelsindustries/prototypes/buildings/angels-labs-enhance.lua index 1218bff02..e2cf639e0 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-enhance.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-enhance.lua @@ -5,6 +5,7 @@ local function create_rich_text_icons(inputs) end return rich_text_icons end + if angelsmods.industries.tech then data:extend( { @@ -12,18 +13,14 @@ if angelsmods.industries.tech then { type = "item", name = "angels-enhance-lab-1", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png" + { + icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.industries.number_tint), subgroup = "angels-labs-1", order = "b[angels-enhance-lab-1]", place_result = "angels-enhance-lab-1", @@ -42,18 +39,14 @@ if angelsmods.industries.tech then "token-bio" }} }, - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png" + { + icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.industries.number_tint), flags = {"placeable-player", "player-creation"}, minable = {mining_time = 1, result = "angels-enhance-lab-1"}, max_health = 150, @@ -108,18 +101,14 @@ if angelsmods.industries.tech then { type = "item", name = "angels-enhance-lab-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png" + { + icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.industries.number_tint), subgroup = "angels-labs-2", order = "b[angels-enhance-lab-2]", place_result = "angels-enhance-lab-2", @@ -137,18 +126,14 @@ if angelsmods.industries.tech then "token-bio" }} }, - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png" + { + icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.industries.number_tint), flags = {"placeable-player", "player-creation"}, minable = {mining_time = 1, result = "angels-enhance-lab-2"}, max_health = 150, @@ -195,18 +180,14 @@ if angelsmods.industries.tech then { type = "item", name = "angels-enhance-lab-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png" + { + icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.industries.number_tint), subgroup = "angels-labs-3", order = "b[angels-enhance-lab-3]", place_result = "angels-enhance-lab-3", @@ -222,18 +203,14 @@ if angelsmods.industries.tech then "datacore-enhance-2" }} }, - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png" + { + icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.industries.number_tint), flags = {"placeable-player", "player-creation"}, minable = {mining_time = 1, result = "angels-enhance-lab-3"}, max_health = 150, diff --git a/angelsindustries/prototypes/buildings/angels-labs-exploration.lua b/angelsindustries/prototypes/buildings/angels-labs-exploration.lua index bcd4c40c7..7b4283805 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-exploration.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-exploration.lua @@ -5,6 +5,7 @@ local function create_rich_text_icons(inputs) end return rich_text_icons end + if angelsmods.industries.tech then data:extend( { @@ -12,18 +13,14 @@ if angelsmods.industries.tech then { type = "item", name = "angels-exploration-lab-1", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png" + { + icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.industries.number_tint), subgroup = "angels-labs-1", order = "a[angels-exploration-lab-1]", place_result = "angels-exploration-lab-1", @@ -47,18 +44,14 @@ if angelsmods.industries.tech then } } }, - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png" + { + icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.industries.number_tint), flags = {"placeable-player", "player-creation"}, minable = {mining_time = 1, result = "angels-exploration-lab-1"}, max_health = 150, @@ -112,18 +105,14 @@ if angelsmods.industries.tech then { type = "item", name = "angels-exploration-lab-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png" + { + icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.industries.number_tint), subgroup = "angels-labs-2", order = "a[angels-exploration-lab-2]", place_result = "angels-exploration-lab-2", @@ -145,18 +134,14 @@ if angelsmods.industries.tech then } } }, - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png" + { + icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.industries.number_tint), flags = {"placeable-player", "player-creation"}, minable = {mining_time = 1, result = "angels-exploration-lab-2"}, max_health = 150, @@ -202,18 +187,14 @@ if angelsmods.industries.tech then { type = "item", name = "angels-exploration-lab-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png" + { + icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.industries.number_tint), subgroup = "angels-labs-3", order = "a[angels-exploration-lab-3]", place_result = "angels-exploration-lab-3", @@ -234,17 +215,14 @@ if angelsmods.industries.tech then } } }, - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png" + { + icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.industries.number_tint), icon_size = 32, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 1, result = "angels-exploration-lab-3"}, diff --git a/angelsindustries/prototypes/buildings/angels-labs-logistic.lua b/angelsindustries/prototypes/buildings/angels-labs-logistic.lua index 7c141d611..d3f3ce246 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-logistic.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-logistic.lua @@ -5,276 +5,253 @@ local function create_rich_text_icons(inputs) end return rich_text_icons end + if angelsmods.industries.tech then -data:extend( - { - --LOGISTIC LAB + data:extend( { - type = "item", - name = "angels-logistic-lab-1", - icons = { - { - icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } + --LOGISTIC LAB + { + type = "item", + name = "angels-logistic-lab-1", + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 1, angelsmods.industries.number_tint), + subgroup = "angels-labs-1", + order = "d[angels-logistic-lab-1]", + place_result = "angels-logistic-lab-1", + stack_size = 10 }, - icon_size = 32, - subgroup = "angels-labs-1", - order = "d[angels-logistic-lab-1]", - place_result = "angels-logistic-lab-1", - stack_size = 10 - }, - { - type = "lab", - name = "angels-logistic-lab-1", - localised_description = {"", - {"entity-description.angels-logistic-lab"}, "\n", - {"entity-description.angels-lab-inputs", create_rich_text_icons{ + { + type = "lab", + name = "angels-logistic-lab-1", + localised_description = {"", + {"entity-description.angels-logistic-lab"}, "\n", + {"entity-description.angels-lab-inputs", create_rich_text_icons{ + "angels-science-pack-red", + "angels-science-pack-green", + "angels-science-pack-orange", + "datacore-logistic-1" + }} + }, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 1, angelsmods.industries.number_tint), + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 1, result = "angels-logistic-lab-1"}, + max_health = 150, + corpse = "big-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}}, + light = {intensity = 0.75, size = 8}, + on_animation = { + filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab.png", + width = 160, + height = 160, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + shift = {0, 0} + }, + off_animation = { + filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab-off.png", + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + }, + working_sound = { + sound = { + filename = "__base__/sound/lab.ogg", + volume = 0.7 + }, + apparent_volume = 1 + }, + energy_source = { + type = "electric", + usage_priority = "secondary-input" + }, + energy_usage = "125kW", + researching_speed = 1, + inputs = { "angels-science-pack-red", "angels-science-pack-green", "angels-science-pack-orange", "datacore-logistic-1" - }} - }, - icons = { - { - icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png" }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} + module_specification = { + module_slots = 2, + max_entity_info_module_icons_per_row = 3, + max_entity_info_module_icon_rows = 1, + module_info_icon_shift = {0, 0.9} } }, - icon_size = 32, - flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 1, result = "angels-logistic-lab-1"}, - max_health = 150, - corpse = "big-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}}, - light = {intensity = 0.75, size = 8}, - on_animation = { - filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab.png", - width = 160, - height = 160, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - shift = {0, 0} + { + type = "item", + name = "angels-logistic-lab-2", + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 2, angelsmods.industries.number_tint), + subgroup = "angels-labs-2", + order = "d[angels-logistic-lab-2]", + place_result = "angels-logistic-lab-2", + stack_size = 10 }, - off_animation = { - filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab-off.png", - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} - }, - working_sound = { - sound = { - filename = "__base__/sound/lab.ogg", - volume = 0.7 + { + type = "lab", + name = "angels-logistic-lab-2", + localised_description = {"", + {"entity-description.angels-logistic-lab"}, "\n", + {"entity-description.angels-lab-inputs", create_rich_text_icons{ + "angels-science-pack-blue", + "angels-science-pack-yellow", + "datacore-logistic-2" + }} }, - apparent_volume = 1 - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input" - }, - energy_usage = "125kW", - researching_speed = 1, - inputs = { - "angels-science-pack-red", - "angels-science-pack-green", - "angels-science-pack-orange", - "datacore-logistic-1" - }, - module_specification = { - module_slots = 2, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} - } - }, - { - type = "item", - name = "angels-logistic-lab-2", - icons = { - { - icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png" + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 2, angelsmods.industries.number_tint), + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 1, result = "angels-logistic-lab-2"}, + max_health = 150, + corpse = "big-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}}, + light = {intensity = 0.75, size = 8}, + on_animation = { + filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab.png", + width = 160, + height = 160, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + shift = {0, 0} }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - subgroup = "angels-labs-2", - order = "d[angels-logistic-lab-2]", - place_result = "angels-logistic-lab-2", - stack_size = 10 - }, - { - type = "lab", - name = "angels-logistic-lab-2", - localised_description = {"", - {"entity-description.angels-logistic-lab"}, "\n", - {"entity-description.angels-lab-inputs", create_rich_text_icons{ + off_animation = { + filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab-off.png", + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + }, + energy_source = { + type = "electric", + usage_priority = "secondary-input" + }, + energy_usage = "250kW", + researching_speed = 2, + inputs = { "angels-science-pack-blue", "angels-science-pack-yellow", "datacore-logistic-2" - }} - }, - icons = { - { - icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png" }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} + module_specification = { + module_slots = 2, + max_entity_info_module_icons_per_row = 3, + max_entity_info_module_icon_rows = 1, + module_info_icon_shift = {0, 0.9} } }, - icon_size = 32, - flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 1, result = "angels-logistic-lab-2"}, - max_health = 150, - corpse = "big-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}}, - light = {intensity = 0.75, size = 8}, - on_animation = { - filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab.png", - width = 160, - height = 160, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - shift = {0, 0} - }, - off_animation = { - filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab-off.png", - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input" - }, - energy_usage = "250kW", - researching_speed = 2, - inputs = { - "angels-science-pack-blue", - "angels-science-pack-yellow", - "datacore-logistic-2" + { + type = "item", + name = "angels-logistic-lab-3", + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 3, angelsmods.industries.number_tint), + subgroup = "angels-labs-3", + order = "d[angels-logistic-lab-3]", + place_result = "angels-logistic-lab-3", + stack_size = 10 }, - module_specification = { - module_slots = 2, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} - } - }, - { - type = "item", - name = "angels-logistic-lab-3", - icons = { - { - icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png" + { + type = "lab", + name = "angels-logistic-lab-3", + localised_description = {"", + {"entity-description.angels-logistic-lab"}, "\n", + {"entity-description.angels-lab-inputs", create_rich_text_icons{ + "angels-science-pack-white", + "datacore-logistic-2" + }} }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - subgroup = "angels-labs-3", - order = "d[angels-logistic-lab-3]", - place_result = "angels-logistic-lab-3", - stack_size = 10 - }, - { - type = "lab", - name = "angels-logistic-lab-3", - localised_description = {"", - {"entity-description.angels-logistic-lab"}, "\n", - {"entity-description.angels-lab-inputs", create_rich_text_icons{ + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 3, angelsmods.industries.number_tint), + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 1, result = "angels-logistic-lab-3"}, + max_health = 150, + corpse = "big-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}}, + light = {intensity = 0.75, size = 8}, + on_animation = { + filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab.png", + width = 160, + height = 160, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + shift = {0, 0} + }, + off_animation = { + filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab-off.png", + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + }, + energy_source = { + type = "electric", + usage_priority = "secondary-input" + }, + energy_usage = "300kW", + researching_speed = 3, + inputs = { "angels-science-pack-white", "datacore-logistic-2" - }} - }, - icons = { - { - icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png" }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} + module_specification = { + module_slots = 3, + max_entity_info_module_icons_per_row = 3, + max_entity_info_module_icon_rows = 1, + module_info_icon_shift = {0, 0.9} } - }, - icon_size = 32, - flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 1, result = "angels-logistic-lab-3"}, - max_health = 150, - corpse = "big-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}}, - light = {intensity = 0.75, size = 8}, - on_animation = { - filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab.png", - width = 160, - height = 160, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - shift = {0, 0} - }, - off_animation = { - filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab-off.png", - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input" - }, - energy_usage = "300kW", - researching_speed = 3, - inputs = { - "angels-science-pack-white", - "datacore-logistic-2" - }, - module_specification = { - module_slots = 3, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} } } - } -) + ) -angelsmods.triggers.lab_ignore_token["angels-logistic-lab-1"] = true -angelsmods.triggers.lab_ignore_token["angels-logistic-lab-2"] = true -angelsmods.triggers.lab_ignore_token["angels-logistic-lab-3"] = true + angelsmods.triggers.lab_ignore_token["angels-logistic-lab-1"] = true + angelsmods.triggers.lab_ignore_token["angels-logistic-lab-2"] = true + angelsmods.triggers.lab_ignore_token["angels-logistic-lab-3"] = true end \ No newline at end of file diff --git a/angelsindustries/prototypes/buildings/angels-labs-main.lua b/angelsindustries/prototypes/buildings/angels-labs-main.lua index dd29a7ab7..3d5b1d1af 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-main.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-main.lua @@ -1,5 +1,5 @@ local OV = angelsmods.functions.OV -local sounds = require("__base__/prototypes/entity/demo-sounds") +local sounds = require("__base__/prototypes/entity/sounds") if angelsmods.industries.tech then local lab_item = { @@ -8,7 +8,8 @@ if angelsmods.industries.tech then icons = { { icon = "__angelsindustries__/graphics/icons/main-lab.png", - icon_size = 64 + icon_size = 64, icon_mipmaps = 1, + scale = 0.5 } }, icon_size = 32, @@ -21,8 +22,7 @@ if angelsmods.industries.tech then local lab_entity = { type = "lab", --name = lab_item.place_result, - icon = lab_item.icons[1].icon, - icon_size = lab_item.icons[1].icon_size, + --icons = lab_item.icons, flags = {"placeable-player", "player-creation"}, minable = { mining_time = 1 @@ -33,7 +33,8 @@ if angelsmods.industries.tech then dying_explosion = "medium-explosion", collision_box = {{-3.2, -3.2}, {3.2, 3.2}}, - selection_box = {{-3.5, -4.5}, {3.5, 3.5}}, + selection_box = {{-3.5, -3.5}, {3.5, 3.5}}, + drawing_box = {{-3.5, -4.5}, {3.5, 3.5}}, light = {intensity = 0.75, size = 8}, @@ -164,15 +165,7 @@ if angelsmods.industries.tech then -- item local lab_item_tier = util.table.deepcopy(lab_item) lab_item_tier.name = lab_item_tier.name .. string.format("-%i", tier_index) - table.insert( - lab_item_tier.icons, - { - icon = string.format("__angelsrefining__/graphics/icons/num_%i.png", tier_index), - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - ) + lab_item_tier.icons = angelsmods.functions.add_number_icon_layer(lab_item_tier.icons, tier_index, angelsmods.industries.number_tint) lab_item_tier.place_result = lab_item_tier.name lab_item_tier.order = lab_item_tier.order .. string.format("-%i", tier_index) @@ -188,6 +181,7 @@ if angelsmods.industries.tech then "\n", {"entity-description.angels-lab-inputs", create_rich_text_icons(lab_entity_tier.inputs)} } + lab_entity_tier.icons = util.table.deepcopy(lab_item_tier.icons) lab_entity_tier.minable.result = lab_item_tier.name lab_entity_tier.energy_usage = string.format("%iMW", lab_entity_tier.researching_speed) @@ -224,7 +218,7 @@ if angelsmods.industries.tech then --]]-- }, - icon = "__base__/graphics/icons/crash-site-lab-repaired.png", + icon = "__angelsindustries__/graphics/icons/crash-site-lab-repaired.png", icon_size = 64, icon_mipmaps = 4, subgroup = lab_item.subgroup, @@ -247,7 +241,7 @@ if angelsmods.industries.tech then create_rich_text_icons(data.raw["lab"][lab_item.name .. string.format("-%i", 1)].inputs)} }, - icon = "__base__/graphics/icons/crash-site-lab-repaired.png", + icon = "__angelsindustries__/graphics/icons/crash-site-lab-repaired.png", icon_size = 64, icon_mipmaps = 4, flags = {"not-deconstructable", "placeable-player", "player-creation", "hidden"}, @@ -270,7 +264,7 @@ if angelsmods.industries.tech then integration_patch_render_layer = "decals", integration_patch = { - filename = "__base__/graphics/entity/crash-site-lab/crash-site-lab-ground.png", + filename = "__angelsindustries__/graphics/entity/crash-site-lab/crash-site-lab-ground.png", priority = "very-low", width = 352, height = 170, @@ -279,7 +273,7 @@ if angelsmods.industries.tech then line_length = 1, hr_version = { - filename = "__base__/graphics/entity/crash-site-lab/hr-crash-site-lab-ground.png", + filename = "__angelsindustries__/graphics/entity/crash-site-lab/hr-crash-site-lab-ground.png", priority = "very-low", width = 700, height = 344, @@ -302,7 +296,7 @@ if angelsmods.industries.tech then layers = { { - filename = "__base__/graphics/entity/crash-site-lab/crash-site-lab-repaired.png", + filename = "__angelsindustries__/graphics/entity/crash-site-lab/crash-site-lab-repaired.png", priority = "very-low", width = 244, height = 126, @@ -313,7 +307,7 @@ if angelsmods.industries.tech then shift = util.by_pixel(-18 - 16, 14 - 8), hr_version = { - filename = "__base__/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired.png", + filename = "__angelsindustries__/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired.png", priority = "very-low", width = 488, height = 252, @@ -326,7 +320,7 @@ if angelsmods.industries.tech then } }, { - filename = "__base__/graphics/entity/crash-site-lab/crash-site-lab-repaired-beams.png", + filename = "__angelsindustries__/graphics/entity/crash-site-lab/crash-site-lab-repaired-beams.png", priority = "very-low", width = 68, height = 50, @@ -337,7 +331,7 @@ if angelsmods.industries.tech then blend_mode = "additive", hr_version = { - filename = "__base__/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired-beams.png", + filename = "__angelsindustries__/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired-beams.png", priority = "very-low", width = 130, height = 100, @@ -350,7 +344,7 @@ if angelsmods.industries.tech then } }, { - filename = "__base__/graphics/entity/crash-site-lab/crash-site-lab-repaired-shadow.png", + filename = "__angelsindustries__/graphics/entity/crash-site-lab/crash-site-lab-repaired-shadow.png", priority = "very-low", width = 350, height = 148, @@ -362,7 +356,7 @@ if angelsmods.industries.tech then draw_as_shadow = true, hr_version = { - filename = "__base__/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired-shadow.png", + filename = "__angelsindustries__/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired-shadow.png", priority = "very-low", width = 696, height = 302, @@ -382,7 +376,7 @@ if angelsmods.industries.tech then layers = { { - filename = "__base__/graphics/entity/crash-site-lab/crash-site-lab-repaired.png", + filename = "__angelsindustries__/graphics/entity/crash-site-lab/crash-site-lab-repaired.png", priority = "very-low", width = 244, height = 126, @@ -393,7 +387,7 @@ if angelsmods.industries.tech then shift = util.by_pixel(-18 - 16, 14 - 8), hr_version = { - filename = "__base__/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired.png", + filename = "__angelsindustries__/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired.png", priority = "very-low", width = 488, height = 252, @@ -406,7 +400,7 @@ if angelsmods.industries.tech then } }, { - filename = "__base__/graphics/entity/crash-site-lab/crash-site-lab-repaired-shadow.png", + filename = "__angelsindustries__/graphics/entity/crash-site-lab/crash-site-lab-repaired-shadow.png", priority = "very-low", width = 350, height = 148, @@ -418,7 +412,7 @@ if angelsmods.industries.tech then draw_as_shadow = true, hr_version = { - filename = "__base__/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired-shadow.png", + filename = "__angelsindustries__/graphics/entity/crash-site-lab/hr-crash-site-lab-repaired-shadow.png", priority = "very-low", width = 696, height = 302, @@ -484,5 +478,4 @@ if angelsmods.industries.tech then ) angelsmods.triggers.lab_ignore_token[lab_item.name .. string.format("-%i", 0)] = true - end diff --git a/angelsindustries/prototypes/buildings/angels-labs-processing.lua b/angelsindustries/prototypes/buildings/angels-labs-processing.lua index 40ca490c2..a9f3b0350 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-processing.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-processing.lua @@ -5,282 +5,260 @@ local function create_rich_text_icons(inputs) end return rich_text_icons end + if angelsmods.industries.tech then -data:extend( - { - --PROCESSING LAB + data:extend( { - type = "item", - name = "angels-processing-lab-1", - icons = { - { - icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } + --PROCESSING LAB + { + type = "item", + name = "angels-processing-lab-1", + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 1, angelsmods.industries.number_tint), + subgroup = "angels-labs-1", + order = "f", + place_result = "angels-processing-lab-1", + stack_size = 10 }, - icon_size = 32, - subgroup = "angels-labs-1", - order = "f", - place_result = "angels-processing-lab-1", - stack_size = 10 - }, - { - type = "lab", - name = "angels-processing-lab-1", - localised_description = {"", - {"entity-description.angels-processing-lab"}, "\n", - {"entity-description.angels-lab-inputs", create_rich_text_icons{ + { + type = "lab", + name = "angels-processing-lab-1", + localised_description = {"", + {"entity-description.angels-processing-lab"}, "\n", + {"entity-description.angels-lab-inputs", create_rich_text_icons{ + "angels-science-pack-red", + "angels-science-pack-green", + "angels-science-pack-orange", + "datacore-processing-1", + "token-bio", + }} + }, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 1, angelsmods.industries.number_tint), + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 1, result = "angels-processing-lab-1"}, + max_health = 150, + corpse = "big-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}}, + light = {intensity = 0.75, size = 8}, + on_animation = { + filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab.png", + width = 160, + height = 160, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + shift = {0, 0} + }, + off_animation = { + filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab-off.png", + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + }, + working_sound = { + sound = { + filename = "__base__/sound/lab.ogg", + volume = 0.7 + }, + apparent_volume = 1 + }, + energy_source = { + type = "electric", + usage_priority = "secondary-input" + }, + energy_usage = "125kW", + researching_speed = 1, + inputs = { "angels-science-pack-red", "angels-science-pack-green", "angels-science-pack-orange", - "datacore-processing-1", - "token-bio", - }} - }, - icons = { - { - icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png" + "datacore-processing-1" }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} + module_specification = { + module_slots = 2, + max_entity_info_module_icons_per_row = 3, + max_entity_info_module_icon_rows = 1, + module_info_icon_shift = {0, 0.9} } }, - icon_size = 32, - flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 1, result = "angels-processing-lab-1"}, - max_health = 150, - corpse = "big-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}}, - light = {intensity = 0.75, size = 8}, - on_animation = { - filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab.png", - width = 160, - height = 160, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - shift = {0, 0} - }, - off_animation = { - filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab-off.png", - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} + { + type = "item", + name = "angels-processing-lab-2", + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 2, angelsmods.industries.number_tint), + subgroup = "angels-labs-2", + order = "f", + place_result = "angels-processing-lab-2", + stack_size = 10 }, - working_sound = { - sound = { - filename = "__base__/sound/lab.ogg", - volume = 0.7 + { + type = "lab", + name = "angels-processing-lab-2", + localised_description = {"", + {"entity-description.angels-processing-lab"}, "\n", + {"entity-description.angels-lab-inputs", create_rich_text_icons{ + "angels-science-pack-blue", + "angels-science-pack-yellow", + "datacore-processing-2", + "token-bio", + }} }, - apparent_volume = 1 - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input" - }, - energy_usage = "125kW", - researching_speed = 1, - inputs = { - "angels-science-pack-red", - "angels-science-pack-green", - "angels-science-pack-orange", - "datacore-processing-1" - }, - module_specification = { - module_slots = 2, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} - } - }, - { - type = "item", - name = "angels-processing-lab-2", - icons = { - { - icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png" + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 2, angelsmods.industries.number_tint), + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 1, result = "angels-processing-lab-2"}, + max_health = 150, + corpse = "big-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}}, + light = {intensity = 0.75, size = 8}, + on_animation = { + filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab.png", + width = 160, + height = 160, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + shift = {0, 0} }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - subgroup = "angels-labs-2", - order = "f", - place_result = "angels-processing-lab-2", - stack_size = 10 - }, - { - type = "lab", - name = "angels-processing-lab-2", - localised_description = {"", - {"entity-description.angels-processing-lab"}, "\n", - {"entity-description.angels-lab-inputs", create_rich_text_icons{ + off_animation = { + filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab-off.png", + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + }, + energy_source = { + type = "electric", + usage_priority = "secondary-input" + }, + energy_usage = "250kW", + researching_speed = 2, + inputs = { "angels-science-pack-blue", "angels-science-pack-yellow", - "datacore-processing-2", - "token-bio", - }} - }, - icons = { - { - icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png" + "datacore-processing-2" + --"datacore-processing-3", + --"datacore-processing-4", + --"datacore-processing-5" }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} + module_specification = { + module_slots = 2, + max_entity_info_module_icons_per_row = 3, + max_entity_info_module_icon_rows = 1, + module_info_icon_shift = {0, 0.9} } }, - icon_size = 32, - flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 1, result = "angels-processing-lab-2"}, - max_health = 150, - corpse = "big-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}}, - light = {intensity = 0.75, size = 8}, - on_animation = { - filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab.png", - width = 160, - height = 160, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - shift = {0, 0} - }, - off_animation = { - filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab-off.png", - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input" - }, - energy_usage = "250kW", - researching_speed = 2, - inputs = { - "angels-science-pack-blue", - "angels-science-pack-yellow", - "datacore-processing-2" - --"datacore-processing-3", - --"datacore-processing-4", - --"datacore-processing-5" + { + type = "item", + name = "angels-processing-lab-3", + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 3, angelsmods.industries.number_tint), + subgroup = "angels-labs-3", + order = "f", + place_result = "angels-processing-lab-3", + stack_size = 10 }, - module_specification = { - module_slots = 2, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} - } - }, - { - type = "item", - name = "angels-processing-lab-3", - icons = { - { - icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png" + { + type = "lab", + name = "angels-processing-lab-3", + localised_description = {"", + {"entity-description.angels-processing-lab"}, "\n", + {"entity-description.angels-lab-inputs", create_rich_text_icons{ + "angels-science-pack-white", + "datacore-processing-2", + "token-bio", + }} }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - subgroup = "angels-labs-3", - order = "f", - place_result = "angels-processing-lab-3", - stack_size = 10 - }, - { - type = "lab", - name = "angels-processing-lab-3", - localised_description = {"", - {"entity-description.angels-processing-lab"}, "\n", - {"entity-description.angels-lab-inputs", create_rich_text_icons{ + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 3, angelsmods.industries.number_tint), + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 1, result = "angels-processing-lab-3"}, + max_health = 150, + corpse = "big-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}}, + light = {intensity = 0.75, size = 8}, + on_animation = { + filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab.png", + width = 160, + height = 160, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + shift = {0, 0} + }, + off_animation = { + filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab-off.png", + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + }, + energy_source = { + type = "electric", + usage_priority = "secondary-input" + }, + energy_usage = "300kW", + researching_speed = 3, + inputs = { "angels-science-pack-white", - "datacore-processing-2", - "token-bio", - }} - }, - icons = { - { - icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png" + "datacore-processing-2" + --"datacore-processing-3", + --"datacore-processing-4", + --"datacore-processing-5" }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} + module_specification = { + module_slots = 3, + max_entity_info_module_icons_per_row = 3, + max_entity_info_module_icon_rows = 1, + module_info_icon_shift = {0, 0.9} } - }, - icon_size = 32, - flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 1, result = "angels-processing-lab-3"}, - max_health = 150, - corpse = "big-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}}, - light = {intensity = 0.75, size = 8}, - on_animation = { - filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab.png", - width = 160, - height = 160, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - shift = {0, 0} - }, - off_animation = { - filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab-off.png", - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input" - }, - energy_usage = "300kW", - researching_speed = 3, - inputs = { - "angels-science-pack-white", - "datacore-processing-2" - --"datacore-processing-3", - --"datacore-processing-4", - --"datacore-processing-5" - }, - module_specification = { - module_slots = 3, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} } } - } -) -angelsmods.triggers.lab_ignore_token["angels-processing-lab-3"] = true + ) + + angelsmods.triggers.lab_ignore_token["angels-processing-lab-3"] = true end \ No newline at end of file diff --git a/angelsindustries/prototypes/buildings/angels-labs-war.lua b/angelsindustries/prototypes/buildings/angels-labs-war.lua index 8c1629dc8..6da403f81 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-war.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-war.lua @@ -5,276 +5,253 @@ local function create_rich_text_icons(inputs) end return rich_text_icons end + if angelsmods.industries.tech then -data:extend( - { - --WAR LAB + data:extend( { - type = "item", - name = "angels-war-lab-1", - icons = { - { - icon = "__angelsindustries__/graphics/icons/war-lab-ico.png", - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } + --WAR LAB + { + type = "item", + name = "angels-war-lab-1", + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/war-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 1, angelsmods.industries.number_tint), + subgroup = "angels-labs-1", + order = "e", + place_result = "angels-war-lab-1", + stack_size = 10 }, - icon_size = 32, - subgroup = "angels-labs-1", - order = "e", - place_result = "angels-war-lab-1", - stack_size = 10 - }, - { - type = "lab", - name = "angels-war-lab-1", - localised_description = {"", - {"entity-description.angels-war-lab"}, "\n", - {"entity-description.angels-lab-inputs", create_rich_text_icons{ + { + type = "lab", + name = "angels-war-lab-1", + localised_description = {"", + {"entity-description.angels-war-lab"}, "\n", + {"entity-description.angels-lab-inputs", create_rich_text_icons{ + "angels-science-pack-red", + "angels-science-pack-green", + "angels-science-pack-orange", + "datacore-war-1" + }} + }, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/war-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 1, angelsmods.industries.number_tint), + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 1, result = "angels-war-lab-1"}, + max_health = 150, + corpse = "big-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}}, + light = {intensity = 0.75, size = 8}, + on_animation = { + filename = "__angelsindustries__/graphics/entity/war-lab/war-lab.png", + width = 160, + height = 160, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + shift = {0, 0} + }, + off_animation = { + filename = "__angelsindustries__/graphics/entity/war-lab/war-lab-off.png", + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + }, + working_sound = { + sound = { + filename = "__base__/sound/lab.ogg", + volume = 0.7 + }, + apparent_volume = 1 + }, + energy_source = { + type = "electric", + usage_priority = "secondary-input" + }, + energy_usage = "125kW", + researching_speed = 1, + inputs = { "angels-science-pack-red", "angels-science-pack-green", "angels-science-pack-orange", "datacore-war-1" - }} - }, - icons = { - { - icon = "__angelsindustries__/graphics/icons/war-lab-ico.png", }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} + module_specification = { + module_slots = 2, + max_entity_info_module_icons_per_row = 3, + max_entity_info_module_icon_rows = 1, + module_info_icon_shift = {0, 0.9} } }, - icon_size = 32, - flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 1, result = "angels-war-lab-1"}, - max_health = 150, - corpse = "big-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}}, - light = {intensity = 0.75, size = 8}, - on_animation = { - filename = "__angelsindustries__/graphics/entity/war-lab/war-lab.png", - width = 160, - height = 160, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - shift = {0, 0} + { + type = "item", + name = "angels-war-lab-2", + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/war-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 2, angelsmods.industries.number_tint), + subgroup = "angels-labs-2", + order = "e", + place_result = "angels-war-lab-2", + stack_size = 10 }, - off_animation = { - filename = "__angelsindustries__/graphics/entity/war-lab/war-lab-off.png", - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} - }, - working_sound = { - sound = { - filename = "__base__/sound/lab.ogg", - volume = 0.7 + { + type = "lab", + name = "angels-war-lab-2", + localised_description = {"", + {"entity-description.angels-war-lab"}, "\n", + {"entity-description.angels-lab-inputs", create_rich_text_icons{ + "angels-science-pack-blue", + "angels-science-pack-yellow", + "datacore-war-2" + }} }, - apparent_volume = 1 - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input" - }, - energy_usage = "125kW", - researching_speed = 1, - inputs = { - "angels-science-pack-red", - "angels-science-pack-green", - "angels-science-pack-orange", - "datacore-war-1" - }, - module_specification = { - module_slots = 2, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} - } - }, - { - type = "item", - name = "angels-war-lab-2", - icons = { - { - icon = "__angelsindustries__/graphics/icons/war-lab-ico.png", + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/war-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 2, angelsmods.industries.number_tint), + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 1, result = "angels-war-lab-2"}, + max_health = 150, + corpse = "big-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}}, + light = {intensity = 0.75, size = 8}, + on_animation = { + filename = "__angelsindustries__/graphics/entity/war-lab/war-lab.png", + width = 160, + height = 160, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + shift = {0, 0} }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - subgroup = "angels-labs-2", - order = "e", - place_result = "angels-war-lab-2", - stack_size = 10 - }, - { - type = "lab", - name = "angels-war-lab-2", - localised_description = {"", - {"entity-description.angels-war-lab"}, "\n", - {"entity-description.angels-lab-inputs", create_rich_text_icons{ + off_animation = { + filename = "__angelsindustries__/graphics/entity/war-lab/war-lab-off.png", + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + }, + energy_source = { + type = "electric", + usage_priority = "secondary-input" + }, + energy_usage = "250kW", + researching_speed = 2, + inputs = { "angels-science-pack-blue", "angels-science-pack-yellow", "datacore-war-2" - }} - }, - icons = { - { - icon = "__angelsindustries__/graphics/icons/war-lab-ico.png", }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} + module_specification = { + module_slots = 2, + max_entity_info_module_icons_per_row = 3, + max_entity_info_module_icon_rows = 1, + module_info_icon_shift = {0, 0.9} } }, - icon_size = 32, - flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 1, result = "angels-war-lab-2"}, - max_health = 150, - corpse = "big-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}}, - light = {intensity = 0.75, size = 8}, - on_animation = { - filename = "__angelsindustries__/graphics/entity/war-lab/war-lab.png", - width = 160, - height = 160, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - shift = {0, 0} - }, - off_animation = { - filename = "__angelsindustries__/graphics/entity/war-lab/war-lab-off.png", - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input" - }, - energy_usage = "250kW", - researching_speed = 2, - inputs = { - "angels-science-pack-blue", - "angels-science-pack-yellow", - "datacore-war-2" + { + type = "item", + name = "angels-war-lab-3", + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/war-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 3, angelsmods.industries.number_tint), + subgroup = "angels-labs-3", + order = "e", + place_result = "angels-war-lab-3", + stack_size = 10 }, - module_specification = { - module_slots = 2, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} - } - }, - { - type = "item", - name = "angels-war-lab-3", - icons = { - { - icon = "__angelsindustries__/graphics/icons/war-lab-ico.png", + { + type = "lab", + name = "angels-war-lab-3", + localised_description = {"", + {"entity-description.angels-war-lab"}, "\n", + {"entity-description.angels-lab-inputs", create_rich_text_icons{ + "angels-science-pack-white", + "datacore-war-2" + }} }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - subgroup = "angels-labs-3", - order = "e", - place_result = "angels-war-lab-3", - stack_size = 10 - }, - { - type = "lab", - name = "angels-war-lab-3", - localised_description = {"", - {"entity-description.angels-war-lab"}, "\n", - {"entity-description.angels-lab-inputs", create_rich_text_icons{ + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/war-lab-ico.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 3, angelsmods.industries.number_tint), + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 1, result = "angels-war-lab-3"}, + max_health = 150, + corpse = "big-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}}, + light = {intensity = 0.75, size = 8}, + on_animation = { + filename = "__angelsindustries__/graphics/entity/war-lab/war-lab.png", + width = 160, + height = 160, + frame_count = 36, + line_length = 6, + animation_speed = 0.5, + shift = {0, 0} + }, + off_animation = { + filename = "__angelsindustries__/graphics/entity/war-lab/war-lab-off.png", + width = 160, + height = 160, + frame_count = 1, + shift = {0, 0} + }, + energy_source = { + type = "electric", + usage_priority = "secondary-input" + }, + energy_usage = "300kW", + researching_speed = 3, + inputs = { "angels-science-pack-white", "datacore-war-2" - }} - }, - icons = { - { - icon = "__angelsindustries__/graphics/icons/war-lab-ico.png", }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12} + module_specification = { + module_slots = 3, + max_entity_info_module_icons_per_row = 3, + max_entity_info_module_icon_rows = 1, + module_info_icon_shift = {0, 0.9} } - }, - icon_size = 32, - flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 1, result = "angels-war-lab-3"}, - max_health = 150, - corpse = "big-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}}, - light = {intensity = 0.75, size = 8}, - on_animation = { - filename = "__angelsindustries__/graphics/entity/war-lab/war-lab.png", - width = 160, - height = 160, - frame_count = 36, - line_length = 6, - animation_speed = 0.5, - shift = {0, 0} - }, - off_animation = { - filename = "__angelsindustries__/graphics/entity/war-lab/war-lab-off.png", - width = 160, - height = 160, - frame_count = 1, - shift = {0, 0} - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input" - }, - energy_usage = "300kW", - researching_speed = 3, - inputs = { - "angels-science-pack-white", - "datacore-war-2" - }, - module_specification = { - module_slots = 3, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} } } - } -) + ) -angelsmods.triggers.lab_ignore_token["angels-war-lab-1"] = true -angelsmods.triggers.lab_ignore_token["angels-war-lab-2"] = true -angelsmods.triggers.lab_ignore_token["angels-war-lab-3"] = true + angelsmods.triggers.lab_ignore_token["angels-war-lab-1"] = true + angelsmods.triggers.lab_ignore_token["angels-war-lab-2"] = true + angelsmods.triggers.lab_ignore_token["angels-war-lab-3"] = true end \ No newline at end of file diff --git a/angelsindustries/prototypes/buildings/angels-logistics-big-chest.lua b/angelsindustries/prototypes/buildings/angels-logistics-big-chest.lua index 5d61d374a..dd95f2293 100644 --- a/angelsindustries/prototypes/buildings/angels-logistics-big-chest.lua +++ b/angelsindustries/prototypes/buildings/angels-logistics-big-chest.lua @@ -91,7 +91,6 @@ data:extend( }, fast_replaceable_group = "container", inventory_size = 60, - logistic_slots_count = 12, logistic_mode = "requester", open_sound = { filename = "__base__/sound/metallic-chest-open.ogg", volume=0.65 }, close_sound = { filename = "__base__/sound/metallic-chest-close.ogg", volume = 0.7 }, @@ -231,7 +230,7 @@ data:extend( }, fast_replaceable_group = "container", inventory_size = 60, - logistic_slots_count = 1, + max_logistic_slots = 1, logistic_mode = "storage", open_sound = { filename = "__base__/sound/metallic-chest-open.ogg", volume=0.65 }, close_sound = { filename = "__base__/sound/metallic-chest-close.ogg", volume = 0.7 }, @@ -283,7 +282,6 @@ data:extend( fast_replaceable_group = "container", inventory_size = 60, logistic_mode = "buffer", - logistic_slots_count = 12, open_sound = { filename = "__base__/sound/metallic-chest-open.ogg", volume=0.65 }, close_sound = { filename = "__base__/sound/metallic-chest-close.ogg", volume = 0.7 }, vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, @@ -300,4 +298,4 @@ data:extend( circuit_wire_max_distance = default_circuit_wire_max_distance }, } -) \ No newline at end of file +) diff --git a/angelsindustries/prototypes/buildings/angels-logistics-robot-cargo.lua b/angelsindustries/prototypes/buildings/angels-logistics-robot-cargo.lua index fef8de260..9b773b9b0 100644 --- a/angelsindustries/prototypes/buildings/angels-logistics-robot-cargo.lua +++ b/angelsindustries/prototypes/buildings/angels-logistics-robot-cargo.lua @@ -1,4 +1,4 @@ -local sounds = require("__base__.prototypes.entity.demo-sounds") +local sounds = require("__base__.prototypes.entity.sounds") data:extend( { @@ -263,4 +263,4 @@ data:extend( cargo_centered = {0.0, 0}, }, } -) \ No newline at end of file +) diff --git a/angelsindustries/prototypes/buildings/angels-logistics-robot-construction.lua b/angelsindustries/prototypes/buildings/angels-logistics-robot-construction.lua index 7ac626aff..f230bc064 100644 --- a/angelsindustries/prototypes/buildings/angels-logistics-robot-construction.lua +++ b/angelsindustries/prototypes/buildings/angels-logistics-robot-construction.lua @@ -1,4 +1,4 @@ -local sounds = require("__base__.prototypes.entity.demo-sounds") +local sounds = require("__base__.prototypes.entity.sounds") data:extend( { @@ -188,4 +188,4 @@ data:extend( construction_vector = {0.30, 0.22}, }, } -) \ No newline at end of file +) diff --git a/angelsindustries/prototypes/items/components-blocks.lua b/angelsindustries/prototypes/items/components-blocks.lua index 069b693a4..efb3e02b5 100644 --- a/angelsindustries/prototypes/items/components-blocks.lua +++ b/angelsindustries/prototypes/items/components-blocks.lua @@ -154,18 +154,14 @@ if angelsmods.industries.components then { type = "item", name = "block-enhancement-1", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-enhancement-1.png", + { + icon = "__angelsindustries__/graphics/icons/block-enhancement-1.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 1, angelsmods.industries.number_tint), subgroup = "blocks-enhancement", order = "a", stack_size = angelsmods.industries.block_stack_size, @@ -173,18 +169,14 @@ if angelsmods.industries.components then { type = "item", name = "block-enhancement-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-enhancement-2.png", + { + icon = "__angelsindustries__/graphics/icons/block-enhancement-2.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 2, angelsmods.industries.number_tint), subgroup = "blocks-enhancement", order = "b", stack_size = angelsmods.industries.block_stack_size, @@ -192,18 +184,14 @@ if angelsmods.industries.components then { type = "item", name = "block-enhancement-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-enhancement-3.png", + { + icon = "__angelsindustries__/graphics/icons/block-enhancement-3.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 3, angelsmods.industries.number_tint), subgroup = "blocks-enhancement", order = "c", stack_size = angelsmods.industries.block_stack_size, @@ -211,18 +199,14 @@ if angelsmods.industries.components then { type = "item", name = "block-enhancement-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-enhancement-4.png", + { + icon = "__angelsindustries__/graphics/icons/block-enhancement-4.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 4, angelsmods.industries.number_tint), subgroup = "blocks-enhancement", order = "d", stack_size = angelsmods.industries.block_stack_size, @@ -230,18 +214,14 @@ if angelsmods.industries.components then { type = "item", name = "block-enhancement-5", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-enhancement-5.png", + { + icon = "__angelsindustries__/graphics/icons/block-enhancement-5.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_5.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 5, angelsmods.industries.number_tint), subgroup = "blocks-enhancement", order = "e", stack_size = angelsmods.industries.block_stack_size, @@ -252,18 +232,14 @@ if angelsmods.industries.components then { type = "item", name = "block-energy-1", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-energy-1.png", + { + icon = "__angelsindustries__/graphics/icons/block-energy-1.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 1, angelsmods.industries.number_tint), subgroup = "blocks-energy", order = "a", stack_size = angelsmods.industries.block_stack_size, @@ -271,18 +247,14 @@ if angelsmods.industries.components then { type = "item", name = "block-energy-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-energy-2.png", + { + icon = "__angelsindustries__/graphics/icons/block-energy-2.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 2, angelsmods.industries.number_tint), subgroup = "blocks-energy", order = "b", stack_size = angelsmods.industries.block_stack_size, @@ -290,18 +262,14 @@ if angelsmods.industries.components then { type = "item", name = "block-energy-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-energy-3.png", + { + icon = "__angelsindustries__/graphics/icons/block-energy-3.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 3, angelsmods.industries.number_tint), subgroup = "blocks-energy", order = "c", stack_size = angelsmods.industries.block_stack_size, @@ -309,18 +277,14 @@ if angelsmods.industries.components then { type = "item", name = "block-energy-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-energy-4.png", + { + icon = "__angelsindustries__/graphics/icons/block-energy-4.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 4, angelsmods.industries.number_tint), subgroup = "blocks-energy", order = "d", stack_size = angelsmods.industries.block_stack_size, @@ -328,18 +292,14 @@ if angelsmods.industries.components then { type = "item", name = "block-energy-5", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-energy-5.png", + { + icon = "__angelsindustries__/graphics/icons/block-energy-5.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_5.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 5, angelsmods.industries.number_tint), subgroup = "blocks-energy", order = "e", stack_size = angelsmods.industries.block_stack_size, @@ -350,18 +310,14 @@ if angelsmods.industries.components then { type = "item", name = "block-exploration-1", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-exploration-1.png", + { + icon = "__angelsindustries__/graphics/icons/block-exploration-1.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 1, angelsmods.industries.number_tint), subgroup = "blocks-exploration", order = "a", stack_size = angelsmods.industries.block_stack_size, @@ -369,18 +325,14 @@ if angelsmods.industries.components then { type = "item", name = "block-exploration-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-exploration-2.png", + { + icon = "__angelsindustries__/graphics/icons/block-exploration-2.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 2, angelsmods.industries.number_tint), subgroup = "blocks-exploration", order = "b", stack_size = angelsmods.industries.block_stack_size, @@ -388,18 +340,14 @@ if angelsmods.industries.components then { type = "item", name = "block-exploration-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-exploration-3.png", + { + icon = "__angelsindustries__/graphics/icons/block-exploration-3.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 3, angelsmods.industries.number_tint), subgroup = "blocks-exploration", order = "c", stack_size = angelsmods.industries.block_stack_size, @@ -407,18 +355,14 @@ if angelsmods.industries.components then { type = "item", name = "block-exploration-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-exploration-4.png", + { + icon = "__angelsindustries__/graphics/icons/block-exploration-4.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 4, angelsmods.industries.number_tint), subgroup = "blocks-exploration", order = "d", stack_size = angelsmods.industries.block_stack_size, @@ -426,18 +370,14 @@ if angelsmods.industries.components then { type = "item", name = "block-exploration-5", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-exploration-5.png", + { + icon = "__angelsindustries__/graphics/icons/block-exploration-5.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_5.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 5, angelsmods.industries.number_tint), subgroup = "blocks-exploration", order = "e", stack_size = angelsmods.industries.block_stack_size, @@ -448,18 +388,14 @@ if angelsmods.industries.components then { type = "item", name = "block-logistic-1", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-logistic-1.png", + { + icon = "__angelsindustries__/graphics/icons/block-logistic-1.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 1, angelsmods.industries.number_tint), subgroup = "blocks-logistic", order = "a", stack_size = angelsmods.industries.block_stack_size, @@ -467,18 +403,14 @@ if angelsmods.industries.components then { type = "item", name = "block-logistic-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-logistic-2.png", + { + icon = "__angelsindustries__/graphics/icons/block-logistic-2.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 2, angelsmods.industries.number_tint), subgroup = "blocks-logistic", order = "b", stack_size = angelsmods.industries.block_stack_size, @@ -486,18 +418,14 @@ if angelsmods.industries.components then { type = "item", name = "block-logistic-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-logistic-3.png", + { + icon = "__angelsindustries__/graphics/icons/block-logistic-3.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 3, angelsmods.industries.number_tint), subgroup = "blocks-logistic", order = "c", stack_size = angelsmods.industries.block_stack_size, @@ -505,18 +433,14 @@ if angelsmods.industries.components then { type = "item", name = "block-logistic-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-logistic-4.png", + { + icon = "__angelsindustries__/graphics/icons/block-logistic-4.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 4, angelsmods.industries.number_tint), subgroup = "blocks-logistic", order = "d", stack_size = angelsmods.industries.block_stack_size, @@ -524,18 +448,14 @@ if angelsmods.industries.components then { type = "item", name = "block-logistic-5", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-logistic-5.png", + { + icon = "__angelsindustries__/graphics/icons/block-logistic-5.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_5.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 5, angelsmods.industries.number_tint), subgroup = "blocks-logistic", order = "e", stack_size = angelsmods.industries.block_stack_size, @@ -546,18 +466,14 @@ if angelsmods.industries.components then { type = "item", name = "block-production-1", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-production-1.png", + { + icon = "__angelsindustries__/graphics/icons/block-production-1.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 1, angelsmods.industries.number_tint), subgroup = "blocks-production", order = "a", stack_size = angelsmods.industries.block_stack_size, @@ -565,18 +481,14 @@ if angelsmods.industries.components then { type = "item", name = "block-production-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-production-2.png", + { + icon = "__angelsindustries__/graphics/icons/block-production-2.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 2, angelsmods.industries.number_tint), subgroup = "blocks-production", order = "b", stack_size = angelsmods.industries.block_stack_size, @@ -584,18 +496,14 @@ if angelsmods.industries.components then { type = "item", name = "block-production-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-production-3.png", + { + icon = "__angelsindustries__/graphics/icons/block-production-3.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 3, angelsmods.industries.number_tint), subgroup = "blocks-production", order = "c", stack_size = angelsmods.industries.block_stack_size, @@ -603,18 +511,14 @@ if angelsmods.industries.components then { type = "item", name = "block-production-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-production-4.png", + { + icon = "__angelsindustries__/graphics/icons/block-production-4.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 4, angelsmods.industries.number_tint), subgroup = "blocks-production", order = "d", stack_size = angelsmods.industries.block_stack_size, @@ -622,18 +526,14 @@ if angelsmods.industries.components then { type = "item", name = "block-production-5", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-production-5.png", + { + icon = "__angelsindustries__/graphics/icons/block-production-5.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_5.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 5, angelsmods.industries.number_tint), subgroup = "blocks-production", order = "e", stack_size = angelsmods.industries.block_stack_size, @@ -644,8 +544,14 @@ if angelsmods.industries.components then { type = "item", name = "block-extraction-3", - icon = "__angelsindustries__/graphics/icons/block-extraction-3.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/block-extraction-3.png", + icon_size = 32, icon_mipmaps = 1, + } + }, + 3, angelsmods.industries.number_tint), subgroup = "blocks-processing", order = "c", stack_size = angelsmods.industries.block_stack_size, @@ -653,8 +559,14 @@ if angelsmods.industries.components then { type = "item", name = "block-extraction-4", - icon = "__angelsindustries__/graphics/icons/block-extraction-4.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/block-extraction-4.png", + icon_size = 32, icon_mipmaps = 1, + } + }, + 4, angelsmods.industries.number_tint), subgroup = "blocks-processing", order = "d", stack_size = angelsmods.industries.block_stack_size, @@ -662,8 +574,14 @@ if angelsmods.industries.components then { type = "item", name = "block-extraction-5", - icon = "__angelsindustries__/graphics/icons/block-extraction-5.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/block-extraction-5.png", + icon_size = 32, icon_mipmaps = 1, + } + }, + 5, angelsmods.industries.number_tint), subgroup = "blocks-processing", order = "e", stack_size = angelsmods.industries.block_stack_size, @@ -674,8 +592,14 @@ if angelsmods.industries.components then { type = "item", name = "block-mprocessing-3", - icon = "__angelsindustries__/graphics/icons/block-mprocessing-3.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/block-mprocessing-3.png", + icon_size = 32, icon_mipmaps = 1, + } + }, + 3, angelsmods.industries.number_tint), subgroup = "blocks-processing", order = "f", stack_size = angelsmods.industries.block_stack_size, @@ -683,8 +607,14 @@ if angelsmods.industries.components then { type = "item", name = "block-mprocessing-4", - icon = "__angelsindustries__/graphics/icons/block-mprocessing-4.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/block-mprocessing-4.png", + icon_size = 32, icon_mipmaps = 1, + } + }, + 4, angelsmods.industries.number_tint), subgroup = "blocks-processing", order = "g", stack_size = angelsmods.industries.block_stack_size, @@ -692,8 +622,14 @@ if angelsmods.industries.components then { type = "item", name = "block-mprocessing-5", - icon = "__angelsindustries__/graphics/icons/block-mprocessing-5.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/block-mprocessing-5.png", + icon_size = 32, icon_mipmaps = 1, + } + }, + 5, angelsmods.industries.number_tint), subgroup = "blocks-processing", order = "h", stack_size = angelsmods.industries.block_stack_size, @@ -704,8 +640,14 @@ if angelsmods.industries.components then { type = "item", name = "block-cprocessing-3", - icon = "__angelsindustries__/graphics/icons/block-cprocessing-3.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/block-cprocessing-3.png", + icon_size = 32, icon_mipmaps = 1, + } + }, + 3, angelsmods.industries.number_tint), subgroup = "blocks-processing", order = "i", stack_size = angelsmods.industries.block_stack_size, @@ -713,8 +655,14 @@ if angelsmods.industries.components then { type = "item", name = "block-cprocessing-4", - icon = "__angelsindustries__/graphics/icons/block-cprocessing-4.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/block-cprocessing-4.png", + icon_size = 32, icon_mipmaps = 1, + } + }, + 4, angelsmods.industries.number_tint), subgroup = "blocks-processing", order = "j", stack_size = angelsmods.industries.block_stack_size, @@ -722,8 +670,14 @@ if angelsmods.industries.components then { type = "item", name = "block-cprocessing-5", - icon = "__angelsindustries__/graphics/icons/block-cprocessing-5.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/block-cprocessing-5.png", + icon_size = 32, icon_mipmaps = 1, + } + }, + 5, angelsmods.industries.number_tint), subgroup = "blocks-processing", order = "k", stack_size = angelsmods.industries.block_stack_size, @@ -734,8 +688,14 @@ if angelsmods.industries.components then { type = "item", name = "block-bprocessing-3", - icon = "__angelsindustries__/graphics/icons/block-bprocessing-3.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/block-bprocessing-3.png", + icon_size = 32, icon_mipmaps = 1, + } + }, + 3, angelsmods.industries.number_tint), subgroup = "blocks-processing", order = "l", stack_size = angelsmods.industries.block_stack_size, @@ -743,8 +703,14 @@ if angelsmods.industries.components then { type = "item", name = "block-bprocessing-4", - icon = "__angelsindustries__/graphics/icons/block-bprocessing-4.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/block-bprocessing-4.png", + icon_size = 32, icon_mipmaps = 1, + } + }, + 4, angelsmods.industries.number_tint), subgroup = "blocks-processing", order = "m", stack_size = angelsmods.industries.block_stack_size, @@ -752,8 +718,14 @@ if angelsmods.industries.components then { type = "item", name = "block-bprocessing-5", - icon = "__angelsindustries__/graphics/icons/block-bprocessing-5.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsindustries__/graphics/icons/block-bprocessing-5.png", + icon_size = 32, icon_mipmaps = 1, + } + }, + 5, angelsmods.industries.number_tint), subgroup = "blocks-processing", order = "n", stack_size = angelsmods.industries.block_stack_size, @@ -764,18 +736,14 @@ if angelsmods.industries.components then { type = "item", name = "block-warfare-1", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-warfare-1.png", + { + icon = "__angelsindustries__/graphics/icons/block-warfare-1.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 1, angelsmods.industries.number_tint), subgroup = "blocks-warfare", order = "a", stack_size = angelsmods.industries.block_stack_size, @@ -783,18 +751,14 @@ if angelsmods.industries.components then { type = "item", name = "block-warfare-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-warfare-2.png", + { + icon = "__angelsindustries__/graphics/icons/block-warfare-2.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 2, angelsmods.industries.number_tint), subgroup = "blocks-warfare", order = "b", stack_size = angelsmods.industries.block_stack_size, @@ -802,18 +766,14 @@ if angelsmods.industries.components then { type = "item", name = "block-warfare-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-warfare-3.png", + { + icon = "__angelsindustries__/graphics/icons/block-warfare-3.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 3, angelsmods.industries.number_tint), subgroup = "blocks-warfare", order = "c", stack_size = angelsmods.industries.block_stack_size, @@ -821,18 +781,14 @@ if angelsmods.industries.components then { type = "item", name = "block-warfare-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-warfare-4.png", + { + icon = "__angelsindustries__/graphics/icons/block-warfare-4.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 4, angelsmods.industries.number_tint), subgroup = "blocks-warfare", order = "d", stack_size = angelsmods.industries.block_stack_size, @@ -840,18 +796,14 @@ if angelsmods.industries.components then { type = "item", name = "block-warfare-5", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsindustries__/graphics/icons/block-warfare-5.png", + { + icon = "__angelsindustries__/graphics/icons/block-warfare-5.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_5.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 5, angelsmods.industries.number_tint), subgroup = "blocks-warfare", order = "e", stack_size = angelsmods.industries.block_stack_size, diff --git a/angelsindustries/prototypes/ordening/angels-intermediates.lua b/angelsindustries/prototypes/ordening/angels-intermediates.lua index 1fafdeae5..8a4baf058 100644 --- a/angelsindustries/prototypes/ordening/angels-intermediates.lua +++ b/angelsindustries/prototypes/ordening/angels-intermediates.lua @@ -126,7 +126,7 @@ end if angelsmods.industries.tech then data.raw["item-subgroup"]["science-pack"].group = "angels-tech" data.raw["item-subgroup"]["science-pack"].order = "ba[science-packs]-b[bobs-alien]" -else +elseif angelsmods.industries.overhaul then data.raw["item-subgroup"]["science-pack"].group = "angels-components" data.raw["item-subgroup"]["science-pack"].order = "z[science]-a" end \ No newline at end of file diff --git a/angelsindustries/prototypes/ordening/angels-personal-equipment.lua b/angelsindustries/prototypes/ordening/angels-personal-equipment.lua index a8f45db8b..24eb44245 100644 --- a/angelsindustries/prototypes/ordening/angels-personal-equipment.lua +++ b/angelsindustries/prototypes/ordening/angels-personal-equipment.lua @@ -2,6 +2,16 @@ local reorder = function(type, item, subgroup, order) angelsmods.functions.move_item(item, subgroup, order, type) end +------------------------------------------------------------------------------- +-- CHARACTERS ----------------------------------------------------------------- +------------------------------------------------------------------------------- +if mods["bobclasses"] then + data.raw["item-subgroup"]["bodies"].group = "angels-logistics" + data.raw["item-subgroup"]["bodies"].order = "d-a[armor]-aa" + data.raw["item-subgroup"]["body-parts"].group = "angels-logistics" + data.raw["item-subgroup"]["body-parts"].order = "d-a[armor]-ab" +end + ------------------------------------------------------------------------------- -- ARMOR ---------------------------------------------------------------------- ------------------------------------------------------------------------------- diff --git a/angelsindustries/prototypes/ordening/angels-power.lua b/angelsindustries/prototypes/ordening/angels-power.lua index bbb1c6839..57a243395 100644 --- a/angelsindustries/prototypes/ordening/angels-power.lua +++ b/angelsindustries/prototypes/ordening/angels-power.lua @@ -256,6 +256,9 @@ if mods["bobpower"] then move_item("fluid-reactor-3", "angels-power-nuclear-reactor-a", "b[fluid-burner]-c") end + -- nuclear fuel + move_item("plutonium-nucleosynthesis", "angels-power-nuclear-processing", "a[uranium]-z[plutonium-harvest]", "recipe") + -- nuclear reactor if settings.startup["bobmods-power-nuclear"].value then data:extend( diff --git a/angelsindustries/prototypes/ordening/angels-vehicle-equipment.lua b/angelsindustries/prototypes/ordening/angels-vehicle-equipment.lua index f4f1be730..57e0b910b 100644 --- a/angelsindustries/prototypes/ordening/angels-vehicle-equipment.lua +++ b/angelsindustries/prototypes/ordening/angels-vehicle-equipment.lua @@ -92,6 +92,7 @@ if mods["bobvehicleequipment"] then ) reorder("item", "vehicle-motor", "angels-vehicle-equipment-bobpower-e", "a") reorder("item", "vehicle-engine", "angels-vehicle-equipment-bobpower-e", "b") + reorder("item", "vehicle-belt-immunity-equipment", "angels-vehicle-equipment-bobpower-e", "z") ----------------------------------------------------------------------------- -- ROBOT EQUIPMENT ---------------------------------------------------------- @@ -141,7 +142,7 @@ if mods["bobvehicleequipment"] then ) reorder("item", "vehicle-roboport-antenna-equipment", "angels-vehicle-equipment-bobrobot-c", "a") reorder("item", "vehicle-roboport-antenna-equipment-2", "angels-vehicle-equipment-bobrobot-c", "b") - reorder("item", "vehicle-roboport-antenna-equipment-3", "angels-vehicle-equipment-bobrobot-c", "e") + reorder("item", "vehicle-roboport-antenna-equipment-3", "angels-vehicle-equipment-bobrobot-c", "c") reorder("item", "vehicle-roboport-antenna-equipment-4", "angels-vehicle-equipment-bobrobot-c", "d") -- combined roboports diff --git a/angelsindustries/prototypes/ordening/angels-vehicles.lua b/angelsindustries/prototypes/ordening/angels-vehicles.lua index 10a01722f..76d470f42 100644 --- a/angelsindustries/prototypes/ordening/angels-vehicles.lua +++ b/angelsindustries/prototypes/ordening/angels-vehicles.lua @@ -59,4 +59,23 @@ if mods["bobwarfare"] then move_item("bob-artillery-wagon-2", "angels-vehicle-train-vanilla", data.raw["artillery-wagon"]["artillery-wagon"].order, "item-with-entity-data") move_item("bob-artillery-wagon-3", "angels-vehicle-train-vanilla", data.raw["artillery-wagon"]["artillery-wagon"].order, "item-with-entity-data") end +end + +------------------------------------------------------------------------------- +-- SPIDERTRON ----------------------------------------------------------------- +------------------------------------------------------------------------------- +move_item("spidertron-remote", "angels-vehicle-spidertron", "a[remote]", "spidertron-remote") +move_item("spidertron", "angels-vehicle-spidertron", "b[spidertron]", "item-with-entity-data") + +if mods["bobwarfare"] then + data.raw["item-subgroup"]["mech-parts"].group = "angels-vehicles" + data.raw["item-subgroup"]["mech-parts"].order = "cbb" + + move_item("antron", "angels-vehicle-spidertron", "b[spidertron]-a", "item-with-entity-data") + move_item("tankotron", "angels-vehicle-spidertron", "b[spidertron]-b", "item-with-entity-data") + move_item("spidertron", "angels-vehicle-spidertron", "b[spidertron]-c", "item-with-entity-data") + move_item("heavy-spidertron", "angels-vehicle-spidertron", "b[spidertron]-d", "item-with-entity-data") + move_item("logistic-spidertron", "angels-vehicle-spidertron", "b[spidertron]-e", "item-with-entity-data") + + move_item("spidertron-cannon", "mech-parts", "s[mech]-c") end \ No newline at end of file diff --git a/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-inserters-update.lua b/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-inserters-update.lua new file mode 100644 index 000000000..8c34aa9ec --- /dev/null +++ b/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-inserters-update.lua @@ -0,0 +1,66 @@ +if angelsmods.industries.components then + local OV = angelsmods.functions.OV + -- CUSTOM FIXES FOR BASE GAME ROBOTS (+ ANGELS) + + OV.patch_recipes( + { + { + name = "inserter", + ingredients = { + {"!!"}, + {type = "item", name = "circuit-grey", amount = 1}, + {type = "item", name = "mechanical-parts", amount = 1}, + {type = "item", name = "angels-servo-motor-1", amount = 1} + }, + }, + { + name = "long-handed-inserter", + ingredients = { + {"!!"}, + {type = "item", name = "inserter", amount = 1}, + {type = "item", name = "mechanical-parts", amount = 1}, + {type = "item", name = "angels-servo-motor-1", amount = 1} + }, + }, + { + name = "fast-inserter", + ingredients = { + {"!!"}, + {type = "item", name = "inserter", amount = 1}, + {type = "item", name = "circuit-red-loaded", amount = 2}, + {type = "item", name = "angels-servo-motor-1", amount = 1} + }, + }, + { + name = "filter-inserter", + ingredients = { + {"!!"}, + {type = "item", name = "fast-inserter", amount = 1}, + {type = "item", name = "circuit-red-loaded", amount = 3} + }, + }, + { + name = "stack-inserter", + ingredients = { + {"!!"}, + {type = "item", name = "fast-inserter", amount = 1}, + {type = "item", name = "circuit-green-loaded", amount = 4}, + {type = "item", name = "circuit-orange-loaded", amount = 1}, + {type = "item", name = "angels-servo-motor-2", amount = 2} + }, + }, + { + name = "stack-filter-inserter", + ingredients = { + {"!!"}, + {type = "item", name = "fast-inserter", amount = 1}, + {type = "item", name = "circuit-orange-loaded", amount = 3}, + {type = "item", name = "angels-servo-motor-3", amount = 1} + }, + }, + } + ) + OV.add_prereq("fast-inserter", "tech-red-circuit") + OV.add_prereq("stack-inserter", "tech-orange-circuit") + +end \ No newline at end of file diff --git a/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-other-entities-update.lua b/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-other-entities-update.lua new file mode 100644 index 000000000..e33fe3e40 --- /dev/null +++ b/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-other-entities-update.lua @@ -0,0 +1,191 @@ +if angelsmods.industries.components then + local OV = angelsmods.functions.OV + -- CUSTOM FIXES FOR BASE GAME ENTITIES THAT DO NOT FIT IN OTHER CATEGORIES (+ ANGELS) + OV.remove_prereq("water-treatment", "angels-fluid-control") + + OV.patch_recipes( + { + { + name = "offshore-pump", + ingredients = { + {"block-electronics-0", "block-electronics-1"} + } + --minable = { + -- results = { + -- {"block-electronics-0", "block-electronics-1"} + -- } + --} + }, + { + name = "stone-wall", + ingredients = { + {type = "item", name = "block-construction-2", amount = 1} + } + }, + { + name = "small-electric-pole", + ingredients = { + {type = "item", name = "wood", amount = 1}, + {type = "item", name = "cable-harness-1", amount = 1} + }, + results = { + {"!!"}, + {type = "item", name = "small-electric-pole", amount = 1} + }, + minable = { + results = { + {type = "item", name = "wood", amount = 1}, + {type = "item", name = "cable-harness-1", amount = 1} + } + } + }, + } + ) + + if not (mods["bobassembly"] or mods["bobelectronics"]) then + OV.patch_recipes( + { + { + name = "assembling-machine-1", + ingredients = { + {"block-electronics-0", "block-electronics-1"} + }, + minable = { + results = { + {"block-electronics-0", "block-electronics-1"} + } + } + }, + { + name = "lab", + ingredients = { + {"block-electronics-0", "block-electronics-1"} + }, + minable = { + results = { + {"block-electronics-0", "block-electronics-1"} + } + } + }, + } + ) + end + OV.add_prereq("automation-2", "angels-components-construction-2") + + ------------------------------------------------------------------------------- + -- BASE GAME TRAIN ------------------------------------------------------------ + ------------------------------------------------------------------------------- + OV.patch_recipes( + { + { + name = "locomotive", + ingredients = { + {"motor-1", "motor-2"}, + {"mechanical-parts", "steel-plate"}, + }, + minable = { + results = { + {"motor-1", "motor-2"}, + {"mechanical-parts", "steel-plate"}, + } + } + }, + { + name = "cargo-wagon", + ingredients = { + {"!!"}, + {"construction-frame-1", 10}, + {"angels-servo-motor-1", 15}, + {"circuit-red-loaded", 5}, + {"mechanical-parts", 5}, + {"steel-chest", 1}, + }, + minable = { + results = { + {"!!"}, + {"construction-frame-1", 10}, + {"angels-servo-motor-1", 15}, + {"circuit-red-loaded", 5}, + {"mechanical-parts", 5}, + {"steel-chest", 1}, + } + } + }, + { + name = "fluid-wagon", + ingredients = { + {"!!"}, + {"construction-frame-1", 10}, + {"angels-servo-motor-1", 15}, + {"circuit-red-loaded", 5}, + {"mechanical-parts", 5}, + {"storage-tank", 1}, + }, + minable = { + results = { + {"!!"}, + {"construction-frame-1", 10}, + {"angels-servo-motor-1", 15}, + {"circuit-red-loaded", 5}, + {"mechanical-parts", 5}, + {"storage-tank", 1}, + } + } + } + } + ) + if angelsmods.industries.tech then + else + OV.remove_prereq("railway", "engine") + OV.add_prereq("railway", "angels-components-mechanical-1") + OV.add_prereq("railway", "tech-red-circuit") + end + + ------------------------------------------------------------------------------- + -- ANGELS ROCKET -------------------------------------------------------------- + ------------------------------------------------------------------------------- + local rocket = data.raw.item["rocket-part"] + if rocket then + rocket.icon = "__angelsindustries__/graphics/icons/rocket.png" + rocket.icon_size = 64 + rocket.icon_mipmaps = 1 + rocket.icons = nil + rocket.subgroup = "angels-rocket" + rocket.order = "b[rocket]" + end + angelsmods.functions.remove_flag(rocket.name, "hidden") + OV.patch_recipes( + { + { + name = "rocket-part", + ingredients = { + {"!!"}, + {"angels-rocket-hull", 30}, + {"angels-rocket-ion-thruster", 05}, + {"angels-rocket-ion-booster", 01}, + {"angels-rocket-fusion-reactor", 02}, + {"angels-rocket-shield-array", 03}, + {"angels-rocket-laser-array", 03} + }, + energy_required = 3 * 100, + enabled = false, + hidden = false + } + } + ) + rocket = data.raw["rocket-silo"]["rocket-silo"] + if rocket then + rocket.rocket_parts_required = 1 + rocket.fixed_recipe = nil + end + OV.remove_prereq("rocket-silo", "speed-module-3") + OV.remove_prereq("rocket-silo", "productivity-module-3") + OV.remove_prereq("rocket-silo", "rocket-control-unit") + OV.remove_prereq("rocket-silo", "rocket-fuel") + OV.add_prereq("rocket-silo", "angels-rocket-hull") + OV.add_prereq("rocket-silo", "angels-rocket-ion-thruster") + OV.add_prereq("rocket-silo", "angels-rocket-fusion-reactor") + OV.add_prereq("rocket-silo", "angels-rocket-shield-array") + OV.set_science_pack("rocket-silo", "military-science-pack") + +end \ No newline at end of file diff --git a/angelsindustries/prototypes/overrides/components-base-entity-update.lua b/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-robots-update.lua similarity index 59% rename from angelsindustries/prototypes/overrides/components-base-entity-update.lua rename to angelsindustries/prototypes/overrides/components-base-entity-update/components-base-robots-update.lua index 7bf8b8b1d..531ed8735 100644 --- a/angelsindustries/prototypes/overrides/components-base-entity-update.lua +++ b/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-robots-update.lua @@ -1,122 +1,7 @@ -local OV = angelsmods.functions.OV if angelsmods.industries.components then - OV.patch_recipes( - { - { - name = "offshore-pump", - ingredients = { - {"block-electronics-0", "block-electronics-1"} - } - --minable = { - -- results = { - -- {"block-electronics-0", "block-electronics-1"} - -- } - --} - }, - { - name = "stone-wall", - ingredients = { - {type = "item", name = "block-construction-2", amount = 1} - } - }, - { - name = "small-electric-pole", - ingredients = { - {type = "item", name = "wood", amount = 1}, - {type = "item", name = "cable-harness-1", amount = 1} - }, - results = { - {"!!"}, - {type = "item", name = "small-electric-pole", amount = 1} - }, - minable = { - results = { - {type = "item", name = "wood", amount = 1}, - {type = "item", name = "cable-harness-1", amount = 1} - } - } - }, - { - name = "inserter", - ingredients = { - {"!!"}, - {type = "item", name = "circuit-grey", amount = 1}, - {type = "item", name = "mechanical-parts", amount = 1}, - {type = "item", name = "angels-servo-motor-1", amount = 1} - }, - }, - { - name = "long-handed-inserter", - ingredients = { - {"!!"}, - {type = "item", name = "inserter", amount = 1}, - {type = "item", name = "mechanical-parts", amount = 1}, - {type = "item", name = "angels-servo-motor-1", amount = 1} - }, - }, - { - name = "fast-inserter", - ingredients = { - {"!!"}, - {type = "item", name = "inserter", amount = 1}, - {type = "item", name = "circuit-red-loaded", amount = 2}, - {type = "item", name = "angels-servo-motor-1", amount = 1} - }, - }, - { - name = "filter-inserter", - ingredients = { - {"!!"}, - {type = "item", name = "fast-inserter", amount = 1}, - {type = "item", name = "circuit-red-loaded", amount = 3} - }, - }, - { - name = "stack-inserter", - ingredients = { - {"!!"}, - {type = "item", name = "fast-inserter", amount = 1}, - {type = "item", name = "circuit-green-loaded", amount = 4}, - {type = "item", name = "circuit-orange-loaded", amount = 1}, - {type = "item", name = "angels-servo-motor-2", amount = 2} - }, - }, - { - name = "stack-filter-inserter", - ingredients = { - {"!!"}, - {type = "item", name = "fast-inserter", amount = 1}, - {type = "item", name = "circuit-orange-loaded", amount = 3}, - {type = "item", name = "angels-servo-motor-3", amount = 1} - }, - }, - } - ) - OV.add_prereq("fast-inserter", "tech-red-circuit") - OV.add_prereq("stack-inserter", "tech-orange-circuit") + local OV = angelsmods.functions.OV + -- CUSTOM FIXES FOR BASE GAME INSERTERS (+ ANGELS) - if not (mods["bobassembly"] or mods["bobelectronics"]) then - OV.patch_recipes( - { - { - name = "assembling-machine-1", - ingredients = { - {"block-electronics-0", "block-electronics-1"} - }, - minable = { - results = { - {"block-electronics-0", "block-electronics-1"} - } - } - } - } - ) - end - OV.add_prereq("automation-2", "angels-components-construction-2") - - ------------------------------------------------------------------------------- - -- ANGELS ROBOTS -------------------------------------------------------------- - ------------------------------------------------------------------------------- OV.patch_recipes( { -- angels early game robots @@ -328,51 +213,7 @@ if angelsmods.industries.components then --OV.remove_science_pack("cargo-robots-3", "chemical-science-pack") OV.add_prereq("angels-construction-robots-3", "tech-blue-circuit") - - ------------------------------------------------------------------------------- - -- ANGELS ROCKET -------------------------------------------------------------- - ------------------------------------------------------------------------------- - local rocket = data.raw.item["rocket-part"] - if rocket then - rocket.icon = "__angelsindustries__/graphics/icons/rocket.png" - rocket.icon_size = 64 - rocket.icon_mipmaps = 1 - rocket.icons = nil - rocket.subgroup = "angels-rocket" - rocket.order = "b[rocket]" - end - angelsmods.functions.remove_flag(rocket.name, "hidden") - OV.patch_recipes( - { - { - name = "rocket-part", - ingredients = { - {"!!"}, - {"angels-rocket-hull", 30}, - {"angels-rocket-ion-thruster", 05}, - {"angels-rocket-ion-booster", 01}, - {"angels-rocket-fusion-reactor", 02}, - {"angels-rocket-shield-array", 03}, - {"angels-rocket-laser-array", 03} - }, - energy_required = 3 * 100, - enabled = false, - hidden = false - } - } - ) - rocket = data.raw["rocket-silo"]["rocket-silo"] - if rocket then - rocket.rocket_parts_required = 1 - rocket.fixed_recipe = nil - end - OV.remove_prereq("rocket-silo", "speed-module-3") - OV.remove_prereq("rocket-silo", "productivity-module-3") - OV.remove_prereq("rocket-silo", "rocket-control-unit") - OV.remove_prereq("rocket-silo", "rocket-fuel") - OV.add_prereq("rocket-silo", "angels-rocket-hull") - OV.add_prereq("rocket-silo", "angels-rocket-ion-thruster") - OV.add_prereq("rocket-silo", "angels-rocket-fusion-reactor") - OV.add_prereq("rocket-silo", "angels-rocket-shield-array") - OV.set_science_pack("rocket-silo", "military-science-pack") + + OV.add_prereq("logistic-robotics","cargo-robots-2") + OV.add_prereq("construction-robotics","angels-construction-robots") end \ No newline at end of file diff --git a/angelsindustries/prototypes/overrides/components-base-recipe-update.lua b/angelsindustries/prototypes/overrides/components-base-recipe-update.lua index 53be6af1e..33e1eeed7 100644 --- a/angelsindustries/prototypes/overrides/components-base-recipe-update.lua +++ b/angelsindustries/prototypes/overrides/components-base-recipe-update.lua @@ -10,11 +10,12 @@ if angelsmods.industries.components then replace_recipe_ing("accumulator","battery-1","battery-2") OV.remove_prereq("electric-energy-accumulators", "battery") OV.add_prereq("electric-energy-accumulators", "angels-components-batteries-2") - - replace_recipe_ing("flying-robot-frame","battery","battery-4") - OV.remove_prereq("robotics", "battery") - OV.add_prereq("robotics", "angels-components-batteries-4") - +--do i want to leave this for bobs bots? + --if (not mods["boblogistics"]) then --if i want to actually move it to battery-2 + replace_recipe_ing("flying-robot-frame","battery","battery-4") + OV.remove_prereq("robotics", "battery") + OV.add_prereq("robotics", "angels-components-batteries-4") + --end replace_recipe_ing("battery-equipment","battery-1","battery-3") OV.remove_prereq("battery-equipment", "battery") OV.add_prereq("battery-equipment", "angels-components-batteries-3") @@ -71,8 +72,8 @@ if angelsmods.industries.components then end if mods["bobmodules"] then + -- bob modules have their own overhaul else - log(serpent.block(data.raw.recipe["speed-module"])) OV.patch_recipes( { { diff --git a/angelsindustries/prototypes/overrides/components-block-update.lua b/angelsindustries/prototypes/overrides/components-block-update.lua index 6a1e74576..2c494d02d 100644 --- a/angelsindustries/prototypes/overrides/components-block-update.lua +++ b/angelsindustries/prototypes/overrides/components-block-update.lua @@ -28,48 +28,6 @@ if angelsmods.industries.components then OV.remove_prereq("angels-steel-smelting-1", "angels-metallurgy-2") OV.add_prereq("angels-steel-smelting-1", "angels-metallurgy-1") - -- split advanced glass smelting 1 in two seperate techs for battery 2 - data:extend( - { - { - type = "technology", - name = "angels-glass-melting", - icon = "__angelssmelting__/graphics/technology/glass-tech.png", - icon_size = 128, - prerequisites = { - "ore-crushing", - "powder-metallurgy-1" - }, - effects = { - { - type = "unlock-recipe", - recipe = "glass-mixture-1" - }, - { - type = "unlock-recipe", - recipe = "molten-glass-smelting" - } - }, - unit = { - count = 100, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1} - }, - time = 30 - }, - order = "c-a" - } - } - ) - OV.add_prereq("angels-glass-smelting-1", "angels-glass-melting") - OV.remove_prereq("angels-glass-smelting-1", "ore-crushing") - OV.remove_prereq("angels-glass-smelting-1", "powder-metallurgy-1") - OV.remove_unlock("angels-glass-smelting-1", "glass-mixture-1") - OV.remove_unlock("angels-glass-smelting-1", "molten-glass-smelting") - -- update depending technologies accordingly - OV.remove_prereq("angels-components-batteries-2", "angels-glass-smelting-1") - OV.add_prereq("angels-components-batteries-2", "angels-glass-melting") - ----------------------------------------------------------------------------- -- ADD ELECTRONIC RECIPES TO ELECTRONIC ASSMBLY ----------------------------- ----------------------------------------------------------------------------- @@ -229,7 +187,6 @@ if angelsmods.industries.components then } } ) - OV.add_unlock("logistic-science-pack", "block-construction-2") OV.add_prereq("advanced-ore-refining-1", "angels-basic-blocks-2") OV.add_prereq("ore-floatation", "angels-basic-blocks-2") OV.add_prereq("angels-metallurgy-2", "angels-basic-blocks-2") @@ -289,7 +246,6 @@ if angelsmods.industries.components then } } ) - OV.add_unlock("military-science-pack", "block-construction-3") OV.add_unlock("military-science-pack", "block-fluidbox-2") OV.add_unlock("military-science-pack", "block-mechanical-2") OV.add_prereq("ore-leaching", "angels-basic-blocks-3") @@ -353,7 +309,6 @@ if angelsmods.industries.components then } } ) - OV.add_unlock("logistic-science-pack", "block-construction-4") OV.add_prereq("ore-refining", "angels-advanced-blocks-1") OV.add_prereq("advanced-ore-refining-3", "angels-advanced-blocks-1") OV.add_prereq("angels-metallurgy-4", "angels-advanced-blocks-1") @@ -415,7 +370,6 @@ if angelsmods.industries.components then } } ) - OV.add_unlock("utility-science-pack", "block-construction-5") OV.add_prereq("advanced-ore-refining-4", "angels-advanced-blocks-2") OV.add_prereq("angels-metallurgy-5", "angels-advanced-blocks-2") end diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-assemblers-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-assemblers-update.lua new file mode 100644 index 000000000..820e9d0dd --- /dev/null +++ b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-assemblers-update.lua @@ -0,0 +1,37 @@ + +if angelsmods.industries.components then + local OV = angelsmods.functions.OV + -- CUSTOM FIXES FOR BOBS INSERTERS + + if mods["bobassembly"] then + OV.patch_recipes( + { + { + name = "assembling-machine-2", + ingredients = { + {"block-electronics-1", "block-electronics-2"} + }, + minable = { + results = { + {"block-electronics-1", "block-electronics-2"} + } + } + } + } + ) + end + + -- regular assemblers ingredient count + if data.raw["assembling-machine"]["assembling-machine-1"].ingredient_count and + data.raw["assembling-machine"]["assembling-machine-1"].ingredient_count < 4 + then -- required for tier 1 block automation + data.raw["assembling-machine"]["assembling-machine-1"].ingredient_count = 4 + end + + if data.raw["assembling-machine"]["assembling-machine-2"].ingredient_count and + data.raw["assembling-machine"]["assembling-machine-2"].ingredient_count < 5 + then -- required for tier 2 block automation + data.raw["assembling-machine"]["assembling-machine-2"].ingredient_count = 5 + end + +end \ No newline at end of file diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-inserters-update.lua similarity index 74% rename from angelsindustries/prototypes/overrides/components-bobs-entity-update.lua rename to angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-inserters-update.lua index 45a9c87f2..0c9571ae5 100644 --- a/angelsindustries/prototypes/overrides/components-bobs-entity-update.lua +++ b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-inserters-update.lua @@ -1,55 +1,9 @@ -local OV = angelsmods.functions.OV --- CUSTOM FIXES FOR BOBS -if angelsmods.industries.components then - if mods["bobassembly"] then - -- burner assemblers - OV.patch_recipes( - { - { - name = "assembling-machine-2", - ingredients = { - {"block-electronics-1", "block-electronics-2"} - }, - minable = { - results = { - {"block-electronics-1", "block-electronics-2"} - } - } - } - } - ) - end - -- regular assemblers - if data.raw["assembling-machine"]["assembling-machine-1"].ingredient_count and - data.raw["assembling-machine"]["assembling-machine-1"].ingredient_count < 4 - then -- required for tier 1 block automation - data.raw["assembling-machine"]["assembling-machine-1"].ingredient_count = 4 - end - if data.raw["assembling-machine"]["assembling-machine-2"].ingredient_count and - data.raw["assembling-machine"]["assembling-machine-2"].ingredient_count < 5 - then -- required for tier 2 block automation - data.raw["assembling-machine"]["assembling-machine-2"].ingredient_count = 5 - end +if angelsmods.industries.components then + local OV = angelsmods.functions.OV + -- CUSTOM FIXES FOR BOBS INSERTERS if mods["boblogistics"] then - if not mods["bobelectronics"] then - OV.patch_recipes( - { - { - name = "lab", - ingredients = { - {"block-electronics-0", "block-electronics-1"} - }, - minable = { - results = { - {"block-electronics-0", "block-electronics-1"} - } - } - }, - } - ) - end if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then OV.patch_recipes( @@ -60,7 +14,8 @@ if angelsmods.industries.components then {"!!"}, {type = "item", name = "inserter", amount = 1}, {type = "item", name = "circuit-grey", amount = 2}, - angelsmods.trigger.smelting_products["tin"].plate and {type = "item", name = "tin-plate", amount = 2} or nil + angelsmods.trigger.smelting_products["tin"].plate and + {type = "item", name = "angels-plate-tin", amount = 2} or nil } }, { @@ -155,7 +110,8 @@ if angelsmods.industries.components then {type = "item", name = "circuit-orange-loaded", amount = 1}, {type = "item", name = "angels-servo-motor-3", amount = 2}, {type = "item", name = "angels-plating", amount = 2}, - data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 1} or nil + data.raw.item["titanium-bearing"] and + {type = "item", name = "titanium-bearing", amount = 1} or nil } }, { @@ -166,7 +122,8 @@ if angelsmods.industries.components then {type = "item", name = "circuit-orange-loaded", amount = 2}, {type = "item", name = "angels-servo-motor-3", amount = 1}, {type = "item", name = "angels-plating", amount = 4}, - data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 1} or nil + data.raw.item["titanium-bearing"] and + {type = "item", name = "titanium-bearing", amount = 1} or nil } }, { @@ -177,7 +134,8 @@ if angelsmods.industries.components then {type = "item", name = "circuit-blue-loaded", amount = 2}, {type = "item", name = "angels-servo-motor-4", amount = 3}, {type = "item", name = "angels-plating", amount = 8}, - data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 1} or nil + data.raw.item["titanium-bearing"] and + {type = "item", name = "titanium-bearing", amount = 1} or nil } }, { @@ -188,7 +146,8 @@ if angelsmods.industries.components then {type = "item", name = "circuit-blue-loaded", amount = 3}, {type = "item", name = "angels-servo-motor-4", amount = 2}, {type = "item", name = "angels-plating", amount = 10}, - data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 1} or nil + data.raw.item["titanium-bearing"] and + {type = "item", name = "titanium-bearing", amount = 1} or nil } }, { @@ -199,7 +158,8 @@ if angelsmods.industries.components then {type = "item", name = "circuit-blue-loaded", amount = 1}, {type = "item", name = "angels-servo-motor-4", amount = 2}, {type = "item", name = "angels-strut", amount = 2}, - data.raw.item["nitinol-bearing"] and {type = "item", name = "nitinol-bearing", amount = 1} or nil + data.raw.item["nitinol-bearing"] and + {type = "item", name = "nitinol-bearing", amount = 1} or nil } }, { @@ -210,7 +170,8 @@ if angelsmods.industries.components then {type = "item", name = "circuit-blue-loaded", amount = 2}, {type = "item", name = "angels-servo-motor-4", amount = 1}, {type = "item", name = "angels-strut", amount = 4}, - data.raw.item["nitinol-bearing"] and {type = "item", name = "nitinol-bearing", amount = 1} or nil + data.raw.item["nitinol-bearing"] and + {type = "item", name = "nitinol-bearing", amount = 1} or nil } }, { @@ -221,7 +182,8 @@ if angelsmods.industries.components then {type = "item", name = "circuit-yellow-loaded", amount = 2}, {type = "item", name = "angels-servo-motor-5", amount = 3}, {type = "item", name = "angels-strut", amount = 8}, - data.raw.item["nitinol-bearing"] and {type = "item", name = "nitinol-bearing", amount = 1} or nil + data.raw.item["nitinol-bearing"] and + {type = "item", name = "nitinol-bearing", amount = 1} or nil } }, { @@ -232,7 +194,8 @@ if angelsmods.industries.components then {type = "item", name = "circuit-yellow-loaded", amount = 3}, {type = "item", name = "angels-servo-motor-5", amount = 2}, {type = "item", name = "angels-strut", amount = 10}, - data.raw.item["nitinol-bearing"] and {type = "item", name = "nitinol-bearing", amount = 1} or nil + data.raw.item["nitinol-bearing"] and + {type = "item", name = "nitinol-bearing", amount = 1} or nil } } } @@ -274,8 +237,10 @@ if angelsmods.industries.components then {type = "item", name = "fast-inserter", amount = 1}, {type = "item", name = "circuit-orange-loaded", amount = 2}, {type = "item", name = "angels-servo-motor-3", amount = 2}, - data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 6} or nil, - data.raw.item["titanium-gear-wheel"] and {type = "item", name = "titanium-gear-wheel", amount = 1} or nil + data.raw.item["titanium-bearing"] and + {type = "item", name = "titanium-bearing", amount = 6} or nil, + data.raw.item["titanium-gear-wheel"] and + {type = "item", name = "angels-spring", amount = 1} or nil } }, { @@ -285,8 +250,10 @@ if angelsmods.industries.components then {type = "item", name = "stack-inserter", amount = 1}, {type = "item", name = "circuit-orange-loaded", amount = 2}, {type = "item", name = "angels-servo-motor-3", amount = 2}, - data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 6} or nil, - data.raw.item["titanium-gear-wheel"] and {type = "item", name = "titanium-gear-wheel", amount = 1} or nil + data.raw.item["titanium-bearing"] and + {type = "item", name = "titanium-bearing", amount = 6} or nil, + data.raw.item["titanium-gear-wheel"] and + {type = "item", name = "angels-spring", amount = 1} or nil } }, { @@ -296,8 +263,10 @@ if angelsmods.industries.components then {type = "item", name = "fast-inserter", amount = 1}, {type = "item", name = "circuit-blue-loaded", amount = 1}, {type = "item", name = "angels-servo-motor-4", amount = 2}, - data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 1} or nil, - data.raw.item["titanium-gear-wheel"] and {type = "item", name = "titanium-gear-wheel", amount = 1} or nil + data.raw.item["titanium-bearing"] and + {type = "item", name = "titanium-bearing", amount = 1} or nil, + data.raw.item["titanium-gear-wheel"] and + {type = "item", name = "angels-spring", amount = 1} or nil } }, { @@ -307,8 +276,10 @@ if angelsmods.industries.components then {type = "item", name = "filter-inserter", amount = 1}, {type = "item", name = "circuit-blue-loaded", amount = 1}, {type = "item", name = "angels-servo-motor-4", amount = 2}, - data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 1} or nil, - data.raw.item["titanium-gear-wheel"] and {type = "item", name = "titanium-gear-wheel", amount = 1} or nil + data.raw.item["titanium-bearing"] and + {type = "item", name = "titanium-bearing", amount = 1} or nil, + data.raw.item["titanium-gear-wheel"] and + {type = "item", name = "angels-spring", amount = 1} or nil } }, { @@ -318,8 +289,10 @@ if angelsmods.industries.components then {type = "item", name = "stack-inserter", amount = 1}, {type = "item", name = "circuit-yellow-loaded", amount = 2}, {type = "item", name = "angels-servo-motor-5", amount = 2}, - data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 6} or nil, - data.raw.item["titanium-gear-wheel"] and {type = "item", name = "titanium-gear-wheel", amount = 1} or nil + data.raw.item["titanium-bearing"] and + {type = "item", name = "titanium-bearing", amount = 6} or nil, + data.raw.item["titanium-gear-wheel"] and + {type = "item", name = "angels-spring", amount = 1} or nil } }, { @@ -329,12 +302,15 @@ if angelsmods.industries.components then {type = "item", name = "stack-filter-inserter", amount = 1}, {type = "item", name = "circuit-yellow-loaded", amount = 2}, {type = "item", name = "angels-servo-motor-5", amount = 2}, - data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 6} or nil, - data.raw.item["titanium-gear-wheel"] and {type = "item", name = "titanium-gear-wheel", amount = 1} or nil + data.raw.item["titanium-bearing"] and + {type = "item", name = "titanium-bearing", amount = 6} or nil, + data.raw.item["titanium-gear-wheel"] and + {type = "item", name = "angels-spring", amount = 1} or nil } } } ) end end + end diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-labs-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-labs-update.lua new file mode 100644 index 000000000..1d2af2d58 --- /dev/null +++ b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-labs-update.lua @@ -0,0 +1,24 @@ +if angelsmods.industries.components then + local OV = angelsmods.functions.OV + + if mods["boblogistics"] then + if not mods["bobelectronics"] then + OV.patch_recipes( + { + { + name = "lab", + ingredients = { + {"block-electronics-0", "block-electronics-1"} + }, + minable = { + results = { + {"block-electronics-0", "block-electronics-1"} + } + } + }, + } + ) + end + end + +end \ No newline at end of file diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-robots-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-robots-update.lua new file mode 100644 index 000000000..e8546402f --- /dev/null +++ b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-robots-update.lua @@ -0,0 +1,149 @@ +if angelsmods.industries.components then + local OV = angelsmods.functions.OV + + if mods["boblogistics"] and settings.startup["bobmods-logistics-flyingrobotframes"].value == true then + -- flying robot frames + OV.patch_recipes( + { + { + name = "flying-robot-frame", + ingredients = + { + { "!!" }, + { type = "item", name = "circuit-orange-loaded", amount = 3 }, + { type = "item", name = "motor-3", amount = 1 }, + { type = "item", name = "construction-frame-3", amount = 1 }, + { type = "item", name = "battery-2", amount = 2 } + }, + }, + { + name = "flying-robot-frame-2", + ingredients = + { + { "!!" }, + { type = "item", name = "circuit-blue-loaded", amount = 3 }, + { type = "item", name = "motor-4", amount = 1 }, + { type = "item", name = "construction-frame-4", amount = 1 }, + { type = "item", name = "battery-3", amount = 2 } + }, + }, + { + name = "flying-robot-frame-3", + ingredients = + { + { "!!" }, + { type = "item", name = "circuit-blue-loaded", amount = 3 }, + { type = "item", name = "motor-4", amount = 1 }, + { type = "item", name = "construction-frame-4", amount = 1 }, + { type = "item", name = "battery-4", amount = 2 } + }, + }, + { + name = "flying-robot-frame-4", + ingredients = + { + { "!!" }, + { type = "item", name = "circuit-yellow-loaded", amount = 3 }, + { type = "item", name = "motor-5", amount = 1 }, + { type = "item", name = "construction-frame-5", amount = 1 }, + mods["bobplates"] and + { type = "item", name = "battery-6", amount = 2 } or + { type = "item", name = "battery-5", amount = 3 } + } + } + } + ) + -- base game late robots + OV.patch_recipes( + { + { + name = "construction-robot", + ingredients = { + {type = "item", name = "robot-brain-construction", amount = 1}, + {type = "item", name = "robot-tool-construction", amount = 1} + } + }, + { + name = "logistic-robot", + ingredients = { + {type = "item", name = "robot-brain-logistic", amount = 1}, + {type = "item", name = "robot-tool-logistic", amount = 1} + } + } + } + ) + end + + OV.remove_prereq("robotics", "angels-components-batteries-4") + OV.remove_prereq("robotics", "electric-engine") + OV.add_prereq("robotics", "angels-components-mechanical-3") + OV.add_prereq("robotics", "tech-orange-circuit") + + OV.add_prereq("bob-robotics-2", "angels-components-mechanical-4") + OV.add_prereq("bob-robotics-2", "tech-blue-circuit") + + OV.remove_prereq("bob-robotics-3", "titanium-processing") + OV.remove_prereq("bob-robotics-3", "advanced-electronics-2") + OV.remove_prereq("bob-robotics-3", "battery-2") + OV.add_prereq("bob-robotics-3", "angels-components-batteries-4") + OV.add_prereq("bob-robotics-3", "angels-components-mechanical-4") + OV.add_prereq("bob-robotics-3", "tech-blue-circuit") + + OV.remove_prereq("bob-robotics-4", "ceramics") + OV.remove_prereq("bob-robotics-4", "battery-3") + if data.raw.technology["angels-components-batteries-6"] then + OV.add_prereq("bob-robotics-4", "angels-components-batteries-6") + end + OV.add_prereq("bob-robotics-4", "angels-components-mechanical-5") + OV.add_prereq("bob-robotics-4", "tech-yellow-circuit") + + -- charging pads + OV.patch_recipes( + { + { + name = "roboport-chargepad-1", + ingredients = + { + { "!!" }, + { type = "item", name = "circuit-orange-loaded", amount = 5 }, + { type = "item", name = "cable-harness-3", amount = 2 }, + { type = "item", name = "battery-2", amount = 2 } + }, + }, + { + name = "roboport-chargepad-2", + ingredients = + { + { "!!" }, + { type = "item", name = "circuit-blue-loaded", amount = 5 }, + { type = "item", name = "cable-harness-4", amount = 2 }, + { type = "item", name = "battery-3", amount = 2 } + }, + }, + { + name = "roboport-chargepad-3", + ingredients = + { + { "!!" }, + { type = "item", name = "circuit-blue-loaded", amount = 5 }, + { type = "item", name = "cable-harness-4", amount = 2 }, + { type = "item", name = "battery-4", amount = 2 } + }, + }, + { + name = "roboport-chargepad-4", + ingredients = + { + { "!!" }, + { type = "item", name = "circuit-yellow-loaded", amount = 5 }, + { type = "item", name = "cable-harness-5", amount = 2 }, + { type = "item", name = "battery-5", amount = 2 } + }, + }, + } + ) + + OV.remove_prereq("bob-robo-modular-2", "bob-robotics-2") + OV.remove_prereq("bob-robo-modular-3", "bob-robotics-3") + OV.remove_prereq("bob-robo-modular-4", "bob-robotics-4") +end \ No newline at end of file diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-trains-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-trains-update.lua new file mode 100644 index 000000000..785615fef --- /dev/null +++ b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-trains-update.lua @@ -0,0 +1,123 @@ + +if angelsmods.industries.components then + local OV = angelsmods.functions.OV + -- CUSTOM FIXES FOR BOBS INSERTERS + + if mods["boblogistics"] then + local function swap_ingredients(recipe_name, ingredients_list) + return { + name = recipe_name, + ingredients = ingredients_list, + } + end + OV.patch_recipes( + { + swap_ingredients("bob-locomotive-2", { + {"circuit-green-loaded", "circuit-orange-loaded"}, + {"motor-2", "angels-gear"}, + {"locomotive", 1} + }), + swap_ingredients("bob-locomotive-3", { + {"motor-4", "angels-spring"}, + {"bob-locomotive-2", 1} + }), + swap_ingredients("bob-armoured-locomotive", { + {"circuit-orange-loaded", 5}, + {"motor-3", 20}, + {"mechanical-parts", 30}, + {"locomotive", 1} + }), + swap_ingredients("bob-armoured-locomotive-2", { + {"circuit-yellow-loaded", "circuit-blue-loaded"}, + {"motor-5", "angels-spring"}, + {"bob-armoured-locomotive", 1} + }), + swap_ingredients("bob-cargo-wagon-2", { + {"!!"}, + {"construction-frame-2", 10}, + {"angels-servo-motor-2", 15}, + {"circuit-green-loaded", 5}, + {"mechanical-parts", 5}, + data.raw.item["brass-chest"] and {"brass-chest", 1} or {"steel-chest", 2}, + {"cargo-wagon", 1} + }), + swap_ingredients("bob-cargo-wagon-3", { + {"!!"}, + {"construction-frame-4", 10}, + {"angels-servo-motor-4", 15}, + {"circuit-blue-loaded", 5}, + {"mechanical-parts", 5}, + data.raw.item["titanium-chest"] and {"titanium-chest", 1} or {"steel-chest", 4}, + {"bob-cargo-wagon-2", 1} + }), + swap_ingredients("bob-armoured-cargo-wagon", { + {"!!"}, + {"construction-frame-3", 10}, + {"angels-servo-motor-3", 15}, + {"circuit-orange-loaded", 5}, + {"mechanical-parts", 5}, + data.raw.item["brass-chest"] and {"brass-chest", 1} or {"steel-chest", 2}, + {"cargo-wagon", 1} + }), + swap_ingredients("bob-armoured-cargo-wagon-2", { + {"!!"}, + {"construction-frame-5", 10}, + {"angels-servo-motor-5", 15}, + {"circuit-yellow-loaded", 5}, + {"mechanical-parts", 5}, + data.raw.item["titanium-chest"] and {"titanium-chest", 1} or {"steel-chest", 4}, + {"bob-armoured-cargo-wagon", 1} + }), + swap_ingredients("bob-fluid-wagon-2", { + {"!!"}, + {"construction-frame-2", 10}, + {"angels-servo-motor-2", 15}, + {"circuit-green-loaded", 5}, + {"mechanical-parts", 5}, + {"storage-tank-2", 1}, + {"fluid-wagon", 1} + }), + swap_ingredients("bob-fluid-wagon-3", { + {"!!"}, + {"construction-frame-4", 10}, + {"angels-servo-motor-4", 15}, + {"circuit-blue-loaded", 5}, + {"mechanical-parts", 5}, + {"storage-tank-4", 1}, + {"bob-fluid-wagon-2", 1} + }), + swap_ingredients("bob-armoured-fluid-wagon", { + {"!!"}, + {"construction-frame-3", 10}, + {"angels-servo-motor-3", 15}, + {"circuit-orange-loaded", 5}, + {"mechanical-parts", 5}, + {"storage-tank-3", 1}, + {"fluid-wagon", 1} + }), + swap_ingredients("bob-armoured-fluid-wagon-2", { + {"!!"}, + {"construction-frame-5", 10}, + {"angels-servo-motor-5", 15}, + {"circuit-yellow-loaded", 5}, + {"mechanical-parts", 5}, + {"bob-storage-tank-all-corners-4", 1}, + {"bob-armoured-fluid-wagon", 1} + }) + } + ) + if angelsmods.industries.tech then + else + OV.remove_prereq("bob-railway-2", "advanced-electronics") + OV.add_prereq("bob-railway-2", "angels-components-mechanical-2") + OV.add_prereq("bob-railway-2", "tech-green-circuit") + OV.add_prereq("bob-railway-3", "angels-components-mechanical-4") + OV.add_prereq("bob-railway-3", "tech-blue-circuit") + OV.add_prereq("bob-armoured-railway", "angels-components-mechanical-3") + OV.add_prereq("bob-armoured-railway", "tech-orange-circuit") + OV.add_prereq("bob-armoured-railway-2", "angels-components-mechanical-5") + OV.add_prereq("bob-armoured-railway-2", "tech-yellow-circuit") + end + end + +end \ No newline at end of file diff --git a/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua b/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua index bd6e9c0d0..065c30b31 100644 --- a/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua +++ b/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua @@ -54,138 +54,7 @@ if angelsmods.industries.components then ----------------------------------------------------------------------------- if mods["bobelectronics"] then OV.disable_recipe("wooden-board-paper") - OV.remove_prereq("water-treatment", "electronics") end - - ----------------------------------------------------------------------------- - -- BOB LOGISTICS ------------------------------------------------------------ - ----------------------------------------------------------------------------- - if mods["boblogistics"] then - if settings.startup["bobmods-logistics-flyingrobotframes"].value == true then - -- flying robot frames - OV.patch_recipes( - { - { - name = "flying-robot-frame", - ingredients = - { - { "!!" }, - { type = "item", name = "circuit-orange-loaded", amount = 3 }, - { type = "item", name = "motor-3", amount = 1 }, - { type = "item", name = "construction-frame-3", amount = 1 }, - { type = "item", name = "battery-2", amount = 2 } - }, - }, - { - name = "flying-robot-frame-2", - ingredients = - { - { "!!" }, - { type = "item", name = "circuit-blue-loaded", amount = 3 }, - { type = "item", name = "motor-4", amount = 1 }, - { type = "item", name = "construction-frame-4", amount = 1 }, - { type = "item", name = "battery-3", amount = 2 } - }, - }, - { - name = "flying-robot-frame-3", - ingredients = - { - { "!!" }, - { type = "item", name = "circuit-blue-loaded", amount = 3 }, - { type = "item", name = "motor-4", amount = 1 }, - { type = "item", name = "construction-frame-4", amount = 1 }, - { type = "item", name = "battery-4", amount = 2 } - }, - }, - { - name = "flying-robot-frame-4", - ingredients = - { - { "!!" }, - { type = "item", name = "circuit-yellow-loaded", amount = 3 }, - { type = "item", name = "motor-5", amount = 1 }, - { type = "item", name = "construction-frame-5", amount = 1 }, - { type = "item", name = "battery-6", amount = 2 } - } - } - } - ) - - OV.remove_prereq("robotics", "angels-components-batteries-4") - OV.remove_prereq("robotics", "electric-engine") - OV.add_prereq("robotics", "angels-components-mechanical-3") - OV.add_prereq("robotics", "tech-orange-circuit") - - OV.add_prereq("bob-robotics-2", "angels-components-mechanical-4") - OV.add_prereq("bob-robotics-2", "tech-blue-circuit") - - OV.remove_prereq("bob-robotics-3", "titanium-processing") - OV.remove_prereq("bob-robotics-3", "advanced-electronics-2") - OV.remove_prereq("bob-robotics-3", "battery-2") - OV.add_prereq("bob-robotics-3", "angels-components-batteries-4") - OV.add_prereq("bob-robotics-3", "angels-components-mechanical-4") - OV.add_prereq("bob-robotics-3", "tech-blue-circuit") - - OV.remove_prereq("bob-robotics-4", "ceramics") - OV.remove_prereq("bob-robotics-4", "battery-3") - OV.add_prereq("bob-robotics-4", "angels-components-batteries-6") - OV.add_prereq("bob-robotics-4", "angels-components-mechanical-5") - OV.add_prereq("bob-robotics-4", "tech-yellow-circuit") - end - - -- charging pads - OV.patch_recipes( - { - { - name = "roboport-chargepad-1", - ingredients = - { - { "!!" }, - { type = "item", name = "circuit-orange-loaded", amount = 5 }, - { type = "item", name = "cable-harness-3", amount = 2 }, - { type = "item", name = "battery-2", amount = 2 } - }, - }, - { - name = "roboport-chargepad-2", - ingredients = - { - { "!!" }, - { type = "item", name = "circuit-blue-loaded", amount = 5 }, - { type = "item", name = "cable-harness-4", amount = 2 }, - { type = "item", name = "battery-3", amount = 2 } - }, - }, - { - name = "roboport-chargepad-3", - ingredients = - { - { "!!" }, - { type = "item", name = "circuit-blue-loaded", amount = 5 }, - { type = "item", name = "cable-harness-4", amount = 2 }, - { type = "item", name = "battery-4", amount = 2 } - }, - }, - { - name = "roboport-chargepad-4", - ingredients = - { - { "!!" }, - { type = "item", name = "circuit-yellow-loaded", amount = 5 }, - { type = "item", name = "cable-harness-5", amount = 2 }, - { type = "item", name = "battery-5", amount = 2 } - }, - }, - } - ) - - OV.remove_prereq("bob-robo-modular-2", "bob-robotics-2") - OV.remove_prereq("bob-robo-modular-3", "bob-robotics-3") - OV.remove_prereq("bob-robo-modular-4", "bob-robotics-4") - - end - ----------------------------------------------------------------------------- -- BOB REVAMP --------------------------------------------------------------- ----------------------------------------------------------------------------- diff --git a/angelsindustries/prototypes/overrides/components-entity-update.lua b/angelsindustries/prototypes/overrides/components-entity-update.lua index 01b8e8b0a..ad68b831d 100644 --- a/angelsindustries/prototypes/overrides/components-entity-update.lua +++ b/angelsindustries/prototypes/overrides/components-entity-update.lua @@ -12,8 +12,17 @@ if angelsmods.industries.components then OV.execute() end --- custom fixes -require("prototypes.overrides.components-base-entity-update") +-- custom fixes base game +require "prototypes.overrides.components-base-entity-update.components-base-other-entities-update" + +require "prototypes.overrides.components-base-entity-update.components-base-inserters-update" +require "prototypes.overrides.components-base-entity-update.components-base-robots-update" OV.execute() -require("prototypes.overrides.components-bobs-entity-update") + +-- custom fixes bobs mods +require "prototypes.overrides.components-bobs-entity-update.components-bobs-assemblers-update" +require "prototypes.overrides.components-bobs-entity-update.components-bobs-inserters-update" +require "prototypes.overrides.components-bobs-entity-update.components-bobs-labs-update" +require "prototypes.overrides.components-bobs-entity-update.components-bobs-robots-update" +require "prototypes.overrides.components-bobs-entity-update.components-bobs-trains-update" OV.execute() \ No newline at end of file diff --git a/angelsindustries/prototypes/overrides/components-recipe-update.lua b/angelsindustries/prototypes/overrides/components-recipe-update.lua index 9b9b50c78..ae3810b89 100644 --- a/angelsindustries/prototypes/overrides/components-recipe-update.lua +++ b/angelsindustries/prototypes/overrides/components-recipe-update.lua @@ -23,10 +23,6 @@ if angelsmods.industries.components then angelsmods.functions.add_flag("battery", "hidden") OV.disable_recipe({"battery"}) - -- OV.global_replace_item("iron-stick", "angels-rod-iron") - -- angelsmods.functions.add_flag("iron-stick", "hidden") - -- OV.disable_recipe({"iron-stick"}) - OV.global_replace_item("iron-gear-wheel", "angels-gear") angelsmods.functions.add_flag("iron-gear-wheel", "hidden") OV.disable_recipe({"iron-gear-wheel"}) diff --git a/angelsindustries/prototypes/overrides/global-components-recipe.lua b/angelsindustries/prototypes/overrides/global-components-recipe.lua index f082c19f2..d2a713d1f 100644 --- a/angelsindustries/prototypes/overrides/global-components-recipe.lua +++ b/angelsindustries/prototypes/overrides/global-components-recipe.lua @@ -12,7 +12,6 @@ if angelsmods.industries.components then ------------------------------------------------------------------------------- -- INTERMEDIATES -------------------------------------------------------------- ------------------------------------------------------------------------------- - -- OV.global_replace_item("iron-stick", "angels-rod-iron") OV.global_replace_item("iron-gear-wheel", "angels-gear") OV.global_replace_item("engine-unit", "motor-2") OV.global_replace_technology("engine", "angels-components-mechanical-2") diff --git a/angelsindustries/prototypes/overrides/global-tech-base-cores.lua b/angelsindustries/prototypes/overrides/global-tech-base-cores.lua index d754a5005..d85500ba3 100644 --- a/angelsindustries/prototypes/overrides/global-tech-base-cores.lua +++ b/angelsindustries/prototypes/overrides/global-tech-base-cores.lua @@ -131,14 +131,14 @@ if angelsmods.industries.tech then OV.set_science_pack("angels-red-loader", "datacore-logistic-1", 2) OV.set_science_pack("angels-blue-loader", "datacore-logistic-1", 2) core_replace("angels-rocket-ion-thruster", "war", "logistic") - -- PRESSURE TANKS ADDONS - if mods["angelsaddons-pressuretanks"] --[[angelsmods.addons.pressuretanks]] then - OV.set_science_pack("pressure-tanks", "datacore-logistic-1", 2) - OV.add_prereq("pressure-tanks", "tech-specialised-labs-basic-logistic-2") - end - --ORE SILO ADDONS - if mods["angelsaddons-oresilos"] --[[angelsmods.addons.oresilos]] then - core_replace("ore-silos", "processing", "logistic") + -- MOBILITY ADDONS + if mods["angelsaddons-storage"] then + if angelsmods.addons.storage.pressuretank then + OV.set_science_pack("pressure-tanks", "datacore-logistic-1", 2) + end + if angelsmods.addons.storage.silos or angelsmods.addons.storage.oresilos then + core_replace("ore-silos", "processing", "logistic") + end end ------------------------------------------------------------------------------- diff --git a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua index 63a8dc10f..81cfccc4b 100644 --- a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua +++ b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua @@ -67,8 +67,6 @@ if angelsmods.industries.tech then -- BASE GAME pack_replace("advanced-material-processing", "red", "green") --move advanced material processing up a tier pack_replace("lubricant", "blue", "green") - OV.remove_prereq("lubricant", "angels-advanced-oil-processing") - OV.add_prereq("lubricant", "angels-oil-processing") -- BIO PROCESSING OV.remove_prereq("bio-refugium-fish-1", "water-treatment-3") OV.add_prereq("bio-refugium-fish-1", "water-treatment-2") @@ -215,11 +213,13 @@ if angelsmods.industries.tech then -- BIO PROCESSING pack_replace("angels-bio-yield-module-3", "blue", "yellow") -- ADDONS - if mods["angelsaddons-warehouses"] then - pack_replace("angels-logistic-warehouses", "blue", "yellow") - end - if mods["angelsaddons-oresilos"] then - pack_replace("logistic-silos", "blue", "yellow") + if mods["angelsadons-storage"] then + if angelsmods.addons.storage.warehouses then + pack_replace("angels-logistic-warehouses", "blue", "yellow") + end + if angelsmods.addons.storage.silos then + pack_replace("logistic-silos", "blue", "yellow") + end end ------------------------------------------------------------------------------- diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua index f7da1e4f3..0e28f4b29 100644 --- a/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua +++ b/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua @@ -122,6 +122,10 @@ if angelsmods.industries.tech then OV.remove_science_pack("speed-module", "angels-science-pack-orange") OV.remove_science_pack("effectivity-module", "angels-science-pack-orange") OV.remove_science_pack("productivity-module", "angels-science-pack-orange") + OV.remove_science_pack("speed-module-3", "angels-science-pack-yellow") + OV.remove_science_pack("effectivity-module-3", "angels-science-pack-yellow") + OV.remove_science_pack("productivity-module-3", "angels-science-pack-yellow") + OV.remove_science_pack("angels-bio-yield-module-3", "angels-science-pack-yellow") end ------------------------------------------------------------------------------- diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua index b0966b444..ec3dbf839 100644 --- a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua +++ b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua @@ -21,6 +21,9 @@ if angelsmods.industries.tech then pack_replace("alien-green-research", "yellow", "blue") pack_replace("alien-red-research", "yellow", "blue") end + + pack_replace("tungsten-processing", "blue", "orange") + pack_replace("ceramics", "blue", "orange") end ------------------------------------------------------------------------------- @@ -143,6 +146,12 @@ if angelsmods.industries.tech then -- belt techs pack_replace("logistics-3", "blue", "orange") OV.remove_prereq("logistics-3", "tech-blue-packs") + -- railway + pack_replace("bob-railway-2", "green", "orange") + pack_replace("bob-armoured-railway-2", "blue", "yellow") + pack_replace("bob-fluid-wagon-2", "green", "orange") + pack_replace("bob-armoured-fluid-wagon-2", "blue", "yellow") + end ------------------------------------------------------------------------------- @@ -235,11 +244,23 @@ if angelsmods.industries.tech then pack_replace("bob-electric-energy-accumulators-2", "green", "orange") end if settings.startup["bobmods-power-fluidgenerator"].value == true then - pack_replace("fluid-generator-1", "red", "orange") + pack_replace("fluid-generator-3", "blue", "orange") end if settings.startup["bobmods-power-steam"].value == true then - pack_replace("bob-steam-engine-3", "green", "orange") + pack_replace("bob-steam-engine-4", "blue", "orange") + pack_replace("bob-boiler-4", "blue", "orange") + pack_replace("bob-oil-boiler-3", "blue", "orange") pack_replace("bob-steam-turbine-1", "green", "orange") + pack_replace("bob-heat-exchanger-2", "blue", "orange") + end + if settings.startup["bobmods-power-steam"].value == true or + settings.startup["bobmods-power-nuclear"].value == true or + settings.startup["bobmods-power-heatsources"].value == true then + pack_replace("bob-heat-pipe-2", "blue", "orange") + end + if settings.startup["bobmods-power-heatsources"].value == true then + pack_replace("burner-reactor-2", "blue", "orange") + pack_replace("fluid-reactor-2", "blue", "orange") end end diff --git a/angelsindustries/prototypes/overrides/global-tech-data.lua b/angelsindustries/prototypes/overrides/global-tech-data.lua index 2ec011546..53f40fc5f 100644 --- a/angelsindustries/prototypes/overrides/global-tech-data.lua +++ b/angelsindustries/prototypes/overrides/global-tech-data.lua @@ -55,7 +55,7 @@ if angelsmods.industries.tech then --removes enhancement core from module techs (not modules) for rec_4tech in pairs(data.raw.technology) do --fix modules to still work in bobs module lab - if string.find(rec_4tech,"-module-")~=nil then + if string.find(rec_4tech,"%-module%-") ~= nil then angelsmods.functions.add_exception(rec_4tech) end end @@ -101,4 +101,4 @@ if angelsmods.industries.tech then angelsmods.functions.add_exception(ignore) end end -end \ No newline at end of file +end diff --git a/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua b/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua index e4997b8b3..c176de31d 100644 --- a/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua +++ b/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua @@ -31,18 +31,9 @@ if angelsmods.industries.overhaul then ingredients = { {type = "item", name = "uranium-235", amount = 15} --halve }, - icons = { - {icon = "__base__/graphics/icons/atomic-bomb.png", icon_size = 64, icon_mipmaps = 4}, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - icon_size = 32, - shift = {-12, -12} - } - }, - icon_size = 32, - icon = nil + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("atomic-bomb"), + 1, angelsmods.industries.number_tint) }, { name = "uranium-fuel-cell", @@ -105,9 +96,10 @@ if angelsmods.industries.overhaul then } } ) - OV.remove_unlock("kovarex-enrichment-process", "kovarex-enrichment-process") + OV.disable_recipe("kovarex-enrichment-process") OV.add_unlock("nuclear-power", "angels-uranium-fuel-cell") data.raw.item["uranium-fuel-cell"].fuel_value = "2GJ" + data.raw.technology["kovarex-enrichment-process"].unit.count = 10 --down from 1500 (Considering empty) ------------------------------------------------------------------------------- -- Productivity @@ -158,7 +150,7 @@ if angelsmods.industries.overhaul then -- plutonium enrichment process if mods["bobrevamp"] and settings.startup["bobmods-revamp-rtg"].value then OV.add_prereq("bobingabout-enrichment-process", "angels-plutonium-power") - OV.patch_recipes({{name="bobingabout-enrichment-process", subgroup="angels-power-nuclear-processing", order="b[AMOX]-c[duplication]"}}) + OV.patch_recipes({{name = "bobingabout-enrichment-process", subgroup = "angels-power-nuclear-processing", order="b[AMOX]-c[duplication]"}}) else --if not rtg, remove bobingabout process OV.remove_unlock("bobingabout-enrichment-process", "bobingabout-enrichment-process") @@ -169,30 +161,32 @@ if angelsmods.industries.overhaul then angelsmods.functions.add_flag("plutonium-fuel-cell", "hide-from-fuel-tooltip") -- thorium processing - OV.remove_unlock("thorium-processing", "thorium-processing") + OV.disable_recipe("thorium-processing") OV.global_replace_technology("thorium-processing", "angels-thorium-power") OV.disable_technology("thorium-processing") angelsmods.functions.add_flag("thorium-fuel-cell", "hidden") angelsmods.functions.add_flag("thorium-fuel-cell", "hide-from-fuel-tooltip") - OV.remove_unlock("thorium-fuel-reprocessing", "thorium-fuel-reprocessing") + OV.disable_recipe("thorium-fuel-reprocessing") OV.disable_technology("thorium-fuel-reprocessing") angelsmods.functions.add_flag("used-up-thorium-fuel-cell", "hidden") - OV.remove_unlock("thorium-plutonium-fuel-cell", "thorium-plutonium-fuel-cell") + OV.disable_recipe("thorium-plutonium-fuel-cell") OV.disable_technology("thorium-plutonium-fuel-cell") angelsmods.functions.add_flag("thorium-plutonium-fuel-cell", "hidden") angelsmods.functions.add_flag("thorium-plutonium-fuel-cell", "hide-from-fuel-tooltip") -- deuterium processing - OV.remove_unlock("water-chemistry-2", "deuterium-fuel-cell") + OV.disable_recipe({"deuterium-fuel-cell","deuterium-fuel-cell-2"}) angelsmods.functions.add_flag("deuterium-fuel-cell", "hidden") angelsmods.functions.add_flag("deuterium-fuel-cell", "hide-from-fuel-tooltip") + angelsmods.functions.add_flag("deuterium-fuel-cell-2", "hidden") + angelsmods.functions.add_flag("deuterium-fuel-cell-2", "hide-from-fuel-tooltip") OV.global_replace_item("fusion-catalyst", "angels-muon-fusion-catalyst") angelsmods.functions.add_flag("fusion-catalyst", "hidden") - OV.remove_unlock("deuterium-fuel-reprocessing", "deuterium-fuel-reprocessing") + OV.disable_recipe("deuterium-fuel-reprocessing") OV.global_replace_technology("deuterium-fuel-reprocessing", "angels-fusion-power-1") OV.global_replace_technology("deuterium-fuel-cell-2", "angels-fusion-power-2") OV.disable_technology("deuterium-fuel-reprocessing", "deuterium-fuel-cell-2") @@ -202,27 +196,29 @@ if angelsmods.industries.overhaul then if bobmods.revamp and settings.startup["bobmods-revamp-nuclear"].value then --if overhaul, remove unlocks in each reactor tech --add each cell to each reactor... or would it be quicker to just set the setting? - OV.remove_unlock("plutonium-fuel-cell", "plutonium-fuel-cell") --keep as "uranium tier" + OV.disable_recipe("plutonium-fuel-cell") --keep as "uranium tier" OV.global_replace_technology("plutonium-fuel-cell", "angels-plutonium-power") OV.disable_technology("plutonium-fuel-cell") - if data.raw.item["thorium-fuel-cell"] and data.raw.reactor["nuclear-reactor-2"] then - OV.remove_unlock("bob-nuclear-power-2", "thorium-fuel-cell") - data.raw.item["angels-thorium-fuel-cell"].fuel_category = "thorium" - OV.add_prereq("bob-nuclear-power-2", "angels-thorium-power") + if data.raw.item["thorium-fuel-cell"] then + OV.disable_recipe("thorium-fuel-cell") + if data.raw.reactor["nuclear-reactor-2"] then + data.raw.item["angels-thorium-fuel-cell"].fuel_category = "thorium" + OV.add_prereq("bob-nuclear-power-2", "angels-thorium-power") + end end - if data.raw.item["deuterium-fuel-cell"] and data.raw.reactor["nuclear-reactor-3"] then - OV.remove_unlock("bob-nuclear-power-3", "deuterium-fuel-cell") - data.raw.item["angels-deuterium-fuel-cell"].fuel_category = "deuterium" - OV.add_prereq("bob-nuclear-power-3", "angels-fusion-power-1") + if data.raw.item["deuterium-fuel-cell"] then + OV.disable_recipe("deuterium-fuel-cell") + if data.raw.reactor["nuclear-reactor-3"] then + data.raw.item["angels-deuterium-fuel-cell"].fuel_category = "deuterium" + OV.add_prereq("bob-nuclear-power-3", "angels-fusion-power-1") + end end else --remove them from their individual techs - OV.remove_unlock("plutonium-fuel-cell", "plutonium-fuel-cell") + OV.disable_recipe({"plutonium-fuel-cell", "thorium-processing"}) OV.global_replace_technology("plutonium-fuel-cell", "angels-plutonium-power") OV.disable_technology("plutonium-fuel-cell") - - OV.remove_unlock("thorium-processing", "thorium-fuel-cell") end end diff --git a/angelsindustries/prototypes/overrides/replacement-fallbacks.lua b/angelsindustries/prototypes/overrides/replacement-fallbacks.lua index 853891355..299e255df 100644 --- a/angelsindustries/prototypes/overrides/replacement-fallbacks.lua +++ b/angelsindustries/prototypes/overrides/replacement-fallbacks.lua @@ -92,7 +92,6 @@ angelsmods.industries.general_replace={ ["titanium-gear-wheel"]={new="angels-spring",amt_multi=1,unlocked_by="titanium-processing"}, ["tungsten-gear-wheel"]={new="angels-bearing",amt_multi=1,unlocked_by="tungsten-processing"}, --intermediates (vanilla) - --["iron-stick"]={new="angels-rod-iron",amt_multi=1} --not sure if the right spot for this ["engine-unit"]={new="motor-2",amt_multi=1,unlocked_by="engine"}, ["electric-engine-unit"]={new="motor-4",amt_multi=1,unlocked_by="electric-engine"}, ["battery"]={new="battery-1",amt_multi=1} diff --git a/angelsindustries/prototypes/overrides/tech-mod-update.lua b/angelsindustries/prototypes/overrides/tech-mod-update.lua index 621d87525..67c624d9a 100644 --- a/angelsindustries/prototypes/overrides/tech-mod-update.lua +++ b/angelsindustries/prototypes/overrides/tech-mod-update.lua @@ -1,11 +1,14 @@ -- File to add fixes for certain mods local OV = angelsmods.functions.OV + if angelsmods.industries.tech then if mods["bobtech"] then if settings.startup["bobmods-burnerphase"].value then -- gets re-enabled as an unlock OV.disable_recipe("lab") OV.disable_technology("lab") + OV.global_replace_item("lab", "angels-basic-lab-2") + angelsmods.functions.add_flag("lab", "hide-from-bonus-gui") -- Allow steam science in basic lab local lab = data.raw.lab["angels-basic-lab"] @@ -14,5 +17,14 @@ if angelsmods.industries.tech then end end end - OV.execute() -end + + data.raw["item"]["satellite"].rocket_launch_product = { + type = "item", + name = "science-gravitational-analyzer", + amount = 1000 + } + data.raw.technology["space-science-pack"].icon = "__angelsindustries__/graphics/technology/tech-white.png" + data.raw.technology["space-science-pack"].icon_size = 128 + OV.add_unlock("space-science-pack", "angels-science-pack-white") + OV.add_unlock("space-science-pack", "angels-main-lab-7") +end \ No newline at end of file diff --git a/angelsindustries/prototypes/recipes/components-construction-recipes.lua b/angelsindustries/prototypes/recipes/components-construction-recipes.lua index b60a6617c..e6e89c13c 100644 --- a/angelsindustries/prototypes/recipes/components-construction-recipes.lua +++ b/angelsindustries/prototypes/recipes/components-construction-recipes.lua @@ -11,7 +11,7 @@ if angelsmods.industries.components then category = "crafting", energy_required = 0.5, ingredients = { - {type = "item", name = "angels-rod-iron", amount = 2} + {type = "item", name = "iron-stick", amount = 2} }, results = { {type = "item", name = "grate-iron", amount = 1} diff --git a/angelsindustries/prototypes/recipes/components-mechanical-recipes.lua b/angelsindustries/prototypes/recipes/components-mechanical-recipes.lua index b21042194..da3bc685a 100644 --- a/angelsindustries/prototypes/recipes/components-mechanical-recipes.lua +++ b/angelsindustries/prototypes/recipes/components-mechanical-recipes.lua @@ -382,7 +382,7 @@ if angelsmods.industries.components then category = "crafting", enabled = true, -- enabled from the start ingredients = { - {type = "item", name = "angels-rod-iron", amount = 1} + {type = "item", name = "iron-stick", amount = 1} }, results = { {type = "item", name = "angels-gear", amount = 2} diff --git a/angelsindustries/prototypes/recipes/logistics-entity.lua b/angelsindustries/prototypes/recipes/logistics-entity.lua index 7efcdf656..00693cbea 100644 --- a/angelsindustries/prototypes/recipes/logistics-entity.lua +++ b/angelsindustries/prototypes/recipes/logistics-entity.lua @@ -337,7 +337,7 @@ data:extend( enabled = false, energy_required = 5, ingredients = { - {type = "item", name = "electronic-circuit", amount = 1}, + {type = "item", name = mods["bobelectronics"] and "basic-circuit-board" or "electronic-circuit", amount = 1}, {type = "item", name = "copper-cable", amount = 3}, {type = "item", name = "iron-plate", amount = 1} }, diff --git a/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua b/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua index 1a4ebe536..bfe15781a 100644 --- a/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua +++ b/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua @@ -797,17 +797,9 @@ data:extend( name = "angels-atomic-bomb", enabled = false, energy_required = 50, - icons={ - {icon = "__base__/graphics/icons/atomic-bomb.png",icon_size = 64, icon_mipmaps = 4}, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.industries.number_tint, - icon_size=32, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size=32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("atomic-bomb"), + 2, angelsmods.industries.number_tint), ingredients = { {type = "item", name = "rocket-control-unit", amount = 10}, @@ -827,17 +819,9 @@ data:extend( category = "advanced-chemistry", enabled = false, energy_required = 50, - icons={ - {icon = "__base__/graphics/icons/atomic-bomb.png",icon_size = 64, icon_mipmaps = 4}, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.industries.number_tint, - scale = 0.32, - icon_size=32, - shift = {-12, -12} - } - }, - icon_size=32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("atomic-bomb"), + 3, angelsmods.industries.number_tint), ingredients = { {type = "item", name = "rocket-control-unit", amount = 20}, diff --git a/angelsindustries/prototypes/recipes/tech-science-packs-recipes.lua b/angelsindustries/prototypes/recipes/tech-science-packs-recipes.lua index 74ab08b73..a4a13c8d9 100644 --- a/angelsindustries/prototypes/recipes/tech-science-packs-recipes.lua +++ b/angelsindustries/prototypes/recipes/tech-science-packs-recipes.lua @@ -106,7 +106,7 @@ if angelsmods.industries.tech then energy_required = 3, enabled = true, ingredients = { - {type = "item", name = "angels-rod-iron", amount = 1}, + {type = "item", name = "iron-stick", amount = 1}, {type = "item", name = "angels-wire-copper", amount = 4} }, results = { diff --git a/angelsindustries/prototypes/technology/components-batteries-technology.lua b/angelsindustries/prototypes/technology/components-batteries-technology.lua index 97e489ed4..db9363577 100644 --- a/angelsindustries/prototypes/technology/components-batteries-technology.lua +++ b/angelsindustries/prototypes/technology/components-batteries-technology.lua @@ -9,7 +9,8 @@ if angelsmods.industries.components then type = "technology", name = "angels-components-batteries-1", icon = "__base__/graphics/technology/battery.png", - icon_size = 128, + icon_size = 256, + icon_mipmaps = 4, prerequisites = { --"angels-lead-smelting-1", "angels-sulfur-processing-1", @@ -54,7 +55,8 @@ if angelsmods.industries.components then type = "technology", name = "angels-components-batteries-2", icon = "__base__/graphics/technology/battery.png", - icon_size = 128, + icon_size = 256, + icon_mipmaps = 4, prerequisites = { "angels-tin-smelting-1", "angels-glass-smelting-1", @@ -103,7 +105,8 @@ if angelsmods.industries.components then type = "technology", name = "angels-components-batteries-3", --unlocks for basic blocks 3 which is a military tier (but does not have the packs) icon = "__base__/graphics/technology/battery.png", - icon_size = 128, + icon_size = 256, + icon_mipmaps = 4, prerequisites = { "angels-aluminium-smelting-1", "angels-cobalt-smelting-1", @@ -153,7 +156,8 @@ if angelsmods.industries.components then type = "technology", name = "angels-components-batteries-4", icon = "__base__/graphics/technology/battery.png", - icon_size = 128, + icon_size = 256, + icon_mipmaps = 4, prerequisites = { "angels-gold-smelting-1", --"plastic-1", @@ -202,7 +206,8 @@ if angelsmods.industries.components then type = "technology", name = "angels-components-batteries-5", icon = "__base__/graphics/technology/battery.png", - icon_size = 128, + icon_size = 256, + icon_mipmaps = 4, prerequisites = { "angels-platinum-smelting-1", "angels-components-batteries-4" @@ -254,7 +259,8 @@ if angelsmods.industries.components then type = "technology", name = "angels-components-batteries-6", icon = "__base__/graphics/technology/battery.png", - icon_size = 128, + icon_size = 256, + icon_mipmaps = 4, prerequisites = { "sodium-processing", "angels-tungsten-smelting-1", diff --git a/angelsindustries/prototypes/technology/components-mechanical-technology.lua b/angelsindustries/prototypes/technology/components-mechanical-technology.lua index b6e2f3cc5..96dc940c2 100644 --- a/angelsindustries/prototypes/technology/components-mechanical-technology.lua +++ b/angelsindustries/prototypes/technology/components-mechanical-technology.lua @@ -10,7 +10,8 @@ if angelsmods.industries.components then type = "technology", name = "angels-components-mechanical-1", icon = "__base__/graphics/technology/engine.png", - icon_size = 128, + icon_size = 256, + icon_mipmaps = 4, prerequisites = {}, effects = { { @@ -62,7 +63,8 @@ if angelsmods.industries.components then type = "technology", name = "angels-components-mechanical-2", icon = "__base__/graphics/technology/engine.png", - icon_size = 128, + icon_size = 256, + icon_mipmaps = 4, prerequisites = { "angels-components-mechanical-1", "angels-stone-smelting-2", @@ -116,7 +118,8 @@ if angelsmods.industries.components then type = "technology", name = "angels-components-mechanical-3", icon = "__base__/graphics/technology/engine.png", - icon_size = 128, + icon_size = 256, + icon_mipmaps = 4, prerequisites = { "angels-components-mechanical-2", --"angels-stone-smelting-2", @@ -170,7 +173,8 @@ if angelsmods.industries.components then type = "technology", name = "angels-components-mechanical-4", icon = "__base__/graphics/technology/electric-engine.png", - icon_size = 128, + icon_size = 256, + icon_mipmaps = 4, prerequisites = { "angels-components-mechanical-3", --"angels-stone-smelting-2", @@ -225,7 +229,8 @@ if angelsmods.industries.components then type = "technology", name = "angels-components-mechanical-5", icon = "__base__/graphics/technology/electric-engine.png", - icon_size = 128, + icon_size = 256, + icon_mipmaps = 4, prerequisites = { "angels-components-mechanical-4", --"angels-stone-smelting-2", diff --git a/angelsindustries/prototypes/technology/components-weapons-technology.lua b/angelsindustries/prototypes/technology/components-weapons-technology.lua index 110470e9b..45d7e45d1 100644 --- a/angelsindustries/prototypes/technology/components-weapons-technology.lua +++ b/angelsindustries/prototypes/technology/components-weapons-technology.lua @@ -9,7 +9,8 @@ data:extend( type = "technology", name = "angels-components-weapons-basic", icon = "__base__/graphics/technology/military.png", - icon_size = 128, + icon_size = 256, + icon_mipmaps = 4, prerequisites = {}, effects = { { @@ -68,7 +69,8 @@ data:extend( type = "technology", name = "angels-components-weapons-advanced", icon = "__base__/graphics/technology/military.png", - icon_size = 128, + icon_size = 256, + icon_mipmaps = 4, prerequisites = { "military-science-pack", "angels-titanium-smelting-1" diff --git a/angelsindustries/prototypes/technology/logistics-technology.lua b/angelsindustries/prototypes/technology/logistics-technology.lua index bc00bdced..becaec130 100644 --- a/angelsindustries/prototypes/technology/logistics-technology.lua +++ b/angelsindustries/prototypes/technology/logistics-technology.lua @@ -323,3 +323,11 @@ data:extend( -- }, } ) + +-- move circuit wires to electronics +local OV = angelsmods.functions.OV +for _, recipe_name in pairs({"green-wire", "red-wire"}) do + OV.remove_unlock("circuit-network", recipe_name) + OV.add_unlock("electronics", recipe_name) +end +OV.execute() \ No newline at end of file diff --git a/angelsindustries/prototypes/technology/vequip-technology.lua b/angelsindustries/prototypes/technology/vequip-technology.lua index 7462c4430..bebf9e26d 100644 --- a/angelsindustries/prototypes/technology/vequip-technology.lua +++ b/angelsindustries/prototypes/technology/vequip-technology.lua @@ -12,6 +12,10 @@ data:extend( { type = "unlock-recipe", recipe = "angels-burner-generator-vequip" + }, + { + type = "unlock-recipe", + recipe = "angels-repair-roboport-vequip" } }, unit = { @@ -37,10 +41,6 @@ data:extend( type = "unlock-recipe", recipe = "angels-fusion-reactor-vequip" }, - { - type = "unlock-recipe", - recipe = "angels-repair-roboport-vequip" - }, { type = "unlock-recipe", recipe = "angels-heavy-energy-shield-vequip" diff --git a/angelsinfiniteores/changelog.txt b/angelsinfiniteores/changelog.txt index cd6cac56d..d3128eb88 100644 --- a/angelsinfiniteores/changelog.txt +++ b/angelsinfiniteores/changelog.txt @@ -1,4 +1,28 @@ --------------------------------------------------------------------------------------------------- +Version: 0.9.9 +Date: ?? + Changes: + - Now shows icons next to the autoplace controls (542) + - Updated the dark-matter-replicators detection script (543) + - Fixed the infinite bob gem mine generation (525) + - Fixed that bobs ore from other ore settings were not removing superfluous ores +--------------------------------------------------------------------------------------------------- +Version: 0.9.8 +Date: 9.12.2020 + Changes: + - Added check for bobs mci before making infinite versions of bob ores +--------------------------------------------------------------------------------------------------- +Version: 0.9.7 +Date: 27.11.2020 + Changes: + - Fixed issue when loading without angels caused by last update +--------------------------------------------------------------------------------------------------- +Version: 0.9.6 +Date: 26.11.2020 + Changes: + - Updated localisation to include bobs infinite thorium (458) + - Updated for factorio version 1.1 +--------------------------------------------------------------------------------------------------- Version: 0.9.5 Date: 29.10.2020 Changes: diff --git a/angelsinfiniteores/data-updates.lua b/angelsinfiniteores/data-updates.lua index 54a3e399c..38c3cb8ce 100644 --- a/angelsinfiniteores/data-updates.lua +++ b/angelsinfiniteores/data-updates.lua @@ -1,6 +1,6 @@ require "prototypes.infiniteores-override" - +require("prototypes.generation.bob-options") -- EXECUTE OVERRIDES if not angelsmods.refining then angelsmods.functions.update_autoplace() -end +end \ No newline at end of file diff --git a/angelsinfiniteores/data.lua b/angelsinfiniteores/data.lua index 1a5be911e..8f29fb922 100644 --- a/angelsinfiniteores/data.lua +++ b/angelsinfiniteores/data.lua @@ -26,5 +26,7 @@ require("prototypes.generation.py-ore-inf") require("prototypes.generation.yuoki-ore-inf") +require("prototypes.generation.dm-tenemut") + -- EXECUTE FUNCTIONS angelsmods.functions.make_resource() diff --git a/angelsinfiniteores/info.json b/angelsinfiniteores/info.json index 3370ea4fe..474073567 100644 --- a/angelsinfiniteores/info.json +++ b/angelsinfiniteores/info.json @@ -1,15 +1,15 @@ { "name": "angelsinfiniteores", - "version": "0.9.5", - "factorio_version": "1.0", + "version": "0.9.9", + "factorio_version": "1.1", "title": "Angel's Infinite Ores", "author": "Arch666Angel", "contact": "", "homepage": "https://forums.factorio.com/viewforum.php?f=185", - "description": "Adds infinite ores for the base game, Bob's mods, Yuoki Industries, Uranium Power, Nucular, Dark Matter Replicators and the base ores for Angel's Refining. Best used with RSO mod to have infinite ores in the core of regular resource patches. Has config options to change the yield for all infinite resources including oil and gas.", + "description": "Adds infinite ores for the base game, Bob's mods, Yuoki Industries, Uranium Power, Nucular, Dark Matter Replicators and the base ores for Angel's Refining. Works well with RSO mod. Has config options to change the yield for all infinite resources including oil and gas.", "dependencies": [ - "base >= 0.18.27", - "? angelsrefining >= 0.11.11", + "base >= 1.1.24", + "? angelsrefining >= 0.11.19", "? rso-mod >= 2.3.3", "? bobores >= 0.18.3", "? bobplates >= 0.18.8", @@ -17,6 +17,7 @@ "? UraniumPower >= 0.6.3", "? Nucular >= 0.2.0", "? dark-matter-replicators >= 0.6.1", + "(?) dark-matter-replicators-18 >= 1.1.0", "? pycoalprocessing >= 1.3.4", "? pyrawores >= 1.5.2", "? pypetroleumhandling >= 1.2.4" diff --git a/angelsinfiniteores/locale/en/names.cfg b/angelsinfiniteores/locale/en/names.cfg index 9e0f1d633..aa0ed36c0 100644 --- a/angelsinfiniteores/locale/en/names.cfg +++ b/angelsinfiniteores/locale/en/names.cfg @@ -17,6 +17,7 @@ infinite-gem-ore=Infinite gem ore infinite-sulfur=Infinite sulfur infinite-silver-ore=Infinite silver ore infinite-cobalt-ore=Infinite cobalt ore +infinite-thorium-ore=Infinite thorium ore infinite-uraninite=Infinite uraninite infinite-fluorite=Infinite fluorite @@ -27,6 +28,7 @@ infinite-y-res2=Infinite F7-material chunk infinite-uranium-ore=Infinite uranium ore infinite-tenemut=Infinite tenemut cluster +infinite-dmr18-tenemut=Infinite tenemut cluster infinite-angels-ore1=Infinite saphirite infinite-angels-ore2=Infinite jivolite @@ -49,61 +51,10 @@ infinite-ore-titanium=Infinite titanium infinite-ore-zinc=Infinite zinc infinite-oil-sand=Infinite oil sand -[autoplace-control-names] -infinite-copper-ore=Infinite copper ore -infinite-iron-ore=Infinite iron ore -infinite-coal=Infinite coal -infinite-stone=Infinite stone - -infinite-tin-ore=Infinite tin ore -infinite-gold-ore=Infinite gold ore -infinite-bauxite-ore=Infinite aluminium ore -infinite-lead-ore=Infinite lead ore -infinite-quartz=Infinite silicon ore -infinite-rutile-ore=Infinite titanium ore -infinite-tungsten-ore=Infinite tungsten ore -infinite-zinc-ore=Infinite zinc ore -infinite-nickel-ore=Infinite nickel ore -infinite-gem-ore=Infinite gem ore -infinite-sulfur=Infinite sulfur -infinite-silver-ore=Infinite silver ore -infinite-cobalt-ore=Infinite cobalt ore - -infinite-angels-ore1=Infinite saphirite -infinite-angels-ore2=Infinite jivolite -infinite-angels-ore3=Infinite stiratite -infinite-angels-ore4=Infinite crotinnium -infinite-angels-ore5=Infinite rubyte -infinite-angels-ore6=Infinite bobmonium - -infinite-uraninite=Infinite uraninite -infinite-fluorite=Infinite fluorite - -infinite-y-res1=Infinite N4-Material chunk -infinite-y-res2=Infinite F7-Material chunk - -infinite-uranium-ore=Infinite uranium ore - -infinite-tenemut=Infinite tenemut cluster - -infinite-borax=Infinite borax -infinite-niobium=Infinite niobium -infinite-molybdenum-ore=Infinite molybdenum -infinite-ore-quartz=Infinite quartz -infinite-raw-coal=Infinite raw coal -infinite-ore-aluminium=Infinite aluminium -infinite-ore-chromium=Infinite chromium -infinite-ore-lead=Infinite lead -infinite-ore-nickel=Infinite nickel -infinite-ore-tin=Infinite tin -infinite-ore-titanium=Infinite titanium -infinite-ore-zinc=Infinite zinc -infinite-oil-sand=Infinite oil sand - [item-name] [mod-setting-name] -angels-infinite-yield=Minimum yield for infine ore +angels-infinite-yield=Minimum yield for infinite ore angels-lower-infinite-yield=Probability that infinite ore produces an output angels-enablefluidreq=Mining infinite ores requires fluids angels-keepuranacid=Mining uranium ore requires acid diff --git a/angelsinfiniteores/prototypes/generation/bob-options.lua b/angelsinfiniteores/prototypes/generation/bob-options.lua index ad3bf8efb..7965e7d15 100644 --- a/angelsinfiniteores/prototypes/generation/bob-options.lua +++ b/angelsinfiniteores/prototypes/generation/bob-options.lua @@ -1,37 +1,44 @@ -if bobmods.ores.settings.UnsortedGemOre == true then - bobmods.lib.resource.add_result("infinite-gem-ore", {name="gem-ore"}) -else - bobmods.lib.resource.add_result("infinite-gem-ore", {name="diamond-ore", probability = bobmods.gems.DiamondRatio}) - bobmods.lib.resource.add_result("infinite-gem-ore", {name="emerald-ore", probability = bobmods.gems.EmeraldRatio}) - bobmods.lib.resource.add_result("infinite-gem-ore", {name="amethyst-ore", probability = bobmods.gems.AmethystRatio}) - bobmods.lib.resource.add_result("infinite-gem-ore", {name="ruby-ore", probability = bobmods.gems.RubyRatio}) - bobmods.lib.resource.add_result("infinite-gem-ore", {name="sapphire-ore", probability = bobmods.gems.SapphireRatio}) - bobmods.lib.resource.add_result("infinite-gem-ore", {name="topaz-ore", probability = bobmods.gems.TopazRatio}) -end +if mods["bobores"] then + if bobmods.ores.settings.UnsortedGemOre == true then + bobmods.lib.resource.add_result("infinite-gem-ore", {name="gem-ore"}) + else + bobmods.lib.resource.add_result("infinite-gem-ore", {name="diamond-ore", probability = bobmods.gems.DiamondRatio}) + bobmods.lib.resource.add_result("infinite-gem-ore", {name="emerald-ore", probability = bobmods.gems.EmeraldRatio}) + bobmods.lib.resource.add_result("infinite-gem-ore", {name="amethyst-ore", probability = bobmods.gems.AmethystRatio}) + bobmods.lib.resource.add_result("infinite-gem-ore", {name="ruby-ore", probability = bobmods.gems.RubyRatio}) + bobmods.lib.resource.add_result("infinite-gem-ore", {name="sapphire-ore", probability = bobmods.gems.SapphireRatio}) + bobmods.lib.resource.add_result("infinite-gem-ore", {name="topaz-ore", probability = bobmods.gems.TopazRatio}) + --remove regular gems + bobmods.lib.resource.remove_result("infinite-gem-ore", "gem-ore") + end -if bobmods.ores.settings.GemsFromOtherOres == true then - bobmods.lib.resource.add_result("infinite-coal", {name="diamond-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.DiamondRatio}) + if bobmods.ores.settings.GemsFromOtherOres == true then + bobmods.lib.resource.add_result("infinite-coal", {name="diamond-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.DiamondRatio}) - bobmods.lib.resource.add_result("infinite-quartz", {name="emerald-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.EmeraldRatio}) - bobmods.lib.resource.add_result("infinite-quartz", {name="amethyst-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.AmethystRatio}) + bobmods.lib.resource.add_result("infinite-quartz", {name="emerald-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.EmeraldRatio}) + bobmods.lib.resource.add_result("infinite-quartz", {name="amethyst-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.AmethystRatio}) - bobmods.lib.resource.add_result("infinite-bauxite-ore", {name="ruby-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.RubyRatio}) - bobmods.lib.resource.add_result("infinite-bauxite-ore", {name="sapphire-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.SapphireRatio}) - bobmods.lib.resource.add_result("infinite-bauxite-ore", {name="topaz-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.TopazRatio}) -end + bobmods.lib.resource.add_result("infinite-bauxite-ore", {name="ruby-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.RubyRatio}) + bobmods.lib.resource.add_result("infinite-bauxite-ore", {name="sapphire-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.SapphireRatio}) + bobmods.lib.resource.add_result("infinite-bauxite-ore", {name="topaz-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.TopazRatio}) + angelsmods.functions.remove_resource("infinite-gem-ore") + end -if bobmods.ores.settings.LeadGivesNickel == true then - bobmods.lib.resource.add_result("infinite-lead-ore", {name = "nickel-ore", probability = bobmods.ores.settings.LeadNickelRatio}) -end + if bobmods.ores.settings.LeadGivesNickel == true then + bobmods.lib.resource.add_result("infinite-lead-ore", {name = "nickel-ore", probability = bobmods.ores.settings.LeadNickelRatio}) + angelsmods.functions.remove_resource("infinite-nickel-ore") + end -if bobmods.ores.settings.NickelGivesCobalt == true then - if bobmods.ores.nickel.enabled then - bobmods.lib.resource.add_result("infinite-nickel-ore", {name = "cobalt-ore", probability = bobmods.ores.settings.NickelCobaltRatio}) - else - if bobmods.ores.settings.LeadGivesNickel == true then - bobmods.lib.resource.add_result("infinite-lead-ore", {name = "cobalt-ore", probability = bobmods.ores.settings.LeadNickelRatio * bobmods.ores.settings.NickelCobaltRatio}) + if bobmods.ores.settings.NickelGivesCobalt == true then + angelsmods.functions.remove_resource("infinite-cobalt-ore") + if bobmods.ores.nickel.enabled then + bobmods.lib.resource.add_result("infinite-nickel-ore", {name = "cobalt-ore", probability = bobmods.ores.settings.NickelCobaltRatio}) + else + if bobmods.ores.settings.LeadGivesNickel == true then + bobmods.lib.resource.add_result("infinite-lead-ore", {name = "cobalt-ore", probability = bobmods.ores.settings.LeadNickelRatio * bobmods.ores.settings.NickelCobaltRatio}) + end end end end \ No newline at end of file diff --git a/angelsinfiniteores/prototypes/generation/bob-ore-inf.lua b/angelsinfiniteores/prototypes/generation/bob-ore-inf.lua index c8aacd914..ce6484b67 100644 --- a/angelsinfiniteores/prototypes/generation/bob-ore-inf.lua +++ b/angelsinfiniteores/prototypes/generation/bob-ore-inf.lua @@ -1,451 +1,453 @@ if bobmods and bobmods.ores then - if angelsmods.ores.disable_ore_override or (not angelsmods.refining) then - if data.raw.resource["bauxite-ore"] then - angelsmods.functions.add_resource("make", { - name = "infinite-bauxite-ore", - get = "bauxite-ore", - order = "b", - sheet = 3, - infinite = true, - glow = true, - var = 3, - map_color = {r=0.777, g=0.7, b=0.333}, - tint = {r=0.777, g=0.7, b=0.333}, - mining_time = 1, - type = "item", - minimum = angelsmods.ores.yield, - normal = 1500, - maximum = 6000, - acid_to_mine = "sulfuric-acid", - output_name = "bauxite-ore", - output_min = 1, - output_max = 1, - output_probability = angelsmods.ores.loweryield, - -- icon = "__bobores__/graphics/icons/bauxite-ore.png", - autoplace = { - starting_area = false, - resource_index = "bauxite-ore", - base_density = 5, - regular_rq_factor_multiplier = 0.3, - starting_rq_factor_multiplier = 0.5, - } - }) - end + if angelsmods.ores.disable_ore_override or (not angelsmods.refining) then + if mods['bobplates'] and settings.startup['bobmods-plates-oreoverride'].value then + if data.raw.resource['bauxite-ore'] then + angelsmods.functions.add_resource('make', { + name = 'infinite-bauxite-ore', + get = 'bauxite-ore', + order = 'b', + sheet = 3, + infinite = true, + glow = true, + var = 3, + map_color = {r = 0.777, g = 0.7, b = 0.333}, + tint = {r = 0.777, g = 0.7, b = 0.333}, + mining_time = 1, + type = 'item', + minimum = angelsmods.ores.yield, + normal = 1500, + maximum = 6000, + acid_to_mine = 'sulfuric-acid', + output_name = 'bauxite-ore', + output_min = 1, + output_max = 1, + output_probability = angelsmods.ores.loweryield, + -- icon = "__bobores__/graphics/icons/bauxite-ore.png", + autoplace = { + starting_area = false, + resource_index = 'bauxite-ore', + base_density = 5, + regular_rq_factor_multiplier = 0.3, + starting_rq_factor_multiplier = 0.5 + } + }) + end - if data.raw.resource["cobalt-ore"] then - angelsmods.functions.add_resource("make", { - name = "infinite-cobalt-ore", - get = "cobalt-ore", - order = "b", - sheet = 3, - infinite = true, - glow = true, - var = 3, - map_color = {r=0.18, g=0.35, b=0.53}, - tint = {r = 0.3, g = 0.53, b = 0.77}, - mining_time = 1, - type = "item", - minimum = angelsmods.ores.yield, - normal = 1500, - maximum = 6000, - acid_to_mine = "sulfuric-acid", - output_name = "cobalt-ore", - output_min = 1, - output_max = 1, - output_probability = angelsmods.ores.loweryield, - -- icon = "__bobores__/graphics/icons/cobalt-ore.png", - autoplace = { - starting_area = false, - --resource_index = 31, - base_density = 5, - regular_rq_factor_multiplier = 0.3, - starting_rq_factor_multiplier = 0.5, - } - }) - end + if data.raw.resource['cobalt-ore'] then + angelsmods.functions.add_resource('make', { + name = 'infinite-cobalt-ore', + get = 'cobalt-ore', + order = 'b', + sheet = 3, + infinite = true, + glow = true, + var = 3, + map_color = {r = 0.18, g = 0.35, b = 0.53}, + tint = {r = 0.3, g = 0.53, b = 0.77}, + mining_time = 1, + type = 'item', + minimum = angelsmods.ores.yield, + normal = 1500, + maximum = 6000, + acid_to_mine = 'sulfuric-acid', + output_name = 'cobalt-ore', + output_min = 1, + output_max = 1, + output_probability = angelsmods.ores.loweryield, + -- icon = "__bobores__/graphics/icons/cobalt-ore.png", + autoplace = { + starting_area = false, + -- resource_index = 31, + base_density = 5, + regular_rq_factor_multiplier = 0.3, + starting_rq_factor_multiplier = 0.5 + } + }) + end - if data.raw.resource["gem-ore"] then - angelsmods.functions.add_resource("make", { - name = "infinite-gem-ore", - get = "gem-ore", - order = "b", - sheet = 3, - infinite = true, - glow = true, - var = 3, - map_color = {r = 0, g = 1, b = 0}, - tint = {r = 0, g = 1, b = 0}, - mining_time = 1, - type = "item", - minimum = angelsmods.ores.yield, - normal = 1500, - maximum = 6000, - acid_to_mine = "sulfuric-acid", - output_name = "gem-ore", - output_min = 1, - output_max = 1, - output_probability = angelsmods.ores.loweryield, - -- icon = "__bobores__/graphics/icons/gem-ore.png", - autoplace = { - starting_area = false, - --resource_index = 32, - base_density = 5, - regular_rq_factor_multiplier = 0.3, - starting_rq_factor_multiplier = 0.5, - } - }) - end + if data.raw.resource['gem-ore'] then + angelsmods.functions.add_resource('make', { + name = 'infinite-gem-ore', + get = 'gem-ore', + order = 'b', + sheet = 3, + infinite = true, + glow = true, + var = 3, + map_color = {r = 0, g = 1, b = 0}, + tint = {r = 0, g = 1, b = 0}, + mining_time = 1, + type = 'item', + minimum = angelsmods.ores.yield, + normal = 1500, + maximum = 6000, + acid_to_mine = 'sulfuric-acid', + output_name = 'gem-ore', + output_min = 1, + output_max = 1, + output_probability = angelsmods.ores.loweryield, + -- icon = "__bobores__/graphics/icons/gem-ore.png", + autoplace = { + starting_area = false, + -- resource_index = 32, + base_density = 5, + regular_rq_factor_multiplier = 0.3, + starting_rq_factor_multiplier = 0.5 + } + }) + end - if data.raw.resource["gold-ore"] then - angelsmods.functions.add_resource("make", { - name = "infinite-gold-ore", - get = "gold-ore", - order = "b", - sheet = 3, - infinite = true, - glow = true, - var = 3, - map_color = {r=0.9, g=0.63, b=0}, - tint = {r = 1, g = 0.75, b = 0}, - mining_time = 1, - type = "item", - minimum = angelsmods.ores.yield, - normal = 1500, - maximum = 6000, - acid_to_mine = "sulfuric-acid", - output_name = "gold-ore", - output_min = 1, - output_max = 1, - output_probability = angelsmods.ores.loweryield, - -- icon = "__bobores__/graphics/icons/gold-ore.png", - autoplace = { - starting_area = false, - --resource_index = 33, - base_density = 5, - regular_rq_factor_multiplier = 0.3, - starting_rq_factor_multiplier = 0.5, - } - }) - end + if data.raw.resource['gold-ore'] then + angelsmods.functions.add_resource('make', { + name = 'infinite-gold-ore', + get = 'gold-ore', + order = 'b', + sheet = 3, + infinite = true, + glow = true, + var = 3, + map_color = {r = 0.9, g = 0.63, b = 0}, + tint = {r = 1, g = 0.75, b = 0}, + mining_time = 1, + type = 'item', + minimum = angelsmods.ores.yield, + normal = 1500, + maximum = 6000, + acid_to_mine = 'sulfuric-acid', + output_name = 'gold-ore', + output_min = 1, + output_max = 1, + output_probability = angelsmods.ores.loweryield, + -- icon = "__bobores__/graphics/icons/gold-ore.png", + autoplace = { + starting_area = false, + -- resource_index = 33, + base_density = 5, + regular_rq_factor_multiplier = 0.3, + starting_rq_factor_multiplier = 0.5 + } + }) + end - if data.raw.resource["lead-ore"] then - angelsmods.functions.add_resource("make", { - name = "infinite-lead-ore", - get = "lead-ore", - order = "b", - sheet = 3, - infinite = true, - glow = true, - var = 3, - map_color = {r=0.250, g=0.250, b=0.250}, - tint = {r = 0.5, g = 0.5, b = 0.5}, - mining_time = 1, - type = "item", - minimum = angelsmods.ores.yield, - normal = 1500, - maximum = 6000, - acid_to_mine = "sulfuric-acid", - output_name = "lead-ore", - output_min = 1, - output_max = 1, - output_probability = angelsmods.ores.loweryield, - -- icon = "__bobores__/graphics/icons/lead-ore.png", - autoplace = { - starting_area = false, - --resource_index = 34, - base_density = 5, - regular_rq_factor_multiplier = 0.3, - starting_rq_factor_multiplier = 0.5, - } - }) - end + if data.raw.resource['lead-ore'] then + angelsmods.functions.add_resource('make', { + name = 'infinite-lead-ore', + get = 'lead-ore', + order = 'b', + sheet = 3, + infinite = true, + glow = true, + var = 3, + map_color = {r = 0.250, g = 0.250, b = 0.250}, + tint = {r = 0.5, g = 0.5, b = 0.5}, + mining_time = 1, + type = 'item', + minimum = angelsmods.ores.yield, + normal = 1500, + maximum = 6000, + acid_to_mine = 'sulfuric-acid', + output_name = 'lead-ore', + output_min = 1, + output_max = 1, + output_probability = angelsmods.ores.loweryield, + -- icon = "__bobores__/graphics/icons/lead-ore.png", + autoplace = { + starting_area = false, + -- resource_index = 34, + base_density = 5, + regular_rq_factor_multiplier = 0.3, + starting_rq_factor_multiplier = 0.5 + } + }) + end - if data.raw.resource["nickel-ore"] then - angelsmods.functions.add_resource("make", { - name = "infinite-nickel-ore", - get = "nickel-ore", - order = "b", - sheet = 3, - infinite = true, - glow = true, - var = 3, - map_color = {r=0.380, g=0.560, b=0.515}, - tint = {r=0.54, g=0.8, b=0.75}, - mining_time = 1, - type = "item", - minimum = angelsmods.ores.yield, - normal = 1500, - maximum = 6000, - acid_to_mine = "sulfuric-acid", - output_name = "nickel-ore", - output_min = 1, - output_max = 1, - output_probability = angelsmods.ores.loweryield, - -- icon = "__bobores__/graphics/icons/nickel-ore.png", - autoplace = { - starting_area = false, - --resource_index = 35, - base_density = 5, - regular_rq_factor_multiplier = 0.3, - starting_rq_factor_multiplier = 0.5, - } - }) - end + if data.raw.resource['nickel-ore'] then + angelsmods.functions.add_resource('make', { + name = 'infinite-nickel-ore', + get = 'nickel-ore', + order = 'b', + sheet = 3, + infinite = true, + glow = true, + var = 3, + map_color = {r = 0.380, g = 0.560, b = 0.515}, + tint = {r = 0.54, g = 0.8, b = 0.75}, + mining_time = 1, + type = 'item', + minimum = angelsmods.ores.yield, + normal = 1500, + maximum = 6000, + acid_to_mine = 'sulfuric-acid', + output_name = 'nickel-ore', + output_min = 1, + output_max = 1, + output_probability = angelsmods.ores.loweryield, + -- icon = "__bobores__/graphics/icons/nickel-ore.png", + autoplace = { + starting_area = false, + -- resource_index = 35, + base_density = 5, + regular_rq_factor_multiplier = 0.3, + starting_rq_factor_multiplier = 0.5 + } + }) + end - if data.raw.resource["quartz"] then - angelsmods.functions.add_resource("make", { - name = "infinite-quartz", - get = "quartz", - order = "b", - sheet = 3, - infinite = true, - glow = true, - var = 3, - map_color = {r = 1, g = 1, b = 1}, - tint = {r = 1, g = 1, b = 1}, - mining_time = 1, - type = "item", - minimum = angelsmods.ores.yield, - normal = 1500, - maximum = 6000, - acid_to_mine = "sulfuric-acid", - output_name = "quartz", - output_min = 1, - output_max = 1, - output_probability = angelsmods.ores.loweryield, - -- icon = "__bobores__/graphics/icons/quartz.png", - autoplace = { - starting_area = false, - --resource_index = 36, - base_density = 5, - regular_rq_factor_multiplier = 0.3, - starting_rq_factor_multiplier = 0.5, - } - }) - end + if data.raw.resource['quartz'] then + angelsmods.functions.add_resource('make', { + name = 'infinite-quartz', + get = 'quartz', + order = 'b', + sheet = 3, + infinite = true, + glow = true, + var = 3, + map_color = {r = 1, g = 1, b = 1}, + tint = {r = 1, g = 1, b = 1}, + mining_time = 1, + type = 'item', + minimum = angelsmods.ores.yield, + normal = 1500, + maximum = 6000, + acid_to_mine = 'sulfuric-acid', + output_name = 'quartz', + output_min = 1, + output_max = 1, + output_probability = angelsmods.ores.loweryield, + -- icon = "__bobores__/graphics/icons/quartz.png", + autoplace = { + starting_area = false, + -- resource_index = 36, + base_density = 5, + regular_rq_factor_multiplier = 0.3, + starting_rq_factor_multiplier = 0.5 + } + }) + end - if data.raw.resource["rutile-ore"] then - angelsmods.functions.add_resource("make", { - name = "infinite-rutile-ore", - get = "rutile-ore", - order = "b", - sheet = 3, - infinite = true, - glow = true, - var = 3, - map_color = {r=0.610, g=0.325, b=0.500}, - tint = {r=0.8, g=0.55, b=0.7}, - mining_time = 1, - type = "item", - minimum = angelsmods.ores.yield, - normal = 1500, - maximum = 6000, - acid_to_mine = "sulfuric-acid", - output_name = "rutile-ore", - output_min = 1, - output_max = 1, - output_probability = angelsmods.ores.loweryield, - -- icon = "__bobores__/graphics/icons/rutile-ore.png", - autoplace = { - starting_area = false, - --resource_index = 37, - base_density = 5, - regular_rq_factor_multiplier = 0.3, - starting_rq_factor_multiplier = 0.5, - } - }) - end + if data.raw.resource['rutile-ore'] then + angelsmods.functions.add_resource('make', { + name = 'infinite-rutile-ore', + get = 'rutile-ore', + order = 'b', + sheet = 3, + infinite = true, + glow = true, + var = 3, + map_color = {r = 0.610, g = 0.325, b = 0.500}, + tint = {r = 0.8, g = 0.55, b = 0.7}, + mining_time = 1, + type = 'item', + minimum = angelsmods.ores.yield, + normal = 1500, + maximum = 6000, + acid_to_mine = 'sulfuric-acid', + output_name = 'rutile-ore', + output_min = 1, + output_max = 1, + output_probability = angelsmods.ores.loweryield, + -- icon = "__bobores__/graphics/icons/rutile-ore.png", + autoplace = { + starting_area = false, + -- resource_index = 37, + base_density = 5, + regular_rq_factor_multiplier = 0.3, + starting_rq_factor_multiplier = 0.5 + } + }) + end - if data.raw.resource["silver-ore"] then - angelsmods.functions.add_resource("make", { - name = "infinite-silver-ore", - get = "silver-ore", - order = "b", - sheet = 3, - infinite = true, - glow = true, - var = 3, - map_color = {r=0.578, g=0.684, b=0.695}, - tint = {r = 0.875, g = 0.975, b = 1}, - mining_time = 1, - type = "item", - minimum = angelsmods.ores.yield, - normal = 1500, - maximum = 6000, - acid_to_mine = "sulfuric-acid", - output_name = "silver-ore", - output_min = 1, - output_max = 1, - output_probability = angelsmods.ores.loweryield, - -- icon = "__bobores__/graphics/icons/silver-ore.png", - autoplace = { - starting_area = false, - --resource_index = 38, - base_density = 5, - regular_rq_factor_multiplier = 0.3, - starting_rq_factor_multiplier = 0.5, - } - }) - end + if data.raw.resource['silver-ore'] then + angelsmods.functions.add_resource('make', { + name = 'infinite-silver-ore', + get = 'silver-ore', + order = 'b', + sheet = 3, + infinite = true, + glow = true, + var = 3, + map_color = {r = 0.578, g = 0.684, b = 0.695}, + tint = {r = 0.875, g = 0.975, b = 1}, + mining_time = 1, + type = 'item', + minimum = angelsmods.ores.yield, + normal = 1500, + maximum = 6000, + acid_to_mine = 'sulfuric-acid', + output_name = 'silver-ore', + output_min = 1, + output_max = 1, + output_probability = angelsmods.ores.loweryield, + -- icon = "__bobores__/graphics/icons/silver-ore.png", + autoplace = { + starting_area = false, + -- resource_index = 38, + base_density = 5, + regular_rq_factor_multiplier = 0.3, + starting_rq_factor_multiplier = 0.5 + } + }) + end - if data.raw.resource["sulfur"] then - angelsmods.functions.add_resource("make", { - name = "infinite-sulfur", - get = "sulfur", - order = "b", - sheet = 3, - infinite = true, - glow = true, - var = 3, - map_color = {r=0.8, g=0.75, b=0.1}, - tint = {r = 0.8, g = 0.75, b = 0.1}, - mining_time = 1, - type = "item", - minimum = angelsmods.ores.yield, - normal = 1500, - maximum = 6000, - acid_to_mine = "water", - output_name = "sulfur", - output_min = 1, - output_max = 1, - output_probability = angelsmods.ores.loweryield, - -- icon = "__bobores__/graphics/icons/sulfur.png", - autoplace = { - starting_area = false, - --resource_index = 39, - base_density = 5, - regular_rq_factor_multiplier = 0.3, - starting_rq_factor_multiplier = 0.5, - } - }) - end + if data.raw.resource['sulfur'] then + angelsmods.functions.add_resource('make', { + name = 'infinite-sulfur', + get = 'sulfur', + order = 'b', + sheet = 3, + infinite = true, + glow = true, + var = 3, + map_color = {r = 0.8, g = 0.75, b = 0.1}, + tint = {r = 0.8, g = 0.75, b = 0.1}, + mining_time = 1, + type = 'item', + minimum = angelsmods.ores.yield, + normal = 1500, + maximum = 6000, + acid_to_mine = 'water', + output_name = 'sulfur', + output_min = 1, + output_max = 1, + output_probability = angelsmods.ores.loweryield, + -- icon = "__bobores__/graphics/icons/sulfur.png", + autoplace = { + starting_area = false, + -- resource_index = 39, + base_density = 5, + regular_rq_factor_multiplier = 0.3, + starting_rq_factor_multiplier = 0.5 + } + }) + end - if data.raw.resource["thorium-ore"] then - angelsmods.functions.add_resource("make", { - name = "infinite-thorium-ore", - get = "thorium-ore", - order = "b", - sheet = 2, - infinite = true, - glow = true, - var = 2, - map_color = {r = 0.600, g = 0.600, b = 0.600}, - tint = {r = 0.95, g = 0.95, b = 0.95}, - mining_time = 1, - type = "item", - minimum = angelsmods.ores.yield, - normal = 1500, - maximum = 6000, - acid_to_mine = "sulfuric-acid", - output_name = "thorium-ore", - output_min = 1, - output_max = 1, - output_probability = angelsmods.ores.loweryield, - -- icon = "__bobores__/graphics/icons/thorium-ore.png", - autoplace = { - starting_area = false, - --resource_index = 40, - base_density = 5, - regular_rq_factor_multiplier = 0.3, - starting_rq_factor_multiplier = 0.5, - } - }) - end - - if data.raw.resource["tin-ore"] then - angelsmods.functions.add_resource("make", { - name = "infinite-tin-ore", - get = "tin-ore", - order = "b", - sheet = 2, - infinite = true, - glow = true, - var = 2, - map_color = {r = 0.600, g = 0.600, b = 0.600}, - tint = {r = 0.95, g = 0.95, b = 0.95}, - mining_time = 1, - type = "item", - minimum = angelsmods.ores.yield, - normal = 1500, - maximum = 6000, - acid_to_mine = "sulfuric-acid", - output_name = "tin-ore", - output_min = 1, - output_max = 1, - output_probability = angelsmods.ores.loweryield, - -- icon = "__bobores__/graphics/icons/tin-ore.png", - autoplace = { - starting_area = false, - --resource_index = 40, - base_density = 5, - regular_rq_factor_multiplier = 0.3, - starting_rq_factor_multiplier = 0.5, - } - }) - end + if data.raw.resource['thorium-ore'] then + angelsmods.functions.add_resource('make', { + name = 'infinite-thorium-ore', + get = 'thorium-ore', + order = 'b', + sheet = 2, + infinite = true, + glow = true, + var = 2, + map_color = {r = 0.600, g = 0.600, b = 0.600}, + tint = {r = 0.95, g = 0.95, b = 0.95}, + mining_time = 1, + type = 'item', + minimum = angelsmods.ores.yield, + normal = 1500, + maximum = 6000, + acid_to_mine = 'sulfuric-acid', + output_name = 'thorium-ore', + output_min = 1, + output_max = 1, + output_probability = angelsmods.ores.loweryield, + -- icon = "__bobores__/graphics/icons/thorium-ore.png", + autoplace = { + starting_area = false, + -- resource_index = 40, + base_density = 5, + regular_rq_factor_multiplier = 0.3, + starting_rq_factor_multiplier = 0.5 + } + }) + end - if data.raw.resource["tungsten-ore"] then - angelsmods.functions.add_resource("make", { - name = "infinite-tungsten-ore", - get = "tungsten-ore", - order = "b", - sheet = 2, - infinite = true, - glow = true, - var = 2, - map_color = {r = 0.375, g = 0.25, b = 0.125}, - tint = {r = 0.75, g = 0.5, b = 0.25}, - mining_time = 1, - type = "item", - minimum = angelsmods.ores.yield, - normal = 1500, - maximum = 6000, - acid_to_mine = "sulfuric-acid", - output_name = "tungsten-ore", - output_min = 1, - output_max = 1, - output_probability = angelsmods.ores.loweryield, - -- icon = "__bobores__/graphics/icons/tungsten-ore.png", - autoplace = { - starting_area = false, - --resource_index = 41, - base_density = 5, - regular_rq_factor_multiplier = 0.3, - starting_rq_factor_multiplier = 0.5, - } - }) - end + if data.raw.resource['tin-ore'] then + angelsmods.functions.add_resource('make', { + name = 'infinite-tin-ore', + get = 'tin-ore', + order = 'b', + sheet = 2, + infinite = true, + glow = true, + var = 2, + map_color = {r = 0.600, g = 0.600, b = 0.600}, + tint = {r = 0.95, g = 0.95, b = 0.95}, + mining_time = 1, + type = 'item', + minimum = angelsmods.ores.yield, + normal = 1500, + maximum = 6000, + acid_to_mine = 'sulfuric-acid', + output_name = 'tin-ore', + output_min = 1, + output_max = 1, + output_probability = angelsmods.ores.loweryield, + -- icon = "__bobores__/graphics/icons/tin-ore.png", + autoplace = { + starting_area = false, + -- resource_index = 40, + base_density = 5, + regular_rq_factor_multiplier = 0.3, + starting_rq_factor_multiplier = 0.5 + } + }) + end - if data.raw.resource["zinc-ore"] then - angelsmods.functions.add_resource("make", { - name = "infinite-zinc-ore", - get = "zinc-ore", - order = "b", - sheet = 2, - infinite = true, - glow = true, - var = 2, - map_color = {r=0.47, g=1, b=0.96}, - tint = {r=0.34, g=0.9, b=0.81}, - mining_time = 1, - type = "item", - minimum = angelsmods.ores.yield, - normal = 1500, - maximum = 6000, - acid_to_mine = "sulfuric-acid", - output_name = "zinc-ore", - output_min = 1, - output_max = 1, - output_probability = angelsmods.ores.loweryield, - -- icon = "__bobores__/graphics/icons/zinc-ore.png", - autoplace = { - starting_area = false, - --resource_index = 42, - base_density = 5, - regular_rq_factor_multiplier = 0.3, - starting_rq_factor_multiplier = 0.5, - } - }) - end - end -end \ No newline at end of file + if data.raw.resource['tungsten-ore'] then + angelsmods.functions.add_resource('make', { + name = 'infinite-tungsten-ore', + get = 'tungsten-ore', + order = 'b', + sheet = 2, + infinite = true, + glow = true, + var = 2, + map_color = {r = 0.375, g = 0.25, b = 0.125}, + tint = {r = 0.75, g = 0.5, b = 0.25}, + mining_time = 1, + type = 'item', + minimum = angelsmods.ores.yield, + normal = 1500, + maximum = 6000, + acid_to_mine = 'sulfuric-acid', + output_name = 'tungsten-ore', + output_min = 1, + output_max = 1, + output_probability = angelsmods.ores.loweryield, + -- icon = "__bobores__/graphics/icons/tungsten-ore.png", + autoplace = { + starting_area = false, + -- resource_index = 41, + base_density = 5, + regular_rq_factor_multiplier = 0.3, + starting_rq_factor_multiplier = 0.5 + } + }) + end + + if data.raw.resource['zinc-ore'] then + angelsmods.functions.add_resource('make', { + name = 'infinite-zinc-ore', + get = 'zinc-ore', + order = 'b', + sheet = 2, + infinite = true, + glow = true, + var = 2, + map_color = {r = 0.47, g = 1, b = 0.96}, + tint = {r = 0.34, g = 0.9, b = 0.81}, + mining_time = 1, + type = 'item', + minimum = angelsmods.ores.yield, + normal = 1500, + maximum = 6000, + acid_to_mine = 'sulfuric-acid', + output_name = 'zinc-ore', + output_min = 1, + output_max = 1, + output_probability = angelsmods.ores.loweryield, + -- icon = "__bobores__/graphics/icons/zinc-ore.png", + autoplace = { + starting_area = false, + -- resource_index = 42, + base_density = 5, + regular_rq_factor_multiplier = 0.3, + starting_rq_factor_multiplier = 0.5 + } + }) + end + end + end +end diff --git a/angelsinfiniteores/prototypes/generation/dm-tenemut.lua b/angelsinfiniteores/prototypes/generation/dm-tenemut.lua index 5765f237a..f790ae758 100644 --- a/angelsinfiniteores/prototypes/generation/dm-tenemut.lua +++ b/angelsinfiniteores/prototypes/generation/dm-tenemut.lua @@ -1,154 +1,54 @@ -if angelsmods.ores.enableinfiniteores and angelsmods.ores.enableinfinitedarkmatter then - data.raw["resource"]["tenemut"].stages={sheet= - { - filename = "__angelsinfiniteores__/graphics/entity/ores/ore-7.png", - tint = {r=0.76, g=0.58, b=0.69}, - priority = "extra-high", - width = 38, - height = 38, - frame_count = 4, - variation_count = 8 - } - } +if angelsmods.ores.disable_ore_override or (not angelsmods.refining) then + local orename = {"tenemut","dmr18-tenemut"} + for _, ore in pairs(orename) do + if data.raw.resource[ore] ~= nil then + angelsmods.functions.add_resource("update", { + name = ore, + order = "b-ab", + autoplace = { + starting_area = true, + --resource_index = 1, + base_density = 10, + regular_rq_factor_multiplier = 1.10, + starting_rq_factor_multiplier = 1.5 + } + }) - data.raw["resource"]["tenemut"].map_color={r=0.76, g=0.58, b=0.69} + local output - if not angelsmods.ores.enablersomode then - data:extend( - { - { - type = "autoplace-control", - name = "infinite-tenemut", - richness = true, - order = "b-e" - }, - { - type = "noise-layer", - name = "infinite-tenemut" - }, - { - type = "resource", - name = "infinite-tenemut", - icon = "__dark-matter-replicators__/graphics/icons/tenemut.png", - flags = {"placeable-neutral"}, - order="a-b-e", - infinite=true, - minimum=angelsmods.ores.yield, - normal=1500, - maximum=6000, - minable = - { - hardness = 0.9, - mining_particle = "tenemut-particle", - mining_time = 4, - results = { - { - type = "item", - name = "tenemut", - amount_min = 1, - amount_max = 1, - probability = angelsmods.ores.loweryield - } - }, - }, - collision_box = {{ -0.1, -0.1}, {0.1, 0.1}}, - selection_box = {{ -0.5, -0.5}, {0.5, 0.5}}, - autoplace = - { - control = "infinite-tenemut", - sharpness = 1, - richness_multiplier = 5000, - richness_multiplier_distance_bonus = 20, - richness_base = 2000, - coverage = 0.01, - peaks = { - { - noise_layer = "infinite-tenemut", - noise_octaves_difference = -2.5, - noise_persistence = 0.3, - starting_area_weight_optimal = 0, - starting_area_weight_range = 0, - starting_area_weight_max_range = 2, - }, - { - noise_layer = "infinite-tenemut", - noise_octaves_difference = -2, - noise_persistence = 0.3, - starting_area_weight_optimal = 1, - starting_area_weight_range = 0, - starting_area_weight_max_range = 2, - }, - { - influence = 0.15, - starting_area_weight_optimal = 0, - starting_area_weight_range = 0, - starting_area_weight_max_range = 2, - } - } - }, - stage_counts = {1}, - stages = - { - sheet = - { - filename = "__angelsinfiniteores__/graphics/entity/ores-inf/ore-7-inf.png", - tint = {r=0.76, g=0.58, b=0.69}, - priority = "extra-high", - width = 38, - height = 38, - frame_count = 8, - variation_count = 1 - } - }, - map_color = {r=0.76, g=0.58, b=0.69}, - }, - }) - else - data:extend( - { - { - type = "resource", - name = "infinite-tenemut", - icon = "__dark-matter-replicators__/graphics/icons/tenemut.png", - flags = {"placeable-neutral"}, - order="a-b-e", - infinite=true, - minimum=angelsmods.ores.yield, - normal=1500, - maximum=6000, - minable = - { - hardness = 0.9, - mining_particle = "tenemut-particle", - mining_time = 4, - results = { - { - type = "item", - name = "tenemut", - amount_min = 1, - amount_max = 1, - probability = angelsmods.ores.loweryield + if data.raw.resource[ore].minable.result ~= nil then + output = data.raw.resource[ore].minable.result + end + + angelsmods.functions.add_resource("make", { + name = "infinite-" .. ore, + get = ore, + order = "b", + sheet = 7, + infinite = true, + glow = true, + var = 2, + map_color = {r=0.55, g=0.392, b=0.55}, + tint = {r=0.55, g=0.392, b=0.55}, + mining_time = 3, + type = "item", + minimum = angelsmods.ores.yield, + normal = 1500, + maximum = 6000, + acid_to_mine = data.raw.resource[ore].minable.required_fluid or "liquid-sulfuric-acid", + output_name = output, + output_min = 1, + output_max = 1, + output_probability = angelsmods.ores.loweryield, + icon = data.raw.resource[ore].icon, + autoplace = { + starting_area = false, + --resource_index = 1, + base_density = 5, + regular_rq_factor_multiplier = 0.3, + starting_rq_factor_multiplier = 0.5, } - }, - }, - collision_box = {{ -0.1, -0.1}, {0.1, 0.1}}, - selection_box = {{ -0.5, -0.5}, {0.5, 0.5}}, - stage_counts = {1}, - stages = - { - sheet = - { - filename = "__angelsinfiniteores__/graphics/entity/ores-inf/ore-7-inf.png", - tint = {r=0.76, g=0.58, b=0.69}, - priority = "extra-high", - width = 38, - height = 38, - frame_count = 8, - variation_count = 1 - } - }, - map_color = {r=0.76, g=0.58, b=0.69}, - }, - }) + }) + end end end \ No newline at end of file diff --git a/angelsinfiniteores/prototypes/generation/resource-builder.lua b/angelsinfiniteores/prototypes/generation/resource-builder.lua index 50e49809d..f67ea6398 100644 --- a/angelsinfiniteores/prototypes/generation/resource-builder.lua +++ b/angelsinfiniteores/prototypes/generation/resource-builder.lua @@ -10,6 +10,7 @@ if not angelsmods.functions.make_resource then { type = "autoplace-control", name = input.name, + localised_name = {"", "[entity="..input.name.."] ", {"entity-name."..input.name}}, richness = true, order = "b-" .. input.order, category = "resource" diff --git a/angelspetrochem/changelog.txt b/angelspetrochem/changelog.txt index 0a05ed0ca..e31297e8f 100644 --- a/angelspetrochem/changelog.txt +++ b/angelspetrochem/changelog.txt @@ -1,4 +1,24 @@ --------------------------------------------------------------------------------------------------- +Version: 0.9.18 +Date: ?? + Changes: + - Tweaked some technology tree prerequisites as cleanup (428) + - Disabled bobs valve as angels valves have an identical purpose with more features + - Added fuel values for vanilla fuels (for compatibility) (494) + - Removed obsolete inventory slots in the flare stack and converter valve + - Added fuel value containing fluids to the flamethrower turret accepted fluids + - Damage multiplier is a function of fuel value ratio with methane for "new" fuels + - Changed and expanded locale strings and text descriptions (489) + Bugfixes: + - Fixed that the converter valve could not be disabled (507) + - Fixed a crash in a very old migration script (535) +--------------------------------------------------------------------------------------------------- +Version: 0.9.17 +Date: 26.11.2020 + Changes: + - Updated to factorio version 1.1 + - Reviewed crude oil fuel value (its fine) +--------------------------------------------------------------------------------------------------- Version: 0.9.16 Date: 16.11.2020 Changes: diff --git a/angelspetrochem/data.lua b/angelspetrochem/data.lua index f78ff1812..fbad4debe 100644 --- a/angelspetrochem/data.lua +++ b/angelspetrochem/data.lua @@ -1,7 +1,7 @@ --INITIALIZE angelsmods = angelsmods or {} angelsmods.petrochem = angelsmods.petrochem or {} -angelsmods.petrochem.number_tint = {r = 1, g = 1, b = 1, a = 0.1} +angelsmods.petrochem.number_tint = {r = 1, g = 1, b = 1, a = 1} --TRIGGER CHECKS angelsmods.trigger = angelsmods.trigger or {} diff --git a/angelspetrochem/graphics/icons/gas.png b/angelspetrochem/graphics/icons/gas.png new file mode 100644 index 000000000..82392b632 Binary files /dev/null and b/angelspetrochem/graphics/icons/gas.png differ diff --git a/angelspetrochem/info.json b/angelspetrochem/info.json index 7fbbbc72c..e0c402209 100644 --- a/angelspetrochem/info.json +++ b/angelspetrochem/info.json @@ -1,17 +1,14 @@ { "name": "angelspetrochem", - "version": "0.9.16", - "factorio_version": "1.0", + "version": "0.9.18", + "factorio_version": "1.1", "title": "Angel's Petrochemical Processing", "author": "Arch666Angel", "contact": "https://discord.gg/ff5p6KE", "homepage": "https://forums.factorio.com/viewforum.php?f=185", "description": "Angel's Petrochemical processing changes Oil processing and adds Gas processing, as well as a more complex web of chemical production. Includes overrides and tie-ins to Bob's technologies and recipes. Dependencies: Angel's Refining", "dependencies": [ - "base >= 1.0.0", - - "angelsrefining >= 0.11.18", - + "angelsrefining >= 0.11.20", "? bobplates >= 0.18.8", "? bobassembly >= 0.18.5", "? bobrevamp >= 0.18.5" diff --git a/angelspetrochem/locale/en/petrochem.cfg b/angelspetrochem/locale/en/petrochem.cfg index f7dc82d2b..45065a125 100644 --- a/angelspetrochem/locale/en/petrochem.cfg +++ b/angelspetrochem/locale/en/petrochem.cfg @@ -82,10 +82,10 @@ liquid-rubber=Liquid rubber chemical-formula=[font=default-semibold][color=1,0.9,0.75]Chemical formula:[/color][/font] __1__ [recipe-name] -dirt-water-separation=Dirt water electrolysis: hydrogen, oxygen, slag -dirt-water-separation-2=Dirt water electrolysis: hydrogen, oxygen, slag, used electrode -water-separation=Purified water electrolysis: hydrogen, oxygen -water-separation-2=Purified water electrolysis: hydrogen, oxygen, used electrode +dirt-water-separation=Dirt water electrolysis +dirt-water-separation-2=Fast dirt water electrolysis +water-separation=Purified water electrolysis +water-separation-2=Fast purified water electrolysis water-gas-shift-1=Water gas shift water-gas-shift-2=Reverse water gas shift carbon-separation-1=Carbon monoxide @@ -93,40 +93,40 @@ carbon-separation-2=Carbon dioxide coke-purification=Carbon coal-crushed=Crushed coal solid-coke=Coke -coke-purification-2=Coke purification: carbon, sodium carbonate -solid-coke-sulfur=Clean coal to coke and sulfuric waste water +coke-purification-2=Coke purification +solid-coke-sulfur=Desulfurization of coal pellet-coke=Coke pellet -coal-cracking-1=Coal cracking gasification: coke, hydrogen sulfide gas, benzene gas, methane gas -coal-cracking-2=Coal cracking Bergius process: coke, metal catalyst carrier, naphtha, ngl, mineral-oil -coal-cracking-3=Coal cracking Fischer–Tropsch process: synthesis gas, carbon dioxide, hydrogen sulfide - -gas-separation=Natural gas separation: raw gas, condensates, sulfuric waste water -gas-refining=Raw gas refining: acid gas, ngl -gas-fractioning=Gas fractioning: methane gas, ethane gas, butane gas -gas-fractioning-synthesis=Advanced light gas fractioning: methane gas, ethane gas, butane gas, carbon monoxide -gas-fractioning-condensates=Advanced heavy gas fractioning: methane gas, ethane gas, butane gas, naphtha -gas-fractioning-residual=Advanced medium gas fractioning: methane gas, ethane gas, butane gas, toluene -condensates-refining=Condensates advanced cracking: coke, naphtha, methane gas -gas-synthesis-separation=Synthesis gas separation: carbon monoxide, hydrogen -gas-synthesis-methanation=Synthesis gas catalytic methanation: methane gas, ethane gas, butane gas +coal-cracking-1=Coal cracking gasification +coal-cracking-2=Coal cracking Bergius process +coal-cracking-3=Coal cracking Fischer–Tropsch process + +gas-separation=Natural gas separation +gas-refining=Raw gas refining +gas-fractioning=Gas fractioning +gas-fractioning-synthesis=Advanced light gas fractioning +gas-fractioning-condensates=Advanced heavy gas fractioning +gas-fractioning-residual=Advanced medium gas fractioning +condensates-refining=Condensates advanced cracking +gas-synthesis-separation=Synthesis gas separation +gas-synthesis-methanation=Synthesis gas catalytic methanation gas-synthesis-methanol=Catalytic synthesis to methanol steam-cracking-residual=Steam cracking residual gas to syngas -oil-separation=Oil Separation: raw gas, crude oil, sulfuric waste water -oil-refining=Oil Refining: mineral oil, fuel oil, naphtha -advanced-oil-refining=Advanced light oil refining: mineral oil, fuel oil, naphtha -residual-oil-refining=Advanced heavy oil refining: mineral oil, fuel oil, naphtha -condensates-oil-refining=Oil and condensates refining: mineral oil, fuel oil, naphtha -steam-cracking-naphtha=Steam cracking naphtha to syngas +oil-separation=Oil Separation +oil-refining=Oil Refining +advanced-oil-refining=Advanced light oil refining +residual-oil-refining=Advanced heavy oil refining +condensates-oil-refining=Oil and condensates refining +steam-cracking-naphtha=Steam cracking of naphtha to syngas liquid-mineral-oil-catalyst=Catalytic cracking of naphtha to mineral oil liquid-naphtha-catalyst=Catalytic synthesis of naphtha -steam-cracking-mineral-oil=Steam cracking mineral oil to syngas -steam-cracking-fuel-oil=Steam cracking fuel oil to syngas +steam-cracking-mineral-oil=Steam cracking of mineral oil to syngas +steam-cracking-fuel-oil=Steam cracking of fuel oil to syngas mineral-oil-lubricant=Lubricant -steam-cracking-methane=Steam cracking methane: methanol gas, residual gas -steam-cracking-ethane=Steam cracking ethane: ethylene gas, residual gas -steam-cracking-butane=Steam cracking butane: benzene gas, residual gas +steam-cracking-methane=Steam cracking of methane +steam-cracking-ethane=Steam cracking of ethane +steam-cracking-butane=Steam cracking of butane catalyst-steam-cracking-butane=Catalytic cracking naphtha to butadiene catalyst-steam-cracking-naphtha=Catalytic cracking naphtha to propene liquid-toluene-from-naphtha=Catalytic synthesis naphtha to toluene @@ -141,13 +141,13 @@ liquid-phenol-catalyst=Catalytic synthesis of phenol gas-propene-synthesis=Synthesis of propene liquid-ethylbenzene-catalyst=Catalytic synthesis of ethylbenzene liquid-bisphenol-a=Synthesis of bisphenol A -cumene-process=Cumene process: acetone, phenol -liquid-ethylene-carbonate=Ethylene Carbonate -gas-ethylene-oxide=Ethylene Oxide +cumene-process=Cumene process +liquid-ethylene-carbonate=Ethylene carbonate +gas-ethylene-oxide=Ethylene oxide -water-saline-separation=Saline water electrolysis: chlorine, hydrogen, sodium hydroxide -solid-salt-separation=Molten salt electrolysis: chlorine, sodium hydroxide -gas-hydrogen-chloride-separation=Separation of hydrogen chloride: chlorine, hydrogen +water-saline-separation=Saline water electrolysis +solid-salt-separation=Molten salt electrolysis +gas-hydrogen-chloride-separation=Separation of hydrogen chloride gas-chlor-methane=Synthesis of chloromethane gas-hydrogen-chloride=Synthesis of hydrogen chloride liquid-hydrochloric-acid=Synthesis of hydrochloric acid @@ -155,7 +155,7 @@ gas-allylchlorid=Synthesis of allyl chloride gas-epichlorhydrin=Synthesis of epichlorohydrin liquid-glycerol=Synthesis of glycerol solid-sodium-perchlorate=Sodium perchlorate -liquid-hydrochloric-acid-solid-sodium-sulfate=Synthesis of hydrochloric acid: sodium sulfate +liquid-hydrochloric-acid-solid-sodium-sulfate=Hydrochloric acid from salt solid-sodium-hydroxide-solid-sodium-sulfate=Synthesis of sodium sulfate angels-hydrogen-sulfide-enrichment=Hydrogen sulfide gas enrichment @@ -163,8 +163,8 @@ angels-water-enrichment=Water enrichment __1__ (from __2__% to __3__%) angels-water-enriched-cooling=Enriched water cooling __1__ angels-heavy-water-extraction=Heavy water separation angels-heavy-water-cooling=Heavy water cooling -angels-heavy-water-separation=Heavy water electrolysis: deuterium, oxygen -angels-heavy-water-separation-2=Heavy water electrolysis: deuterium, oxygen, used electrode +angels-heavy-water-separation=Heavy water electrolysis +angels-heavy-water-separation-2=Fast heavy water electrolysis solid-plastic-1=Propene plastic solid-plastic-2=Polyethylene plastic @@ -182,19 +182,19 @@ catalyst-metal-blue=Blue metal catalyst catalyst-metal-yellow=Yellow metal catalyst angels-electrode-used=Clean used electrode -gas-acid-catalyst=Catalytic cracking acid gas -solid-sulfur=Synthesis sulfur -gas-sulfur-dioxide=Synthesis sulfur dioxide -gas-sulfur-dioxide-calcium-sulfate=Synthesis sulfur dioxide from calcium sulfate -liquid-sulfuric-acid=Synthesis sulfuric acid -liquid-hydrofluoric-acid=Synthesis hydrofluoric acid +gas-acid-catalyst=Catalytic cracking of acid gas +solid-sulfur=Sulfur synthesis +gas-sulfur-dioxide=Sulfur dioxide synthesis +gas-sulfur-dioxide-calcium-sulfate=Sulfur dioxide synthesis from calcium sulfate +liquid-sulfuric-acid=Sulfuric acid synthesis +liquid-hydrofluoric-acid=Hydrofluoric acid synthesis liquid-hydrogen-fluoride=Hydrogen fluoride dissolving gas-hydrogen-fluoride=Hydrogen fluoride gas seperation angels-sulfur-scrubber=Sulfur air scrubbing -angels-sulfur-air-scrubbing=Lime filter recycling: acid gas +angels-sulfur-air-scrubbing=Acid gas from lime filter recycling -air-filtering=Air filtering: compressed air -air-separation=Air separation: nitrogen gas, oxygen gas +air-filtering=Air compression +air-separation=Air separation gas-ammonia=Ammonia synthesis gas-nitrogen-monoxide=Nitrogen monoxide synthesis gas-nitrogen-dioxide=Nitrogen dioxide synthesis @@ -208,8 +208,8 @@ gas-methylamine=Methylamine gas gas-dimethylamine=Dimethylamine gas gas-dimethylhydrazine=Dimethylhydrazine gas -solid-sodium-nitrate-processing=Sodium nitrate: nitrogen monoxide, nitrogen dioxide -sodium-nitrate-acid-processing=Sodium nitrate acid synthesis +solid-sodium-nitrate-processing=Sodium nitrate to nitric gasses +sodium-nitrate-acid-processing=Sodium nitrate to nitric acid converter-angels=Convert __1__ to __2__ @@ -283,6 +283,63 @@ angels-electric-boiler=Electric boiler 1 angels-electric-boiler-2=Electric boiler 2 angels-electric-boiler-3=Electric boiler 3 +[entity-description] +advanced-chemical-plant=Most versatile chemical machine, can process up to 3 fluid inputs and/or 3 fluid outputs. +advanced-chemical-plant-2=Most versatile chemical machine, can process up to 3 fluid inputs and/or 3 fluid outputs. + +angels-flare-stack=Burns excess chemicals at the cost of high pollution. + +angels-fluid-splitter-2-way=2-way fluid splitter +angels-fluid-splitter-3-way=3-way fluid splitter + +gas-refinery-small=Machine for fractioning of short-chained mixtures. +gas-refinery-small-2=Machine for fractioning of short-chained mixtures. +gas-refinery-small-3=Machine for fractioning of short-chained mixtures. +gas-refinery-small-4=Machine for fractioning of short-chained mixtures. + +gas-refinery=Machine for fractioning of short-chained mixtures, can use up to 4 outputs. +gas-refinery-2=Machine for fractioning of short-chained mixtures, can use up to 4 outputs. +gas-refinery-3=Machine for fractioning of short-chained mixtures, can use up to 4 outputs. +gas-refinery-4=Machine for fractioning of short-chained mixtures, can use up to 4 outputs. + +separator=Machine for separating hydrophobic liquids from gasses. +separator-2=Machine for separating hydrophobic liquids from gasses. +separator-3=Machine for separating hydrophobic liquids from gasses. +separator-4=Machine for separating hydrophobic liquids from gasses. + +steam-cracker=Uses steam to break down long molecules, and re-combines them into new compounds. +steam-cracker-2=Uses steam to break down long molecules, and re-combines them into new compounds. +steam-cracker-3=Uses steam to break down long molecules, and re-combines them into new compounds. +steam-cracker-4=Uses steam to break down long molecules, and re-combines them into new compounds. + +angels-electrolyser=Uses electricity to break strong chemical bonds. +angels-electrolyser-2=Uses electricity to break strong chemical bonds. +angels-electrolyser-3=Uses electricity to break strong chemical bonds. +angels-electrolyser-4=Uses electricity to break strong chemical bonds. + +angels-air-filter=Makes environmental air accessible for further processing. +angels-air-filter-2=Makes environmental air accessible for further processing. + +angels-chemical-plant=Versatile chemical machine, can process up to 2 fluid inputs and/or 2 fluid outputs. +angels-chemical-plant-2=Versatile chemical machine, can process up to 2 fluid inputs and/or 2 fluid outputs. +angels-chemical-plant-3=Versatile chemical machine, can process up to 2 fluid inputs and/or 2 fluid outputs. +angels-chemical-plant-4=Versatile chemical machine, can process up to 2 fluid inputs and/or 2 fluid outputs. + +valve-inspector=Pipe section that can hold 1000 units of fluid and can be connected to a wire. +valve-return=Only allows one directional flow. +valve-overflow=Allows flow if the input side is above 80%. +valve-converter=Converts base game fluids to Angel's mod fluids and vice versa. +valve-underflow=Allows flow if the output side is below 80%. + +oil-refinery=Machine for fractioning of long-chained mixtures. +oil-refinery-2=Machine for fractioning of long-chained mixtures. +oil-refinery-3=Machine for fractioning of long-chained mixtures. +oil-refinery-4=Machine for fractioning of long-chained mixtures. + +angels-electric-boiler=Uses electricity to turn water into steam. +angels-electric-boiler-2=Uses electricity to turn water into steam. +angels-electric-boiler-3=Uses electricity to turn water into steam. + [item-name] solid-sodium-hydroxide=Sodium hydroxide solid-sodium-hypochlorite=Sodium hypochlorite @@ -314,7 +371,7 @@ solid-carbon=Carbon solid-coke=Coke pellet-coke=Coke pellet -catalyst-metal-carrier=Metal catalyst carrier +catalyst-metal-carrier=Metal-catalyst carrier catalyst-metal-red=Red metal catalyst catalyst-metal-green=Green metal catalyst catalyst-metal-blue=Blue metal catalyst @@ -371,21 +428,15 @@ angels-air-filter=Air filter 1 angels-air-filter-2=Air filter 2 valve-inspector=Inspector valve -valve-return=No-return valve +valve-return=Non-return valve valve-overflow=Overflow valve valve-converter=Converter valve valve-underflow=Top-up valve [item-description] -angels-flare-stack=Burns excess chemicals (chemical void). angels-fluid-splitter-2-way=Splits fluids between two outputs. Stops working if one output is blocked. angels-fluid-splitter-3-way=Splits fluids between three outputs. Stops working if one output is blocked. -valve-inspector=Pipe section that can hold 1000 units of fluid and can be connected to a wire. -valve-return=Only allows one directional flow. -valve-overflow=Allows flow if the input side is above 80%. -valve-converter=Converts base game fluids to Angel's mod fluids and vice versa. -valve-underflow=Allows flow if the output side is below 80%. [technology-name] angels-fluid-control=Fluid control @@ -417,31 +468,45 @@ angels-explosives=Explosives angels-electric-boiler=Electric boiler angels-nuclear-fuel=Nuclear fuel +[technology-description] +angels-fluid-control=Provides utilities to control the flow of fluids. +basic-chemistry=Knowledge to produce and handle the basic ingredients for chemistry. +water-chemistry=Enrichment and processing of heavy water. +angels-sulfur-processing=Sulfur is a highly reactive non-metallic chemical with a broad range of applications. +angels-nitrogen-processing=Nitrogen is a non-metallic chemical with a broad range of applications. +chlorine-processing=Chlorine is a reactive halogen with a broad range of applications. +oil-gas-extraction=Organic compounds from fossile deposits serve as the base for a vast number of production chains. +angels-advanced-gas-processing=Alternative ways of fractioning short-chained hydrocarbons. +angels-oil-processing=Key technology for the processing of long-chained hydrocarbons. +angels-advanced-oil-processing=Alternative ways of fractioning of long-chained hydrocarbons. +gas-processing=Key technology for the processing of short-chained hydrocarbons. +angels-flare-stack=Burning off excess chemicals simplifies production chains at the cost of pollution. +angels-advanced-chemistry=Selective chemical conversions using catalysts. +angels-coal-processing=Purification and use of coke as well as carbon. +angels-coal-cracking=Liquefaction and gasification of coal. +gas-synthesis=De novo synthesis of hydrocarbons from base chemicals. +gas-steam-cracking=Re-combination of short-chained hydrocarbons. +oil-steam-cracking=Cracking down of long-chained hydrocarbons. +plastic=Various sources for plastic. +resins=Synthetic polymeric materials that can be molded into protective composition. +resin=Various sources for resins. +rubbers=Synthetic polymeric materials that can be molded into elastic composition. +rubber=Co-polymerization of styrene and butadiene as a versatile artificial rubber. +sodium-processing=Sodium is a highly-reactive alcali metal whose salts are key reactants in many processes. +rocket-booster=Versatile fuel that provides high acceleration for vehicles. +angels-explosives=Alternative ways to make explosives. +angels-electric-boiler=Electricity as an alternative energy source for steam production. +angels-nuclear-fuel=Radioactive materials provide fuels with exceptional acceleration for vehicles. + [mod-setting-name] angels-enable-converter=Enable converter valve and conversion recipes angels-hide-converter=Hide conversion recipes angels-enable-acids=Add acids to ore refining and mining of infinite ores -angels-disable-vanilla-chemical-plants=Disable base game chemical plant +angels-disable-vanilla-chemical-plants=Disable base-game chemical plant angels-disable-bobs-electrolysers=Disable Bob's electrolysers angels-disable-bobs-chemical-plants=Disable Bob's chemical plants angels-disable-bobs-distilleries=Disable Bob's distilleries -angels-show-chemical-formula=Show chemical formulae on item descriptions - -[technology-description] -angels-fluid-control=Provides utilities to control the flow of fluids. -basic-chemistry=Knowledge to produce and handle the basic ingredients for chemistry. -resins=Synthetic polymeric materials that can be molded into protective composition. -rubbers=Synthetic polymeric materials that can be molded into elastic composition. - -[entity-description] -angels-flare-stack=Burns excess chemicals (chemical void). - -valve-inspector=Pipe section that can hold 1000 units of fluid and can be connected to a wire. -valve-return=Only allows one directional flow. -valve-overflow=Allows flow if the input side is above 80%. -valve-converter=Converts base game fluids to Angel's mod fluids and vice versa. - -valve-underflow=Allows flow if the output side is below 80%. +angels-show-chemical-formula=Show chemical formulae in item descriptions [mod-setting-description] angels-enable-acids=Changes leaching recipes in Refining to use different Petrochem acids and also changes the acid requirement of Infinite Ores. diff --git a/angelspetrochem/migrations/angelspetrochem_0.4.0.lua b/angelspetrochem/migrations/angelspetrochem_0.4.0.lua index 6e43d2ab4..ae5240960 100644 --- a/angelspetrochem/migrations/angelspetrochem_0.4.0.lua +++ b/angelspetrochem/migrations/angelspetrochem_0.4.0.lua @@ -3,19 +3,19 @@ game.reload_script() for index, force in pairs(game.forces) do force.reset_recipes() force.reset_technologies() - if force.technologies["basic-chemistry"].researched then - force.recipes["dirt-water-separation"].enabled = true - end - if force.technologies["basic-chemistry-2"].researched then - force.recipes["chemical-plant"].enabled = true - end - if force.technologies["angels-advanced-chemistry-2"].researched then - force.recipes["chemical-plant-2"].enabled = true - end - if force.technologies["angels-advanced-chemistry-3"].researched then - force.recipes["chemical-plant-3"].enabled = true - end - if force.technologies["angels-advanced-chemistry-4"].researched then - force.recipes["chemical-plant-4"].enabled = true - end + if force.technologies["basic-chemistry"] and force.technologies["basic-chemistry"].researched then + force.recipes["dirt-water-separation"].enabled = true + end + if force.technologies["basic-chemistry-2"] and force.technologies["basic-chemistry-2"].researched then + force.recipes["chemical-plant"].enabled = true + end + if force.technologies["angels-advanced-chemistry-2"] and force.technologies["angels-advanced-chemistry-2"].researched then + force.recipes["chemical-plant-2"].enabled = true + end + if force.technologies["angels-advanced-chemistry-3"] and force.technologies["angels-advanced-chemistry-3"].researched then + force.recipes["chemical-plant-3"].enabled = true + end + if force.technologies["angels-advanced-chemistry-4"] and force.technologies["angels-advanced-chemistry-4"].researched then + force.recipes["chemical-plant-4"].enabled = true + end end \ No newline at end of file diff --git a/angelspetrochem/migrations/angelspetrochem_0.9.16.lua b/angelspetrochem/migrations/angelspetrochem_0.9.16.lua index c3997372e..2e23898a0 100644 --- a/angelspetrochem/migrations/angelspetrochem_0.9.16.lua +++ b/angelspetrochem/migrations/angelspetrochem_0.9.16.lua @@ -4,6 +4,10 @@ for _, force in pairs(game.forces) do force.technologies["angels-sulfur-processing-4"].researched = force.technologies["angels-sulfur-processing-3"].researched force.technologies["angels-sulfur-processing-3"].researched = force.technologies["angels-sulfur-processing-2"].researched end + + if force.technologies["angels-coal-processing-3"] and force.technologies["angels-coal-processing-2"] then + force.technologies["angels-coal-processing-3"].researched = force.technologies["angels-coal-processing-2"].researched + end force.reset_recipes() force.reset_technologies() diff --git a/angelspetrochem/prototypes/buildings/advanced-chemical-plant.lua b/angelspetrochem/prototypes/buildings/advanced-chemical-plant.lua index af3819680..55424ca1e 100644 --- a/angelspetrochem/prototypes/buildings/advanced-chemical-plant.lua +++ b/angelspetrochem/prototypes/buildings/advanced-chemical-plant.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "advanced-chemical-plant", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png" + { + icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-chemical-plant", order = "b[advanced]-a", place_result = "advanced-chemical-plant", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "advanced-chemical-plant", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png" + { + icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "advanced-chemical-plant"}, fast_replaceable_group = "advanced-chemical-plant", @@ -139,18 +131,14 @@ data:extend( { type = "item", name = "advanced-chemical-plant-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png" + { + icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-chemical-plant", order = "b[advanced]-b", place_result = "advanced-chemical-plant-2", @@ -159,18 +147,14 @@ data:extend( { type = "assembling-machine", name = "advanced-chemical-plant-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png" + { + icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "advanced-chemical-plant-2"}, fast_replaceable_group = "advanced-chemical-plant", diff --git a/angelspetrochem/prototypes/buildings/advanced-gas-refinery.lua b/angelspetrochem/prototypes/buildings/advanced-gas-refinery.lua index 9ffa9e5ab..e1156f8b4 100644 --- a/angelspetrochem/prototypes/buildings/advanced-gas-refinery.lua +++ b/angelspetrochem/prototypes/buildings/advanced-gas-refinery.lua @@ -4,18 +4,14 @@ data:extend( { type = "item", name = "gas-refinery", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", + { + icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-gas-refinery", order = "b[gas-refinery]-a", place_result = "gas-refinery", @@ -24,18 +20,14 @@ data:extend( { type = "assembling-machine", name = "gas-refinery", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", + { + icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "gas-refinery"}, fast_replaceable_group = "gas-refinery", @@ -149,18 +141,14 @@ data:extend( { type = "item", name = "gas-refinery-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", + { + icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-gas-refinery", order = "b[gas-refinery]-b", place_result = "gas-refinery-2", @@ -169,18 +157,14 @@ data:extend( { type = "assembling-machine", name = "gas-refinery-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", + { + icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "gas-refinery-2"}, fast_replaceable_group = "gas-refinery", @@ -294,18 +278,14 @@ data:extend( { type = "item", name = "gas-refinery-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", + { + icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 3, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-gas-refinery", order = "b[gas-refinery]-c", place_result = "gas-refinery-3", @@ -314,18 +294,14 @@ data:extend( { type = "assembling-machine", name = "gas-refinery-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", + { + icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 3, angelsmods.petrochem.number_tint), flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "gas-refinery-3"}, fast_replaceable_group = "gas-refinery", @@ -438,18 +414,14 @@ data:extend( { type = "item", name = "gas-refinery-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", + { + icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 4, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-gas-refinery", order = "b[gas-refinery]-d", place_result = "gas-refinery-4", @@ -458,18 +430,14 @@ data:extend( { type = "assembling-machine", name = "gas-refinery-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", + { + icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 4, angelsmods.petrochem.number_tint), flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "gas-refinery-4"}, fast_replaceable_group = "gas-refinery", diff --git a/angelspetrochem/prototypes/buildings/air-filter.lua b/angelspetrochem/prototypes/buildings/air-filter.lua index 821be8bc8..041a274c6 100644 --- a/angelspetrochem/prototypes/buildings/air-filter.lua +++ b/angelspetrochem/prototypes/buildings/air-filter.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "angels-air-filter", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/air-filter.png", + { + icon = "__angelspetrochem__/graphics/icons/air-filter.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-electrolyser", order = "b[angels-air-filter]-a", place_result = "angels-air-filter", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "angels-air-filter", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/air-filter.png", + { + icon = "__angelspetrochem__/graphics/icons/air-filter.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "angels-air-filter"}, fast_replaceable_group = "angels-air-filter", @@ -99,18 +91,14 @@ data:extend( { type = "item", name = "angels-air-filter-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/air-filter.png", + { + icon = "__angelspetrochem__/graphics/icons/air-filter.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-electrolyser", order = "b[angels-air-filter]-b", place_result = "angels-air-filter-2", @@ -119,18 +107,14 @@ data:extend( { type = "assembling-machine", name = "angels-air-filter-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/air-filter.png", + { + icon = "__angelspetrochem__/graphics/icons/air-filter.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "angels-air-filter-2"}, fast_replaceable_group = "angels-air-filter", diff --git a/angelspetrochem/prototypes/buildings/chemical-plant.lua b/angelspetrochem/prototypes/buildings/chemical-plant.lua index c30b33cff..f83e118f5 100644 --- a/angelspetrochem/prototypes/buildings/chemical-plant.lua +++ b/angelspetrochem/prototypes/buildings/chemical-plant.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "angels-chemical-plant", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/chemical-plant.png" + { + icon = "__angelspetrochem__/graphics/icons/chemical-plant.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-chemical-plant", order = "a[regular]-b[angel]-a", place_result = "angels-chemical-plant", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "angels-chemical-plant", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/chemical-plant.png" + { + icon = "__angelspetrochem__/graphics/icons/chemical-plant.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "placeable-player", "player-creation"}, minable = {hardness = 0.2, mining_time = 0.5, result = "angels-chemical-plant"}, max_health = 300, @@ -156,18 +148,14 @@ data:extend( { type = "item", name = "angels-chemical-plant-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/chemical-plant.png" + { + icon = "__angelspetrochem__/graphics/icons/chemical-plant.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-chemical-plant", order = "a[regular]-b[angel]-b", place_result = "angels-chemical-plant-2", @@ -176,18 +164,14 @@ data:extend( { type = "assembling-machine", name = "angels-chemical-plant-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/chemical-plant.png" + { + icon = "__angelspetrochem__/graphics/icons/chemical-plant.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "placeable-player", "player-creation"}, minable = {hardness = 0.2, mining_time = 0.5, result = "angels-chemical-plant-2"}, max_health = 300, @@ -309,18 +293,14 @@ data:extend( { type = "item", name = "angels-chemical-plant-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/chemical-plant.png" + { + icon = "__angelspetrochem__/graphics/icons/chemical-plant.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-chemical-plant", order = "a[regular]-b[angel]-c", place_result = "angels-chemical-plant-3", @@ -329,18 +309,14 @@ data:extend( { type = "assembling-machine", name = "angels-chemical-plant-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/chemical-plant.png" + { + icon = "__angelspetrochem__/graphics/icons/chemical-plant.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "placeable-player", "player-creation"}, minable = {hardness = 0.2, mining_time = 0.5, result = "angels-chemical-plant-3"}, max_health = 300, @@ -462,18 +438,14 @@ data:extend( { type = "item", name = "angels-chemical-plant-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/chemical-plant.png" + { + icon = "__angelspetrochem__/graphics/icons/chemical-plant.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 4, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-chemical-plant", order = "a[regular]-b[angel]-d", place_result = "angels-chemical-plant-4", @@ -482,18 +454,14 @@ data:extend( { type = "assembling-machine", name = "angels-chemical-plant-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/chemical-plant.png" + { + icon = "__angelspetrochem__/graphics/icons/chemical-plant.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 4, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "placeable-player", "player-creation"}, minable = {hardness = 0.2, mining_time = 0.5, result = "angels-chemical-plant-4"}, max_health = 300, diff --git a/angelspetrochem/prototypes/buildings/electric-boiler.lua b/angelspetrochem/prototypes/buildings/electric-boiler.lua index c9535e8f9..d72a53a2c 100644 --- a/angelspetrochem/prototypes/buildings/electric-boiler.lua +++ b/angelspetrochem/prototypes/buildings/electric-boiler.lua @@ -10,18 +10,14 @@ data:extend( { type = "item", name = "angels-electric-boiler", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/electric-boiler.png" + { + icon = "__angelspetrochem__/graphics/icons/electric-boiler.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), subgroup = "boiler-building", order = "c[electric-boiler]-a", place_result = "angels-electric-boiler", @@ -30,18 +26,14 @@ data:extend( { type = "assembling-machine", name = "angels-electric-boiler", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/electric-boiler.png" + { + icon = "__angelspetrochem__/graphics/icons/electric-boiler.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "angels-electric-boiler"}, fast_replaceable_group = "angels-electric-boiler", @@ -168,18 +160,14 @@ data:extend( { type = "item", name = "angels-electric-boiler-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/electric-boiler.png" + { + icon = "__angelspetrochem__/graphics/icons/electric-boiler.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), subgroup = "boiler-building", order = "c[electric-boiler]-b", place_result = "angels-electric-boiler-2", @@ -188,18 +176,14 @@ data:extend( { type = "assembling-machine", name = "angels-electric-boiler-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/electric-boiler.png" + { + icon = "__angelspetrochem__/graphics/icons/electric-boiler.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "angels-electric-boiler-2"}, fast_replaceable_group = "angels-electric-boiler", @@ -326,18 +310,14 @@ data:extend( { type = "item", name = "angels-electric-boiler-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/electric-boiler.png" + { + icon = "__angelspetrochem__/graphics/icons/electric-boiler.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.petrochem.number_tint), subgroup = "boiler-building", order = "c[electric-boiler]-c", place_result = "angels-electric-boiler-3", @@ -346,18 +326,14 @@ data:extend( { type = "assembling-machine", name = "angels-electric-boiler-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/electric-boiler.png" + { + icon = "__angelspetrochem__/graphics/icons/electric-boiler.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "angels-electric-boiler-3"}, fast_replaceable_group = "angels-electric-boiler", diff --git a/angelspetrochem/prototypes/buildings/electrolyser.lua b/angelspetrochem/prototypes/buildings/electrolyser.lua index a4fbe77b4..61dd58239 100644 --- a/angelspetrochem/prototypes/buildings/electrolyser.lua +++ b/angelspetrochem/prototypes/buildings/electrolyser.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "angels-electrolyser", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/electrolyser.png" + { + icon = "__angelspetrochem__/graphics/icons/electrolyser.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-electrolyser", order = "ab[angels-electrolyser]-a", place_result = "angels-electrolyser", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "angels-electrolyser", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/electrolyser.png" + { + icon = "__angelspetrochem__/graphics/icons/electrolyser.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "angels-electrolyser"}, fast_replaceable_group = "angels-electrolyser", @@ -138,18 +130,14 @@ data:extend( { type = "item", name = "angels-electrolyser-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/electrolyser.png" + { + icon = "__angelspetrochem__/graphics/icons/electrolyser.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-electrolyser", order = "ab[angels-electrolyser]-b", place_result = "angels-electrolyser-2", @@ -158,18 +146,14 @@ data:extend( { type = "assembling-machine", name = "angels-electrolyser-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/electrolyser.png" + { + icon = "__angelspetrochem__/graphics/icons/electrolyser.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "angels-electrolyser-2"}, fast_replaceable_group = "angels-electrolyser", @@ -273,18 +257,14 @@ data:extend( { type = "item", name = "angels-electrolyser-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/electrolyser.png" + { + icon = "__angelspetrochem__/graphics/icons/electrolyser.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-electrolyser", order = "ab[angels-electrolyser]-c", place_result = "angels-electrolyser-3", @@ -293,18 +273,14 @@ data:extend( { type = "assembling-machine", name = "angels-electrolyser-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/electrolyser.png" + { + icon = "__angelspetrochem__/graphics/icons/electrolyser.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "angels-electrolyser-3"}, fast_replaceable_group = "angels-electrolyser", @@ -408,18 +384,14 @@ data:extend( { type = "item", name = "angels-electrolyser-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/electrolyser.png" + { + icon = "__angelspetrochem__/graphics/icons/electrolyser.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 4, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-electrolyser", order = "ab[angels-electrolyser]-d", place_result = "angels-electrolyser-4", @@ -428,18 +400,14 @@ data:extend( { type = "assembling-machine", name = "angels-electrolyser-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/electrolyser.png" + { + icon = "__angelspetrochem__/graphics/icons/electrolyser.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 4, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "angels-electrolyser-4"}, fast_replaceable_group = "angels-electrolyser", diff --git a/angelspetrochem/prototypes/buildings/flare-stack.lua b/angelspetrochem/prototypes/buildings/flare-stack.lua index ea8f696ce..bdad1a5a4 100644 --- a/angelspetrochem/prototypes/buildings/flare-stack.lua +++ b/angelspetrochem/prototypes/buildings/flare-stack.lua @@ -28,9 +28,9 @@ data:extend( module_slots = 2 }, allowed_effects = {"consumption", "speed", "pollution"}, - result_inventory_size = 1, + result_inventory_size = 0, + source_inventory_size = 0, crafting_speed = 2, - source_inventory_size = 1, show_recipe_icon = false, resistances = { diff --git a/angelspetrochem/prototypes/buildings/gas-refinery.lua b/angelspetrochem/prototypes/buildings/gas-refinery.lua index aff387636..79c23866c 100644 --- a/angelspetrochem/prototypes/buildings/gas-refinery.lua +++ b/angelspetrochem/prototypes/buildings/gas-refinery.lua @@ -4,18 +4,14 @@ data:extend( { type = "item", name = "gas-refinery-small", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png" + { + icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-gas-refinery", order = "a[gas-refinery-small]-a", place_result = "gas-refinery-small", @@ -24,18 +20,14 @@ data:extend( { type = "assembling-machine", name = "gas-refinery-small", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png" + { + icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "gas-refinery-small"}, fast_replaceable_group = "gas-refinery-small", @@ -129,18 +121,14 @@ data:extend( { type = "item", name = "gas-refinery-small-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png" + { + icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-gas-refinery", order = "a[gas-refinery-small]-b", place_result = "gas-refinery-small-2", @@ -149,18 +137,14 @@ data:extend( { type = "assembling-machine", name = "gas-refinery-small-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png" + { + icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "gas-refinery-small-2"}, fast_replaceable_group = "gas-refinery-small", @@ -254,18 +238,14 @@ data:extend( { type = "item", name = "gas-refinery-small-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png" + { + icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-gas-refinery", order = "a[gas-refinery-small]-c", place_result = "gas-refinery-small-3", @@ -274,18 +254,14 @@ data:extend( { type = "assembling-machine", name = "gas-refinery-small-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png" + { + icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "gas-refinery-small-3"}, fast_replaceable_group = "gas-refinery-small", @@ -379,18 +355,14 @@ data:extend( { type = "item", name = "gas-refinery-small-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png" + { + icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 4, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-gas-refinery", order = "a[gas-refinery-small]-d", place_result = "gas-refinery-small-4", @@ -399,18 +371,14 @@ data:extend( { type = "assembling-machine", name = "gas-refinery-small-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png" + { + icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 4, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "gas-refinery-small-4"}, fast_replaceable_group = "gas-refinery-small", diff --git a/angelspetrochem/prototypes/buildings/oil-refinery.lua b/angelspetrochem/prototypes/buildings/oil-refinery.lua index 1ee108b18..b98ed682b 100644 --- a/angelspetrochem/prototypes/buildings/oil-refinery.lua +++ b/angelspetrochem/prototypes/buildings/oil-refinery.lua @@ -12,19 +12,15 @@ data:extend( { type = "item", name = "oil-refinery-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__base__/graphics/icons/oil-refinery.png", - icon_size = 64 + { + icon = "__base__/graphics/icons/oil-refinery.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-oil-refinery", order = "b[oil-refinery]-b", place_result = "oil-refinery-2", @@ -33,19 +29,15 @@ data:extend( { type = "assembling-machine", name = "oil-refinery-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__base__/graphics/icons/oil-refinery.png", - icon_size = 64 + { + icon = "__base__/graphics/icons/oil-refinery.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "oil-refinery-2"}, fast_replaceable_group = "oil-refinery", @@ -179,19 +171,15 @@ data:extend( { type = "item", name = "oil-refinery-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__base__/graphics/icons/oil-refinery.png", - icon_size = 64 + { + icon = "__base__/graphics/icons/oil-refinery.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-oil-refinery", order = "b[oil-refinery]-c", place_result = "oil-refinery-3", @@ -200,19 +188,15 @@ data:extend( { type = "assembling-machine", name = "oil-refinery-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__base__/graphics/icons/oil-refinery.png", - icon_size = 64 + { + icon = "__base__/graphics/icons/oil-refinery.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "oil-refinery-3"}, fast_replaceable_group = "oil-refinery", @@ -346,19 +330,15 @@ data:extend( { type = "item", name = "oil-refinery-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__base__/graphics/icons/oil-refinery.png", - icon_size = 64 + { + icon = "__base__/graphics/icons/oil-refinery.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 4, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-oil-refinery", order = "b[oil-refinery]-d", place_result = "oil-refinery-4", @@ -367,19 +347,15 @@ data:extend( { type = "assembling-machine", name = "oil-refinery-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__base__/graphics/icons/oil-refinery.png", - icon_size = 64 + { + icon = "__base__/graphics/icons/oil-refinery.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 4, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "oil-refinery-4"}, fast_replaceable_group = "oil-refinery", diff --git a/angelspetrochem/prototypes/buildings/separator.lua b/angelspetrochem/prototypes/buildings/separator.lua index a076cd4a9..88a4cb113 100644 --- a/angelspetrochem/prototypes/buildings/separator.lua +++ b/angelspetrochem/prototypes/buildings/separator.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "separator", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/separator.png", + { + icon = "__angelspetrochem__/graphics/icons/separator.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-oil-refinery", order = "a[separator]-a", place_result = "separator", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "separator", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/separator.png", + { + icon = "__angelspetrochem__/graphics/icons/separator.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "separator"}, fast_replaceable_group = "separator", @@ -123,17 +115,14 @@ data:extend( { type = "item", name = "separator-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/separator.png", + { + icon = "__angelspetrochem__/graphics/icons/separator.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, + 2, angelsmods.petrochem.number_tint), icon_size = 32, subgroup = "petrochem-buildings-oil-refinery", order = "a[separator]-b", @@ -143,18 +132,14 @@ data:extend( { type = "assembling-machine", name = "separator-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/separator.png", + { + icon = "__angelspetrochem__/graphics/icons/separator.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "separator-2"}, fast_replaceable_group = "separator", @@ -243,18 +228,14 @@ data:extend( { type = "item", name = "separator-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/separator.png", + { + icon = "__angelspetrochem__/graphics/icons/separator.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 3, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-oil-refinery", order = "a[separator]-c", place_result = "separator-3", @@ -263,18 +244,14 @@ data:extend( { type = "assembling-machine", name = "separator-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/separator.png", + { + icon = "__angelspetrochem__/graphics/icons/separator.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 3, angelsmods.petrochem.number_tint), flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "separator-3"}, fast_replaceable_group = "separator", @@ -363,18 +340,14 @@ data:extend( { type = "item", name = "separator-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/separator.png", + { + icon = "__angelspetrochem__/graphics/icons/separator.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 4, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-oil-refinery", order = "a[separator]-d", place_result = "separator-4", @@ -383,18 +356,14 @@ data:extend( { type = "assembling-machine", name = "separator-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/separator.png", + { + icon = "__angelspetrochem__/graphics/icons/separator.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 4, angelsmods.petrochem.number_tint), flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "separator-4"}, fast_replaceable_group = "separator", diff --git a/angelspetrochem/prototypes/buildings/steam-cracker.lua b/angelspetrochem/prototypes/buildings/steam-cracker.lua index e0e6313eb..d26be6f6f 100644 --- a/angelspetrochem/prototypes/buildings/steam-cracker.lua +++ b/angelspetrochem/prototypes/buildings/steam-cracker.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "steam-cracker", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/steam-cracker.png" + { + icon = "__angelspetrochem__/graphics/icons/steam-cracker.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-steam", order = "a[steam-cracker]-a", place_result = "steam-cracker", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "steam-cracker", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/steam-cracker.png" + { + icon = "__angelspetrochem__/graphics/icons/steam-cracker.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "steam-cracker"}, fast_replaceable_group = "steam-cracker", @@ -164,18 +156,14 @@ data:extend( { type = "item", name = "steam-cracker-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/steam-cracker.png" + { + icon = "__angelspetrochem__/graphics/icons/steam-cracker.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-steam", order = "a[steam-cracker]-b", place_result = "steam-cracker-2", @@ -184,18 +172,14 @@ data:extend( { type = "assembling-machine", name = "steam-cracker-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/steam-cracker.png" + { + icon = "__angelspetrochem__/graphics/icons/steam-cracker.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "steam-cracker-2"}, fast_replaceable_group = "steam-cracker", @@ -309,18 +293,14 @@ data:extend( { type = "item", name = "steam-cracker-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/steam-cracker.png" + { + icon = "__angelspetrochem__/graphics/icons/steam-cracker.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-steam", order = "a[steam-cracker]-c", place_result = "steam-cracker-3", @@ -329,18 +309,14 @@ data:extend( { type = "assembling-machine", name = "steam-cracker-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/steam-cracker.png" + { + icon = "__angelspetrochem__/graphics/icons/steam-cracker.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "steam-cracker-3"}, fast_replaceable_group = "steam-cracker", @@ -454,18 +430,14 @@ data:extend( { type = "item", name = "steam-cracker-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/steam-cracker.png" + { + icon = "__angelspetrochem__/graphics/icons/steam-cracker.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 4, angelsmods.petrochem.number_tint), subgroup = "petrochem-buildings-steam", order = "a[steam-cracker]-d", place_result = "steam-cracker-4", @@ -474,18 +446,14 @@ data:extend( { type = "assembling-machine", name = "steam-cracker-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelspetrochem__/graphics/icons/steam-cracker.png" + { + icon = "__angelspetrochem__/graphics/icons/steam-cracker.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 4, angelsmods.petrochem.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "steam-cracker-4"}, fast_replaceable_group = "steam-cracker", diff --git a/angelspetrochem/prototypes/buildings/valves.lua b/angelspetrochem/prototypes/buildings/valves.lua index c8c659b08..ebece2fb2 100644 --- a/angelspetrochem/prototypes/buildings/valves.lua +++ b/angelspetrochem/prototypes/buildings/valves.lua @@ -542,9 +542,9 @@ data:extend( collision_box = {{-0.29, -0.29}, {0.29, 0.29}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, crafting_categories = {"angels-converter"}, - result_inventory_size = 1, + result_inventory_size = 0, crafting_speed = 2, - source_inventory_size = 1, + source_inventory_size = 0, resistances = { { diff --git a/angelspetrochem/prototypes/generation/angels-natural-gas.lua b/angelspetrochem/prototypes/generation/angels-natural-gas.lua index 57b0e67c1..17efee074 100644 --- a/angelspetrochem/prototypes/generation/angels-natural-gas.lua +++ b/angelspetrochem/prototypes/generation/angels-natural-gas.lua @@ -17,9 +17,9 @@ angelsmods.functions.add_resource( output_name = "gas-natural-1", output_min = 20, output_max = 20, - icon = "__base__/graphics/icons/crude-oil-resource.png", + icon = "__angelspetrochem__/graphics/icons/gas.png", icon_size = 64, - icon_mipmaps = 4, + icon_mipmaps = 1, stage_counts = {0}, autoplace = { starting_area = false, diff --git a/angelspetrochem/prototypes/global-override/base-game.lua b/angelspetrochem/prototypes/global-override/base-game.lua index 4e613f3d4..53ac9f06c 100644 --- a/angelspetrochem/prototypes/global-override/base-game.lua +++ b/angelspetrochem/prototypes/global-override/base-game.lua @@ -5,20 +5,14 @@ local move_item = angelsmods.functions.move_item -- CHEMICAL PLANTS ------------------------------------------------------------ ------------------------------------------------------------------------------- move_item("chemical-plant", "petrochem-buildings-chemical-plant", "a[regular]-aa[vanilla]") +data.raw["item"]["chemical-plant"].icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("chemical-plant"), + 1, angelsmods.petrochem.number_tint) data.raw["item"]["chemical-plant"].icon = nil -data.raw["item"]["chemical-plant"].icon_size = 32 -data.raw["item"]["chemical-plant"].icons = { - { - icon = "__base__/graphics/icons/chemical-plant.png", - icon_size = 64 - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } -} +data.raw["item"]["chemical-plant"].icon_size = nil +data.raw["assembling-machine"]["chemical-plant"].icon = nil +data.raw["assembling-machine"]["chemical-plant"].icon_size = nil +data.raw["assembling-machine"]["chemical-plant"].icons = util.table.deepcopy(data.raw["item"]["chemical-plant"].icons) data.raw["assembling-machine"]["chemical-plant"].fast_replaceable_group = "chemical-plant" angelsmods.functions.add_crafting_category("assembling-machine", "chemical-plant", "liquifying") @@ -38,20 +32,14 @@ end ------------------------------------------------------------------------------- -- oil refinery move_item("oil-refinery", "petrochem-buildings-oil-refinery", "b[oil-refinery]-a") +data.raw["item"]["oil-refinery"].icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("oil-refinery"), + 1, angelsmods.petrochem.number_tint) data.raw["item"]["oil-refinery"].icon = nil -data.raw["item"]["oil-refinery"].icon_size = 32 -data.raw["item"]["oil-refinery"].icons = { - { - icon = "__base__/graphics/icons/oil-refinery.png", - icon_size = 64 - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } -} +data.raw["item"]["oil-refinery"].icon_size = nil +data.raw["assembling-machine"]["oil-refinery"].icon = nil +data.raw["assembling-machine"]["oil-refinery"].icon_size = nil +data.raw["assembling-machine"]["oil-refinery"].icons = util.table.deepcopy(data.raw["item"]["oil-refinery"].icons) data.raw["assembling-machine"]["oil-refinery"].fast_replaceable_group = "oil-refinery" -- oil processing @@ -110,15 +98,12 @@ OV.remove_unlock("kovarex-enrichment-process", "nuclear-fuel") data.raw["recipe"]["explosives"].subgroup = "petrochem-solids-2" data.raw["recipe"]["explosives"].order = "a[explosives]-a" data.raw["recipe"]["explosives"].icon_size = 32 -data.raw["recipe"]["explosives"].icons = { +data.raw["recipe"]["explosives"].icons = angelsmods.functions.add_number_icon_layer( { - icon = "__base__/graphics/icons/explosives.png", - icon_size = 64 + { + icon = "__base__/graphics/icons/explosives.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } -} + 1, angelsmods.petrochem.number_tint) diff --git a/angelspetrochem/prototypes/global-override/bobassembly.lua b/angelspetrochem/prototypes/global-override/bobassembly.lua index 5169d4e8a..373891dd4 100644 --- a/angelspetrochem/prototypes/global-override/bobassembly.lua +++ b/angelspetrochem/prototypes/global-override/bobassembly.lua @@ -199,4 +199,4 @@ if mods["bobplates"] then --angelsmods.functions.add_crafting_category("assembling-machine", "angels-chemical-plant-5", "distillery") end end -end +end \ No newline at end of file diff --git a/angelspetrochem/prototypes/global-override/boblogistics.lua b/angelspetrochem/prototypes/global-override/boblogistics.lua new file mode 100644 index 000000000..4459f1523 --- /dev/null +++ b/angelspetrochem/prototypes/global-override/boblogistics.lua @@ -0,0 +1,13 @@ +local OV = angelsmods.functions.OV + +if mods["boblogistics"] then + -- bob valves + OV.disable_recipe{ + "bob-valve", + "bob-overflow-valve", + "bob-topup-valve", + } + angelsmods.functions.add_flag("bob-valve", "hidden") + angelsmods.functions.add_flag("bob-overflow-valve", "hidden") + angelsmods.functions.add_flag("bob-topup-valve", "hidden") +end \ No newline at end of file diff --git a/angelspetrochem/prototypes/global-override/bobplates.lua b/angelspetrochem/prototypes/global-override/bobplates.lua index 636f28f97..04d04162c 100644 --- a/angelspetrochem/prototypes/global-override/bobplates.lua +++ b/angelspetrochem/prototypes/global-override/bobplates.lua @@ -28,58 +28,25 @@ if mods["bobplates"] then "air-compressor-4" } ) + + OV.hide_recipe( + { + "air-pump", + "air-pump-2", + "air-pump-3", + "air-pump-4", + "void-pump", + } + ) end ------------------------------------------------------------------------------- -- STORAGE TANKS -------------------------------------------------------------- ------------------------------------------------------------------------------- if mods["bobplates"] then - move_item("bob-small-inline-storage-tank", "angels-fluid-tanks", "a[small-tank]-a") - move_item("bob-small-storage-tank", "angels-fluid-tanks", "a[small-tank]-b") - move_item("storage-tank", "angels-fluid-tanks", "b[medium-tank]-a[mk1]-a[regular]") - move_item("angels-storage-tank-1", "angels-fluid-tanks", "c[large-tank]-c[gas]") - move_item("angels-storage-tank-2", "angels-fluid-tanks", "c[large-tank]-b[oil]") - move_item("angels-storage-tank-3", "angels-fluid-tanks", "c[large-tank]-a[inline]") - - OV.patch_recipes( - { - { - name = "bob-small-storage-tank", - ingredients = { - {"!!"}, - {name = "bob-small-inline-storage-tank", amount = 1}, - {name = "pipe", amount = 1} - } - }, - { - name = "storage-tank", - ingredients = { - {name = "bob-small-inline-storage-tank", amount = 1} - } - } - } - ) - if mods["boblogistics"] then - move_item("bob-storage-tank-all-corners", "angels-fluid-tanks", "b[medium-tank]-a[mk1]-b[all-corners]") - move_item("storage-tank-2", "angels-fluid-tanks", "b[medium-tank]-b[mk2]-a[regular]") - move_item("bob-storage-tank-all-corners-2", "angels-fluid-tanks", "b[medium-tank]-b[mk2]-b[all-corners]") - move_item("storage-tank-3", "angels-fluid-tanks", "b[medium-tank]-c[mk3]-a[regular]") - move_item("bob-storage-tank-all-corners-3", "angels-fluid-tanks", "b[medium-tank]-c[mk3]-b[all-corners]") - move_item("storage-tank-3", "angels-fluid-tanks", "b[medium-tank]-d[mk3]-a[regular]") - move_item("bob-storage-tank-all-corners-3", "angels-fluid-tanks", "b[medium-tank]-d[mk3]-b[all-corners]") - move_item("storage-tank-4", "angels-fluid-tanks", "b[medium-tank]-e[mk4]-a[regular]") - move_item("bob-storage-tank-all-corners-4", "angels-fluid-tanks", "b[medium-tank]-e[mk4]-b[all-corners]") - OV.patch_recipes( { - { - name = "bob-storage-tank-all-corners", - ingredients = { - {name = "bob-small-storage-tank", amount = 1}, - {name = "pipe", amount = 2} - } - }, { name = "angels-storage-tank-3", ingredients = { @@ -92,28 +59,22 @@ if mods["bobplates"] then data.raw["storage-tank"]["angels-storage-tank-1"].fluid_box.base_area = 2000 data.raw["storage-tank"]["angels-storage-tank-2"].fluid_box.base_area = 1500 end + -- electrolysis ------------------------------------------------------------- + --move small tanks to fluid-control + OV.add_unlock("angels-fluid-control","bob-small-storage-tank") + OV.add_unlock("angels-fluid-control","bob-small-inline-storage-tank") + OV.disable_technology({"electrolysis-1","electrolysis-2"}) + --clean-up pre-requisites + OV.remove_prereq("steel-processing","electrolysis-1") + OV.remove_prereq("lithium-processing","electrolysis-1") + OV.remove_prereq("chemical-processing-2","electrolysis-2") + OV.remove_prereq("plastics","electrolysis-2") end ------------------------------------------------------------------------------- -- FLUID CONTROL -------------------------------------------------------------- ------------------------------------------------------------------------------- if mods["bobplates"] then - if mods["boblogistics"] then - -- hide fluid control from bob (as we use the extended angel equivalents) - angelsmods.functions.add_flag("bob-valve", "hidden") - angelsmods.functions.add_flag("bob-overflow-valve", "hidden") - angelsmods.functions.add_flag("bob-topup-valve", "hidden") - OV.disable_recipe("bob-valve") - OV.remove_unlock("fluid-handling", "bob-overflow-valve") - OV.remove_unlock("fluid-handling", "bob-topup-valve") - - -- move pumps over - move_item("pump", "angels-fluid-control", "b[pump]-a[mk1]") - move_item("bob-pump-2", "angels-fluid-control", "b[pump]-b[mk2]") - move_item("bob-pump-3", "angels-fluid-control", "b[pump]-c[mk3]") - move_item("bob-pump-4", "angels-fluid-control", "b[pump]-d[mk4]") - end - -- generic replace items ---------------------------------------------------- OV.global_replace_item("carbon", "solid-carbon") angelsmods.functions.add_flag("carbon", "hidden") @@ -215,7 +176,28 @@ if mods["bobplates"] then move_item("enriched-fuel", "petrochem-fuel", "a[solid-fuel]-b") OV.patch_recipes({{name = "enriched-fuel-from-liquid-fuel", subgroup = "petrochem-fuel", order = "g"}}) OV.disable_technology({"oil-processing-2", "oil-processing-3", "oil-processing-4"}) - + --hide disabled + OV.hide_recipe( + { + "bob-oil-processing", + "hydrogen-sulfide", + "sulfur-dioxide", + "coal-cracking", + "hydrogen-chloride", + "petroleum-gas-cracking", + "nitric-acid", + "nitrogen-dioxide", + "nitrogen", + "sulfuric-acid-2", + "sulfuric-acid-3", + "bob-liquid-air", + "solid-fuel-from-hydrogen", + "sulfur", + "sulfur-2", + "sulfur-3", + "carbon", + } + ) -- plastics ----------------------------------------------------------------- OV.remove_unlock("plastics", "plastic-bar") @@ -255,36 +237,30 @@ if mods["bobplates"] then }, subgroup = "petrochem-solids", order = "b[resin]-b[solid]-a", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__bobplates__/graphics/icons/resin.png" + { + icon = "__bobplates__/graphics/icons/resin.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32 + 1, angelsmods.petrochem.number_tint), }, { name = "solid-resin", order = "b[resin]-b[solid]-b", - icons = { + icons = mods["angelsbioprocessing"] and { { - icon = "__bobplates__/graphics/icons/resin.png" + icon = "__bobplates__/graphics/icons/resin.png", + icon_size = 32, icon_mipmaps = 1, }, - not mods["angelsbioprocessing"] and - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } or - nil + } or angelsmods.functions.add_number_icon_layer({ + { + icon = "__bobplates__/graphics/icons/resin.png", + icon_size = 32, icon_mipmaps = 1, + } }, - icon_size = 32 + 2, angelsmods.petrochem.number_tint), } } ) @@ -315,35 +291,27 @@ if mods["bobplates"] then }, subgroup = "petrochem-solids-2", order = "b[rubber]-b[solid]-a", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__bobplates__/graphics/icons/rubber.png" + { + icon = "__bobplates__/graphics/icons/rubber.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32 + 1, angelsmods.petrochem.number_tint), }, { name = "solid-rubber", subgroup = "petrochem-solids-2", order = "b[rubber]-b[solid]-a", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__bobplates__/graphics/icons/rubber.png" + { + icon = "__bobplates__/graphics/icons/rubber.png", + icon_size = 32, icon_mipmaps = 1, + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32 + 2, angelsmods.petrochem.number_tint), } } ) diff --git a/angelspetrochem/prototypes/global-override/bobrevamp.lua b/angelspetrochem/prototypes/global-override/bobrevamp.lua index 3c991360e..0fc800231 100644 --- a/angelspetrochem/prototypes/global-override/bobrevamp.lua +++ b/angelspetrochem/prototypes/global-override/bobrevamp.lua @@ -20,8 +20,8 @@ if mods["bobrevamp"] then OV.remove_unlock("angels-oil-processing", "solid-fuel-naphtha") OV.remove_unlock("gas-processing", "solid-fuel-methane") - OV.add_unlock("flammables", "solid-fuel-naphtha") OV.add_unlock("flammables", "solid-fuel-fuel-oil") + OV.add_unlock("flammables", "solid-fuel-naphtha") OV.add_unlock("angels-advanced-gas-processing", "solid-fuel-methane") OV.add_prereq("angels-advanced-gas-processing", "flammables") @@ -54,6 +54,28 @@ if mods["bobrevamp"] then angelsmods.functions.add_flag("sour-gas", "hidden") angelsmods.functions.disable_barreling_recipes("sour-gas") + OV.hide_recipe("ammonia") + OV.converter_fluid("ammonia", "gas-ammonia") + angelsmods.functions.disable_barreling_recipes("ammonia") + + if mods["bobplates"] and settings.startup["bobmods-revamp-old-oil"] then + OV.hide_recipe( + { + "oil-processing-with-sulfur", + "oil-processing-with-sulfur-dioxide", + "oil-processing-with-sulfur-dioxide-2", + "oil-processing-with-sulfur-dioxide-3", + } + ) + end + if mods["bobplates"] and settings.startup["bobmods-revamp-oil"] then + OV.hide_recipe( + { + "solid-fuel-from-sour-gas", + } + ) + end + if angelsmods.trigger.disable_bobs_chemical_plants then OV.global_replace_technology("chemical-plant", "basic-chemistry-2") end @@ -62,16 +84,19 @@ if mods["bobrevamp"] then -- HARDMODE ----------------------------------------------------------------- ----------------------------------------------------------------------------- if mods["bobplates"] and settings.startup["bobmods-revamp-hardmode"].value then + OV.hide_recipe("carbon-dioxide-oil-processing") --disable all the recipes --NaClO3+H2O-->NaClO4+H2 - OV.remove_unlock("lithium-processing", "sodium-perchlorate") + --OV.remove_unlock("lithium-processing", "sodium-perchlorate") --NaCl+H2O-->NaClO3+H2O - OV.remove_unlock("lithium-processing", "sodium-chlorate") + --OV.remove_unlock("lithium-processing", "sodium-chlorate") + OV.disable_recipe({"sodium-chlorate","sodium-perchlorate"}) --make pre-reqs match new unlock point OV.add_prereq("battery-2", "chlorine-processing-3") OV.converter_fluid("carbon-dioxide", "gas-carbon-dioxide") angelsmods.functions.disable_barreling_recipes("carbon-dioxide") + --OV.remove_unlock("chemical-processing-2", "carbon-dioxide") OV.global_replace_item("sodium-carbonate", "solid-sodium-carbonate") angelsmods.functions.add_flag("sodium-carbonate", "hidden") @@ -82,12 +107,9 @@ if mods["bobrevamp"] then OV.global_replace_item("sodium-chlorate", "solid-sodium-chlorate") angelsmods.functions.add_flag("sodium-chlorate", "hidden") - OV.converter_fluid("ammonia", "gas-ammonia") - angelsmods.functions.disable_barreling_recipes("ammonia") - OV.converter_fluid("nitric-oxide", "gas-nitrogen-monoxide") angelsmods.functions.disable_barreling_recipes("nitric-oxide") - + OV.converter_fluid("nitric-dioxide", "gas-nitrogen-dioxide") angelsmods.functions.disable_barreling_recipes("nitric-dioxide") @@ -102,7 +124,17 @@ if mods["bobrevamp"] then OV.global_replace_technology("hydrazine", "angels-nitrogen-processing-3") --OV.global_replace_technology("rocket-fuel", "angels-rocket-fuel") - OV.remove_unlock("rocket-fuel", "dinitrogen-tetroxide") + --OV.remove_unlock("rocket-fuel", "dinitrogen-tetroxide") + OV.disable_recipe( + { + "dinitrogen-tetroxide", + "nitric-oxide", + "hydrazine", + "hydrogen-peroxide", + "carbon-dioxide", + "enriched-fuel-from-hydrazine", + } + ) end ----------------------------------------------------------------------------- diff --git a/angelspetrochem/prototypes/global-override/bobtech.lua b/angelspetrochem/prototypes/global-override/bobtech.lua index 42682458f..1a20d9470 100644 --- a/angelspetrochem/prototypes/global-override/bobtech.lua +++ b/angelspetrochem/prototypes/global-override/bobtech.lua @@ -4,10 +4,5 @@ local OV = angelsmods.functions.OV -- STEAM BURNER PHASE --------------------------------------------------------- ------------------------------------------------------------------------------- if mods["bobtech"] and settings.startup["bobmods-burnerphase"].value then - OV.add_prereq("basic-chemistry", "ore-crushing") - - OV.add_prereq("angels-fluid-control", "steel-processing") - if mods["bobplates"] then - OV.add_prereq("angels-fluid-control", "electrolysis-1") - end -end \ No newline at end of file + --do nothing +end diff --git a/angelspetrochem/prototypes/override/angelspetrochem.lua b/angelspetrochem/prototypes/override/angelspetrochem.lua index b71e4714f..66131f962 100644 --- a/angelspetrochem/prototypes/override/angelspetrochem.lua +++ b/angelspetrochem/prototypes/override/angelspetrochem.lua @@ -174,6 +174,15 @@ else -- special vanilla ) end +------------------------------------------------------------------------------- +-- VALVES --------------------------------------------------------------------- +------------------------------------------------------------------------------- +if angelsmods.trigger.enableconverter then +else + angelsmods.functions.add_flag("valve-converter", "hidden") + OV.disable_recipe("valve-converter") +end + ------------------------------------------------------------------------------- -- SPECIAL VANILLA ------------------------------------------------------------ ------------------------------------------------------------------------------- diff --git a/angelspetrochem/prototypes/override/angelsrefining.lua b/angelspetrochem/prototypes/override/angelsrefining.lua index e24b425bc..b3dd6dec2 100644 --- a/angelspetrochem/prototypes/override/angelsrefining.lua +++ b/angelspetrochem/prototypes/override/angelsrefining.lua @@ -6,16 +6,16 @@ local move_item = angelsmods.functions.move_item ------------------------------------------------------------------------------- if angelsmods.refining then move_item("liquifier", "petrochem-buildings-electrolyser", "c[liquifier]-a") - data.raw["item"]["liquifier"].icons[2].tint = angelsmods.petrochem.number_tint + data.raw["item"]["liquifier"].icons[3].tint = angelsmods.petrochem.number_tint move_item("liquifier-2", "petrochem-buildings-electrolyser", "c[liquifier]-b") - data.raw["item"]["liquifier-2"].icons[2].tint = angelsmods.petrochem.number_tint + data.raw["item"]["liquifier-2"].icons[3].tint = angelsmods.petrochem.number_tint move_item("liquifier-3", "petrochem-buildings-electrolyser", "c[liquifier]-c") - data.raw["item"]["liquifier-3"].icons[2].tint = angelsmods.petrochem.number_tint + data.raw["item"]["liquifier-3"].icons[3].tint = angelsmods.petrochem.number_tint move_item("liquifier-4", "petrochem-buildings-electrolyser", "c[liquifier]-d") - data.raw["item"]["liquifier-4"].icons[2].tint = angelsmods.petrochem.number_tint + data.raw["item"]["liquifier-4"].icons[3].tint = angelsmods.petrochem.number_tint angelsmods.functions.add_crafting_category("assembling-machine", "advanced-chemical-plant", "liquifying") angelsmods.functions.add_crafting_category("assembling-machine", "advanced-chemical-plant-2", "liquifying") @@ -41,16 +41,31 @@ if angelsmods.refining then } ) + OV.add_prereq("water-treatment-2", "basic-chemistry-3") OV.remove_unlock("slag-processing-1", "liquifier") OV.add_unlock("basic-chemistry", "liquifier") + OV.add_prereq("slag-processing-1", "angels-sulfur-processing-1") + OV.add_prereq("slag-processing-1", "water-treatment-2") + OV.remove_prereq("slag-processing-1", "ore-crushing") + OV.add_prereq("advanced-ore-refining-1", "ore-crushing") OV.remove_unlock("slag-processing-2", "liquifier-2") + OV.add_prereq("slag-processing-2", "ore-leaching") OV.add_unlock("angels-advanced-chemistry-1", "liquifier-2") OV.add_unlock("angels-advanced-chemistry-2", "liquifier-3") OV.add_unlock("angels-advanced-chemistry-3", "liquifier-4") end ------------------------------------------------------------------------------- --- FERROUS/CUPRIC REFINING----------------------------------------------------- +-- REGULAR REFINING ----------------------------------------------------------- +------------------------------------------------------------------------------- +if angelsmods.refining then + OV.remove_prereq("ore-floatation", "automation-2") + OV.remove_prereq("ore-floatation", "water-treatment") + --OV.add_prereq("ore-floatation", "basic-chemistry-3") +end + +------------------------------------------------------------------------------- +-- FERROUS/CUPRIC REFINING ---------------------------------------------------- ------------------------------------------------------------------------------- if angelsmods.refining then if mods["bobplates"] then @@ -58,7 +73,6 @@ if angelsmods.refining then else OV.remove_prereq("lubricant", "advanced-oil-processing") end - OV.add_prereq("lubricant", "angels-oil-processing") for _, tech_name in pairs({ "lubricant", "ore-powderizer" }) do local ingredients = ((data.raw.technology[tech_name] or {}).unit or {}).ingredients or {} for index, ingredient in pairs(ingredients) do diff --git a/angelspetrochem/prototypes/override/base-game.lua b/angelspetrochem/prototypes/override/base-game.lua index 78658c163..365a1d18e 100644 --- a/angelspetrochem/prototypes/override/base-game.lua +++ b/angelspetrochem/prototypes/override/base-game.lua @@ -16,10 +16,15 @@ move_item("petroleum-gas", "petrochem-carbon-fluids", "a", "fluid") move_item("light-oil", "petrochem-carbon-fluids", "dab", "fluid") move_item("heavy-oil", "petrochem-carbon-fluids", "ddd", "fluid") move_item("lubricant", "petrochem-carbon-fluids", "dcd", "fluid") +OV.remove_prereq("lubricant", "oil-processing") +OV.remove_prereq("lubricant", "chemical-plant") +OV.add_prereq("lubricant", "oil-steam-cracking-1") -- plastics -OV.add_unlock("plastics", "solid-plastic") +--OV.add_unlock("plastics", "solid-plastic") move_item("plastic-bar", "petrochem-solids", "a[petrochem-solids]-a[plastic]") +OV.add_prereq("plastics", "angels-advanced-chemistry-1") +OV.remove_prereq("plastics", "oil-processing") -- sulfur move_item("sulfur", "petrochem-sulfur", "a[sulfer]-a[sulfer]") @@ -35,6 +40,14 @@ OV.add_prereq("explosives", "angels-sulfur-processing-2") move_item("steam", "petrochem-basic-fluids", "a", "fluid") move_item("solid-fuel", "petrochem-fuel", "a[solid-fuel]-a") +OV.remove_unlock("angels-oil-processing", "solid-fuel-naphtha") +OV.add_unlock("flammables", "solid-fuel-naphtha") +OV.remove_unlock("angels-oil-processing", "solid-fuel-fuel-oil") +OV.add_unlock("flammables", "solid-fuel-fuel-oil") +OV.remove_unlock("gas-processing", "solid-fuel-methane") +OV.add_unlock("flammables", "solid-fuel-methane") +OV.add_prereq("flammables", "gas-processing") + if angelsmods.smelting then -- angelssmelting takes all the ores onto the smelting tab, so coal has to move as well move_item("coal", "petrochem-coal", "a[carbon]-a") @@ -68,7 +81,7 @@ local function remove_item(tab, liquid) end end end - +--do we want to add all "thermal fluids" to this list... in particular, in exploration? local turret_params = data.raw["fluid-turret"]["flamethrower-turret"].attack_parameters.fluids remove_item(turret_params, {"heavy-oil", "light-oil"}) table.insert(turret_params, {type = "liquid-naphtha", damage_modifier = 1.05}) @@ -122,3 +135,14 @@ OV.add_prereq("rocketry", "rocket-booster-1") angelsmods.functions.move_item("cliff-explosives", "petrochem-solids", "b[petrochem-solids-2]-b[cliff-explosives]", "capsule") angelsmods.functions.move_item("cliff-explosives", "petrochem-solids-2", "a[explosives]-d", "recipe") +--hide disabled vanilla recipes +OV.hide_recipe({ + "basic-oil-processing", + "advanced-oil-processing", + "solid-fuel-from-light-oil", + "solid-fuel-from-petroleum-gas", + "solid-fuel-from-heavy-oil", + "light-oil-cracking", + "heavy-oil-cracking", + "sulfuric-acid" +}) diff --git a/angelspetrochem/prototypes/override/boblogistics.lua b/angelspetrochem/prototypes/override/boblogistics.lua new file mode 100644 index 000000000..31143a287 --- /dev/null +++ b/angelspetrochem/prototypes/override/boblogistics.lua @@ -0,0 +1,8 @@ +local OV = angelsmods.functions.OV + +if mods["boblogistics"] then + -- bob tanks + angelsmods.functions.move_item("angels-storage-tank-1", "angels-fluid-tanks", "c[large-tank]-c[gas]") + angelsmods.functions.move_item("angels-storage-tank-2", "angels-fluid-tanks", "c[large-tank]-b[oil]") + angelsmods.functions.move_item("angels-storage-tank-3", "angels-fluid-tanks", "c[large-tank]-a[inline]") +end \ No newline at end of file diff --git a/angelspetrochem/prototypes/override/bobplates.lua b/angelspetrochem/prototypes/override/bobplates.lua index 4715b9523..5ebc07d23 100644 --- a/angelspetrochem/prototypes/override/bobplates.lua +++ b/angelspetrochem/prototypes/override/bobplates.lua @@ -6,7 +6,6 @@ if mods["bobplates"] then OV.set_science_pack("electric-engine", "chemical-science-pack") end - ------------------------------------------------------------------------------- -- CONVERT FLUIDS TO ANGELS VERSION ------------------------------------------- ------------------------------------------------------------------------------- @@ -61,57 +60,49 @@ end --Do this regardless of settings --base fluid is methane, all others are based on relative real values --==BASED ON VOULMETRIC NUMBERS divided by 10, using methane as the base -if mods["bobplates"] then +local Energy_table = { --liquid Naphtha (heavy oil), bobs value is 1MJ (Heavy fuel oil 38.2 MJ/L)(39 MJ/kg) - data.raw.fluid["liquid-naphtha"].fuel_value = "244.7kJ" - data.raw.fluid["liquid-naphtha"].emissions_multiplier = 3 - + ["liquid-naphtha"] = { fv = 244.7, em = 3, turr = false}, + ["heavy-oil"] = { fv = angelsmods.trigger.enableconverter and 244.7 or nil, turr = angelsmods.trigger.enableconverter and true or false}, --liquid Fuel oil (light oil), bobs value 1.5MJ (light fuel oil 39 MJ/L)(40.6 MJ/kg) - data.raw.fluid["liquid-fuel-oil"].fuel_value = "249.9kJ" -- was 24.99kJ - data.raw.fluid["liquid-fuel-oil"].emissions_multiplier = 2 - - --gas methane (petrogas), bobs value 2.3MJ (methane 35.9 MJ/L)(49.85 MJ/kg) - data.raw.fluid["gas-methane"].fuel_value = "230.0kJ" - - --gas ethane (), - (ethane 60.7 MJ/L)(47.2 MJ/kg) - data.raw.fluid["gas-ethane"].fuel_value = "388.9kJ" - data.raw.fluid["gas-ethane"].emissions_multiplier = 1.5 - - --gas butane (), - (butane 110.9 MJ/L)(46.46 MJ/kg) - data.raw.fluid["gas-butane"].fuel_value = "710.5kJ" - data.raw.fluid["gas-butane"].emissions_multiplier = 1.8 - - --gas propene (), - (propylene 81.4 MJ/L)(45.8 MJ/kg) - data.raw.fluid["gas-propene"].fuel_value = "521.5kJ" - data.raw.fluid["gas-propene"].emissions_multiplier = 5 - - --gas methanol (), - (methanol(L) 15.8 MJ/L)(19.9 MJ/kg) - data.raw.fluid["gas-methanol"].fuel_value = "101.2kJ" - - --gas ethylene (), - (ethylene 57.0 MJ/L)(47.7 MJ/kg) - data.raw.fluid["gas-ethylene"].fuel_value = "365.2kJ" - - --gas benzene (), - (benzene 133.8 MJ/L)(40.5 MJ/kg) - data.raw.fluid["gas-benzene"].fuel_value = "857.2kJ" - - --liquid crude (crude oil) - --data.raw.fluid["crude-oil"].fuel_value = "1000kJ" - - --gas hydrogen (), bobs value is 45kJ (hydrogen 10.3 MJ/L)(120.1 MJ/kg) - -->>(may need to go much lower) meant to be 66kJ, but dropped to 33 for reasons. - data.raw.fluid["gas-hydrogen"].fuel_value = "33kJ" - data.raw.fluid["gas-hydrogen"].emissions_multiplier = 0.2 - - --gas hydrazine (), bobs value is 340kJ (hydrazine 19.8 MJ/L)(19.4 MJ/kg) - data.raw.fluid["gas-hydrazine"].fuel_value = "126.9kJ" - data.raw.fluid["gas-hydrazine"].emissions_multiplier = 0.1 - + ["liquid-fuel-oil"] = { fv = 249.9, em = 2, turr = false}, --was 24.99kJ + ["light-oil"] = { fv = angelsmods.trigger.enableconverter and 249.9 or nil, turr = angelsmods.trigger.enableconverter and true or false}, + --gas methane (petrogas), bobs value 2.3MJ (methane 35.9 MJ/L)(49.85 MJ/kg) + ["gas-methane"] = { fv = 230}, + ["petroleum-gas"] = { fv = angelsmods.trigger.enableconverter and 230 or nil, turr = angelsmods.trigger.enableconverter and true or false}, + ["gas-ethane"] = { fv = 388.9, em = 1.5}, --gas ethane (), - (ethane 60.7 MJ/L)(47.2 MJ/kg) + ["gas-butane"] = { fv = 710.5, em = 1.8}, --gas butane (), - (butane 110.9 MJ/L)(46.46 MJ/kg) + ["gas-propene"] = { fv = 521.5, em = 5}, --gas propene (), - (propylene 81.4 MJ/L)(45.8 MJ/kg) + ["gas-methanol"] = { fv = 101.2}, --gas methanol (), - (methanol(L) 15.8 MJ/L)(19.9 MJ/kg) + ["gas-ethylene"] = { fv = 365.2}, --gas ethylene (), - (ethylene 57.0 MJ/L)(47.7 MJ/kg) + ["crude-oil"] = { fv = 1000, turr = false}, --liquid crude (crude oil) + ["gas-hydrogen"] = { fv = 33, em = 0.2--[[>>(may need to go much lower) meant to be 66kJ, but dropped to 33 for reasons.]]}, --gas hydrogen (), bobs value is 45kJ (hydrogen 10.3 MJ/L)(120.1 MJ/kg) + ["gas-hydrazine"] = { fv = 126.9, em = 0.1}, --gas hydrazine (), bobs value is 340kJ (hydrazine 19.8 MJ/L)(19.4 MJ/kg) + ["liquid-fuel"] = { fv = 300, em = 1.5, turr = false}, --down from 2.3MJ + ["gas-ethanol"] = { fv = mods["angelsbioprocessing"] and 135.2 or nil}, --liquid ethanol (), - (ethanol(L) 21.1 MJ/L)(26.7 MJ/kg) +} +local turret_params = data.raw["fluid-turret"]["flamethrower-turret"].attack_parameters.fluids + +if mods["bobplates"] then + for fluid, vals in pairs(Energy_table) do + if vals.fv then + data.raw.fluid[fluid].fuel_value = vals.fv .."kJ" + data.raw.fluid[fluid].emmissions_multiplier = vals.em or 1 + if vals.turr ~= false then + table.insert(turret_params, {type = fluid, damage_modifier = vals.fv/Energy_table["gas-methane"].fv}) + end + end + end --fuel oil balancing - data.raw.fluid["liquid-fuel"].fuel_value = "300kJ" --down from 2.3MJ data.raw.recipe["enriched-fuel-from-liquid-fuel"].ingredients = {{type = "fluid", name = "liquid-fuel", amount = 100}} --up from 20 - - if mods["angelsbioprocessing"] then - --liquid ethanol (), - (ethanol(L) 21.1 MJ/L)(26.7 MJ/kg) - data.raw.fluid["gas-ethanol"].fuel_value = "135.2kJ" - end end +------------------------------------------------------------------------------- +-- TECH TREE CLEANUP ---------------------------------------------------------- +------------------------------------------------------------------------------- +if mods["bobplates"] then + -- electronics tech patch --------------------------------------------------- + OV.remove_prereq("electronics","alloy-processing") + if mods["bobelectronics"] then + OV.add_prereq("electronics","angels-coal-processing") + end +end \ No newline at end of file diff --git a/angelspetrochem/prototypes/petrochem-global-override.lua b/angelspetrochem/prototypes/petrochem-global-override.lua index d160c4951..3b415cbce 100644 --- a/angelspetrochem/prototypes/petrochem-global-override.lua +++ b/angelspetrochem/prototypes/petrochem-global-override.lua @@ -29,6 +29,7 @@ require("prototypes.global-override.bobwarfare") require("prototypes.global-override.bobassembly") require("prototypes.global-override.bobtech") require("prototypes.global-override.bobgreenhouse") +require("prototypes.global-override.boblogistics") --URANIUM POWER OVERRIDE if data.raw["item"]["fluorite"] then diff --git a/angelspetrochem/prototypes/petrochem-override.lua b/angelspetrochem/prototypes/petrochem-override.lua index 34f41f52a..2ff2bdd62 100644 --- a/angelspetrochem/prototypes/petrochem-override.lua +++ b/angelspetrochem/prototypes/petrochem-override.lua @@ -17,6 +17,7 @@ require("prototypes.override.angelsindustries") require("prototypes.override.bobplates") require("prototypes.override.bobassembly") require("prototypes.override.bobgreenhouse") +require("prototypes.override.boblogistics") --UPDATE ENTITY RECIPES require("prototypes.recipes.petrochem-entity-angels") diff --git a/angelspetrochem/prototypes/recipes/petrochem-basics.lua b/angelspetrochem/prototypes/recipes/petrochem-basics.lua index e535710ba..ef20ce8a5 100644 --- a/angelspetrochem/prototypes/recipes/petrochem-basics.lua +++ b/angelspetrochem/prototypes/recipes/petrochem-basics.lua @@ -59,6 +59,25 @@ data:extend( {type = "item", name = "slag", amount = 1} }, always_show_products = true, + --icons = angelsmods.functions.create_gas_recipe_icon( + -- { + -- {"__angelspetrochem__/graphics/icons/molecules/oxygen.png", 72}, + -- {"__angelspetrochem__/graphics/icons/molecules/hydrogen.png", 72} + -- }, + -- "ohh", + -- { + -- { + -- { + -- icon = "__angelsrefining__/graphics/icons/num_1.png", + -- icon_size = 32, + -- tint = angelsmods.petrochem.number_tint + -- --scale = 0.32, + -- --shift = {-12, -12}, + -- } + -- }, + -- "water" + -- } + --), icons = angelsmods.functions.create_gas_recipe_icon( { {"__angelspetrochem__/graphics/icons/molecules/oxygen.png", 72}, @@ -66,15 +85,7 @@ data:extend( }, "ohh", { - { - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - tint = angelsmods.petrochem.number_tint - --scale = 0.32, - --shift = {-12, -12}, - } - }, + angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.petrochem.number_tint), "water" } ), @@ -110,15 +121,7 @@ data:extend( }, "ohh", { - { - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - tint = angelsmods.petrochem.number_tint - --scale = 0.32, - --shift = {-12, -12}, - } - }, + angelsmods.functions.add_number_icon_layer({}, 2, angelsmods.petrochem.number_tint), "water" } ), @@ -151,15 +154,7 @@ data:extend( }, "ohh", { - { - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - tint = angelsmods.petrochem.number_tint - --scale = 0.32, - --shift = {-12, -12}, - } - }, + angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.petrochem.number_tint), "water-purified" } ), @@ -194,15 +189,7 @@ data:extend( }, "ohh", { - { - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - tint = angelsmods.petrochem.number_tint - --scale = 0.32, - --shift = {-12, -12}, - } - }, + angelsmods.functions.add_number_icon_layer({}, 2, angelsmods.petrochem.number_tint), "water-purified" } ), @@ -492,18 +479,9 @@ data:extend( results = { {type = "item", name = "solid-carbon", amount = 3} }, - icons = { - { - icon = "__angelspetrochem__/graphics/icons/solid-carbon.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-carbon"), + 1, angelsmods.petrochem.number_tint), order = "d[coke-purification]", crafting_machine_tint = { primary = {r = 1, g = 0.5, b = 0.5, a = 0}, @@ -528,18 +506,9 @@ data:extend( {type = "item", name = "solid-sodium-carbonate", amount = 1}, {type = "fluid", name = "water", amount = 10} }, - icons = { - { - icon = "__angelspetrochem__/graphics/icons/solid-carbon.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-carbon"), + 2, angelsmods.petrochem.number_tint), order = "d[coke-purification]", crafting_machine_tint = { primary = {r = 1, g = 0.5, b = 0.5, a = 0}, @@ -577,18 +546,9 @@ data:extend( results = { {type = "item", name = "solid-coke", amount = 2} }, - icons = { - { - icon = "__angelspetrochem__/graphics/icons/solid-coke.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-coke"), + 1, angelsmods.petrochem.number_tint), order = "b[coal-crushed]" }, { @@ -606,18 +566,9 @@ data:extend( {type = "item", name = "solid-coke", amount = 2}, {type = "fluid", name = "water-yellow-waste", amount = 50} }, - icons = { - { - icon = "__angelspetrochem__/graphics/icons/solid-coke.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-coke"), + 2, angelsmods.petrochem.number_tint), order = "c[solid-coke-sulfur]", crafting_machine_tint = { primary = {r = 1, g = 0.5, b = 0.5, a = 0}, @@ -668,11 +619,7 @@ data:extend( }, "odh", { - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - tint = angelsmods.refining.number_tint - }, + angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.refining.number_tint), { icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-sulfide.png", icon_size = 72 @@ -706,11 +653,7 @@ data:extend( }, "odh", { - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - tint = angelsmods.refining.number_tint - }, + angelsmods.functions.add_number_icon_layer({}, 2, angelsmods.refining.number_tint), { icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-sulfide.png", icon_size = 72 @@ -744,11 +687,7 @@ data:extend( }, "odh", { - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - icon_size = 32, - tint = angelsmods.refining.number_tint - }, + angelsmods.functions.add_number_icon_layer({}, 3, angelsmods.refining.number_tint), { icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-sulfide.png", icon_size = 72 @@ -780,11 +719,7 @@ data:extend( }, "odh", { - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - tint = angelsmods.refining.number_tint - }, + angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.refining.number_tint), mods["angelssmelting"] and { icon = "__angelssmelting__/graphics/icons/liquid-coolant.png", @@ -818,11 +753,7 @@ data:extend( }, "odh", { - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - tint = angelsmods.refining.number_tint - }, + angelsmods.functions.add_number_icon_layer({}, 2, angelsmods.refining.number_tint), mods["angelssmelting"] and { icon = "__angelssmelting__/graphics/icons/liquid-coolant.png", @@ -856,11 +787,7 @@ data:extend( }, "odh", { - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - icon_size = 32, - tint = angelsmods.refining.number_tint - }, + angelsmods.functions.add_number_icon_layer({}, 3, angelsmods.refining.number_tint), mods["angelssmelting"] and { icon = "__angelssmelting__/graphics/icons/liquid-coolant.png", @@ -955,15 +882,7 @@ data:extend( }, "odd", { - { - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - tint = angelsmods.petrochem.number_tint - --scale = 0.32, - --shift = {-12, -12}, - } - }, + angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.petrochem.number_tint), {"__angelspetrochem__/graphics/icons/molecules/heavy-water.png", 64} } ), @@ -998,15 +917,7 @@ data:extend( }, "odd", { - { - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - tint = angelsmods.petrochem.number_tint - --scale = 0.32, - --shift = {-12, -12}, - } - }, + angelsmods.functions.add_number_icon_layer({}, 2, angelsmods.petrochem.number_tint), {"__angelspetrochem__/graphics/icons/molecules/heavy-water.png", 64} } ), diff --git a/angelspetrochem/prototypes/recipes/petrochem-solids.lua b/angelspetrochem/prototypes/recipes/petrochem-solids.lua index 2533b850d..b21ab28aa 100644 --- a/angelspetrochem/prototypes/recipes/petrochem-solids.lua +++ b/angelspetrochem/prototypes/recipes/petrochem-solids.lua @@ -49,11 +49,7 @@ data:extend( nil, {{255, 255, 255}, {255, 255, 255}}, { - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - tint = angelsmods.petrochem.number_tint - } + angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.petrochem.number_tint), } ), order = "a[plastic]-a[liquid]-a" @@ -77,11 +73,7 @@ data:extend( nil, {{255, 255, 255}, {255, 255, 255}}, { - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - tint = angelsmods.petrochem.number_tint - } + angelsmods.functions.add_number_icon_layer({}, 2, angelsmods.petrochem.number_tint), } ), order = "a[plastic]-a[liquid]-b" @@ -105,11 +97,7 @@ data:extend( nil, {{255, 255, 255}, {255, 255, 255}}, { - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - icon_size = 32, - tint = angelsmods.petrochem.number_tint - } + angelsmods.functions.add_number_icon_layer({}, 3, angelsmods.petrochem.number_tint), } ), order = "a[plastic]-a[liquid]-c" @@ -164,11 +152,7 @@ data:extend( nil, {{255, 225, 155}, {255, 225, 155}}, { - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - tint = angelsmods.petrochem.number_tint - } + angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.petrochem.number_tint), } ), order = "b[resin]-a[liquid]-a" @@ -192,11 +176,7 @@ data:extend( nil, {{255, 225, 155}, {255, 225, 155}}, { - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - tint = angelsmods.petrochem.number_tint - } + angelsmods.functions.add_number_icon_layer({}, 2, angelsmods.petrochem.number_tint), } ), order = "b[resin]-a[liquid]-b" @@ -220,11 +200,7 @@ data:extend( nil, {{255, 225, 155}, {255, 225, 155}}, { - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - icon_size = 32, - tint = angelsmods.petrochem.number_tint - } + angelsmods.functions.add_number_icon_layer({}, 3, angelsmods.petrochem.number_tint), } ), order = "b[resin]-a[liquid]-c" @@ -279,11 +255,7 @@ data:extend( nil, {{193, 197, 255}, {193, 197, 255}}, { - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - tint = angelsmods.petrochem.number_tint - } + angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.petrochem.number_tint), } ), order = "b[rubber]-a[liquid]" @@ -587,19 +559,9 @@ data:extend( results = { {type = "item", name = "explosives", amount = 2} }, - icons = { - { - icon = "__base__/graphics/icons/explosives.png", - icon_size = 64 - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("explosives"), + 2, angelsmods.petrochem.number_tint), main_product = "explosives", order = "a[explosives]-b" }, @@ -620,19 +582,9 @@ data:extend( {type = "item", name = "explosives", amount = 3}, {type = "fluid", name = "water-yellow-waste", amount = 25} }, - icons = { - { - icon = "__base__/graphics/icons/explosives.png", - icon_size = 64 - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("explosives"), + 3, angelsmods.petrochem.number_tint), main_product = "explosives", order = "a[explosives]-c" } diff --git a/angelspetrochem/prototypes/technology/angels-technology.lua b/angelspetrochem/prototypes/technology/angels-technology.lua deleted file mode 100644 index 78f4c4f1e..000000000 --- a/angelspetrochem/prototypes/technology/angels-technology.lua +++ /dev/null @@ -1,921 +0,0 @@ -data:extend( - { - { - type = "technology", - name = "angels-fluid-control", - icon = "__angelspetrochem__/graphics/technology/fluid-splitter-tech.png", - icon_size = 128, - prerequisites = { - "basic-chemistry" - }, - effects = { - { - type = "unlock-recipe", - recipe = "valve-inspector" - }, - { - type = "unlock-recipe", - recipe = "valve-overflow" - }, - { - type = "unlock-recipe", - recipe = "valve-return" - }, - { - type = "unlock-recipe", - recipe = "valve-converter" - }, - { - type = "unlock-recipe", - recipe = "fluid-splitter-2-way" - }, - { - type = "unlock-recipe", - recipe = "fluid-splitter-3-way" - }, - { - type = "unlock-recipe", - recipe = "heavy-pump" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - --CHEMISTRY - { - type = "technology", - name = "basic-chemistry", - icon = "__angelspetrochem__/graphics/technology/petrochem-tech.png", - icon_size = 128, - prerequisites = {}, - effects = { - { - type = "unlock-recipe", - recipe = "angels-electrolyser" - }, - { - type = "unlock-recipe", - recipe = "water-separation" - }, - { - type = "unlock-recipe", - recipe = "carbon-separation-2" - }, - { - type = "unlock-recipe", - recipe = "coke-purification" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "angels-sulfur-processing", - icon = "__angelspetrochem__/graphics/technology/sulfur-tech.png", - icon_size = 128, - prerequisites = { - "basic-chemistry" - }, - effects = { - { - type = "unlock-recipe", - recipe = "gas-acid-catalyst" - }, - { - type = "unlock-recipe", - recipe = "solid-sulfur" - }, - { - type = "unlock-recipe", - recipe = "gas-sulfur-dioxide" - }, - { - type = "unlock-recipe", - recipe = "liquid-sulfuric-acid" - }, - { - type = "unlock-recipe", - recipe = "liquid-hydrofluoric-acid" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "angels-nitrogen-processing-1", - icon = "__angelspetrochem__/graphics/technology/nitrogen-tech.png", - icon_size = 128, - prerequisites = { - "basic-chemistry" - }, - effects = { - { - type = "unlock-recipe", - recipe = "air-separation" - }, - { - type = "unlock-recipe", - recipe = "gas-ammonia" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "angels-nitrogen-processing-2", - icon = "__angelspetrochem__/graphics/technology/nitrogen-tech.png", - icon_size = 128, - prerequisites = { - "angels-nitrogen-processing-1", - "angels-advanced-chemistry-1" - }, - effects = { - { - type = "unlock-recipe", - recipe = "gas-ammonium-chloride" - }, - { - type = "unlock-recipe", - recipe = "gas-urea" - }, - { - type = "unlock-recipe", - recipe = "gas-melamine" - }, - { - type = "unlock-recipe", - recipe = "liquid-nitric-acid" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "chlorine-processing", - icon = "__angelspetrochem__/graphics/technology/chlorine-tech.png", - icon_size = 128, - prerequisites = { - "basic-chemistry" - }, - effects = { - { - type = "unlock-recipe", - recipe = "water-saline-separation" - }, - { - type = "unlock-recipe", - recipe = "gas-chlor-methane" - }, - { - type = "unlock-recipe", - recipe = "gas-hydrogen-chloride" - }, - { - type = "unlock-recipe", - recipe = "liquid-hydrochloric-acid" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - --PETRO CHEMISTRY - { - type = "technology", - name = "oil-gas-extraction", - icon = "__angelspetrochem__/graphics/technology/separator-tech.png", - icon_size = 128, - prerequisites = { - "basic-chemistry", - "electronics" - }, - effects = { - { - type = "unlock-recipe", - recipe = "pumpjack" - }, - { - type = "unlock-recipe", - recipe = "separator" - }, - { - type = "unlock-recipe", - recipe = "gas-separation" - }, - { - type = "unlock-recipe", - recipe = "oil-separation" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "angels-oil-processing", - icon = "__base__/graphics/technology/oil-processing.png", - icon_size = 128, - prerequisites = { - "oil-gas-extraction" - }, - effects = { - { - type = "unlock-recipe", - recipe = "oil-refinery" - }, - { - type = "unlock-recipe", - recipe = "angels-storage-tank-2" - }, - { - type = "unlock-recipe", - recipe = "oil-refining" - }, - { - type = "unlock-recipe", - recipe = "condensates-oil-refining" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "gas-processing", - icon = "__angelspetrochem__/graphics/technology/gas-refinery-tech.png", - icon_size = 128, - prerequisites = { - "oil-gas-extraction" - }, - effects = { - { - type = "unlock-recipe", - recipe = "gas-refinery" - }, - { - type = "unlock-recipe", - recipe = "angels-storage-tank-1" - }, - { - type = "unlock-recipe", - recipe = "gas-refining" - }, - { - type = "unlock-recipe", - recipe = "gas-fractioning" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "flare-stack", - icon = "__angelspetrochem__/graphics/technology/flare-stack.png", - icon_size = 128, - prerequisites = { - "oil-gas-extraction" - }, - effects = { - { - type = "unlock-recipe", - recipe = "flare-stack" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "angels-advanced-chemistry-1", - icon = "__angelspetrochem__/graphics/technology/advanced-chemical-plant-tech.png", - icon_size = 128, - prerequisites = { - "oil-gas-extraction", - "angels-oil-processing", - "gas-processing" - }, - effects = { - { - type = "unlock-recipe", - recipe = "angels-electrolyser-2" - }, - { - type = "unlock-recipe", - recipe = "advanced-chemical-plant" - }, - { - type = "unlock-recipe", - recipe = "gas-methanol-catalyst" - }, - { - type = "unlock-recipe", - recipe = "gas-formaldehyde-catalyst" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "angels-advanced-chemistry-2", - icon = "__angelspetrochem__/graphics/technology/advanced-chemical-plant-tech.png", - icon_size = 128, - prerequisites = { - "angels-advanced-chemistry-1", - "gas-steam-cracking-1", - "oil-steam-cracking-1" - }, - effects = { - { - type = "unlock-recipe", - recipe = "angels-electrolyser-3" - }, - { - type = "unlock-recipe", - recipe = "separator-2" - }, - { - type = "unlock-recipe", - recipe = "gas-refinery-2" - }, - { - type = "unlock-recipe", - recipe = "oil-refinery-2" - }, - { - type = "unlock-recipe", - recipe = "liquid-styrene-catalyst" - }, - { - type = "unlock-recipe", - recipe = "gas-benzene-catalyst" - }, - { - type = "unlock-recipe", - recipe = "liquid-ethylbenzene-catalyst" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "angels-advanced-chemistry-3", - icon = "__angelspetrochem__/graphics/technology/advanced-chemical-plant-tech.png", - icon_size = 128, - prerequisites = { - "angels-advanced-chemistry-2", - "gas-steam-cracking-2", - "oil-steam-cracking-2" - }, - effects = { - { - type = "unlock-recipe", - recipe = "angels-electrolyser-4" - }, - { - type = "unlock-recipe", - recipe = "separator-3" - }, - { - type = "unlock-recipe", - recipe = "gas-refinery-3" - }, - { - type = "unlock-recipe", - recipe = "oil-refinery-3" - }, - { - type = "unlock-recipe", - recipe = "steam-cracker-3" - }, - { - type = "unlock-recipe", - recipe = "advanced-chemical-plant-2" - }, - { - type = "unlock-recipe", - recipe = "advanced-oil-refining" - }, - { - type = "unlock-recipe", - recipe = "condensates-refining" - }, - { - type = "unlock-recipe", - recipe = "liquid-mineral-oil-catalyst" - }, - { - type = "unlock-recipe", - recipe = "liquid-polyethylene-catalyst" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1}, - {type = "item", name = "chemical-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "angels-advanced-chemistry-4", - icon = "__angelspetrochem__/graphics/technology/advanced-chemical-plant-tech.png", - icon_size = 128, - prerequisites = { - "angels-advanced-chemistry-3" - }, - effects = { - { - type = "unlock-recipe", - recipe = "separator-4" - }, - { - type = "unlock-recipe", - recipe = "gas-refinery-4" - }, - { - type = "unlock-recipe", - recipe = "oil-refinery-4" - }, - { - type = "unlock-recipe", - recipe = "steam-cracker-4" - }, - { - type = "unlock-recipe", - recipe = "liquid-phenol-catalyst" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1}, - {type = "item", name = "chemical-science-pack", amount = 1}, - {type = "item", name = "production-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "coal-cracking", - icon = "__angelspetrochem__/graphics/technology/coal-tech.png", - icon_size = 128, - prerequisites = { - "angels-advanced-chemistry-3" - }, - effects = { - { - type = "unlock-recipe", - recipe = "coal-cracking-1" - }, - { - type = "unlock-recipe", - recipe = "coal-cracking-2" - }, - { - type = "unlock-recipe", - recipe = "coal-cracking-3" - }, - { - type = "unlock-recipe", - recipe = "carbon-separation-1" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1}, - {type = "item", name = "chemical-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "gas-synthesis", - icon = "__angelspetrochem__/graphics/technology/synthesis-tech.png", - icon_size = 128, - prerequisites = { - "angels-advanced-chemistry-3" - }, - effects = { - { - type = "unlock-recipe", - recipe = "gas-synthesis-separation" - }, - { - type = "unlock-recipe", - recipe = "gas-synthesis-methanation" - }, - { - type = "unlock-recipe", - recipe = "gas-synthesis-methanol" - }, - { - type = "unlock-recipe", - recipe = "liquid-naphtha-catalyst" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1}, - {type = "item", name = "chemical-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "gas-steam-cracking-1", - icon = "__angelspetrochem__/graphics/technology/steam-cracker-tech.png", - icon_size = 128, - prerequisites = { - "gas-processing" - }, - effects = { - { - type = "unlock-recipe", - recipe = "steam-cracker" - }, - { - type = "unlock-recipe", - recipe = "steam-cracking-methane" - }, - { - type = "unlock-recipe", - recipe = "steam-cracking-ethane" - }, - { - type = "unlock-recipe", - recipe = "steam-cracking-butane" - }, - { - type = "unlock-recipe", - recipe = "gas-propene-synthesis" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "gas-steam-cracking-2", - icon = "__angelspetrochem__/graphics/technology/steam-cracker-tech.png", - icon_size = 128, - prerequisites = { - "gas-steam-cracking-1", - "angels-advanced-chemistry-2" - }, - effects = { - { - type = "unlock-recipe", - recipe = "steam-cracker-2" - }, - { - type = "unlock-recipe", - recipe = "steam-cracking-residual" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1}, - {type = "item", name = "chemical-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "oil-steam-cracking-1", - icon = "__angelspetrochem__/graphics/technology/steam-cracker-tech.png", - icon_size = 128, - prerequisites = { - "angels-oil-processing" - }, - effects = { - { - type = "unlock-recipe", - recipe = "steam-cracker" - }, - { - type = "unlock-recipe", - recipe = "catalyst-steam-cracking-butane" - }, - { - type = "unlock-recipe", - recipe = "catalyst-steam-cracking-naphtha" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "oil-steam-cracking-2", - icon = "__angelspetrochem__/graphics/technology/steam-cracker-tech.png", - icon_size = 128, - prerequisites = { - "oil-steam-cracking-1", - "angels-advanced-chemistry-2" - }, - effects = { - { - type = "unlock-recipe", - recipe = "steam-cracker-2" - }, - { - type = "unlock-recipe", - recipe = "steam-cracking-naphtha" - }, - { - type = "unlock-recipe", - recipe = "steam-cracking-mineral-oil" - }, - { - type = "unlock-recipe", - recipe = "steam-cracking-fuel-oil" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1}, - {type = "item", name = "chemical-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - --SOLIDS - { - type = "technology", - name = "plastic-1", - icon = "__angelspetrochem__/graphics/technology/plastic-1-tech.png", - icon_size = 128, - prerequisites = { - "angels-advanced-chemistry-1" - }, - effects = { - { - type = "unlock-recipe", - recipe = "solid-plastic-1" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "plastic-2", - icon = "__angelspetrochem__/graphics/technology/plastic-2-tech.png", - icon_size = 128, - prerequisites = { - "plastic-1", - "angels-advanced-chemistry-3" - }, - effects = { - { - type = "unlock-recipe", - recipe = "solid-plastic-2" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1}, - {type = "item", name = "chemical-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "plastic-3", - icon = "__angelspetrochem__/graphics/technology/plastic-3-tech.png", - icon_size = 128, - prerequisites = { - "plastic-2", - "angels-advanced-chemistry-4" - }, - effects = { - { - type = "unlock-recipe", - recipe = "solid-plastic-3" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1}, - {type = "item", name = "chemical-science-pack", amount = 1}, - {type = "item", name = "production-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "resin-1", - icon = "__angelspetrochem__/graphics/technology/separator-tech.png", - icon_size = 128, - prerequisites = { - "angels-advanced-chemistry-1", - "angels-nitrogen-processing-2" - }, - effects = { - { - type = "unlock-recipe", - recipe = "solid-resin" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "resin-2", - icon = "__angelspetrochem__/graphics/technology/separator-tech.png", - icon_size = 128, - prerequisites = { - "resin-1", - "angels-advanced-chemistry-3" - }, - effects = { - { - type = "unlock-recipe", - recipe = "solid-resin-2" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1}, - {type = "item", name = "chemical-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "rubber", - icon = "__angelspetrochem__/graphics/technology/separator-tech.png", - icon_size = 128, - prerequisites = { - "gas-steam-cracking-1", - "angels-advanced-chemistry-2" - }, - effects = { - { - type = "unlock-recipe", - recipe = "solid-rubber" - } - }, - unit = { - count = 30, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1}, - {type = "item", name = "chemical-science-pack", amount = 1} - }, - time = 15 - }, - order = "c-a" - } - } -) diff --git a/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua b/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua index e13a67c4e..35013ec03 100644 --- a/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua +++ b/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua @@ -87,7 +87,9 @@ data:extend( icons = angelsmods.functions.create_gas_tech_icon({{105, 113, 090}, {088, 113, 075}, {070, 090, 060}}), upgrade = true, prerequisites = { - "basic-chemistry-2" + "basic-chemistry-2", + "angels-coal-processing", + "automation-2" }, effects = { { @@ -251,20 +253,43 @@ data:extend( upgrade = true, prerequisites = { "angels-coal-processing", - "angels-advanced-chemistry-1" + --"basic-chemistry-3", + "water-treatment-2" }, effects = { { type = "unlock-recipe", - recipe = "coke-purification-2" + recipe = "carbon-separation-1" }, { type = "unlock-recipe", - recipe = "carbon-separation-1" + recipe = "solid-coke-sulfur" + } + }, + unit = { + count = 50, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1} }, + time = 15 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-coal-processing-3", + icons = angelsmods.functions.create_gas_tech_icon({{067, 067, 067}, {056, 056, 056}, {045, 045, 045}}), + upgrade = true, + prerequisites = { + "angels-coal-processing-2", + "chlorine-processing-1", + "angels-nitrogen-processing-1" + }, + effects = { { type = "unlock-recipe", - recipe = "solid-coke-sulfur" + recipe = "coke-purification-2" } }, unit = { @@ -282,7 +307,7 @@ data:extend( name = "angels-coal-cracking", icons = angelsmods.functions.create_gas_tech_icon({{067, 067, 067}, {056, 056, 056}, {045, 045, 045}}), prerequisites = { - "angels-coal-processing-2", + "angels-coal-processing-3", "angels-advanced-chemistry-3" }, effects = { @@ -381,7 +406,8 @@ data:extend( upgrade = true, prerequisites = { "angels-sulfur-processing-2", - "angels-advanced-chemistry-1" + "angels-advanced-chemistry-1", + "gas-processing" }, effects = { { @@ -484,6 +510,7 @@ data:extend( prerequisites = { "angels-nitrogen-processing-1", "angels-advanced-chemistry-1", + "chlorine-processing-1", "water-treatment-2" }, effects = { @@ -617,8 +644,9 @@ data:extend( icons = angelsmods.functions.create_gas_tech_icon("lll"), upgrade = true, prerequisites = { - "basic-chemistry-2", - "water-treatment", + --"basic-chemistry-2", + --"water-treatment", + "ore-crushing", "gas-processing" }, effects = { @@ -655,7 +683,8 @@ data:extend( icons = angelsmods.functions.create_gas_tech_icon("lll"), upgrade = true, prerequisites = { - "chlorine-processing-1" + "chlorine-processing-1", + "gas-steam-cracking-1" }, effects = { { diff --git a/angelspetrochem/prototypes/technology/petrochem-petro-chemistry.lua b/angelspetrochem/prototypes/technology/petrochem-petro-chemistry.lua index dcf480e4b..ff3590ce2 100644 --- a/angelspetrochem/prototypes/technology/petrochem-petro-chemistry.lua +++ b/angelspetrochem/prototypes/technology/petrochem-petro-chemistry.lua @@ -7,8 +7,9 @@ data:extend( icon = "__angelspetrochem__/graphics/technology/separator-tech.png", icon_size = 128, prerequisites = { - "basic-chemistry", - "electronics" + "basic-chemistry-3", + --"electronics", + "fluid-handling" }, effects = { { @@ -42,7 +43,8 @@ data:extend( type = "technology", name = "angels-oil-processing", icon = "__base__/graphics/technology/oil-processing.png", - icon_size = 128, + icon_size = 256, + icon_mipmaps = 4, prerequisites = { "oil-gas-extraction" }, @@ -86,7 +88,8 @@ data:extend( type = "technology", name = "angels-advanced-oil-processing", icon = "__base__/graphics/technology/oil-processing.png", - icon_size = 128, + icon_size = 256, + icon_mipmaps = 4, prerequisites = { "oil-processing" }, @@ -194,7 +197,8 @@ data:extend( icon = "__angelspetrochem__/graphics/technology/flare-stack.png", icon_size = 128, prerequisites = { - "angels-fluid-control" + "angels-fluid-control", + "basic-chemistry-3" }, effects = { { @@ -218,9 +222,8 @@ data:extend( icon = "__angelspetrochem__/graphics/technology/advanced-chemical-plant-tech.png", icon_size = 128, prerequisites = { - "oil-gas-extraction", - "oil-processing", - "gas-processing" + --"basic-chemistry-3", + "ore-floatation" }, effects = { { @@ -574,7 +577,8 @@ data:extend( icon = "__angelspetrochem__/graphics/technology/steam-cracker-tech.png", icon_size = 128, prerequisites = { - "oil-processing" + "oil-processing", + "angels-advanced-chemistry-1" }, effects = { { diff --git a/angelspetrochem/prototypes/technology/petrochem-solids.lua b/angelspetrochem/prototypes/technology/petrochem-solids.lua index 71487a7fa..4ae2a73c1 100644 --- a/angelspetrochem/prototypes/technology/petrochem-solids.lua +++ b/angelspetrochem/prototypes/technology/petrochem-solids.lua @@ -7,17 +7,17 @@ data:extend( icon = "__angelspetrochem__/graphics/technology/plastic-1-tech.png", icon_size = 128, prerequisites = { - "angels-advanced-chemistry-1", - "plastics" + "plastics", + "angels-advanced-chemistry-2" }, effects = { { type = "unlock-recipe", - recipe = "solid-plastic" + recipe = "liquid-plastic-1" }, { type = "unlock-recipe", - recipe = "liquid-plastic-1" + recipe = "solid-plastic" } }, unit = { @@ -89,13 +89,13 @@ data:extend( icon = "__angelspetrochem__/graphics/technology/resins-tech.png", icon_size = 128, prerequisites = { - "angels-oil-processing" + "basic-chemistry-3" }, effects = { - { - type = "unlock-recipe", - recipe = "solid-resin" - }, + --{ + -- type = "unlock-recipe", + -- recipe = "solid-resin" + --}, }, unit = { count = 50, @@ -120,12 +120,12 @@ data:extend( effects = { { type = "unlock-recipe", - recipe = "solid-resin" + recipe = "liquid-resin-1" }, { type = "unlock-recipe", - recipe = "liquid-resin-1" - } + recipe = "solid-resin" + }, }, unit = { count = 50, @@ -199,10 +199,10 @@ data:extend( "angels-oil-processing" }, effects = { - { - type = "unlock-recipe", - recipe = "solid-rubber" - }, + --{ + -- type = "unlock-recipe", + -- recipe = "solid-rubber" + --}, }, unit = { count = 50, @@ -221,7 +221,7 @@ data:extend( icon_size = 128, prerequisites = { "rubbers", - "gas-steam-cracking-1", + --"oil-steam-cracking-1", "angels-advanced-chemistry-2" }, effects = { diff --git a/angelspetrochem/settings-updates.lua b/angelspetrochem/settings-updates.lua index cd469fb58..dfd252a06 100644 --- a/angelspetrochem/settings-updates.lua +++ b/angelspetrochem/settings-updates.lua @@ -1,16 +1,7 @@ -local function hide_setting(setting_type, setting_name, setting_default) - if data.raw[setting_type] and data.raw[setting_type][setting_name] then - data.raw[setting_type][setting_name].hidden = true - if setting_default ~= nil then - data.raw[setting_type][setting_name].default_value = setting_default - end - end -end - if mods["bobplates"] then - hide_setting("bool-setting", "angels-disable-vanilla-chemical-plants", true) + angelsmods.settings.hide_setting("bool-setting", "angels-disable-vanilla-chemical-plants", true) else - hide_setting("bool-setting", "angels-disable-bobs-electrolysers", true) - hide_setting("bool-setting", "angels-disable-bobs-chemical-plants", true) - hide_setting("bool-setting", "angels-disable-bobs-distilleries", true) + angelsmods.settings.hide_setting("bool-setting", "angels-disable-bobs-electrolysers", true) + angelsmods.settings.hide_setting("bool-setting", "angels-disable-bobs-chemical-plants", true) + angelsmods.settings.hide_setting("bool-setting", "angels-disable-bobs-distilleries", true) end \ No newline at end of file diff --git a/angelsrefining/changelog.txt b/angelsrefining/changelog.txt index 0e780e6cb..9a182f0f2 100644 --- a/angelsrefining/changelog.txt +++ b/angelsrefining/changelog.txt @@ -1,4 +1,38 @@ --------------------------------------------------------------------------------------------------- +Version: 0.11.20 +Date: ?? + Changes: + - Tweaked some technology tree prerequisites as cleanup (428) + - Hidden the crystallizers fluid box when no fluid is required (475) + - Sorted bobs fluid tanks into the fluid handling tab (486) + - Locked bobs gem refining behind technology rather than unlocking from the start (455) + - Renamed gode crystallization 2 to geode processing 3 + - Make voiding recipes hidden_from_player_crafting instead of plain hidden (492) + - Tweaked the lib to hide all objects (entities, items, fluids, tools etc) when a flag is set + - NOT just the first thing found. + - Also updated the remove flag script to do the same thing + - Tweaked the lib to show icons next to the autoplace controls (542) + - Sorting Facility 4 no longer has an ingredient limit (defaults to 255) (514) + - Added HQ tier numbering icons + - Burner crusher is now not counted as tier 1 (but as tier 0, currently without icon) (513) + - Hides the unused settings now properly for consistency (538) + - Allowed the hydro-plant to be unlocked slightly earlier (550) + - Changed and expanded locale strings and text descriptions (489) + Bugfixes: + - Fixed geode crystalisation 1 did exist without any unlocks + - Fixed incorrect localisation on hidding voiding recipes + - Removed obsolete inventory slots in the clarifier + - Fixed that recipes were not being hidden correctly and showing in lookup mods (491) + - Improved the limited flow capacity in the Thermal bore/extractor (509) + - Fixed an issue with Yuoki's icons not being updated (with the old ones already removed) + - Fixed that the method for removing autoplace controls was not universally used (373) + - Fixed deadlock for bobclasses "fighter" and component mode (394, 559) +--------------------------------------------------------------------------------------------------- +Version: 0.11.19 +Date: 26.11.2020 + Changes: + - Updated to Factorio 1.1 +--------------------------------------------------------------------------------------------------- Version: 0.11.18 Date: 16.11.2020 Changes: diff --git a/angelsrefining/control.lua b/angelsrefining/control.lua index c7d50bdb5..6d7ccc4dc 100644 --- a/angelsrefining/control.lua +++ b/angelsrefining/control.lua @@ -1,13 +1,18 @@ script.on_init(function() - if remote.interfaces["freeplay"] then -- give ore crushers + if remote.interfaces["freeplay"] then local items_to_insert = remote.call("freeplay", "get_created_items") + local technology_overhaul = settings.startup["angels-enable-tech"].value + local components_overhaul = technology_overhaul or settings.startup["angels-enable-components"].value + + -- give ore crushers items_to_insert["burner-ore-crusher"] = (items_to_insert["burner-ore-crusher"] or 0) + 1 - remote.call("freeplay", "set_created_items", items_to_insert) - end - - if game.active_mods["bobclasses"] and remote.interfaces['freeplay'] then -- give an extra miner - local items_to_insert = remote.call("freeplay", "get_created_items") - items_to_insert["burner-mining-drill"] = (items_to_insert["burner-mining-drill"] or 0) + 1 -- 2 additional plates + if game.active_mods["bobclasses"] then + -- fix character classes starting point + if components_overhaul then + -- give two additional iron plates + items_to_insert["iron-plate"] = (items_to_insert["iron-plate"] or 0) + 2 + end + end remote.call("freeplay", "set_created_items", items_to_insert) end end) diff --git a/angelsrefining/data.lua b/angelsrefining/data.lua index 038796fdc..0a48fae5a 100644 --- a/angelsrefining/data.lua +++ b/angelsrefining/data.lua @@ -5,7 +5,7 @@ angelsmods = angelsmods or {} angelsmods.refining = angelsmods.refining or {} angelsmods.refining.disable_ore_override = false angelsmods.refining.productivity_exception = {} -angelsmods.refining.number_tint = {r = 0.3, g = 1.0, b = 1.0, a = 0} +angelsmods.refining.number_tint = {r = 0.3, g = 1.0, b = 1.0, a = 1} --LOAD FUNCTIONS angelsmods.functions = angelsmods.functions or {} diff --git a/angelsrefining/graphics/icons/angels-ore-mix-aluminium-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-aluminium-sorting.png deleted file mode 100644 index b3c0b097a..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-aluminium-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-chrome-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-chrome-sorting.png deleted file mode 100644 index 2f76ff0be..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-chrome-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-cobalt-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-cobalt-sorting.png deleted file mode 100644 index fa20164a8..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-cobalt-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-copper-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-copper-sorting.png deleted file mode 100644 index dddfadff0..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-copper-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-gold-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-gold-sorting.png deleted file mode 100644 index b46947a98..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-gold-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-iron-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-iron-sorting.png deleted file mode 100644 index 3f6704007..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-iron-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-lead-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-lead-sorting.png deleted file mode 100644 index 0c8f28aa3..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-lead-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-manganese-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-manganese-sorting.png deleted file mode 100644 index fd9748b98..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-manganese-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-nickel-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-nickel-sorting.png deleted file mode 100644 index de5e9309f..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-nickel-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-nuc-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-nuc-sorting.png deleted file mode 100644 index c36c855da..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-nuc-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-platinum-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-platinum-sorting.png deleted file mode 100644 index accf76c1f..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-platinum-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-silica-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-silica-sorting.png deleted file mode 100644 index 2d87bcaf4..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-silica-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-silver-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-silver-sorting.png deleted file mode 100644 index 7286f1dcd..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-silver-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-tin-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-tin-sorting.png deleted file mode 100644 index 37bea0055..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-tin-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-titanium-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-titanium-sorting.png deleted file mode 100644 index 4e385202e..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-titanium-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-tungsten-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-tungsten-sorting.png deleted file mode 100644 index 9c3b493fc..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-tungsten-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-up1-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-up1-sorting.png deleted file mode 100644 index f88391c26..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-up1-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-up2-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-up2-sorting.png deleted file mode 100644 index 57525efdb..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-up2-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-yi1-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-yi1-sorting.png deleted file mode 100644 index b67a686ce..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-yi1-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-yi2-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-yi2-sorting.png deleted file mode 100644 index 23fe6573b..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-yi2-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore-mix-zinc-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-zinc-sorting.png deleted file mode 100644 index 9553f5bdf..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore-mix-zinc-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore1-chunk-sorting.png b/angelsrefining/graphics/icons/angels-ore1-chunk-sorting.png deleted file mode 100644 index 96d4a5786..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore1-chunk-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore1-crushed-sorting.png b/angelsrefining/graphics/icons/angels-ore1-crushed-sorting.png deleted file mode 100644 index bb4893984..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore1-crushed-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore1-crystal-sorting.png b/angelsrefining/graphics/icons/angels-ore1-crystal-sorting.png deleted file mode 100644 index 300d17918..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore1-crystal-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore1-pure-sorting.png b/angelsrefining/graphics/icons/angels-ore1-pure-sorting.png deleted file mode 100644 index 7fcdfb8b1..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore1-pure-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore2-chunk-sorting.png b/angelsrefining/graphics/icons/angels-ore2-chunk-sorting.png deleted file mode 100644 index 246e9aad8..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore2-chunk-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore2-crushed-sorting.png b/angelsrefining/graphics/icons/angels-ore2-crushed-sorting.png deleted file mode 100644 index 6ef5cc5a0..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore2-crushed-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore2-crystal-sorting.png b/angelsrefining/graphics/icons/angels-ore2-crystal-sorting.png deleted file mode 100644 index 1a2fae5c0..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore2-crystal-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore2-pure-sorting.png b/angelsrefining/graphics/icons/angels-ore2-pure-sorting.png deleted file mode 100644 index 0a6b02580..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore2-pure-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore3-chunk-sorting.png b/angelsrefining/graphics/icons/angels-ore3-chunk-sorting.png deleted file mode 100644 index a3231400c..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore3-chunk-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore3-crushed-sorting.png b/angelsrefining/graphics/icons/angels-ore3-crushed-sorting.png deleted file mode 100644 index e42826bbf..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore3-crushed-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore3-crystal-sorting.png b/angelsrefining/graphics/icons/angels-ore3-crystal-sorting.png deleted file mode 100644 index 096f554d1..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore3-crystal-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore3-pure-sorting.png b/angelsrefining/graphics/icons/angels-ore3-pure-sorting.png deleted file mode 100644 index 2ad90ff6a..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore3-pure-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore4-chunk-sorting.png b/angelsrefining/graphics/icons/angels-ore4-chunk-sorting.png deleted file mode 100644 index 32692d875..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore4-chunk-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore4-crushed-sorting.png b/angelsrefining/graphics/icons/angels-ore4-crushed-sorting.png deleted file mode 100644 index 7726428c4..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore4-crushed-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore4-crystal-sorting.png b/angelsrefining/graphics/icons/angels-ore4-crystal-sorting.png deleted file mode 100644 index b9c6e7f2a..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore4-crystal-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore4-pure-sorting.png b/angelsrefining/graphics/icons/angels-ore4-pure-sorting.png deleted file mode 100644 index fbaee4ffc..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore4-pure-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore5-chunk-sorting.png b/angelsrefining/graphics/icons/angels-ore5-chunk-sorting.png deleted file mode 100644 index 1bc5d1b9e..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore5-chunk-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore5-crushed-sorting.png b/angelsrefining/graphics/icons/angels-ore5-crushed-sorting.png deleted file mode 100644 index c122e72ec..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore5-crushed-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore5-crystal-sorting.png b/angelsrefining/graphics/icons/angels-ore5-crystal-sorting.png deleted file mode 100644 index b5f908c1b..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore5-crystal-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore5-pure-sorting.png b/angelsrefining/graphics/icons/angels-ore5-pure-sorting.png deleted file mode 100644 index e4fbef69f..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore5-pure-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore6-chunk-sorting.png b/angelsrefining/graphics/icons/angels-ore6-chunk-sorting.png deleted file mode 100644 index f809467bf..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore6-chunk-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore6-crushed-sorting.png b/angelsrefining/graphics/icons/angels-ore6-crushed-sorting.png deleted file mode 100644 index fe3059896..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore6-crushed-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore6-crystal-sorting.png b/angelsrefining/graphics/icons/angels-ore6-crystal-sorting.png deleted file mode 100644 index 00a92de0b..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore6-crystal-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore6-pure-sorting.png b/angelsrefining/graphics/icons/angels-ore6-pure-sorting.png deleted file mode 100644 index cd150695a..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore6-pure-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore8-anode-sludge.png b/angelsrefining/graphics/icons/angels-ore8-anode-sludge.png deleted file mode 100644 index 9bb576d9a..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore8-anode-sludge.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore8-slime-filtering.png b/angelsrefining/graphics/icons/angels-ore8-slime-filtering.png deleted file mode 100644 index a3da3cb37..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore8-slime-filtering.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore8-slime.png b/angelsrefining/graphics/icons/angels-ore8-slime.png deleted file mode 100644 index a2829460f..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore8-slime.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore8-sludge.png b/angelsrefining/graphics/icons/angels-ore8-sludge.png deleted file mode 100644 index 9300c94d6..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore8-sludge.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore8-solution.png b/angelsrefining/graphics/icons/angels-ore8-solution.png deleted file mode 100644 index 4257e02f0..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore8-solution.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore9-anode-sludge.png b/angelsrefining/graphics/icons/angels-ore9-anode-sludge.png deleted file mode 100644 index 9b06f1af8..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore9-anode-sludge.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore9-slime-filtering.png b/angelsrefining/graphics/icons/angels-ore9-slime-filtering.png deleted file mode 100644 index 24bc9367b..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore9-slime-filtering.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore9-slime.png b/angelsrefining/graphics/icons/angels-ore9-slime.png deleted file mode 100644 index 83cf6ae5c..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore9-slime.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore9-sludge.png b/angelsrefining/graphics/icons/angels-ore9-sludge.png deleted file mode 100644 index 2ad1ccbb3..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore9-sludge.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angels-ore9-solution.png b/angelsrefining/graphics/icons/angels-ore9-solution.png deleted file mode 100644 index 1ca761552..000000000 Binary files a/angelsrefining/graphics/icons/angels-ore9-solution.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angelsore7-chunk-mix-processing.png b/angelsrefining/graphics/icons/angelsore7-chunk-mix-processing.png deleted file mode 100644 index 7bebf9757..000000000 Binary files a/angelsrefining/graphics/icons/angelsore7-chunk-mix-processing.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angelsore7-crushed-mix-processing.png b/angelsrefining/graphics/icons/angelsore7-crushed-mix-processing.png deleted file mode 100644 index cb0c59959..000000000 Binary files a/angelsrefining/graphics/icons/angelsore7-crushed-mix-processing.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angelsore7-crystal-mix-processing.png b/angelsrefining/graphics/icons/angelsore7-crystal-mix-processing.png deleted file mode 100644 index 2dc32570b..000000000 Binary files a/angelsrefining/graphics/icons/angelsore7-crystal-mix-processing.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/angelsore7-pure-mix-processing.png b/angelsrefining/graphics/icons/angelsore7-pure-mix-processing.png deleted file mode 100644 index 142b8952a..000000000 Binary files a/angelsrefining/graphics/icons/angelsore7-pure-mix-processing.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/clarifier-void-1.png b/angelsrefining/graphics/icons/clarifier-void-1.png deleted file mode 100644 index 10dd419e6..000000000 Binary files a/angelsrefining/graphics/icons/clarifier-void-1.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/clarifier-void-2.png b/angelsrefining/graphics/icons/clarifier-void-2.png deleted file mode 100644 index 8bc0274a8..000000000 Binary files a/angelsrefining/graphics/icons/clarifier-void-2.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/clarifier-void-3.png b/angelsrefining/graphics/icons/clarifier-void-3.png deleted file mode 100644 index 7acb69fc8..000000000 Binary files a/angelsrefining/graphics/icons/clarifier-void-3.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/clarifier-void-4.png b/angelsrefining/graphics/icons/clarifier-void-4.png deleted file mode 100644 index a0ab88151..000000000 Binary files a/angelsrefining/graphics/icons/clarifier-void-4.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/clarifier-void-5.png b/angelsrefining/graphics/icons/clarifier-void-5.png deleted file mode 100644 index b52c58064..000000000 Binary files a/angelsrefining/graphics/icons/clarifier-void-5.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/clarifier-void-6.png b/angelsrefining/graphics/icons/clarifier-void-6.png deleted file mode 100644 index 7ed8085ba..000000000 Binary files a/angelsrefining/graphics/icons/clarifier-void-6.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/clarifier-void-7.png b/angelsrefining/graphics/icons/clarifier-void-7.png deleted file mode 100644 index 8a0ec72ca..000000000 Binary files a/angelsrefining/graphics/icons/clarifier-void-7.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/copper-ore-chunk-sorting.png b/angelsrefining/graphics/icons/copper-ore-chunk-sorting.png deleted file mode 100644 index 57f874058..000000000 Binary files a/angelsrefining/graphics/icons/copper-ore-chunk-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/copper-ore-chunk.png b/angelsrefining/graphics/icons/copper-ore-chunk.png deleted file mode 100644 index 7693550b4..000000000 Binary files a/angelsrefining/graphics/icons/copper-ore-chunk.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/copper-ore-crushed-sorting.png b/angelsrefining/graphics/icons/copper-ore-crushed-sorting.png deleted file mode 100644 index 00c0d9686..000000000 Binary files a/angelsrefining/graphics/icons/copper-ore-crushed-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/copper-ore-crushed.png b/angelsrefining/graphics/icons/copper-ore-crushed.png deleted file mode 100644 index 26fa1640c..000000000 Binary files a/angelsrefining/graphics/icons/copper-ore-crushed.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/copper-ore-crystal-sorting.png b/angelsrefining/graphics/icons/copper-ore-crystal-sorting.png deleted file mode 100644 index f6c8f0f9f..000000000 Binary files a/angelsrefining/graphics/icons/copper-ore-crystal-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/copper-ore-crystal.png b/angelsrefining/graphics/icons/copper-ore-crystal.png deleted file mode 100644 index 908ee56f6..000000000 Binary files a/angelsrefining/graphics/icons/copper-ore-crystal.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/copper-ore-pure-sorting.png b/angelsrefining/graphics/icons/copper-ore-pure-sorting.png deleted file mode 100644 index 3941986a5..000000000 Binary files a/angelsrefining/graphics/icons/copper-ore-pure-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/copper-ore-pure.png b/angelsrefining/graphics/icons/copper-ore-pure.png deleted file mode 100644 index e49d7412e..000000000 Binary files a/angelsrefining/graphics/icons/copper-ore-pure.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/crystal-filtering-1.png b/angelsrefining/graphics/icons/crystal-filtering-1.png deleted file mode 100644 index d11ff894f..000000000 Binary files a/angelsrefining/graphics/icons/crystal-filtering-1.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/crystal-filtering-2.png b/angelsrefining/graphics/icons/crystal-filtering-2.png deleted file mode 100644 index 483cec9bb..000000000 Binary files a/angelsrefining/graphics/icons/crystal-filtering-2.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/crystal-filtering-conversion-1.png b/angelsrefining/graphics/icons/crystal-filtering-conversion-1.png deleted file mode 100644 index d11ff894f..000000000 Binary files a/angelsrefining/graphics/icons/crystal-filtering-conversion-1.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/crystal-filtering-conversion-2.png b/angelsrefining/graphics/icons/crystal-filtering-conversion-2.png deleted file mode 100644 index 483cec9bb..000000000 Binary files a/angelsrefining/graphics/icons/crystal-filtering-conversion-2.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/crystal-matrix.png b/angelsrefining/graphics/icons/crystal-matrix.png deleted file mode 100644 index 24fe6cb67..000000000 Binary files a/angelsrefining/graphics/icons/crystal-matrix.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/crystal-seedling.png b/angelsrefining/graphics/icons/crystal-seedling.png deleted file mode 100644 index 3b1612db2..000000000 Binary files a/angelsrefining/graphics/icons/crystal-seedling.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/crystal-slurry.png b/angelsrefining/graphics/icons/crystal-slurry.png deleted file mode 100644 index efe88beaf..000000000 Binary files a/angelsrefining/graphics/icons/crystal-slurry.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/electrolysis-salt-water.png b/angelsrefining/graphics/icons/electrolysis-salt-water.png deleted file mode 100644 index c6ee8848f..000000000 Binary files a/angelsrefining/graphics/icons/electrolysis-salt-water.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/fissure.png b/angelsrefining/graphics/icons/fissure.png new file mode 100644 index 000000000..d214f16f2 Binary files /dev/null and b/angelsrefining/graphics/icons/fissure.png differ diff --git a/angelsrefining/graphics/icons/gem-crystallization-amethyst.png b/angelsrefining/graphics/icons/gem-crystallization-amethyst.png deleted file mode 100644 index 622d838be..000000000 Binary files a/angelsrefining/graphics/icons/gem-crystallization-amethyst.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/gem-crystallization-diamond.png b/angelsrefining/graphics/icons/gem-crystallization-diamond.png deleted file mode 100644 index bc1563e5b..000000000 Binary files a/angelsrefining/graphics/icons/gem-crystallization-diamond.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/gem-crystallization-emerald.png b/angelsrefining/graphics/icons/gem-crystallization-emerald.png deleted file mode 100644 index 75998e104..000000000 Binary files a/angelsrefining/graphics/icons/gem-crystallization-emerald.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/gem-crystallization-ruby.png b/angelsrefining/graphics/icons/gem-crystallization-ruby.png deleted file mode 100644 index a0b16c16c..000000000 Binary files a/angelsrefining/graphics/icons/gem-crystallization-ruby.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/gem-crystallization-sapphire.png b/angelsrefining/graphics/icons/gem-crystallization-sapphire.png deleted file mode 100644 index f10fda38d..000000000 Binary files a/angelsrefining/graphics/icons/gem-crystallization-sapphire.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/gem-crystallization-topaz.png b/angelsrefining/graphics/icons/gem-crystallization-topaz.png deleted file mode 100644 index 9faa28280..000000000 Binary files a/angelsrefining/graphics/icons/gem-crystallization-topaz.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/iron-ore-chunk-sorting.png b/angelsrefining/graphics/icons/iron-ore-chunk-sorting.png deleted file mode 100644 index 797f357ef..000000000 Binary files a/angelsrefining/graphics/icons/iron-ore-chunk-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/iron-ore-chunk.png b/angelsrefining/graphics/icons/iron-ore-chunk.png deleted file mode 100644 index 40eca45d0..000000000 Binary files a/angelsrefining/graphics/icons/iron-ore-chunk.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/iron-ore-crushed-sorting.png b/angelsrefining/graphics/icons/iron-ore-crushed-sorting.png deleted file mode 100644 index e370fc159..000000000 Binary files a/angelsrefining/graphics/icons/iron-ore-crushed-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/iron-ore-crushed.png b/angelsrefining/graphics/icons/iron-ore-crushed.png deleted file mode 100644 index 58e5c3e38..000000000 Binary files a/angelsrefining/graphics/icons/iron-ore-crushed.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/iron-ore-crystal-sorting.png b/angelsrefining/graphics/icons/iron-ore-crystal-sorting.png deleted file mode 100644 index 695a6f840..000000000 Binary files a/angelsrefining/graphics/icons/iron-ore-crystal-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/iron-ore-crystal.png b/angelsrefining/graphics/icons/iron-ore-crystal.png deleted file mode 100644 index fe14c8a59..000000000 Binary files a/angelsrefining/graphics/icons/iron-ore-crystal.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/iron-ore-pure-sorting.png b/angelsrefining/graphics/icons/iron-ore-pure-sorting.png deleted file mode 100644 index 201fc715a..000000000 Binary files a/angelsrefining/graphics/icons/iron-ore-pure-sorting.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/iron-ore-pure.png b/angelsrefining/graphics/icons/iron-ore-pure.png deleted file mode 100644 index c7c41c88c..000000000 Binary files a/angelsrefining/graphics/icons/iron-ore-pure.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/liquify-blank.png b/angelsrefining/graphics/icons/liquify-blank.png deleted file mode 100644 index d77e96675..000000000 Binary files a/angelsrefining/graphics/icons/liquify-blank.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/liquify-blue.png b/angelsrefining/graphics/icons/liquify-blue.png deleted file mode 100644 index 774384d32..000000000 Binary files a/angelsrefining/graphics/icons/liquify-blue.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/liquify-cyan.png b/angelsrefining/graphics/icons/liquify-cyan.png deleted file mode 100644 index b5e3b4661..000000000 Binary files a/angelsrefining/graphics/icons/liquify-cyan.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/liquify-lightgreen.png b/angelsrefining/graphics/icons/liquify-lightgreen.png deleted file mode 100644 index 161045a88..000000000 Binary files a/angelsrefining/graphics/icons/liquify-lightgreen.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/liquify-purple.png b/angelsrefining/graphics/icons/liquify-purple.png deleted file mode 100644 index 3d14773fa..000000000 Binary files a/angelsrefining/graphics/icons/liquify-purple.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/liquify-red.png b/angelsrefining/graphics/icons/liquify-red.png deleted file mode 100644 index 3a0c5a57e..000000000 Binary files a/angelsrefining/graphics/icons/liquify-red.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/liquify-yellow.png b/angelsrefining/graphics/icons/liquify-yellow.png deleted file mode 100644 index 603d184f6..000000000 Binary files a/angelsrefining/graphics/icons/liquify-yellow.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/mineral-sludge.png b/angelsrefining/graphics/icons/mineral-sludge.png deleted file mode 100644 index 1b9e2c701..000000000 Binary files a/angelsrefining/graphics/icons/mineral-sludge.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/nodule-crushed.png b/angelsrefining/graphics/icons/nodule-crushed.png deleted file mode 100644 index 228720458..000000000 Binary files a/angelsrefining/graphics/icons/nodule-crushed.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/nodule-sludge.png b/angelsrefining/graphics/icons/nodule-sludge.png deleted file mode 100644 index cd3908188..000000000 Binary files a/angelsrefining/graphics/icons/nodule-sludge.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/nodule-slurry.png b/angelsrefining/graphics/icons/nodule-slurry.png deleted file mode 100644 index eef337e83..000000000 Binary files a/angelsrefining/graphics/icons/nodule-slurry.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/nodule-slurrying.png b/angelsrefining/graphics/icons/nodule-slurrying.png deleted file mode 100644 index 5a85c74f5..000000000 Binary files a/angelsrefining/graphics/icons/nodule-slurrying.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/numerals/num-1-outline.png b/angelsrefining/graphics/icons/numerals/num-1-outline.png new file mode 100644 index 000000000..c5ed12047 Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-1-outline.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-1.png b/angelsrefining/graphics/icons/numerals/num-1.png new file mode 100644 index 000000000..6f25a75da Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-1.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-10-outline.png b/angelsrefining/graphics/icons/numerals/num-10-outline.png new file mode 100644 index 000000000..ba46aaf29 Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-10-outline.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-10.png b/angelsrefining/graphics/icons/numerals/num-10.png new file mode 100644 index 000000000..2a531ca62 Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-10.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-2-outline.png b/angelsrefining/graphics/icons/numerals/num-2-outline.png new file mode 100644 index 000000000..e733c5567 Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-2-outline.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-2.png b/angelsrefining/graphics/icons/numerals/num-2.png new file mode 100644 index 000000000..aac23f47c Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-2.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-3-outline.png b/angelsrefining/graphics/icons/numerals/num-3-outline.png new file mode 100644 index 000000000..137cbb67a Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-3-outline.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-3.png b/angelsrefining/graphics/icons/numerals/num-3.png new file mode 100644 index 000000000..693fe81a1 Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-3.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-4-outline.png b/angelsrefining/graphics/icons/numerals/num-4-outline.png new file mode 100644 index 000000000..4df5a8984 Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-4-outline.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-4.png b/angelsrefining/graphics/icons/numerals/num-4.png new file mode 100644 index 000000000..7c0d40c55 Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-4.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-5-outline.png b/angelsrefining/graphics/icons/numerals/num-5-outline.png new file mode 100644 index 000000000..e8216997a Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-5-outline.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-5.png b/angelsrefining/graphics/icons/numerals/num-5.png new file mode 100644 index 000000000..53fb265d1 Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-5.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-6-outline.png b/angelsrefining/graphics/icons/numerals/num-6-outline.png new file mode 100644 index 000000000..38dc6f031 Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-6-outline.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-6.png b/angelsrefining/graphics/icons/numerals/num-6.png new file mode 100644 index 000000000..e5994e0b9 Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-6.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-7-outline.png b/angelsrefining/graphics/icons/numerals/num-7-outline.png new file mode 100644 index 000000000..6af274929 Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-7-outline.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-7.png b/angelsrefining/graphics/icons/numerals/num-7.png new file mode 100644 index 000000000..b5f4fbf9c Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-7.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-8-outline.png b/angelsrefining/graphics/icons/numerals/num-8-outline.png new file mode 100644 index 000000000..a8f1268ff Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-8-outline.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-8.png b/angelsrefining/graphics/icons/numerals/num-8.png new file mode 100644 index 000000000..237c32d71 Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-8.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-9-outline.png b/angelsrefining/graphics/icons/numerals/num-9-outline.png new file mode 100644 index 000000000..cc24e9dfb Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-9-outline.png differ diff --git a/angelsrefining/graphics/icons/numerals/num-9.png b/angelsrefining/graphics/icons/numerals/num-9.png new file mode 100644 index 000000000..83120ff7c Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-9.png differ diff --git a/angelsrefining/graphics/icons/slag-filtering-1.png b/angelsrefining/graphics/icons/slag-filtering-1.png deleted file mode 100644 index 88e048b63..000000000 Binary files a/angelsrefining/graphics/icons/slag-filtering-1.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-filtering-2.png b/angelsrefining/graphics/icons/slag-filtering-2.png deleted file mode 100644 index 47160592e..000000000 Binary files a/angelsrefining/graphics/icons/slag-filtering-2.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-angel1.png b/angelsrefining/graphics/icons/slag-processing-angel1.png deleted file mode 100644 index a6eb273b6..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-angel1.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-angel2.png b/angelsrefining/graphics/icons/slag-processing-angel2.png deleted file mode 100644 index cee3107dd..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-angel2.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-angel3.png b/angelsrefining/graphics/icons/slag-processing-angel3.png deleted file mode 100644 index 38b6409e9..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-angel3.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-angel4.png b/angelsrefining/graphics/icons/slag-processing-angel4.png deleted file mode 100644 index 1f39ccb41..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-angel4.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-angel5.png b/angelsrefining/graphics/icons/slag-processing-angel5.png deleted file mode 100644 index c7e4ea38c..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-angel5.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-angel6.png b/angelsrefining/graphics/icons/slag-processing-angel6.png deleted file mode 100644 index 01391b50e..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-angel6.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-angel7.png b/angelsrefining/graphics/icons/slag-processing-angel7.png deleted file mode 100644 index 76da918ea..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-angel7.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-angel8.png b/angelsrefining/graphics/icons/slag-processing-angel8.png deleted file mode 100644 index 882f25fab..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-angel8.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-blank.png b/angelsrefining/graphics/icons/slag-processing-blank.png deleted file mode 100644 index 810f88d44..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-blank.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-bob1.png b/angelsrefining/graphics/icons/slag-processing-bob1.png deleted file mode 100644 index a6eb273b6..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-bob1.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-bob2.png b/angelsrefining/graphics/icons/slag-processing-bob2.png deleted file mode 100644 index cee3107dd..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-bob2.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-bob3.png b/angelsrefining/graphics/icons/slag-processing-bob3.png deleted file mode 100644 index affc9dbbe..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-bob3.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-bob4.png b/angelsrefining/graphics/icons/slag-processing-bob4.png deleted file mode 100644 index 864bbf4da..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-bob4.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-bob5.png b/angelsrefining/graphics/icons/slag-processing-bob5.png deleted file mode 100644 index 0e4c4ba79..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-bob5.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-bob6.png b/angelsrefining/graphics/icons/slag-processing-bob6.png deleted file mode 100644 index 978a98e0a..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-bob6.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-nuc.png b/angelsrefining/graphics/icons/slag-processing-nuc.png deleted file mode 100644 index 602467b95..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-nuc.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-up.png b/angelsrefining/graphics/icons/slag-processing-up.png deleted file mode 100644 index e83efc2c4..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-up.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-vanilla1.png b/angelsrefining/graphics/icons/slag-processing-vanilla1.png deleted file mode 100644 index 3119d2267..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-vanilla1.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-vanilla2.png b/angelsrefining/graphics/icons/slag-processing-vanilla2.png deleted file mode 100644 index 7e06435e1..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-vanilla2.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-vanilla3.png b/angelsrefining/graphics/icons/slag-processing-vanilla3.png deleted file mode 100644 index db3a9a508..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-vanilla3.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-vanilla4.png b/angelsrefining/graphics/icons/slag-processing-vanilla4.png deleted file mode 100644 index 04c7fa341..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-vanilla4.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-processing-yi.png b/angelsrefining/graphics/icons/slag-processing-yi.png deleted file mode 100644 index 681e33e51..000000000 Binary files a/angelsrefining/graphics/icons/slag-processing-yi.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slag-slurry.png b/angelsrefining/graphics/icons/slag-slurry.png deleted file mode 100644 index bf6f04833..000000000 Binary files a/angelsrefining/graphics/icons/slag-slurry.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/slurry.png b/angelsrefining/graphics/icons/slurry.png deleted file mode 100644 index a9364d28f..000000000 Binary files a/angelsrefining/graphics/icons/slurry.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/thermal-water-barrel.png b/angelsrefining/graphics/icons/thermal-water-barrel.png deleted file mode 100644 index 50dd001e9..000000000 Binary files a/angelsrefining/graphics/icons/thermal-water-barrel.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-concentrated-mud.png b/angelsrefining/graphics/icons/water-concentrated-mud.png deleted file mode 100644 index b0a551c83..000000000 Binary files a/angelsrefining/graphics/icons/water-concentrated-mud.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-green-waste-purification.png b/angelsrefining/graphics/icons/water-green-waste-purification.png deleted file mode 100644 index 8f29280ca..000000000 Binary files a/angelsrefining/graphics/icons/water-green-waste-purification.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-green-waste.png b/angelsrefining/graphics/icons/water-green-waste.png deleted file mode 100644 index 10c6e310a..000000000 Binary files a/angelsrefining/graphics/icons/water-green-waste.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-greenyellow-waste-purification.png b/angelsrefining/graphics/icons/water-greenyellow-waste-purification.png deleted file mode 100644 index bf84c78be..000000000 Binary files a/angelsrefining/graphics/icons/water-greenyellow-waste-purification.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-greenyellow-waste.png b/angelsrefining/graphics/icons/water-greenyellow-waste.png deleted file mode 100644 index fe5dc1945..000000000 Binary files a/angelsrefining/graphics/icons/water-greenyellow-waste.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-heavy-mud.png b/angelsrefining/graphics/icons/water-heavy-mud.png deleted file mode 100644 index f9495cba8..000000000 Binary files a/angelsrefining/graphics/icons/water-heavy-mud.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-light-mud.png b/angelsrefining/graphics/icons/water-light-mud.png deleted file mode 100644 index 01c01d1c0..000000000 Binary files a/angelsrefining/graphics/icons/water-light-mud.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-lithia.png b/angelsrefining/graphics/icons/water-lithia.png deleted file mode 100644 index 2e50bdac3..000000000 Binary files a/angelsrefining/graphics/icons/water-lithia.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-mineralized.png b/angelsrefining/graphics/icons/water-mineralized.png deleted file mode 100644 index aa88e7e08..000000000 Binary files a/angelsrefining/graphics/icons/water-mineralized.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-purification.png b/angelsrefining/graphics/icons/water-purification.png deleted file mode 100644 index 92290cae6..000000000 Binary files a/angelsrefining/graphics/icons/water-purification.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-purified.png b/angelsrefining/graphics/icons/water-purified.png deleted file mode 100644 index 85002ee18..000000000 Binary files a/angelsrefining/graphics/icons/water-purified.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-red-waste-purification.png b/angelsrefining/graphics/icons/water-red-waste-purification.png deleted file mode 100644 index 650464823..000000000 Binary files a/angelsrefining/graphics/icons/water-red-waste-purification.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-red-waste.png b/angelsrefining/graphics/icons/water-red-waste.png deleted file mode 100644 index d727c612e..000000000 Binary files a/angelsrefining/graphics/icons/water-red-waste.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-saline.png b/angelsrefining/graphics/icons/water-saline.png deleted file mode 100644 index ea0834d30..000000000 Binary files a/angelsrefining/graphics/icons/water-saline.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-thermal-lithia.png b/angelsrefining/graphics/icons/water-thermal-lithia.png deleted file mode 100644 index a8f12e601..000000000 Binary files a/angelsrefining/graphics/icons/water-thermal-lithia.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-thermal-purification.png b/angelsrefining/graphics/icons/water-thermal-purification.png deleted file mode 100644 index 1e5b11ef7..000000000 Binary files a/angelsrefining/graphics/icons/water-thermal-purification.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-thermal.png b/angelsrefining/graphics/icons/water-thermal.png deleted file mode 100644 index c66bd54fd..000000000 Binary files a/angelsrefining/graphics/icons/water-thermal.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-thin-mud.png b/angelsrefining/graphics/icons/water-thin-mud.png deleted file mode 100644 index 5847edd7f..000000000 Binary files a/angelsrefining/graphics/icons/water-thin-mud.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-viscous-mud.png b/angelsrefining/graphics/icons/water-viscous-mud.png deleted file mode 100644 index 38e052386..000000000 Binary files a/angelsrefining/graphics/icons/water-viscous-mud.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-yellow-waste-purification-yi.png b/angelsrefining/graphics/icons/water-yellow-waste-purification-yi.png deleted file mode 100644 index 602bd21ea..000000000 Binary files a/angelsrefining/graphics/icons/water-yellow-waste-purification-yi.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-yellow-waste-purification.png b/angelsrefining/graphics/icons/water-yellow-waste-purification.png deleted file mode 100644 index 772bd3bc2..000000000 Binary files a/angelsrefining/graphics/icons/water-yellow-waste-purification.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water-yellow-waste.png b/angelsrefining/graphics/icons/water-yellow-waste.png deleted file mode 100644 index 7ffd56b28..000000000 Binary files a/angelsrefining/graphics/icons/water-yellow-waste.png and /dev/null differ diff --git a/angelsrefining/graphics/icons/water.png b/angelsrefining/graphics/icons/water.png deleted file mode 100644 index a780689b1..000000000 Binary files a/angelsrefining/graphics/icons/water.png and /dev/null differ diff --git a/angelsrefining/graphics/technology/geode-processing-yellow.png b/angelsrefining/graphics/technology/geode-processing-yellow.png new file mode 100644 index 000000000..f19eb2e7c Binary files /dev/null and b/angelsrefining/graphics/technology/geode-processing-yellow.png differ diff --git a/angelsrefining/info.json b/angelsrefining/info.json index 2129827c6..44ed572ee 100644 --- a/angelsrefining/info.json +++ b/angelsrefining/info.json @@ -1,18 +1,17 @@ { "name": "angelsrefining", - "version": "0.11.18", - "factorio_version": "1.0", + "version": "0.11.20", + "factorio_version": "1.1", "title": "Angel's Refining", "author": "Arch666Angel", "contact": "https://discord.gg/ff5p6KE", "homepage": "https://forums.factorio.com/viewforum.php?f=185", "description": "Adds ore refining to the game. Compound ores have to be refined before you are able to smelt and cast them into plates. Works best in conjunction with Angel's industries and/or Bob's mods and supports additional mods like Yuoki Industries, Uranium Power and Nucular.", "dependencies": [ - "base >= 1.0.0", + "base >= 1.1.24", "? bobplates >= 0.18.8", "? bobrevamp >= 0.18.5", - "? rso-mod >= 2.3.3", "? Yuoki >= 0.4.0", "? UraniumPower >= 0.6.4", diff --git a/angelsrefining/locale/en/ore-refining-refining.cfg b/angelsrefining/locale/en/ore-refining-refining.cfg index 87e0cfff4..559658918 100644 --- a/angelsrefining/locale/en/ore-refining-refining.cfg +++ b/angelsrefining/locale/en/ore-refining-refining.cfg @@ -47,8 +47,8 @@ angels-ore5-pure=Purified rubyte angels-ore6-pure=Purified bobmonium [item-description] -angels-ore-refining=Can be refined and sorted for smeltable ores: -angels-ore-sorting=Can be sorted for smeltable ores: +angels-ore-refining=Can be refined and sorted for pure ores: +angels-ore-sorting=Can be sorted for pure ores: angels-ore-refining-again=Can be refined further prior to sorting for: loc-space= @@ -170,6 +170,10 @@ ore-leaching=Chemical refining ore-refining=Thermal refining [technology-description] +ore-crushing=Crushing and sorting of compound ores produces a variety of pure ores ready to be smelted. +ore-floatation=Froth flotation of crushed compound ores provides higher yield of pure ores upon sorting. +ore-leaching=Chemical leaching of compound ore chunks provides additional yield of pure ores upon sorting. +ore-refining=Thermal refining of compound ore crystals provides optimal yield of pure ores upon sorting. [mod-setting-name] diff --git a/angelsrefining/locale/en/ore-refining-sorting.cfg b/angelsrefining/locale/en/ore-refining-sorting.cfg index df0cbfd3b..d2e67c1ba 100644 --- a/angelsrefining/locale/en/ore-refining-sorting.cfg +++ b/angelsrefining/locale/en/ore-refining-sorting.cfg @@ -63,7 +63,7 @@ angelsore6-pure-processing=Purified bobmonium sorting ; slag processing slag_processing_2=Processing mineral sludge into __1__, and __2__ slag_processing_3=Processing mineral sludge into __1__, __2__, and __3__ -slag_processing_1=Processing mineral sludge __1__ +slag_processing_1=Processing mineral sludge into __1__ [recipe-description] [item-group-name] diff --git a/angelsrefining/locale/en/ore-refining.cfg b/angelsrefining/locale/en/ore-refining.cfg index 5c6be06f5..42a5c1372 100644 --- a/angelsrefining/locale/en/ore-refining.cfg +++ b/angelsrefining/locale/en/ore-refining.cfg @@ -32,14 +32,14 @@ ore-sorting-facility-2=Ore sorting facility 2 ore-sorting-facility-3=Ore sorting facility 3 ore-sorting-facility-4=Ore sorting facility 4 -liquifier=Liquifier 1 -liquifier-2=Liquifier 2 -liquifier-3=Liquifier 3 -liquifier-4=Liquifier 4 +liquifier=Liquefier 1 +liquifier-2=Liquefier 2 +liquifier-3=Liquefier 3 +liquifier-4=Liquefier 4 -electro-whinning-cell=Electrowinning Cell 1 -electro-whinning-cell-2=Electrowinning Cell 2 -electro-whinning-cell-3=Electrowinning Cell 3 +electro-whinning-cell=Electrowinning cell 1 +electro-whinning-cell-2=Electrowinning cell 2 +electro-whinning-cell-3=Electrowinning cell 3 ore-powderizer=Ore powderizer 1 ore-powderizer-2=Ore powderizer 2 @@ -53,6 +53,52 @@ crystallizer-2=Crystallizer 2 thermal-bore=Thermal water bore thermal-extractor=Thermal water extractor +[entity-description] +angels-fissure=Source of hot and mineral-rich water. + +burner-ore-crusher=Crushes compound ores. Don't stick your fingers in. +ore-crusher=Crushes compound ores. Don't stick your fingers in. +ore-crusher-2=Crushes compound ores. Don't stick your fingers in. +ore-crusher-3=Crushes compound ores. Don't stick your fingers in. + +ore-floatation-cell=Further refines crushed ores using froth flotation. +ore-floatation-cell-2=Further refines crushed ores using froth flotation. +ore-floatation-cell-3=Further refines crushed ores using froth flotation. + +ore-leaching-plant=Further refines ore chunks using chemical leaching. +ore-leaching-plant-2=Further refines ore chunks using chemical leaching. +ore-leaching-plant-3=Further refines ore chunks using chemical leaching. + +ore-refinery=Further refines ore crystals using heating and roasting processes. +ore-refinery-2=Further refines ore crystals using heating and roasting processes. +ore-refinery-3=Further refines ore crystals using heating and roasting processes. + +ore-sorting-facility=Sorts refined compound ores into pure ores. +ore-sorting-facility-2=Sorts refined compound ores into pure ores. +ore-sorting-facility-3=Sorts refined compound ores into pure ores. +ore-sorting-facility-4=Sorts refined compound ores into pure ores. + +liquifier=Versatile machine, can process up to one fluid input and/or 1 fluid output. +liquifier-2=Versatile machine, can process up to one fluid input and/or 1 fluid output. +liquifier-3=Versatile machine, can process up to one fluid input and/or 1 fluid output. +liquifier-4=Versatile machine, can process up to one fluid input and/or 1 fluid output. + +electro-whinning-cell=Uses an electrolytic bath for additional purification. +electro-whinning-cell-2=Uses an electrolytic bath for additional purification. +electro-whinning-cell-3=Uses an electrolytic bath for additional purification. + +ore-powderizer=Uses milling drums to turn solid material into powder. +ore-powderizer-2=Uses milling drums to turn solid material into powder. +ore-powderizer-3=Uses milling drums to turn solid material into powder. + +filtration-unit=Filters out impurities from liquids. +filtration-unit-2=Filters out impurities from liquids. +crystallizer=Forces the crystallization of higher elements from chemical solutions. +crystallizer-2=Forces the crystallization of higher elements from chemical solutions. + +thermal-bore=A simple machine that uses a fissure to extract mineral rich thermal water from deep underground. Not the ideal setup. +thermal-extractor=Specialized machine that uses a fissure to extract mineral rich thermal water from deep underground at a reasonable rate. + [autoplace-control-names] angels-ore1=Saphirite angels-ore2=Jivolite @@ -102,6 +148,9 @@ angels-void=Something went wrong gas-canister=Empty bottle +[item-description] +angels-void=You are missing dependencies or something went wrong. If the error persists, please report it in the Bugs thread on the forum. + [fluid-name] thermal-water=Thermal water slag-slurry=Slag slurry @@ -121,12 +170,12 @@ geode-purple-processing=Purple geode processing geode-red-processing=Red geode processing geode-yellow-processing=Yellow geode processing -geode-blue-liquify=Liquifying blue geodes to crystal slurry -geode-cyan-liquify=Liquifying cyan geodes to crystal slurry -geode-lightgreen-liquify=Liquifying light green geodes to crystal slurry -geode-purple-liquify=Liquifying purple geodes to crystal slurry -geode-red-liquify=Liquifying red geodes to crystal slurry -geode-yellow-liquify=Liquifying yellow geodes to crystal slurry +geode-blue-liquify=Liquefying blue geodes to crystal slurry +geode-cyan-liquify=Liquefying cyan geodes to crystal slurry +geode-lightgreen-liquify=Liquefying light green geodes to crystal slurry +geode-purple-liquify=Liquefying purple geodes to crystal slurry +geode-red-liquify=Liquefying red geodes to crystal slurry +geode-yellow-liquify=Liquefying yellow geodes to crystal slurry thermal-water-filtering-1=Thermal water coal filtering thermal-water-filtering-2=Thermal water ceramic filtering @@ -145,7 +194,7 @@ angelsore7-crystallization-5=Crystallizing to __1__ angelsore7-crystallization-6=Crystallizing to __1__ slag-processing-dissolution=Liquefy slag to slurry -stone-crushed-dissolution=Liquefy crushed stone to Slurry +stone-crushed-dissolution=Liquefy crushed stone to slurry slag-processing-filtering-1=Slurry coal filtering slag-processing-filtering-2=Slurry ceramic filtering slag-processing-stone=Slag processing to stone @@ -176,15 +225,27 @@ thermal-water-processing=Thermal water processing slag-processing=Slag processing geode-processing=Geode processing -geode-crystallization=Geode crystallization +geode-crystallization=Gem crystallization [technology-description] +ore-advanced-crushing=High yield of pure ores via special ore mixtures. +ore-powderizer=High yield of pure ores via special ore mixtures. +ore-advanced-floatation=High yield of pure ores via special ore mixtures. +ore-electro-whinning-cell=High yield of pure ores via special ore mixtures. + +advanced-ore-refining=High yield of pure ores via special catalytic sorting. + thermal-water-extraction=Extract mineral rich thermal water from deep underground. thermal-water-processing=Process mineral rich thermal water from deep underground. +slag-processing=Recovery of valuable materials from mineral by-products. + +geode-processing=Crystalline by-products of hydro-refining can act as catalysts for advanced ore sorting. +geode-crystallization=Re-crystallization of crystal seedling into precious stones. + [mod-setting-name] angels-enable-auto-barreling=Auto-barreling -angels-enable-hide-void=Do not hide voiding recipes +angels-enable-hide-void=Hide voiding recipes angels-tryptophobia-friendly-stiratite=Use trypophobia friendly graphics for stiratite angels-hq-graphics=Use high-resolution graphics for Angel's mods @@ -226,64 +287,3 @@ angels-enable-biters=Biters are not required if you play without Angel's Explora angels-pavement-stack-size=Pavement items are items like stone, concrete, landfill which can be used to build tiles and paths. -[item-description] -burner-ore-crusher=Don't stick your fingers in. Crushes raw ores. -ore-crusher=Don't stick your fingers in. Crushes raw ores. -ore-crusher-2=Don't stick your fingers in. Crushes raw ores. -ore-crusher-3=Don't stick your fingers in. Crushes raw ores. - -ore-floatation-cell=Further refines crushed ores using froth flotation. -ore-floatation-cell-2=Further refines crushed ores using froth flotation. -ore-floatation-cell-3=Further refines crushed ores using froth flotation. - -ore-leaching-plant=Further refines ore chunks using chemical leaching. -ore-leaching-plant-2=Further refines ore chunks using chemical leaching. -ore-leaching-plant-3=Further refines ore chunks using chemical leaching. - -ore-refinery=Further refines ore crystals using heating and roasting processes. -ore-refinery-2=Further refines ore crystals using heating and roasting processes. -ore-refinery-3=Further refines ore crystals using heating and roasting processes. - -ore-sorting-facility=Sorts refined raw ores into smeltable ores. -ore-sorting-facility-2=Sorts refined raw ores into smeltable ores. -ore-sorting-facility-3=Sorts refined raw ores into smeltable ores. -ore-sorting-facility-4=Sorts refined raw ores into smeltable ores. - -filtration-unit=Filters out impurities from liquids. -crystallizer=Forces the crystallization of higher elements from chemical solutions. - -thermal-bore=A machine that uses a fissure to extract mineral rich thermal water from deep underground. Not the ideal setup. -thermal-extractor=Specialized machine that uses a fissure to extract mineral rich thermal water from deep underground at a reasonable rate. - -angels-void=You are missing dependencies or something went wrong. If the error persists, please report it on Bugs thread in the forum. - -[entity-description] -burner-ore-crusher=Don't stick your fingers in. Crushes raw ores. -ore-crusher=Don't stick your fingers in. Crushes raw ores. -ore-crusher-2=Don't stick your fingers in. Crushes raw ores. -ore-crusher-3=Don't stick your fingers in. Crushes raw ores. - -ore-floatation-cell=Further refines crushed ores using froth flotation. -ore-floatation-cell-2=Further refines crushed ores using froth flotation. -ore-floatation-cell-3=Further refines crushed ores using froth flotation. - -ore-leaching-plant=Further refines ore chunks using chemical leaching. -ore-leaching-plant-2=Further refines ore chunks using chemical leaching. -ore-leaching-plant-3=Further refines ore chunks using chemical leaching. - -ore-refinery=Further refines ore crystals using heating and roasting processes. -ore-refinery-2=Further refines ore crystals using heating and roasting processes. -ore-refinery-3=Further refines ore crystals using heating and roasting processes. - -ore-sorting-facility=Sorts refined raw ores into smeltable ores. -ore-sorting-facility-2=Sorts refined raw ores into smeltable ores. -ore-sorting-facility-3=Sorts refined raw ores into smeltable ores. -ore-sorting-facility-4=Sorts refined raw ores into smeltable ores. - -filtration-unit=Filters out impurities from liquids. -filtration-unit-2=Filters out impurities from liquids. -crystallizer=Forces the crystallization of higher elements from chemical solutions. -crystallizer-2=Forces the crystallization of higher elements from chemical solutions. - -thermal-bore=A machine that uses a fissure to extract mineral rich thermal water from deep underground. Not the ideal setup. -thermal-extractor=Specialized machine that uses a fissure to extract mineral rich thermal water from deep underground at a reasonable rate. diff --git a/angelsrefining/locale/en/water-treatment.cfg b/angelsrefining/locale/en/water-treatment.cfg index c8739baa5..692840fd2 100644 --- a/angelsrefining/locale/en/water-treatment.cfg +++ b/angelsrefining/locale/en/water-treatment.cfg @@ -56,6 +56,19 @@ washing-plant-2=Washing plant 2 barreling-pump=Barreling pump ground-water-pump=Ground water bore +[entity-description] +hydro-plant=Purifies water and separates impurities from waste water. +hydro-plant-2=Purifies water and separates impurities from waste water. +hydro-plant-3=Purifies water and separates impurities from waste water. +clarifier=Helps you to get rid of all the water you don't want. +salination-plant=Increases salinity of water via evaporation. +salination-plant-2=Increases salinity of water via evaporation. +seafloor-pump=Extracts visous mud water from a body of water. +washing-plant=Dilutes mud water or extracts sediments. +washing-plant-2=Dilutes mud water or extracts sediments. +barreling-pump=Fills or empties fluid containers. +ground-water-pump=Pumps water from a deep aquifer. Slow but readily available. + [item-name] solid-mud=Mud solid-limestone=Limestone @@ -74,14 +87,7 @@ water-washing=Washing nodule-processing=Nodule processing [technology-description] -water-treatment=Water treatment -angels-fluid-barreling=Fluid barreling -water-washing=Washing -nodule-processing=Nodule processing +water-treatment=Essential methods for the treatment of impure water. +angels-fluid-barreling=Methods to fill fluids into containers for alternative transport. +water-washing=Processing of mud water and extraction of sediments. -[entity-description] -clarifier=Helps you to get rid of all the water you don't want (water void). -seafloor-pump=Provides mud water for washing plant. -washing-plant=Processes mud water. -washing-plant-2=Processes mud water. -ground-water-pump=Pumps fluid from a deep underground reservoir. Slow but readily available. diff --git a/angelsrefining/migrations/angelsrefining_0.11.20.lua b/angelsrefining/migrations/angelsrefining_0.11.20.lua new file mode 100644 index 000000000..c3310c654 --- /dev/null +++ b/angelsrefining/migrations/angelsrefining_0.11.20.lua @@ -0,0 +1,14 @@ +for _, force in pairs(game.forces) do + if force.technologies["geode-crystallization-2"] and force.technologies["geode-processing-3"] then + force.technologies["geode-processing-3"].researched = force.technologies["geode-crystallization-2"].researched + if force.technologies["gem-processing-1"] then + force.technologies["geode-crystallization-2"].researched = force.technologies["gem-processing-1"].researched + else + force.technologies["geode-crystallization-2"].researched = false + end + end + + force.reset_recipes() + force.reset_technologies() + force.reset_technology_effects() +end \ No newline at end of file diff --git a/angelsrefining/prototypes/angels-functions.lua b/angelsrefining/prototypes/angels-functions.lua index cc72c6290..b9993c6a8 100644 --- a/angelsrefining/prototypes/angels-functions.lua +++ b/angelsrefining/prototypes/angels-functions.lua @@ -1,8 +1,8 @@ ------------------------------------------------------------------------------- ---GET ICON/ICONS FROM FLUID/ITEM ---------------------------------------------- +-- GET ICON/ICONS FROM FLUID/ITEM --------------------------------------------- ------------------------------------------------------------------------------- local function get_icons(object_name) - for _, prototype in pairs({"item", "fluid", "capsule"}) do + for _, prototype in pairs({"item", "fluid", "ammo", "capsule"}) do local object = data.raw[prototype][object_name] if object then if object.icon then @@ -11,6 +11,7 @@ local function get_icons(object_name) { icon = object.icon, icon_size = object.icon_size or 32, + icon_mipmaps = object.icon_mipmaps ~= 1 and object.icon_mipmaps or nil, scale = scale ~= 1 and scale or nil } } @@ -34,6 +35,7 @@ function angelsmods.functions.add_icon_layer(icon_layers, layers_to_add, layer_s { icon = layer_to_add.icon, icon_size = layer_to_add.icon_size, + icon_mipmaps = layer_to_add.icon_mipmaps, tint = layer_to_add.tint, scale = (layer_to_add.scale or 1) * (layer_scale or 1), shift = @@ -49,6 +51,7 @@ function angelsmods.functions.add_icon_layer(icon_layers, layers_to_add, layer_s { icon = layers_to_add.icon, icon_size = layers_to_add.icon_size, + icon_mipmaps = layers_to_add.icon_mipmaps, tint = layers_to_add.tint, scale = (layers_to_add.scale or 1) * (layer_scale or 1), shift = @@ -107,6 +110,39 @@ local function clean_table(t) return t end +function angelsmods.functions.add_number_icon_layer(icon_layers, number_tier, number_tint, outline_tint) + -- adds a new layer to icon_layers to show the tier number (with a color) + -- outline_tint is optional + local icon_size_scale = 1 + local icon_size_shift = {0, 0} + + icon_layers = icon_layers or {} + if #icon_layers == 0 then + -- if the icon_layer is empty, we make sure it will be a full sized number after usage in the recipe functions + icon_size_scale = 32 / 10.24 + icon_size_shift = {11.5 * icon_size_scale, 12 * icon_size_scale} + else + icon_size_scale = (icon_layers[1].icon_size or 32) * (icon_layers[1].scale or 1) / 32 + end + + return angelsmods.functions.add_icon_layer(icon_layers, { + { + icon = "__angelsrefining__/graphics/icons/numerals/num-"..number_tier.."-outline.png", + icon_size = 64, icon_mipmaps = 2, + tint = unify_tint(outline_tint or {0, 0, 0, 1}), + scale = 0.5 * icon_size_scale, + shift = icon_size_shift + }, + { + icon = "__angelsrefining__/graphics/icons/numerals/num-"..number_tier..".png", + icon_size = 64, icon_mipmaps = 2, + tint = unify_tint(number_tint), + scale = 0.5 * icon_size_scale, + shift = icon_size_shift + } + }) +end + ------------------------------------------------------------------------------- -- ICON GENERATION ------------------------------------------------------------ ------------------------------------------------------------------------------- @@ -991,6 +1027,25 @@ end ------------------------------------------------------------------------------- -- MODIFY FLAGS --------------------------------------------------------------- ------------------------------------------------------------------------------- +local building_types = { + "assembling-machine", + "mining-drill", + "lab", + "furnace", + "offshore-pump", + "pump", + "rocket-silo", + "radar", + "beacon", + "boiler", + "generator", + "solar-panel", + "accumulator", + "reactor", + "electric-pole", + "wall", + "gate" +} function angelsmods.functions.add_flag(entity, flag) -- Adds a flag to an item/fluid (may be a table containing a list of items/fluids) if type(entity) == "table" then for _, ent in pairs(entity) do @@ -998,28 +1053,30 @@ function angelsmods.functions.add_flag(entity, flag) -- Adds a flag to an item/f end return end - - local to_add = data.raw.item[entity] or data.raw.tool[entity] or data.raw["item-with-entity-data"][entity] or nil - if to_add then - if to_add.flags then - table.insert(to_add.flags, flag) - else - to_add.flags = {flag} + + for _,type in pairs({"item","tool","item-with-entity-data","fluid"}) do --list of things to hide + local to_add = data.raw[type][entity] or nil + if to_add then + if to_add.flags then + table.insert(to_add.flags, flag) + else + to_add.flags = {flag} + end + if type == "fluid" and flag == "hidden" then --also remove barrel if a fluid + angelsmods.functions.disable_barreling_recipes(entity) + end end - return end - - to_add = data.raw.fluid[entity] - if to_add then - if flag == "hidden" then - to_add.hidden = true - angelsmods.functions.disable_barreling_recipes(entity) - elseif to_add.flags then - table.insert(to_add.flags, flag) - else - to_add.flags = {flag} + --actual entity if not not just an item + for _,type in pairs(building_types) do + to_add = data.raw[type][entity] --entity-types... + if to_add then + if to_add.flags then + table.insert(to_add.flags, flag) + else + to_add.flags = {flag} + end end - return end end @@ -1031,24 +1088,27 @@ function angelsmods.functions.remove_flag(entity, flag_to_remove) -- Removes a f return end - local to_remove = data.raw.item[entity] or data.raw.tool[entity] or data.raw["item-with-entity-data"][entity] or nil - if to_remove then - for flag_index, flag in pairs(to_remove.flags or {}) do - if flag == flag_to_remove then - table.remove(to_remove.flags, flag_index) - return + for _,type in pairs({"item","tool","item-with-entity-data","fluid"}) do --list of things to hide + -- THIS DOES NOT RE-ENABLE THE BARRELING RECIPES FOR THIS FLUID! + local to_remove = data.raw[type][entity] or nil + if to_remove then + if to_remove.flags then + table.insert(to_remove.flags, flag) + else + to_remove.flags = {flag} end end - return end - - to_remove = data.raw.fluid[entity] - if to_remove then - if flag == "hidden" then - to_remove.hidden = false - -- THIS DOES NOT RE-ENABLE THE BARRELING RECIPES FOR THIS FLUID! + --actual entity if not not just an item + for _,type in pairs(building_types) do + to_remove = data.raw[type][entity] --entity-types... + if to_remove then + for flag_index, flag in pairs(to_remove.flags or {}) do + if flag == flag_to_remove then + table.remove(to_remove.flags, flag_index) + end + end end - return end end @@ -1219,7 +1279,7 @@ function angelsmods.functions.make_void(fluid_name, void_category, void_amount) recipe.name = "angels-" .. void_category .. "-void-" .. fluid_name recipe.category = "angels-" .. void_category .. "-void" recipe.enabled = true - recipe.hidden = angelsmods.trigger.enable_hide_void + recipe.hide_from_player_crafting = angelsmods.trigger.enable_hide_void recipe.energy_required = void_process_time recipe.ingredients = { { diff --git a/angelsrefining/prototypes/angels-settings.lua b/angelsrefining/prototypes/angels-settings.lua new file mode 100644 index 000000000..9dee86ea1 --- /dev/null +++ b/angelsrefining/prototypes/angels-settings.lua @@ -0,0 +1,15 @@ +angelsmods = angelsmods or {} +angelsmods.settings = angelsmods.settings or {} + +function angelsmods.settings.hide_setting(setting_type, setting_name, forced_setting_value) + if data.raw[setting_type] and data.raw[setting_type][setting_name] then + data.raw[setting_type][setting_name].hidden = true + if forced_setting_value ~= nil then + data.raw[setting_type][setting_name].forced_value = forced_setting_value + else + data.raw[setting_type][setting_name].forced_value = data.raw[setting_type][setting_name].default_value + end + else + log("Could not find setting '" .. setting_name .. "'.") + end +end diff --git a/angelsrefining/prototypes/buildings/clarifier.lua b/angelsrefining/prototypes/buildings/clarifier.lua index 864a0c322..a7f4f262e 100644 --- a/angelsrefining/prototypes/buildings/clarifier.lua +++ b/angelsrefining/prototypes/buildings/clarifier.lua @@ -27,9 +27,9 @@ data:extend( module_slots = 2 }, allowed_effects = {"consumption", "speed", "pollution"}, - result_inventory_size = 1, + result_inventory_size = 0, crafting_speed = 2, - source_inventory_size = 1, + source_inventory_size = 0, show_recipe_icon = false, resistances = { { diff --git a/angelsrefining/prototypes/buildings/crystallizer.lua b/angelsrefining/prototypes/buildings/crystallizer.lua index 26455e591..7e0c3fc4c 100644 --- a/angelsrefining/prototypes/buildings/crystallizer.lua +++ b/angelsrefining/prototypes/buildings/crystallizer.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "crystallizer", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/crystallizer.png" + { + icon = "__angelsrefining__/graphics/icons/crystallizer.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), subgroup = "refining-buildings", order = "c[crystallizer]-a[mk1]", place_result = "crystallizer", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "crystallizer", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/crystallizer.png" + { + icon = "__angelsrefining__/graphics/icons/crystallizer.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "crystallizer"}, fast_replaceable_group = "crystallizer", @@ -90,32 +82,27 @@ data:extend( base_area = 10, base_level = -1, pipe_connections = {{type = "input", position = {0, 3}}} - } + }, -- { -- production_type = "output", -- pipe_covers = pipecoverspictures(), -- base_level = 1, -- pipe_connections = {{ position = {0, -3} }} - -- } + -- }, + off_when_no_fluid_recipe = true }, - pipe_covers = pipecoverspictures(), - off_when_no_fluid_recipe = true }, { type = "item", name = "crystallizer-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/crystallizer.png" + { + icon = "__angelsrefining__/graphics/icons/crystallizer.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), subgroup = "refining-buildings", order = "c[crystallizer]-b[mk2]", place_result = "crystallizer-2", @@ -124,18 +111,14 @@ data:extend( { type = "assembling-machine", name = "crystallizer-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/crystallizer.png" + { + icon = "__angelsrefining__/graphics/icons/crystallizer.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "crystallizer-2"}, fast_replaceable_group = "crystallizer", @@ -190,16 +173,15 @@ data:extend( base_area = 10, base_level = -1, pipe_connections = {{type = "input", position = {0, 3}}} - } + }, -- { -- production_type = "output", -- pipe_covers = pipecoverspictures(), -- base_level = 1, -- pipe_connections = {{ position = {0, -3} }} - -- } + -- }, + off_when_no_fluid_recipe = true }, - pipe_covers = pipecoverspictures(), - off_when_no_fluid_recipe = true } } ) diff --git a/angelsrefining/prototypes/buildings/electro-whinning-cell.lua b/angelsrefining/prototypes/buildings/electro-whinning-cell.lua index a805674be..77cba84c8 100644 --- a/angelsrefining/prototypes/buildings/electro-whinning-cell.lua +++ b/angelsrefining/prototypes/buildings/electro-whinning-cell.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "electro-whinning-cell", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png" + { + icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), subgroup = "ore-whinning", order = "d", place_result = "electro-whinning-cell", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "electro-whinning-cell", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png" + { + icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "electro-whinning-cell"}, fast_replaceable_group = "electro-whinning-cell", @@ -122,18 +114,14 @@ data:extend( { type = "item", name = "electro-whinning-cell-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png" + { + icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), subgroup = "ore-whinning", order = "e", place_result = "electro-whinning-cell-2", @@ -142,18 +130,14 @@ data:extend( { type = "assembling-machine", name = "electro-whinning-cell-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png" + { + icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "electro-whinning-cell-2"}, fast_replaceable_group = "electro-whinning-cell", @@ -241,18 +225,14 @@ data:extend( { type = "item", name = "electro-whinning-cell-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png" + { + icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.refining.number_tint), subgroup = "ore-whinning", order = "f", place_result = "electro-whinning-cell-3", @@ -261,18 +241,14 @@ data:extend( { type = "assembling-machine", name = "electro-whinning-cell-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png" + { + icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "electro-whinning-cell-3"}, fast_replaceable_group = "electro-whinning-cell", diff --git a/angelsrefining/prototypes/buildings/filtration-unit.lua b/angelsrefining/prototypes/buildings/filtration-unit.lua index a2c67b194..528091116 100644 --- a/angelsrefining/prototypes/buildings/filtration-unit.lua +++ b/angelsrefining/prototypes/buildings/filtration-unit.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "filtration-unit", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/filtration-unit.png" + { + icon = "__angelsrefining__/graphics/icons/filtration-unit.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), subgroup = "refining-buildings", order = "b[filtration-unit]-a[mk1]", place_result = "filtration-unit", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "filtration-unit", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/filtration-unit.png" + { + icon = "__angelsrefining__/graphics/icons/filtration-unit.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "filtration-unit"}, fast_replaceable_group = "filtration-unit", @@ -118,18 +110,14 @@ data:extend( { type = "item", name = "filtration-unit-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/filtration-unit.png" + { + icon = "__angelsrefining__/graphics/icons/filtration-unit.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), subgroup = "refining-buildings", order = "b[filtration-unit]-b[mk2]", place_result = "filtration-unit-2", @@ -138,18 +126,14 @@ data:extend( { type = "assembling-machine", name = "filtration-unit-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/filtration-unit.png" + { + icon = "__angelsrefining__/graphics/icons/filtration-unit.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "filtration-unit-2"}, fast_replaceable_group = "filtration-unit", diff --git a/angelsrefining/prototypes/buildings/ground-water-pump.lua b/angelsrefining/prototypes/buildings/ground-water-pump.lua index 388b44a6b..f3ce81135 100644 --- a/angelsrefining/prototypes/buildings/ground-water-pump.lua +++ b/angelsrefining/prototypes/buildings/ground-water-pump.lua @@ -1,5 +1,5 @@ -local hit_effects = require ("__base__.prototypes.entity.demo-hit-effects") -local sounds = require("__base__.prototypes.entity.demo-sounds") +local hit_effects = require ("__base__.prototypes.entity.hit-effects") +local sounds = require("__base__.prototypes.entity.sounds") local create_static_stripes = function(stripe, stripe_count) local stripes = {} for i = 1, stripe_count do diff --git a/angelsrefining/prototypes/buildings/hydro-plant.lua b/angelsrefining/prototypes/buildings/hydro-plant.lua index 0b8428895..0c96bff6f 100644 --- a/angelsrefining/prototypes/buildings/hydro-plant.lua +++ b/angelsrefining/prototypes/buildings/hydro-plant.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "hydro-plant", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/hydro-plant.png" + { + icon = "__angelsrefining__/graphics/icons/hydro-plant.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), subgroup = "water-treatment-building", order = "a[hydro-plant]", place_result = "hydro-plant", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "hydro-plant", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/hydro-plant.png" + { + icon = "__angelsrefining__/graphics/icons/hydro-plant.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "hydro-plant"}, fast_replaceable_group = "hydro-plant", @@ -116,18 +108,14 @@ data:extend( { type = "item", name = "hydro-plant-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/hydro-plant.png" + { + icon = "__angelsrefining__/graphics/icons/hydro-plant.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), subgroup = "water-treatment-building", order = "b[hydro-plant2-]", place_result = "hydro-plant-2", @@ -136,18 +124,14 @@ data:extend( { type = "assembling-machine", name = "hydro-plant-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/hydro-plant.png" + { + icon = "__angelsrefining__/graphics/icons/hydro-plant.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "hydro-plant-2"}, fast_replaceable_group = "hydro-plant", @@ -229,18 +213,14 @@ data:extend( { type = "item", name = "hydro-plant-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/hydro-plant.png" + { + icon = "__angelsrefining__/graphics/icons/hydro-plant.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.refining.number_tint), subgroup = "water-treatment-building", order = "b[hydro-plant2-]", place_result = "hydro-plant-3", @@ -249,18 +229,14 @@ data:extend( { type = "assembling-machine", name = "hydro-plant-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/hydro-plant.png" + { + icon = "__angelsrefining__/graphics/icons/hydro-plant.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "hydro-plant-3"}, fast_replaceable_group = "hydro-plant", diff --git a/angelsrefining/prototypes/buildings/liquifier.lua b/angelsrefining/prototypes/buildings/liquifier.lua index f55a348de..0f39ae7b7 100644 --- a/angelsrefining/prototypes/buildings/liquifier.lua +++ b/angelsrefining/prototypes/buildings/liquifier.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "liquifier", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/liquifier.png" + { + icon = "__angelsrefining__/graphics/icons/liquifier.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), subgroup = "refining-buildings", order = "f[liquifier]", place_result = "liquifier", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "liquifier", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/liquifier.png" + { + icon = "__angelsrefining__/graphics/icons/liquifier.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "liquifier"}, fast_replaceable_group = "liquifier", @@ -106,18 +98,14 @@ data:extend( { type = "item", name = "liquifier-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/liquifier.png" + { + icon = "__angelsrefining__/graphics/icons/liquifier.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), subgroup = "refining-buildings", order = "g[liquifier-2]", place_result = "liquifier-2", @@ -126,18 +114,14 @@ data:extend( { type = "assembling-machine", name = "liquifier-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/liquifier.png" + { + icon = "__angelsrefining__/graphics/icons/liquifier.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "liquifier-2"}, fast_replaceable_group = "liquifier", @@ -209,18 +193,14 @@ data:extend( { type = "item", name = "liquifier-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/liquifier.png" + { + icon = "__angelsrefining__/graphics/icons/liquifier.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.refining.number_tint), subgroup = "refining-buildings", order = "h[liquifier-3]", place_result = "liquifier-3", @@ -229,18 +209,14 @@ data:extend( { type = "assembling-machine", name = "liquifier-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/liquifier.png" + { + icon = "__angelsrefining__/graphics/icons/liquifier.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "liquifier-3"}, fast_replaceable_group = "liquifier", @@ -312,18 +288,14 @@ data:extend( { type = "item", name = "liquifier-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/liquifier.png" + { + icon = "__angelsrefining__/graphics/icons/liquifier.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 4, angelsmods.refining.number_tint), subgroup = "refining-buildings", order = "i[liquifier-4]", place_result = "liquifier-4", @@ -332,18 +304,14 @@ data:extend( { type = "assembling-machine", name = "liquifier-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/liquifier.png" + { + icon = "__angelsrefining__/graphics/icons/liquifier.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 4, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "liquifier-4"}, fast_replaceable_group = "liquifier", diff --git a/angelsrefining/prototypes/buildings/ore-crusher.lua b/angelsrefining/prototypes/buildings/ore-crusher.lua index a748477d5..329596395 100644 --- a/angelsrefining/prototypes/buildings/ore-crusher.lua +++ b/angelsrefining/prototypes/buildings/ore-crusher.lua @@ -4,18 +4,14 @@ data:extend( { type = "item", name = "burner-ore-crusher", - icons = { + icons = --angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-crusher-burner.png" + { + icon = "__angelsrefining__/graphics/icons/ore-crusher-burner.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + --1, angelsmods.refining.number_tint), subgroup = "ore-crusher", order = "a[burner-ore-crusher]", place_result = "burner-ore-crusher", @@ -24,18 +20,14 @@ data:extend( { type = "assembling-machine", name = "burner-ore-crusher", - icons = { + icons = --angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-crusher-burner.png" + { + icon = "__angelsrefining__/graphics/icons/ore-crusher-burner.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + --1, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 0.5, result = "burner-ore-crusher"}, fast_replaceable_group = "ore-crusher", @@ -101,18 +93,14 @@ data:extend( { type = "item", name = "ore-crusher", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-crusher.png" + { + icon = "__angelsrefining__/graphics/icons/ore-crusher.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), subgroup = "ore-crusher", order = "b[ore-crusher]", place_result = "ore-crusher", @@ -121,18 +109,14 @@ data:extend( { type = "assembling-machine", name = "ore-crusher", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-crusher.png" + { + icon = "__angelsrefining__/graphics/icons/ore-crusher.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-crusher"}, fast_replaceable_group = "ore-crusher", @@ -175,18 +159,14 @@ data:extend( { type = "item", name = "ore-crusher-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-crusher-2.png" + { + icon = "__angelsrefining__/graphics/icons/ore-crusher-2.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), subgroup = "ore-crusher", order = "c[ore-crusher-2]", place_result = "ore-crusher-2", @@ -195,18 +175,14 @@ data:extend( { type = "assembling-machine", name = "ore-crusher-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-crusher-2.png" + { + icon = "__angelsrefining__/graphics/icons/ore-crusher-2.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-crusher-2"}, fast_replaceable_group = "ore-crusher", @@ -263,18 +239,14 @@ data:extend( { type = "item", name = "ore-crusher-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-crusher-3.png" + { + icon = "__angelsrefining__/graphics/icons/ore-crusher-3.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.refining.number_tint), subgroup = "ore-crusher", order = "d[ore-crusher-3]", place_result = "ore-crusher-3", @@ -283,18 +255,14 @@ data:extend( { type = "assembling-machine", name = "ore-crusher-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-crusher-3.png" + { + icon = "__angelsrefining__/graphics/icons/ore-crusher-3.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-crusher-3"}, fast_replaceable_group = "ore-crusher", diff --git a/angelsrefining/prototypes/buildings/ore-floatation-cell.lua b/angelsrefining/prototypes/buildings/ore-floatation-cell.lua index bc58162f1..bbb48fbf0 100644 --- a/angelsrefining/prototypes/buildings/ore-floatation-cell.lua +++ b/angelsrefining/prototypes/buildings/ore-floatation-cell.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "ore-floatation-cell", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-floatation-cell.png" + { + icon = "__angelsrefining__/graphics/icons/ore-floatation-cell.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), subgroup = "ore-floatation", order = "a[ore-floatation-cell]", place_result = "ore-floatation-cell", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "ore-floatation-cell", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-floatation-cell.png" + { + icon = "__angelsrefining__/graphics/icons/ore-floatation-cell.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-floatation-cell"}, fast_replaceable_group = "ore-floatation-cell", @@ -95,18 +87,14 @@ data:extend( { type = "item", name = "ore-floatation-cell-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-floatation-cell-2.png" + { + icon = "__angelsrefining__/graphics/icons/ore-floatation-cell-2.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), subgroup = "ore-floatation", order = "b[ore-floatation-cell-2]", place_result = "ore-floatation-cell-2", @@ -115,18 +103,14 @@ data:extend( { type = "assembling-machine", name = "ore-floatation-cell-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-floatation-cell-2.png" + { + icon = "__angelsrefining__/graphics/icons/ore-floatation-cell-2.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-floatation-cell-2"}, fast_replaceable_group = "ore-floatation-cell", @@ -201,18 +185,14 @@ data:extend( { type = "item", name = "ore-floatation-cell-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-floatation-cell-3.png" + { + icon = "__angelsrefining__/graphics/icons/ore-floatation-cell-3.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.refining.number_tint), subgroup = "ore-floatation", order = "c[ore-floatation-cell-3]", place_result = "ore-floatation-cell-3", @@ -221,18 +201,14 @@ data:extend( { type = "assembling-machine", name = "ore-floatation-cell-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-floatation-cell-3.png" + { + icon = "__angelsrefining__/graphics/icons/ore-floatation-cell-3.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-floatation-cell-3"}, fast_replaceable_group = "ore-floatation-cell", diff --git a/angelsrefining/prototypes/buildings/ore-leaching-plant.lua b/angelsrefining/prototypes/buildings/ore-leaching-plant.lua index fb30ffc24..66e03e59b 100644 --- a/angelsrefining/prototypes/buildings/ore-leaching-plant.lua +++ b/angelsrefining/prototypes/buildings/ore-leaching-plant.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "ore-leaching-plant", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-leaching-plant.png" + { + icon = "__angelsrefining__/graphics/icons/ore-leaching-plant.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), subgroup = "ore-leaching", order = "a[ore-leaching-plant]", place_result = "ore-leaching-plant", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "ore-leaching-plant", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-leaching-plant.png" + { + icon = "__angelsrefining__/graphics/icons/ore-leaching-plant.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-leaching-plant"}, fast_replaceable_group = "ore-leaching-plant", @@ -92,17 +84,14 @@ data:extend( { type = "item", name = "ore-leaching-plant-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-leaching-plant-2.png" + { + icon = "__angelsrefining__/graphics/icons/ore-leaching-plant-2.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.refining.number_tint), icon_size = 32, subgroup = "ore-leaching", order = "b[ore-leaching-plant-2]", @@ -112,18 +101,14 @@ data:extend( { type = "assembling-machine", name = "ore-leaching-plant-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-leaching-plant-2.png" + { + icon = "__angelsrefining__/graphics/icons/ore-leaching-plant-2.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-leaching-plant-2"}, fast_replaceable_group = "ore-leaching-plant", @@ -194,18 +179,14 @@ data:extend( { type = "item", name = "ore-leaching-plant-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-leaching-plant-3.png" + { + icon = "__angelsrefining__/graphics/icons/ore-leaching-plant-3.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.refining.number_tint), subgroup = "ore-leaching", order = "c[ore-leaching-plant-3]", place_result = "ore-leaching-plant-3", @@ -214,18 +195,14 @@ data:extend( { type = "assembling-machine", name = "ore-leaching-plant-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-leaching-plant-3.png" + { + icon = "__angelsrefining__/graphics/icons/ore-leaching-plant-3.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-leaching-plant-3"}, fast_replaceable_group = "ore-leaching-plant", diff --git a/angelsrefining/prototypes/buildings/ore-refinery.lua b/angelsrefining/prototypes/buildings/ore-refinery.lua index 627ec3875..a01e9bb08 100644 --- a/angelsrefining/prototypes/buildings/ore-refinery.lua +++ b/angelsrefining/prototypes/buildings/ore-refinery.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "ore-refinery", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-refinery.png" + { + icon = "__angelsrefining__/graphics/icons/ore-refinery.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), subgroup = "ore-refining", order = "a[ore-refinery]", place_result = "ore-refinery", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "ore-refinery", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-refinery.png" + { + icon = "__angelsrefining__/graphics/icons/ore-refinery.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-refinery"}, fast_replaceable_group = "ore-refinery", @@ -107,18 +99,14 @@ data:extend( { type = "item", name = "ore-refinery-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-refinery-2.png" + { + icon = "__angelsrefining__/graphics/icons/ore-refinery.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), subgroup = "ore-refining", order = "b[ore-refinery-2]", place_result = "ore-refinery-2", @@ -127,18 +115,14 @@ data:extend( { type = "assembling-machine", name = "ore-refinery-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-refinery-2.png" + { + icon = "__angelsrefining__/graphics/icons/ore-refinery.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-refinery-2"}, fast_replaceable_group = "ore-refinery", diff --git a/angelsrefining/prototypes/buildings/ore-sorting-facility.lua b/angelsrefining/prototypes/buildings/ore-sorting-facility.lua index 1a505f716..66fc5f63d 100644 --- a/angelsrefining/prototypes/buildings/ore-sorting-facility.lua +++ b/angelsrefining/prototypes/buildings/ore-sorting-facility.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "ore-sorting-facility", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-sorting-facility.png" + { + icon = "__angelsrefining__/graphics/icons/ore-sorting-facility.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), subgroup = "ore-sorter", order = "a[ore-sorting-facility]", place_result = "ore-sorting-facility", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "ore-sorting-facility", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-sorting-facility.png" + { + icon = "__angelsrefining__/graphics/icons/ore-sorting-facility.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-sorting-facility"}, fast_replaceable_group = "ore-sorting-facility", @@ -91,18 +83,14 @@ data:extend( { type = "item", name = "ore-sorting-facility-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-2.png" + { + icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-2.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), subgroup = "ore-sorter", order = "b[ore-sorting-facility-2]", place_result = "ore-sorting-facility-2", @@ -111,18 +99,14 @@ data:extend( { type = "assembling-machine", name = "ore-sorting-facility-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-2.png" + { + icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-2.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-sorting-facility-2"}, fast_replaceable_group = "ore-sorting-facility", @@ -180,18 +164,14 @@ data:extend( { type = "item", name = "ore-sorting-facility-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-3.png" + { + icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-3.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.refining.number_tint), subgroup = "ore-sorter", order = "c[ore-sorting-facility-3]", place_result = "ore-sorting-facility-3", @@ -200,18 +180,14 @@ data:extend( { type = "assembling-machine", name = "ore-sorting-facility-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-3.png" + { + icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-3.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-sorting-facility-3"}, fast_replaceable_group = "ore-sorting-facility", @@ -269,18 +245,14 @@ data:extend( { type = "item", name = "ore-sorting-facility-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-4.png" + { + icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-4.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 4, angelsmods.refining.number_tint), subgroup = "ore-sorter", order = "d[ore-sorting-facility-4]", place_result = "ore-sorting-facility-4", @@ -289,18 +261,14 @@ data:extend( { type = "assembling-machine", name = "ore-sorting-facility-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-4.png" + { + icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-4.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 4, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-sorting-facility-4"}, fast_replaceable_group = "ore-sorting-facility", @@ -321,7 +289,7 @@ data:extend( emissions_per_minute = 0.06 * 60 }, energy_usage = "300kW", - ingredient_count = 6, + --ingredient_count = 6, animation = { layers = { { diff --git a/angelsrefining/prototypes/buildings/powderizer.lua b/angelsrefining/prototypes/buildings/powderizer.lua index 10f3a5af9..0d521c546 100644 --- a/angelsrefining/prototypes/buildings/powderizer.lua +++ b/angelsrefining/prototypes/buildings/powderizer.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "ore-powderizer", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/powderizer-ico.png" + { + icon = "__angelsrefining__/graphics/icons/powderizer-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), subgroup = "ore-powderizer", order = "a", place_result = "ore-powderizer", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "ore-powderizer", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/powderizer-ico.png" + { + icon = "__angelsrefining__/graphics/icons/powderizer-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-powderizer"}, fast_replaceable_group = "ore-powderizer", @@ -88,18 +80,14 @@ data:extend( { type = "item", name = "ore-powderizer-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/powderizer-ico.png" + { + icon = "__angelsrefining__/graphics/icons/powderizer-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), subgroup = "ore-powderizer", order = "b", place_result = "ore-powderizer-2", @@ -108,18 +96,14 @@ data:extend( { type = "assembling-machine", name = "ore-powderizer-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/powderizer-ico.png" + { + icon = "__angelsrefining__/graphics/icons/powderizer-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-powderizer-2"}, fast_replaceable_group = "ore-powderizer", @@ -173,18 +157,14 @@ data:extend( { type = "item", name = "ore-powderizer-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/powderizer-ico.png" + { + icon = "__angelsrefining__/graphics/icons/powderizer-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.refining.number_tint), subgroup = "ore-powderizer", order = "c", place_result = "ore-powderizer-3", @@ -193,18 +173,14 @@ data:extend( { type = "assembling-machine", name = "ore-powderizer-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/powderizer-ico.png" + { + icon = "__angelsrefining__/graphics/icons/powderizer-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 3, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-powderizer-3"}, fast_replaceable_group = "ore-powderizer", diff --git a/angelsrefining/prototypes/buildings/salination-plant.lua b/angelsrefining/prototypes/buildings/salination-plant.lua index 40858cd64..498f4f4bd 100644 --- a/angelsrefining/prototypes/buildings/salination-plant.lua +++ b/angelsrefining/prototypes/buildings/salination-plant.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "salination-plant", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/salination-plant.png" + { + icon = "__angelsrefining__/graphics/icons/salination-plant.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), subgroup = "water-treatment-building", order = "d[salination-plant]", place_result = "salination-plant", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "salination-plant", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/salination-plant.png" + { + icon = "__angelsrefining__/graphics/icons/salination-plant.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "salination-plant"}, fast_replaceable_group = "salination-plant", @@ -95,18 +87,14 @@ data:extend( { type = "item", name = "salination-plant-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/salination-plant.png" + { + icon = "__angelsrefining__/graphics/icons/salination-plant.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), subgroup = "water-treatment-building", order = "e[salination-plant2-]", place_result = "salination-plant-2", @@ -115,18 +103,14 @@ data:extend( { type = "assembling-machine", name = "salination-plant-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/salination-plant.png" + { + icon = "__angelsrefining__/graphics/icons/salination-plant.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "salination-plant-2"}, fast_replaceable_group = "salination-plant", diff --git a/angelsrefining/prototypes/buildings/thermal-extractor.lua b/angelsrefining/prototypes/buildings/thermal-extractor.lua index 84b7ff455..6ddd294f9 100644 --- a/angelsrefining/prototypes/buildings/thermal-extractor.lua +++ b/angelsrefining/prototypes/buildings/thermal-extractor.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "thermal-bore", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", + { + icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), subgroup = "refining-buildings", order = "a[thermal-extractor]-a[bore]", place_result = "thermal-bore", @@ -23,8 +19,14 @@ data:extend( { type = "mining-drill", name = "thermal-bore", - icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 1, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "thermal-bore"}, resource_categories = {"angels-fissure"}, @@ -43,7 +45,7 @@ data:extend( usage_priority = "secondary-input" }, output_fluid_box = { - base_area = 1, + base_area = 5, base_level = 1, pipe_covers = pipecoverspictures(), pipe_connections = @@ -171,18 +173,14 @@ data:extend( { type = "item", name = "thermal-extractor", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", + { + icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), subgroup = "refining-buildings", order = "a[thermal-extractor]-b[extractor]", place_result = "thermal-extractor", @@ -191,8 +189,14 @@ data:extend( { type = "mining-drill", name = "thermal-extractor", - icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsrefining__/graphics/icons/thermal-extractor.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 2, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "thermal-extractor"}, resource_categories = {"angels-fissure"}, @@ -211,7 +215,7 @@ data:extend( usage_priority = "secondary-input" }, output_fluid_box = { - base_area = 1, + base_area = 10, base_level = 1, pipe_covers = pipecoverspictures(), pipe_connections = { diff --git a/angelsrefining/prototypes/buildings/washing-plant.lua b/angelsrefining/prototypes/buildings/washing-plant.lua index bbe2730b0..217e19ff7 100644 --- a/angelsrefining/prototypes/buildings/washing-plant.lua +++ b/angelsrefining/prototypes/buildings/washing-plant.lua @@ -3,18 +3,14 @@ data:extend( { type = "item", name = "washing-plant", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/washing-plant-ico.png" + { + icon = "__angelsrefining__/graphics/icons/washing-plant-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), subgroup = "washing-building", order = "b", place_result = "washing-plant", @@ -23,18 +19,14 @@ data:extend( { type = "assembling-machine", name = "washing-plant", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/washing-plant-ico.png" + { + icon = "__angelsrefining__/graphics/icons/washing-plant-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "washing-plant"}, fast_replaceable_group = "washing-plant", @@ -109,18 +101,14 @@ data:extend( { type = "item", name = "washing-plant-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/washing-plant-ico.png" + { + icon = "__angelsrefining__/graphics/icons/washing-plant-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), subgroup = "washing-building", order = "c", place_result = "washing-plant-2", @@ -129,18 +117,14 @@ data:extend( { type = "assembling-machine", name = "washing-plant-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/washing-plant-ico.png" + { + icon = "__angelsrefining__/graphics/icons/washing-plant-ico.png", + icon_size = 32, icon_mipmaps = 1 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.refining.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "washing-plant-2"}, fast_replaceable_group = "washing-plant", diff --git a/angelsrefining/prototypes/generation/angels-crystal-rock.lua b/angelsrefining/prototypes/generation/angels-crystal-rock.lua index a51f9b19a..de5060b97 100644 --- a/angelsrefining/prototypes/generation/angels-crystal-rock.lua +++ b/angelsrefining/prototypes/generation/angels-crystal-rock.lua @@ -19,6 +19,7 @@ data:extend( loot = { {item = "stone", probability = 1, count_min = 5, count_max = 10} }, + count_as_rock_for_filtered_deconstruction = true, mined_sound = {filename = "__base__/sound/deconstruct-bricks.ogg"}, render_layer = "object", max_health = 200, diff --git a/angelsrefining/prototypes/generation/angels-fissure.lua b/angelsrefining/prototypes/generation/angels-fissure.lua index 05008df21..1bfb3593b 100644 --- a/angelsrefining/prototypes/generation/angels-fissure.lua +++ b/angelsrefining/prototypes/generation/angels-fissure.lua @@ -7,6 +7,7 @@ data:extend( { type = "autoplace-control", name = "angels-fissure", + localised_name = {"", "[entity=angels-fissure] ", {"entity-name.angels-fissure"}}, richness = true, order = "b-e", category = "resource" @@ -14,7 +15,7 @@ data:extend( { type = "resource", name = "angels-fissure", - icon = "__base__/graphics/icons/crude-oil-resource.png", + icon = "__angelsrefining__/graphics/icons/fissure.png", icon_size = 64, icon_mipmaps = 4, flags = {"placeable-neutral"}, diff --git a/angelsrefining/prototypes/generation/angels-ore.lua b/angelsrefining/prototypes/generation/angels-ore.lua index 366e36b40..ba776f28d 100644 --- a/angelsrefining/prototypes/generation/angels-ore.lua +++ b/angelsrefining/prototypes/generation/angels-ore.lua @@ -175,7 +175,7 @@ angelsmods.functions.add_resource( output_name = "thermal-water", output_min = 20, output_max = 20, - icon = "__base__/graphics/icons/crude-oil-resource.png", + icon = "__angelsrefining__/graphics/icons/fissure.png", icon_size = 64, icon_mipmaps = 4, autoplace = { diff --git a/angelsrefining/prototypes/generation/angels-override.lua b/angelsrefining/prototypes/generation/angels-override.lua index c620f7224..63c796bf7 100644 --- a/angelsrefining/prototypes/generation/angels-override.lua +++ b/angelsrefining/prototypes/generation/angels-override.lua @@ -34,21 +34,16 @@ if not angelsmods.refining.disable_ore_override then --YUOKI if data.raw.resource["y-res1"] then - data.raw.resource["y-res1"] = nil - data.raw["autoplace-control"]["y-res1"] = nil - - data.raw.resource["y-res2"] = nil - data.raw["autoplace-control"]["y-res2"] = nil + angelsmods.functions.remove_resource("y-res1") + angelsmods.functions.remove_resource("y-res2") end --URANIUM POWER if data.raw.resource["uraninite"] then - data.raw.resource["fluorite"] = nil - data.raw["autoplace-control"]["fluorite"] = nil - data.raw["item"]["fluorite"].icon = "__angelsinfiniteores__/graphics/icons/up-fluorite.png" + angelsmods.functions.remove_resource("uraninite") + angelsmods.functions.remove_resource("fluorite") - data.raw.resource["uraninite"] = nil - data.raw["autoplace-control"]["uraninite"] = nil + data.raw["item"]["fluorite"].icon = "__angelsinfiniteores__/graphics/icons/up-fluorite.png" data.raw["item"]["uraninite"].icon = "__angelsinfiniteores__/graphics/icons/up-uraninite.png" end end diff --git a/angelsrefining/prototypes/generation/resource-builder.lua b/angelsrefining/prototypes/generation/resource-builder.lua index 9d2cb6477..ba73be5a6 100644 --- a/angelsrefining/prototypes/generation/resource-builder.lua +++ b/angelsrefining/prototypes/generation/resource-builder.lua @@ -9,6 +9,7 @@ local function make_resautoplace(input) { type = "autoplace-control", name = input.name, + localised_name = {"", "[entity="..input.name.."] ", {"entity-name."..input.name}}, richness = true, order = "b-" .. input.order, category = "resource" diff --git a/angelsrefining/prototypes/items/refining-ores.lua b/angelsrefining/prototypes/items/refining-ores.lua index 161c7be0c..84abfb0f2 100644 --- a/angelsrefining/prototypes/items/refining-ores.lua +++ b/angelsrefining/prototypes/items/refining-ores.lua @@ -1,26 +1,26 @@ -angel_ore_3 = { - type = "item", - name = "angels-ore3", - subgroup = "angels-ores", - order = "c[angels-ore3]", - stack_size = 200 +local angel_ore_3 = { + type = "item", + name = "angels-ore3", + subgroup = "angels-ores", + order = "c[angels-ore3]", + stack_size = 200 } if settings.startup["angels-tryptophobia-friendly-stiratite"].value == true then - angel_ore_3["icon"] = "__angelsrefining__/graphics/icons/angels-ore3.png" - angel_ore_3["icon_size"] = 32 + angel_ore_3["icon"] = "__angelsrefining__/graphics/icons/angels-ore3.png" + angel_ore_3["icon_size"] = 32 else - angel_ore_3["icon"] = "__angelsrefining__/graphics/icons/angels-ore3-HR.png" - angel_ore_3["icon_size"] = 64 - angel_ore_3["pictures"] = { - { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-1.png", scale = 0.25, mipmap_count = 1 }, - { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-2.png", scale = 0.25, mipmap_count = 1 }, - { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-3.png", scale = 0.25, mipmap_count = 1 }, - { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-4.png", scale = 0.25, mipmap_count = 1 }, - { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-5.png", scale = 0.25, mipmap_count = 1 }, - { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-6.png", scale = 0.25, mipmap_count = 1 }, - { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-7.png", scale = 0.25, mipmap_count = 1 }, - { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-8.png", scale = 0.25, mipmap_count = 1 }, - } + angel_ore_3["icon"] = "__angelsrefining__/graphics/icons/angels-ore3-HR.png" + angel_ore_3["icon_size"] = 64 + angel_ore_3["pictures"] = { + { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-1.png", scale = 0.25, mipmap_count = 1 }, + { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-2.png", scale = 0.25, mipmap_count = 1 }, + { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-3.png", scale = 0.25, mipmap_count = 1 }, + { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-4.png", scale = 0.25, mipmap_count = 1 }, + { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-5.png", scale = 0.25, mipmap_count = 1 }, + { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-6.png", scale = 0.25, mipmap_count = 1 }, + { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-7.png", scale = 0.25, mipmap_count = 1 }, + { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-8.png", scale = 0.25, mipmap_count = 1 }, + } end data:extend( diff --git a/angelsrefining/prototypes/override-functions.lua b/angelsrefining/prototypes/override-functions.lua index 607f054b0..e727fedf7 100644 --- a/angelsrefining/prototypes/override-functions.lua +++ b/angelsrefining/prototypes/override-functions.lua @@ -505,6 +505,7 @@ ov_functions.disable_recipe = function(recipe) -- disables recipe (may be a tabl patch.enabled = false end disable_table.recipes[rec] = true + ov_functions.hide_recipe(rec) end else guarantee_subtable(patch_table, recipe) @@ -516,6 +517,7 @@ ov_functions.disable_recipe = function(recipe) -- disables recipe (may be a tabl patch.enabled = false end disable_table.recipes[recipe] = true + ov_functions.hide_recipe(recipe) end end diff --git a/angelsrefining/prototypes/override/refining-override-boblogistics.lua b/angelsrefining/prototypes/override/refining-override-boblogistics.lua new file mode 100644 index 000000000..785c4ab88 --- /dev/null +++ b/angelsrefining/prototypes/override/refining-override-boblogistics.lua @@ -0,0 +1,39 @@ +local OV = angelsmods.functions.OV +if mods["boblogistics"] then + -- bob valves + angelsmods.functions.move_item("bob-valve", "angels-fluid-control", "a[valve]-a", "item") + angelsmods.functions.move_item("bob-overflow-valve", "angels-fluid-control", "a[valve]-b", "item") + angelsmods.functions.move_item("bob-topup-valve", "angels-fluid-control", "a[valve]-c", "item") + + -- bob pumps + angelsmods.functions.move_item("pump", "angels-fluid-control", "b[pump]-a[mk1]") + angelsmods.functions.move_item("bob-pump-2", "angels-fluid-control", "b[pump]-b[mk2]") + angelsmods.functions.move_item("bob-pump-3", "angels-fluid-control", "b[pump]-c[mk3]") + angelsmods.functions.move_item("bob-pump-4", "angels-fluid-control", "b[pump]-d[mk4]") + + -- bob tanks + --angelsmods.functions.move_item("storage-tank", "angels-fluid-tanks", "b[medium-tank]-a[mk1]-a[regular]") + angelsmods.functions.move_item("bob-storage-tank-all-corners", "angels-fluid-tanks", "b[medium-tank]-a[mk1]-b[all-corners]") + angelsmods.functions.move_item("storage-tank-2", "angels-fluid-tanks", "b[medium-tank]-b[mk2]-a[regular]") + angelsmods.functions.move_item("bob-storage-tank-all-corners-2", "angels-fluid-tanks", "b[medium-tank]-b[mk2]-b[all-corners]") + angelsmods.functions.move_item("storage-tank-3", "angels-fluid-tanks", "b[medium-tank]-c[mk3]-a[regular]") + angelsmods.functions.move_item("bob-storage-tank-all-corners-3", "angels-fluid-tanks", "b[medium-tank]-c[mk3]-b[all-corners]") + angelsmods.functions.move_item("storage-tank-3", "angels-fluid-tanks", "b[medium-tank]-d[mk3]-a[regular]") + angelsmods.functions.move_item("bob-storage-tank-all-corners-3", "angels-fluid-tanks", "b[medium-tank]-d[mk3]-b[all-corners]") + angelsmods.functions.move_item("storage-tank-4", "angels-fluid-tanks", "b[medium-tank]-e[mk4]-a[regular]") + angelsmods.functions.move_item("bob-storage-tank-all-corners-4", "angels-fluid-tanks", "b[medium-tank]-e[mk4]-b[all-corners]") + + if mods["bobplates"] then + OV.patch_recipes( + { + { + name = "bob-storage-tank-all-corners", + ingredients = { + {name = "bob-small-storage-tank", amount = 1}, + {name = "pipe", amount = 2} + } + }, + } + ) + end +end \ No newline at end of file diff --git a/angelsrefining/prototypes/override/refining-override-bobmining.lua b/angelsrefining/prototypes/override/refining-override-bobmining.lua index c66448d89..a2cf30ba7 100644 --- a/angelsrefining/prototypes/override/refining-override-bobmining.lua +++ b/angelsrefining/prototypes/override/refining-override-bobmining.lua @@ -21,5 +21,15 @@ if mods["bobmining"] then "water-miner-5" } ) + + OV.hide_recipe( + { + "water-miner-1", + "water-miner-2", + "water-miner-3", + "water-miner-4", + "water-miner-5" + } + ) end \ No newline at end of file diff --git a/angelsrefining/prototypes/override/refining-override-bobplates.lua b/angelsrefining/prototypes/override/refining-override-bobplates.lua index 529b6948a..d1ae0526a 100644 --- a/angelsrefining/prototypes/override/refining-override-bobplates.lua +++ b/angelsrefining/prototypes/override/refining-override-bobplates.lua @@ -11,6 +11,15 @@ if mods["bobplates"] then "water-pump-3", "water-pump-4" }, "hidden") + + OV.hide_recipe( + { + "water-pump", + "water-pump-2", + "water-pump-3", + "water-pump-4" + } + ) angelsmods.functions.set_next_upgrade("assembling-machine", "water-pump", nil) angelsmods.functions.set_next_upgrade("assembling-machine", "water-pump-2", nil) @@ -33,12 +42,146 @@ if mods["bobplates"] then "water-bore-4" } ) + + angelsmods.functions.move_item("bob-small-inline-storage-tank", "angels-fluid-tanks", "a[small-tank]-a") + angelsmods.functions.move_item("bob-small-storage-tank", "angels-fluid-tanks", "a[small-tank]-b") + OV.patch_recipes( + { + { + name = "bob-small-storage-tank", + ingredients = { + {"!!"}, + {name = "bob-small-inline-storage-tank", amount = 1}, + {name = "pipe", amount = 1} + } + }, + { + name = "storage-tank", + ingredients = { + {name = "bob-small-inline-storage-tank", amount = 1} + } + } + } + ) end ------------------------------------------------------------------------------- -- GEMSTONES ------------------------------------------------------------------ ------------------------------------------------------------------------------- if mods["bobplates"] then + data:extend( + { + { + type = "technology", + name = "geode-crystallization-1", + icon = "__angelsrefining__/graphics/technology/geode-processing-cyan.png", + icon_size = 256, + icon_mipmaps = 2, + upgrade = true, + prerequisites = { + "geode-processing-2" + }, + effects = { + { + type = "unlock-recipe", + recipe = "angelsore7-crystallization-1" + }, + { + type = "unlock-recipe", + recipe = "angelsore7-crystallization-2" + }, + { + type = "unlock-recipe", + recipe = "angelsore7-crystallization-3" + }, + { + type = "unlock-recipe", + recipe = "angelsore7-crystallization-4" + }, + { + type = "unlock-recipe", + recipe = "angelsore7-crystallization-5" + }, + { + type = "unlock-recipe", + recipe = "angelsore7-crystallization-6" + } + }, + unit = { + count = 50, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1} + }, + time = 30 + }, + order = "a-a-a1" + }, + { + type = "technology", + name = "geode-crystallization-2", + icon = "__angelsrefining__/graphics/technology/geode-processing-blue.png", + icon_size = 256, + icon_mipmaps = 2, + upgrade = true, + prerequisites = { + "geode-crystallization-1" + }, + effects = { + { + type = "unlock-recipe", + recipe = "bob-ruby-3" + }, + { + type = "unlock-recipe", + recipe = "bob-sapphire-3" + }, + { + type = "unlock-recipe", + recipe = "bob-emerald-3" + }, + { + type = "unlock-recipe", + recipe = "bob-amethyst-3" + }, + { + type = "unlock-recipe", + recipe = "bob-topaz-3" + }, + { + type = "unlock-recipe", + recipe = "bob-diamond-3" + } + }, + unit = { + count = 50, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1} + }, + time = 30 + }, + order = "a-a-a1" + }, + } + ) + OV.add_prereq("gem-processing-1", "geode-crystallization-2") + for _, recipeName in pairs{ + "bob-ruby-3", + "bob-sapphire-3", + "bob-emerald-3", + "bob-amethyst-3", + "bob-topaz-3", + "bob-diamond-3", + } do + data.raw.recipe[recipeName].enabled = false + if data.raw.recipe[recipeName].normal then + data.raw.recipe[recipeName].normal.enabled = false + end + if data.raw.recipe[recipeName].expensive then + data.raw.recipe[recipeName].expensive.enabled = false + end + end move_item("grinding-wheel", "bob-gems-cut", "g-4") move_item("polishing-wheel", "bob-gems-polished", "g-5-a") move_item("polishing-compound", "bob-gems-polished", "g-5-b") diff --git a/angelsrefining/prototypes/override/refining-override-bobrevamp.lua b/angelsrefining/prototypes/override/refining-override-bobrevamp.lua index 77a134f0f..c38341f83 100644 --- a/angelsrefining/prototypes/override/refining-override-bobrevamp.lua +++ b/angelsrefining/prototypes/override/refining-override-bobrevamp.lua @@ -24,7 +24,9 @@ if mods["bobrevamp"] then end end end - + if mods["bobplates"] and settings.startup["bobmods-revamp-old-oil"] then + OV.hide_recipe({"sulfuric-acid","sulfur"}) + end end --local ammonium = data.raw.recipe["ammonium-chloride-recycling"] diff --git a/angelsrefining/prototypes/override/refining-override-sorting.lua b/angelsrefining/prototypes/override/refining-override-sorting.lua index c558f5492..38101ed04 100644 --- a/angelsrefining/prototypes/override/refining-override-sorting.lua +++ b/angelsrefining/prototypes/override/refining-override-sorting.lua @@ -577,6 +577,17 @@ else "ore-electro-whinning-cell" } ) + --also hide buildings + OV.hide_recipe({ + "ore-powderizer", + "ore-powderizer-2", + "ore-powderizer-3", + "milling-drum", + "milling-drum-used", + "electro-whinning-cell", + "electro-whinning-cell-2", + "electro-whinning-cell-3", + }) end if ore_enabled("ferrous") and ore_enabled("cupric") then @@ -584,6 +595,14 @@ else OV.remove_unlock("ore-electro-whinning-cell", "angelsore-crystal-mix6-processing") OV.disable_recipe("angelsore-crystal-mix6-processing") end +if not ore_enabled("ferrous") then +--I DON'T KNOW WHY THIS IS STILL GETTING THROUGH!!! + OV.disable_recipe({"angelsore8-crushed","angelsore8-crushed-processing"}) +end +if not ore_enabled("cupric") then +--I DON'T KNOW WHY THIS IS STILL GETTING THROUGH!!! + OV.disable_recipe({"angelsore9-crushed","angelsore9-crushed-processing"}) +end ------------------------------------------------------------------------------- -- MIXED SORTING -------------------------------------------------------------- @@ -708,16 +727,17 @@ OV.patch_recipes( {type = "item", name = "thorium-ore", amount = 3} }, { - --[[1]] special_vanilla and { - {icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - }, + --[[1]] special_vanilla and angelsmods.functions.add_icon_layer( + angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsrefining__/graphics/icons/sort-icon.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 1, angelsmods.refining.number_tint), tweaked_icon_lookup("uranium-ore", 0.5, {10, 10}) - } or { + ) or { {icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, tweaked_icon_lookup("rutile-ore", 0.5, {10, 10}) }, @@ -752,16 +772,17 @@ OV.patch_recipes( "unused" }, { - --[[1]] special_vanilla and { - {icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - }, + --[[1]] special_vanilla and angelsmods.functions.add_icon_layer( + angelsmods.functions.add_number_icon_layer( + { + { + icon = "__angelsrefining__/graphics/icons/sort-icon.png", + icon_size = 32, icon_mipmaps = 1 + } + }, + 2, angelsmods.refining.number_tint), tweaked_icon_lookup("uranium-ore", 0.5, {10, 10}) - } or { + ) or { {icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, tweaked_icon_lookup("tungsten-ore", 0.5, {10, 10}) }, diff --git a/angelsrefining/prototypes/override/refining-override-water-treatment.lua b/angelsrefining/prototypes/override/refining-override-water-treatment.lua index ac08560f4..3776cf2e3 100644 --- a/angelsrefining/prototypes/override/refining-override-water-treatment.lua +++ b/angelsrefining/prototypes/override/refining-override-water-treatment.lua @@ -51,6 +51,25 @@ end if angelsmods.trigger.washing_tech == false then --not angelsmods.smelting then OV.disable_technology({"water-washing-1", "water-washing-2"}) OV.remove_prereq("geode-processing-2", "water-washing-2") + OV.hide_recipe( + { + "water-viscous-mud", + "washing-1", + "washing-2", + "washing-3", + "washing-4", + "washing-5", + "solid-mud-landfill", + "solid-geodes", + "solid-clay", + "solid-limestone", + "solid-sand", + --hide buildings too + "seafloor-pump", + "washing-plant", + "washing-plant-2" + } + ) end angelsmods.functions.move_item("offshore-pump", "washing-building", "d") @@ -80,8 +99,18 @@ if mods["bobplates"] then {type = "fluid", name = "chlorine", amount = 20}, {type = "fluid", name = "hydrogen", amount = 20} }, - icon = "__angelsrefining__/graphics/icons/electrolysis-salt-water.png", - icon_size = 32, + --icon = "__angelsrefining__/graphics/icons/electrolysis-salt-water.png", + --icon_size = 32, + icons = angelsmods.functions.create_viscous_liquid_recipe_icon( + { + "chlorine", + "hydrogen", + "sodium-hydroxide" + }, + { + {039, 112, 194}, {168, 173, 173}, {070, 133, 232}, {185, 185, 185, 0.8} + } + ), subgroup = "bob-fluid-electrolysis", order = "b[fluid-chemistry]-b[salt-water-electrolysis]" } @@ -95,8 +124,10 @@ end -- LITHIA WATER --------------------------------------------------------------- ------------------------------------------------------------------------------- if mods["bobplates"] then - data.raw.fluid["lithia-water"].icon = "__angelsrefining__/graphics/icons/water-lithia.png" - data.raw.fluid["lithia-water"].icon_size = 32 --icon size of 64 overriding caused issues + data.raw.fluid["lithia-water"].icons = angelsmods.functions.create_viscous_liquid_fluid_icon(nil, { {032,118,206}, {248,083,099}, {038,137,237,0.8}, {255,073,072,0.8} }) + data.raw.fluid["lithia-water"].icon = nil + data.raw.fluid["lithia-water"].icon_size = nil + data.raw.fluid["lithia-water"].icon_mipmaps = nil angelsmods.functions.move_item("lithia-water", "water-treatment-fluid", "ea", "fluid") data:extend( diff --git a/angelsrefining/prototypes/recipe-builder-fallbacks.lua b/angelsrefining/prototypes/recipe-builder-fallbacks.lua index 196a13545..8fffd9115 100644 --- a/angelsrefining/prototypes/recipe-builder-fallbacks.lua +++ b/angelsrefining/prototypes/recipe-builder-fallbacks.lua @@ -191,7 +191,7 @@ --BIO PROCESSING angelsmods.functions.RB.set_fallback("item", "algaefarm-1", { { "block-electronics-0", 5 } } ) - angelsmods.functions.RB.set_fallback("item", "algaefarm-2", { { "block-bprocessing-3", 5 }, { "algae-farm" } } ) + angelsmods.functions.RB.set_fallback("item", "algaefarm-2", { { "block-bprocessing-2", 5 }, { "algae-farm" } } ) angelsmods.functions.RB.set_fallback("item", "algaefarm-3", { { "block-bprocessing-4", 5 }, { "algae-farm-2" } } ) angelsmods.functions.RB.set_fallback("item", "cropfarm-1", { { "block-production-1", 3 } } ) diff --git a/angelsrefining/prototypes/recipe-builder.lua b/angelsrefining/prototypes/recipe-builder.lua index aa1e5b477..5573f8278 100644 --- a/angelsrefining/prototypes/recipe-builder.lua +++ b/angelsrefining/prototypes/recipe-builder.lua @@ -130,13 +130,22 @@ local p_blocked = { results = true, amount = true, amount_min = true, - amount_max = true + amount_max = true, + crafting_machine_tints = true } +-- list of properties which activate in the normal/expensive blocks local p_splittable = { ingredients = true, enabled = true, + hidden = true, energy_required = true, - main_product = true + main_product = true, + --products = true, + emissions_multiplier = true, + hide_from_flow_stats = true, + hide_from_player_crafting = true, + allow_decomposition = true, + allow_as_intermediate = true, } local function prioritize(a, b) diff --git a/angelsrefining/prototypes/recipes/water-treatment-recipes.lua b/angelsrefining/prototypes/recipes/water-treatment-recipes.lua index f480ada35..7415d7487 100644 --- a/angelsrefining/prototypes/recipes/water-treatment-recipes.lua +++ b/angelsrefining/prototypes/recipes/water-treatment-recipes.lua @@ -49,6 +49,7 @@ data:extend( subgroup = "water-treatment", energy_required = 1, enabled = false, + hidden = true, ingredients = { {type = "fluid", name = "thermal-water", amount = 50} }, diff --git a/angelsrefining/prototypes/refining-generate.lua b/angelsrefining/prototypes/refining-generate.lua index e541f7f92..7095bb2cb 100644 --- a/angelsrefining/prototypes/refining-generate.lua +++ b/angelsrefining/prototypes/refining-generate.lua @@ -39,15 +39,12 @@ if angelsmods.refining then --MOVE EMPTY BARREL data.raw["item-subgroup"]["fill-barrel"].group = "angels-fluid-control" data.raw["item-subgroup"]["empty-barrel"].group = "angels-fluid-control" - data.raw.item["empty-barrel"].subgroup = "angels-fluid-control" - data.raw.item["empty-barrel"].order = "h" - data.raw.recipe["empty-barrel"].subgroup = "angels-fluid-control" - data.raw.recipe["empty-barrel"].order = "h" + angelsmods.functions.move_item("empty-barrel", "angels-fluid-control", "h") + angelsmods.functions.move_item("empty-barrel", "angels-fluid-control", "h", "recipe") --angelsmods.functions.OV.set_special_recipe_override("empty-barrel", { subgroup = "angels-fluid-control", order = "h" }) --MOVE STORAGE TANK - data.raw.item["storage-tank"].subgroup = "angels-fluid-tanks" - data.raw.item["storage-tank"].order = "a" + angelsmods.functions.move_item("storage-tank", "angels-fluid-tanks", "b[medium-tank]-a[mk1]-a[regular]") --angelsmods.functions.OV.set_special_recipe_override("storage-tank", { subgroup = "angels-fluid-tanks", order = "a" }) --MODIFY BARRELING RECIPES diff --git a/angelsrefining/prototypes/refining-override.lua b/angelsrefining/prototypes/refining-override.lua index dc67f0f4a..db35171cf 100644 --- a/angelsrefining/prototypes/refining-override.lua +++ b/angelsrefining/prototypes/refining-override.lua @@ -31,6 +31,7 @@ require("prototypes.override.refining-override-bobtech") require("prototypes.override.refining-override-bobrevamp") require("prototypes.override.refining-override-bobwarfare") require("prototypes.override.refining-override-bobclasses") +require("prototypes.override.refining-override-boblogistics") if mods["bobplates"] then --revamp override @@ -131,6 +132,7 @@ if data.raw.item["y-res1"] then ) --RECIPES + local slag_color = {{202, 099, 017}, {097, 052, 020}, {097, 052, 020}} data:extend( { { @@ -147,8 +149,13 @@ if data.raw.item["y-res1"] then {type = "item", name = "y-res1", amount = 1, probability = 0.5}, {type = "item", name = "y-res2", amount = 1, probability = 0.5} }, - icon = "__angelsrefining__/graphics/icons/slag-processing-yi.png", - icon_size = 32, + icons = angelsmods.functions.create_liquid_recipe_icon( + { + "y-res1", + "y-res2" + }, + slag_color + ), order = "a-a [slag-processing-yi]" }, { @@ -166,8 +173,10 @@ if data.raw.item["y-res1"] then results = { {type = "item", name = "y-res1", amount = 6} }, - icon = "__angelsrefining__/graphics/icons/angels-ore-mix-yi1-sorting.png", - icon_size = 32, + icons = { + {icon = "__angelsrefining__/graphics/icons/sort-icon.png", icon_size = 32}, + {icon = "__Yuoki__/graphics/icons/uni-com-pur.png", icon_size = 32, scale = 0.5, shift = {10, 10}}, + }, order = "c-i-g[angelsore-chunk-mix-yi1-processing]" }, { @@ -185,8 +194,10 @@ if data.raw.item["y-res1"] then results = { {type = "item", name = "y-res2", amount = 6} }, - icon = "__angelsrefining__/graphics/icons/angels-ore-mix-yi2-sorting.png", - icon_size = 32, + icons = { + {icon = "__angelsrefining__/graphics/icons/sort-icon.png", icon_size = 32}, + {icon = "__Yuoki__/graphics/icons/yi-res-2-pur.png", icon_size = 32, scale = 0.5, shift = {10, 10}}, + }, order = "c-i-g[angelsore-chunk-mix-yi2-processing]" }, { @@ -204,8 +215,14 @@ if data.raw.item["y-res1"] then {type = "fluid", name = "water-purified", amount = 70}, {type = "item", name = "sulfur", amount = 1} }, - icon = "__angelsrefining__/graphics/icons/water-yellow-waste-purification-yi.png", - icon_size = 32, + icons = angelsmods.functions.create_liquid_recipe_icon( + { + "y-con_water", + "water-purified", + mods["angelspetrochem"] and {"__angelspetrochem__/graphics/icons/solid-sulfur.png", 32} or "sulfur" + }, + "wss" + ),-- order = "a[yellow-waste-water-purification-yi]" } } diff --git a/angelsrefining/prototypes/technology/refining-technology.lua b/angelsrefining/prototypes/technology/refining-technology.lua index aee9bbde4..279fb9216 100644 --- a/angelsrefining/prototypes/technology/refining-technology.lua +++ b/angelsrefining/prototypes/technology/refining-technology.lua @@ -123,6 +123,7 @@ data:extend( icon = "__angelsrefining__/graphics/technology/geode-processing-red.png", icon_size = 256, icon_mipmaps = 2, + upgrade = true, prerequisites = { --"ore-crushing", "ore-floatation" @@ -239,7 +240,8 @@ data:extend( icon_size = 128, prerequisites = { "ore-crushing", - "oil-processing" + "water-treatment-2", + "automation-2" }, effects = { { @@ -369,6 +371,7 @@ data:extend( icon = "__angelsrefining__/graphics/technology/geode-processing-green.png", icon_size = 256, icon_mipmaps = 2, + upgrade = true, prerequisites = { --"ore-crushing", "geode-processing-1", @@ -503,7 +506,7 @@ data:extend( icon = "__angelsrefining__/graphics/technology/thermal-extractor.png", icon_size = 128, prerequisites = { - "slag-processing-1", + --"slag-processing-1", "advanced-ore-refining-1" }, effects = { @@ -711,58 +714,14 @@ data:extend( }, { type = "technology", - name = "geode-crystallization-1", - icon = "__angelsrefining__/graphics/technology/geode-processing-cyan.png", + name = "geode-processing-3", + icon = "__angelsrefining__/graphics/technology/geode-processing-yellow.png", icon_size = 256, icon_mipmaps = 2, + upgrade = true, prerequisites = { - "geode-processing-2" - }, - effects = { - { - type = "unlock-recipe", - recipe = "angelsore7-crystallization-1" - }, - { - type = "unlock-recipe", - recipe = "angelsore7-crystallization-2" - }, - { - type = "unlock-recipe", - recipe = "angelsore7-crystallization-3" - }, - { - type = "unlock-recipe", - recipe = "angelsore7-crystallization-4" - }, - { - type = "unlock-recipe", - recipe = "angelsore7-crystallization-5" - }, - { - type = "unlock-recipe", - recipe = "angelsore7-crystallization-6" - } - }, - unit = { - count = 50, - ingredients = { - {type = "item", name = "automation-science-pack", amount = 1}, - {type = "item", name = "logistic-science-pack", amount = 1} - }, - time = 30 - }, - order = "a-a-a1" - }, - { - type = "technology", - name = "geode-crystallization-2", - icon = "__angelsrefining__/graphics/technology/geode-processing-blue.png", - icon_size = 256, - icon_mipmaps = 2, - prerequisites = { - "slag-processing-2", - "geode-crystallization-1" + "geode-processing-2", + "slag-processing-2" }, effects = { { @@ -775,15 +734,15 @@ data:extend( } }, unit = { - count = 50, + count = 75, ingredients = { {type = "item", name = "automation-science-pack", amount = 1}, {type = "item", name = "logistic-science-pack", amount = 1}, {type = "item", name = "chemical-science-pack", amount = 1} }, - time = 30 + time = 15 }, - order = "a-a-a1" + order = "c-a" }, --TIER 4 { diff --git a/angelsrefining/prototypes/technology/water-treatment-technology.lua b/angelsrefining/prototypes/technology/water-treatment-technology.lua index a0f789268..673579e72 100644 --- a/angelsrefining/prototypes/technology/water-treatment-technology.lua +++ b/angelsrefining/prototypes/technology/water-treatment-technology.lua @@ -6,7 +6,8 @@ data:extend( -- localised_name = {"technology-name.fluid-handling"}, -- localised_description = {"technology-description.fluid-handling"}, -- icon = "__base__/graphics/technology/fluid-handling.png", - -- icon_size = 128, + -- icon_size = 256, + -- icon_mipmaps = 4, -- prerequisites = { -- "automation-2" -- }, @@ -32,7 +33,7 @@ data:extend( icon = "__angelsrefining__/graphics/technology/water-treatment.png", icon_size = 128, prerequisites = { - "electronics" + mods["angelspetrochem"] and "angels-fluid-control" or "electronics" }, effects = { { @@ -72,7 +73,7 @@ data:extend( icon_size = 128, prerequisites = { "water-treatment", - "ore-floatation" + --"ore-crushing" }, effects = { { diff --git a/angelsrefining/settings-updates.lua b/angelsrefining/settings-updates.lua index 008dbe422..3a060362c 100644 --- a/angelsrefining/settings-updates.lua +++ b/angelsrefining/settings-updates.lua @@ -1,69 +1,60 @@ -local function hide_setting(setting_type, setting_name, setting_default) - if data.raw[setting_type] and data.raw[setting_type][setting_name] then - data.raw[setting_type][setting_name].hidden = true - if setting_default ~= nil then - data.raw[setting_type][setting_name].default_value = setting_default - end - end -end - if mods["bobplates"] then - hide_setting("bool-setting", "bobmods-plates-oreoverride") - hide_setting("bool-setting", "bobmods-plates-groundwater") - hide_setting("bool-setting", "bobmods-plates-vanillabarrelling") + angelsmods.settings.hide_setting("bool-setting", "bobmods-plates-oreoverride") + angelsmods.settings.hide_setting("bool-setting", "bobmods-plates-groundwater") + angelsmods.settings.hide_setting("bool-setting", "bobmods-plates-vanillabarrelling") if mods["angelspetrochem"] then - hide_setting("bool-setting", "bobmods-plates-purewater") + angelsmods.settings.hide_setting("bool-setting", "bobmods-plates-purewater") end if mods["angelsindustries"] then - hide_setting("bool-setting", "bobmods-plates-bluedeuterium") - hide_setting("bool-setting", "bobmods-plates-nuclearupdate") + angelsmods.settings.hide_setting("bool-setting", "bobmods-plates-bluedeuterium") + angelsmods.settings.hide_setting("bool-setting", "bobmods-plates-nuclearupdate") end end if mods["bobores"] then --ores - hide_setting("bool-setting", "bobmods-ores-enablebauxite") - hide_setting("bool-setting", "bobmods-ores-enablecobaltore") - hide_setting("bool-setting", "bobmods-ores-enablegemsore") - hide_setting("bool-setting", "bobmods-ores-enablegoldore") - hide_setting("bool-setting", "bobmods-ores-enableleadore") - hide_setting("bool-setting", "bobmods-ores-enablenickelore") - hide_setting("bool-setting", "bobmods-ores-enablequartz") - hide_setting("bool-setting", "bobmods-ores-enablerutile") - hide_setting("bool-setting", "bobmods-ores-enablesilverore") - hide_setting("bool-setting", "bobmods-ores-enablesulfur") - hide_setting("bool-setting", "bobmods-ores-enabletinore") - hide_setting("bool-setting", "bobmods-ores-enabletungstenore") - hide_setting("bool-setting", "bobmods-ores-enablezincore") - --hide_setting("bool-setting", "bobmods-ores-enablewaterores") - hide_setting("bool-setting", "bobmods-ores-enablethoriumore") - - hide_setting("bool-setting", "bobmods-ores-leadgivesnickel") - hide_setting("double-setting", "bobmods-ores-leadnickelratio") - hide_setting("bool-setting", "bobmods-ores-nickelgivescobalt") - hide_setting("double-setting", "bobmods-ores-nickelcobaltratio") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablebauxite") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablecobaltore") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablegemsore") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablegoldore") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enableleadore") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablenickelore") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablequartz") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablerutile") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablesilverore") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablesulfur") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enabletinore") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enabletungstenore") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablezincore") + --angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablewaterores") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablethoriumore") + + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-leadgivesnickel") + angelsmods.settings.hide_setting("double-setting", "bobmods-ores-leadnickelratio") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-nickelgivescobalt") + angelsmods.settings.hide_setting("double-setting", "bobmods-ores-nickelcobaltratio") --gems - hide_setting("bool-setting", "bobmods-ores-unsortedgemore") - hide_setting("double-setting", "bobmods-gems-rubyratio") - hide_setting("double-setting", "bobmods-gems-sapphireratio") - hide_setting("double-setting", "bobmods-gems-emeraldratio") - hide_setting("double-setting", "bobmods-gems-amethystratio") - hide_setting("double-setting", "bobmods-gems-topazratio") - hide_setting("double-setting", "bobmods-gems-diamondratio") - - hide_setting("bool-setting", "bobmods-ores-gemsfromotherores") - hide_setting("double-setting", "bobmods-ores-gemprobability") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-unsortedgemore") + angelsmods.settings.hide_setting("double-setting", "bobmods-gems-rubyratio") + angelsmods.settings.hide_setting("double-setting", "bobmods-gems-sapphireratio") + angelsmods.settings.hide_setting("double-setting", "bobmods-gems-emeraldratio") + angelsmods.settings.hide_setting("double-setting", "bobmods-gems-amethystratio") + angelsmods.settings.hide_setting("double-setting", "bobmods-gems-topazratio") + angelsmods.settings.hide_setting("double-setting", "bobmods-gems-diamondratio") + + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-gemsfromotherores") + angelsmods.settings.hide_setting("double-setting", "bobmods-ores-gemprobability") end if mods["bobassembly"] then - hide_setting("bool-setting", "bobmods-assembly-limits", false) + angelsmods.settings.hide_setting("bool-setting", "bobmods-assembly-limits", false) end if mods["boblogistics"] then if mods["angelsindustries"] then - hide_setting("bool-setting", "bobmods-logistics-inserterrequireprevious") + angelsmods.settings.hide_setting("bool-setting", "bobmods-logistics-inserterrequireprevious") end end \ No newline at end of file diff --git a/angelsrefining/settings.lua b/angelsrefining/settings.lua index c1f97ae6a..cf55bf2cb 100644 --- a/angelsrefining/settings.lua +++ b/angelsrefining/settings.lua @@ -1,3 +1,5 @@ +require "prototypes.angels-settings" + data:extend( { { diff --git a/angelssmelting/changelog.txt b/angelssmelting/changelog.txt index 4cda0cc3b..374decee3 100644 --- a/angelssmelting/changelog.txt +++ b/angelssmelting/changelog.txt @@ -1,4 +1,32 @@ --------------------------------------------------------------------------------------------------- +Version: 0.6.15 +Date: ?? + Changes: + - Split smelting technologies in two parts: (498) + - Smelting to ingots, faster tech progress to allow additional mid-tier improvements + - Casting to usable products (plates, wires, rods), similar tech progress as before + - Added new graphics to + - technology, + - processed metals, pellets, powder, + - ingots, molted metals, + - metal rolls and metal wire coils. + - Tweaked some technology tree prerequisites as cleanup (428) + - Disabled some ore to plate smelting recipes to enforce angels metallurgy smelting (456, 329) + - Updated electronics to not rely on steel processing if bobs is installed (550) + - Changed and expanded locale strings and text descriptions (489) + - Removed angels iron rod (in favour of the vanilla iron stick) (484,485) + Bugfixes: + - Fixed rod stack converting recipes could not use producitivity modules + - Fixed bronze and brass smelting missed some prerequisites (551) +--------------------------------------------------------------------------------------------------- +Version: 0.6.14 +Date: 26.11.2020 + Changes: + - Updated to factorio version 1.1 + - Kirazy's rework of lighting for smelting structures (465) + Bugfixes: + - Technology icon size updates +--------------------------------------------------------------------------------------------------- Version: 0.6.13 Date: 16.11.2020 Changes: diff --git a/angelssmelting/data-final-fixes.lua b/angelssmelting/data-final-fixes.lua index 8e960e87f..f158dc437 100644 --- a/angelssmelting/data-final-fixes.lua +++ b/angelssmelting/data-final-fixes.lua @@ -1,4 +1,4 @@ ---require("prototypes.smelting-override-global") +require("prototypes.smelting-override-global") -- EXECUTE OVERRIDES angelsmods.functions.OV.execute() diff --git a/angelssmelting/data.lua b/angelssmelting/data.lua index ef721206f..efa3524ea 100644 --- a/angelssmelting/data.lua +++ b/angelssmelting/data.lua @@ -1,7 +1,7 @@ --INITIALIZE angelsmods = angelsmods or {} angelsmods.smelting = angelsmods.smelting or {} -angelsmods.smelting.number_tint = {r = 1, g = 0.8, b = 0.0, a = 0.5} +angelsmods.smelting.number_tint = {r = 1, g = 0.8, b = 0.0, a = 1} --TRIGGER CHECKS angelsmods.trigger = angelsmods.trigger or {} @@ -119,7 +119,8 @@ require("prototypes.buildings.cooling-tower") require("prototypes.buildings.clay-bricks") require("prototypes.buildings.concrete-bricks") -require("prototypes.items.angels-alloys") +require("prototypes.items.angels-alloy-solder") +require("prototypes.items.angels-alloy-steel") require("prototypes.items.angels-aluminium") require("prototypes.items.angels-chrome") require("prototypes.items.angels-cobalt") @@ -141,7 +142,8 @@ require("prototypes.items.angels-titanium") require("prototypes.items.angels-tungsten") require("prototypes.items.angels-zinc") -require("prototypes.recipes.smelting-alloys") +require("prototypes.recipes.smelting-alloy-solder") +require("prototypes.recipes.smelting-alloy-steel") require("prototypes.recipes.smelting-aluminium") require("prototypes.recipes.smelting-chrome") require("prototypes.recipes.smelting-cobalt") diff --git a/angelssmelting/graphics/entity/blast-furnace/blast-furnace-glow.png b/angelssmelting/graphics/entity/blast-furnace/blast-furnace-glow.png new file mode 100644 index 000000000..691c42d78 Binary files /dev/null and b/angelssmelting/graphics/entity/blast-furnace/blast-furnace-glow.png differ diff --git a/angelssmelting/graphics/entity/blast-furnace/blast-furnace-working-light.png b/angelssmelting/graphics/entity/blast-furnace/blast-furnace-working-light.png index 9db38f681..31b903e5c 100644 Binary files a/angelssmelting/graphics/entity/blast-furnace/blast-furnace-working-light.png and b/angelssmelting/graphics/entity/blast-furnace/blast-furnace-working-light.png differ diff --git a/angelssmelting/graphics/entity/blast-furnace/hr-blast-furnace-working-light.png b/angelssmelting/graphics/entity/blast-furnace/hr-blast-furnace-working-light.png index 613732c48..9ffe0f587 100644 Binary files a/angelssmelting/graphics/entity/blast-furnace/hr-blast-furnace-working-light.png and b/angelssmelting/graphics/entity/blast-furnace/hr-blast-furnace-working-light.png differ diff --git a/angelssmelting/graphics/entity/casting-machine/casting-machine-light.png b/angelssmelting/graphics/entity/casting-machine/casting-machine-light.png index 486b6fd23..47fc3cbef 100644 Binary files a/angelssmelting/graphics/entity/casting-machine/casting-machine-light.png and b/angelssmelting/graphics/entity/casting-machine/casting-machine-light.png differ diff --git a/angelssmelting/graphics/entity/casting-machine/hr-casting-machine-light.png b/angelssmelting/graphics/entity/casting-machine/hr-casting-machine-light.png index e1b264c27..5365af7f8 100644 Binary files a/angelssmelting/graphics/entity/casting-machine/hr-casting-machine-light.png and b/angelssmelting/graphics/entity/casting-machine/hr-casting-machine-light.png differ diff --git a/angelssmelting/graphics/entity/chemical-furnace/chemical-furnace-light.png b/angelssmelting/graphics/entity/chemical-furnace/chemical-furnace-light.png index a0276e871..f007f9226 100644 Binary files a/angelssmelting/graphics/entity/chemical-furnace/chemical-furnace-light.png and b/angelssmelting/graphics/entity/chemical-furnace/chemical-furnace-light.png differ diff --git a/angelssmelting/graphics/entity/chemical-furnace/hr-chemical-furnace-light_01.png b/angelssmelting/graphics/entity/chemical-furnace/hr-chemical-furnace-light_01.png index 3e679b3ff..b0fceb104 100644 Binary files a/angelssmelting/graphics/entity/chemical-furnace/hr-chemical-furnace-light_01.png and b/angelssmelting/graphics/entity/chemical-furnace/hr-chemical-furnace-light_01.png differ diff --git a/angelssmelting/graphics/entity/chemical-furnace/hr-chemical-furnace-light_02.png b/angelssmelting/graphics/entity/chemical-furnace/hr-chemical-furnace-light_02.png index c8aecf572..02ba5feda 100644 Binary files a/angelssmelting/graphics/entity/chemical-furnace/hr-chemical-furnace-light_02.png and b/angelssmelting/graphics/entity/chemical-furnace/hr-chemical-furnace-light_02.png differ diff --git a/angelssmelting/graphics/entity/induction-furnace/hr-induction-furnace-working-lights_01.png b/angelssmelting/graphics/entity/induction-furnace/hr-induction-furnace-working-lights_01.png index 7e93eb7d5..7fcf2a891 100644 Binary files a/angelssmelting/graphics/entity/induction-furnace/hr-induction-furnace-working-lights_01.png and b/angelssmelting/graphics/entity/induction-furnace/hr-induction-furnace-working-lights_01.png differ diff --git a/angelssmelting/graphics/entity/induction-furnace/hr-induction-furnace-working-lights_02.png b/angelssmelting/graphics/entity/induction-furnace/hr-induction-furnace-working-lights_02.png index f66c5906a..1a5d3be50 100644 Binary files a/angelssmelting/graphics/entity/induction-furnace/hr-induction-furnace-working-lights_02.png and b/angelssmelting/graphics/entity/induction-furnace/hr-induction-furnace-working-lights_02.png differ diff --git a/angelssmelting/graphics/entity/induction-furnace/induction-furnace-working-lights.png b/angelssmelting/graphics/entity/induction-furnace/induction-furnace-working-lights.png index 9959f9459..9b642e2e7 100644 Binary files a/angelssmelting/graphics/entity/induction-furnace/induction-furnace-working-lights.png and b/angelssmelting/graphics/entity/induction-furnace/induction-furnace-working-lights.png differ diff --git a/angelssmelting/graphics/entity/sintering-oven/hr-sintering-oven-glow.png b/angelssmelting/graphics/entity/sintering-oven/hr-sintering-oven-glow.png index 7f1298437..3a6fdcafe 100644 Binary files a/angelssmelting/graphics/entity/sintering-oven/hr-sintering-oven-glow.png and b/angelssmelting/graphics/entity/sintering-oven/hr-sintering-oven-glow.png differ diff --git a/angelssmelting/graphics/entity/sintering-oven/hr-sintering-oven-light.png b/angelssmelting/graphics/entity/sintering-oven/hr-sintering-oven-light.png index dbd8e94f6..613be5450 100644 Binary files a/angelssmelting/graphics/entity/sintering-oven/hr-sintering-oven-light.png and b/angelssmelting/graphics/entity/sintering-oven/hr-sintering-oven-light.png differ diff --git a/angelssmelting/graphics/entity/sintering-oven/sintering-oven-glow.png b/angelssmelting/graphics/entity/sintering-oven/sintering-oven-glow.png index ba9d67013..f4a4b5bc7 100644 Binary files a/angelssmelting/graphics/entity/sintering-oven/sintering-oven-glow.png and b/angelssmelting/graphics/entity/sintering-oven/sintering-oven-glow.png differ diff --git a/angelssmelting/graphics/entity/sintering-oven/sintering-oven-light.png b/angelssmelting/graphics/entity/sintering-oven/sintering-oven-light.png index f82eea65c..c5050bca6 100644 Binary files a/angelssmelting/graphics/entity/sintering-oven/sintering-oven-light.png and b/angelssmelting/graphics/entity/sintering-oven/sintering-oven-light.png differ diff --git a/angelssmelting/graphics/entity/strand-casting-machine/hr-strand-casting-machine-light.png b/angelssmelting/graphics/entity/strand-casting-machine/hr-strand-casting-machine-light.png index 8fb7997a7..8ed286eae 100644 Binary files a/angelssmelting/graphics/entity/strand-casting-machine/hr-strand-casting-machine-light.png and b/angelssmelting/graphics/entity/strand-casting-machine/hr-strand-casting-machine-light.png differ diff --git a/angelssmelting/graphics/entity/strand-casting-machine/strand-casting-machine-light.png b/angelssmelting/graphics/entity/strand-casting-machine/strand-casting-machine-light.png index 768bbbe4b..9885146c8 100644 Binary files a/angelssmelting/graphics/entity/strand-casting-machine/strand-casting-machine-light.png and b/angelssmelting/graphics/entity/strand-casting-machine/strand-casting-machine-light.png differ diff --git a/angelssmelting/graphics/icons/gas-silane.png b/angelssmelting/graphics/icons/gas-silane.png deleted file mode 100644 index 63b4603fd..000000000 Binary files a/angelssmelting/graphics/icons/gas-silane.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/gas-tungsten-hexafluoride.png b/angelssmelting/graphics/icons/gas-tungsten-hexafluoride.png deleted file mode 100644 index 82a594c16..000000000 Binary files a/angelssmelting/graphics/icons/gas-tungsten-hexafluoride.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/ingot-aluminium.png b/angelssmelting/graphics/icons/ingot-aluminium.png index 5d4d8f4d2..e6a1b166c 100644 Binary files a/angelssmelting/graphics/icons/ingot-aluminium.png and b/angelssmelting/graphics/icons/ingot-aluminium.png differ diff --git a/angelssmelting/graphics/icons/ingot-chrome.png b/angelssmelting/graphics/icons/ingot-chrome.png index 2fd31075a..aa93014e8 100644 Binary files a/angelssmelting/graphics/icons/ingot-chrome.png and b/angelssmelting/graphics/icons/ingot-chrome.png differ diff --git a/angelssmelting/graphics/icons/ingot-cobalt.png b/angelssmelting/graphics/icons/ingot-cobalt.png index 2fc8a118c..9d90ec614 100644 Binary files a/angelssmelting/graphics/icons/ingot-cobalt.png and b/angelssmelting/graphics/icons/ingot-cobalt.png differ diff --git a/angelssmelting/graphics/icons/ingot-copper.png b/angelssmelting/graphics/icons/ingot-copper.png index 661cbab7f..3d9f083e8 100644 Binary files a/angelssmelting/graphics/icons/ingot-copper.png and b/angelssmelting/graphics/icons/ingot-copper.png differ diff --git a/angelssmelting/graphics/icons/ingot-gold.png b/angelssmelting/graphics/icons/ingot-gold.png index 475d5bb82..9a18156a6 100644 Binary files a/angelssmelting/graphics/icons/ingot-gold.png and b/angelssmelting/graphics/icons/ingot-gold.png differ diff --git a/angelssmelting/graphics/icons/ingot-iron.png b/angelssmelting/graphics/icons/ingot-iron.png index 2e70ebe2b..1222ced7b 100644 Binary files a/angelssmelting/graphics/icons/ingot-iron.png and b/angelssmelting/graphics/icons/ingot-iron.png differ diff --git a/angelssmelting/graphics/icons/ingot-lead.png b/angelssmelting/graphics/icons/ingot-lead.png index a7d3d695b..ad1197185 100644 Binary files a/angelssmelting/graphics/icons/ingot-lead.png and b/angelssmelting/graphics/icons/ingot-lead.png differ diff --git a/angelssmelting/graphics/icons/ingot-manganese.png b/angelssmelting/graphics/icons/ingot-manganese.png index 6ba84333d..0a62d0410 100644 Binary files a/angelssmelting/graphics/icons/ingot-manganese.png and b/angelssmelting/graphics/icons/ingot-manganese.png differ diff --git a/angelssmelting/graphics/icons/ingot-nickel.png b/angelssmelting/graphics/icons/ingot-nickel.png index 45006ed31..84cd12526 100644 Binary files a/angelssmelting/graphics/icons/ingot-nickel.png and b/angelssmelting/graphics/icons/ingot-nickel.png differ diff --git a/angelssmelting/graphics/icons/ingot-platinum.png b/angelssmelting/graphics/icons/ingot-platinum.png index e5c5174be..8de237359 100644 Binary files a/angelssmelting/graphics/icons/ingot-platinum.png and b/angelssmelting/graphics/icons/ingot-platinum.png differ diff --git a/angelssmelting/graphics/icons/ingot-silicon.png b/angelssmelting/graphics/icons/ingot-silicon.png index 38562d619..6444995a7 100644 Binary files a/angelssmelting/graphics/icons/ingot-silicon.png and b/angelssmelting/graphics/icons/ingot-silicon.png differ diff --git a/angelssmelting/graphics/icons/ingot-silver.png b/angelssmelting/graphics/icons/ingot-silver.png index c4222c3e8..b9fb2a635 100644 Binary files a/angelssmelting/graphics/icons/ingot-silver.png and b/angelssmelting/graphics/icons/ingot-silver.png differ diff --git a/angelssmelting/graphics/icons/ingot-steel.png b/angelssmelting/graphics/icons/ingot-steel.png index deab00dd9..341f5dc3f 100644 Binary files a/angelssmelting/graphics/icons/ingot-steel.png and b/angelssmelting/graphics/icons/ingot-steel.png differ diff --git a/angelssmelting/graphics/icons/ingot-tin.png b/angelssmelting/graphics/icons/ingot-tin.png index ab9d98d3d..e10a74ff8 100644 Binary files a/angelssmelting/graphics/icons/ingot-tin.png and b/angelssmelting/graphics/icons/ingot-tin.png differ diff --git a/angelssmelting/graphics/icons/ingot-titanium.png b/angelssmelting/graphics/icons/ingot-titanium.png index 569738c90..49943767d 100644 Binary files a/angelssmelting/graphics/icons/ingot-titanium.png and b/angelssmelting/graphics/icons/ingot-titanium.png differ diff --git a/angelssmelting/graphics/icons/ingot-tungsten.png b/angelssmelting/graphics/icons/ingot-tungsten.png deleted file mode 100644 index cef9959b7..000000000 Binary files a/angelssmelting/graphics/icons/ingot-tungsten.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/ingot-unobtainium.png b/angelssmelting/graphics/icons/ingot-unobtainium.png deleted file mode 100644 index b1abc7957..000000000 Binary files a/angelssmelting/graphics/icons/ingot-unobtainium.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/ingot-zinc.png b/angelssmelting/graphics/icons/ingot-zinc.png index aac086a9a..7a8f7a358 100644 Binary files a/angelssmelting/graphics/icons/ingot-zinc.png and b/angelssmelting/graphics/icons/ingot-zinc.png differ diff --git a/angelssmelting/graphics/icons/liquid-chlorauric-acid.png b/angelssmelting/graphics/icons/liquid-chlorauric-acid.png deleted file mode 100644 index 3e1ad2ebb..000000000 Binary files a/angelssmelting/graphics/icons/liquid-chlorauric-acid.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/liquid-hexachloroplatinic-acid.png b/angelssmelting/graphics/icons/liquid-hexachloroplatinic-acid.png deleted file mode 100644 index a3e737af0..000000000 Binary files a/angelssmelting/graphics/icons/liquid-hexachloroplatinic-acid.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/liquid-hexafluorosilicic-acid.png b/angelssmelting/graphics/icons/liquid-hexafluorosilicic-acid.png deleted file mode 100644 index 13fba0716..000000000 Binary files a/angelssmelting/graphics/icons/liquid-hexafluorosilicic-acid.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/liquid-titanium-tetrachloride.png b/angelssmelting/graphics/icons/liquid-titanium-tetrachloride.png deleted file mode 100644 index a6505c167..000000000 Binary files a/angelssmelting/graphics/icons/liquid-titanium-tetrachloride.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/liquid-trichlorosilane.png b/angelssmelting/graphics/icons/liquid-trichlorosilane.png deleted file mode 100644 index 2dea4d532..000000000 Binary files a/angelssmelting/graphics/icons/liquid-trichlorosilane.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/liquid-tungstic-acid.png b/angelssmelting/graphics/icons/liquid-tungstic-acid.png deleted file mode 100644 index 557c8603a..000000000 Binary files a/angelssmelting/graphics/icons/liquid-tungstic-acid.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/molten-aluminium.png b/angelssmelting/graphics/icons/molten-aluminium.png index 1105d8634..310ffadbd 100644 Binary files a/angelssmelting/graphics/icons/molten-aluminium.png and b/angelssmelting/graphics/icons/molten-aluminium.png differ diff --git a/angelssmelting/graphics/icons/molten-brass.png b/angelssmelting/graphics/icons/molten-brass.png index 3562a750d..ffd1ff28a 100644 Binary files a/angelssmelting/graphics/icons/molten-brass.png and b/angelssmelting/graphics/icons/molten-brass.png differ diff --git a/angelssmelting/graphics/icons/molten-bronze.png b/angelssmelting/graphics/icons/molten-bronze.png index 5a218467d..f927af0f9 100644 Binary files a/angelssmelting/graphics/icons/molten-bronze.png and b/angelssmelting/graphics/icons/molten-bronze.png differ diff --git a/angelssmelting/graphics/icons/molten-chrome-tungsten-steel.png b/angelssmelting/graphics/icons/molten-chrome-tungsten-steel.png deleted file mode 100644 index 8a016fcee..000000000 Binary files a/angelssmelting/graphics/icons/molten-chrome-tungsten-steel.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/molten-chrome.png b/angelssmelting/graphics/icons/molten-chrome.png index d5fe55581..c51a276c0 100644 Binary files a/angelssmelting/graphics/icons/molten-chrome.png and b/angelssmelting/graphics/icons/molten-chrome.png differ diff --git a/angelssmelting/graphics/icons/molten-cobalt-nickel-steel.png b/angelssmelting/graphics/icons/molten-cobalt-nickel-steel.png deleted file mode 100644 index ba866f51a..000000000 Binary files a/angelssmelting/graphics/icons/molten-cobalt-nickel-steel.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/molten-cobalt-steel.png b/angelssmelting/graphics/icons/molten-cobalt-steel.png index 44807c540..6ae2720cc 100644 Binary files a/angelssmelting/graphics/icons/molten-cobalt-steel.png and b/angelssmelting/graphics/icons/molten-cobalt-steel.png differ diff --git a/angelssmelting/graphics/icons/molten-cobalt.png b/angelssmelting/graphics/icons/molten-cobalt.png index 8ccd5281b..eb2045885 100644 Binary files a/angelssmelting/graphics/icons/molten-cobalt.png and b/angelssmelting/graphics/icons/molten-cobalt.png differ diff --git a/angelssmelting/graphics/icons/molten-concrete.png b/angelssmelting/graphics/icons/molten-concrete.png index 7676f3903..c80e2960d 100644 Binary files a/angelssmelting/graphics/icons/molten-concrete.png and b/angelssmelting/graphics/icons/molten-concrete.png differ diff --git a/angelssmelting/graphics/icons/molten-copper.png b/angelssmelting/graphics/icons/molten-copper.png index e71934ae8..d6e5218ce 100644 Binary files a/angelssmelting/graphics/icons/molten-copper.png and b/angelssmelting/graphics/icons/molten-copper.png differ diff --git a/angelssmelting/graphics/icons/molten-electrum.png b/angelssmelting/graphics/icons/molten-electrum.png deleted file mode 100644 index 932d8ed5a..000000000 Binary files a/angelssmelting/graphics/icons/molten-electrum.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/molten-glass.png b/angelssmelting/graphics/icons/molten-glass.png index 1fa14599d..9df551feb 100644 Binary files a/angelssmelting/graphics/icons/molten-glass.png and b/angelssmelting/graphics/icons/molten-glass.png differ diff --git a/angelssmelting/graphics/icons/molten-gold.png b/angelssmelting/graphics/icons/molten-gold.png index 0aba5c1b7..ec578c8e8 100644 Binary files a/angelssmelting/graphics/icons/molten-gold.png and b/angelssmelting/graphics/icons/molten-gold.png differ diff --git a/angelssmelting/graphics/icons/molten-gunmetal.png b/angelssmelting/graphics/icons/molten-gunmetal.png index 2ef8ff7aa..4aa45f52f 100644 Binary files a/angelssmelting/graphics/icons/molten-gunmetal.png and b/angelssmelting/graphics/icons/molten-gunmetal.png differ diff --git a/angelssmelting/graphics/icons/molten-invar.png b/angelssmelting/graphics/icons/molten-invar.png index d71f6a911..62d796f54 100644 Binary files a/angelssmelting/graphics/icons/molten-invar.png and b/angelssmelting/graphics/icons/molten-invar.png differ diff --git a/angelssmelting/graphics/icons/molten-iron.png b/angelssmelting/graphics/icons/molten-iron.png index d87434b6b..381285634 100644 Binary files a/angelssmelting/graphics/icons/molten-iron.png and b/angelssmelting/graphics/icons/molten-iron.png differ diff --git a/angelssmelting/graphics/icons/molten-lead.png b/angelssmelting/graphics/icons/molten-lead.png index cd2e34a41..4764fecb1 100644 Binary files a/angelssmelting/graphics/icons/molten-lead.png and b/angelssmelting/graphics/icons/molten-lead.png differ diff --git a/angelssmelting/graphics/icons/molten-manganese-steel.png b/angelssmelting/graphics/icons/molten-manganese-steel.png deleted file mode 100644 index 493a63ab3..000000000 Binary files a/angelssmelting/graphics/icons/molten-manganese-steel.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/molten-manganese.png b/angelssmelting/graphics/icons/molten-manganese.png index 4fe83b321..75e1c6d5a 100644 Binary files a/angelssmelting/graphics/icons/molten-manganese.png and b/angelssmelting/graphics/icons/molten-manganese.png differ diff --git a/angelssmelting/graphics/icons/molten-nickel.png b/angelssmelting/graphics/icons/molten-nickel.png index 9e9d6d670..39c7f271c 100644 Binary files a/angelssmelting/graphics/icons/molten-nickel.png and b/angelssmelting/graphics/icons/molten-nickel.png differ diff --git a/angelssmelting/graphics/icons/molten-nitinol.png b/angelssmelting/graphics/icons/molten-nitinol.png index 37685d88a..3bc7b1412 100644 Binary files a/angelssmelting/graphics/icons/molten-nitinol.png and b/angelssmelting/graphics/icons/molten-nitinol.png differ diff --git a/angelssmelting/graphics/icons/molten-platinum.png b/angelssmelting/graphics/icons/molten-platinum.png index dafa3a5c9..ea2e23105 100644 Binary files a/angelssmelting/graphics/icons/molten-platinum.png and b/angelssmelting/graphics/icons/molten-platinum.png differ diff --git a/angelssmelting/graphics/icons/molten-silicon-steel.png b/angelssmelting/graphics/icons/molten-silicon-steel.png deleted file mode 100644 index 88fc9a656..000000000 Binary files a/angelssmelting/graphics/icons/molten-silicon-steel.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/molten-silicon.png b/angelssmelting/graphics/icons/molten-silicon.png index 19a235ca5..09df7ad1d 100644 Binary files a/angelssmelting/graphics/icons/molten-silicon.png and b/angelssmelting/graphics/icons/molten-silicon.png differ diff --git a/angelssmelting/graphics/icons/molten-silver.png b/angelssmelting/graphics/icons/molten-silver.png index 4c5afa320..848cd3ad7 100644 Binary files a/angelssmelting/graphics/icons/molten-silver.png and b/angelssmelting/graphics/icons/molten-silver.png differ diff --git a/angelssmelting/graphics/icons/molten-solder-1.png b/angelssmelting/graphics/icons/molten-solder-1.png deleted file mode 100644 index 189e1fef6..000000000 Binary files a/angelssmelting/graphics/icons/molten-solder-1.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/molten-solder-2.png b/angelssmelting/graphics/icons/molten-solder-2.png deleted file mode 100644 index 8c04a38dd..000000000 Binary files a/angelssmelting/graphics/icons/molten-solder-2.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/molten-solder-3.png b/angelssmelting/graphics/icons/molten-solder-3.png deleted file mode 100644 index 140e271df..000000000 Binary files a/angelssmelting/graphics/icons/molten-solder-3.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/molten-solder.png b/angelssmelting/graphics/icons/molten-solder.png index 1e2e3fb64..c4edd9919 100644 Binary files a/angelssmelting/graphics/icons/molten-solder.png and b/angelssmelting/graphics/icons/molten-solder.png differ diff --git a/angelssmelting/graphics/icons/molten-steel.png b/angelssmelting/graphics/icons/molten-steel.png index b86e05663..3a29cc75e 100644 Binary files a/angelssmelting/graphics/icons/molten-steel.png and b/angelssmelting/graphics/icons/molten-steel.png differ diff --git a/angelssmelting/graphics/icons/molten-tin.png b/angelssmelting/graphics/icons/molten-tin.png index d6c549e34..93ebd2c7d 100644 Binary files a/angelssmelting/graphics/icons/molten-tin.png and b/angelssmelting/graphics/icons/molten-tin.png differ diff --git a/angelssmelting/graphics/icons/molten-titanium.png b/angelssmelting/graphics/icons/molten-titanium.png index ffe30c49e..2858d2ab1 100644 Binary files a/angelssmelting/graphics/icons/molten-titanium.png and b/angelssmelting/graphics/icons/molten-titanium.png differ diff --git a/angelssmelting/graphics/icons/molten-tungsten.png b/angelssmelting/graphics/icons/molten-tungsten.png deleted file mode 100644 index 477e3453b..000000000 Binary files a/angelssmelting/graphics/icons/molten-tungsten.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/molten-zinc.png b/angelssmelting/graphics/icons/molten-zinc.png index 8a284a6ab..2262ed571 100644 Binary files a/angelssmelting/graphics/icons/molten-zinc.png and b/angelssmelting/graphics/icons/molten-zinc.png differ diff --git a/angelssmelting/graphics/icons/pellet-aluminium.png b/angelssmelting/graphics/icons/pellet-aluminium.png index eb08796db..5902b2231 100644 Binary files a/angelssmelting/graphics/icons/pellet-aluminium.png and b/angelssmelting/graphics/icons/pellet-aluminium.png differ diff --git a/angelssmelting/graphics/icons/pellet-chrome.png b/angelssmelting/graphics/icons/pellet-chrome.png index fbcba0212..d62b5d1d2 100644 Binary files a/angelssmelting/graphics/icons/pellet-chrome.png and b/angelssmelting/graphics/icons/pellet-chrome.png differ diff --git a/angelssmelting/graphics/icons/pellet-cobalt.png b/angelssmelting/graphics/icons/pellet-cobalt.png index ecdda9668..1bad25ae5 100644 Binary files a/angelssmelting/graphics/icons/pellet-cobalt.png and b/angelssmelting/graphics/icons/pellet-cobalt.png differ diff --git a/angelssmelting/graphics/icons/pellet-copper.png b/angelssmelting/graphics/icons/pellet-copper.png index e5cfa0d0f..88c47d2fa 100644 Binary files a/angelssmelting/graphics/icons/pellet-copper.png and b/angelssmelting/graphics/icons/pellet-copper.png differ diff --git a/angelssmelting/graphics/icons/pellet-gold.png b/angelssmelting/graphics/icons/pellet-gold.png index ce4163fd2..813e997f3 100644 Binary files a/angelssmelting/graphics/icons/pellet-gold.png and b/angelssmelting/graphics/icons/pellet-gold.png differ diff --git a/angelssmelting/graphics/icons/pellet-iron.png b/angelssmelting/graphics/icons/pellet-iron.png index c85696cf1..76fe82b2e 100644 Binary files a/angelssmelting/graphics/icons/pellet-iron.png and b/angelssmelting/graphics/icons/pellet-iron.png differ diff --git a/angelssmelting/graphics/icons/pellet-lead.png b/angelssmelting/graphics/icons/pellet-lead.png index 29451026c..cea25c2a7 100644 Binary files a/angelssmelting/graphics/icons/pellet-lead.png and b/angelssmelting/graphics/icons/pellet-lead.png differ diff --git a/angelssmelting/graphics/icons/pellet-manganese.png b/angelssmelting/graphics/icons/pellet-manganese.png index aea656e6d..9067bdc56 100644 Binary files a/angelssmelting/graphics/icons/pellet-manganese.png and b/angelssmelting/graphics/icons/pellet-manganese.png differ diff --git a/angelssmelting/graphics/icons/pellet-nickel.png b/angelssmelting/graphics/icons/pellet-nickel.png index 393799813..81b2ce48f 100644 Binary files a/angelssmelting/graphics/icons/pellet-nickel.png and b/angelssmelting/graphics/icons/pellet-nickel.png differ diff --git a/angelssmelting/graphics/icons/pellet-platinum.png b/angelssmelting/graphics/icons/pellet-platinum.png index 803f62ea4..957a56064 100644 Binary files a/angelssmelting/graphics/icons/pellet-platinum.png and b/angelssmelting/graphics/icons/pellet-platinum.png differ diff --git a/angelssmelting/graphics/icons/pellet-silica.png b/angelssmelting/graphics/icons/pellet-silica.png index 078acafe3..2da5746f5 100644 Binary files a/angelssmelting/graphics/icons/pellet-silica.png and b/angelssmelting/graphics/icons/pellet-silica.png differ diff --git a/angelssmelting/graphics/icons/pellet-silver.png b/angelssmelting/graphics/icons/pellet-silver.png index f41796a81..82be1b52a 100644 Binary files a/angelssmelting/graphics/icons/pellet-silver.png and b/angelssmelting/graphics/icons/pellet-silver.png differ diff --git a/angelssmelting/graphics/icons/pellet-tin.png b/angelssmelting/graphics/icons/pellet-tin.png index 7a277e77d..2545358b4 100644 Binary files a/angelssmelting/graphics/icons/pellet-tin.png and b/angelssmelting/graphics/icons/pellet-tin.png differ diff --git a/angelssmelting/graphics/icons/pellet-titanium.png b/angelssmelting/graphics/icons/pellet-titanium.png index 12c5b22d3..8b75bc855 100644 Binary files a/angelssmelting/graphics/icons/pellet-titanium.png and b/angelssmelting/graphics/icons/pellet-titanium.png differ diff --git a/angelssmelting/graphics/icons/pellet-tungsten.png b/angelssmelting/graphics/icons/pellet-tungsten.png index 954eeabbb..9723930ae 100644 Binary files a/angelssmelting/graphics/icons/pellet-tungsten.png and b/angelssmelting/graphics/icons/pellet-tungsten.png differ diff --git a/angelssmelting/graphics/icons/pellet-zinc.png b/angelssmelting/graphics/icons/pellet-zinc.png index acb8a46fe..7fa58cb33 100644 Binary files a/angelssmelting/graphics/icons/pellet-zinc.png and b/angelssmelting/graphics/icons/pellet-zinc.png differ diff --git a/angelssmelting/graphics/icons/plate-electrum.png b/angelssmelting/graphics/icons/plate-electrum.png deleted file mode 100644 index ca8782bd2..000000000 Binary files a/angelssmelting/graphics/icons/plate-electrum.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/powder-aluminium.png b/angelssmelting/graphics/icons/powder-aluminium.png index 7aa35aafb..1d52075ec 100644 Binary files a/angelssmelting/graphics/icons/powder-aluminium.png and b/angelssmelting/graphics/icons/powder-aluminium.png differ diff --git a/angelssmelting/graphics/icons/powder-chrome.png b/angelssmelting/graphics/icons/powder-chrome.png index 2e7f32db6..1a869d766 100644 Binary files a/angelssmelting/graphics/icons/powder-chrome.png and b/angelssmelting/graphics/icons/powder-chrome.png differ diff --git a/angelssmelting/graphics/icons/powder-cobalt.png b/angelssmelting/graphics/icons/powder-cobalt.png index 53d810fdc..5e58c9354 100644 Binary files a/angelssmelting/graphics/icons/powder-cobalt.png and b/angelssmelting/graphics/icons/powder-cobalt.png differ diff --git a/angelssmelting/graphics/icons/powder-copper.png b/angelssmelting/graphics/icons/powder-copper.png index 71037ba51..48aaee252 100644 Binary files a/angelssmelting/graphics/icons/powder-copper.png and b/angelssmelting/graphics/icons/powder-copper.png differ diff --git a/angelssmelting/graphics/icons/powder-gold.png b/angelssmelting/graphics/icons/powder-gold.png index a45754fc1..a62d704ae 100644 Binary files a/angelssmelting/graphics/icons/powder-gold.png and b/angelssmelting/graphics/icons/powder-gold.png differ diff --git a/angelssmelting/graphics/icons/powder-iron.png b/angelssmelting/graphics/icons/powder-iron.png index 2a28ab86f..ab1f4c327 100644 Binary files a/angelssmelting/graphics/icons/powder-iron.png and b/angelssmelting/graphics/icons/powder-iron.png differ diff --git a/angelssmelting/graphics/icons/powder-lead.png b/angelssmelting/graphics/icons/powder-lead.png index 78bf6f962..16893a504 100644 Binary files a/angelssmelting/graphics/icons/powder-lead.png and b/angelssmelting/graphics/icons/powder-lead.png differ diff --git a/angelssmelting/graphics/icons/powder-manganese.png b/angelssmelting/graphics/icons/powder-manganese.png index e42a29d00..6a047d8ab 100644 Binary files a/angelssmelting/graphics/icons/powder-manganese.png and b/angelssmelting/graphics/icons/powder-manganese.png differ diff --git a/angelssmelting/graphics/icons/powder-nickel.png b/angelssmelting/graphics/icons/powder-nickel.png index f67730b17..b89a49216 100644 Binary files a/angelssmelting/graphics/icons/powder-nickel.png and b/angelssmelting/graphics/icons/powder-nickel.png differ diff --git a/angelssmelting/graphics/icons/powder-platinum.png b/angelssmelting/graphics/icons/powder-platinum.png index b09c18d5f..d3d8ae738 100644 Binary files a/angelssmelting/graphics/icons/powder-platinum.png and b/angelssmelting/graphics/icons/powder-platinum.png differ diff --git a/angelssmelting/graphics/icons/powder-silica.png b/angelssmelting/graphics/icons/powder-silica.png index afc77b95c..97270d832 100644 Binary files a/angelssmelting/graphics/icons/powder-silica.png and b/angelssmelting/graphics/icons/powder-silica.png differ diff --git a/angelssmelting/graphics/icons/powder-silver.png b/angelssmelting/graphics/icons/powder-silver.png index fd6f2d613..7530d54af 100644 Binary files a/angelssmelting/graphics/icons/powder-silver.png and b/angelssmelting/graphics/icons/powder-silver.png differ diff --git a/angelssmelting/graphics/icons/powder-steel.png b/angelssmelting/graphics/icons/powder-steel.png index 2b1485e94..0df066d6c 100644 Binary files a/angelssmelting/graphics/icons/powder-steel.png and b/angelssmelting/graphics/icons/powder-steel.png differ diff --git a/angelssmelting/graphics/icons/powder-tin.png b/angelssmelting/graphics/icons/powder-tin.png index db8156aa2..be6d4120e 100644 Binary files a/angelssmelting/graphics/icons/powder-tin.png and b/angelssmelting/graphics/icons/powder-tin.png differ diff --git a/angelssmelting/graphics/icons/powder-titanium.png b/angelssmelting/graphics/icons/powder-titanium.png index 8dc3c45ce..1477a4195 100644 Binary files a/angelssmelting/graphics/icons/powder-titanium.png and b/angelssmelting/graphics/icons/powder-titanium.png differ diff --git a/angelssmelting/graphics/icons/powder-tungsten-mixture.png b/angelssmelting/graphics/icons/powder-tungsten-mixture.png index 2339b889e..733738fd0 100644 Binary files a/angelssmelting/graphics/icons/powder-tungsten-mixture.png and b/angelssmelting/graphics/icons/powder-tungsten-mixture.png differ diff --git a/angelssmelting/graphics/icons/powder-tungsten.png b/angelssmelting/graphics/icons/powder-tungsten.png index c55c2b509..5c4a6e0a9 100644 Binary files a/angelssmelting/graphics/icons/powder-tungsten.png and b/angelssmelting/graphics/icons/powder-tungsten.png differ diff --git a/angelssmelting/graphics/icons/powder-zinc.png b/angelssmelting/graphics/icons/powder-zinc.png index a1c9291a7..0e0eb2c94 100644 Binary files a/angelssmelting/graphics/icons/powder-zinc.png and b/angelssmelting/graphics/icons/powder-zinc.png differ diff --git a/angelssmelting/graphics/icons/processed-aluminium.png b/angelssmelting/graphics/icons/processed-aluminium.png index 793bc9bc5..ad8e64e40 100644 Binary files a/angelssmelting/graphics/icons/processed-aluminium.png and b/angelssmelting/graphics/icons/processed-aluminium.png differ diff --git a/angelssmelting/graphics/icons/processed-chrome.png b/angelssmelting/graphics/icons/processed-chrome.png index 154a7fd21..4ea0d26e3 100644 Binary files a/angelssmelting/graphics/icons/processed-chrome.png and b/angelssmelting/graphics/icons/processed-chrome.png differ diff --git a/angelssmelting/graphics/icons/processed-cobalt.png b/angelssmelting/graphics/icons/processed-cobalt.png index bb0ccb24f..1dde36aab 100644 Binary files a/angelssmelting/graphics/icons/processed-cobalt.png and b/angelssmelting/graphics/icons/processed-cobalt.png differ diff --git a/angelssmelting/graphics/icons/processed-copper.png b/angelssmelting/graphics/icons/processed-copper.png index c409e02bf..431dec1d7 100644 Binary files a/angelssmelting/graphics/icons/processed-copper.png and b/angelssmelting/graphics/icons/processed-copper.png differ diff --git a/angelssmelting/graphics/icons/processed-gold.png b/angelssmelting/graphics/icons/processed-gold.png index 53713b35f..555de8037 100644 Binary files a/angelssmelting/graphics/icons/processed-gold.png and b/angelssmelting/graphics/icons/processed-gold.png differ diff --git a/angelssmelting/graphics/icons/processed-iron.png b/angelssmelting/graphics/icons/processed-iron.png index 02d01784b..b65c4a4a0 100644 Binary files a/angelssmelting/graphics/icons/processed-iron.png and b/angelssmelting/graphics/icons/processed-iron.png differ diff --git a/angelssmelting/graphics/icons/processed-lead.png b/angelssmelting/graphics/icons/processed-lead.png index 4645f1b44..128a7efb5 100644 Binary files a/angelssmelting/graphics/icons/processed-lead.png and b/angelssmelting/graphics/icons/processed-lead.png differ diff --git a/angelssmelting/graphics/icons/processed-manganese.png b/angelssmelting/graphics/icons/processed-manganese.png index 7386bb56b..9d13d73a6 100644 Binary files a/angelssmelting/graphics/icons/processed-manganese.png and b/angelssmelting/graphics/icons/processed-manganese.png differ diff --git a/angelssmelting/graphics/icons/processed-nickel.png b/angelssmelting/graphics/icons/processed-nickel.png index 5498fc502..86a247121 100644 Binary files a/angelssmelting/graphics/icons/processed-nickel.png and b/angelssmelting/graphics/icons/processed-nickel.png differ diff --git a/angelssmelting/graphics/icons/processed-platinum.png b/angelssmelting/graphics/icons/processed-platinum.png index fd3e8f243..32eb0d1f2 100644 Binary files a/angelssmelting/graphics/icons/processed-platinum.png and b/angelssmelting/graphics/icons/processed-platinum.png differ diff --git a/angelssmelting/graphics/icons/processed-silica.png b/angelssmelting/graphics/icons/processed-silica.png index cbc62b8aa..c14a04c3e 100644 Binary files a/angelssmelting/graphics/icons/processed-silica.png and b/angelssmelting/graphics/icons/processed-silica.png differ diff --git a/angelssmelting/graphics/icons/processed-silver.png b/angelssmelting/graphics/icons/processed-silver.png index 24e9ccc0b..34a50431a 100644 Binary files a/angelssmelting/graphics/icons/processed-silver.png and b/angelssmelting/graphics/icons/processed-silver.png differ diff --git a/angelssmelting/graphics/icons/processed-tin.png b/angelssmelting/graphics/icons/processed-tin.png index 5eab3c082..39e06d1b8 100644 Binary files a/angelssmelting/graphics/icons/processed-tin.png and b/angelssmelting/graphics/icons/processed-tin.png differ diff --git a/angelssmelting/graphics/icons/processed-titanium.png b/angelssmelting/graphics/icons/processed-titanium.png index 5a959afbe..385bd0e66 100644 Binary files a/angelssmelting/graphics/icons/processed-titanium.png and b/angelssmelting/graphics/icons/processed-titanium.png differ diff --git a/angelssmelting/graphics/icons/processed-tungsten.png b/angelssmelting/graphics/icons/processed-tungsten.png index 1c3fcb8fd..1ba0668d1 100644 Binary files a/angelssmelting/graphics/icons/processed-tungsten.png and b/angelssmelting/graphics/icons/processed-tungsten.png differ diff --git a/angelssmelting/graphics/icons/processed-zinc.png b/angelssmelting/graphics/icons/processed-zinc.png index bc407bee3..c1e1dd5ad 100644 Binary files a/angelssmelting/graphics/icons/processed-zinc.png and b/angelssmelting/graphics/icons/processed-zinc.png differ diff --git a/angelssmelting/graphics/icons/roll-aluminium.png b/angelssmelting/graphics/icons/roll-aluminium.png index d7b9faefe..b1cf7425f 100644 Binary files a/angelssmelting/graphics/icons/roll-aluminium.png and b/angelssmelting/graphics/icons/roll-aluminium.png differ diff --git a/angelssmelting/graphics/icons/roll-chrome.png b/angelssmelting/graphics/icons/roll-chrome.png index 7c80022cb..96d67b098 100644 Binary files a/angelssmelting/graphics/icons/roll-chrome.png and b/angelssmelting/graphics/icons/roll-chrome.png differ diff --git a/angelssmelting/graphics/icons/roll-cobalt.png b/angelssmelting/graphics/icons/roll-cobalt.png index 930aa2a5b..9da4b5005 100644 Binary files a/angelssmelting/graphics/icons/roll-cobalt.png and b/angelssmelting/graphics/icons/roll-cobalt.png differ diff --git a/angelssmelting/graphics/icons/roll-copper.png b/angelssmelting/graphics/icons/roll-copper.png index b919a0b11..860d80679 100644 Binary files a/angelssmelting/graphics/icons/roll-copper.png and b/angelssmelting/graphics/icons/roll-copper.png differ diff --git a/angelssmelting/graphics/icons/roll-gold.png b/angelssmelting/graphics/icons/roll-gold.png index 6b86cf834..20e56a956 100644 Binary files a/angelssmelting/graphics/icons/roll-gold.png and b/angelssmelting/graphics/icons/roll-gold.png differ diff --git a/angelssmelting/graphics/icons/roll-iron.png b/angelssmelting/graphics/icons/roll-iron.png index 256423247..883679a03 100644 Binary files a/angelssmelting/graphics/icons/roll-iron.png and b/angelssmelting/graphics/icons/roll-iron.png differ diff --git a/angelssmelting/graphics/icons/roll-lead.png b/angelssmelting/graphics/icons/roll-lead.png index 389f0ef86..891259ec7 100644 Binary files a/angelssmelting/graphics/icons/roll-lead.png and b/angelssmelting/graphics/icons/roll-lead.png differ diff --git a/angelssmelting/graphics/icons/roll-manganese.png b/angelssmelting/graphics/icons/roll-manganese.png index 4140d3862..434353af1 100644 Binary files a/angelssmelting/graphics/icons/roll-manganese.png and b/angelssmelting/graphics/icons/roll-manganese.png differ diff --git a/angelssmelting/graphics/icons/roll-nickel.png b/angelssmelting/graphics/icons/roll-nickel.png index fe889d588..f6700b25d 100644 Binary files a/angelssmelting/graphics/icons/roll-nickel.png and b/angelssmelting/graphics/icons/roll-nickel.png differ diff --git a/angelssmelting/graphics/icons/roll-platinum.png b/angelssmelting/graphics/icons/roll-platinum.png index aed5aa12e..9ecba7634 100644 Binary files a/angelssmelting/graphics/icons/roll-platinum.png and b/angelssmelting/graphics/icons/roll-platinum.png differ diff --git a/angelssmelting/graphics/icons/roll-silicon.png b/angelssmelting/graphics/icons/roll-silicon.png deleted file mode 100644 index 77e98a33d..000000000 Binary files a/angelssmelting/graphics/icons/roll-silicon.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/roll-silver.png b/angelssmelting/graphics/icons/roll-silver.png index e77e16bed..d58e32da1 100644 Binary files a/angelssmelting/graphics/icons/roll-silver.png and b/angelssmelting/graphics/icons/roll-silver.png differ diff --git a/angelssmelting/graphics/icons/roll-steel.png b/angelssmelting/graphics/icons/roll-steel.png index 2d935b3f4..d0b9d0f5b 100644 Binary files a/angelssmelting/graphics/icons/roll-steel.png and b/angelssmelting/graphics/icons/roll-steel.png differ diff --git a/angelssmelting/graphics/icons/roll-tin.png b/angelssmelting/graphics/icons/roll-tin.png index e4db41b29..fd7ae11a3 100644 Binary files a/angelssmelting/graphics/icons/roll-tin.png and b/angelssmelting/graphics/icons/roll-tin.png differ diff --git a/angelssmelting/graphics/icons/roll-titanium.png b/angelssmelting/graphics/icons/roll-titanium.png index 03391d25e..257590d61 100644 Binary files a/angelssmelting/graphics/icons/roll-titanium.png and b/angelssmelting/graphics/icons/roll-titanium.png differ diff --git a/angelssmelting/graphics/icons/roll-tungsten.png b/angelssmelting/graphics/icons/roll-tungsten.png deleted file mode 100644 index 50c114c6c..000000000 Binary files a/angelssmelting/graphics/icons/roll-tungsten.png and /dev/null differ diff --git a/angelssmelting/graphics/icons/roll-zinc.png b/angelssmelting/graphics/icons/roll-zinc.png index 792d83b4a..065d46f80 100644 Binary files a/angelssmelting/graphics/icons/roll-zinc.png and b/angelssmelting/graphics/icons/roll-zinc.png differ diff --git a/angelssmelting/graphics/icons/wire-coil-copper.png b/angelssmelting/graphics/icons/wire-coil-copper.png index c922a1e53..ac173da0e 100644 Binary files a/angelssmelting/graphics/icons/wire-coil-copper.png and b/angelssmelting/graphics/icons/wire-coil-copper.png differ diff --git a/angelssmelting/graphics/icons/wire-coil-glass.png b/angelssmelting/graphics/icons/wire-coil-glass.png index 14f9de113..a83bc28da 100644 Binary files a/angelssmelting/graphics/icons/wire-coil-glass.png and b/angelssmelting/graphics/icons/wire-coil-glass.png differ diff --git a/angelssmelting/graphics/icons/wire-coil-gold.png b/angelssmelting/graphics/icons/wire-coil-gold.png index 28ac1b888..8abbcc0ee 100644 Binary files a/angelssmelting/graphics/icons/wire-coil-gold.png and b/angelssmelting/graphics/icons/wire-coil-gold.png differ diff --git a/angelssmelting/graphics/icons/wire-coil-platinum.png b/angelssmelting/graphics/icons/wire-coil-platinum.png index 8a9e067c7..933c99787 100644 Binary files a/angelssmelting/graphics/icons/wire-coil-platinum.png and b/angelssmelting/graphics/icons/wire-coil-platinum.png differ diff --git a/angelssmelting/graphics/icons/wire-coil-silver.png b/angelssmelting/graphics/icons/wire-coil-silver.png index 3c5addeb3..cf77ba760 100644 Binary files a/angelssmelting/graphics/icons/wire-coil-silver.png and b/angelssmelting/graphics/icons/wire-coil-silver.png differ diff --git a/angelssmelting/graphics/icons/wire-coil-tin.png b/angelssmelting/graphics/icons/wire-coil-tin.png index 1fc135f68..92ad44ec7 100644 Binary files a/angelssmelting/graphics/icons/wire-coil-tin.png and b/angelssmelting/graphics/icons/wire-coil-tin.png differ diff --git a/angelssmelting/graphics/technology/casting-aluminium-tech.png b/angelssmelting/graphics/technology/casting-aluminium-tech.png new file mode 100644 index 000000000..dd6a5f8c3 Binary files /dev/null and b/angelssmelting/graphics/technology/casting-aluminium-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-brass-tech.png b/angelssmelting/graphics/technology/casting-brass-tech.png new file mode 100644 index 000000000..f81085d2b Binary files /dev/null and b/angelssmelting/graphics/technology/casting-brass-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-bronze-tech.png b/angelssmelting/graphics/technology/casting-bronze-tech.png new file mode 100644 index 000000000..2184bfd1b Binary files /dev/null and b/angelssmelting/graphics/technology/casting-bronze-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-chrome-tech.png b/angelssmelting/graphics/technology/casting-chrome-tech.png new file mode 100644 index 000000000..95bbda353 Binary files /dev/null and b/angelssmelting/graphics/technology/casting-chrome-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-cobalt-steel-tech.png b/angelssmelting/graphics/technology/casting-cobalt-steel-tech.png new file mode 100644 index 000000000..4905ccef1 Binary files /dev/null and b/angelssmelting/graphics/technology/casting-cobalt-steel-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-cobalt-tech.png b/angelssmelting/graphics/technology/casting-cobalt-tech.png new file mode 100644 index 000000000..66de5b895 Binary files /dev/null and b/angelssmelting/graphics/technology/casting-cobalt-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-copper-tech.png b/angelssmelting/graphics/technology/casting-copper-tech.png new file mode 100644 index 000000000..a3b3d9ce2 Binary files /dev/null and b/angelssmelting/graphics/technology/casting-copper-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-gold-tech.png b/angelssmelting/graphics/technology/casting-gold-tech.png new file mode 100644 index 000000000..c792d2598 Binary files /dev/null and b/angelssmelting/graphics/technology/casting-gold-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-gunmetal-tech.png b/angelssmelting/graphics/technology/casting-gunmetal-tech.png new file mode 100644 index 000000000..d1fc77417 Binary files /dev/null and b/angelssmelting/graphics/technology/casting-gunmetal-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-invar-tech.png b/angelssmelting/graphics/technology/casting-invar-tech.png new file mode 100644 index 000000000..763bb163f Binary files /dev/null and b/angelssmelting/graphics/technology/casting-invar-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-iron-tech.png b/angelssmelting/graphics/technology/casting-iron-tech.png new file mode 100644 index 000000000..8de6e8fab Binary files /dev/null and b/angelssmelting/graphics/technology/casting-iron-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-lead-tech.png b/angelssmelting/graphics/technology/casting-lead-tech.png new file mode 100644 index 000000000..039c303dd Binary files /dev/null and b/angelssmelting/graphics/technology/casting-lead-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-manganese-tech.png b/angelssmelting/graphics/technology/casting-manganese-tech.png new file mode 100644 index 000000000..6fa442b0e Binary files /dev/null and b/angelssmelting/graphics/technology/casting-manganese-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-nickel-tech.png b/angelssmelting/graphics/technology/casting-nickel-tech.png new file mode 100644 index 000000000..bf9295400 Binary files /dev/null and b/angelssmelting/graphics/technology/casting-nickel-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-nitinol-tech.png b/angelssmelting/graphics/technology/casting-nitinol-tech.png new file mode 100644 index 000000000..2a30b02d0 Binary files /dev/null and b/angelssmelting/graphics/technology/casting-nitinol-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-platinum-tech.png b/angelssmelting/graphics/technology/casting-platinum-tech.png new file mode 100644 index 000000000..673bc433c Binary files /dev/null and b/angelssmelting/graphics/technology/casting-platinum-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-silicon-tech.png b/angelssmelting/graphics/technology/casting-silicon-tech.png new file mode 100644 index 000000000..db3df78a0 Binary files /dev/null and b/angelssmelting/graphics/technology/casting-silicon-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-silver-tech.png b/angelssmelting/graphics/technology/casting-silver-tech.png new file mode 100644 index 000000000..7443bb1c2 Binary files /dev/null and b/angelssmelting/graphics/technology/casting-silver-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-solder-tech.png b/angelssmelting/graphics/technology/casting-solder-tech.png new file mode 100644 index 000000000..24d906ef1 Binary files /dev/null and b/angelssmelting/graphics/technology/casting-solder-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-steel-tech.png b/angelssmelting/graphics/technology/casting-steel-tech.png new file mode 100644 index 000000000..f65b8b67a Binary files /dev/null and b/angelssmelting/graphics/technology/casting-steel-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-tin-tech.png b/angelssmelting/graphics/technology/casting-tin-tech.png new file mode 100644 index 000000000..54c81a953 Binary files /dev/null and b/angelssmelting/graphics/technology/casting-tin-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-titanium-tech.png b/angelssmelting/graphics/technology/casting-titanium-tech.png new file mode 100644 index 000000000..f229d91d3 Binary files /dev/null and b/angelssmelting/graphics/technology/casting-titanium-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-tungsten-tech.png b/angelssmelting/graphics/technology/casting-tungsten-tech.png new file mode 100644 index 000000000..5be66a6ad Binary files /dev/null and b/angelssmelting/graphics/technology/casting-tungsten-tech.png differ diff --git a/angelssmelting/graphics/technology/casting-zinc-tech.png b/angelssmelting/graphics/technology/casting-zinc-tech.png new file mode 100644 index 000000000..ba6ae44fc Binary files /dev/null and b/angelssmelting/graphics/technology/casting-zinc-tech.png differ diff --git a/angelssmelting/graphics/technology/glass-tech.png b/angelssmelting/graphics/technology/glass-tech.png index 7f6d15835..a8169089f 100644 Binary files a/angelssmelting/graphics/technology/glass-tech.png and b/angelssmelting/graphics/technology/glass-tech.png differ diff --git a/angelssmelting/graphics/technology/glass-tech2.png b/angelssmelting/graphics/technology/glass-tech2.png deleted file mode 100644 index 5fad20311..000000000 Binary files a/angelssmelting/graphics/technology/glass-tech2.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-aluminium-tech.png b/angelssmelting/graphics/technology/smelting-aluminium-tech.png new file mode 100644 index 000000000..baef02ea1 Binary files /dev/null and b/angelssmelting/graphics/technology/smelting-aluminium-tech.png differ diff --git a/angelssmelting/graphics/technology/smelting-aluminium.png b/angelssmelting/graphics/technology/smelting-aluminium.png deleted file mode 100644 index 6295ee51c..000000000 Binary files a/angelssmelting/graphics/technology/smelting-aluminium.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-brass.png b/angelssmelting/graphics/technology/smelting-brass.png deleted file mode 100644 index d12f1a780..000000000 Binary files a/angelssmelting/graphics/technology/smelting-brass.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-bronze.png b/angelssmelting/graphics/technology/smelting-bronze.png deleted file mode 100644 index 5d597ca5a..000000000 Binary files a/angelssmelting/graphics/technology/smelting-bronze.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-chrome-tech.png b/angelssmelting/graphics/technology/smelting-chrome-tech.png new file mode 100644 index 000000000..915514d70 Binary files /dev/null and b/angelssmelting/graphics/technology/smelting-chrome-tech.png differ diff --git a/angelssmelting/graphics/technology/smelting-chrome.png b/angelssmelting/graphics/technology/smelting-chrome.png deleted file mode 100644 index b26739dc6..000000000 Binary files a/angelssmelting/graphics/technology/smelting-chrome.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-cobalt-steel.png b/angelssmelting/graphics/technology/smelting-cobalt-steel.png deleted file mode 100644 index 1e734a607..000000000 Binary files a/angelssmelting/graphics/technology/smelting-cobalt-steel.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-cobalt-tech.png b/angelssmelting/graphics/technology/smelting-cobalt-tech.png new file mode 100644 index 000000000..8bfa16728 Binary files /dev/null and b/angelssmelting/graphics/technology/smelting-cobalt-tech.png differ diff --git a/angelssmelting/graphics/technology/smelting-cobalt.png b/angelssmelting/graphics/technology/smelting-cobalt.png deleted file mode 100644 index 5db6c5bfb..000000000 Binary files a/angelssmelting/graphics/technology/smelting-cobalt.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-copper-tech.png b/angelssmelting/graphics/technology/smelting-copper-tech.png new file mode 100644 index 000000000..0a3fff17b Binary files /dev/null and b/angelssmelting/graphics/technology/smelting-copper-tech.png differ diff --git a/angelssmelting/graphics/technology/smelting-copper.png b/angelssmelting/graphics/technology/smelting-copper.png deleted file mode 100644 index a03d0a9ca..000000000 Binary files a/angelssmelting/graphics/technology/smelting-copper.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-electrum.png b/angelssmelting/graphics/technology/smelting-electrum.png deleted file mode 100644 index 364eb57f0..000000000 Binary files a/angelssmelting/graphics/technology/smelting-electrum.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-gold-tech.png b/angelssmelting/graphics/technology/smelting-gold-tech.png new file mode 100644 index 000000000..31dea063c Binary files /dev/null and b/angelssmelting/graphics/technology/smelting-gold-tech.png differ diff --git a/angelssmelting/graphics/technology/smelting-gold.png b/angelssmelting/graphics/technology/smelting-gold.png deleted file mode 100644 index f49f69d50..000000000 Binary files a/angelssmelting/graphics/technology/smelting-gold.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-gunmetal.png b/angelssmelting/graphics/technology/smelting-gunmetal.png deleted file mode 100644 index 1204b65df..000000000 Binary files a/angelssmelting/graphics/technology/smelting-gunmetal.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-invar.png b/angelssmelting/graphics/technology/smelting-invar.png deleted file mode 100644 index 3c648a611..000000000 Binary files a/angelssmelting/graphics/technology/smelting-invar.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-iron-tech.png b/angelssmelting/graphics/technology/smelting-iron-tech.png new file mode 100644 index 000000000..72c5359fe Binary files /dev/null and b/angelssmelting/graphics/technology/smelting-iron-tech.png differ diff --git a/angelssmelting/graphics/technology/smelting-iron.png b/angelssmelting/graphics/technology/smelting-iron.png deleted file mode 100644 index d47c5b718..000000000 Binary files a/angelssmelting/graphics/technology/smelting-iron.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-lead-tech.png b/angelssmelting/graphics/technology/smelting-lead-tech.png new file mode 100644 index 000000000..dc7daa929 Binary files /dev/null and b/angelssmelting/graphics/technology/smelting-lead-tech.png differ diff --git a/angelssmelting/graphics/technology/smelting-lead.png b/angelssmelting/graphics/technology/smelting-lead.png deleted file mode 100644 index 84b171d9d..000000000 Binary files a/angelssmelting/graphics/technology/smelting-lead.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-manganese-tech.png b/angelssmelting/graphics/technology/smelting-manganese-tech.png new file mode 100644 index 000000000..c90af78f9 Binary files /dev/null and b/angelssmelting/graphics/technology/smelting-manganese-tech.png differ diff --git a/angelssmelting/graphics/technology/smelting-manganese.png b/angelssmelting/graphics/technology/smelting-manganese.png deleted file mode 100644 index e98ef5967..000000000 Binary files a/angelssmelting/graphics/technology/smelting-manganese.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-nickel-tech.png b/angelssmelting/graphics/technology/smelting-nickel-tech.png new file mode 100644 index 000000000..b727289e4 Binary files /dev/null and b/angelssmelting/graphics/technology/smelting-nickel-tech.png differ diff --git a/angelssmelting/graphics/technology/smelting-nickel.png b/angelssmelting/graphics/technology/smelting-nickel.png deleted file mode 100644 index 4e7dda713..000000000 Binary files a/angelssmelting/graphics/technology/smelting-nickel.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-nitinol.png b/angelssmelting/graphics/technology/smelting-nitinol.png deleted file mode 100644 index 3d79d0db0..000000000 Binary files a/angelssmelting/graphics/technology/smelting-nitinol.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-platinum-tech.png b/angelssmelting/graphics/technology/smelting-platinum-tech.png new file mode 100644 index 000000000..e15f5dfef Binary files /dev/null and b/angelssmelting/graphics/technology/smelting-platinum-tech.png differ diff --git a/angelssmelting/graphics/technology/smelting-platinum.png b/angelssmelting/graphics/technology/smelting-platinum.png deleted file mode 100644 index 507c46993..000000000 Binary files a/angelssmelting/graphics/technology/smelting-platinum.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-silicon-tech.png b/angelssmelting/graphics/technology/smelting-silicon-tech.png new file mode 100644 index 000000000..d65a3e5ac Binary files /dev/null and b/angelssmelting/graphics/technology/smelting-silicon-tech.png differ diff --git a/angelssmelting/graphics/technology/smelting-silicon.png b/angelssmelting/graphics/technology/smelting-silicon.png deleted file mode 100644 index 348dcbec6..000000000 Binary files a/angelssmelting/graphics/technology/smelting-silicon.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-silver-tech.png b/angelssmelting/graphics/technology/smelting-silver-tech.png new file mode 100644 index 000000000..d0c0ab5bc Binary files /dev/null and b/angelssmelting/graphics/technology/smelting-silver-tech.png differ diff --git a/angelssmelting/graphics/technology/smelting-silver.png b/angelssmelting/graphics/technology/smelting-silver.png deleted file mode 100644 index d987bfec7..000000000 Binary files a/angelssmelting/graphics/technology/smelting-silver.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-solder.png b/angelssmelting/graphics/technology/smelting-solder.png deleted file mode 100644 index e0dbb16eb..000000000 Binary files a/angelssmelting/graphics/technology/smelting-solder.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-steel.png b/angelssmelting/graphics/technology/smelting-steel.png deleted file mode 100644 index 5b4493601..000000000 Binary files a/angelssmelting/graphics/technology/smelting-steel.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-tin-tech.png b/angelssmelting/graphics/technology/smelting-tin-tech.png new file mode 100644 index 000000000..bd81185b6 Binary files /dev/null and b/angelssmelting/graphics/technology/smelting-tin-tech.png differ diff --git a/angelssmelting/graphics/technology/smelting-tin.png b/angelssmelting/graphics/technology/smelting-tin.png deleted file mode 100644 index a5c4acd6c..000000000 Binary files a/angelssmelting/graphics/technology/smelting-tin.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-titanium-tech.png b/angelssmelting/graphics/technology/smelting-titanium-tech.png new file mode 100644 index 000000000..f20530832 Binary files /dev/null and b/angelssmelting/graphics/technology/smelting-titanium-tech.png differ diff --git a/angelssmelting/graphics/technology/smelting-titanium.png b/angelssmelting/graphics/technology/smelting-titanium.png deleted file mode 100644 index cd0c13db5..000000000 Binary files a/angelssmelting/graphics/technology/smelting-titanium.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-tungsten.png b/angelssmelting/graphics/technology/smelting-tungsten.png deleted file mode 100644 index 1e4393bec..000000000 Binary files a/angelssmelting/graphics/technology/smelting-tungsten.png and /dev/null differ diff --git a/angelssmelting/graphics/technology/smelting-zinc-tech.png b/angelssmelting/graphics/technology/smelting-zinc-tech.png new file mode 100644 index 000000000..788d62032 Binary files /dev/null and b/angelssmelting/graphics/technology/smelting-zinc-tech.png differ diff --git a/angelssmelting/graphics/technology/smelting-zinc.png b/angelssmelting/graphics/technology/smelting-zinc.png deleted file mode 100644 index 0fd9d1ae8..000000000 Binary files a/angelssmelting/graphics/technology/smelting-zinc.png and /dev/null differ diff --git a/angelssmelting/info.json b/angelssmelting/info.json index 270f56021..b77747b5e 100644 --- a/angelssmelting/info.json +++ b/angelssmelting/info.json @@ -1,18 +1,15 @@ { "name": "angelssmelting", - "version": "0.6.13", - "factorio_version": "1.0", + "version": "0.6.15", + "factorio_version": "1.1", "title": "Angel's Smelting", "author": "Arch666Angel", "contact": "https://discord.gg/ff5p6KE", "homepage": "https://forums.factorio.com/viewforum.php?f=185", "description": "Angel's Smelting provides alternative ways to produce plate and increase ore yield at the expense of space and energy.", "dependencies": [ - "base >= 1.0.0", - - "angelsrefining >= 0.11.18", - "angelspetrochem >= 0.9.16", - + "angelsrefining >= 0.11.20", + "angelspetrochem >= 0.9.18", "? bobplates >= 0.18.8" ] } diff --git a/angelssmelting/locale/en/smelting.cfg b/angelssmelting/locale/en/smelting.cfg index a8f281efd..58a578a32 100644 --- a/angelssmelting/locale/en/smelting.cfg +++ b/angelssmelting/locale/en/smelting.cfg @@ -100,6 +100,54 @@ strand-casting-machine-4=Strand casting machine 4 cooling-tower=Cooling tower +[entity-description] +blast-furnace=Turns pure ores into ingots. Can handle gaseous fluids. +blast-furnace-2=Turns pure ores into ingots. Can handle gaseous fluids. +blast-furnace-3=Turns pure ores into ingots. Can handle gaseous fluids. +blast-furnace-4=Turns pure ores into ingots. Can handle gaseous fluids. + +angels-chemical-furnace=Turns pure ores into ingots. Can handle liquid fluids. +angels-chemical-furnace-2=Turns pure ores into ingots. Can handle liquid fluids. +angels-chemical-furnace-3=Turns pure ores into ingots. Can handle liquid fluids. +angels-chemical-furnace-4=Turns pure ores into ingots. Can handle liquid fluids. + +powder-mixer=Prepares powdered granulates for subsequent smelting. +powder-mixer-2=Prepares powdered granulates for subsequent smelting. +powder-mixer-3=Prepares powdered granulates for subsequent smelting. +powder-mixer-4=Prepares powdered granulates for subsequent smelting. + +induction-furnace=Melts metal ingots for subsequent casting. +induction-furnace-2=Melts metal ingots for subsequent casting. +induction-furnace-3=Melts metal ingots for subsequent casting. +induction-furnace-4=Melts metal ingots for subsequent casting. + +casting-machine=Casts molten material into handy shape. +casting-machine-2=Casts molten material into handy shape. +casting-machine-3=Casts molten material into handy shape. +casting-machine-4=Casts molten material into handy shape. + +ore-processing-machine=Pre-processes ores for subsequent smelting. +ore-processing-machine-2=Pre-processes ores for subsequent smelting. +ore-processing-machine-3=Pre-processes ores for subsequent smelting. +ore-processing-machine-4=Pre-processes ores for subsequent smelting. + +pellet-press=Compresses pre-processed ores into pellets. +pellet-press-2=Compresses pre-processed ores into pellets. +pellet-press-3=Compresses pre-processed ores into pellets. +pellet-press-4=Compresses pre-processed ores into pellets. + +sintering-oven=Uses heat and pressure to fuse powder into a solid shape. +sintering-oven-2=Uses heat and pressure to fuse powder into a solid shape. +sintering-oven-3=Uses heat and pressure to fuse powder into a solid shape. +sintering-oven-4=Uses heat and pressure to fuse powder into a solid shape. + +strand-casting-machine=Rapidly cools large amounts of molten metal into machinable shape. +strand-casting-machine-2=Rapidly cools large amounts of molten metal into machinable shape. +strand-casting-machine-3=Rapidly cools large amounts of molten metal into machinable shape. +strand-casting-machine-4=Rapidly cools large amounts of molten metal into machinable shape. + +cooling-tower=Heat exchanger capable of reducing the temperature of its primary input. + [item-name] bauxite-ore=Aluminium ore processed-aluminium=Processed aluminium @@ -319,27 +367,77 @@ ore-processing=Ore processing angels-cooling=Cooling solutions angels-coolant=Coolant +angels-aluminium-metallurgy=Advanced aluminium smelting and casting 1 angels-aluminium-smelting=Advanced aluminium smelting +angels-aluminium-casting=Advanced aluminium casting + +angels-chrome-metallurgy=Advanced chrome smelting and casting 1 angels-chrome-smelting=Advanced chrome smelting +angels-chrome-casting=Advanced chrome casting + +angels-cobalt-metallurgy=Advanced cobalt smelting and casting 1 angels-cobalt-smelting=Advanced cobalt smelting +angels-cobalt-casting=Advanced cobalt casting + +angels-copper-metallurgy=Advanced copper smelting and casting 1 angels-copper-smelting=Advanced copper smelting -angels-glass-smelting=Advanced glass smelting +angels-copper-casting=Advanced copper casting + +angels-glass-smelting=Advanced glass smelting and casting + +angels-gold-metallurgy=Advanced gold smelting and casting 1 angels-gold-smelting=Advanced gold smelting +angels-gold-casting=Advanced gold casting + +angels-iron-metallurgy=Advanced iron smelting and casting 1 angels-iron-smelting=Advanced iron smelting +angels-iron-casting=Advanced iron casting + +angels-lead-metallurgy=Advanced lead smelting and casting 1 angels-lead-smelting=Advanced lead smelting +angels-lead-casting=Advanced lead casting + +angels-manganese-metallurgy=Advanced manganese smelting and casting 1 angels-manganese-smelting=Advanced manganese smelting +angels-manganese-casting=Advanced manganese casting + +angels-nickel-metallurgy=Advanced nickel smelting and casting 1 angels-nickel-smelting=Advanced nickel smelting +angels-nickel-casting=Advanced nickel casting + +angels-platinum-metallurgy=Advanced platinum smelting and casting 1 angels-platinum-smelting=Advanced platinum smelting +angels-platinum-casting=Advanced platinum casting + +angels-silicon-metallurgy=Advanced silicon smelting and casting 1 angels-silicon-smelting=Advanced silicon smelting +angels-silicon-casting=Advanced silicon casting + +angels-silver-metallurgy=Advanced silver smelting and casting 1 angels-silver-smelting=Advanced silver smelting +angels-silver-casting=Advanced silver casting + angels-stone-smelting=Cement processing + +angels-tin-metallurgy=Advanced tin smelting and casting 1 angels-tin-smelting=Advanced tin smelting +angels-tin-casting=Advanced tin casting + +angels-titanium-metallurgy=Advanced titanium smelting and casting 1 angels-titanium-smelting=Advanced titanium smelting -angels-tungsten-smelting=Advanced tungsten smelting +angels-titanium-casting=Advanced titanium casting + +angels-tungsten-smelting=Advanced tungsten smelting and casting + +angels-zinc-metallurgy=Advanced zinc smelting and casting 1 angels-zinc-smelting=Advanced zinc smelting -angels-steel-smelting=Advanced steel smelting -angels-solder-smelting-basic=Basic solder smelting -angels-solder-smelting=Advanced solder smelting +angels-zinc-casting=Advanced zinc casting + +angels-steel-smelting=Advanced steel smelting and casting +angels-steel-casting=Advanced steel casting + +angels-solder-smelting-basic=Basic solder casting +angels-solder-smelting=Advanced solder casting angels-bronze-smelting=Advanced bronze smelting angels-brass-smelting=Advanced brass smelting @@ -349,10 +447,95 @@ angels-invar-smelting=Advanced invar smelting angels-cobalt-steel-smelting=Advanced cobalt steel smelting angels-nitinol-smelting=Advanced nitinol smelting -[entity-description] - [technology-description] +angels-metallurgy=Machines for advanced metallurgical smelting. +powder-metallurgy=Machines for handling powdered ores and metals. +strand-casting=Machines for rapid cooling of molten metal for higher throughput. +ore-processing=Machines for pre-processing of ores. +angels-cooling=Heat exchangers for cooling. +angels-coolant=Specialized fluid that is optimized for accepting and transporting heat. + +angels-aluminium-metallurgy=Advanced processing steps for the production of aluminium. +angels-aluminium-smelting=Additional processing steps to reduce material loss. +angels-aluminium-casting=Additional processing steps to increase yield. + +angels-chrome-metallurgy=Advanced processing steps for the production of chrome. +angels-chrome-smelting=Additional processing steps to reduce material loss. +angels-chrome-casting=Additional processing steps to increase yield. + +angels-cobalt-metallurgy=Advanced processing steps for the production of cobalt. +angels-cobalt-smelting=Additional processing steps to reduce material loss. +angels-cobalt-casting=Additional processing steps to increase yield. + +angels-copper-metallurgy=Advanced processing steps for efficient production of copper. +angels-copper-smelting=Additional processing steps to reduce material loss. +angels-copper-casting=Additional processing steps to increase yield. + +angels-glass-smelting=Advanced processing steps for efficient production of glass. + +angels-gold-metallurgy=Advanced processing steps for the production of gold. +angels-gold-smelting=Additional processing steps to reduce material loss. +angels-gold-casting=Additional processing steps to increase yield. + +angels-iron-metallurgy=Advanced processing steps for efficient production of iron. +angels-iron-smelting=Additional processing steps to reduce material loss. +angels-iron-casting=Additional processing steps to increase yield. + +angels-lead-metallurgy=Advanced processing steps for efficient production of lead. +angels-lead-smelting=Additional processing steps to reduce material loss. +angels-lead-casting=Additional processing steps to increase yield. + +angels-manganese-metallurgy=Advanced processing steps for the production of manganese. +angels-manganese-smelting=Additional processing steps to reduce material loss. +angels-manganese-casting=Additional processing steps to increase yield. + +angels-nickel-metallurgy=Advanced processing steps for the production of nickel. +angels-nickel-smelting=Additional processing steps to reduce material loss. +angels-nickel-casting=Additional processing steps to increase yield. + +angels-platinum-metallurgy=Advanced processing steps for the production of platinum. +angels-platinum-smelting=Additional processing steps to reduce material loss. +angels-platinum-casting=Additional processing steps to increase yield. + +angels-silicon-metallurgy=Advanced processing steps for the production of silicon. +angels-silicon-smelting=Additional processing steps to reduce material loss. +angels-silicon-casting=Additional processing steps to increase yield. + +angels-silver-metallurgy=Advanced processing steps for efficient production of silver. +angels-silver-smelting=Additional processing steps to reduce material loss. +angels-silver-casting=Additional processing steps to increase yield. + +angels-stone-smelting=Bricks for advanced buildings. + +angels-tin-metallurgy=Advanced processing steps for efficient production of tin. +angels-tin-smelting=Additional processing steps to reduce material loss. +angels-tin-casting=Additional processing steps to increase yield. + +angels-titanium-metallurgy=Advanced processing steps for the production of titanium. +angels-titanium-smelting=Additional processing steps to reduce material loss. +angels-titanium-casting=Additional processing steps to increase yield. + +angels-tungsten-smelting=Advanced processing steps for the production of tungsten. + +angels-zinc-metallurgy=Advanced processing steps for the production of zinc. +angels-zinc-smelting=Additional processing steps to reduce material loss. +angels-zinc-casting=Additional processing steps to increase yield. + +angels-steel-smelting=Advanced processing steps for efficient production of steel. +angels-steel-casting=Additional processing steps to increase yield. + +angels-solder-smelting-basic=Solder is a tin alloy with very low melting temperature. +angels-solder-smelting=Advanced processing steps for efficient production of solder. + +angels-bronze-smelting=Advanced processing steps for the production of bronze. +angels-brass-smelting=Advanced processing steps for the production of brass. +angels-electrum-smelting=Advanced processing steps for the production of electrum. +angels-gunmetal-smelting=Advanced processing steps for the production of gunmetal. +angels-invar-smelting=Advanced processing steps for the production of invar. +angels-cobalt-steel-smelting=Advanced processing steps for the production of cobalt steel. +angels-nitinol-smelting=Advanced processing steps for the production of nitinol. + [tile-name] clay-bricks=Clay path concrete-brick=Concrete slab (grid) diff --git a/angelssmelting/migrations/angelssmelting_0.6.15.lua b/angelssmelting/migrations/angelssmelting_0.6.15.lua new file mode 100644 index 000000000..a1eca8974 --- /dev/null +++ b/angelssmelting/migrations/angelssmelting_0.6.15.lua @@ -0,0 +1,55 @@ +for _, force in pairs(game.forces) do + for newTech, existingTech in pairs{ + -- aluminium + ["angels-aluminium-casting-2"] = "angels-aluminium-smelting-2", + ["angels-aluminium-casting-3"] = "angels-aluminium-smelting-3", + -- chrome + ["angels-chrome-casting-2"] = "angels-chrome-smelting-2", + ["angels-chrome-casting-3"] = "angels-chrome-smelting-3", + -- cobalt + ["angels-cobalt-casting-2"] = "angels-cobalt-smelting-2", + ["angels-cobalt-casting-3"] = "angels-cobalt-smelting-3", + -- copper + ["angels-copper-casting-2"] = "angels-copper-smelting-2", + ["angels-copper-casting-3"] = "angels-copper-smelting-3", + -- gold + ["angels-gold-casting-2"] = "angels-gold-smelting-2", + ["angels-gold-casting-3"] = "angels-gold-smelting-3", + -- iron + ["angels-iron-casting-2"] = "angels-iron-smelting-2", + ["angels-iron-casting-3"] = "angels-iron-smelting-3", + -- lead + ["angels-lead-casting-2"] = "angels-lead-smelting-2", + ["angels-lead-casting-3"] = "angels-lead-smelting-3", + -- manganese + ["angels-manganese-casting-2"] = "angels-manganese-smelting-2", + ["angels-manganese-casting-3"] = "angels-manganese-smelting-3", + -- nickel + ["angels-nickel-casting-2"] = "angels-nickel-smelting-2", + ["angels-nickel-casting-3"] = "angels-nickel-smelting-3", + -- platinum + ["angels-platinum-casting-2"] = "angels-platinum-smelting-2", + ["angels-platinum-casting-3"] = "angels-platinum-smelting-3", + -- silicon + ["angels-silicon-casting-2"] = "angels-silicon-smelting-3", + -- silver + ["angels-silver-casting-2"] = "angels-silver-smelting-2", + ["angels-silver-casting-3"] = "angels-silver-smelting-3", + -- tin + ["angels-tin-casting-2"] = "angels-tin-smelting-2", + ["angels-tin-casting-3"] = "angels-tin-smelting-3", + -- titanium + ["angels-titanium-casting-2"] = "angels-titanium-smelting-2", + ["angels-titanium-casting-3"] = "angels-titanium-smelting-3", + -- zinc + ["angels-zinc-casting-2"] = "angels-zinc-smelting-2", + ["angels-zinc-casting-3"] = "angels-zinc-smelting-3", + } do + if force.technologies[newTech ] and force.technologies[newTech ].prototype.enabled and + force.technologies[existingTech] and force.technologies[existingTech].prototype.enabled + then + force.technologies[newTech].researched = force.technologies[existingTech].researched + end + end + force.reset_technology_effects() +end diff --git a/angelssmelting/prototypes/buildings/blast-furnace.lua b/angelssmelting/prototypes/buildings/blast-furnace.lua index fbc4b367d..393548f29 100644 --- a/angelssmelting/prototypes/buildings/blast-furnace.lua +++ b/angelssmelting/prototypes/buildings/blast-furnace.lua @@ -3,21 +3,15 @@ data:extend( { type = "item", name = "blast-furnace", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/blast-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/blast-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 1, angelsmods.smelting.number_tint), subgroup = "angels-blast-furnace", order = "a[blast-furnace]", place_result = "blast-furnace", @@ -26,21 +20,15 @@ data:extend( { type = "assembling-machine", name = "blast-furnace", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/blast-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/blast-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 1, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "blast-furnace"}, fast_replaceable_group = "blast-furnace", @@ -73,7 +61,9 @@ data:extend( } }, light_flicker = { - color = {0, 0, 0} + color = {0, 0, 0}, + minimum_light_size = 0, + light_intensity_to_size_coefficient = 0, } }, energy_usage = "150kW", @@ -117,11 +107,11 @@ data:extend( vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, working_visualisations = { { + fadeout = true, north_position = {0, 0}, east_position = {0, 0}, south_position = {0, 0}, west_position = {0, 0}, - light = {intensity = 1, size = 2, color = {r = 1.0, g = 1.0, b = 1.0}, shift = util.by_pixel(7, 38)}, animation = { filename = "__angelssmelting__/graphics/entity/blast-furnace/blast-furnace-fire.png", priority = "high", @@ -131,6 +121,7 @@ data:extend( frame_count = 48, animation_speed = 0.5, shift = util.by_pixel(4, 29), + draw_as_glow = true, hr_version = { filename = "__angelssmelting__/graphics/entity/blast-furnace/hr-blast-furnace-fire.png", priority = "high", @@ -140,27 +131,31 @@ data:extend( frame_count = 48, animation_speed = 0.5, shift = util.by_pixel(3, 29), + draw_as_glow = true, scale = 0.5, } } }, { + fadeout = true, north_position = {0, 0}, east_position = {0, 0}, south_position = {0, 0}, west_position = {0, 0}, effect = "flicker", animation = { - filename = "__base__/graphics/entity/steel-furnace/steel-furnace-glow.png", + filename = "__angelssmelting__/graphics/entity/blast-furnace/blast-furnace-glow.png", priority = "high", width = 60, height = 43, blend_mode = "additive", - shift = util.by_pixel(4, 37.5), + shift = util.by_pixel(5, 39), + draw_as_glow = true, scale = 0.75, } }, { + fadeout = true, north_position = {0, 0}, east_position = {0, 0}, south_position = {0, 0}, @@ -169,17 +164,19 @@ data:extend( animation = { filename = "__angelssmelting__/graphics/entity/blast-furnace/blast-furnace-working-light.png", priority = "high", - width = 17, - height = 20, + width = 164, + height = 189, blend_mode = "additive", - shift = util.by_pixel(4.5, 40), + shift = util.by_pixel(0, -14), + draw_as_glow = true, hr_version = { filename = "__angelssmelting__/graphics/entity/blast-furnace/hr-blast-furnace-working-light.png", priority = "high", - width = 34, - height = 40, + width = 328, + height = 376, blend_mode = "additive", - shift = util.by_pixel(4.5, 40), + shift = util.by_pixel(0, -13.5), + draw_as_glow = true, scale = 0.5, } } @@ -211,20 +208,15 @@ data:extend( { type = "item", name = "blast-furnace-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/blast-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/blast-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.smelting.number_tint), subgroup = "angels-blast-furnace", order = "b[blast-furnace-2]", place_result = "blast-furnace-2", @@ -233,20 +225,15 @@ data:extend( { type = "assembling-machine", name = "blast-furnace-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/blast-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/blast-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "blast-furnace-2"}, fast_replaceable_group = "blast-furnace", @@ -279,7 +266,9 @@ data:extend( } }, light_flicker = { - color = {0, 0, 0} + color = {0, 0, 0}, + minimum_light_size = 0, + light_intensity_to_size_coefficient = 0, } }, energy_usage = "200kW", @@ -323,11 +312,11 @@ data:extend( vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, working_visualisations = { { + fadeout = true, north_position = {0, 0}, east_position = {0, 0}, south_position = {0, 0}, west_position = {0, 0}, - light = {intensity = 1, size = 2, color = {r = 1.0, g = 1.0, b = 1.0}, shift = util.by_pixel(7, 38)}, animation = { filename = "__angelssmelting__/graphics/entity/blast-furnace/blast-furnace-fire.png", priority = "high", @@ -337,6 +326,7 @@ data:extend( frame_count = 48, animation_speed = 0.5, shift = util.by_pixel(4, 29), + draw_as_glow = true, hr_version = { filename = "__angelssmelting__/graphics/entity/blast-furnace/hr-blast-furnace-fire.png", priority = "high", @@ -346,27 +336,31 @@ data:extend( frame_count = 48, animation_speed = 0.5, shift = util.by_pixel(3, 29), + draw_as_glow = true, scale = 0.5, } } }, { + fadeout = true, north_position = {0, 0}, east_position = {0, 0}, south_position = {0, 0}, west_position = {0, 0}, effect = "flicker", animation = { - filename = "__base__/graphics/entity/steel-furnace/steel-furnace-glow.png", + filename = "__angelssmelting__/graphics/entity/blast-furnace/blast-furnace-glow.png", priority = "high", width = 60, height = 43, blend_mode = "additive", - shift = util.by_pixel(4, 37.5), + shift = util.by_pixel(5, 39), + draw_as_glow = true, scale = 0.75, } }, { + fadeout = true, north_position = {0, 0}, east_position = {0, 0}, south_position = {0, 0}, @@ -375,17 +369,19 @@ data:extend( animation = { filename = "__angelssmelting__/graphics/entity/blast-furnace/blast-furnace-working-light.png", priority = "high", - width = 17, - height = 20, + width = 164, + height = 189, blend_mode = "additive", - shift = util.by_pixel(4.5, 40), + shift = util.by_pixel(0, -14), + draw_as_glow = true, hr_version = { filename = "__angelssmelting__/graphics/entity/blast-furnace/hr-blast-furnace-working-light.png", priority = "high", - width = 34, - height = 40, + width = 328, + height = 376, blend_mode = "additive", - shift = util.by_pixel(4.5, 40), + shift = util.by_pixel(0, -13.5), + draw_as_glow = true, scale = 0.5, } } @@ -417,20 +413,15 @@ data:extend( { type = "item", name = "blast-furnace-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/blast-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/blast-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - icon_size = 32, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.smelting.number_tint), subgroup = "angels-blast-furnace", order = "c[blast-furnace-3]", place_result = "blast-furnace-3", @@ -439,20 +430,15 @@ data:extend( { type = "assembling-machine", name = "blast-furnace-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/blast-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/blast-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - icon_size = 32, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "blast-furnace-3"}, fast_replaceable_group = "blast-furnace", @@ -485,7 +471,9 @@ data:extend( } }, light_flicker = { - color = {0, 0, 0} + color = {0, 0, 0}, + minimum_light_size = 0, + light_intensity_to_size_coefficient = 0, } }, energy_usage = "250kW", @@ -529,11 +517,11 @@ data:extend( vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, working_visualisations = { { + fadeout = true, north_position = {0, 0}, east_position = {0, 0}, south_position = {0, 0}, west_position = {0, 0}, - light = {intensity = 1, size = 2, color = {r = 1.0, g = 1.0, b = 1.0}, shift = util.by_pixel(7, 38)}, animation = { filename = "__angelssmelting__/graphics/entity/blast-furnace/blast-furnace-fire.png", priority = "high", @@ -543,6 +531,7 @@ data:extend( frame_count = 48, animation_speed = 0.5, shift = util.by_pixel(4, 29), + draw_as_glow = true, hr_version = { filename = "__angelssmelting__/graphics/entity/blast-furnace/hr-blast-furnace-fire.png", priority = "high", @@ -552,27 +541,31 @@ data:extend( frame_count = 48, animation_speed = 0.5, shift = util.by_pixel(3, 29), + draw_as_glow = true, scale = 0.5, } } }, { + fadeout = true, north_position = {0, 0}, east_position = {0, 0}, south_position = {0, 0}, west_position = {0, 0}, effect = "flicker", animation = { - filename = "__base__/graphics/entity/steel-furnace/steel-furnace-glow.png", + filename = "__angelssmelting__/graphics/entity/blast-furnace/blast-furnace-glow.png", priority = "high", width = 60, height = 43, blend_mode = "additive", - shift = util.by_pixel(4, 37.5), + shift = util.by_pixel(5, 39), + draw_as_glow = true, scale = 0.75, } }, { + fadeout = true, north_position = {0, 0}, east_position = {0, 0}, south_position = {0, 0}, @@ -581,17 +574,19 @@ data:extend( animation = { filename = "__angelssmelting__/graphics/entity/blast-furnace/blast-furnace-working-light.png", priority = "high", - width = 17, - height = 20, + width = 164, + height = 189, blend_mode = "additive", - shift = util.by_pixel(4.5, 40), + shift = util.by_pixel(0, -14), + draw_as_glow = true, hr_version = { filename = "__angelssmelting__/graphics/entity/blast-furnace/hr-blast-furnace-working-light.png", priority = "high", - width = 34, - height = 40, + width = 328, + height = 376, blend_mode = "additive", - shift = util.by_pixel(4.5, 40), + shift = util.by_pixel(0, -13.5), + draw_as_glow = true, scale = 0.5, } } @@ -623,20 +618,15 @@ data:extend( { type = "item", name = "blast-furnace-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/blast-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/blast-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - icon_size = 32, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 4, angelsmods.smelting.number_tint), subgroup = "angels-blast-furnace", order = "d[blast-furnace-4]", place_result = "blast-furnace-4", @@ -645,20 +635,15 @@ data:extend( { type = "assembling-machine", name = "blast-furnace-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/blast-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/blast-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - icon_size = 32, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 4, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "blast-furnace-4"}, fast_replaceable_group = "blast-furnace", @@ -690,7 +675,9 @@ data:extend( } }, light_flicker = { - color = {0, 0, 0} + color = {0, 0, 0}, + minimum_light_size = 0, + light_intensity_to_size_coefficient = 0, } }, energy_usage = "300kW", @@ -734,11 +721,11 @@ data:extend( vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, working_visualisations = { { + fadeout = true, north_position = {0, 0}, east_position = {0, 0}, south_position = {0, 0}, west_position = {0, 0}, - light = {intensity = 1, size = 2, color = {r = 1.0, g = 1.0, b = 1.0}, shift = util.by_pixel(7, 38)}, animation = { filename = "__angelssmelting__/graphics/entity/blast-furnace/blast-furnace-fire.png", priority = "high", @@ -748,6 +735,7 @@ data:extend( frame_count = 48, animation_speed = 0.5, shift = util.by_pixel(4, 29), + draw_as_glow = true, hr_version = { filename = "__angelssmelting__/graphics/entity/blast-furnace/hr-blast-furnace-fire.png", priority = "high", @@ -757,27 +745,31 @@ data:extend( frame_count = 48, animation_speed = 0.5, shift = util.by_pixel(3, 29), + draw_as_glow = true, scale = 0.5, } } }, { + fadeout = true, north_position = {0, 0}, east_position = {0, 0}, south_position = {0, 0}, west_position = {0, 0}, effect = "flicker", animation = { - filename = "__base__/graphics/entity/steel-furnace/steel-furnace-glow.png", + filename = "__angelssmelting__/graphics/entity/blast-furnace/blast-furnace-glow.png", priority = "high", width = 60, height = 43, blend_mode = "additive", - shift = util.by_pixel(4, 37.5), + shift = util.by_pixel(5, 39), + draw_as_glow = true, scale = 0.75, } }, { + fadeout = true, north_position = {0, 0}, east_position = {0, 0}, south_position = {0, 0}, @@ -786,17 +778,19 @@ data:extend( animation = { filename = "__angelssmelting__/graphics/entity/blast-furnace/blast-furnace-working-light.png", priority = "high", - width = 17, - height = 20, + width = 164, + height = 189, blend_mode = "additive", - shift = util.by_pixel(4.5, 40), + shift = util.by_pixel(0, -14), + draw_as_glow = true, hr_version = { filename = "__angelssmelting__/graphics/entity/blast-furnace/hr-blast-furnace-working-light.png", priority = "high", - width = 34, - height = 40, + width = 328, + height = 376, blend_mode = "additive", - shift = util.by_pixel(4.5, 40), + shift = util.by_pixel(0, -13.5), + draw_as_glow = true, scale = 0.5, } } diff --git a/angelssmelting/prototypes/buildings/casting-machine.lua b/angelssmelting/prototypes/buildings/casting-machine.lua index 266bdc60a..db12ffba4 100644 --- a/angelssmelting/prototypes/buildings/casting-machine.lua +++ b/angelssmelting/prototypes/buildings/casting-machine.lua @@ -3,21 +3,15 @@ data:extend( { type = "item", name = "casting-machine", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/casting-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/casting-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12} - } - }, + 1, angelsmods.smelting.number_tint), subgroup = "angels-casting-machine", order = "a[casting-machine]", place_result = "casting-machine", @@ -26,21 +20,15 @@ data:extend( { type = "assembling-machine", name = "casting-machine", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/casting-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/casting-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12} - } - }, + 1, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "casting-machine"}, fast_replaceable_group = "casting-machine", @@ -145,8 +133,6 @@ data:extend( vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, working_visualisations = { { - draw_as_sprite = false, - draw_as_light = true, always_draw = true, animation = { filename = "__angelssmelting__/graphics/entity/casting-machine/casting-machine-light.png", @@ -154,12 +140,14 @@ data:extend( width = 111, height = 104, shift = util.by_pixel(1, -2), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { filename = "__angelssmelting__/graphics/entity/casting-machine/hr-casting-machine-light.png", priority = "high", width = 205, height = 244, shift = util.by_pixel(0, -2), + draw_as_light = true, scale = 0.5 } or nil } @@ -175,21 +163,15 @@ data:extend( { type = "item", name = "casting-machine-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/casting-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/casting-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.smelting.number_tint), subgroup = "angels-casting-machine", order = "b[casting-machine-2]", place_result = "casting-machine-2", @@ -198,21 +180,15 @@ data:extend( { type = "assembling-machine", name = "casting-machine-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/casting-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/casting-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "casting-machine-2"}, fast_replaceable_group = "casting-machine", @@ -317,8 +293,6 @@ data:extend( vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, working_visualisations = { { - draw_as_sprite = false, - draw_as_light = true, always_draw = true, animation = { filename = "__angelssmelting__/graphics/entity/casting-machine/casting-machine-light.png", @@ -326,12 +300,14 @@ data:extend( width = 111, height = 104, shift = util.by_pixel(1, -2), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { filename = "__angelssmelting__/graphics/entity/casting-machine/hr-casting-machine-light.png", priority = "high", width = 205, height = 244, shift = util.by_pixel(0, -2), + draw_as_light = true, scale = 0.5 } or nil } @@ -347,21 +323,15 @@ data:extend( { type = "item", name = "casting-machine-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/casting-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/casting-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.smelting.number_tint), subgroup = "angels-casting-machine", order = "c[casting-machine-3]", place_result = "casting-machine-3", @@ -370,21 +340,15 @@ data:extend( { type = "assembling-machine", name = "casting-machine-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/casting-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/casting-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "casting-machine-3"}, fast_replaceable_group = "casting-machine", @@ -489,8 +453,6 @@ data:extend( vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, working_visualisations = { { - draw_as_sprite = false, - draw_as_light = true, always_draw = true, animation = { filename = "__angelssmelting__/graphics/entity/casting-machine/casting-machine-light.png", @@ -498,12 +460,14 @@ data:extend( width = 111, height = 104, shift = util.by_pixel(1, -2), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { filename = "__angelssmelting__/graphics/entity/casting-machine/hr-casting-machine-light.png", priority = "high", width = 205, height = 244, shift = util.by_pixel(0, -2), + draw_as_light = true, scale = 0.5 } or nil } @@ -519,21 +483,15 @@ data:extend( { type = "item", name = "casting-machine-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/casting-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/casting-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12} - } - }, + 4, angelsmods.smelting.number_tint), subgroup = "angels-casting-machine", order = "d[casting-machine-4]", place_result = "casting-machine-4", @@ -542,21 +500,15 @@ data:extend( { type = "assembling-machine", name = "casting-machine-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/casting-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/casting-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12} - } - }, + 4, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "casting-machine-4"}, fast_replaceable_group = "casting-machine", @@ -660,8 +612,6 @@ data:extend( vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, working_visualisations = { { - draw_as_sprite = false, - draw_as_light = true, always_draw = true, animation = { filename = "__angelssmelting__/graphics/entity/casting-machine/casting-machine-light.png", @@ -669,12 +619,14 @@ data:extend( width = 111, height = 104, shift = util.by_pixel(1, -2), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { filename = "__angelssmelting__/graphics/entity/casting-machine/hr-casting-machine-light.png", priority = "high", width = 205, height = 244, shift = util.by_pixel(0, -2), + draw_as_light = true, scale = 0.5 } or nil } diff --git a/angelssmelting/prototypes/buildings/chemical-furnace.lua b/angelssmelting/prototypes/buildings/chemical-furnace.lua index b073f3b2b..a486702ef 100644 --- a/angelssmelting/prototypes/buildings/chemical-furnace.lua +++ b/angelssmelting/prototypes/buildings/chemical-furnace.lua @@ -3,21 +3,15 @@ data:extend( { type = "item", name = "angels-chemical-furnace", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 1, angelsmods.smelting.number_tint), subgroup = "angels-chemical-furnace", order = "a[angels-chemical-furnace]", place_result = "angels-chemical-furnace", @@ -26,21 +20,15 @@ data:extend( { type = "assembling-machine", name = "angels-chemical-furnace", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 1, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "angels-chemical-furnace"}, fast_replaceable_group = "angels-chemical-furnace", @@ -135,8 +123,6 @@ data:extend( vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, working_visualisations = { { - draw_as_sprite = false, - draw_as_light = true, always_draw = true, animation = { filename = "__angelssmelting__/graphics/entity/chemical-furnace/chemical-furnace-light.png", @@ -147,6 +133,7 @@ data:extend( frame_count = 36, animation_speed = 0.5, shift = util.by_pixel(-1, -12), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { priority = "high", width = 332, @@ -166,7 +153,8 @@ data:extend( }, animation_speed = 0.5, shift = util.by_pixel(-1, -11.5), - scale = 0.5 + draw_as_light = true, + scale = 0.5, } or nil } } @@ -210,21 +198,15 @@ data:extend( { type = "item", name = "angels-chemical-furnace-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.smelting.number_tint), subgroup = "angels-chemical-furnace", order = "b[angels-chemical-furnace-2]", place_result = "angels-chemical-furnace-2", @@ -233,21 +215,15 @@ data:extend( { type = "assembling-machine", name = "angels-chemical-furnace-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "angels-chemical-furnace-2"}, fast_replaceable_group = "angels-chemical-furnace", @@ -342,8 +318,6 @@ data:extend( vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, working_visualisations = { { - draw_as_sprite = false, - draw_as_light = true, always_draw = true, animation = { filename = "__angelssmelting__/graphics/entity/chemical-furnace/chemical-furnace-light.png", @@ -354,6 +328,7 @@ data:extend( frame_count = 36, animation_speed = 0.5, shift = util.by_pixel(-1, -12), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { priority = "high", width = 332, @@ -373,6 +348,7 @@ data:extend( }, animation_speed = 0.5, shift = util.by_pixel(-1, -11.5), + draw_as_light = true, scale = 0.5 } or nil } @@ -417,21 +393,15 @@ data:extend( { type = "item", name = "angels-chemical-furnace-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.smelting.number_tint), subgroup = "angels-chemical-furnace", order = "c[angels-chemical-furnace-3]", place_result = "angels-chemical-furnace-3", @@ -440,21 +410,15 @@ data:extend( { type = "assembling-machine", name = "angels-chemical-furnace-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "angels-chemical-furnace-3"}, fast_replaceable_group = "angels-chemical-furnace", @@ -549,8 +513,6 @@ data:extend( vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, working_visualisations = { { - draw_as_sprite = false, - draw_as_light = true, always_draw = true, animation = { filename = "__angelssmelting__/graphics/entity/chemical-furnace/chemical-furnace-light.png", @@ -561,6 +523,7 @@ data:extend( frame_count = 36, animation_speed = 0.5, shift = util.by_pixel(-1, -12), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { priority = "high", width = 332, @@ -580,6 +543,7 @@ data:extend( }, animation_speed = 0.5, shift = util.by_pixel(-1, -11.5), + draw_as_light = true, scale = 0.5 } or nil } @@ -624,21 +588,15 @@ data:extend( { type = "item", name = "angels-chemical-furnace-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 4, angelsmods.smelting.number_tint), subgroup = "angels-chemical-furnace", order = "d[angels-chemical-furnace-4]", place_result = "angels-chemical-furnace-4", @@ -647,21 +605,15 @@ data:extend( { type = "assembling-machine", name = "angels-chemical-furnace-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/chemical-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 4, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "angels-chemical-furnace-4"}, fast_replaceable_group = "angels-chemical-furnace", @@ -755,8 +707,6 @@ data:extend( vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, working_visualisations = { { - draw_as_sprite = false, - draw_as_light = true, always_draw = true, animation = { filename = "__angelssmelting__/graphics/entity/chemical-furnace/chemical-furnace-light.png", @@ -767,6 +717,7 @@ data:extend( frame_count = 36, animation_speed = 0.5, shift = util.by_pixel(-1, -12), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { priority = "high", width = 332, @@ -786,6 +737,7 @@ data:extend( }, animation_speed = 0.5, shift = util.by_pixel(-1, -11.5), + draw_as_light = true, scale = 0.5 } or nil } diff --git a/angelssmelting/prototypes/buildings/concrete-bricks.lua b/angelssmelting/prototypes/buildings/concrete-bricks.lua index 7e3561dbd..4e7b3d5f5 100644 --- a/angelssmelting/prototypes/buildings/concrete-bricks.lua +++ b/angelssmelting/prototypes/buildings/concrete-bricks.lua @@ -21,12 +21,14 @@ local concrete_brick_tile_data = data:extend( { copyGrid("concrete-brick", { - walking_speed_modifier = 1.55, + walking_speed_modifier = 1.50, decorative_removal_probability = 0.33, --0.25, + layer = 61 }), copyGrid("reinforced-concrete-brick", { walking_speed_modifier = 1.55, decorative_removal_probability = 1.00, --0.25, + layer = 64 }) } ) diff --git a/angelssmelting/prototypes/buildings/cooling-tower.lua b/angelssmelting/prototypes/buildings/cooling-tower.lua index d09096829..d9138af0d 100644 --- a/angelssmelting/prototypes/buildings/cooling-tower.lua +++ b/angelssmelting/prototypes/buildings/cooling-tower.lua @@ -89,7 +89,7 @@ data:extend( x = 0, y = 0, width = 108, - height = 108, + height = 157, frame_count = 1, shift = util.by_pixel(0, -19), scale = 1, @@ -138,7 +138,7 @@ data:extend( x = 108, y = 0, width = 108, - height = 108, + height = 157, frame_count = 1, shift = util.by_pixel(0, -19), scale = 1, @@ -187,7 +187,7 @@ data:extend( x = 216, y = 0, width = 108, - height = 108, + height = 157, frame_count = 1, shift = util.by_pixel(0, -19), scale = 1, @@ -236,7 +236,7 @@ data:extend( x = 324, y = 0, width = 108, - height = 108, + height = 157, frame_count = 1, shift = util.by_pixel(0, -19), scale = 1, diff --git a/angelssmelting/prototypes/buildings/induction-furnace.lua b/angelssmelting/prototypes/buildings/induction-furnace.lua index 40ca121f4..6ce9d8fb3 100644 --- a/angelssmelting/prototypes/buildings/induction-furnace.lua +++ b/angelssmelting/prototypes/buildings/induction-furnace.lua @@ -3,21 +3,15 @@ data:extend( { type = "item", name = "induction-furnace", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/induction-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/induction-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12}, - } - }, + 1, angelsmods.smelting.number_tint), subgroup = "angels-induction-furnace", order = "a[induction-furnace]", place_result = "induction-furnace", @@ -26,21 +20,15 @@ data:extend( { type = "assembling-machine", name = "induction-furnace", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/induction-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/induction-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12}, - } - }, + 1, angelsmods.smelting.number_tint), flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "induction-furnace"}, fast_replaceable_group = "induction-furnace", @@ -193,8 +181,6 @@ data:extend( } }, { - draw_as_sprite = false, - draw_as_light = true, always_draw = true, animation = { filename = "__angelssmelting__/graphics/entity/induction-furnace/induction-furnace-working-lights.png", @@ -205,10 +191,11 @@ data:extend( frame_count = 36, animation_speed = 0.5, shift = util.by_pixel(0.5, -5.5), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { priority = "high", width = 336, - height = 379, + height = 381, frame_count = 36, stripes = { { @@ -223,7 +210,8 @@ data:extend( }, }, animation_speed = 0.5, - shift = util.by_pixel(0, -6), + shift = util.by_pixel(0, -5), + draw_as_light = true, scale = 0.5 } or nil } @@ -244,9 +232,9 @@ data:extend( pipe_covers = pipecoverspictures(), base_level = 1, pipe_connections = {{ position = {2, -3} }} - } + }, + --off_when_no_fluid_recipe = true, }, - off_when_no_fluid_recipe = true, vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, working_sound = { @@ -259,21 +247,15 @@ data:extend( { type = "item", name = "induction-furnace-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/induction-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/induction-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12}, - } - }, + 2, angelsmods.smelting.number_tint), subgroup = "angels-induction-furnace", order = "b[induction-furnace-2]", place_result = "induction-furnace-2", @@ -282,21 +264,15 @@ data:extend( { type = "assembling-machine", name = "induction-furnace-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/induction-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/induction-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12}, - } - }, + 2, angelsmods.smelting.number_tint), flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "induction-furnace-2"}, fast_replaceable_group = "induction-furnace", @@ -449,8 +425,6 @@ data:extend( } }, { - draw_as_sprite = false, - draw_as_light = true, always_draw = true, animation = { filename = "__angelssmelting__/graphics/entity/induction-furnace/induction-furnace-working-lights.png", @@ -461,10 +435,11 @@ data:extend( frame_count = 36, animation_speed = 0.5, shift = util.by_pixel(0.5, -5.5), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { priority = "high", width = 336, - height = 379, + height = 381, frame_count = 36, stripes = { { @@ -479,7 +454,8 @@ data:extend( }, }, animation_speed = 0.5, - shift = util.by_pixel(0, -6), + shift = util.by_pixel(0, -5), + draw_as_light = true, scale = 0.5 } or nil } @@ -492,9 +468,9 @@ data:extend( pipe_covers = pipecoverspictures(), base_level = 1, pipe_connections = {{ position = {2, -3} }} - } + }, + --off_when_no_fluid_recipe = true, }, - off_when_no_fluid_recipe = true, vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, working_sound = { @@ -507,21 +483,15 @@ data:extend( { type = "item", name = "induction-furnace-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/induction-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/induction-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12}, - } - }, + 3, angelsmods.smelting.number_tint), subgroup = "angels-induction-furnace", order = "c[induction-furnace-3]", place_result = "induction-furnace-3", @@ -530,21 +500,15 @@ data:extend( { type = "assembling-machine", name = "induction-furnace-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/induction-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/induction-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12}, - } - }, + 3, angelsmods.smelting.number_tint), flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "induction-furnace-3"}, fast_replaceable_group = "induction-furnace", @@ -697,8 +661,6 @@ data:extend( } }, { - draw_as_sprite = false, - draw_as_light = true, always_draw = true, animation = { filename = "__angelssmelting__/graphics/entity/induction-furnace/induction-furnace-working-lights.png", @@ -709,10 +671,11 @@ data:extend( frame_count = 36, animation_speed = 0.5, shift = util.by_pixel(0.5, -5.5), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { priority = "high", width = 336, - height = 379, + height = 381, frame_count = 36, stripes = { { @@ -727,7 +690,8 @@ data:extend( }, }, animation_speed = 0.5, - shift = util.by_pixel(0, -6), + shift = util.by_pixel(0, -5), + draw_as_light = true, scale = 0.5 } or nil } @@ -740,9 +704,9 @@ data:extend( pipe_covers = pipecoverspictures(), base_level = 1, pipe_connections = {{ position = {2, -3} }} - } + }, + --off_when_no_fluid_recipe = true, }, - off_when_no_fluid_recipe = true, vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, working_sound = { @@ -755,21 +719,15 @@ data:extend( { type = "item", name = "induction-furnace-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/induction-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/induction-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12}, - } - }, + 4, angelsmods.smelting.number_tint), subgroup = "angels-induction-furnace", order = "d[induction-furnace-4]", place_result = "induction-furnace-4", @@ -778,21 +736,15 @@ data:extend( { type = "assembling-machine", name = "induction-furnace-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/induction-furnace.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/induction-furnace.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12}, - } - }, + 4, angelsmods.smelting.number_tint), flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "induction-furnace-4"}, fast_replaceable_group = "induction-furnace", @@ -944,8 +896,6 @@ data:extend( } }, { - draw_as_sprite = false, - draw_as_light = true, always_draw = true, animation = { filename = "__angelssmelting__/graphics/entity/induction-furnace/induction-furnace-working-lights.png", @@ -956,10 +906,11 @@ data:extend( frame_count = 36, animation_speed = 0.5, shift = util.by_pixel(0.5, -5.5), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { priority = "high", width = 336, - height = 379, + height = 381, frame_count = 36, stripes = { { @@ -974,7 +925,8 @@ data:extend( }, }, animation_speed = 0.5, - shift = util.by_pixel(0, -6), + shift = util.by_pixel(0, -5), + draw_as_light = true, scale = 0.5 } or nil } @@ -987,9 +939,9 @@ data:extend( pipe_covers = pipecoverspictures(), base_level = 1, pipe_connections = {{ position = {2, -3} }} - } + }, + --off_when_no_fluid_recipe = true, }, - off_when_no_fluid_recipe = true, vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, working_sound = { diff --git a/angelssmelting/prototypes/buildings/ore-processing-machine.lua b/angelssmelting/prototypes/buildings/ore-processing-machine.lua index 91da96c23..41ead0c5f 100644 --- a/angelssmelting/prototypes/buildings/ore-processing-machine.lua +++ b/angelssmelting/prototypes/buildings/ore-processing-machine.lua @@ -3,21 +3,15 @@ data:extend( { type = "item", name = "ore-processing-machine", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 1, angelsmods.smelting.number_tint), subgroup = "angels-processing-machine", order = "a[ore-processing-machine]", place_result = "ore-processing-machine", @@ -26,21 +20,15 @@ data:extend( { type = "assembling-machine", name = "ore-processing-machine", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 1, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-processing-machine"}, fast_replaceable_group = "ore-processing-machine", @@ -192,21 +180,15 @@ data:extend( { type = "item", name = "ore-processing-machine-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.smelting.number_tint), subgroup = "angels-processing-machine", order = "b[ore-processing-machine-2]", place_result = "ore-processing-machine-2", @@ -215,21 +197,15 @@ data:extend( { type = "assembling-machine", name = "ore-processing-machine-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-processing-machine-2"}, fast_replaceable_group = "ore-processing-machine", @@ -381,21 +357,15 @@ data:extend( { type = "item", name = "ore-processing-machine-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.smelting.number_tint), subgroup = "angels-processing-machine", order = "c[ore-processing-machine-3]", place_result = "ore-processing-machine-3", @@ -404,21 +374,15 @@ data:extend( { type = "assembling-machine", name = "ore-processing-machine-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-processing-machine-3"}, fast_replaceable_group = "ore-processing-machine", @@ -570,21 +534,15 @@ data:extend( { type = "item", name = "ore-processing-machine-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 4, angelsmods.smelting.number_tint), subgroup = "angels-processing-machine", order = "d[ore-processing-machine-4]", place_result = "ore-processing-machine-4", @@ -593,21 +551,15 @@ data:extend( { type = "assembling-machine", name = "ore-processing-machine-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 4, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "ore-processing-machine-4"}, fast_replaceable_group = "ore-processing-machine", diff --git a/angelssmelting/prototypes/buildings/pellet-press.lua b/angelssmelting/prototypes/buildings/pellet-press.lua index 283c26b2b..8d58232d6 100644 --- a/angelssmelting/prototypes/buildings/pellet-press.lua +++ b/angelssmelting/prototypes/buildings/pellet-press.lua @@ -3,21 +3,15 @@ data:extend( { type = "item", name = "pellet-press", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/pellet-press.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/pellet-press.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 1, angelsmods.smelting.number_tint), subgroup = "angels-pellet-press", order = "a[pellet-press]", place_result = "pellet-press", @@ -26,21 +20,15 @@ data:extend( { type = "assembling-machine", name = "pellet-press", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/pellet-press.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/pellet-press.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 1, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "pellet-press"}, fast_replaceable_group = "pellet-press", @@ -122,21 +110,15 @@ data:extend( { type = "item", name = "pellet-press-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/pellet-press.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/pellet-press.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.smelting.number_tint), subgroup = "angels-pellet-press", order = "b[pellet-press-2]", place_result = "pellet-press-2", @@ -145,21 +127,15 @@ data:extend( { type = "assembling-machine", name = "pellet-press-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/pellet-press.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/pellet-press.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "pellet-press-2"}, fast_replaceable_group = "pellet-press", @@ -241,21 +217,15 @@ data:extend( { type = "item", name = "pellet-press-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/pellet-press.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/pellet-press.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.smelting.number_tint), subgroup = "angels-pellet-press", order = "c[pellet-press-3]", place_result = "pellet-press-3", @@ -264,21 +234,15 @@ data:extend( { type = "assembling-machine", name = "pellet-press-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/pellet-press.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/pellet-press.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "pellet-press-3"}, fast_replaceable_group = "pellet-press", @@ -360,21 +324,15 @@ data:extend( { type = "item", name = "pellet-press-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/pellet-press.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/pellet-press.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 4, angelsmods.smelting.number_tint), subgroup = "angels-pellet-press", order = "d[pellet-press-4]", place_result = "pellet-press-4", @@ -383,21 +341,15 @@ data:extend( { type = "assembling-machine", name = "pellet-press-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/pellet-press.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/pellet-press.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 4, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "pellet-press-4"}, fast_replaceable_group = "pellet-press", diff --git a/angelssmelting/prototypes/buildings/powder-mixer.lua b/angelssmelting/prototypes/buildings/powder-mixer.lua index 369c8d6bf..7775ce4ab 100644 --- a/angelssmelting/prototypes/buildings/powder-mixer.lua +++ b/angelssmelting/prototypes/buildings/powder-mixer.lua @@ -3,21 +3,15 @@ data:extend( { type = "item", name = "powder-mixer", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 1, angelsmods.smelting.number_tint), subgroup = "angels-powder-mixer", order = "a[powder-mixer]", place_result = "powder-mixer", @@ -26,21 +20,15 @@ data:extend( { type = "assembling-machine", name = "powder-mixer", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 1, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "powder-mixer"}, fast_replaceable_group = "powder-mixer", @@ -121,21 +109,15 @@ data:extend( { type = "item", name = "powder-mixer-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.smelting.number_tint), subgroup = "angels-powder-mixer", order = "b[powder-mixer-2]", place_result = "powder-mixer-2", @@ -144,21 +126,15 @@ data:extend( { type = "assembling-machine", name = "powder-mixer-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "powder-mixer-2"}, fast_replaceable_group = "powder-mixer", @@ -239,21 +215,15 @@ data:extend( { type = "item", name = "powder-mixer-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.smelting.number_tint), subgroup = "angels-powder-mixer", order = "c[powder-mixer-3]", place_result = "powder-mixer-3", @@ -262,21 +232,15 @@ data:extend( { type = "assembling-machine", name = "powder-mixer-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "powder-mixer-3"}, fast_replaceable_group = "powder-mixer", @@ -357,21 +321,15 @@ data:extend( { type = "item", name = "powder-mixer-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 4, angelsmods.smelting.number_tint), subgroup = "angels-powder-mixer", order = "d[powder-mixer-4]", place_result = "powder-mixer-4", @@ -380,21 +338,15 @@ data:extend( { type = "assembling-machine", name = "powder-mixer-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 4, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "powder-mixer-4"}, fast_replaceable_group = "powder-mixer", diff --git a/angelssmelting/prototypes/buildings/sintering-oven.lua b/angelssmelting/prototypes/buildings/sintering-oven.lua index a303a322a..632b54418 100644 --- a/angelssmelting/prototypes/buildings/sintering-oven.lua +++ b/angelssmelting/prototypes/buildings/sintering-oven.lua @@ -3,21 +3,15 @@ data:extend( { type = "item", name = "sintering-oven", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/sintering-oven.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/sintering-oven.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 1, angelsmods.smelting.number_tint), subgroup = "angels-sintering-oven", order = "a[sintering-oven]", place_result = "sintering-oven", @@ -26,21 +20,15 @@ data:extend( { type = "assembling-machine", name = "sintering-oven", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/sintering-oven.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/sintering-oven.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 1, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "sintering-oven"}, fast_replaceable_group = "sintering-oven", @@ -102,6 +90,7 @@ data:extend( vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, working_visualisations = { { + fadeout = true, effect = "uranium-glow", animation = { filename = "__angelssmelting__/graphics/entity/sintering-oven/sintering-oven-glow.png", @@ -110,6 +99,7 @@ data:extend( height = 177, blend_mode = "additive", shift = util.by_pixel(-1, -7), + draw_as_glow = true, hr_version = angelsmods.trigger.enable_hq_graphics and { filename = "__angelssmelting__/graphics/entity/sintering-oven/hr-sintering-oven-glow.png", priority = "high", @@ -117,26 +107,28 @@ data:extend( height = 350, blend_mode = "additive", shift = util.by_pixel(-1, -6.5), + draw_as_glow = true, scale = 0.5 } or nil } }, { + fadeout = true, effect = "uranium-glow", - draw_as_sprite = false, - draw_as_light = true, animation = { filename = "__angelssmelting__/graphics/entity/sintering-oven/sintering-oven-light.png", priority = "high", width = 165, height = 177, shift = util.by_pixel(-1, -7), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { filename = "__angelssmelting__/graphics/entity/sintering-oven/hr-sintering-oven-light.png", priority = "high", width = 326, height = 350, shift = util.by_pixel(-1, -6.5), + draw_as_light = true, scale = 0.5 } or nil } @@ -152,21 +144,15 @@ data:extend( { type = "item", name = "sintering-oven-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/sintering-oven.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/sintering-oven.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.smelting.number_tint), subgroup = "angels-sintering-oven", order = "b[sintering-oven-2]", place_result = "sintering-oven-2", @@ -175,21 +161,15 @@ data:extend( { type = "assembling-machine", name = "sintering-oven-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/sintering-oven.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/sintering-oven.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "sintering-oven-2"}, fast_replaceable_group = "sintering-oven", @@ -251,6 +231,7 @@ data:extend( vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, working_visualisations = { { + fadeout = true, effect = "uranium-glow", animation = { filename = "__angelssmelting__/graphics/entity/sintering-oven/sintering-oven-glow.png", @@ -259,6 +240,7 @@ data:extend( height = 177, blend_mode = "additive", shift = util.by_pixel(-1, -7), + draw_as_glow = true, hr_version = angelsmods.trigger.enable_hq_graphics and { filename = "__angelssmelting__/graphics/entity/sintering-oven/hr-sintering-oven-glow.png", priority = "high", @@ -266,26 +248,28 @@ data:extend( height = 350, blend_mode = "additive", shift = util.by_pixel(-1, -6.5), + draw_as_glow = true, scale = 0.5 } or nil } }, { + fadeout = true, effect = "uranium-glow", - draw_as_sprite = false, - draw_as_light = true, animation = { filename = "__angelssmelting__/graphics/entity/sintering-oven/sintering-oven-light.png", priority = "high", width = 165, height = 177, shift = util.by_pixel(-1, -7), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { filename = "__angelssmelting__/graphics/entity/sintering-oven/hr-sintering-oven-light.png", priority = "high", width = 326, height = 350, shift = util.by_pixel(-1, -6.5), + draw_as_light = true, scale = 0.5 } or nil } @@ -301,21 +285,15 @@ data:extend( { type = "item", name = "sintering-oven-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/sintering-oven.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/sintering-oven.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.smelting.number_tint), subgroup = "angels-sintering-oven", order = "c[sintering-oven-3]", place_result = "sintering-oven-3", @@ -324,21 +302,15 @@ data:extend( { type = "assembling-machine", name = "sintering-oven-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/sintering-oven.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/sintering-oven.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "sintering-oven-3"}, fast_replaceable_group = "sintering-oven", @@ -400,6 +372,7 @@ data:extend( vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, working_visualisations = { { + fadeout = true, effect = "uranium-glow", animation = { filename = "__angelssmelting__/graphics/entity/sintering-oven/sintering-oven-glow.png", @@ -408,6 +381,7 @@ data:extend( height = 177, blend_mode = "additive", shift = util.by_pixel(-1, -7), + draw_as_glow = true, hr_version = angelsmods.trigger.enable_hq_graphics and { filename = "__angelssmelting__/graphics/entity/sintering-oven/hr-sintering-oven-glow.png", priority = "high", @@ -415,26 +389,28 @@ data:extend( height = 350, blend_mode = "additive", shift = util.by_pixel(-1, -6.5), + draw_as_glow = true, scale = 0.5 } or nil } }, { + fadeout = true, effect = "uranium-glow", - draw_as_sprite = false, - draw_as_light = true, animation = { filename = "__angelssmelting__/graphics/entity/sintering-oven/sintering-oven-light.png", priority = "high", width = 165, height = 177, shift = util.by_pixel(-1, -7), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { filename = "__angelssmelting__/graphics/entity/sintering-oven/hr-sintering-oven-light.png", priority = "high", width = 326, height = 350, shift = util.by_pixel(-1, -6.5), + draw_as_light = true, scale = 0.5 } or nil } @@ -450,21 +426,15 @@ data:extend( { type = "item", name = "sintering-oven-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/sintering-oven.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/sintering-oven.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 4, angelsmods.smelting.number_tint), subgroup = "angels-sintering-oven", order = "d[sintering-oven-4]", place_result = "sintering-oven-4", @@ -473,21 +443,15 @@ data:extend( { type = "assembling-machine", name = "sintering-oven-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/sintering-oven.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/sintering-oven.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - icon_size = 32, - icon_mipmaps = 1, - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, + 4, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "sintering-oven-4"}, fast_replaceable_group = "sintering-oven", @@ -548,6 +512,7 @@ data:extend( vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, working_visualisations = { { + fadeout = true, effect = "uranium-glow", animation = { filename = "__angelssmelting__/graphics/entity/sintering-oven/sintering-oven-glow.png", @@ -556,6 +521,7 @@ data:extend( height = 177, blend_mode = "additive", shift = util.by_pixel(-1, -7), + draw_as_glow = true, hr_version = angelsmods.trigger.enable_hq_graphics and { filename = "__angelssmelting__/graphics/entity/sintering-oven/hr-sintering-oven-glow.png", priority = "high", @@ -563,26 +529,28 @@ data:extend( height = 350, blend_mode = "additive", shift = util.by_pixel(-1, -6.5), + draw_as_glow = true, scale = 0.5 } or nil } }, { + fadeout = true, effect = "uranium-glow", - draw_as_sprite = false, - draw_as_light = true, animation = { filename = "__angelssmelting__/graphics/entity/sintering-oven/sintering-oven-light.png", priority = "high", width = 165, height = 177, shift = util.by_pixel(-1, -7), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { filename = "__angelssmelting__/graphics/entity/sintering-oven/hr-sintering-oven-light.png", priority = "high", width = 326, height = 350, shift = util.by_pixel(-1, -6.5), + draw_as_light = true, scale = 0.5 } or nil } diff --git a/angelssmelting/prototypes/buildings/strand-casting-machine.lua b/angelssmelting/prototypes/buildings/strand-casting-machine.lua index c759672ce..0a09b8942 100644 --- a/angelssmelting/prototypes/buildings/strand-casting-machine.lua +++ b/angelssmelting/prototypes/buildings/strand-casting-machine.lua @@ -3,21 +3,15 @@ data:extend( { type = "item", name = "strand-casting-machine", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12} - } - }, + 1, angelsmods.smelting.number_tint), subgroup = "angels-strand-casting-machine", order = "a[strand-casting-machine]", place_result = "strand-casting-machine", @@ -26,21 +20,15 @@ data:extend( { type = "assembling-machine", name = "strand-casting-machine", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12} - } - }, + 1, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "strand-casting-machine"}, fast_replaceable_group = "strand-casting-machine", @@ -181,20 +169,27 @@ data:extend( } }, { - draw_as_sprite = false, - draw_as_light = true, + fadeout = true, animation = { filename = "__angelssmelting__/graphics/entity/strand-casting-machine/strand-casting-machine-light.png", priority = "high", width = 167, height = 197, + line_length = 6, + frame_count = 24, + animation_speed = 0.5, shift = util.by_pixel(0, -16.5), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { filename = "__angelssmelting__/graphics/entity/strand-casting-machine/hr-strand-casting-machine-light.png", priority = "high", width = 329, height = 392, + line_length = 6, + frame_count = 24, + animation_speed = 0.5, shift = util.by_pixel(0, -16.5), + draw_as_light = true, scale = 0.5 } or nil } @@ -210,21 +205,15 @@ data:extend( { type = "item", name = "strand-casting-machine-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.smelting.number_tint), subgroup = "angels-strand-casting-machine", order = "b[strand-casting-machine-2]", place_result = "strand-casting-machine-2", @@ -233,21 +222,15 @@ data:extend( { type = "assembling-machine", name = "strand-casting-machine-2", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12} - } - }, + 2, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "strand-casting-machine-2"}, fast_replaceable_group = "strand-casting-machine", @@ -388,20 +371,27 @@ data:extend( } }, { - draw_as_sprite = false, - draw_as_light = true, + fadeout = true, animation = { filename = "__angelssmelting__/graphics/entity/strand-casting-machine/strand-casting-machine-light.png", priority = "high", width = 167, height = 197, + line_length = 6, + frame_count = 24, + animation_speed = 0.5, shift = util.by_pixel(0, -16.5), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { filename = "__angelssmelting__/graphics/entity/strand-casting-machine/hr-strand-casting-machine-light.png", priority = "high", width = 329, height = 392, + line_length = 6, + frame_count = 24, + animation_speed = 0.5, shift = util.by_pixel(0, -16.5), + draw_as_light = true, scale = 0.5 } or nil } @@ -417,21 +407,15 @@ data:extend( { type = "item", name = "strand-casting-machine-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.smelting.number_tint), subgroup = "angels-strand-casting-machine", order = "c[strand-casting-machine-3]", place_result = "strand-casting-machine-3", @@ -440,21 +424,15 @@ data:extend( { type = "assembling-machine", name = "strand-casting-machine-3", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12} - } - }, + 3, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "strand-casting-machine-3"}, fast_replaceable_group = "strand-casting-machine", @@ -595,20 +573,27 @@ data:extend( } }, { - draw_as_sprite = false, - draw_as_light = true, + fadeout = true, animation = { filename = "__angelssmelting__/graphics/entity/strand-casting-machine/strand-casting-machine-light.png", priority = "high", width = 167, height = 197, + line_length = 6, + frame_count = 24, + animation_speed = 0.5, shift = util.by_pixel(0, -16.5), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { filename = "__angelssmelting__/graphics/entity/strand-casting-machine/hr-strand-casting-machine-light.png", priority = "high", width = 329, height = 392, + line_length = 6, + frame_count = 24, + animation_speed = 0.5, shift = util.by_pixel(0, -16.5), + draw_as_light = true, scale = 0.5 } or nil } @@ -624,21 +609,15 @@ data:extend( { type = "item", name = "strand-casting-machine-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12} - } - }, + 4, angelsmods.smelting.number_tint), subgroup = "angels-strand-casting-machine", order = "d[strand-casting-machine-4]", place_result = "strand-casting-machine-4", @@ -647,21 +626,15 @@ data:extend( { type = "assembling-machine", name = "strand-casting-machine-4", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png", - icon_size = 64, - icon_mipmaps = 4 + { + icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.smelting.number_tint, - icon_size = 32, - icon_mipmaps = 1, - scale = 0.32, - shift = {-12, -12} - } - }, + 4, angelsmods.smelting.number_tint), flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 1, result = "strand-casting-machine-4"}, fast_replaceable_group = "strand-casting-machine", @@ -801,20 +774,27 @@ data:extend( } }, { - draw_as_sprite = false, - draw_as_light = true, + fadeout = true, animation = { filename = "__angelssmelting__/graphics/entity/strand-casting-machine/strand-casting-machine-light.png", priority = "high", width = 167, height = 197, + line_length = 6, + frame_count = 24, + animation_speed = 0.5, shift = util.by_pixel(0, -16.5), + draw_as_light = true, hr_version = angelsmods.trigger.enable_hq_graphics and { filename = "__angelssmelting__/graphics/entity/strand-casting-machine/hr-strand-casting-machine-light.png", priority = "high", width = 329, height = 392, + line_length = 6, + frame_count = 24, + animation_speed = 0.5, shift = util.by_pixel(0, -16.5), + draw_as_light = true, scale = 0.5 } or nil } diff --git a/angelssmelting/prototypes/items/angels-alloy-solder.lua b/angelssmelting/prototypes/items/angels-alloy-solder.lua new file mode 100644 index 000000000..4de4101d4 --- /dev/null +++ b/angelssmelting/prototypes/items/angels-alloy-solder.lua @@ -0,0 +1,51 @@ +data:extend( +{ + -- SOLDER SMELTING INTERMEDIATE + -- SOLDER SMELTING RESULTS + { + type = "item", + name = "angels-solder-mixture", + icon = "__angelssmelting__/graphics/icons/solder-mixture.png", + icon_size = 32, + subgroup = "angels-alloys", + order = "a[solder]-a", + stack_size = 200 + }, + -- SOLDER CASTING INTERMEDIATE + { + type = "fluid", + name = "liquid-molten-solder", + icon = "__angelssmelting__/graphics/icons/molten-solder.png", + icon_size = 64, icon_mipmaps = 4, + subgroup = "angels-solder-casting", + order = "b", + default_temperature = 200, + heat_capacity = "0KJ", + base_color = {r = 106/255, g = 138/255, b = 129/255}, + flow_color = {r = 106/255, g = 138/255, b = 129/255}, + max_temperature = 200, + pressure_to_speed_ratio = 0.4, + flow_to_energy_ratio = 0.59, + auto_barrel = false + }, + { + type = "item", + name = "angels-roll-solder", + icon = "__angelssmelting__/graphics/icons/roll-solder.png", + icon_size = 32, + subgroup = "angels-solder-casting", + order = "c", + stack_size = 200 + }, + -- SOLDER CASTING RESULT + { + type = "item", + name = "angels-solder", + icon = "__angelssmelting__/graphics/icons/solder.png", + icon_size = 32, + subgroup = "angels-solder-casting", + order = "d", + stack_size = 200 + } +} +) \ No newline at end of file diff --git a/angelssmelting/prototypes/items/angels-alloys.lua b/angelssmelting/prototypes/items/angels-alloy-steel.lua similarity index 60% rename from angelssmelting/prototypes/items/angels-alloys.lua rename to angelssmelting/prototypes/items/angels-alloy-steel.lua index e09e7e8a5..1ed79a321 100644 --- a/angelssmelting/prototypes/items/angels-alloys.lua +++ b/angelssmelting/prototypes/items/angels-alloy-steel.lua @@ -6,7 +6,7 @@ data:extend( type = "item", name = "ingot-steel", icon = "__angelssmelting__/graphics/icons/ingot-steel.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-iron", order = "f", stack_size = 200 @@ -15,7 +15,7 @@ data:extend( type = "item", name = "powder-steel", icon = "__angelssmelting__/graphics/icons/powder-steel.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-iron", order = "h", stack_size = 200 @@ -25,7 +25,7 @@ data:extend( type = "fluid", name = "liquid-molten-steel", icon = "__angelssmelting__/graphics/icons/molten-steel.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-steel-casting", order = "i", default_temperature = 1370, @@ -41,7 +41,7 @@ data:extend( type = "item", name = "angels-roll-steel", icon = "__angelssmelting__/graphics/icons/roll-steel.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-steel-casting", order = "j", stack_size = 200 @@ -84,55 +84,5 @@ data:extend( stack_size = 200 }, -- order n reserved for motor casting (see industries) - - - - -- SOLDER SMELTING INTERMEDIATE - -- SOLDER SMELTING RESULTS - { - type = "item", - name = "angels-solder-mixture", - icon = "__angelssmelting__/graphics/icons/solder-mixture.png", - icon_size = 32, - subgroup = "angels-alloys", - order = "a[solder]-a", - stack_size = 200 - }, - -- SOLDER CASTING INTERMEDIATE - { - type = "fluid", - name = "liquid-molten-solder", - icon = "__angelssmelting__/graphics/icons/molten-solder-1.png", - icon_size = 32, - subgroup = "angels-solder-casting", - order = "b", - default_temperature = 200, - heat_capacity = "0KJ", - base_color = {r = 106/255, g = 138/255, b = 129/255}, - flow_color = {r = 106/255, g = 138/255, b = 129/255}, - max_temperature = 200, - pressure_to_speed_ratio = 0.4, - flow_to_energy_ratio = 0.59, - auto_barrel = false - }, - { - type = "item", - name = "angels-roll-solder", - icon = "__angelssmelting__/graphics/icons/roll-solder.png", - icon_size = 32, - subgroup = "angels-solder-casting", - order = "c", - stack_size = 200 - }, - -- SOLDER CASTING RESULT - { - type = "item", - name = "angels-solder", - icon = "__angelssmelting__/graphics/icons/solder.png", - icon_size = 32, - subgroup = "angels-solder-casting", - order = "d", - stack_size = 200 - }, } ) \ No newline at end of file diff --git a/angelssmelting/prototypes/items/angels-aluminium.lua b/angelssmelting/prototypes/items/angels-aluminium.lua index b04a7faa8..17a6e4b74 100644 --- a/angelssmelting/prototypes/items/angels-aluminium.lua +++ b/angelssmelting/prototypes/items/angels-aluminium.lua @@ -15,7 +15,7 @@ data:extend( type = "item", name = "processed-aluminium", icon = "__angelssmelting__/graphics/icons/processed-aluminium.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-aluminium", order = "b", stack_size = 200 @@ -24,7 +24,7 @@ data:extend( type = "item", name = "pellet-aluminium", icon = "__angelssmelting__/graphics/icons/pellet-aluminium.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-aluminium", order = "c", stack_size = 200 @@ -61,7 +61,7 @@ data:extend( type = "item", name = "ingot-aluminium", icon = "__angelssmelting__/graphics/icons/ingot-aluminium.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-aluminium", order = "g", stack_size = 200 @@ -70,7 +70,7 @@ data:extend( type = "item", name = "powder-aluminium", icon = "__angelssmelting__/graphics/icons/powder-aluminium.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-aluminium", order = "h", stack_size = 200 @@ -80,7 +80,7 @@ data:extend( type = "fluid", name = "liquid-molten-aluminium", icon = "__angelssmelting__/graphics/icons/molten-aluminium.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-aluminium-casting", order = "i", default_temperature = 660.3, @@ -96,7 +96,7 @@ data:extend( type = "item", name = "angels-roll-aluminium", icon = "__angelssmelting__/graphics/icons/roll-aluminium.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-aluminium-casting", order = "j", stack_size = 200 diff --git a/angelssmelting/prototypes/items/angels-chrome.lua b/angelssmelting/prototypes/items/angels-chrome.lua index ab860083e..94f5f2524 100644 --- a/angelssmelting/prototypes/items/angels-chrome.lua +++ b/angelssmelting/prototypes/items/angels-chrome.lua @@ -15,7 +15,7 @@ data:extend( type = "item", name = "processed-chrome", icon = "__angelssmelting__/graphics/icons/processed-chrome.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-chrome", order = "b", stack_size = 200 @@ -24,7 +24,7 @@ data:extend( type = "item", name = "pellet-chrome", icon = "__angelssmelting__/graphics/icons/pellet-chrome.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-chrome", order = "c", stack_size = 200 @@ -61,7 +61,7 @@ data:extend( type = "item", name = "ingot-chrome", icon = "__angelssmelting__/graphics/icons/ingot-chrome.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-chrome", order = "g", stack_size = 200 @@ -70,7 +70,7 @@ data:extend( type = "item", name = "powder-chrome", icon = "__angelssmelting__/graphics/icons/powder-chrome.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-chrome", order = "h", stack_size = 200 @@ -80,7 +80,7 @@ data:extend( type = "fluid", name = "liquid-molten-chrome", icon = "__angelssmelting__/graphics/icons/molten-chrome.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-chrome-casting", order = "i", default_temperature = 1907, @@ -96,7 +96,7 @@ data:extend( type = "item", name = "angels-roll-chrome", icon = "__angelssmelting__/graphics/icons/roll-chrome.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-chrome-casting", order = "j", stack_size = 200 diff --git a/angelssmelting/prototypes/items/angels-cobalt.lua b/angelssmelting/prototypes/items/angels-cobalt.lua index 11d55ce1d..e8a8f70fc 100644 --- a/angelssmelting/prototypes/items/angels-cobalt.lua +++ b/angelssmelting/prototypes/items/angels-cobalt.lua @@ -15,7 +15,7 @@ data:extend( type = "item", name = "processed-cobalt", icon = "__angelssmelting__/graphics/icons/processed-cobalt.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-cobalt", order = "b", stack_size = 200 @@ -24,7 +24,7 @@ data:extend( type = "item", name = "pellet-cobalt", icon = "__angelssmelting__/graphics/icons/pellet-cobalt.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-cobalt", order = "c", stack_size = 200 @@ -52,7 +52,7 @@ data:extend( type = "item", name = "ingot-cobalt", icon = "__angelssmelting__/graphics/icons/ingot-cobalt.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-cobalt", order = "f", stack_size = 200 @@ -61,7 +61,7 @@ data:extend( type = "item", name = "powder-cobalt", icon = "__angelssmelting__/graphics/icons/powder-cobalt.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-cobalt", order = "g", stack_size = 200 @@ -71,7 +71,7 @@ data:extend( type = "fluid", name = "liquid-molten-cobalt", icon = "__angelssmelting__/graphics/icons/molten-cobalt.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-cobalt-casting", order = "h", default_temperature = 1495, @@ -87,7 +87,7 @@ data:extend( type = "item", name = "angels-roll-cobalt", icon = "__angelssmelting__/graphics/icons/roll-cobalt.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-cobalt-casting", order = "i", stack_size = 200 diff --git a/angelssmelting/prototypes/items/angels-copper.lua b/angelssmelting/prototypes/items/angels-copper.lua index 7992f1245..5fa89fb43 100644 --- a/angelssmelting/prototypes/items/angels-copper.lua +++ b/angelssmelting/prototypes/items/angels-copper.lua @@ -7,7 +7,7 @@ data:extend( type = "item", name = "processed-copper", icon = "__angelssmelting__/graphics/icons/processed-copper.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-copper", order = "b", stack_size = 200 @@ -16,7 +16,7 @@ data:extend( type = "item", name = "pellet-copper", icon = "__angelssmelting__/graphics/icons/pellet-copper.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-copper", order = "c", stack_size = 200 @@ -35,7 +35,7 @@ data:extend( type = "item", name = "ingot-copper", icon = "__angelssmelting__/graphics/icons/ingot-copper.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-copper", order = "e", stack_size = 200 @@ -44,7 +44,7 @@ data:extend( type = "item", name = "powder-copper", icon = "__angelssmelting__/graphics/icons/powder-copper.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-copper", order = "f", stack_size = 200 @@ -54,7 +54,7 @@ data:extend( type = "fluid", name = "liquid-molten-copper", icon = "__angelssmelting__/graphics/icons/molten-copper.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-copper-casting", order = "g", default_temperature = 1085, @@ -70,7 +70,7 @@ data:extend( type = "item", name = "angels-roll-copper", icon = "__angelssmelting__/graphics/icons/roll-copper.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-copper-casting", order = "h", stack_size = 200 @@ -79,7 +79,7 @@ data:extend( type = "item", name = "angels-wire-coil-copper", icon = "__angelssmelting__/graphics/icons/wire-coil-copper.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-copper-casting", order = "i", stack_size = 200 diff --git a/angelssmelting/prototypes/items/angels-glass.lua b/angelssmelting/prototypes/items/angels-glass.lua index 12cd99ab0..11178b00b 100644 --- a/angelssmelting/prototypes/items/angels-glass.lua +++ b/angelssmelting/prototypes/items/angels-glass.lua @@ -17,7 +17,7 @@ data:extend( type = "fluid", name = "liquid-molten-glass", icon = "__angelssmelting__/graphics/icons/molten-glass.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-glass-casting", order = "b", default_temperature = 1500, @@ -33,7 +33,7 @@ data:extend( type = "item", name = "angels-coil-glass-fiber", icon = "__angelssmelting__/graphics/icons/wire-coil-glass.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-glass-casting", order = "c", stack_size = 200 diff --git a/angelssmelting/prototypes/items/angels-gold.lua b/angelssmelting/prototypes/items/angels-gold.lua index 0cd148999..16ec4424f 100644 --- a/angelssmelting/prototypes/items/angels-gold.lua +++ b/angelssmelting/prototypes/items/angels-gold.lua @@ -17,7 +17,7 @@ data:extend( type = "item", name = "processed-gold", icon = "__angelssmelting__/graphics/icons/processed-gold.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-gold", order = "b", stack_size = 200 @@ -26,7 +26,7 @@ data:extend( type = "item", name = "pellet-gold", icon = "__angelssmelting__/graphics/icons/pellet-gold.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-gold", order = "c", stack_size = 200 @@ -69,7 +69,7 @@ data:extend( type = "item", name = "ingot-gold", icon = "__angelssmelting__/graphics/icons/ingot-gold.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-gold", order = "g", stack_size = 200 @@ -78,7 +78,7 @@ data:extend( type = "item", name = "powder-gold", icon = "__angelssmelting__/graphics/icons/powder-gold.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-gold", order = "h", stack_size = 200 @@ -88,7 +88,7 @@ data:extend( type = "fluid", name = "liquid-molten-gold", icon = "__angelssmelting__/graphics/icons/molten-gold.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-gold-casting", order = "i", default_temperature = 1064, @@ -104,7 +104,7 @@ data:extend( type = "item", name = "angels-roll-gold", icon = "__angelssmelting__/graphics/icons/roll-gold.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-gold-casting", order = "j", stack_size = 200 @@ -113,7 +113,7 @@ data:extend( type = "item", name = "angels-wire-coil-gold", icon = "__angelssmelting__/graphics/icons/wire-coil-gold.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-gold-casting", order = "k", stack_size = 200 diff --git a/angelssmelting/prototypes/items/angels-iron.lua b/angelssmelting/prototypes/items/angels-iron.lua index a61978d93..4368e4ce5 100644 --- a/angelssmelting/prototypes/items/angels-iron.lua +++ b/angelssmelting/prototypes/items/angels-iron.lua @@ -7,7 +7,7 @@ data:extend( type = "item", name = "processed-iron", icon = "__angelssmelting__/graphics/icons/processed-iron.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-iron", order = "b", stack_size = 200 @@ -16,7 +16,7 @@ data:extend( type = "item", name = "pellet-iron", icon = "__angelssmelting__/graphics/icons/pellet-iron.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-iron", order = "c", stack_size = 200 @@ -35,7 +35,7 @@ data:extend( type = "item", name = "ingot-iron", icon = "__angelssmelting__/graphics/icons/ingot-iron.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-iron", order = "e", stack_size = 200 @@ -45,7 +45,7 @@ data:extend( type = "item", name = "powder-iron", icon = "__angelssmelting__/graphics/icons/powder-iron.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-iron", order = "g", stack_size = 200 @@ -56,7 +56,7 @@ data:extend( type = "fluid", name = "liquid-molten-iron", icon = "__angelssmelting__/graphics/icons/molten-iron.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-iron-casting", order = "i", default_temperature = 1538, @@ -72,7 +72,7 @@ data:extend( type = "item", name = "angels-roll-iron", icon = "__angelssmelting__/graphics/icons/roll-iron.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-iron-casting", order = "j", stack_size = 200 @@ -96,7 +96,7 @@ data:extend( order = "l", stack_size = 200 }, - { + --[[{ type = "item", name = "angels-rod-iron", icon = "__angelssmelting__/graphics/icons/rod-iron.png", @@ -104,7 +104,17 @@ data:extend( subgroup = "angels-iron-casting", order = "m", stack_size = 200 - }, + },]] -- order n reserved for motor casting (see industries) } -) \ No newline at end of file +) +------------------------------------------------------------------ +--UPDATE IRON STICK TO MATCH THE "ROD" +------------------------------------------------------------------ +local stick = data.raw.item["iron-stick"] +stick.icon = "__angelssmelting__/graphics/icons/rod-iron.png" +stick.localised_name = {"item-name.angels-rod-iron"} +stick.icon_size = 32 +stick.subgroup = "angels-iron-casting" +stick.order = "m" +stick.stack_size = 200 \ No newline at end of file diff --git a/angelssmelting/prototypes/items/angels-lead.lua b/angelssmelting/prototypes/items/angels-lead.lua index 06e0bb813..c6a43572d 100644 --- a/angelssmelting/prototypes/items/angels-lead.lua +++ b/angelssmelting/prototypes/items/angels-lead.lua @@ -17,7 +17,7 @@ data:extend( type = "item", name = "processed-lead", icon = "__angelssmelting__/graphics/icons/processed-lead.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-lead", order = "b", stack_size = 200 @@ -26,7 +26,7 @@ data:extend( type = "item", name = "pellet-lead", icon = "__angelssmelting__/graphics/icons/pellet-lead.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-lead", order = "c", stack_size = 200 @@ -69,7 +69,7 @@ data:extend( type = "item", name = "ingot-lead", icon = "__angelssmelting__/graphics/icons/ingot-lead.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-lead", order = "g", stack_size = 200 @@ -78,7 +78,7 @@ data:extend( type = "item", name = "powder-lead", icon = "__angelssmelting__/graphics/icons/powder-lead.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-lead", order = "h", stack_size = 200 @@ -88,7 +88,7 @@ data:extend( type = "fluid", name = "liquid-molten-lead", icon = "__angelssmelting__/graphics/icons/molten-lead.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-lead-casting", order = "i", default_temperature = 327.5, @@ -104,7 +104,7 @@ data:extend( type = "item", name = "angels-roll-lead", icon = "__angelssmelting__/graphics/icons/roll-lead.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-lead-casting", order = "j", stack_size = 200 diff --git a/angelssmelting/prototypes/items/angels-manganese.lua b/angelssmelting/prototypes/items/angels-manganese.lua index 25eb60aac..be1675336 100644 --- a/angelssmelting/prototypes/items/angels-manganese.lua +++ b/angelssmelting/prototypes/items/angels-manganese.lua @@ -15,7 +15,7 @@ data:extend( type = "item", name = "processed-manganese", icon = "__angelssmelting__/graphics/icons/processed-manganese.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-manganese", order = "b", stack_size = 200 @@ -24,7 +24,7 @@ data:extend( type = "item", name = "pellet-manganese", icon = "__angelssmelting__/graphics/icons/pellet-manganese.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-manganese", order = "c", stack_size = 200 @@ -52,7 +52,7 @@ data:extend( type = "item", name = "ingot-manganese", icon = "__angelssmelting__/graphics/icons/ingot-manganese.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-manganese", order = "f", stack_size = 200 @@ -61,7 +61,7 @@ data:extend( type = "item", name = "powder-manganese", icon = "__angelssmelting__/graphics/icons/powder-manganese.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-manganese", order = "g", stack_size = 200 @@ -71,7 +71,7 @@ data:extend( type = "fluid", name = "liquid-molten-manganese", icon = "__angelssmelting__/graphics/icons/molten-manganese.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-manganese-casting", order = "h", default_temperature = 1246, @@ -87,7 +87,7 @@ data:extend( type = "item", name = "angels-roll-manganese", icon = "__angelssmelting__/graphics/icons/roll-manganese.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-manganese-casting", order = "i", stack_size = 200 diff --git a/angelssmelting/prototypes/items/angels-nickel.lua b/angelssmelting/prototypes/items/angels-nickel.lua index aa8475f95..4f5469422 100644 --- a/angelssmelting/prototypes/items/angels-nickel.lua +++ b/angelssmelting/prototypes/items/angels-nickel.lua @@ -15,7 +15,7 @@ data:extend( type = "item", name = "processed-nickel", icon = "__angelssmelting__/graphics/icons/processed-nickel.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-nickel", order = "b", stack_size = 200 @@ -24,7 +24,7 @@ data:extend( type = "item", name = "pellet-nickel", icon = "__angelssmelting__/graphics/icons/pellet-nickel.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-nickel", order = "c", stack_size = 200 @@ -52,7 +52,7 @@ data:extend( type = "item", name = "ingot-nickel", icon = "__angelssmelting__/graphics/icons/ingot-nickel.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-nickel", order = "f", stack_size = 200 @@ -61,7 +61,7 @@ data:extend( type = "item", name = "powder-nickel", icon = "__angelssmelting__/graphics/icons/powder-nickel.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-nickel", order = "g", stack_size = 200 @@ -71,7 +71,7 @@ data:extend( type = "fluid", name = "liquid-molten-nickel", icon = "__angelssmelting__/graphics/icons/molten-nickel.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-nickel-casting", order = "h", default_temperature = 1455, @@ -87,7 +87,7 @@ data:extend( type = "item", name = "angels-roll-nickel", icon = "__angelssmelting__/graphics/icons/roll-nickel.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-nickel-casting", order = "i", stack_size = 200 diff --git a/angelssmelting/prototypes/items/angels-platinum.lua b/angelssmelting/prototypes/items/angels-platinum.lua index a2560389c..4ef5ae977 100644 --- a/angelssmelting/prototypes/items/angels-platinum.lua +++ b/angelssmelting/prototypes/items/angels-platinum.lua @@ -17,7 +17,7 @@ data:extend( type = "item", name = "processed-platinum", icon = "__angelssmelting__/graphics/icons/processed-platinum.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-platinum", order = "b", stack_size = 200 @@ -26,7 +26,7 @@ data:extend( type = "item", name = "pellet-platinum", icon = "__angelssmelting__/graphics/icons/pellet-platinum.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-platinum", order = "c", stack_size = 200 @@ -60,7 +60,7 @@ data:extend( type = "item", name = "ingot-platinum", icon = "__angelssmelting__/graphics/icons/ingot-platinum.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-platinum", order = "f", stack_size = 200 @@ -69,7 +69,7 @@ data:extend( type = "item", name = "powder-platinum", icon = "__angelssmelting__/graphics/icons/powder-platinum.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-platinum", order = "g", stack_size = 200 @@ -79,7 +79,7 @@ data:extend( type = "fluid", name = "liquid-molten-platinum", icon = "__angelssmelting__/graphics/icons/molten-platinum.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-platinum-casting", order = "h", default_temperature = 1768, @@ -95,7 +95,7 @@ data:extend( type = "item", name = "angels-roll-platinum", icon = "__angelssmelting__/graphics/icons/roll-platinum.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-platinum-casting", order = "i", stack_size = 200 @@ -104,7 +104,7 @@ data:extend( type = "item", name = "angels-wire-coil-platinum", icon = "__angelssmelting__/graphics/icons/wire-coil-platinum.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-platinum-casting", order = "j", stack_size = 200 diff --git a/angelssmelting/prototypes/items/angels-silicon.lua b/angelssmelting/prototypes/items/angels-silicon.lua index e8c2f0c4a..d2b85eb05 100644 --- a/angelssmelting/prototypes/items/angels-silicon.lua +++ b/angelssmelting/prototypes/items/angels-silicon.lua @@ -17,7 +17,7 @@ data:extend( type = "item", name = "processed-silica", icon = "__angelssmelting__/graphics/icons/processed-silica.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-silicon", order = "b", stack_size = 200 @@ -26,7 +26,7 @@ data:extend( type = "item", name = "pellet-silica", icon = "__angelssmelting__/graphics/icons/pellet-silica.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-silicon", order = "c", stack_size = 200 @@ -66,7 +66,7 @@ data:extend( type = "item", name = "ingot-silicon", icon = "__angelssmelting__/graphics/icons/ingot-silicon.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-silicon", order = "f", stack_size = 200 @@ -75,7 +75,7 @@ data:extend( type = "item", name = "powder-silicon", icon = "__angelssmelting__/graphics/icons/powder-silica.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-silicon", order = "g", stack_size = 200 @@ -85,7 +85,7 @@ data:extend( type = "fluid", name = "liquid-molten-silicon", icon = "__angelssmelting__/graphics/icons/molten-silicon.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-silicon-casting", order = "h", default_temperature = 1414, diff --git a/angelssmelting/prototypes/items/angels-silver.lua b/angelssmelting/prototypes/items/angels-silver.lua index 14b7ab7fe..902b9c1bd 100644 --- a/angelssmelting/prototypes/items/angels-silver.lua +++ b/angelssmelting/prototypes/items/angels-silver.lua @@ -15,7 +15,7 @@ data:extend( type = "item", name = "processed-silver", icon = "__angelssmelting__/graphics/icons/processed-silver.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-silver", order = "b", stack_size = 200 @@ -24,7 +24,7 @@ data:extend( type = "item", name = "pellet-silver", icon = "__angelssmelting__/graphics/icons/pellet-silver.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-silver", order = "c", stack_size = 200 @@ -62,7 +62,7 @@ data:extend( type = "item", name = "ingot-silver", icon = "__angelssmelting__/graphics/icons/ingot-silver.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-silver", order = "h", stack_size = 200 @@ -71,7 +71,7 @@ data:extend( type = "item", name = "powder-silver", icon = "__angelssmelting__/graphics/icons/powder-silver.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-silver", order = "i", stack_size = 200 @@ -81,7 +81,7 @@ data:extend( type = "fluid", name = "liquid-molten-silver", icon = "__angelssmelting__/graphics/icons/molten-silver.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-silver-casting", order = "j", default_temperature = 961.8, @@ -97,7 +97,7 @@ data:extend( type = "item", name = "angels-roll-silver", icon = "__angelssmelting__/graphics/icons/roll-silver.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-silver-casting", order = "k", stack_size = 200 @@ -106,7 +106,7 @@ data:extend( type = "item", name = "angels-wire-coil-silver", icon = "__angelssmelting__/graphics/icons/wire-coil-silver.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-silver-casting", order = "l", stack_size = 200 diff --git a/angelssmelting/prototypes/items/angels-stone.lua b/angelssmelting/prototypes/items/angels-stone.lua index 75422528a..2a642f4dd 100644 --- a/angelssmelting/prototypes/items/angels-stone.lua +++ b/angelssmelting/prototypes/items/angels-stone.lua @@ -50,7 +50,7 @@ data:extend( type = "fluid", name = "liquid-concrete", icon = "__angelssmelting__/graphics/icons/molten-concrete.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-stone-casting", order = "g", default_temperature = 100, diff --git a/angelssmelting/prototypes/items/angels-tin.lua b/angelssmelting/prototypes/items/angels-tin.lua index 97e4f9819..6b501862d 100644 --- a/angelssmelting/prototypes/items/angels-tin.lua +++ b/angelssmelting/prototypes/items/angels-tin.lua @@ -15,7 +15,7 @@ data:extend( type = "item", name = "processed-tin", icon = "__angelssmelting__/graphics/icons/processed-tin.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-tin", order = "b", stack_size = 200 @@ -24,7 +24,7 @@ data:extend( type = "item", name = "pellet-tin", icon = "__angelssmelting__/graphics/icons/pellet-tin.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-tin", order = "c", stack_size = 200 @@ -34,7 +34,7 @@ data:extend( type = "item", name = "ingot-tin", icon = "__angelssmelting__/graphics/icons/ingot-tin.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-tin", order = "d", stack_size = 200 @@ -43,7 +43,7 @@ data:extend( type = "item", name = "powder-tin", icon = "__angelssmelting__/graphics/icons/powder-tin.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-tin", order = "e", stack_size = 200 @@ -53,7 +53,7 @@ data:extend( type = "fluid", name = "liquid-molten-tin", icon = "__angelssmelting__/graphics/icons/molten-tin.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-tin-casting", order = "f", default_temperature = 231.9, @@ -69,7 +69,7 @@ data:extend( type = "item", name = "angels-roll-tin", icon = "__angelssmelting__/graphics/icons/roll-tin.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-tin-casting", order = "g", stack_size = 200 @@ -78,7 +78,7 @@ data:extend( type = "item", name = "angels-wire-coil-tin", icon = "__angelssmelting__/graphics/icons/wire-coil-tin.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-tin-casting", order = "h", stack_size = 200 diff --git a/angelssmelting/prototypes/items/angels-titanium.lua b/angelssmelting/prototypes/items/angels-titanium.lua index 326d13a0a..200873184 100644 --- a/angelssmelting/prototypes/items/angels-titanium.lua +++ b/angelssmelting/prototypes/items/angels-titanium.lua @@ -17,7 +17,7 @@ data:extend( type = "item", name = "processed-titanium", icon = "__angelssmelting__/graphics/icons/processed-titanium.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-titanium", order = "b", stack_size = 200 @@ -26,7 +26,7 @@ data:extend( type = "item", name = "pellet-titanium", icon = "__angelssmelting__/graphics/icons/pellet-titanium.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-titanium", order = "c", stack_size = 200 @@ -60,7 +60,7 @@ data:extend( type = "item", name = "ingot-titanium", icon = "__angelssmelting__/graphics/icons/ingot-titanium.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-titanium", order = "f", stack_size = 200 @@ -69,7 +69,7 @@ data:extend( type = "item", name = "powder-titanium", icon = "__angelssmelting__/graphics/icons/powder-titanium.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-titanium", order = "g", stack_size = 200 @@ -79,7 +79,7 @@ data:extend( type = "fluid", name = "liquid-molten-titanium", icon = "__angelssmelting__/graphics/icons/molten-titanium.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-titanium-casting", order = "h", default_temperature = 100, @@ -95,7 +95,7 @@ data:extend( type = "item", name = "angels-roll-titanium", icon = "__angelssmelting__/graphics/icons/roll-titanium.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-titanium-casting", order = "i", stack_size = 200 diff --git a/angelssmelting/prototypes/items/angels-tungsten.lua b/angelssmelting/prototypes/items/angels-tungsten.lua index 3d383fc32..f6cffc7d5 100644 --- a/angelssmelting/prototypes/items/angels-tungsten.lua +++ b/angelssmelting/prototypes/items/angels-tungsten.lua @@ -17,7 +17,7 @@ data:extend( type = "item", name = "processed-tungsten", icon = "__angelssmelting__/graphics/icons/processed-tungsten.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-tungsten", order = "b", stack_size = 200 @@ -26,7 +26,7 @@ data:extend( type = "item", name = "pellet-tungsten", icon = "__angelssmelting__/graphics/icons/pellet-tungsten.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-tungsten", order = "c", stack_size = 200 @@ -84,7 +84,7 @@ data:extend( type = "item", name = "powder-tungsten", icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-tungsten", order = "h", stack_size = 200 @@ -94,7 +94,7 @@ data:extend( type = "item", name = "casting-powder-tungsten", icon = "__angelssmelting__/graphics/icons/powder-tungsten-mixture.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-tungsten-casting", order = "i", stack_size = 200 diff --git a/angelssmelting/prototypes/items/angels-zinc.lua b/angelssmelting/prototypes/items/angels-zinc.lua index d01db166b..ba704990d 100644 --- a/angelssmelting/prototypes/items/angels-zinc.lua +++ b/angelssmelting/prototypes/items/angels-zinc.lua @@ -15,7 +15,7 @@ data:extend( type = "item", name = "processed-zinc", icon = "__angelssmelting__/graphics/icons/processed-zinc.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-zinc", order = "b", stack_size = 200 @@ -24,7 +24,7 @@ data:extend( type = "item", name = "pellet-zinc", icon = "__angelssmelting__/graphics/icons/pellet-zinc.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-zinc", order = "c", stack_size = 200 @@ -52,7 +52,7 @@ data:extend( type = "item", name = "ingot-zinc", icon = "__angelssmelting__/graphics/icons/ingot-zinc.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-zinc", order = "f", stack_size = 200 @@ -61,7 +61,7 @@ data:extend( type = "item", name = "powder-zinc", icon = "__angelssmelting__/graphics/icons/powder-zinc.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-zinc", order = "g", stack_size = 200 @@ -71,7 +71,7 @@ data:extend( type = "fluid", name = "liquid-molten-zinc", icon = "__angelssmelting__/graphics/icons/molten-zinc.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-zinc-casting", order = "h", default_temperature = 419.5, @@ -87,7 +87,7 @@ data:extend( type = "item", name = "angels-roll-zinc", icon = "__angelssmelting__/graphics/icons/roll-zinc.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-zinc-casting", order = "i", stack_size = 200 diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-brass.lua b/angelssmelting/prototypes/override/smelting-override-alloy-brass.lua index 1ee1bc37a..2c1ee7a15 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-brass.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-brass.lua @@ -17,7 +17,7 @@ if angelsmods.trigger.smelting_products["brass"].plate then type = "fluid", name = "liquid-molten-brass", icon = "__angelssmelting__/graphics/icons/molten-brass.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-alloys-casting", order = "b[brass]-a[liquid-molten-brass]", default_temperature = 100, @@ -48,18 +48,9 @@ if angelsmods.trigger.smelting_products["brass"].plate then results = { {type = "fluid", name = "liquid-molten-brass", amount = 240} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-brass.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-brass"), + 1, angelsmods.smelting.number_tint), order = "b[brass]-a[liquid-molten-brass]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-brass") }, @@ -78,18 +69,9 @@ if angelsmods.trigger.smelting_products["brass"].plate then results = { {type = "fluid", name = "liquid-molten-brass", amount = 360} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-brass.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-brass"), + 2, angelsmods.smelting.number_tint), order = "b[brass]-a[liquid-molten-brass]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-brass") }, @@ -108,18 +90,9 @@ if angelsmods.trigger.smelting_products["brass"].plate then results = { {type = "fluid", name = "liquid-molten-brass", amount = 360} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-brass.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-brass"), + 3, angelsmods.smelting.number_tint), order = "b[brass]-a[liquid-molten-brass]-c", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-brass") }, @@ -137,15 +110,14 @@ if angelsmods.trigger.smelting_products["brass"].plate then results = { {type = "item", name = "brass-alloy", amount = 4} }, - icon_size = 32, order = "b[brass]-b[brass-alloy]" }, --TECHS { type = "technology", name = "angels-brass-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-brass.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-brass-tech.png", + icon_size = 256, icon_mipmaps = 4, prerequisites = { "angels-zinc-smelting-1", "angels-copper-smelting-1" @@ -173,10 +145,11 @@ if angelsmods.trigger.smelting_products["brass"].plate then { type = "technology", name = "angels-brass-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-brass.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-brass-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { + "angels-metallurgy-3", "angels-brass-smelting-1", "angels-tin-smelting-1" }, @@ -200,10 +173,11 @@ if angelsmods.trigger.smelting_products["brass"].plate then { type = "technology", name = "angels-brass-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-brass.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-brass-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { + "angels-metallurgy-4", "angels-brass-smelting-2", "angels-lead-smelting-1" }, diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua b/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua index 274bd6b7c..ce7d25b3d 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua @@ -17,7 +17,7 @@ if angelsmods.trigger.smelting_products["bronze"].plate then type = "fluid", name = "liquid-molten-bronze", icon = "__angelssmelting__/graphics/icons/molten-bronze.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-alloys-casting", order = "a[bronze]-a[liquid-molten-bronze]", default_temperature = 100, @@ -48,18 +48,9 @@ if angelsmods.trigger.smelting_products["bronze"].plate then results = { {type = "fluid", name = "liquid-molten-bronze", amount = 240} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-bronze.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-bronze"), + 1, angelsmods.smelting.number_tint), order = "a[bronze]-a[liquid-molten-bronze]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-bronze") }, @@ -78,18 +69,9 @@ if angelsmods.trigger.smelting_products["bronze"].plate then results = { {type = "fluid", name = "liquid-molten-bronze", amount = 360} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-bronze.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-bronze"), + 2, angelsmods.smelting.number_tint), order = "a[bronze]-a[liquid-molten-bronze]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-bronze") }, @@ -108,18 +90,9 @@ if angelsmods.trigger.smelting_products["bronze"].plate then results = { {type = "fluid", name = "liquid-molten-bronze", amount = 360} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-bronze.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-bronze"), + 3, angelsmods.smelting.number_tint), order = "a[bronze]-a[liquid-molten-bronze]-c", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-bronze") }, @@ -137,15 +110,14 @@ if angelsmods.trigger.smelting_products["bronze"].plate then results = { {type = "item", name = "bronze-alloy", amount = 4} }, - icon_size = 32, order = "a[bronze]-b[bronze-alloy]" }, --TECH { type = "technology", name = "angels-bronze-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-bronze.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-bronze-tech.png", + icon_size = 256, icon_mipmaps = 4, prerequisites = { "angels-tin-smelting-1", "angels-copper-smelting-1" @@ -172,10 +144,11 @@ if angelsmods.trigger.smelting_products["bronze"].plate then { type = "technology", name = "angels-bronze-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-bronze.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-bronze-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { + "angels-metallurgy-2", "angels-bronze-smelting-1", "angels-nickel-smelting-1" }, @@ -198,10 +171,11 @@ if angelsmods.trigger.smelting_products["bronze"].plate then { type = "technology", name = "angels-bronze-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-bronze.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-bronze-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { + "angels-metallurgy-3", "angels-bronze-smelting-2", "angels-zinc-smelting-1" }, @@ -227,5 +201,9 @@ if angelsmods.trigger.smelting_products["bronze"].plate then OV.add_prereq("alloy-processing-1", "angels-bronze-smelting-1") OV.disable_recipe({"bronze-alloy"}) angelsmods.functions.allow_productivity("angels-plate-bronze") + -- alloys shenanigans ------------------------------------------------------- + if mods["bobplates"] then + OV.add_prereq("alloy-processing","angels-bronze-smelting-1") + end end end diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-cobalt-steel.lua b/angelssmelting/prototypes/override/smelting-override-alloy-cobalt-steel.lua index 32cd4fc60..998fb6044 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-cobalt-steel.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-cobalt-steel.lua @@ -17,7 +17,7 @@ if angelsmods.trigger.smelting_products["cobalt-steel"].plate then type = "fluid", name = "liquid-molten-cobalt-steel", icon = "__angelssmelting__/graphics/icons/molten-cobalt-steel.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-alloys-casting", order = "e[cobalt-steel]-a[liquid-molten-cobalt-steel]", default_temperature = 100, @@ -48,18 +48,6 @@ if angelsmods.trigger.smelting_products["cobalt-steel"].plate then results = { {type = "fluid", name = "liquid-molten-cobalt-steel", amount = 360} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-cobalt-steel.png" - } - -- { - -- icon = "__angelsrefining__/graphics/icons/num_1.png", - -- tint = angelsmods.smelting.number_tint, - -- scale = 0.32, - -- shift = {-12, -12}, - -- } - }, - icon_size = 32, order = "e[cobalt-steel]-a[liquid-molten-cobalt-steel]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-cobalt-steel") }, @@ -77,15 +65,14 @@ if angelsmods.trigger.smelting_products["cobalt-steel"].plate then results = { {type = "item", name = "cobalt-steel-alloy", amount = 4} }, - icon_size = 32, order = "e[cobalt-steel]-b[cobalt-steel-alloy]" }, --TECHS { type = "technology", name = "angels-cobalt-steel-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-cobalt-steel.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-cobalt-steel-tech.png", + icon_size = 256, icon_mipmaps = 4, prerequisites = { "angels-steel-smelting-1", "angels-cobalt-smelting-1" diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-gunmetal.lua b/angelssmelting/prototypes/override/smelting-override-alloy-gunmetal.lua index e3a65db6b..12305b01c 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-gunmetal.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-gunmetal.lua @@ -17,7 +17,7 @@ if angelsmods.trigger.smelting_products["gunmetal"].plate then type = "fluid", name = "liquid-molten-gunmetal", icon = "__angelssmelting__/graphics/icons/molten-gunmetal.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-alloys-casting", order = "c[gunmetal]-a[liquid-molten-gunmetal]", default_temperature = 100, @@ -49,18 +49,6 @@ if angelsmods.trigger.smelting_products["gunmetal"].plate then results = { {type = "fluid", name = "liquid-molten-gunmetal", amount = 360} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-gunmetal.png" - } - -- { - -- icon = "__angelsrefining__/graphics/icons/num_1.png", - -- tint = angelsmods.smelting.number_tint, - -- scale = 0.32, - -- shift = {-12, -12}, - -- } - }, - icon_size = 32, order = "c[gunmetal]-a[liquid-molten-gunmetal]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-gunmetal") }, @@ -78,15 +66,14 @@ if angelsmods.trigger.smelting_products["gunmetal"].plate then results = { {type = "item", name = "gunmetal-alloy", amount = 4} }, - icon_size = 32, order = "c[gunmetal]-b[gunmetal-alloy]" }, --TECHS { type = "technology", name = "angels-gunmetal-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-gunmetal.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-gunmetal-tech.png", + icon_size = 256, icon_mipmaps = 4, prerequisites = { "angels-tin-smelting-1", "angels-zinc-smelting-1", diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-invar.lua b/angelssmelting/prototypes/override/smelting-override-alloy-invar.lua index c7a965580..a6a4e2080 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-invar.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-invar.lua @@ -10,6 +10,7 @@ end ------------------------------------------------------------------------------- if angelsmods.trigger.smelting_products["invar"].plate then if mods["bobplates"] then + OV.hide_recipe("invar-alloy") data:extend( { --INVAR @@ -18,7 +19,7 @@ if angelsmods.trigger.smelting_products["invar"].plate then type = "fluid", name = "liquid-molten-invar", icon = "__angelssmelting__/graphics/icons/molten-invar.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-alloys-casting", order = "d[invar]-a[liquid-molten-invar]", default_temperature = 100, @@ -50,18 +51,6 @@ if angelsmods.trigger.smelting_products["invar"].plate then results = { {type = "fluid", name = "liquid-molten-invar", amount = 360} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-invar.png" - } - -- { - -- icon = "__angelsrefining__/graphics/icons/num_1.png", - -- tint = angelsmods.smelting.number_tint, - -- scale = 0.32, - -- shift = {-12, -12}, - -- } - }, - icon_size = 32, order = "d[invar]-a[liquid-molten-invar]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-invar") }, @@ -79,15 +68,14 @@ if angelsmods.trigger.smelting_products["invar"].plate then results = { {type = "item", name = "invar-alloy", amount = 4} }, - icon_size = 32, order = "d[invar]-b[invar-alloy]" }, --TECH { type = "technology", name = "angels-invar-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-invar.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-invar-tech.png", + icon_size = 256, icon_mipmaps = 4, prerequisites = { "angels-steel-smelting-1", "angels-nickel-smelting-1" diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-nitinol.lua b/angelssmelting/prototypes/override/smelting-override-alloy-nitinol.lua index e56fe02b3..af29097a4 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-nitinol.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-nitinol.lua @@ -17,7 +17,7 @@ if angelsmods.trigger.smelting_products["nitinol"].plate then type = "fluid", name = "liquid-molten-nitinol", icon = "__angelssmelting__/graphics/icons/molten-nitinol.png", - icon_size = 32, + icon_size = 64, icon_mipmaps = 4, subgroup = "angels-alloys-casting", order = "f[nitinol]-a[liquid-molten-nitinol]", default_temperature = 100, @@ -48,18 +48,6 @@ if angelsmods.trigger.smelting_products["nitinol"].plate then results = { {type = "fluid", name = "liquid-molten-nitinol", amount = 360} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-nitinol.png" - } - -- { - -- icon = "__angelsrefining__/graphics/icons/num_1.png", - -- tint = angelsmods.smelting.number_tint, - -- scale = 0.32, - -- shift = {-12, -12}, - -- } - }, - icon_size = 32, order = "f[nitinol]-a[liquid-molten-nitinol]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-nitinol") }, @@ -77,15 +65,14 @@ if angelsmods.trigger.smelting_products["nitinol"].plate then results = { {type = "item", name = "nitinol-alloy", amount = 4} }, - icon_size = 32, order = "f[nitinol]-b[nitinol-alloy]" }, --TECHS { type = "technology", name = "angels-nitinol-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-nitinol.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-nitinol-tech.png", + icon_size = 256, icon_mipmaps = 4, prerequisites = { "angels-titanium-smelting-1", "angels-nickel-smelting-1" diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-steel.lua b/angelssmelting/prototypes/override/smelting-override-alloy-steel.lua index 5de2192c0..dbb635125 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-steel.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-steel.lua @@ -42,6 +42,11 @@ if angelsmods.trigger.smelting_products["steel"].ingot then OV.remove_prereq("angels-steel-smelting-2", "strand-casting-2") OV.remove_prereq("angels-steel-smelting-3", "strand-casting-3") end + + if angelsmods.trigger.smelting_products["steel"].powder then + else + data.raw.technology["angels-steel-smelting-2"].localised_name = {"", {"technology-name.angels-steel-casting"}, " 2"} + end else angelsmods.functions.add_flag("ingot-steel", "hidden") angelsmods.functions.add_flag("liquid-molten-steel", "hidden") diff --git a/angelssmelting/prototypes/override/smelting-override-aluminium.lua b/angelssmelting/prototypes/override/smelting-override-aluminium.lua index 904628255..a94967c45 100644 --- a/angelssmelting/prototypes/override/smelting-override-aluminium.lua +++ b/angelssmelting/prototypes/override/smelting-override-aluminium.lua @@ -47,9 +47,11 @@ if angelsmods.trigger.smelting_products["aluminium"].ingot then -- no need for molten recipe angelsmods.functions.add_flag("liquid-molten-aluminium", "hidden") OV.disable_recipe({ "molten-aluminium-smelting-1", "molten-aluminium-smelting-2", "molten-aluminium-smelting-3" }) - -- no need for the strand casting - OV.remove_prereq("angels-aluminium-smelting-2", "strand-casting-2") - OV.remove_prereq("angels-aluminium-smelting-3", "strand-casting-3") + OV.disable_technology({"angels-aluminium-casting-2", "angels-aluminium-casting-3"}) + -- swap tech tier 1 to ingots + for _, property in pairs({"icon", "icon_size", "icon_mipmaps", "icons", "localised_name"}) do + data.raw.technology["angels-aluminium-smelting-1"][property] = util.table.deepcopy(data.raw.technology["angels-aluminium-smelting-2"][property]) + end end else angelsmods.functions.add_flag("processed-aluminium", "hidden") @@ -59,11 +61,12 @@ else angelsmods.functions.add_flag("solid-aluminium-oxide", "hidden") angelsmods.functions.add_flag("ingot-aluminium", "hidden") angelsmods.functions.add_flag("liquid-molten-aluminium", "hidden") - OV.disable_recipe({ "aluminium-processed-processing", "pellet-aluminium-smelting", "bauxite-ore-smelting" }) - OV.disable_recipe({ "processed-aluminium-smelting", "solid-aluminium-hydroxide-smelting", "solid-sodium-aluminate-smelting" }) - OV.disable_recipe({ "solid-aluminium-oxide-smelting" }) - OV.disable_recipe({ "molten-aluminium-smelting-1", "molten-aluminium-smelting-2", "molten-aluminium-smelting-3" }) + OV.disable_recipe({"bauxite-ore-processing", "aluminium-processed-processing", "pellet-aluminium-smelting", "bauxite-ore-smelting" }) + OV.disable_recipe({"processed-aluminium-smelting", "solid-aluminium-hydroxide-smelting", "solid-sodium-aluminate-smelting" }) + OV.disable_recipe({"solid-aluminium-oxide-smelting" }) + OV.disable_recipe({"molten-aluminium-smelting-1", "molten-aluminium-smelting-2", "molten-aluminium-smelting-3" }) OV.disable_technology({"angels-aluminium-smelting-1", "angels-aluminium-smelting-2", "angels-aluminium-smelting-3"}) + OV.disable_technology({"angels-aluminium-casting-2", "angels-aluminium-casting-3"}) end ------------------------------------------------------------------------------- @@ -74,6 +77,7 @@ if angelsmods.trigger.smelting_products["aluminium"].plate then if mods['bobplates'] then OV.global_replace_item("angels-plate-aluminium", "aluminium-plate") angelsmods.functions.add_flag("angels-plate-aluminium", "hidden") + OV.hide_recipe({"bob-aluminium-plate","alumina"}) end else angelsmods.functions.add_flag("angels-plate-aluminium", "hidden") diff --git a/angelssmelting/prototypes/override/smelting-override-chrome.lua b/angelssmelting/prototypes/override/smelting-override-chrome.lua index 0511e1aee..8e95770a4 100644 --- a/angelssmelting/prototypes/override/smelting-override-chrome.lua +++ b/angelssmelting/prototypes/override/smelting-override-chrome.lua @@ -24,9 +24,11 @@ if angelsmods.trigger.smelting_products["chrome"].ingot then -- no need for molten recipe angelsmods.functions.add_flag("liquid-molten-chrome", "hidden") OV.disable_recipe({ "molten-chrome-smelting" }) - -- no need for the strand casting - OV.remove_prereq("angels-chrome-smelting-2", "strand-casting-3") - OV.remove_prereq("angels-chrome-smelting-3", "strand-casting-4") + OV.disable_technology({"angels-chrome-casting-2", "angels-chrome-casting-3"}) + -- swap tech tier 1 to ingots + for _, property in pairs({"icon", "icon_size", "icon_mipmaps", "icons", "localised_name"}) do + data.raw.technology["angels-chrome-smelting-1"][property] = util.table.deepcopy(data.raw.technology["angels-chrome-smelting-2"][property]) + end end else angelsmods.functions.add_flag("processed-chrome", "hidden") @@ -40,8 +42,8 @@ else OV.disable_recipe({ "solid-chromate-smelting", "solid-dichromate-smelting" }) OV.disable_recipe({ "chrome-ore-smelting", "processed-chrome-smelting", "solid-chrome-oxide-smelting" }) OV.disable_recipe({ "molten-chrome-smelting" }) - OV.disable_technology({"angels-chrome-smelting-1", "angels-chrome-smelting-2", "angels-chrome-smelting-3"}) + OV.disable_technology({"angels-chrome-casting-2", "angels-chrome-casting-3"}) end ------------------------------------------------------------------------------- diff --git a/angelssmelting/prototypes/override/smelting-override-cobalt.lua b/angelssmelting/prototypes/override/smelting-override-cobalt.lua index aca33694f..a8fac9175 100644 --- a/angelssmelting/prototypes/override/smelting-override-cobalt.lua +++ b/angelssmelting/prototypes/override/smelting-override-cobalt.lua @@ -31,9 +31,11 @@ if angelsmods.trigger.smelting_products["cobalt"].ingot then -- no need for molten recipe angelsmods.functions.add_flag("liquid-molten-cobalt", "hidden") OV.disable_recipe({"molten-cobalt-smelting"}) - -- no need for the strand casting - OV.remove_prereq("angels-cobalt-smelting-2", "strand-casting-2") - OV.remove_prereq("angels-cobalt-smelting-3", "strand-casting-3") + OV.disable_technology({"angels-cobalt-casting-2", "angels-cobalt-casting-3"}) + -- swap tech tier 1 to ingots + for _, property in pairs({"icon", "icon_size", "icon_mipmaps", "icons", "localised_name"}) do + data.raw.technology["angels-cobalt-smelting-1"][property] = util.table.deepcopy(data.raw.technology["angels-cobalt-smelting-2"][property]) + end end if mods["angelsindustries"] and angelsmods.industries.components then @@ -52,6 +54,7 @@ else OV.disable_recipe({"cobalt-ore-smelting", "solid-cobalt-oxide-smelting"}) OV.disable_recipe({"molten-cobalt-smelting"}) OV.disable_technology({"angels-cobalt-smelting-1", "angels-cobalt-smelting-2", "angels-cobalt-smelting-3"}) + OV.disable_technology({"angels-cobalt-casting-2", "angels-cobalt-casting-3"}) end ------------------------------------------------------------------------------- diff --git a/angelssmelting/prototypes/override/smelting-override-copper.lua b/angelssmelting/prototypes/override/smelting-override-copper.lua index cb3d69cc8..d205218f6 100644 --- a/angelssmelting/prototypes/override/smelting-override-copper.lua +++ b/angelssmelting/prototypes/override/smelting-override-copper.lua @@ -32,8 +32,11 @@ if angelsmods.trigger.smelting_products["copper"].ingot then if angelsmods.trigger.smelting_products["copper"].plate or angelsmods.trigger.smelting_products["copper"].wire then else - OV.remove_prereq("angels-copper-smelting-2", "strand-casting-1") - OV.remove_prereq("angels-copper-smelting-3", "strand-casting-2") + OV.disable_technology({"angels-copper-casting-2", "angels-copper-casting-3"}) + -- swap tech tier 1 to ingots + for _, property in pairs({"icon", "icon_size", "icon_mipmaps", "icons", "localised_name"}) do + data.raw.technology["angels-copper-smelting-1"][property] = util.table.deepcopy(data.raw.technology["angels-copper-smelting-2"][property]) + end end else --todo @@ -49,6 +52,8 @@ if angelsmods.trigger.smelting_products["copper"].plate then name = "copper-plate", energy_required = 10.5, normal = { + enabled = false, + hidden = true, --this essentially enforces the smelting of ore/advanced methods ingredients = { {name = "copper-ore", type = "item", amount = "+3"} }, @@ -57,6 +62,8 @@ if angelsmods.trigger.smelting_products["copper"].plate then } }, expensive = { + enabled = false, + hidden = true, --this essentially enforces the smelting of ore/advanced methods ingredients = { {"!!"}, {name = "copper-ore", type = "item", amount = 5 * intermediatemulti} diff --git a/angelssmelting/prototypes/override/smelting-override-glass.lua b/angelssmelting/prototypes/override/smelting-override-glass.lua index 4276e5ac3..eb6ab6b46 100644 --- a/angelssmelting/prototypes/override/smelting-override-glass.lua +++ b/angelssmelting/prototypes/override/smelting-override-glass.lua @@ -85,6 +85,7 @@ end ------------------------------------------------------------------------------- -- BOARD ---------------------------------------------------------------------- ------------------------------------------------------------------------------- +log(angelsmods.trigger.smelting_products["glass"].board) if angelsmods.trigger.smelting_products["glass"].board then if mods["bobelectronics"] then OV.patch_recipes( @@ -103,7 +104,9 @@ if angelsmods.trigger.smelting_products["glass"].board then }, { icon = "__angelssmelting__/graphics/icons/wire-coil-glass.png", - scale = 0.4375, + icon_size = 64, + icon_mipmaps = 4, + scale = 0.4375*0.5, shift = {-10, -10} } }, @@ -117,9 +120,22 @@ if angelsmods.trigger.smelting_products["glass"].board then -- disable bob variant OV.remove_unlock("advanced-electronics-2", "fibreglass-board") OV.disable_recipe({"fibreglass-board"}) + else + angelsmods.functions.add_flag("angels-coil-glass-fiber", "hidden") + OV.disable_recipe({"angels-coil-glass-fiber","angels-glass-fiber-board"}) + --[[OV.patch_recipes( + { + { + name = "angels-glass-fiber-board", + results = { + {"!!"}, + {name = "angels-glass-fiber-board", type = "item", amount = 4} + }, + } + } + )]] end else angelsmods.functions.add_flag("angels-coil-glass-fiber", "hidden") - OV.disable_recipe({"angels-coil-glass-fiber"}) - OV.disable_recipe({"angels-glass-fiber-board"}) + OV.disable_recipe({"angels-coil-glass-fiber","angels-glass-fiber-board"}) end diff --git a/angelssmelting/prototypes/override/smelting-override-gold.lua b/angelssmelting/prototypes/override/smelting-override-gold.lua index bd509523b..e817aabef 100644 --- a/angelssmelting/prototypes/override/smelting-override-gold.lua +++ b/angelssmelting/prototypes/override/smelting-override-gold.lua @@ -26,9 +26,11 @@ if angelsmods.trigger.smelting_products["gold"].ingot then -- no need for molten recipe angelsmods.functions.add_flag("liquid-molten-gold", "hidden") OV.disable_recipe({"molten-gold-smelting"}) - -- no need for the strand casting - OV.remove_prereq("angels-gold-smelting-2", "strand-casting-2") - OV.remove_prereq("angels-gold-smelting-3", "strand-casting-3") + OV.disable_technology({"angels-gold-casting-2", "angels-gold-casting-3"}) + -- swap tech tier 1 to ingots + for _, property in pairs({"icon", "icon_size", "icon_mipmaps", "icons", "localised_name"}) do + data.raw.technology["angels-gold-smelting-1"][property] = util.table.deepcopy(data.raw.technology["angels-gold-smelting-2"][property]) + end end else angelsmods.functions.add_flag("processed-gold", "hidden") @@ -43,6 +45,7 @@ else OV.disable_recipe({"gold-ore-smelting", "cathode-gold-smelting"}) OV.disable_recipe({"molten-gold-smelting"}) OV.disable_technology({"angels-gold-smelting-1", "angels-gold-smelting-2", "angels-gold-smelting-3"}) + OV.disable_technology({"angels-gold-casting-2", "angels-gold-casting-3"}) end ------------------------------------------------------------------------------- @@ -51,6 +54,7 @@ end if angelsmods.trigger.smelting_products["gold"].plate then -- REPLACE ITEMS (use bob version) if mods['bobplates'] then + OV.hide_recipe("bob-gold-plate") OV.global_replace_item("angels-plate-gold", "gold-plate") angelsmods.functions.add_flag("angels-plate-gold", "hidden") diff --git a/angelssmelting/prototypes/override/smelting-override-iron.lua b/angelssmelting/prototypes/override/smelting-override-iron.lua index 295728050..b7a22b611 100644 --- a/angelssmelting/prototypes/override/smelting-override-iron.lua +++ b/angelssmelting/prototypes/override/smelting-override-iron.lua @@ -53,8 +53,11 @@ if angelsmods.trigger.smelting_products["iron"].ingot then if angelsmods.trigger.smelting_products["iron"].plate or angelsmods.trigger.smelting_products["iron"].rod then else - OV.remove_prereq("angels-iron-smelting-2", "strand-casting-1") - OV.remove_prereq("angels-iron-smelting-3", "strand-casting-2") + OV.disable_technology({"angels-iron-casting-2", "angels-iron-casting-3"}) + -- swap tech tier 1 to ingots + for _, property in pairs({"icon", "icon_size", "icon_mipmaps", "icons", "localised_name"}) do + data.raw.technology["angels-iron-smelting-1"][property] = util.table.deepcopy(data.raw.technology["angels-iron-smelting-2"][property]) + end end else --todo @@ -70,6 +73,8 @@ if angelsmods.trigger.smelting_products["iron"].plate then name = "iron-plate", energy_required = 10.5, normal = { + enabled = false, + hidden = true, --this essentially enforces the smelting of ore/advanced methods ingredients = { {name = "iron-ore", type = "item", amount = "+3"} }, @@ -78,6 +83,8 @@ if angelsmods.trigger.smelting_products["iron"].plate then } }, expensive = { + enabled = false, + hidden = true, --this essentially enforces the smelting of ore/advanced methods ingredients = { {"!!"}, {name = "iron-ore", type = "item", amount = 5 * intermediatemulti} @@ -144,9 +151,9 @@ end -- ROD ------------------------------------------------------------------------ ------------------------------------------------------------------------------- if angelsmods.trigger.smelting_products["iron"].rod then - OV.global_replace_item("iron-stick", "angels-rod-iron") - angelsmods.functions.add_flag("iron-stick", "hidden") - OV.disable_recipe({"iron-stick"}) + OV.global_replace_item("angels-rod-iron","iron-stick") + --angelsmods.functions.add_flag("iron-stick", "hidden") + OV.disable_recipe({"iron-stick"}) --disable vanilla's recipe? else OV.disable_recipe({"rod-stack-iron-casting", "rod-stack-iron-casting-fast"}) OV.disable_recipe({"angels-rod-iron-plate", "angels-rod-stack-iron-converting"}) diff --git a/angelssmelting/prototypes/override/smelting-override-lead.lua b/angelssmelting/prototypes/override/smelting-override-lead.lua index c1d6fd889..f8d20f681 100644 --- a/angelssmelting/prototypes/override/smelting-override-lead.lua +++ b/angelssmelting/prototypes/override/smelting-override-lead.lua @@ -25,7 +25,7 @@ if angelsmods.trigger.smelting_products["lead"].ingot then if mods["bobplates"] then OV.global_replace_item("solid-lead-oxide", "lead-oxide") angelsmods.functions.add_flag("solid-lead-oxide", "hidden") - + OV.hide_recipe({"bob-lead-plate","lead-oxide","lead-oxide-2"}) OV.global_replace_technology("lead-processing", "angels-lead-smelting-1") end @@ -38,9 +38,11 @@ if angelsmods.trigger.smelting_products["lead"].ingot then if angelsmods.trigger.smelting_products["lead"].plate then else - -- no need for the strand casting - OV.remove_prereq("angels-lead-smelting-2", "strand-casting-1") - OV.remove_prereq("angels-lead-smelting-3", "strand-casting-2") + OV.disable_technology({"angels-lead-casting-2", "angels-lead-casting-3"}) + -- swap tech tier 1 to ingots + for _, property in pairs({"icon", "icon_size", "icon_mipmaps", "icons", "localised_name"}) do + data.raw.technology["angels-lead-smelting-1"][property] = util.table.deepcopy(data.raw.technology["angels-lead-smelting-2"][property]) + end end else angelsmods.functions.add_flag("processed-lead", "hidden") @@ -55,6 +57,7 @@ else OV.disable_recipe({"lead-ore-smelting", "solid-lead-oxide-smelting", "anode-lead-smelting"}) OV.disable_recipe({"molten-lead-smelting"}) OV.disable_technology({"angels-lead-smelting-1", "angels-lead-smelting-2", "angels-lead-smelting-3"}) + OV.disable_technology({"angels-lead-casting-2", "angels-lead-casting-3"}) end ------------------------------------------------------------------------------- @@ -83,6 +86,8 @@ if angelsmods.trigger.smelting_products["lead"].plate then name = "lead-plate", energy_required = 10.5, normal = { + enabled = false, + hidden = true, ingredients = { {name = "lead-ore", type = "item", amount = "+3"} }, @@ -91,6 +96,8 @@ if angelsmods.trigger.smelting_products["lead"].plate then } }, expensive = { + enabled = false, + hidden = true, ingredients = { {"!!"}, {name = "lead-ore", type = "item", amount = 5 * intermediatemulti} diff --git a/angelssmelting/prototypes/override/smelting-override-manganese.lua b/angelssmelting/prototypes/override/smelting-override-manganese.lua index f3c6dd421..47ca7db5d 100644 --- a/angelssmelting/prototypes/override/smelting-override-manganese.lua +++ b/angelssmelting/prototypes/override/smelting-override-manganese.lua @@ -24,9 +24,11 @@ if angelsmods.trigger.smelting_products["manganese"].ingot then -- no need for molten recipe angelsmods.functions.add_flag("liquid-molten-manganese", "hidden") OV.disable_recipe({"molten-manganese-smelting"}) - -- no need for the strand casting - OV.remove_prereq("angels-manganese-smelting-2", "strand-casting-2") - OV.remove_prereq("angels-manganese-smelting-3", "strand-casting-3") + OV.disable_technology({"angels-manganese-casting-2", "angels-manganese-casting-3"}) + -- swap tech tier 1 to ingots + for _, property in pairs({"icon", "icon_size", "icon_mipmaps", "icons", "localised_name"}) do + data.raw.technology["angels-manganese-smelting-1"][property] = util.table.deepcopy(data.raw.technology["angels-manganese-smelting-2"][property]) + end end if mods["angelsindustries"] and angelsmods.industries.components then @@ -43,8 +45,9 @@ else OV.disable_recipe({"manganese-ore-processing", "manganese-processed-processing"}) OV.disable_recipe({"pellet-manganese-smelting", "processed-manganese-smelting", "manganese-processed-processing-alt", "solid-manganese-oxide-smelting"}) OV.disable_recipe({"manganese-ore-smelting", "cathode-manganese-smelting"}) - OV.disable_recipe({"molten-manganese-smelting"}) + OV.disable_recipe({"molten-manganese-smelting", "solid-iron-hydroxide-smelting"}) OV.disable_technology({"angels-manganese-smelting-1", "angels-manganese-smelting-2", "angels-manganese-smelting-3"}) + OV.disable_technology({"angels-manganese-casting-2", "angels-manganese-casting-3"}) end ------------------------------------------------------------------------------- diff --git a/angelssmelting/prototypes/override/smelting-override-nickel.lua b/angelssmelting/prototypes/override/smelting-override-nickel.lua index a0da9a494..d70088f44 100644 --- a/angelssmelting/prototypes/override/smelting-override-nickel.lua +++ b/angelssmelting/prototypes/override/smelting-override-nickel.lua @@ -21,6 +21,7 @@ end if angelsmods.trigger.smelting_products["nickel"].ingot then if mods['bobplates'] then OV.global_replace_technology("nickel-processing", "angels-nickel-smelting-1") + OV.hide_recipe("bob-nickel-plate") end if angelsmods.trigger.smelting_products["nickel"].plate then @@ -28,9 +29,11 @@ if angelsmods.trigger.smelting_products["nickel"].ingot then -- no need for molten recipe angelsmods.functions.add_flag("liquid-molten-nickel", "hidden") OV.disable_recipe({"molten-nickel-smelting"}) - -- no need for the strand casting - OV.remove_prereq("angels-nickel-smelting-2", "strand-casting-1") - OV.remove_prereq("angels-nickel-smelting-3", "strand-casting-2") + OV.disable_technology({"angels-nickel-casting-2", "angels-nickel-casting-3"}) + -- swap tech tier 1 to ingots + for _, property in pairs({"icon", "icon_size", "icon_mipmaps", "icons", "localised_name"}) do + data.raw.technology["angels-nickel-smelting-1"][property] = util.table.deepcopy(data.raw.technology["angels-nickel-smelting-2"][property]) + end end else angelsmods.functions.add_flag("processed-nickel", "hidden") @@ -44,6 +47,7 @@ else OV.disable_recipe({"nickel-ore-smelting", "cathode-nickel-smelting", "solid-nickel-carbonyl-smelting"}) OV.disable_recipe({"molten-nickel-smelting"}) OV.disable_technology({"angels-nickel-smelting-1", "angels-nickel-smelting-2", "angels-nickel-smelting-3"}) + OV.disable_technology({"angels-nickel-casting-2", "angels-nickel-casting-3"}) end ------------------------------------------------------------------------------- diff --git a/angelssmelting/prototypes/override/smelting-override-platinum.lua b/angelssmelting/prototypes/override/smelting-override-platinum.lua index fa36800aa..936fa3cac 100644 --- a/angelssmelting/prototypes/override/smelting-override-platinum.lua +++ b/angelssmelting/prototypes/override/smelting-override-platinum.lua @@ -26,9 +26,11 @@ if angelsmods.trigger.smelting_products["platinum"].ingot then -- no need for molten recipe angelsmods.functions.add_flag("liquid-molten-platinum", "hidden") OV.disable_recipe({"molten-platinum-smelting"}) - -- no need for the strand casting - OV.remove_prereq("angels-platinum-smelting-2", "strand-casting-3") - OV.remove_prereq("angels-platinum-smelting-3", "strand-casting-4") + OV.disable_technology({"angels-platinum-casting-2", "angels-platinum-casting-3"}) + -- swap tech tier 1 to ingots + for _, property in pairs({"icon", "icon_size", "icon_mipmaps", "icons", "localised_name"}) do + data.raw.technology["angels-platinum-smelting-1"][property] = util.table.deepcopy(data.raw.technology["angels-platinum-smelting-2"][property]) + end end else angelsmods.functions.add_flag("processed-platinum", "hidden") @@ -42,6 +44,7 @@ else OV.disable_recipe({"platinum-ore-smelting", "processed-platinum-smelting", "solid-ammonium-chloroplatinate-smelting"}) OV.disable_recipe({"molten-platinum-smelting"}) OV.disable_technology({"angels-platinum-smelting-1", "angels-platinum-smelting-2", "angels-platinum-smelting-3"}) + OV.disable_technology({"angels-platinum-casting-2", "angels-platinum-casting-3"}) end ------------------------------------------------------------------------------- diff --git a/angelssmelting/prototypes/override/smelting-override-productivity.lua b/angelssmelting/prototypes/override/smelting-override-productivity.lua index 94b1f8bd1..2d2408f37 100644 --- a/angelssmelting/prototypes/override/smelting-override-productivity.lua +++ b/angelssmelting/prototypes/override/smelting-override-productivity.lua @@ -1,5 +1,7 @@ angelsmods.functions.allow_productivity("angels-plate-steel") angelsmods.functions.allow_productivity("angels-roll-steel-converting") +angelsmods.functions.allow_productivity("angels-rod-stack-steel-converting") + angelsmods.functions.allow_productivity("angels-solder") angelsmods.functions.allow_productivity("angels-roll-solder-converting") @@ -22,6 +24,7 @@ angelsmods.functions.allow_productivity("angels-roll-gold-converting") angelsmods.functions.allow_productivity("angels-plate-iron") angelsmods.functions.allow_productivity("angels-roll-iron-converting") +angelsmods.functions.allow_productivity("angels-rod-stack-iron-converting") angelsmods.functions.allow_productivity("angels-plate-lead") angelsmods.functions.allow_productivity("angels-roll-lead-converting") diff --git a/angelssmelting/prototypes/override/smelting-override-silicon.lua b/angelssmelting/prototypes/override/smelting-override-silicon.lua index c2039ab05..1ff5eba46 100644 --- a/angelssmelting/prototypes/override/smelting-override-silicon.lua +++ b/angelssmelting/prototypes/override/smelting-override-silicon.lua @@ -25,6 +25,11 @@ if angelsmods.trigger.smelting_products["silicon"].ingot then -- no need for molten recipe angelsmods.functions.add_flag("liquid-molten-silicon", "hidden") OV.disable_recipe({"molten-silicon-smelting"}) + OV.disable_technology({"angels-silicon-casting-2"--[[, "angels-silicon-casting-3"]]}) + -- swap tech tier 1 to ingots + for _, property in pairs({"icon", "icon_size", "icon_mipmaps", "icons", "localised_name"}) do + data.raw.technology["angels-silicon-smelting-1"][property] = util.table.deepcopy(data.raw.technology["angels-silicon-smelting-2"][property]) + end end else angelsmods.functions.add_flag("processed-silica", "hidden") @@ -38,6 +43,7 @@ else OV.disable_recipe({"silicon-ore-smelting", "liquid-trichlorosilane-smelting", "gas-silane-smelting"}) OV.disable_recipe({"molten-silicon-smelting"}) OV.disable_technology({"angels-silicon-smelting-1", "angels-silicon-smelting-2", "angels-silicon-smelting-3"}) + OV.disable_technology({"angels-silicon-casting-2"--[[, "angels-silicon-casting-3"]]}) end ------------------------------------------------------------------------------- @@ -99,7 +105,7 @@ if angelsmods.trigger.smelting_products["silicon"].powder then angelsmods.functions.move_item("silicon-powder", "angels-silicon", "g") data.raw.item["silicon-powder"].icon = "__angelssmelting__/graphics/icons/powder-silica.png" - data.raw.item["silicon-powder"].icon_size = 32 + data.raw.item["silicon-powder"].icon_size = 64 data.raw.item["silicon-powder"].localised_name = {"item-name.powder-silicon"} OV.patch_recipes( { diff --git a/angelssmelting/prototypes/override/smelting-override-silver.lua b/angelssmelting/prototypes/override/smelting-override-silver.lua index c25729788..b5137ecc1 100644 --- a/angelssmelting/prototypes/override/smelting-override-silver.lua +++ b/angelssmelting/prototypes/override/smelting-override-silver.lua @@ -24,7 +24,7 @@ if angelsmods.trigger.smelting_products["silver"].ingot then if mods['bobplates'] then OV.global_replace_item("solid-silver-nitrate", "silver-nitrate") angelsmods.functions.add_flag("solid-silver-nitrate", "hidden") - OV.disable_recipe({"silver-nitrate"}) + OV.disable_recipe({"silver-nitrate","silver-from-lead"}) end if mods['bobplates'] then @@ -40,9 +40,11 @@ if angelsmods.trigger.smelting_products["silver"].ingot then -- no need for molten recipe angelsmods.functions.add_flag("liquid-molten-silver", "hidden") OV.disable_recipe({"molten-silver-smelting"}) - -- no need for the strand casting - OV.remove_prereq("angels-silver-smelting-2", "strand-casting-2") - OV.remove_prereq("angels-silver-smelting-3", "strand-casting-3") + OV.disable_technology({"angels-silver-casting-2", "angels-silver-casting-3"}) + -- swap tech tier 1 to ingots + for _, property in pairs({"icon", "icon_size", "icon_mipmaps", "icons", "localised_name"}) do + data.raw.technology["angels-silver-smelting-1"][property] = util.table.deepcopy(data.raw.technology["angels-silver-smelting-2"][property]) + end end else angelsmods.functions.add_flag("processed-silver", "hidden") @@ -57,6 +59,7 @@ else OV.disable_recipe({"silver-ore-smelting", "solid-silver-nitrate-smelting", "cathode-silver-smelting"}) OV.disable_recipe({"molten-silver-smelting"}) OV.disable_technology({"angels-silver-smelting-1", "angels-silver-smelting-2", "angels-silver-smelting-3"}) + OV.disable_technology({"angels-silver-casting-2", "angels-silver-casting-3"}) end ------------------------------------------------------------------------------- diff --git a/angelssmelting/prototypes/override/smelting-override-stone.lua b/angelssmelting/prototypes/override/smelting-override-stone.lua index 08fa31ba5..4afb412d9 100644 --- a/angelssmelting/prototypes/override/smelting-override-stone.lua +++ b/angelssmelting/prototypes/override/smelting-override-stone.lua @@ -24,19 +24,15 @@ OV.patch_recipes({ { name = "stone-brick", subgroup = "angels-stone", order = "f[stone-brick]" }, { name = "concrete", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__base__/graphics/icons/concrete.png", - icon_size = 64 + { + icon = "__base__/graphics/icons/concrete.png", + icon_size = 64, icon_mipmaps = 4, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12}, - } - }, - icon_size = 32, + 1, angelsmods.smelting.number_tint), subgroup = "angels-stone-casting", order = "h[concrete]-a" }, { name = "hazard-concrete", subgroup = "angels-stone-casting", order = "h[concrete]-c" }, diff --git a/angelssmelting/prototypes/override/smelting-override-support.lua b/angelssmelting/prototypes/override/smelting-override-support.lua index 9caf68de3..6844c93e6 100644 --- a/angelssmelting/prototypes/override/smelting-override-support.lua +++ b/angelssmelting/prototypes/override/smelting-override-support.lua @@ -14,6 +14,7 @@ else OV.disable_recipe({"mold-non-expendable", "mold-non-expendable-wash"}) OV.remove_prereq("angels-metallurgy-2", "angels-stone-smelting-1") OV.remove_prereq("angels-metallurgy-3", "angels-stone-smelting-2") + OV.remove_prereq("angels-stone-smelting-2", "resins") end ------------------------------------------------------------------------------- diff --git a/angelssmelting/prototypes/override/smelting-override-tin.lua b/angelssmelting/prototypes/override/smelting-override-tin.lua index f9c807c7a..54872c750 100644 --- a/angelssmelting/prototypes/override/smelting-override-tin.lua +++ b/angelssmelting/prototypes/override/smelting-override-tin.lua @@ -23,11 +23,16 @@ if angelsmods.trigger.smelting_products["tin"].ingot then if angelsmods.trigger.smelting_products["tin"].plate or angelsmods.trigger.smelting_products["tin"].wire then else -- no need for molten recipe - angelsmods.functions.add_flag("liquid-molten-tin", "hidden") - OV.disable_recipe({"molten-tin-smelting"}) - -- no need for the strand casting - OV.remove_prereq("angels-tin-smelting-2", "strand-casting-1") - OV.remove_prereq("angels-tin-smelting-3", "strand-casting-2") + angelsmods.functions.add_flag("liquid-molten-tin", "hidden") + OV.disable_recipe({"molten-tin-smelting"}) + OV.disable_technology({"angels-tin-casting-2", "angels-tin-casting-3"}) + -- swap tech tier 1 to ingots + for _, property in pairs({"icon", "icon_size", "icon_mipmaps", "icons", "localised_name"}) do + data.raw.technology["angels-tin-smelting-1"][property] = util.table.deepcopy(data.raw.technology["angels-tin-smelting-2"][property]) + end + end + if mods["bobelectronics"] and mods["bobplates"] then --this is the minimum combo to make insulated wire to use tinned wire + OV.add_prereq("electronics","angels-tin-smelting-1") end else angelsmods.functions.add_flag("processed-tin", "hidden") @@ -38,6 +43,7 @@ else OV.disable_recipe({"tin-ore-smelting", "processed-tin-smelting", "pellet-tin-smelting"}) OV.disable_recipe({"molten-tin-smelting"}) OV.disable_technology({"angels-tin-smelting-1", "angels-tin-smelting-2", "angels-tin-smelting-3"}) + OV.disable_technology({"angels-tin-casting-2", "angels-tin-casting-3"}) end ------------------------------------------------------------------------------- @@ -67,6 +73,8 @@ if angelsmods.trigger.smelting_products["tin"].plate then name = "tin-plate", energy_required = 10.5, normal = { + enabled = false, + hidden = true, ingredients = { {name = "tin-ore", type = "item", amount = "+3"} }, @@ -75,6 +83,8 @@ if angelsmods.trigger.smelting_products["tin"].plate then } }, expensive = { + enabled = false, + hidden = true, ingredients = { {"!!"}, {name = "tin-ore", type = "item", amount = 5 * intermediatemulti} @@ -130,6 +140,10 @@ if angelsmods.trigger.smelting_products["tin"].wire then } ) end + if mods["bobelectronics"] then + OV.add_unlock("electronics","basic-tinned-copper-wire") + OV.remove_prereq("electronics","angels-tin-smelting-1") + end end else angelsmods.functions.add_flag("angels-wire-tin", "hidden") diff --git a/angelssmelting/prototypes/override/smelting-override-titanium.lua b/angelssmelting/prototypes/override/smelting-override-titanium.lua index ab2745ceb..b97a65df1 100644 --- a/angelssmelting/prototypes/override/smelting-override-titanium.lua +++ b/angelssmelting/prototypes/override/smelting-override-titanium.lua @@ -29,9 +29,11 @@ if angelsmods.trigger.smelting_products["titanium"].ingot then -- no need for molten recipe angelsmods.functions.add_flag("liquid-molten-titanium", "hidden") OV.disable_recipe({"molten-titanium-smelting-1", "molten-titanium-smelting-2", "molten-titanium-smelting-3", "molten-titanium-smelting-4", "molten-titanium-smelting-5"}) - -- no need for the strand casting - OV.remove_prereq("angels-titanium-smelting-2", "strand-casting-3") - OV.remove_prereq("angels-titanium-smelting-3", "strand-casting-4") + OV.disable_technology({"angels-titanium-casting-2", "angels-titanium-casting-3"}) + -- swap tech tier 1 to ingots + for _, property in pairs({"icon", "icon_size", "icon_mipmaps", "icons", "localised_name"}) do + data.raw.technology["angels-titanium-smelting-1"][property] = util.table.deepcopy(data.raw.technology["angels-titanium-smelting-2"][property]) + end end else angelsmods.functions.add_flag("processed-titanium", "hidden") @@ -45,6 +47,7 @@ else OV.disable_recipe({"sponge-titanium-smelting", "pellet-titanium-smelting"}) OV.disable_recipe({"molten-titanium-smelting-1", "molten-titanium-smelting-2", "molten-titanium-smelting-3", "molten-titanium-smelting-4", "molten-titanium-smelting-5"}) OV.disable_technology({"angels-titanium-smelting-1", "angels-titanium-smelting-2", "angels-titanium-smelting-3"}) + OV.disable_technology({"angels-titanium-casting-2", "angels-titanium-casting-3"}) end ------------------------------------------------------------------------------- diff --git a/angelssmelting/prototypes/override/smelting-override-tungsten.lua b/angelssmelting/prototypes/override/smelting-override-tungsten.lua index b983bb0b7..c2a0b4c40 100644 --- a/angelssmelting/prototypes/override/smelting-override-tungsten.lua +++ b/angelssmelting/prototypes/override/smelting-override-tungsten.lua @@ -68,37 +68,29 @@ if angelsmods.trigger.smelting_products["tungsten"].plate then name = "tungsten-carbide", subgroup = "angels-tungsten-casting", order = "k[tungsten-carbide]-a", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__bobplates__/graphics/icons/plate/tungsten-carbide-plate.png", - icon_size = 64, + { + icon = "__bobplates__/graphics/icons/plate/tungsten-carbide-plate.png", + icon_size = 64, icon_mipmaps = 1, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12}, - icon_size = 32 - } - } + 1, angelsmods.smelting.number_tint), }, { name = "tungsten-carbide-2", subgroup = "angels-tungsten-casting", order = "k[tungsten-carbide]-b", - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__bobplates__/graphics/icons/plate/tungsten-carbide-plate.png", - icon_size = 64, + { + icon = "__bobplates__/graphics/icons/plate/tungsten-carbide-plate.png", + icon_size = 64, icon_mipmaps = 1, + scale = 0.5 + } }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12}, - icon_size = 32 - } - } + 2, angelsmods.smelting.number_tint), }, }) end @@ -112,3 +104,19 @@ else OV.disable_recipe({"casting-powder-tungsten-1", "casting-powder-tungsten-2"}) OV.disable_recipe({"angels-plate-tungsten"}) end +--hide all if not used +if (not angelsmods.trigger.smelting_products["tungsten"].plate) and (not angelsmods.trigger.smelting_products["tungsten"].powder) then + OV.hide_recipe( + { + "tungsten-ore-processing", + "tungsten-processed-processing", + "tungsten-ore-smelting", + "liquid-tungstic-acid-smelting", + "pellet-tungsten-smelting", + "solid-tungsten-oxide-smelting", + "processed-tungsten-smelting", + "gas-tungsten-hexafluoride-smelting", + "solid-ammonium-paratungstate-smelting" + } + ) +end \ No newline at end of file diff --git a/angelssmelting/prototypes/override/smelting-override-zinc.lua b/angelssmelting/prototypes/override/smelting-override-zinc.lua index 69e4eb301..e2689d0b6 100644 --- a/angelssmelting/prototypes/override/smelting-override-zinc.lua +++ b/angelssmelting/prototypes/override/smelting-override-zinc.lua @@ -24,9 +24,11 @@ if angelsmods.trigger.smelting_products["zinc"].ingot then -- no need for molten recipe angelsmods.functions.add_flag("liquid-molten-zinc", "hidden") OV.disable_recipe({"molten-zinc-smelting"}) - -- no need for the strand casting - OV.remove_prereq("angels-zinc-smelting-2", "strand-casting-2") - OV.remove_prereq("angels-zinc-smelting-3", "strand-casting-3") + OV.disable_technology({"angels-zinc-casting-2", "angels-zinc-casting-3"}) + -- swap tech tier 1 to ingots + for _, property in pairs({"icon", "icon_size", "icon_mipmaps", "icons", "localised_name"}) do + data.raw.technology["angels-zinc-smelting-1"][property] = util.table.deepcopy(data.raw.technology["angels-zinc-smelting-2"][property]) + end end if mods["angelsindustries"] and angelsmods.industries.components then @@ -46,6 +48,7 @@ else OV.disable_recipe({"molten-zinc-smelting"}) OV.disable_recipe({"molten-zinc-smelting"}) OV.disable_technology({"angels-zinc-smelting-1", "angels-zinc-smelting-2", "angels-zinc-smelting-3"}) + OV.disable_technology({"angels-zinc-casting-2", "angels-zinc-casting-3"}) end ------------------------------------------------------------------------------- diff --git a/angelssmelting/prototypes/recipes/smelting-alloy-solder.lua b/angelssmelting/prototypes/recipes/smelting-alloy-solder.lua new file mode 100644 index 000000000..1153aa22a --- /dev/null +++ b/angelssmelting/prototypes/recipes/smelting-alloy-solder.lua @@ -0,0 +1,258 @@ +local intermediatemulti = angelsmods.marathon.intermediatemulti + +data:extend( + { + -- SOLDER SMELTING INTERMEDIATE + -- SOLDER SMELTING RESULTS + { + type = "recipe", + name = "angels-solder-mixture", + category = "crafting", + subgroup = "angels-alloys", + enabled = false, + energy_required = 2, + ingredients = { + {type = "item", name = "angels-plate-tin", amount = 2}, + {type = "item", name = "angels-plate-lead", amount = 2} + }, + results = { + {type = "item", name = "angels-solder-mixture", amount = 2} + }, + order = "a[solder]-a[angels-solder-mixture]-a" + }, + -- SOLDER CASTING INTERMEDIATE + { + type = "recipe", + name = "angels-solder-smelting-1", + category = "induction-smelting", + subgroup = "angels-solder-casting", + energy_required = 4, + enabled = false, + ingredients = { + {type = "item", name = "angels-solder-mixture", amount = 12} + }, + results = { + {type = "fluid", name = "liquid-molten-solder", amount = 120} + }, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-solder"), + 1, angelsmods.smelting.number_tint), + order = "b[liquid-molten-solder]-a", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-solder") + }, + { + type = "recipe", + name = "angels-solder-smelting-2", + category = "induction-smelting", + subgroup = "angels-solder-casting", + energy_required = 4, + enabled = false, + ingredients = { + {type = "item", name = "ingot-tin", amount = 12}, + {type = "item", name = "ingot-lead", amount = 12} + }, + results = { + {type = "fluid", name = "liquid-molten-solder", amount = 240} + }, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-solder"), + 2, angelsmods.smelting.number_tint), + order = "b[liquid-molten-solder]-b", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-solder") + }, + { + type = "recipe", + name = "angels-solder-smelting-3", + category = "induction-smelting-2", + subgroup = "angels-solder-casting", + energy_required = 4, + enabled = false, + ingredients = { + {type = "item", name = "ingot-tin", amount = 12}, + {type = "item", name = "ingot-zinc", amount = 12} + }, + results = { + {type = "fluid", name = "liquid-molten-solder", amount = 240} + }, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-solder"), + 3, angelsmods.smelting.number_tint), + order = "b[liquid-molten-solder]-c", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-solder") + }, + { + type = "recipe", + name = "angels-solder-smelting-4", + category = "induction-smelting-3", + subgroup = "angels-solder-casting", + energy_required = 4, + enabled = false, + ingredients = { + {type = "item", name = "ingot-tin", amount = 12}, + {type = "item", name = "ingot-copper", amount = 12}, + {type = "item", name = "ingot-silver", amount = 12} + }, + results = { + {type = "fluid", name = "liquid-molten-solder", amount = 360} + }, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-solder"), + 4, angelsmods.smelting.number_tint), + order = "b[liquid-molten-solder]-d", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-solder") + }, + { + type = "recipe", + name = "roll-solder-casting", + category = "strand-casting", + subgroup = "angels-solder-casting", + normal = { + enabled = false, + energy_required = 4, + ingredients = { + {type = "fluid", name = "liquid-molten-solder", amount = 80}, + {type = "fluid", name = "water", amount = 40} + }, + results = { + {type = "item", name = "angels-roll-solder", amount = 4} + } + }, + expensive = { + enabled = false, + energy_required = 4, + ingredients = { + {type = "fluid", name = "liquid-molten-solder", amount = 100 * intermediatemulti}, + {type = "fluid", name = "water", amount = 40} + }, + results = { + {type = "item", name = "angels-roll-solder", amount = 4} + } + }, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-solder"), + 1, angelsmods.smelting.number_tint), + order = "c[angels-roll-solder]-a", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-solder") + }, + { + type = "recipe", + name = "roll-solder-casting-fast", + category = "strand-casting-2", + subgroup = "angels-solder-casting", + normal = { + enabled = false, + energy_required = 2, + ingredients = { + {type = "fluid", name = "liquid-molten-solder", amount = 140}, + {type = "fluid", name = "liquid-coolant", amount = 40, maximum_temperature = 50} + }, + results = { + {type = "item", name = "angels-roll-solder", amount = 8}, + {type = "fluid", name = "liquid-coolant-used", amount = 40, temperature = 300} + }, + main_product = "angels-roll-solder" + }, + expensive = { + enabled = false, + energy_required = 2, + ingredients = { + {type = "fluid", name = "liquid-molten-solder", amount = 180 * intermediatemulti}, + {type = "fluid", name = "liquid-coolant", amount = 40, maximum_temperature = 50} + }, + results = { + {type = "item", name = "angels-roll-solder", amount = 8}, + {type = "fluid", name = "liquid-coolant-used", amount = 40, temperature = 300} + }, + main_product = "angels-roll-solder" + }, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-solder"), + 2, angelsmods.smelting.number_tint), + order = "c[angels-roll-solder]-b", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-solder") + }, + -- SOLDER CASTING RESULT + { + type = "recipe", + name = "angels-solder-mixture-smelting", + category = "smelting", + subgroup = "angels-solder-casting", + normal = { + enabled = false, + energy_required = 4, + ingredients = { + {type = "item", name = "angels-solder-mixture", amount = 2} + }, + results = { + {type = "item", name = "angels-solder", amount = 2} + } + }, + expensive = { + enabled = false, + energy_required = 4, + ingredients = { + {type = "item", name = "angels-solder-mixture", amount = 3 * intermediatemulti} + }, + results = { + {type = "item", name = "angels-solder", amount = 2} + } + }, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-solder"), + angelsmods.functions.get_object_icons("angels-solder-mixture"), + {-10, -10}, 0.4375), + order = "d[angels-solder]-a" + }, + { + type = "recipe", + name = "angels-solder", + category = "casting", + subgroup = "angels-solder-casting", + normal = { + enabled = false, + energy_required = 4, + ingredients = { + {type = "fluid", name = "liquid-molten-solder", amount = 40} + }, + results = { + {type = "item", name = "angels-solder", amount = 6} + } + }, + expensive = { + enabled = false, + energy_required = 4, + ingredients = { + {type = "fluid", name = "liquid-molten-solder", amount = 50 * intermediatemulti} + }, + results = { + {type = "item", name = "angels-solder", amount = 6} + } + }, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-solder"), + angelsmods.functions.get_object_icons("liquid-molten-solder"), + {-10, -10}, 0.4375), + order = "d[angels-solder]-b" + }, + { + type = "recipe", + name = "angels-roll-solder-converting", + category = "advanced-crafting", + subgroup = "angels-solder-casting", + energy_required = 0.5, + enabled = false, + allow_decomposition = false, + ingredients = { + {type = "item", name = "angels-roll-solder", amount = 4} + }, + results = { + {type = "item", name = "angels-solder", amount = 12} + }, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-solder"), + angelsmods.functions.get_object_icons("angels-roll-solder"), + {-10, -10}, 0.4375), + order = "d[angels-solder]-c" + } + } +) diff --git a/angelssmelting/prototypes/recipes/smelting-alloy-steel.lua b/angelssmelting/prototypes/recipes/smelting-alloy-steel.lua new file mode 100644 index 000000000..f83f68a7c --- /dev/null +++ b/angelssmelting/prototypes/recipes/smelting-alloy-steel.lua @@ -0,0 +1,405 @@ +local intermediatemulti = angelsmods.marathon.intermediatemulti + +data:extend( + { + -- STEEL SMELTING INTERMEDIATE + -- STEEL SMELTING RESULTS + { + type = "recipe", + name = "ingot-iron-smelting", + category = "blast-smelting", + subgroup = "angels-iron", + energy_required = 4, + enabled = false, + ingredients = { + {type = "item", name = "ingot-iron", amount = 24}, + {type = "fluid", name = "gas-oxygen", amount = 60} + }, + results = { + {type = "item", name = "ingot-steel", amount = 6} + }, + order = "f[ingot-steel]" + }, + { + type = "recipe", + name = "powder-steel", + category = "advanced-crafting", + subgroup = "angels-iron", + energy_required = 0.5, + enabled = false, + ingredients = { + {type = "item", name = "ingot-steel", amount = 1} + }, + results = { + {type = "item", name = "powder-steel", amount = 1} + }, + order = "h[powder-steel]" + }, + -- STEEL CASTING INTERMEDIATE + { + type = "recipe", + name = "molten-steel-smelting-1", + category = "induction-smelting", + subgroup = "angels-steel-casting", + energy_required = 4, + enabled = false, + ingredients = { + {type = "item", name = "ingot-steel", amount = 12} + }, + results = { + {type = "fluid", name = "liquid-molten-steel", amount = 120} + }, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-steel"), + 1, angelsmods.smelting.number_tint), + order = "i[liquid-molten-steel]-a", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") + }, + { + type = "recipe", + name = "molten-steel-smelting-2", + category = "induction-smelting-2", + subgroup = "angels-steel-casting", + energy_required = 4, + enabled = false, + ingredients = { + {type = "item", name = "ingot-steel", amount = 12}, + {type = "item", name = "ingot-silicon", amount = 12} + }, + results = { + {type = "fluid", name = "liquid-molten-steel", amount = 240} + }, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-steel"), + 2, angelsmods.smelting.number_tint), + order = "i[liquid-molten-steel]-b", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") + }, + { + type = "recipe", + name = "molten-steel-smelting-3", + category = "induction-smelting-2", + subgroup = "angels-steel-casting", + energy_required = 4, + enabled = false, + ingredients = { + {type = "item", name = "ingot-steel", amount = 12}, + {type = "item", name = "ingot-manganese", amount = 12} + }, + results = { + {type = "fluid", name = "liquid-molten-steel", amount = 240} + }, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-steel"), + 3, angelsmods.smelting.number_tint), + order = "i[liquid-molten-steel]-c", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") + }, + { + type = "recipe", + name = "molten-steel-smelting-4", + category = "induction-smelting-3", + subgroup = "angels-steel-casting", + energy_required = 4, + enabled = false, + ingredients = { + {type = "item", name = "ingot-steel", amount = 12}, + {type = "item", name = "ingot-cobalt", amount = 12}, + {type = "item", name = "ingot-nickel", amount = 12} + }, + results = { + {type = "fluid", name = "liquid-molten-steel", amount = 360} + }, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-steel"), + 4, angelsmods.smelting.number_tint), + order = "i[liquid-molten-steel]-d", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") + }, + { + type = "recipe", + name = "molten-steel-smelting-5", + category = "induction-smelting-3", + subgroup = "angels-steel-casting", + energy_required = 4, + enabled = false, + ingredients = { + {type = "item", name = "ingot-steel", amount = 12}, + {type = "item", name = "ingot-chrome", amount = 12}, + {type = "item", name = "powder-tungsten", amount = 12} + }, + results = { + {type = "fluid", name = "liquid-molten-steel", amount = 360} + }, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-steel"), + 5, angelsmods.smelting.number_tint), + order = "i[liquid-molten-steel]-e", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") + }, + { + type = "recipe", + name = "angels-roll-steel-casting", + category = "strand-casting", + subgroup = "angels-steel-casting", + normal = { + enabled = false, + energy_required = 4, + ingredients = { + {type = "fluid", name = "liquid-molten-steel", amount = 80}, + {type = "fluid", name = "water", amount = 40} + }, + results = { + {type = "item", name = "angels-roll-steel", amount = 2} + } + }, + expensive = { + enabled = false, + energy_required = 4, + ingredients = { + {type = "fluid", name = "liquid-molten-steel", amount = 100 * intermediatemulti}, + {type = "fluid", name = "water", amount = 40} + }, + results = { + {type = "item", name = "angels-roll-steel", amount = 2} + } + }, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-steel"), + 1, angelsmods.smelting.number_tint), + order = "j[angels-roll-steel]-a", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") + }, + { + type = "recipe", + name = "angels-roll-steel-casting-fast", + category = "strand-casting-2", + subgroup = "angels-steel-casting", + normal = { + enabled = false, + energy_required = 2, + ingredients = { + {type = "fluid", name = "liquid-molten-steel", amount = 140}, + {type = "fluid", name = "liquid-coolant", amount = 40, maximum_temperature = 50} + }, + results = { + {type = "item", name = "angels-roll-steel", amount = 4}, + {type = "fluid", name = "liquid-coolant-used", amount = 40, temperature = 300} + }, + main_product = "angels-roll-steel" + }, + expensive = { + enabled = false, + energy_required = 2, + ingredients = { + {type = "fluid", name = "liquid-molten-steel", amount = 180 * intermediatemulti}, + {type = "fluid", name = "liquid-coolant", amount = 40, maximum_temperature = 50} + }, + results = { + {type = "item", name = "angels-roll-steel", amount = 4}, + {type = "fluid", name = "liquid-coolant-used", amount = 40, temperature = 300} + }, + main_product = "angels-roll-steel" + }, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-steel"), + 2, angelsmods.smelting.number_tint), + order = "j[angels-roll-steel]-b", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") + }, + { + type = "recipe", + name = "rod-stack-steel-casting", + category = "strand-casting", + subgroup = "angels-steel-casting", + normal = { + enabled = false, + energy_required = 4, + ingredients = { + {type = "fluid", name = "liquid-molten-steel", amount = 60}, + {type = "fluid", name = "water", amount = 40} + }, + results = { + {type = "item", name = "angels-rod-stack-steel", amount = 1} + } + }, + expensive = { + enabled = false, + energy_required = 4, + ingredients = { + {type = "fluid", name = "liquid-molten-steel", amount = 80 * intermediatemulti}, + {type = "fluid", name = "water", amount = 40} + }, + results = { + {type = "item", name = "angels-rod-stack-steel", amount = 1} + } + }, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-rod-stack-steel"), + 1, angelsmods.smelting.number_tint), + order = "k[angels-rod-stack-steel]-a", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") + }, + { + type = "recipe", + name = "rod-stack-steel-casting-fast", + category = "strand-casting-2", + subgroup = "angels-steel-casting", + normal = { + enabled = false, + energy_required = 2, + ingredients = { + {type = "fluid", name = "liquid-molten-steel", amount = 110}, + {type = "fluid", name = "liquid-coolant", amount = 40, maximum_temperature = 50} + }, + results = { + {type = "item", name = "angels-rod-stack-steel", amount = 2}, + {type = "fluid", name = "liquid-coolant-used", amount = 40, temperature = 300} + }, + main_product = "angels-rod-stack-steel" + }, + expensive = { + enabled = false, + energy_required = 2, + ingredients = { + {type = "fluid", name = "liquid-molten-steel", amount = 150 * intermediatemulti}, + {type = "fluid", name = "liquid-coolant", amount = 40, maximum_temperature = 50} + }, + results = { + {type = "item", name = "angels-rod-stack-steel", amount = 2}, + {type = "fluid", name = "liquid-coolant-used", amount = 40, temperature = 300} + }, + main_product = "angels-rod-stack-steel" + }, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-rod-stack-steel"), + 2, angelsmods.smelting.number_tint), + order = "k[angels-rod-stack-steel]-b", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") + }, + -- STEEL CASTING RESULT + { + type = "recipe", + name = "angels-plate-steel-pre-heating", + category = "advanced-crafting", + subgroup = "angels-steel-casting", + normal = { + enabled = false, + energy_required = 4, + ingredients = { + {type = "item", name = "angels-plate-hot-iron", amount = 8} + }, + results = { + {type = "item", name = "angels-plate-steel", amount = 1} + } + }, + expensive = { + enabled = false, + energy_required = 4, + ingredients = { + {type = "item", name = "angels-plate-hot-iron", amount = 8 * intermediatemulti} + }, + results = { + {type = "item", name = "angels-plate-steel", amount = 1} + } + }, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-steel"), + angelsmods.functions.get_object_icons("angels-plate-hot-iron"), + {-10, -10}, 0.4375), + order = "l[angels-plate-steel]-ab" + }, + { + type = "recipe", + name = "angels-plate-steel", + category = "casting", + subgroup = "angels-steel-casting", + normal = { + enabled = false, + energy_required = 4, + ingredients = { + {type = "fluid", name = "liquid-molten-steel", amount = 40} + }, + results = { + {type = "item", name = "angels-plate-steel", amount = 4} + } + }, + expensive = { + enabled = false, + energy_required = 4, + ingredients = { + {type = "fluid", name = "liquid-molten-steel", amount = 50 * intermediatemulti} + }, + results = { + {type = "item", name = "angels-plate-steel", amount = 4} + } + }, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-steel"), + angelsmods.functions.get_object_icons("liquid-molten-steel"), + {-10, -10}, 0.4375), + order = "l[angels-plate-steel]-b" -- l[angels-plate-steel]-a reserved for base game smelting recipe (see global overrides) + }, + { + type = "recipe", + name = "angels-roll-steel-converting", + category = "advanced-crafting", + subgroup = "angels-steel-casting", + energy_required = 0.5, + allow_decomposition = false, + enabled = false, + ingredients = { + {type = "item", name = "angels-roll-steel", amount = 1} + }, + results = { + {type = "item", name = "angels-plate-steel", amount = 4} + }, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-steel"), + angelsmods.functions.get_object_icons("angels-roll-steel"), + {-10, -10}, 0.4375), + order = "l[angels-plate-steel]-c" + }, + { + type = "recipe", + name = "angels-rod-steel-plate", + category = "crafting", + subgroup = "angels-steel-casting", + energy_required = 0.5, + enabled = false, + allow_decomposition = true, + ingredients = { + {type = "item", name = "angels-plate-steel", amount = 2} + }, + results = { + {type = "item", name = "angels-rod-steel", amount = 1} + }, + allow_decomposition = false, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-rod-steel"), + angelsmods.functions.get_object_icons("angels-plate-steel"), + {-10, -10}, 0.4375), + order = "m[angels-rod-steel]-a" + }, + { + type = "recipe", + name = "angels-rod-stack-steel-converting", + category = "advanced-crafting", + subgroup = "angels-steel-casting", + energy_required = 0.5, + enabled = false, + allow_decomposition = false, + ingredients = { + {type = "item", name = "angels-rod-stack-steel", amount = 1} + }, + results = { + {type = "item", name = "angels-rod-steel", amount = 4} + }, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-rod-steel"), + angelsmods.functions.get_object_icons("angels-rod-stack-steel"), + {-10, -10}, 0.4375), + order = "m[angels-rod-steel]-b" + } + } +) diff --git a/angelssmelting/prototypes/recipes/smelting-alloys.lua b/angelssmelting/prototypes/recipes/smelting-alloys.lua deleted file mode 100644 index c63630e9b..000000000 --- a/angelssmelting/prototypes/recipes/smelting-alloys.lua +++ /dev/null @@ -1,852 +0,0 @@ -local intermediatemulti = angelsmods.marathon.intermediatemulti - -data:extend( - { - -- STEEL SMELTING INTERMEDIATE - -- STEEL SMELTING RESULTS - { - type = "recipe", - name = "ingot-iron-smelting", - category = "blast-smelting", - subgroup = "angels-iron", - energy_required = 4, - enabled = false, - ingredients = { - {type = "item", name = "ingot-iron", amount = 24}, - {type = "fluid", name = "gas-oxygen", amount = 60} - }, - results = { - {type = "item", name = "ingot-steel", amount = 6} - }, - icon_size = 32, - order = "f[ingot-steel]" - }, - { - type = "recipe", - name = "powder-steel", - category = "advanced-crafting", - subgroup = "angels-iron", - energy_required = 0.5, - enabled = false, - ingredients = { - {type = "item", name = "ingot-steel", amount = 1} - }, - results = { - {type = "item", name = "powder-steel", amount = 1} - }, - icon_size = 32, - order = "h[powder-steel]" - }, - -- STEEL CASTING INTERMEDIATE - { - type = "recipe", - name = "molten-steel-smelting-1", - category = "induction-smelting", - subgroup = "angels-steel-casting", - energy_required = 4, - enabled = false, - ingredients = { - {type = "item", name = "ingot-steel", amount = 12} - }, - results = { - {type = "fluid", name = "liquid-molten-steel", amount = 120} - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-steel.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - order = "i[liquid-molten-steel]-a", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") - }, - { - type = "recipe", - name = "molten-steel-smelting-2", - category = "induction-smelting-2", - subgroup = "angels-steel-casting", - energy_required = 4, - enabled = false, - ingredients = { - {type = "item", name = "ingot-steel", amount = 12}, - {type = "item", name = "ingot-silicon", amount = 12} - }, - results = { - {type = "fluid", name = "liquid-molten-steel", amount = 240} - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-steel.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - order = "i[liquid-molten-steel]-b", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") - }, - { - type = "recipe", - name = "molten-steel-smelting-3", - category = "induction-smelting-2", - subgroup = "angels-steel-casting", - energy_required = 4, - enabled = false, - ingredients = { - {type = "item", name = "ingot-steel", amount = 12}, - {type = "item", name = "ingot-manganese", amount = 12} - }, - results = { - {type = "fluid", name = "liquid-molten-steel", amount = 240} - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-steel.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - order = "i[liquid-molten-steel]-c", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") - }, - { - type = "recipe", - name = "molten-steel-smelting-4", - category = "induction-smelting-3", - subgroup = "angels-steel-casting", - energy_required = 4, - enabled = false, - ingredients = { - {type = "item", name = "ingot-steel", amount = 12}, - {type = "item", name = "ingot-cobalt", amount = 12}, - {type = "item", name = "ingot-nickel", amount = 12} - }, - results = { - {type = "fluid", name = "liquid-molten-steel", amount = 360} - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-steel.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - order = "i[liquid-molten-steel]-d", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") - }, - { - type = "recipe", - name = "molten-steel-smelting-5", - category = "induction-smelting-3", - subgroup = "angels-steel-casting", - energy_required = 4, - enabled = false, - ingredients = { - {type = "item", name = "ingot-steel", amount = 12}, - {type = "item", name = "ingot-chrome", amount = 12}, - {type = "item", name = "powder-tungsten", amount = 12} - }, - results = { - {type = "fluid", name = "liquid-molten-steel", amount = 360} - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-steel.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_5.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - order = "i[liquid-molten-steel]-e", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") - }, - { - type = "recipe", - name = "angels-roll-steel-casting", - category = "strand-casting", - subgroup = "angels-steel-casting", - normal = { - enabled = false, - energy_required = 4, - ingredients = { - {type = "fluid", name = "liquid-molten-steel", amount = 80}, - {type = "fluid", name = "water", amount = 40} - }, - results = { - {type = "item", name = "angels-roll-steel", amount = 2} - } - }, - expensive = { - enabled = false, - energy_required = 4, - ingredients = { - {type = "fluid", name = "liquid-molten-steel", amount = 100 * intermediatemulti}, - {type = "fluid", name = "water", amount = 40} - }, - results = { - {type = "item", name = "angels-roll-steel", amount = 2} - } - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-steel.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - order = "j[angels-roll-steel]-a", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") - }, - { - type = "recipe", - name = "angels-roll-steel-casting-fast", - category = "strand-casting-2", - subgroup = "angels-steel-casting", - normal = { - enabled = false, - energy_required = 2, - ingredients = { - {type = "fluid", name = "liquid-molten-steel", amount = 140}, - {type = "fluid", name = "liquid-coolant", amount = 40, maximum_temperature = 50} - }, - results = { - {type = "item", name = "angels-roll-steel", amount = 4}, - {type = "fluid", name = "liquid-coolant-used", amount = 40, temperature = 300} - }, - main_product = "angels-roll-steel" - }, - expensive = { - enabled = false, - energy_required = 2, - ingredients = { - {type = "fluid", name = "liquid-molten-steel", amount = 180 * intermediatemulti}, - {type = "fluid", name = "liquid-coolant", amount = 40, maximum_temperature = 50} - }, - results = { - {type = "item", name = "angels-roll-steel", amount = 4}, - {type = "fluid", name = "liquid-coolant-used", amount = 40, temperature = 300} - }, - main_product = "angels-roll-steel" - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-steel.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - order = "j[angels-roll-steel]-b", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") - }, - { - type = "recipe", - name = "rod-stack-steel-casting", - category = "strand-casting", - subgroup = "angels-steel-casting", - normal = { - enabled = false, - energy_required = 4, - ingredients = { - {type = "fluid", name = "liquid-molten-steel", amount = 60}, - {type = "fluid", name = "water", amount = 40} - }, - results = { - {type = "item", name = "angels-rod-stack-steel", amount = 1} - } - }, - expensive = { - enabled = false, - energy_required = 4, - ingredients = { - {type = "fluid", name = "liquid-molten-steel", amount = 80 * intermediatemulti}, - {type = "fluid", name = "water", amount = 40} - }, - results = { - {type = "item", name = "angels-rod-stack-steel", amount = 1} - } - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/rod-stack-steel.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - order = "k[angels-rod-stack-steel]-a", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") - }, - { - type = "recipe", - name = "rod-stack-steel-casting-fast", - category = "strand-casting-2", - subgroup = "angels-steel-casting", - normal = { - enabled = false, - energy_required = 2, - ingredients = { - {type = "fluid", name = "liquid-molten-steel", amount = 110}, - {type = "fluid", name = "liquid-coolant", amount = 40, maximum_temperature = 50} - }, - results = { - {type = "item", name = "angels-rod-stack-steel", amount = 2}, - {type = "fluid", name = "liquid-coolant-used", amount = 40, temperature = 300} - }, - main_product = "angels-rod-stack-steel" - }, - expensive = { - enabled = false, - energy_required = 2, - ingredients = { - {type = "fluid", name = "liquid-molten-steel", amount = 150 * intermediatemulti}, - {type = "fluid", name = "liquid-coolant", amount = 40, maximum_temperature = 50} - }, - results = { - {type = "item", name = "angels-rod-stack-steel", amount = 2}, - {type = "fluid", name = "liquid-coolant-used", amount = 40, temperature = 300} - }, - main_product = "angels-rod-stack-steel" - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/rod-stack-steel.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - order = "k[angels-rod-stack-steel]-b", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") - }, - -- STEEL CASTING RESULT - { - type = "recipe", - name = "angels-plate-steel-pre-heating", - category = "advanced-crafting", - subgroup = "angels-steel-casting", - normal = { - enabled = false, - energy_required = 4, - ingredients = { - {type = "item", name = "angels-plate-hot-iron", amount = 8} - }, - results = { - {type = "item", name = "angels-plate-steel", amount = 1} - } - }, - expensive = { - enabled = false, - energy_required = 4, - ingredients = { - {type = "item", name = "angels-plate-hot-iron", amount = 8 * intermediatemulti} - }, - results = { - {type = "item", name = "angels-plate-steel", amount = 1} - } - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-steel.png" - }, - { - icon = "__angelssmelting__/graphics/icons/plate-iron-hot.png", - icon_size = 64, - scale = 0.4375 * 0.5, - shift = {-10, -10} - } - }, - icon_size = 32, - order = "l[angels-plate-steel]-ab" - }, - { - type = "recipe", - name = "angels-plate-steel", - category = "casting", - subgroup = "angels-steel-casting", - normal = { - enabled = false, - energy_required = 4, - ingredients = { - {type = "fluid", name = "liquid-molten-steel", amount = 40} - }, - results = { - {type = "item", name = "angels-plate-steel", amount = 4} - } - }, - expensive = { - enabled = false, - energy_required = 4, - ingredients = { - {type = "fluid", name = "liquid-molten-steel", amount = 50 * intermediatemulti} - }, - results = { - {type = "item", name = "angels-plate-steel", amount = 4} - } - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-steel.png" - }, - { - icon = "__angelssmelting__/graphics/icons/molten-steel.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, - order = "l[angels-plate-steel]-b" -- l[angels-plate-steel]-a reserved for base game smelting recipe (see global overrides) - }, - { - type = "recipe", - name = "angels-roll-steel-converting", - category = "advanced-crafting", - subgroup = "angels-steel-casting", - energy_required = 0.5, - allow_decomposition = false, - enabled = false, - ingredients = { - {type = "item", name = "angels-roll-steel", amount = 1} - }, - results = { - {type = "item", name = "angels-plate-steel", amount = 4} - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-steel.png" - }, - { - icon = "__angelssmelting__/graphics/icons/roll-steel.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, - order = "l[angels-plate-steel]-c" - }, - { - type = "recipe", - name = "angels-rod-steel-plate", - category = "crafting", - subgroup = "angels-steel-casting", - energy_required = 0.5, - enabled = false, - allow_decomposition = true, - ingredients = { - {type = "item", name = "angels-plate-steel", amount = 2} - }, - results = { - {type = "item", name = "angels-rod-steel", amount = 1} - }, - allow_decomposition = false, - icons = { - { - icon = "__angelssmelting__/graphics/icons/rod-steel.png" - }, - { - icon = "__angelssmelting__/graphics/icons/plate-steel.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, - order = "m[angels-rod-steel]-a" - }, - { - type = "recipe", - name = "angels-rod-stack-steel-converting", - category = "advanced-crafting", - subgroup = "angels-steel-casting", - energy_required = 0.5, - enabled = false, - allow_decomposition = false, - ingredients = { - {type = "item", name = "angels-rod-stack-steel", amount = 1} - }, - results = { - {type = "item", name = "angels-rod-steel", amount = 4} - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/rod-steel.png" - }, - { - icon = "__angelssmelting__/graphics/icons/rod-stack-steel.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, - order = "m[angels-rod-steel]-b" - }, - -- SOLDER SMELTING INTERMEDIATE - -- SOLDER SMELTING RESULTS - { - type = "recipe", - name = "angels-solder-mixture", - category = "crafting", - subgroup = "angels-alloys", - enabled = false, - energy_required = 2, - ingredients = { - {type = "item", name = "angels-plate-tin", amount = 2}, - {type = "item", name = "angels-plate-lead", amount = 2} - }, - results = { - {type = "item", name = "angels-solder-mixture", amount = 2} - }, - icon_size = 32, - order = "a[solder]-a[angels-solder-mixture]-a" - }, - -- SOLDER CASTING INTERMEDIATE - { - type = "recipe", - name = "angels-solder-smelting-1", - category = "induction-smelting", - subgroup = "angels-solder-casting", - energy_required = 4, - enabled = false, - ingredients = { - {type = "item", name = "angels-solder-mixture", amount = 12} - }, - results = { - {type = "fluid", name = "liquid-molten-solder", amount = 120} - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-solder.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - order = "b[liquid-molten-solder]-a", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-solder") - }, - { - type = "recipe", - name = "angels-solder-smelting-2", - category = "induction-smelting", - subgroup = "angels-solder-casting", - energy_required = 4, - enabled = false, - ingredients = { - {type = "item", name = "ingot-tin", amount = 12}, - {type = "item", name = "ingot-lead", amount = 12} - }, - results = { - {type = "fluid", name = "liquid-molten-solder", amount = 240} - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-solder.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - order = "b[liquid-molten-solder]-b", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-solder") - }, - { - type = "recipe", - name = "angels-solder-smelting-3", - category = "induction-smelting-2", - subgroup = "angels-solder-casting", - energy_required = 4, - enabled = false, - ingredients = { - {type = "item", name = "ingot-tin", amount = 12}, - {type = "item", name = "ingot-zinc", amount = 12} - }, - results = { - {type = "fluid", name = "liquid-molten-solder", amount = 240} - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-solder.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - order = "b[liquid-molten-solder]-c", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-solder") - }, - { - type = "recipe", - name = "angels-solder-smelting-4", - category = "induction-smelting-3", - subgroup = "angels-solder-casting", - energy_required = 4, - enabled = false, - ingredients = { - {type = "item", name = "ingot-tin", amount = 12}, - {type = "item", name = "ingot-copper", amount = 12}, - {type = "item", name = "ingot-silver", amount = 12} - }, - results = { - {type = "fluid", name = "liquid-molten-solder", amount = 360} - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-solder.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - order = "b[liquid-molten-solder]-d", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-solder") - }, - { - type = "recipe", - name = "roll-solder-casting", - category = "strand-casting", - subgroup = "angels-solder-casting", - normal = { - enabled = false, - energy_required = 4, - ingredients = { - {type = "fluid", name = "liquid-molten-solder", amount = 80}, - {type = "fluid", name = "water", amount = 40} - }, - results = { - {type = "item", name = "angels-roll-solder", amount = 4} - } - }, - expensive = { - enabled = false, - energy_required = 4, - ingredients = { - {type = "fluid", name = "liquid-molten-solder", amount = 100 * intermediatemulti}, - {type = "fluid", name = "water", amount = 40} - }, - results = { - {type = "item", name = "angels-roll-solder", amount = 4} - } - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-solder.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - order = "c[angels-roll-solder]-a", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-solder") - }, - { - type = "recipe", - name = "roll-solder-casting-fast", - category = "strand-casting-2", - subgroup = "angels-solder-casting", - normal = { - enabled = false, - energy_required = 2, - ingredients = { - {type = "fluid", name = "liquid-molten-solder", amount = 140}, - {type = "fluid", name = "liquid-coolant", amount = 40, maximum_temperature = 50} - }, - results = { - {type = "item", name = "angels-roll-solder", amount = 8}, - {type = "fluid", name = "liquid-coolant-used", amount = 40, temperature = 300} - }, - main_product = "angels-roll-solder" - }, - expensive = { - enabled = false, - energy_required = 2, - ingredients = { - {type = "fluid", name = "liquid-molten-solder", amount = 180 * intermediatemulti}, - {type = "fluid", name = "liquid-coolant", amount = 40, maximum_temperature = 50} - }, - results = { - {type = "item", name = "angels-roll-solder", amount = 8}, - {type = "fluid", name = "liquid-coolant-used", amount = 40, temperature = 300} - }, - main_product = "angels-roll-solder" - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-solder.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, - order = "c[angels-roll-solder]-b", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-solder") - }, - -- SOLDER CASTING RESULT - { - type = "recipe", - name = "angels-solder-mixture-smelting", - category = "smelting", - subgroup = "angels-solder-casting", - normal = { - enabled = false, - energy_required = 4, - ingredients = { - {type = "item", name = "angels-solder-mixture", amount = 2} - }, - results = { - {type = "item", name = "angels-solder", amount = 2} - } - }, - expensive = { - enabled = false, - energy_required = 4, - ingredients = { - {type = "item", name = "angels-solder-mixture", amount = 3 * intermediatemulti} - }, - results = { - {type = "item", name = "angels-solder", amount = 2} - } - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/solder.png" - }, - { - icon = "__angelssmelting__/graphics/icons/solder-mixture.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, - order = "d[angels-solder]-a" - }, - { - type = "recipe", - name = "angels-solder", - category = "casting", - subgroup = "angels-solder-casting", - normal = { - enabled = false, - energy_required = 4, - ingredients = { - {type = "fluid", name = "liquid-molten-solder", amount = 40} - }, - results = { - {type = "item", name = "angels-solder", amount = 6} - } - }, - expensive = { - enabled = false, - energy_required = 4, - ingredients = { - {type = "fluid", name = "liquid-molten-solder", amount = 50 * intermediatemulti} - }, - results = { - {type = "item", name = "angels-solder", amount = 6} - } - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/solder.png" - }, - { - icon = "__angelssmelting__/graphics/icons/molten-solder.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, - order = "d[angels-solder]-b" - }, - { - type = "recipe", - name = "angels-roll-solder-converting", - category = "advanced-crafting", - subgroup = "angels-solder-casting", - energy_required = 0.5, - enabled = false, - allow_decomposition = false, - ingredients = { - {type = "item", name = "angels-roll-solder", amount = 4} - }, - results = { - {type = "item", name = "angels-solder", amount = 12} - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/solder.png" - }, - { - icon = "__angelssmelting__/graphics/icons/roll-solder.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, - order = "d[angels-solder]-c" - } - } -) diff --git a/angelssmelting/prototypes/recipes/smelting-aluminium.lua b/angelssmelting/prototypes/recipes/smelting-aluminium.lua index 2a5200b7f..037831c18 100644 --- a/angelssmelting/prototypes/recipes/smelting-aluminium.lua +++ b/angelssmelting/prototypes/recipes/smelting-aluminium.lua @@ -18,8 +18,6 @@ data:extend( {type = "item", name = "processed-aluminium", amount = 2} }, main_product = "processed-aluminium", - icon = "__angelssmelting__/graphics/icons/processed-aluminium.png", - icon_size = 32, order = "b[processed-aluminium]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-aluminium") }, @@ -37,8 +35,6 @@ data:extend( {type = "item", name = "pellet-aluminium", amount = 4} }, main_product = "pellet-aluminium", - icon = "__angelssmelting__/graphics/icons/pellet-aluminium.png", - icon_size = 32, order = "c[pellet-aluminium]" }, { @@ -56,7 +52,7 @@ data:extend( results = { {type = "item", name = "solid-sodium-aluminate", amount = 18} }, - icon_size = 32, + main_product = "solid-sodium-aluminate", order = "d[solid-sodium-aluminate]" }, { @@ -73,18 +69,9 @@ data:extend( results = { {type = "item", name = "solid-aluminium-hydroxide", amount = 12} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/solid-aluminium-hydroxide.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-aluminium-hydroxide"), + 1, angelsmods.smelting.number_tint), order = "e[solid-aluminium-hydroxide]-a" }, { @@ -101,18 +88,9 @@ data:extend( results = { {type = "item", name = "solid-aluminium-hydroxide", amount = 12} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/solid-aluminium-hydroxide.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-aluminium-hydroxide"), + 2, angelsmods.smelting.number_tint), order = "e[solid-aluminium-hydroxide]-b" }, { @@ -128,18 +106,9 @@ data:extend( results = { {type = "item", name = "solid-aluminium-oxide", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/solid-aluminium-oxide.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-aluminium-oxide"), + 1, angelsmods.smelting.number_tint), order = "f[solid-aluminium-oxide]-a" }, { @@ -159,18 +128,9 @@ data:extend( {type = "item", name = "solid-sodium-carbonate", amount = 2} }, main_product = "solid-aluminium-oxide", - icons = { - { - icon = "__angelssmelting__/graphics/icons/solid-aluminium-oxide.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-aluminium-oxide"), + 2, angelsmods.smelting.number_tint), order = "f[solid-aluminium-oxide]-b" }, -- SMELTING RESULT @@ -188,7 +148,6 @@ data:extend( results = { {type = "item", name = "ingot-aluminium", amount = 24} }, - icon_size = 32, order = "g[ingot-aluminium]" }, { @@ -204,7 +163,6 @@ data:extend( results = { {type = "item", name = "powder-aluminium", amount = 1} }, - icon_size = 32, order = "h[powder-aluminium]" }, -- CASTING INTERMEDIATE @@ -221,18 +179,9 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-aluminium", amount = 120} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-aluminium.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-aluminium"), + 1, angelsmods.smelting.number_tint), order = "i[liquid-molten-aluminium]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-aluminium") }, @@ -250,18 +199,9 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-aluminium", amount = 240} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-aluminium.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-aluminium"), + 2, angelsmods.smelting.number_tint), order = "i[liquid-molten-aluminium]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-aluminium") }, @@ -280,18 +220,9 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-aluminium", amount = 360} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-aluminium.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-aluminium"), + 3, angelsmods.smelting.number_tint), order = "i[liquid-molten-aluminium]-c", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-aluminium") }, @@ -322,18 +253,9 @@ data:extend( {type = "item", name = "angels-roll-aluminium", amount = 2} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-aluminium.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-aluminium"), + 1, angelsmods.smelting.number_tint), order = "j[angels-roll-aluminium]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-aluminium") }, @@ -368,18 +290,9 @@ data:extend( }, main_product = "angels-roll-aluminium" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-aluminium.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-aluminium"), + 2, angelsmods.smelting.number_tint), order = "j[angels-roll-aluminium]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-aluminium") }, @@ -409,17 +322,10 @@ data:extend( {type = "item", name = "angels-plate-aluminium", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-aluminium.png" - }, - { - icon = "__angelssmelting__/graphics/icons/molten-aluminium.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-aluminium"), + angelsmods.functions.get_object_icons("liquid-molten-aluminium"), + {-10, -10}, 0.4375), order = "k[angels-plate-aluminium]-a" }, { @@ -436,17 +342,10 @@ data:extend( results = { {type = "item", name = "angels-plate-aluminium", amount = 4} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-aluminium.png" - }, - { - icon = "__angelssmelting__/graphics/icons/roll-aluminium.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-aluminium"), + angelsmods.functions.get_object_icons("angels-roll-aluminium"), + {-10, -10}, 0.4375), order = "k[angels-plate-aluminium]-b" } -- order l reserved for motor casting (see industries) diff --git a/angelssmelting/prototypes/recipes/smelting-chrome.lua b/angelssmelting/prototypes/recipes/smelting-chrome.lua index 43757ab76..b8914a996 100644 --- a/angelssmelting/prototypes/recipes/smelting-chrome.lua +++ b/angelssmelting/prototypes/recipes/smelting-chrome.lua @@ -17,7 +17,6 @@ data:extend( results = { {type = "item", name = "processed-chrome", amount = 2} }, - icon_size = 32, order = "b[processed-chrome]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-chrome") }, @@ -34,7 +33,6 @@ data:extend( results = { {type = "item", name = "pellet-chrome", amount = 4} }, - icon_size = 32, order = "c[pellet-chrome]" }, { @@ -52,7 +50,6 @@ data:extend( results = { {type = "item", name = "solid-chromate", amount = 24} }, - icon_size = 32, order = "d[solid-chromate]" }, { @@ -72,7 +69,6 @@ data:extend( {type = "fluid", name = "water-purified", amount = 30} }, main_product = "solid-dichromate", - icon_size = 32, order = "e[solid-dichromate]" }, { @@ -92,7 +88,6 @@ data:extend( {type = "fluid", name = "gas-carbon-monoxide", amount = 30} }, main_product = "solid-chrome-oxide", - icon_size = 32, order = "f[solid-chrome-oxide]" }, -- SMELTING RESULTS @@ -112,18 +107,9 @@ data:extend( {type = "fluid", name = "gas-carbon-monoxide", amount = 60} }, main_product = "ingot-chrome", - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-chrome.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-chrome"), + 1, angelsmods.smelting.number_tint), order = "g[ingot-chrome]-a" }, { @@ -142,18 +128,9 @@ data:extend( {type = "fluid", name = "gas-carbon-monoxide", amount = 60} }, main_product = "ingot-chrome", - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-chrome.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-chrome"), + 2, angelsmods.smelting.number_tint), order = "g[ingot-chrome]-b" }, { @@ -172,18 +149,9 @@ data:extend( {type = "item", name = "solid-chrome-oxide", amount = 6} }, main_product = "ingot-chrome", - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-chrome.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-chrome"), + 3, angelsmods.smelting.number_tint), order = "g[ingot-chrome]-c" }, { @@ -199,7 +167,6 @@ data:extend( results = { {type = "item", name = "powder-chrome", amount = 1} }, - icon_size = 32, order = "h[powder-chrome]" }, -- CASTING INTERMEDIATE @@ -216,7 +183,6 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-chrome", amount = 120} }, - icon_size = 32, order = "i[liquid-molten-chrome]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-chrome") }, @@ -247,18 +213,9 @@ data:extend( {type = "item", name = "angels-roll-chrome", amount = 2} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-chrome.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-chrome"), + 1, angelsmods.smelting.number_tint), order = "j[angels-roll-chrome]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-chrome") }, @@ -293,18 +250,9 @@ data:extend( }, main_product = "angels-roll-chrome" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-chrome.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-chrome"), + 2, angelsmods.smelting.number_tint), order = "j[angels-roll-chrome]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-chrome") }, @@ -334,17 +282,10 @@ data:extend( {type = "item", name = "angels-plate-chrome", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-chrome.png" - }, - { - icon = "__angelssmelting__/graphics/icons/molten-chrome.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-chrome"), + angelsmods.functions.get_object_icons("liquid-molten-chrome"), + {-10, -10}, 0.4375), order = "k[angels-plate-chrome]-a" }, { @@ -361,17 +302,10 @@ data:extend( results = { {type = "item", name = "angels-plate-chrome", amount = 4} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-chrome.png" - }, - { - icon = "__angelssmelting__/graphics/icons/roll-chrome.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-chrome"), + angelsmods.functions.get_object_icons("angels-roll-chrome"), + {-10, -10}, 0.4375), order = "k[angels-plate-chrome]-b" } } diff --git a/angelssmelting/prototypes/recipes/smelting-cobalt.lua b/angelssmelting/prototypes/recipes/smelting-cobalt.lua index 9f2610206..337f67b6a 100644 --- a/angelssmelting/prototypes/recipes/smelting-cobalt.lua +++ b/angelssmelting/prototypes/recipes/smelting-cobalt.lua @@ -17,7 +17,6 @@ data:extend( results = { {type = "item", name = "processed-cobalt", amount = 2} }, - icon_size = 32, order = "b[processed-cobalt]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-cobalt") }, @@ -34,7 +33,6 @@ data:extend( results = { {type = "item", name = "pellet-cobalt", amount = 4} }, - icon_size = 32, order = "c[pellet-cobalt]" }, { @@ -51,7 +49,6 @@ data:extend( results = { {type = "item", name = "solid-cobalt-hydroxide", amount = 6} }, - icon_size = 32, order = "d[solid-cobalt-hydroxide]" }, { @@ -68,18 +65,9 @@ data:extend( results = { {type = "item", name = "solid-cobalt-oxide", amount = 8} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/solid-cobalt-oxide.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-cobalt-oxide"), + 1, angelsmods.smelting.number_tint), order = "e[solid-cobalt-oxide]-a" }, { @@ -96,18 +84,9 @@ data:extend( results = { {type = "item", name = "solid-cobalt-oxide", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/solid-cobalt-oxide.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-cobalt-oxide"), + 2, angelsmods.smelting.number_tint), order = "e[solid-cobalt-oxide]-b" }, { @@ -124,18 +103,9 @@ data:extend( results = { {type = "item", name = "solid-cobalt-oxide", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/solid-cobalt-oxide.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-cobalt-oxide"), + 3, angelsmods.smelting.number_tint), order = "e[solid-cobalt-oxide]-c" }, -- SMELTING RESULTS @@ -153,18 +123,9 @@ data:extend( results = { {type = "item", name = "ingot-cobalt", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-cobalt.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-cobalt"), + 1, angelsmods.smelting.number_tint), order = "f[ingot-cobalt]-a" }, { @@ -181,18 +142,9 @@ data:extend( results = { {type = "item", name = "ingot-cobalt", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-cobalt.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-cobalt"), + 2, angelsmods.smelting.number_tint), order = "f[ingot-cobalt]-b" }, { @@ -208,7 +160,6 @@ data:extend( results = { {type = "item", name = "powder-cobalt", amount = 1} }, - icon_size = 32, order = "g[powder-cobalt]" }, -- CASTING INTERMEDIATE @@ -225,7 +176,6 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-cobalt", amount = 120} }, - icon_size = 32, order = "h[liquid-molten-cobalt]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-cobalt") }, @@ -256,18 +206,9 @@ data:extend( {type = "item", name = "angels-roll-cobalt", amount = 2} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-cobalt.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-cobalt"), + 1, angelsmods.smelting.number_tint), order = "i[angels-roll-cobalt]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-cobalt") }, @@ -302,18 +243,9 @@ data:extend( }, main_product = "angels-roll-cobalt" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-cobalt.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-cobalt"), + 2, angelsmods.smelting.number_tint), order = "i[angels-roll-cobalt]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-cobalt") }, @@ -343,17 +275,10 @@ data:extend( {type = "item", name = "angels-plate-cobalt", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-cobalt.png" - }, - { - icon = "__angelssmelting__/graphics/icons/molten-cobalt.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-cobalt"), + angelsmods.functions.get_object_icons("liquid-molten-cobalt"), + {-10, -10}, 0.4375), order = "j[angels-plate-cobalt]-a" }, { @@ -370,17 +295,10 @@ data:extend( results = { {type = "item", name = "angels-plate-cobalt", amount = 4} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-cobalt.png" - }, - { - icon = "__angelssmelting__/graphics/icons/roll-cobalt.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-cobalt"), + angelsmods.functions.get_object_icons("angels-roll-cobalt"), + {-10, -10}, 0.4375), order = "j[angels-plate-cobalt]-b" } } diff --git a/angelssmelting/prototypes/recipes/smelting-copper.lua b/angelssmelting/prototypes/recipes/smelting-copper.lua index 120e68ed6..6723be4fd 100644 --- a/angelssmelting/prototypes/recipes/smelting-copper.lua +++ b/angelssmelting/prototypes/recipes/smelting-copper.lua @@ -18,7 +18,6 @@ data:extend( results = { {type = "item", name = "processed-copper", amount = 2} }, - icon_size = 32, order = "b[processed-copper]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-copper") }, @@ -35,7 +34,6 @@ data:extend( results = { {type = "item", name = "pellet-copper", amount = 4} }, - icon_size = 32, order = "c[pellet-copper]" }, { @@ -53,7 +51,6 @@ data:extend( results = { {type = "item", name = "anode-copper", amount = 24} }, - icon_size = 32, order = "d[anode-copper]" }, -- SMELTING RESULTS @@ -70,18 +67,9 @@ data:extend( results = { {type = "item", name = "ingot-copper", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-copper.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-copper"), + 1, angelsmods.smelting.number_tint), order = "e[ingot-copper]-a" }, { @@ -98,18 +86,9 @@ data:extend( results = { {type = "item", name = "ingot-copper", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-copper.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-copper"), + 2, angelsmods.smelting.number_tint), order = "e[ingot-copper]-b" }, { @@ -126,18 +105,9 @@ data:extend( results = { {type = "item", name = "ingot-copper", amount = 12} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-copper.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-copper"), + 3, angelsmods.smelting.number_tint), order = "e[ingot-copper]-c" }, { @@ -153,7 +123,6 @@ data:extend( results = { {type = "item", name = "powder-copper", amount = 1} }, - icon_size = 32, order = "f[powder-copper]" }, -- CASTING INTERMEDIATE @@ -170,7 +139,6 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-copper", amount = 120} }, - icon_size = 32, order = "g[liquid-molten-copper]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-copper") }, @@ -201,18 +169,9 @@ data:extend( {type = "item", name = "angels-roll-copper", amount = 2} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-copper.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-copper"), + 1, angelsmods.smelting.number_tint), order = "h[angels-roll-copper]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-copper") }, @@ -248,18 +207,9 @@ data:extend( }, main_product = "angels-roll-copper" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-copper.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-copper"), + 2, angelsmods.smelting.number_tint), order = "h[angels-roll-copper]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-copper") }, @@ -290,18 +240,9 @@ data:extend( {type = "item", name = "angels-wire-coil-copper", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-coil-copper.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-coil-copper"), + 1, angelsmods.smelting.number_tint), order = "i[angels-wire-coil-copper]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-copper") }, @@ -336,18 +277,9 @@ data:extend( }, main_product = "angels-wire-coil-copper" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-coil-copper.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-coil-copper"), + 2, angelsmods.smelting.number_tint), order = "i[angels-wire-coil-copper]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-copper") }, @@ -378,17 +310,10 @@ data:extend( {type = "item", name = "angels-plate-copper", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-copper.png" - }, - { - icon = "__angelssmelting__/graphics/icons/molten-copper.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-copper"), + angelsmods.functions.get_object_icons("liquid-molten-copper"), + {-10, -10}, 0.4375), order = "j[angels-plate-copper]-c" -- j[angels-plate-copper]-a reserved for crushed stiratite smelting (see global overrides) }, -- j[angels-plate-copper]-b reserved for base game smelting recipe (see global overrides) { @@ -405,17 +330,10 @@ data:extend( results = { {type = "item", name = "angels-plate-copper", amount = 4} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-copper.png" - }, - { - icon = "__angelssmelting__/graphics/icons/roll-copper.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-copper"), + angelsmods.functions.get_object_icons("angels-roll-copper"), + {-10, -10}, 0.4375), order = "j[angels-plate-copper]-d" }, { @@ -432,17 +350,10 @@ data:extend( results = { {type = "item", name = "angels-wire-copper", amount = 16} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-copper.png" - }, - { - icon = "__angelssmelting__/graphics/icons/wire-coil-copper.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-copper"), + angelsmods.functions.get_object_icons("angels-wire-coil-copper"), + {-10, -10}, 0.4375), order = "k[angels-wire-copper]-e" -- k[angels-wire-copper]-a reserved for base game recipe (see global overrides) } } diff --git a/angelssmelting/prototypes/recipes/smelting-glass.lua b/angelssmelting/prototypes/recipes/smelting-glass.lua index 4729cab7f..1936bf886 100644 --- a/angelssmelting/prototypes/recipes/smelting-glass.lua +++ b/angelssmelting/prototypes/recipes/smelting-glass.lua @@ -18,18 +18,9 @@ data:extend( results = { {type = "item", name = "solid-glass-mixture", amount = 1} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/glass-mixture.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-glass-mixture"), + 1, angelsmods.smelting.number_tint), order = "a[solid-glass-mixture]-a" }, { @@ -46,18 +37,9 @@ data:extend( results = { {type = "item", name = "solid-glass-mixture", amount = 2} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/glass-mixture.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-glass-mixture"), + 2, angelsmods.smelting.number_tint), order = "a[solid-glass-mixture]-b" }, { @@ -75,18 +57,9 @@ data:extend( results = { {type = "item", name = "solid-glass-mixture", amount = 3} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/glass-mixture.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-glass-mixture"), + 3, angelsmods.smelting.number_tint), order = "a[solid-glass-mixture]-c" }, { @@ -105,18 +78,9 @@ data:extend( results = { {type = "item", name = "solid-glass-mixture", amount = 4} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/glass-mixture.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-glass-mixture"), + 4, angelsmods.smelting.number_tint), order = "a[solid-glass-mixture]-d" }, -- CASTING INTERMEDIATE @@ -133,7 +97,6 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-glass", amount = 120} }, - icon_size = 32, order = "b[liquid-molten-glass]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-glass") }, @@ -162,7 +125,6 @@ data:extend( {type = "item", name = "angels-coil-glass-fiber", amount = 4} } }, - icon_size = 32, order = "c[angels-coil-glass-fiber]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-glass") }, @@ -192,18 +154,9 @@ data:extend( {type = "item", name = "angels-plate-glass", amount = 3} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-glass.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-glass"), + 1, angelsmods.smelting.number_tint), order = "d[angels-plate-glass]-b" -- d[angels-plate-glass]-a reserved for quartz (ore) smelting (see bob overrides) }, { @@ -237,18 +190,9 @@ data:extend( }, main_product = "angels-plate-glass" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-glass.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-glass"), + 2, angelsmods.smelting.number_tint), order = "d[angels-plate-glass]-c" }, { @@ -284,18 +228,9 @@ data:extend( }, main_product = "angels-plate-glass" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-glass.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-glass"), + 3, angelsmods.smelting.number_tint), order = "d[angels-plate-glass]-d" }, { @@ -312,17 +247,13 @@ data:extend( results = { {type = "item", name = "angels-void", amount = 1} -- see glass overrides }, - icons = { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelsrefining__/graphics/icons/void.png" - }, - { - icon = "__angelssmelting__/graphics/icons/wire-coil-glass.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + { + icon = "__angelsrefining__/graphics/icons/void.png", + icon_size = 32, + } + }, 1, angelsmods.smelting.number_tint), order = "e[angels-glass-fiber-board]" } } diff --git a/angelssmelting/prototypes/recipes/smelting-gold.lua b/angelssmelting/prototypes/recipes/smelting-gold.lua index a831a2e91..9a96d3060 100644 --- a/angelssmelting/prototypes/recipes/smelting-gold.lua +++ b/angelssmelting/prototypes/recipes/smelting-gold.lua @@ -19,7 +19,6 @@ data:extend( }, main_product = "processed-gold", --icon = "__angelssmelting__/graphics/icons/processed-gold.png", - icon_size = 32, order = "b[processed-gold]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-gold") }, @@ -38,7 +37,6 @@ data:extend( }, main_product = "pellet-gold", --icon = "__angelssmelting__/graphics/icons/pellet-gold.png", - icon_size = 32, order = "c[pellet-gold]" }, { @@ -59,7 +57,6 @@ data:extend( {type = "item", name = "solid-sodium-hydroxide", amount = 4} }, main_product = "solid-sodium-gold-cyanide", - icon_size = 32, order = "d[solid-sodium-gold-cyanide]" }, { @@ -96,18 +93,9 @@ data:extend( results = { {type = "item", name = "cathode-gold", amount = 12} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/cathode-gold.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("cathode-gold"), + 1, angelsmods.smelting.number_tint), order = "f[cathode-gold]-a" }, { @@ -123,18 +111,9 @@ data:extend( results = { {type = "item", name = "cathode-gold", amount = 12} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/cathode-gold.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("cathode-gold"), + 2, angelsmods.smelting.number_tint), order = "f[cathode-gold]-b" }, -- SMELTING RESULTS @@ -152,18 +131,9 @@ data:extend( results = { {type = "item", name = "ingot-gold", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-gold.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-gold"), + 1, angelsmods.smelting.number_tint), order = "g[ingot-gold]-a" }, { @@ -179,18 +149,9 @@ data:extend( results = { {type = "item", name = "ingot-gold", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-gold.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-gold"), + 2, angelsmods.smelting.number_tint), order = "g[ingot-gold]-b" }, { @@ -206,7 +167,6 @@ data:extend( results = { {type = "item", name = "powder-gold", amount = 1} }, - icon_size = 32, order = "h[powder-gold]" }, -- CASTING INTERMEDIATE @@ -225,7 +185,6 @@ data:extend( }, main_product = "liquid-molten-gold", --icon = "__angelssmelting__/graphics/icons/molten-gold.png", - icon_size = 32, order = "i[liquid-molten-gold]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-gold") }, @@ -256,18 +215,9 @@ data:extend( {type = "item", name = "angels-roll-gold", amount = 2} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-gold.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-gold"), + 1, angelsmods.smelting.number_tint), order = "j[angels-roll-gold]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-gold") }, @@ -302,18 +252,9 @@ data:extend( }, main_product = "angels-roll-gold" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-gold.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-gold"), + 2, angelsmods.smelting.number_tint), order = "j[angels-roll-gold]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-gold") }, @@ -346,18 +287,9 @@ data:extend( {type = "item", name = "angels-wire-coil-gold", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-coil-gold.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-coil-gold"), + 1, angelsmods.smelting.number_tint), order = "k[angels-wire-coil-gold]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-gold") }, @@ -394,18 +326,9 @@ data:extend( }, main_product = "angels-wire-coil-gold" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-coil-gold.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-coil-gold"), + 2, angelsmods.smelting.number_tint), order = "k[angels-wire-coil-gold]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-gold") }, @@ -435,17 +358,10 @@ data:extend( {type = "item", name = "angels-plate-gold", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-gold.png" - }, - { - icon = "__angelssmelting__/graphics/icons/molten-gold.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-gold"), + angelsmods.functions.get_object_icons("liquid-molten-gold"), + {-10, -10}, 0.4375), order = "l[angels-plate-gold]-a" }, { @@ -462,17 +378,10 @@ data:extend( results = { {type = "item", name = "angels-plate-gold", amount = 4} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-gold.png" - }, - { - icon = "__angelssmelting__/graphics/icons/roll-gold.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-gold"), + angelsmods.functions.get_object_icons("angels-roll-gold"), + {-10, -10}, 0.4375), order = "l[angels-plate-gold]-b" }, { @@ -490,17 +399,10 @@ data:extend( {type = "item", name = "angels-wire-gold", amount = 5} }, allow_decomposition = false, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-gold.png" - }, - { - icon = "__angelssmelting__/graphics/icons/plate-gold.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-gold"), + angelsmods.functions.get_object_icons("angels-plate-gold"), + {-10, -10}, 0.4375), order = "m[angels-wire-gold]-a" }, { @@ -517,17 +419,10 @@ data:extend( results = { {type = "item", name = "angels-wire-gold", amount = 16} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-gold.png" - }, - { - icon = "__angelssmelting__/graphics/icons/wire-coil-gold.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-gold"), + angelsmods.functions.get_object_icons("angels-wire-coil-gold"), + {-10, -10}, 0.4375), order = "m[angels-wire-gold]-b" } } diff --git a/angelssmelting/prototypes/recipes/smelting-iron.lua b/angelssmelting/prototypes/recipes/smelting-iron.lua index 4c7466a82..3f7edf93b 100644 --- a/angelssmelting/prototypes/recipes/smelting-iron.lua +++ b/angelssmelting/prototypes/recipes/smelting-iron.lua @@ -17,7 +17,6 @@ data:extend( results = { {type = "item", name = "processed-iron", amount = 2} }, - icon_size = 32, order = "b[processed-iron]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-iron") }, @@ -34,7 +33,6 @@ data:extend( results = { {type = "item", name = "pellet-iron", amount = 4} }, - icon_size = 32, order = "c[pellet-iron]" }, -- order d reserved for solid-iron-hydroxide @@ -52,18 +50,9 @@ data:extend( results = { {type = "item", name = "ingot-iron", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-iron.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-iron"), + 1, angelsmods.smelting.number_tint), order = "e[ingot-iron]-a" }, { @@ -80,18 +69,9 @@ data:extend( results = { {type = "item", name = "ingot-iron", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-iron.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-iron"), + 2, angelsmods.smelting.number_tint), order = "e[ingot-iron]-b" }, { @@ -109,18 +89,9 @@ data:extend( results = { {type = "item", name = "ingot-iron", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-iron.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-iron"), + 3, angelsmods.smelting.number_tint), order = "e[ingot-iron]-c" }, { @@ -139,18 +110,9 @@ data:extend( {type = "fluid", name = "gas-carbon-dioxide", amount = 20} }, main_product = "ingot-iron", - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-iron.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-iron"), + 4, angelsmods.smelting.number_tint), order = "e[ingot-iron]-d" }, -- order f reserved for ingot-steel (see alloys) @@ -167,7 +129,6 @@ data:extend( results = { {type = "item", name = "powder-iron", amount = 1} }, - icon_size = 32, order = "g[powder-iron]" }, -- order h reserved for powder-steel (see alloys) @@ -185,18 +146,9 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-iron", amount = 120} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-iron.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-iron"), + 1, angelsmods.smelting.number_tint), order = "i[liquid-molten-iron]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-iron") }, @@ -214,18 +166,9 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-iron", amount = 240} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-iron.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-iron"), + 2, angelsmods.smelting.number_tint), order = "i[liquid-molten-iron]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-iron") }, @@ -243,18 +186,9 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-iron", amount = 240} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-iron.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-iron"), + 3, angelsmods.smelting.number_tint), order = "i[liquid-molten-iron]-c", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-iron") }, @@ -273,18 +207,9 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-iron", amount = 360} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-iron.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-iron"), + 4, angelsmods.smelting.number_tint), order = "i[liquid-molten-iron]-d", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-iron") }, @@ -303,18 +228,9 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-iron", amount = 360} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-iron.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_5.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-iron"), + 5, angelsmods.smelting.number_tint), order = "i[liquid-molten-iron]-e", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-iron") }, @@ -345,18 +261,9 @@ data:extend( {type = "item", name = "angels-roll-iron", amount = 2} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-iron.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-iron"), + 1, angelsmods.smelting.number_tint), order = "j[angels-roll-iron]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-iron") }, @@ -391,18 +298,9 @@ data:extend( }, main_product = "angels-roll-iron" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-iron.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-iron"), + 2, angelsmods.smelting.number_tint), order = "j[angels-roll-iron]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-iron") }, @@ -433,18 +331,9 @@ data:extend( {type = "item", name = "angels-rod-stack-iron", amount = 1} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/rod-stack-iron.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-rod-stack-iron"), + 1, angelsmods.smelting.number_tint), order = "k[angels-rod-stack-iron]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-iron") }, @@ -479,18 +368,9 @@ data:extend( }, main_product = "angels-rod-stack-iron" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/rod-stack-iron.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-rod-stack-iron"), + 2, angelsmods.smelting.number_tint), order = "k[angels-rod-stack-iron]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-iron") }, @@ -520,17 +400,10 @@ data:extend( {type = "item", name = "angels-plate-iron", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-iron.png" - }, - { - icon = "__angelssmelting__/graphics/icons/molten-iron.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-iron"), + angelsmods.functions.get_object_icons("liquid-molten-iron"), + {-10, -10}, 0.4375), order = "l[angels-plate-iron]-c" -- l[angels-plate-iron]-a reserved for crushed saphirite smelting (see global overrides) }, -- l[angels-plate-iron]-b reserved for base game smelting recipe (see global overrides) { @@ -547,17 +420,10 @@ data:extend( results = { {type = "item", name = "angels-plate-iron", amount = 4} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-iron.png" - }, - { - icon = "__angelssmelting__/graphics/icons/roll-iron.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-iron"), + angelsmods.functions.get_object_icons("angels-roll-iron"), + {-10, -10}, 0.4375), order = "l[angels-plate-iron]-d" }, { @@ -572,20 +438,13 @@ data:extend( {type = "item", name = "angels-plate-iron", amount = 2} }, results = { - {type = "item", name = "angels-rod-iron", amount = 1} + {type = "item", name = "iron-stick", amount = 1} }, allow_decomposition = false, - icons = { - { - icon = "__angelssmelting__/graphics/icons/rod-iron.png" - }, - { - icon = "__angelssmelting__/graphics/icons/plate-iron.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("iron-stick"), + angelsmods.functions.get_object_icons("angels-plate-iron"), + {-10, -10}, 0.4375), order = "m[angels-rod-iron]-a" }, { @@ -600,19 +459,12 @@ data:extend( {type = "item", name = "angels-rod-stack-iron", amount = 1} }, results = { - {type = "item", name = "angels-rod-iron", amount = 4} - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/rod-iron.png" - }, - { - icon = "__angelssmelting__/graphics/icons/rod-stack-iron.png", - scale = 0.4375, - shift = {-10, -10} - } + {type = "item", name = "iron-stick", amount = 4} }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("iron-stick"), + angelsmods.functions.get_object_icons("angels-rod-stack-iron"), + {-10, -10}, 0.4375), order = "m[angels-rod-iron]-b" } } diff --git a/angelssmelting/prototypes/recipes/smelting-lead.lua b/angelssmelting/prototypes/recipes/smelting-lead.lua index 5255a8cd7..feaf0719e 100644 --- a/angelssmelting/prototypes/recipes/smelting-lead.lua +++ b/angelssmelting/prototypes/recipes/smelting-lead.lua @@ -17,7 +17,6 @@ data:extend( results = { {type = "item", name = "processed-lead", amount = 2} }, - icon_size = 32, order = "b[processed-lead]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-lead") }, @@ -34,7 +33,6 @@ data:extend( results = { {type = "item", name = "pellet-lead", amount = 4} }, - icon_size = 32, order = "c[pellet-lead]" }, { @@ -53,7 +51,6 @@ data:extend( {type = "fluid", name = "gas-sulfur-dioxide", amount = 120} }, main_product = "solid-lead-oxide", - icon_size = 32, order = "d[solid-lead-oxide]" }, { @@ -74,7 +71,6 @@ data:extend( {type = "fluid", name = "gas-sulfur-dioxide", amount = 60} }, main_product = "anode-lead", - icon_size = 32, order = "e[anode-lead]" }, { @@ -118,18 +114,9 @@ data:extend( {type = "fluid", name = "gas-sulfur-dioxide", amount = 60} }, main_product = "ingot-lead", - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-lead.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-lead"), + 1, angelsmods.smelting.number_tint), order = "g[ingot-lead]-a" }, { @@ -147,18 +134,9 @@ data:extend( {type = "item", name = "ingot-lead", amount = 24} }, main_product = "ingot-lead", - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-lead.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-lead"), + 2, angelsmods.smelting.number_tint), order = "g[ingot-lead]-b" }, { @@ -177,18 +155,9 @@ data:extend( {type = "item", name = "slag", amount = 1} }, main_product = "ingot-lead", - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-lead.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-lead"), + 3, angelsmods.smelting.number_tint), order = "g[ingot-lead]-c" }, { @@ -204,7 +173,6 @@ data:extend( results = { {type = "item", name = "powder-lead", amount = 1} }, - icon_size = 32, order = "h[powder-lead]" }, -- CASTING INTERMEDIATE @@ -221,7 +189,6 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-lead", amount = 120} }, - icon_size = 32, order = "i[liquid-molten-lead]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-lead") }, @@ -252,18 +219,9 @@ data:extend( {type = "item", name = "angels-roll-lead", amount = 2} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-lead.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-lead"), + 1, angelsmods.smelting.number_tint), order = "j[angels-roll-lead]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-lead") }, @@ -298,18 +256,9 @@ data:extend( }, main_product = "angels-roll-lead" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-lead.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-lead"), + 2, angelsmods.smelting.number_tint), order = "j[angels-roll-lead]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-lead") }, @@ -339,17 +288,10 @@ data:extend( {type = "item", name = "angels-plate-lead", amount = 4} } }, - icon_size = 32, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-lead.png" - }, - { - icon = "__angelssmelting__/graphics/icons/molten-lead.png", - scale = 0.4375, - shift = {-10, -10} - } - }, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-lead"), + angelsmods.functions.get_object_icons("liquid-molten-lead"), + {-10, -10}, 0.4375), order = "k[angels-plate-lead]-c" -- k[angels-plate-lead]-a reserved for crushed rubyte smelting (see lead overrides) }, -- k[angels-plate-lead]-b reserved for crushed rubyte smelting (see lead overrides) { @@ -366,17 +308,10 @@ data:extend( results = { {type = "item", name = "angels-plate-lead", amount = 4} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-lead.png" - }, - { - icon = "__angelssmelting__/graphics/icons/roll-lead.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-lead"), + angelsmods.functions.get_object_icons("angels-roll-lead"), + {-10, -10}, 0.4375), order = "k[angels-plate-lead]-d" } } diff --git a/angelssmelting/prototypes/recipes/smelting-manganese.lua b/angelssmelting/prototypes/recipes/smelting-manganese.lua index 8a14bb61d..8fb3d841b 100644 --- a/angelssmelting/prototypes/recipes/smelting-manganese.lua +++ b/angelssmelting/prototypes/recipes/smelting-manganese.lua @@ -17,7 +17,6 @@ data:extend( results = { {type = "item", name = "processed-manganese", amount = 2} }, - icon_size = 32, order = "b[processed-manganese]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-manganese") }, @@ -34,13 +33,12 @@ data:extend( results = { {type = "item", name = "pellet-manganese", amount = 4} }, - icon_size = 32, order = "c[pellet-manganese]" }, { type = "recipe", name = "manganese-processed-processing-alt", - category = "ore-processing", + category = "chemical-smelting", subgroup = "angels-manganese", energy_required = 2, enabled = false, @@ -51,18 +49,9 @@ data:extend( results = { {type = "item", name = "solid-manganese-oxide", amount = 6} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/solid-manganese-oxide.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-manganese-oxide"), + 1, angelsmods.smelting.number_tint), order = "d[solid-manganese-oxide]-a" }, { @@ -79,18 +68,9 @@ data:extend( results = { {type = "item", name = "solid-manganese-oxide", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/solid-manganese-oxide.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-manganese-oxide"), + 2, angelsmods.smelting.number_tint), order = "d[solid-manganese-oxide]-b" }, { @@ -107,18 +87,9 @@ data:extend( results = { {type = "item", name = "cathode-manganese", amount = 12} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/cathode-manganese.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("cathode-manganese"), + 1, angelsmods.smelting.number_tint), order = "e[cathode-manganese]-a" }, { @@ -138,18 +109,9 @@ data:extend( {type = "item", name = "solid-iron-hydroxide", amount = 4} }, main_product = "cathode-manganese", - icons = { - { - icon = "__angelssmelting__/graphics/icons/cathode-manganese.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("cathode-manganese"), + 2, angelsmods.smelting.number_tint), order = "e[cathode-manganese]-b" }, -- SMELTING RESULTS @@ -167,18 +129,9 @@ data:extend( results = { {type = "item", name = "ingot-manganese", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-manganese.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-manganese"), + 1, angelsmods.smelting.number_tint), order = "f[ingot-manganese]-a" }, { @@ -194,18 +147,9 @@ data:extend( results = { {type = "item", name = "ingot-manganese", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-manganese.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-manganese"), + 2, angelsmods.smelting.number_tint), order = "f[ingot-manganese]-b" }, { @@ -221,7 +165,6 @@ data:extend( results = { {type = "item", name = "powder-manganese", amount = 1} }, - icon_size = 32, order = "g[powder-manganese]" }, -- CASTING INTERMEDIATE @@ -238,7 +181,6 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-manganese", amount = 120} }, - icon_size = 32, order = "h[liquid-molten-manganese]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-manganese") }, @@ -269,18 +211,9 @@ data:extend( {type = "item", name = "angels-roll-manganese", amount = 2} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-manganese.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-manganese"), + 1, angelsmods.smelting.number_tint), order = "i[angels-roll-manganese]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-manganese") }, @@ -315,18 +248,9 @@ data:extend( }, main_product = "angels-roll-manganese" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-manganese.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-manganese"), + 2, angelsmods.smelting.number_tint), order = "i[angels-roll-manganese]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-manganese") }, @@ -356,17 +280,10 @@ data:extend( {type = "item", name = "angels-plate-manganese", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-manganese.png" - }, - { - icon = "__angelssmelting__/graphics/icons/molten-manganese.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-manganese"), + angelsmods.functions.get_object_icons("liquid-molten-manganese"), + {-10, -10}, 0.4375), order = "j[angels-plate-manganese]-a" }, { @@ -383,17 +300,10 @@ data:extend( results = { {type = "item", name = "angels-plate-manganese", amount = 4} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-manganese.png" - }, - { - icon = "__angelssmelting__/graphics/icons/roll-manganese.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-manganese"), + angelsmods.functions.get_object_icons("angels-roll-manganese"), + {-10, -10}, 0.4375), order = "j[angels-plate-manganese]-b" } } diff --git a/angelssmelting/prototypes/recipes/smelting-nickel.lua b/angelssmelting/prototypes/recipes/smelting-nickel.lua index bc7dcadd2..9c548f6f5 100644 --- a/angelssmelting/prototypes/recipes/smelting-nickel.lua +++ b/angelssmelting/prototypes/recipes/smelting-nickel.lua @@ -17,7 +17,6 @@ data:extend( results = { {type = "item", name = "processed-nickel", amount = 2} }, - icon_size = 32, order = "b[processed-nickel]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-nickel") }, @@ -34,7 +33,6 @@ data:extend( results = { {type = "item", name = "pellet-nickel", amount = 4} }, - icon_size = 32, order = "c[pellet-nickel]" }, { @@ -51,7 +49,6 @@ data:extend( results = { {type = "item", name = "cathode-nickel", amount = 12} }, - icon_size = 32, order = "d[cathode-nickel]" }, { @@ -69,7 +66,6 @@ data:extend( results = { {type = "item", name = "solid-nickel-carbonyl", amount = 24} }, - icon_size = 32, order = "e[solid-nickel-carbonyl]" }, -- SMELTING RESULTS @@ -87,18 +83,9 @@ data:extend( results = { {type = "item", name = "ingot-nickel", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-nickel.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-nickel"), + 1, angelsmods.smelting.number_tint), order = "f[ingot-nickel]-a" }, { @@ -114,18 +101,9 @@ data:extend( results = { {type = "item", name = "ingot-nickel", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-nickel.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-nickel"), + 2, angelsmods.smelting.number_tint), order = "f[ingot-nickel]-b" }, { @@ -142,18 +120,9 @@ data:extend( results = { {type = "item", name = "ingot-nickel", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-nickel.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-nickel"), + 3, angelsmods.smelting.number_tint), order = "f[ingot-nickel]-c" }, { @@ -169,7 +138,6 @@ data:extend( results = { {type = "item", name = "powder-nickel", amount = 1} }, - icon_size = 32, order = "g[powder-nickel]" }, -- CASTING INTERMEDIATE @@ -186,7 +154,6 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-nickel", amount = 120} }, - icon_size = 32, order = "h[liquid-molten-nickel]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-nickel") }, @@ -217,18 +184,9 @@ data:extend( {type = "item", name = "angels-roll-nickel", amount = 2} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-nickel.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-nickel"), + 1, angelsmods.smelting.number_tint), order = "i[angels-roll-nickel]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-nickel") }, @@ -263,18 +221,9 @@ data:extend( }, main_product = "angels-roll-nickel" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-nickel.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-nickel"), + 2, angelsmods.smelting.number_tint), order = "i[angels-roll-nickel]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-nickel") }, @@ -304,17 +253,10 @@ data:extend( {type = "item", name = "angels-plate-nickel", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-nickel.png" - }, - { - icon = "__angelssmelting__/graphics/icons/molten-nickel.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-nickel"), + angelsmods.functions.get_object_icons("liquid-molten-nickel"), + {-10, -10}, 0.4375), order = "j[angels-plate-nickel]-a" }, { @@ -331,17 +273,10 @@ data:extend( results = { {type = "item", name = "angels-plate-nickel", amount = 4} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-nickel.png" - }, - { - icon = "__angelssmelting__/graphics/icons/roll-nickel.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-nickel"), + angelsmods.functions.get_object_icons("angels-roll-nickel"), + {-10, -10}, 0.4375), order = "j[angels-plate-nickel]-b" } } diff --git a/angelssmelting/prototypes/recipes/smelting-platinum.lua b/angelssmelting/prototypes/recipes/smelting-platinum.lua index da0ef37f7..9f257ffff 100644 --- a/angelssmelting/prototypes/recipes/smelting-platinum.lua +++ b/angelssmelting/prototypes/recipes/smelting-platinum.lua @@ -17,7 +17,6 @@ data:extend( results = { {type = "item", name = "processed-platinum", amount = 2} }, - icon_size = 32, order = "b[processed-platinum]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-platinum") }, @@ -34,7 +33,6 @@ data:extend( results = { {type = "item", name = "pellet-platinum", amount = 4} }, - icon_size = 32, order = "c[pellet-platinum]" }, { @@ -71,7 +69,6 @@ data:extend( results = { {type = "item", name = "solid-ammonium-chloroplatinate", amount = 24} }, - icon_size = 32, order = "e[solid-ammonium-chloroplatinate]" }, -- SMELTING RESULTS @@ -88,18 +85,9 @@ data:extend( results = { {type = "item", name = "ingot-platinum", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-platinum.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-platinum"), + 1, angelsmods.smelting.number_tint), order = "f[ingot-platinum]-a" }, { @@ -116,18 +104,9 @@ data:extend( results = { {type = "item", name = "ingot-platinum", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-platinum.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-platinum"), + 2, angelsmods.smelting.number_tint), order = "f[ingot-platinum]-b" }, { @@ -143,18 +122,9 @@ data:extend( results = { {type = "item", name = "ingot-platinum", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-platinum.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-platinum"), + 3, angelsmods.smelting.number_tint), order = "f[ingot-platinum]-c" }, { @@ -170,7 +140,6 @@ data:extend( results = { {type = "item", name = "powder-platinum", amount = 1} }, - icon_size = 32, order = "g[powder-platinum]" }, -- CASTING INTERMEDIATE @@ -187,7 +156,6 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-platinum", amount = 120} }, - icon_size = 32, order = "h[liquid-molten-platinum]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-platinum") }, @@ -218,18 +186,9 @@ data:extend( {type = "item", name = "angels-roll-platinum", amount = 2} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-platinum.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-platinum"), + 1, angelsmods.smelting.number_tint), order = "i[angels-roll-platinum]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-platinum") }, @@ -264,18 +223,9 @@ data:extend( }, main_product = "angels-roll-platinum" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-platinum.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-platinum"), + 2, angelsmods.smelting.number_tint), order = "i[angels-roll-platinum]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-platinum") }, @@ -308,18 +258,9 @@ data:extend( {type = "item", name = "angels-wire-coil-platinum", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-coil-platinum.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-coil-platinum"), + 1, angelsmods.smelting.number_tint), order = "j[angels-wire-coil-platinum]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-platinum") }, @@ -356,18 +297,9 @@ data:extend( }, main_product = "angels-wire-coil-platinum" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-coil-platinum.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-coil-platinum"), + 2, angelsmods.smelting.number_tint), order = "j[angels-wire-coil-platinum]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-platinum") }, @@ -397,17 +329,10 @@ data:extend( {type = "item", name = "angels-plate-platinum", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-platinum.png" - }, - { - icon = "__angelssmelting__/graphics/icons/molten-platinum.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-platinum"), + angelsmods.functions.get_object_icons("liquid-molten-platinum"), + {-10, -10}, 0.4375), order = "k[angels-plate-platinum]-a" }, { @@ -424,17 +349,10 @@ data:extend( results = { {type = "item", name = "angels-plate-platinum", amount = 4} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-platinum.png" - }, - { - icon = "__angelssmelting__/graphics/icons/roll-platinum.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-platinum"), + angelsmods.functions.get_object_icons("angels-roll-platinum"), + {-10, -10}, 0.4375), order = "k[angels-plate-platinum]-b" }, { @@ -453,17 +371,10 @@ data:extend( {type = "item", name = "angels-wire-platinum", amount = 5} }, allow_decomposition = false, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-platinum.png" - }, - { - icon = "__angelssmelting__/graphics/icons/plate-platinum.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-platinum"), + angelsmods.functions.get_object_icons("angels-plate-platinum"), + {-10, -10}, 0.4375), order = "l[angels-wire-platinum]-a" }, { @@ -480,17 +391,10 @@ data:extend( results = { {type = "item", name = "angels-wire-platinum", amount = 16} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-platinum.png" - }, - { - icon = "__angelssmelting__/graphics/icons/wire-coil-platinum.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-platinum"), + angelsmods.functions.get_object_icons("angels-wire-coil-platinum"), + {-10, -10}, 0.4375), order = "l[angels-wire-platinum]-b" } } diff --git a/angelssmelting/prototypes/recipes/smelting-silicon.lua b/angelssmelting/prototypes/recipes/smelting-silicon.lua index 46247fd5c..fb43357a5 100644 --- a/angelssmelting/prototypes/recipes/smelting-silicon.lua +++ b/angelssmelting/prototypes/recipes/smelting-silicon.lua @@ -18,8 +18,6 @@ data:extend( {type = "item", name = "processed-silica", amount = 2} }, main_product = "processed-silica", - --icon = "__angelssmelting__/graphics/icons/processed-silica.png", - icon_size = 32, order = "b[processed-silica]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-silicon") }, @@ -37,8 +35,6 @@ data:extend( {type = "item", name = "pellet-silica", amount = 4} }, main_product = "pellet-silica", - --icon = "__angelssmelting__/graphics/icons/pellet-silica.png", - icon_size = 32, order = "c[pellet-silica]" }, { @@ -107,18 +103,9 @@ data:extend( results = { {type = "item", name = "ingot-silicon", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-silicon.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-silicon"), + 1, angelsmods.smelting.number_tint), order = "f[ingot-silicon]-a" }, { @@ -135,18 +122,9 @@ data:extend( results = { {type = "item", name = "ingot-silicon", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-silicon.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-silicon"), + 2, angelsmods.smelting.number_tint), order = "f[ingot-silicon]-b" }, { @@ -163,18 +141,9 @@ data:extend( results = { {type = "item", name = "ingot-silicon", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-silicon.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-silicon"), + 3, angelsmods.smelting.number_tint), order = "f[ingot-silicon]-c" }, { @@ -190,7 +159,6 @@ data:extend( results = { {type = "item", name = "powder-silicon", amount = 1} }, - icon_size = 32, order = "g[powder-silicon]" }, -- CASTING INTERMEDIATE @@ -208,8 +176,6 @@ data:extend( {type = "fluid", name = "liquid-molten-silicon", amount = 120} }, main_product = "liquid-molten-silicon", - --icon = "__angelssmelting__/graphics/icons/molten-silicon.png", - icon_size = 32, order = "h[liquid-molten-silicon]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-silicon") }, @@ -240,7 +206,6 @@ data:extend( {type = "item", name = "angels-mono-silicon-seed", amount = 5} } }, - icon_size = 32, order = "i[angels-mono-silicon-seed]" }, { @@ -268,7 +233,6 @@ data:extend( {type = "item", name = "angels-quartz-crucible", amount = 1} } }, - icon_size = 32, order = "j[angels-quartz-crucible]" }, -- CASTING RESULT @@ -299,18 +263,9 @@ data:extend( {type = "item", name = "angels-mono-silicon", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/silicon-mono.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-mono-silicon"), + 1, angelsmods.smelting.number_tint), order = "k[angels-mono-silicon]-a" }, { @@ -346,18 +301,9 @@ data:extend( }, main_product = "angels-mono-silicon" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/silicon-mono.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-mono-silicon"), + 2, angelsmods.smelting.number_tint), order = "k[angels-mono-silicon]-b" }, { @@ -373,7 +319,6 @@ data:extend( results = { {type = "item", name = "angels-silicon-wafer", amount_min = 1, amount_max = 5} }, - icon_size = 32, order = "l[angels-silicon-wafer]" } -- order m reserved for bob silicon processing diff --git a/angelssmelting/prototypes/recipes/smelting-silver.lua b/angelssmelting/prototypes/recipes/smelting-silver.lua index dfae8836d..51bf5228e 100644 --- a/angelssmelting/prototypes/recipes/smelting-silver.lua +++ b/angelssmelting/prototypes/recipes/smelting-silver.lua @@ -17,7 +17,6 @@ data:extend( results = { {type = "item", name = "processed-silver", amount = 2} }, - icon_size = 32, order = "b[processed-silver]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-silver") }, @@ -34,7 +33,6 @@ data:extend( results = { {type = "item", name = "pellet-silver", amount = 4} }, - icon_size = 32, order = "c[pellet-silver]" }, { @@ -51,7 +49,6 @@ data:extend( results = { {type = "item", name = "solid-silver-nitrate", amount = 12} }, - icon_size = 32, order = "d[solid-silver-nitrate]" }, { @@ -72,7 +69,6 @@ data:extend( {type = "item", name = "solid-sodium-hydroxide", amount = 4} }, main_product = "solid-sodium-silver-cyanide", - icon_size = 32, order = "f[solid-sodium-silver-cyanide]" }, { @@ -88,7 +84,6 @@ data:extend( results = { {type = "item", name = "cathode-silver", amount = 12} }, - icon_size = 32, order = "g[cathode-silver]" }, -- SMELTING RESULTS @@ -105,18 +100,9 @@ data:extend( results = { {type = "item", name = "ingot-silver", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-silver.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-silver"), + 1, angelsmods.smelting.number_tint), order = "h[ingot-silver]-a" }, { @@ -132,18 +118,9 @@ data:extend( results = { {type = "item", name = "ingot-silver", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-silver.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-silver"), + 2, angelsmods.smelting.number_tint), order = "h[ingot-silver]-b" }, { @@ -159,18 +136,9 @@ data:extend( results = { {type = "item", name = "ingot-silver", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-silver.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-silver"), + 3, angelsmods.smelting.number_tint), order = "h[ingot-silver]-c" }, { @@ -186,7 +154,6 @@ data:extend( results = { {type = "item", name = "powder-silver", amount = 1} }, - icon_size = 32, order = "i[powder-silver]" }, -- CASTING INTERMEDIATE @@ -203,7 +170,6 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-silver", amount = 120} }, - icon_size = 32, order = "j[liquid-molten-silver]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-silver") }, @@ -234,18 +200,9 @@ data:extend( {type = "item", name = "angels-roll-silver", amount = 2} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-silver.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-silver"), + 1, angelsmods.smelting.number_tint), order = "k[angels-roll-silver]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-silver") }, @@ -280,18 +237,9 @@ data:extend( }, main_product = "angels-roll-silver" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-silver.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-silver"), + 2, angelsmods.smelting.number_tint), order = "k[angels-roll-silver]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-silver") }, @@ -324,18 +272,9 @@ data:extend( {type = "item", name = "angels-wire-coil-silver", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-coil-silver.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-coil-silver"), + 1, angelsmods.smelting.number_tint), order = "l[angels-wire-coil-silver]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-silver") }, @@ -372,18 +311,9 @@ data:extend( }, main_product = "angels-wire-coil-silver" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-coil-silver.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-coil-silver"), + 2, angelsmods.smelting.number_tint), order = "l[angels-wire-coil-silver]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-silver") }, @@ -413,17 +343,10 @@ data:extend( {type = "item", name = "angels-plate-silver", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-silver.png" - }, - { - icon = "__angelssmelting__/graphics/icons/molten-silver.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-silver"), + angelsmods.functions.get_object_icons("liquid-molten-silver"), + {-10, -10}, 0.4375), order = "m[angels-plate-silver]-b" -- m[angels-plate-silver]-a reserved for silver ore smelting (see silver overrides) }, { @@ -440,17 +363,10 @@ data:extend( results = { {type = "item", name = "angels-plate-silver", amount = 4} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-silver.png" - }, - { - icon = "__angelssmelting__/graphics/icons/roll-silver.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-silver"), + angelsmods.functions.get_object_icons("angels-roll-silver"), + {-10, -10}, 0.4375), order = "m[angels-plate-silver]-c" }, { @@ -469,17 +385,10 @@ data:extend( {type = "item", name = "angels-wire-silver", amount = 5} }, allow_decomposition = false, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-silver.png" - }, - { - icon = "__angelssmelting__/graphics/icons/plate-silver.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-silver"), + angelsmods.functions.get_object_icons("angels-plate-silver"), + {-10, -10}, 0.4375), order = "n[angels-wire-silver]-a" }, { @@ -496,17 +405,10 @@ data:extend( results = { {type = "item", name = "angels-wire-silver", amount = 16} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-silver.png" - }, - { - icon = "__angelssmelting__/graphics/icons/wire-coil-silver.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-silver"), + angelsmods.functions.get_object_icons("angels-wire-coil-silver"), + {-10, -10}, 0.4375), order = "n[angels-wire-silver]-b" } -- order n reserved for bob diff --git a/angelssmelting/prototypes/recipes/smelting-stone.lua b/angelssmelting/prototypes/recipes/smelting-stone.lua index 7dbc72680..849b04a5a 100644 --- a/angelssmelting/prototypes/recipes/smelting-stone.lua +++ b/angelssmelting/prototypes/recipes/smelting-stone.lua @@ -19,7 +19,6 @@ data:extend( {type = "fluid", name = "gas-carbon-dioxide", amount = 50} }, main_product = "solid-lime", - icon_size = 32, order = "b[solid-lime]" }, -- SMELTING RESULTS @@ -37,18 +36,9 @@ data:extend( results = { {type = "item", name = "solid-cement", amount = 1} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/solid-cement.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-cement"), + 1, angelsmods.smelting.number_tint), order = "c[solid-cement]-a" }, { @@ -67,18 +57,9 @@ data:extend( results = { {type = "item", name = "solid-cement", amount = 2} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/solid-cement.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-cement"), + 2, angelsmods.smelting.number_tint), order = "c[solid-cement]-b" }, { @@ -96,7 +77,6 @@ data:extend( results = { {type = "item", name = "clay-brick-raw", amount = 4} }, - icon_size = 32, order = "d[clay-brick-raw]" }, { @@ -112,7 +92,6 @@ data:extend( results = { {type = "item", name = "clay-brick", amount = 4} }, - icon_size = 32, order = "e[clay-brick]" }, -- CASTING INTERMEDIATE @@ -132,18 +111,9 @@ data:extend( results = { {type = "fluid", name = "liquid-concrete", amount = 100} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-concrete.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-concrete"), + 1, angelsmods.smelting.number_tint), order = "g[liquid-concrete]-a" }, { @@ -162,18 +132,9 @@ data:extend( results = { {type = "fluid", name = "liquid-concrete", amount = 120} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-concrete.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-concrete"), + 2, angelsmods.smelting.number_tint), order = "g[liquid-concrete]-b" }, -- CASTING RESULT @@ -190,19 +151,9 @@ data:extend( results = { {type = "item", name = "concrete", amount = 4} }, - icons = { - { - icon = "__base__/graphics/icons/concrete.png", - icon_size = 64 - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("concrete"), + 2, angelsmods.smelting.number_tint), order = "h[concrete]-b" -- h[concrete]-a is reserved for base game recipe (see override) }, { @@ -219,7 +170,6 @@ data:extend( results = { {type = "item", name = "concrete-brick", amount = 4} }, - icon_size = 32, order = "i[concrete-brick]" }, { @@ -237,7 +187,6 @@ data:extend( results = { {type = "item", name = "reinforced-concrete-brick", amount = 4} }, - icon_size = 32, order = "j[reinforced-concrete-brick]" } } diff --git a/angelssmelting/prototypes/recipes/smelting-support.lua b/angelssmelting/prototypes/recipes/smelting-support.lua index c8c73e944..a202f94a8 100644 --- a/angelssmelting/prototypes/recipes/smelting-support.lua +++ b/angelssmelting/prototypes/recipes/smelting-support.lua @@ -114,19 +114,9 @@ data:extend( {type = "fluid", name = "steam", amount = 50, temperature = 175} }, --main_product= "liquid-coolant-clean", - icons = - { - { - icon = "__angelssmelting__/graphics/icons/liquid-coolant-used.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-coolant-used"), + 3, angelsmods.refining.number_tint), order = "h" }, { @@ -153,19 +143,9 @@ data:extend( {type = "fluid", name = "steam", amount = 50, temperature = 150} }, --main_product= "liquid-coolant-clean", - icons = - { - { - icon = "__angelssmelting__/graphics/icons/liquid-coolant-used.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-coolant-used"), + 2, angelsmods.refining.number_tint), order = "g" }, { @@ -192,19 +172,9 @@ data:extend( {type = "fluid", name = "steam", amount = 50, temperature = 125} }, --main_product= "liquid-coolant-clean", - icons = - { - { - icon = "__angelssmelting__/graphics/icons/liquid-coolant-used.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.refining.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-coolant-used"), + 1, angelsmods.refining.number_tint), order = "f" }, --MOLDS @@ -288,24 +258,20 @@ data:extend( {type = "item", name = "slag", amount = 1} }, main_product = "mold-non-expendable", - icons = - { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png" + { + icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png", + icon_size = 32, icon_mipmaps = 1 + }, + { + icon = "__angelssmelting__/graphics/icons/motor-casing-0.png", + icon_size = 32, icon_mipmaps = 1, + scale = 0.4375, + shift = {10, -10} + } }, - { - icon = "__angelssmelting__/graphics/icons/motor-casing-0.png", - scale = 0.4375, - shift = {10, -10} - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 1, angelsmods.smelting.number_tint), order = "c[mold-non-expendable]-a[creation]", stack_size = 200 }, @@ -326,25 +292,20 @@ data:extend( {type = "item", name = "mold-non-expendable", amount = 1, probability = 0.90, catalyst_amount = 1}, {type = "fluid", name = "water-red-waste", amount = 20} }, - icons = - { + icons = angelsmods.functions.add_number_icon_layer( { - icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png" + { + icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png", + icon_size = 32, icon_mipmaps = 1 + }, + { + icon = "__angelspetrochem__/graphics/icons/molecules/nitric-acid.png", + icon_size = 72, + scale = 32/72 * 0.4375, + shift = {10, -10} + } }, - { - icon = "__angelspetrochem__/graphics/icons/molecules/nitric-acid.png", - icon_size = 72, - scale = 32/72 * 0.4375, - shift = {10, -10} - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + 2, angelsmods.smelting.number_tint), order = "c[mold-non-expendable]-b[cleaning]" } } diff --git a/angelssmelting/prototypes/recipes/smelting-tin.lua b/angelssmelting/prototypes/recipes/smelting-tin.lua index c60a8c447..ce4f37679 100644 --- a/angelssmelting/prototypes/recipes/smelting-tin.lua +++ b/angelssmelting/prototypes/recipes/smelting-tin.lua @@ -17,7 +17,6 @@ data:extend( results = { {type = "item", name = "processed-tin", amount = 2} }, - icon_size = 32, order = "b[processed-tin]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-tin") }, @@ -34,7 +33,6 @@ data:extend( results = { {type = "item", name = "pellet-tin", amount = 4} }, - icon_size = 32, order = "c[pellet-tin]" }, -- SMELTING RESULTS @@ -51,18 +49,9 @@ data:extend( results = { {type = "item", name = "ingot-tin", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-tin.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-tin"), + 1, angelsmods.smelting.number_tint), order = "d[ingot-tin]-a" }, { @@ -79,18 +68,9 @@ data:extend( results = { {type = "item", name = "ingot-tin", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-tin.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-tin"), + 2, angelsmods.smelting.number_tint), order = "d[ingot-tin]-b" }, { @@ -107,18 +87,9 @@ data:extend( results = { {type = "item", name = "ingot-tin", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-tin.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-tin"), + 3, angelsmods.smelting.number_tint), order = "d[ingot-tin]-c" }, { @@ -134,7 +105,6 @@ data:extend( results = { {type = "item", name = "powder-tin", amount = 1} }, - icon_size = 32, order = "e[powder-tin]" }, -- CASTING INTERMEDIATE @@ -152,7 +122,6 @@ data:extend( {type = "fluid", name = "liquid-molten-tin", amount = 120} }, main_product = "liquid-molten-tin", - icon_size = 32, order = "f[liquid-molten-tin]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-tin") }, @@ -183,18 +152,9 @@ data:extend( {type = "item", name = "angels-roll-tin", amount = 2} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-tin.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-tin"), + 1, angelsmods.smelting.number_tint), order = "g[angels-roll-tin]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-tin") }, @@ -229,18 +189,9 @@ data:extend( }, main_product = "angels-roll-tin" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-tin.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-tin"), + 2, angelsmods.smelting.number_tint), order = "g[angels-roll-tin]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-tin") }, @@ -273,18 +224,9 @@ data:extend( {type = "item", name = "angels-wire-coil-tin", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-coil-tin.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-coil-tin"), + 1, angelsmods.smelting.number_tint), order = "h[angels-wire-coil-tin]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-tin") }, @@ -321,18 +263,9 @@ data:extend( }, main_product = "angels-wire-coil-tin" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-coil-tin.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-coil-tin"), + 2, angelsmods.smelting.number_tint), order = "h[angels-wire-coil-tin]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-tin") }, @@ -362,17 +295,10 @@ data:extend( {type = "item", name = "angels-plate-tin", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-tin.png" - }, - { - icon = "__angelssmelting__/graphics/icons/molten-tin.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-tin"), + angelsmods.functions.get_object_icons("liquid-molten-tin"), + {-10, -10}, 0.4375), order = "i[angels-plate-tin]-c" -- i[angels-plate-tin]-a reserved for crushed bobmonium smelting (see tin overrides) }, -- i[angels-plate-tin]-b reserved for tin ore smelting (see tin overrides) { @@ -389,17 +315,10 @@ data:extend( results = { {type = "item", name = "angels-plate-tin", amount = 4} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-tin.png" - }, - { - icon = "__angelssmelting__/graphics/icons/roll-tin.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-tin"), + angelsmods.functions.get_object_icons("angels-roll-tin"), + {-10, -10}, 0.4375), order = "i[angels-plate-tin]-d" }, { @@ -418,17 +337,10 @@ data:extend( {type = "item", name = "angels-wire-tin", amount = 5} }, allow_decomposition = false, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-tin.png" - }, - { - icon = "__angelssmelting__/graphics/icons/plate-tin.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-tin"), + angelsmods.functions.get_object_icons("angels-plate-tin"), + {-10, -10}, 0.4375), order = "j[angels-wire-tin]-a" }, { @@ -445,17 +357,10 @@ data:extend( results = { {type = "item", name = "angels-wire-tin", amount = 16} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/wire-tin.png" - }, - { - icon = "__angelssmelting__/graphics/icons/wire-coil-tin.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-wire-tin"), + angelsmods.functions.get_object_icons("angels-wire-coil-tin"), + {-10, -10}, 0.4375), order = "j[angels-wire-tin]-b" } } diff --git a/angelssmelting/prototypes/recipes/smelting-titanium.lua b/angelssmelting/prototypes/recipes/smelting-titanium.lua index 30e670923..bf7a0628a 100644 --- a/angelssmelting/prototypes/recipes/smelting-titanium.lua +++ b/angelssmelting/prototypes/recipes/smelting-titanium.lua @@ -17,7 +17,6 @@ data:extend( results = { {type = "item", name = "processed-titanium", amount = 2} }, - icon_size = 32, order = "b[processed-titanium]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-titanium") }, @@ -34,7 +33,6 @@ data:extend( results = { {type = "item", name = "pellet-titanium", amount = 4} }, - icon_size = 32, order = "c[pellet-titanium]" }, { @@ -54,19 +52,12 @@ data:extend( }, main_product = "liquid-titanium-tetrachloride", always_show_products = true, - icons = angelsmods.functions.create_liquid_recipe_icon( - { - {"__angelssmelting__/graphics/icons/molecule-titanium-tetrachloride.png", 72} - }, - "ill", - { + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.create_liquid_recipe_icon( { - icon = "__angelsrefining__/graphics/icons/num_1.png", - icon_size = 32, - tint = angelsmods.smelting.number_tint - } - } - ), + {"__angelssmelting__/graphics/icons/molecule-titanium-tetrachloride.png", 72} + }, "ill" + ), 1, angelsmods.smelting.number_tint), order = "d[liquid-titanium-tetrachloride]-a" }, { @@ -86,19 +77,12 @@ data:extend( }, main_product = "liquid-titanium-tetrachloride", always_show_products = true, - icons = angelsmods.functions.create_liquid_recipe_icon( - { - {"__angelssmelting__/graphics/icons/molecule-titanium-tetrachloride.png", 72} - }, - "ill", - { + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.create_liquid_recipe_icon( { - icon = "__angelsrefining__/graphics/icons/num_2.png", - icon_size = 32, - tint = angelsmods.smelting.number_tint - } - } - ), + {"__angelssmelting__/graphics/icons/molecule-titanium-tetrachloride.png", 72} + }, "ill" + ), 2, angelsmods.smelting.number_tint), order = "d[liquid-titanium-tetrachloride]-b" }, { @@ -115,7 +99,6 @@ data:extend( results = { {type = "item", name = "sponge-titanium", amount = 24} }, - icon_size = 32, order = "e[sponge-titanium]" }, -- SMELTING RESULTS @@ -132,18 +115,9 @@ data:extend( results = { {type = "item", name = "ingot-titanium", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-titanium.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-titanium"), + 1, angelsmods.smelting.number_tint), order = "f[ingot-titanium]-a" }, { @@ -163,18 +137,9 @@ data:extend( {type = "item", name = "solid-limestone", amount = 6} }, main_product = "ingot-titanium", - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-titanium.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-titanium"), + 2, angelsmods.smelting.number_tint), order = "f[ingot-titanium]-b" }, { @@ -190,7 +155,6 @@ data:extend( results = { {type = "item", name = "powder-titanium", amount = 1} }, - icon_size = 32, order = "g[powder-titanium]" }, -- CASTING INTERMEDIATE @@ -207,18 +171,9 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-titanium", amount = 120} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-titanium.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-titanium"), + 1, angelsmods.smelting.number_tint), order = "h[liquid-molten-titanium]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-titanium") }, @@ -236,18 +191,9 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-titanium", amount = 240} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-titanium.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-titanium"), + 2, angelsmods.smelting.number_tint), order = "h[liquid-molten-titanium]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-titanium") }, @@ -265,18 +211,9 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-titanium", amount = 240} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-titanium.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-titanium"), + 3, angelsmods.smelting.number_tint), order = "h[liquid-molten-titanium]-c", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-titanium") }, @@ -295,18 +232,9 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-titanium", amount = 360} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-titanium.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_4.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-titanium"), + 4, angelsmods.smelting.number_tint), order = "h[liquid-molten-titanium]-d", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-titanium") }, @@ -325,18 +253,9 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-titanium", amount = 360} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/molten-titanium.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_5.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("liquid-molten-titanium"), + 5, angelsmods.smelting.number_tint), order = "h[liquid-molten-titanium]-e", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-titanium") }, @@ -367,18 +286,9 @@ data:extend( {type = "item", name = "angels-roll-titanium", amount = 2} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-titanium.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-titanium"), + 1, angelsmods.smelting.number_tint), order = "i[angels-roll-titanium]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-titanium") }, @@ -413,18 +323,9 @@ data:extend( }, main_product = "angels-roll-titanium" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-titanium.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-titanium"), + 2, angelsmods.smelting.number_tint), order = "i[angels-roll-titanium]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-titanium") }, @@ -453,17 +354,10 @@ data:extend( {type = "item", name = "angels-plate-titanium", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-titanium.png" - }, - { - icon = "__angelssmelting__/graphics/icons/molten-titanium.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-titanium"), + angelsmods.functions.get_object_icons("liquid-molten-titanium"), + {-10, -10}, 0.4375), order = "j[angels-plate-titanium]-a" }, { @@ -480,17 +374,10 @@ data:extend( results = { {type = "item", name = "angels-plate-titanium", amount = 4} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-titanium.png" - }, - { - icon = "__angelssmelting__/graphics/icons/roll-titanium.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-titanium"), + angelsmods.functions.get_object_icons("angels-roll-titanium"), + {-10, -10}, 0.4375), order = "j[angels-plate-titanium]-b" } } diff --git a/angelssmelting/prototypes/recipes/smelting-tungsten.lua b/angelssmelting/prototypes/recipes/smelting-tungsten.lua index 7497afd03..1dcfac145 100644 --- a/angelssmelting/prototypes/recipes/smelting-tungsten.lua +++ b/angelssmelting/prototypes/recipes/smelting-tungsten.lua @@ -17,7 +17,6 @@ data:extend( results = { {type = "item", name = "processed-tungsten", amount = 2} }, - icon_size = 32, order = "b[processed-tungsten]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-tungsten") }, @@ -32,7 +31,6 @@ data:extend( results = { {type = "item", name = "pellet-tungsten", amount = 4} }, - icon_size = 32, order = "c[pellet-tungsten]" }, { @@ -70,18 +68,9 @@ data:extend( {type = "fluid", name = "water-purified", amount = 60} }, main_product = "solid-tungsten-oxide", - icons = { - { - icon = "__angelssmelting__/graphics/icons/solid-tungsten-oxide.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-tungsten-oxide"), + 1, angelsmods.smelting.number_tint), order = "e[solid-tungsten-oxide]-a" }, { @@ -98,18 +87,9 @@ data:extend( results = { {type = "item", name = "solid-tungsten-oxide", amount = 12} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/solid-tungsten-oxide.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-tungsten-oxide"), + 2, angelsmods.smelting.number_tint), order = "e[solid-tungsten-oxide]-b" }, { @@ -148,7 +128,6 @@ data:extend( results = { {type = "item", name = "solid-ammonium-paratungstate", amount = 24} }, - icon_size = 32, order = "g[solid-ammonium-paratungstate]" }, -- SMELTING RESULTS @@ -167,18 +146,9 @@ data:extend( {type = "item", name = "fluorite-ore", amount = 3} }, main_product = "powder-tungsten", - icons = { - { - icon = "__angelssmelting__/graphics/icons/powder-tungsten.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("powder-tungsten"), + 1, angelsmods.smelting.number_tint), order = "h[powder-tungsten]-a" }, { @@ -195,18 +165,9 @@ data:extend( results = { {type = "item", name = "powder-tungsten", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/powder-tungsten.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("powder-tungsten"), + 2, angelsmods.smelting.number_tint), order = "h[powder-tungsten]-b" }, -- CASTING INTERMEDIATE @@ -224,18 +185,9 @@ data:extend( results = { {type = "item", name = "casting-powder-tungsten", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/powder-tungsten-mixture.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("casting-powder-tungsten"), + 1, angelsmods.smelting.number_tint), order = "i[casting-powder-tungsten]-a" }, { @@ -252,18 +204,9 @@ data:extend( results = { {type = "item", name = "casting-powder-tungsten", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/powder-tungsten-mixture.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("casting-powder-tungsten"), + 2, angelsmods.smelting.number_tint), order = "i[casting-powder-tungsten]-b" }, -- CASTING RESULT @@ -292,7 +235,6 @@ data:extend( {type = "item", name = "angels-plate-tungsten", amount = 12} } }, - icon_size = 32, order = "j[angels-plate-tungsten]" } } diff --git a/angelssmelting/prototypes/recipes/smelting-zinc.lua b/angelssmelting/prototypes/recipes/smelting-zinc.lua index 96dc8ccdb..da16da66a 100644 --- a/angelssmelting/prototypes/recipes/smelting-zinc.lua +++ b/angelssmelting/prototypes/recipes/smelting-zinc.lua @@ -18,8 +18,6 @@ data:extend( {type = "item", name = "processed-zinc", amount = 2} }, main_product = "processed-zinc", - icon = "__angelssmelting__/graphics/icons/processed-zinc.png", - icon_size = 32, order = "b[processed-zinc]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-zinc") }, @@ -37,8 +35,6 @@ data:extend( {type = "item", name = "pellet-zinc", amount = 4} }, main_product = "pellet-zinc", - icon = "__angelssmelting__/graphics/icons/pellet-zinc.png", - icon_size = 32, order = "c[pellet-zinc]" }, { @@ -57,18 +53,9 @@ data:extend( {type = "fluid", name = "gas-sulfur-dioxide", amount = 30} }, main_product = "solid-zinc-oxide", - icons = { - { - icon = "__angelssmelting__/graphics/icons/solid-zinc-oxide.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-zinc-oxide"), + 1, angelsmods.smelting.number_tint), order = "d[solid-zinc-oxide]-a" }, { @@ -87,18 +74,9 @@ data:extend( {type = "fluid", name = "gas-sulfur-dioxide", amount = 30} }, main_product = "solid-zinc-oxide", - icons = { - { - icon = "__angelssmelting__/graphics/icons/solid-zinc-oxide.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("solid-zinc-oxide"), + 2, angelsmods.smelting.number_tint), order = "d[solid-zinc-oxide]-b" }, { @@ -115,7 +93,6 @@ data:extend( results = { {type = "item", name = "cathode-zinc", amount = 12} }, - icon_size = 32, order = "e[cathode-zinc]" }, -- SMELTING RESULTS @@ -137,18 +114,9 @@ data:extend( {type = "fluid", name = "gas-sulfur-dioxide", amount = 30} }, main_product = "ingot-zinc", - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-zinc.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-zinc"), + 1, angelsmods.smelting.number_tint), order = "f[ingot-zinc]-a" }, { @@ -168,18 +136,9 @@ data:extend( {type = "fluid", name = "gas-sulfur-dioxide", amount = 30} }, main_product = "ingot-zinc", - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-zinc.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-zinc"), + 2, angelsmods.smelting.number_tint), order = "f[ingot-zinc]-b" }, { @@ -195,18 +154,9 @@ data:extend( results = { {type = "item", name = "ingot-zinc", amount = 24} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/ingot-zinc.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_3.png", - tint = angelsmods.smelting.number_tint, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("ingot-zinc"), + 3, angelsmods.smelting.number_tint), order = "f[ingot-zinc]-c" }, { @@ -222,7 +172,6 @@ data:extend( results = { {type = "item", name = "powder-zinc", amount = 1} }, - icon_size = 32, order = "g[powder-zinc]" }, -- CASTING INTERMEDIATE @@ -239,7 +188,6 @@ data:extend( results = { {type = "fluid", name = "liquid-molten-zinc", amount = 120} }, - icon_size = 32, order = "h[liquid-molten-zinc]", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-zinc") }, @@ -270,18 +218,9 @@ data:extend( {type = "item", name = "angels-roll-zinc", amount = 2} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-zinc.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_1.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-zinc"), + 1, angelsmods.smelting.number_tint), order = "i[angels-roll-zinc]-a", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-zinc") }, @@ -316,18 +255,9 @@ data:extend( }, main_product = "angels-roll-zinc" }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/roll-zinc.png" - }, - { - icon = "__angelsrefining__/graphics/icons/num_2.png", - tint = {r = 1.0, g = 0.8, b = 0.0, a = 0.5}, - scale = 0.32, - shift = {-12, -12} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-roll-zinc"), + 2, angelsmods.smelting.number_tint), order = "i[angels-roll-zinc]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-zinc") }, @@ -356,17 +286,10 @@ data:extend( {type = "item", name = "angels-plate-zinc", amount = 4} } }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-zinc.png" - }, - { - icon = "__angelssmelting__/graphics/icons/molten-zinc.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-zinc"), + angelsmods.functions.get_object_icons("liquid-molten-zinc"), + {-10, -10}, 0.4375), order = "j[angels-plate-zinc]-a" }, { @@ -383,17 +306,10 @@ data:extend( results = { {type = "item", name = "angels-plate-zinc", amount = 4} }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-zinc.png" - }, - { - icon = "__angelssmelting__/graphics/icons/roll-zinc.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32, + icons = angelsmods.functions.add_icon_layer( + angelsmods.functions.get_object_icons("angels-plate-zinc"), + angelsmods.functions.get_object_icons("angels-roll-zinc"), + {-10, -10}, 0.4375), order = "j[angels-plate-zinc]-b" } } diff --git a/angelssmelting/prototypes/smelting-override-global.lua b/angelssmelting/prototypes/smelting-override-global.lua index c85b1a06e..19a3f5d4d 100644 --- a/angelssmelting/prototypes/smelting-override-global.lua +++ b/angelssmelting/prototypes/smelting-override-global.lua @@ -21,19 +21,19 @@ data.raw["item"]["copper-cable"].icon_size = 32 data.raw["item"]["copper-cable"].icon_mipmaps = 1 data.raw["item"]["copper-cable"].subgroup = "angels-copper-casting" data.raw["item"]["copper-cable"].order = "k" -angelsmods.functions.OV.global_replace_icon( +OV.global_replace_icon( "__base__/graphics/icons/plate/iron-plate.png", "__angelssmelting__/graphics/icons/plate-iron.png" ) -angelsmods.functions.OV.global_replace_icon( +OV.global_replace_icon( "__base__/graphics/icons/plate/steel-plate.png", "__angelssmelting__/graphics/icons/plate-steel.png" ) -angelsmods.functions.OV.global_replace_icon( +OV.global_replace_icon( "__base__/graphics/icons/plate/copper-plate.png", "__angelssmelting__/graphics/icons/plate-copper.png" ) -angelsmods.functions.OV.global_replace_icon( +OV.global_replace_icon( "__base__/graphics/icons/plate/copper-cable.png", "__angelssmelting__/graphics/icons/wire-copper.png" ) @@ -45,146 +45,169 @@ if bobmods and bobmods.plates then data.raw["item"]["tin-plate"].subgroup = "angels-tin-casting" data.raw["item"]["tin-plate"].order = "i" data.raw["item"]["tin-plate"].icon_size = 32 + data.raw["item"]["tin-plate"].icon_mipmaps = 1 data.raw["item"]["silver-plate"].icon = "__angelssmelting__/graphics/icons/plate-silver.png" data.raw["item"]["silver-plate"].subgroup = "angels-silver-casting" data.raw["item"]["silver-plate"].order = "m" data.raw["item"]["silver-plate"].icon_size = 32 + data.raw["item"]["silver-plate"].icon_mipmaps = 1 data.raw["item"]["lead-plate"].icon = "__angelssmelting__/graphics/icons/plate-lead.png" data.raw["item"]["lead-plate"].subgroup = "angels-lead-casting" data.raw["item"]["lead-plate"].order = "k" data.raw["item"]["lead-plate"].icon_size = 32 + data.raw["item"]["lead-plate"].icon_mipmaps = 1 data.raw["item"]["glass"].icon = "__angelssmelting__/graphics/icons/plate-glass.png" data.raw["item"]["glass"].subgroup = "angels-glass-casting" data.raw["item"]["glass"].order = "d" data.raw["item"]["glass"].icon_size = 32 + data.raw["item"]["glass"].icon_mipmaps = 1 data.raw["item"]["gold-plate"].icon = "__angelssmelting__/graphics/icons/plate-gold.png" data.raw["item"]["gold-plate"].subgroup = "angels-gold-casting" data.raw["item"]["gold-plate"].order = "l" data.raw["item"]["gold-plate"].icon_size = 32 + data.raw["item"]["gold-plate"].icon_mipmaps = 1 data.raw["item"]["nickel-plate"].icon = "__angelssmelting__/graphics/icons/plate-nickel.png" data.raw["item"]["nickel-plate"].subgroup = "angels-nickel-casting" data.raw["item"]["nickel-plate"].order = "j" data.raw["item"]["nickel-plate"].icon_size = 32 + data.raw["item"]["nickel-plate"].icon_mipmaps = 1 data.raw["item"]["zinc-plate"].icon = "__angelssmelting__/graphics/icons/plate-zinc.png" data.raw["item"]["zinc-plate"].subgroup = "angels-zinc-casting" data.raw["item"]["zinc-plate"].order = "j" data.raw["item"]["zinc-plate"].icon_size = 32 + data.raw["item"]["zinc-plate"].icon_mipmaps = 1 data.raw["item"]["aluminium-plate"].icon = "__angelssmelting__/graphics/icons/plate-aluminium.png" data.raw["item"]["aluminium-plate"].subgroup = "angels-aluminium-casting" data.raw["item"]["aluminium-plate"].order = "k" data.raw["item"]["aluminium-plate"].icon_size = 32 + data.raw["item"]["aluminium-plate"].icon_mipmaps = 1 -- intermediates data.raw["item"]["lead-oxide"].icon = "__angelssmelting__/graphics/icons/solid-lead-oxide.png" data.raw["item"]["lead-oxide"].subgroup = "angels-lead" data.raw["item"]["lead-oxide"].order = "d" data.raw["item"]["lead-oxide"].icon_size = 32 + data.raw["item"]["lead-oxide"].icon_mipmaps = 1 data.raw["item"]["alumina"].icon = "__angelssmelting__/graphics/icons/solid-aluminium-oxide.png" data.raw["item"]["alumina"].subgroup = "angels-aluminium" data.raw["item"]["alumina"].order = "f" data.raw["item"]["alumina"].icon_size = 32 + data.raw["item"]["alumina"].icon_mipmaps = 1 data.raw["item"]["tungsten-oxide"].icon = "__angelssmelting__/graphics/icons/solid-tungsten-oxide.png" data.raw["item"]["tungsten-oxide"].subgroup = "angels-tungsten" data.raw["item"]["tungsten-oxide"].order = "e" data.raw["item"]["tungsten-oxide"].icon_size = 32 + data.raw["item"]["tungsten-oxide"].icon_mipmaps = 1 data.raw["item"]["powdered-tungsten"].icon = "__angelssmelting__/graphics/icons/powder-tungsten.png" data.raw["item"]["powdered-tungsten"].subgroup = "angels-tungsten" data.raw["item"]["powdered-tungsten"].order = "h" - data.raw["item"]["powdered-tungsten"].icon_size = 32 + data.raw["item"]["powdered-tungsten"].icon_size = 64 + data.raw["item"]["powdered-tungsten"].icon_mipmaps = 4 data.raw["item"]["cobalt-oxide"].icon = "__angelssmelting__/graphics/icons/solid-cobalt-oxide.png" data.raw["item"]["cobalt-oxide"].subgroup = "angels-cobalt" data.raw["item"]["cobalt-oxide"].order = "e" data.raw["item"]["cobalt-oxide"].icon_size = 32 + data.raw["item"]["cobalt-oxide"].icon_mipmaps = 1 data.raw["item"]["silver-nitrate"].icon = "__angelssmelting__/graphics/icons/solid-silver-nitrate.png" data.raw["item"]["silver-nitrate"].subgroup = "angels-silver" data.raw["item"]["silver-nitrate"].order = "d" data.raw["item"]["silver-nitrate"].icon_size = 32 + data.raw["item"]["silver-nitrate"].icon_mipmaps = 1 data.raw["item"]["titanium-plate"].icon = "__angelssmelting__/graphics/icons/plate-titanium.png" data.raw["item"]["titanium-plate"].subgroup = "angels-titanium-casting" data.raw["item"]["titanium-plate"].order = "j" data.raw["item"]["titanium-plate"].icon_size = 32 + data.raw["item"]["titanium-plate"].icon_mipmaps = 1 data.raw["item"]["tungsten-plate"].icon = "__angelssmelting__/graphics/icons/plate-tungsten.png" data.raw["item"]["tungsten-plate"].subgroup = "angels-tungsten-casting" data.raw["item"]["tungsten-plate"].order = "j" data.raw["item"]["tungsten-plate"].icon_size = 32 + data.raw["item"]["tungsten-plate"].icon_mipmaps = 1 data.raw["item"]["silicon"].icon = "__angelssmelting__/graphics/icons/plate-silicon.png" data.raw["item"]["silicon"].subgroup = "angels-silicon-casting" data.raw["item"]["silicon"].order = "k" data.raw["item"]["silicon"].icon_size = 32 + data.raw["item"]["silicon"].icon_mipmaps = 1 data.raw["item"]["cobalt-plate"].icon = "__angelssmelting__/graphics/icons/plate-cobalt.png" data.raw["item"]["cobalt-plate"].subgroup = "angels-cobalt-casting" data.raw["item"]["cobalt-plate"].order = "j" data.raw["item"]["cobalt-plate"].icon_size = 32 + data.raw["item"]["cobalt-plate"].icon_mipmaps = 1 -- alloys data.raw["item"]["bronze-alloy"].icon = "__angelssmelting__/graphics/icons/plate-bronze.png" data.raw["item"]["bronze-alloy"].subgroup = "angels-alloys-casting" data.raw["item"]["bronze-alloy"].order = "a[bronze]-b[bronze-alloy]" data.raw["item"]["bronze-alloy"].icon_size = 32 + data.raw["item"]["bronze-alloy"].icon_mipmaps = 1 data.raw["item"]["brass-alloy"].icon = "__angelssmelting__/graphics/icons/plate-brass.png" data.raw["item"]["brass-alloy"].subgroup = "angels-alloys-casting" data.raw["item"]["brass-alloy"].order = "b[brass]-b[brass-alloy]" data.raw["item"]["brass-alloy"].icon_size = 32 + data.raw["item"]["brass-alloy"].icon_mipmaps = 1 data.raw["item"]["gunmetal-alloy"].icon = "__angelssmelting__/graphics/icons/plate-gunmetal.png" data.raw["item"]["gunmetal-alloy"].subgroup = "angels-alloys-casting" data.raw["item"]["gunmetal-alloy"].order = "c[gunmetal]-b[gunmetal-alloy]" data.raw["item"]["gunmetal-alloy"].icon_size = 32 + data.raw["item"]["gunmetal-alloy"].icon_mipmaps = 1 data.raw["item"]["invar-alloy"].icon = "__angelssmelting__/graphics/icons/plate-invar.png" data.raw["item"]["invar-alloy"].subgroup = "angels-alloys-casting" data.raw["item"]["invar-alloy"].order = "d[invar]-b[invar-alloy]" data.raw["item"]["invar-alloy"].icon_size = 32 + data.raw["item"]["invar-alloy"].icon_mipmaps = 1 data.raw["item"]["cobalt-steel-alloy"].icon = "__angelssmelting__/graphics/icons/plate-cobalt-steel.png" data.raw["item"]["cobalt-steel-alloy"].subgroup = "angels-alloys-casting" data.raw["item"]["cobalt-steel-alloy"].order = "e[cobalt-steel]-b[cobalt-steel-alloy]" data.raw["item"]["cobalt-steel-alloy"].icon_size = 32 + data.raw["item"]["cobalt-steel-alloy"].icon_mipmaps = 1 data.raw["item"]["nitinol-alloy"].icon = "__angelssmelting__/graphics/icons/plate-nitinol.png" data.raw["item"]["nitinol-alloy"].subgroup = "angels-alloys-casting" data.raw["item"]["nitinol-alloy"].order = "f[nitinol]-b[nitinol-alloy]" data.raw["item"]["nitinol-alloy"].icon_size = 32 + data.raw["item"]["nitinol-alloy"].icon_mipmaps = 1 - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/tin-plate.png", "__angelssmelting__/graphics/icons/plate-tin.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/silver-plate.png", "__angelssmelting__/graphics/icons/plate-silver.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/lead-plate.png", "__angelssmelting__/graphics/icons/plate-lead.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/glass.png", "__angelssmelting__/graphics/icons/plate-glass.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/gold-plate.png", "__angelssmelting__/graphics/icons/plate-gold.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/nickel-plate.png", "__angelssmelting__/graphics/icons/plate-nickel.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/zinc-plate.png", "__angelssmelting__/graphics/icons/plate-zinc.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/aluminium-plate.png", "__angelssmelting__/graphics/icons/plate-aluminium.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/lead-oxide.png", "__angelssmelting__/graphics/icons/solid-lead-oxide.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/corundum.png", "__angelssmelting__/graphics/icons/solid-aluminium-oxide.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/tungsten-oxide.png", "__angelssmelting__/graphics/icons/solid-tungsten-oxide.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/powdered-tungsten.png", "__angelssmelting__/graphics/icons/powder-tungsten.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/cobalt-oxide.png", "__angelssmelting__/graphics/icons/solid-cobalt-oxide.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/silver-nitrate.png", "__angelssmelting__/graphics/icons/solid-silver-nitrate.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/titanium-plate.png", "__angelssmelting__/graphics/icons/plate-titanium.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/tungsten-plate.png", "__angelssmelting__/graphics/icons/plate-tungsten.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/silicon-plate.png", "__angelssmelting__/graphics/icons/plate-silicon.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/cobalt-plate.png", "__angelssmelting__/graphics/icons/plate-cobalt.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/cobalt-plate.png", "__angelssmelting__/graphics/icons/plate-cobalt.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/brass-plate.png", "__angelssmelting__/graphics/icons/plate-brass.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/bronze-plate.png", "__angelssmelting__/graphics/icons/plate-bronze.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/electrum-plate.png", "__angelssmelting__/graphics/icons/plate-electrum.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/gunmetal-plate.png", "__angelssmelting__/graphics/icons/plate-gunmetal.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/invar-plate.png", "__angelssmelting__/graphics/icons/plate-invar.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/nitinol-plate.png", "__angelssmelting__/graphics/icons/plate-nitinol.png") - -- angelsmods.functions.OV.global_replace_icon("__bobplates__/graphics/icons/plate/cobalt-steel-plate.png", "__angelssmelting__/graphics/icons/plate-cobalt-steel.png") if data.raw.item["tinned-copper-cable"] then data.raw["item"]["tinned-copper-cable"].icon = "__angelssmelting__/graphics/icons/wire-tin.png" - data.raw["item"]["gilded-copper-cable"].icon = "__angelssmelting__/graphics/icons/wire-gold.png" - data.raw["item"]["solder"].icon = "__angelssmelting__/graphics/icons/solder.png" data.raw["item"]["tinned-copper-cable"].icon_size = 32 + data.raw["item"]["tinned-copper-cable"].icon_mipmaps = 1 + data.raw["item"]["gilded-copper-cable"].icon = "__angelssmelting__/graphics/icons/wire-gold.png" data.raw["item"]["gilded-copper-cable"].icon_size = 32 + data.raw["item"]["gilded-copper-cable"].icon_mipmaps = 1 + data.raw["item"]["solder"].icon = "__angelssmelting__/graphics/icons/solder.png" data.raw["item"]["solder"].icon_size = 32 + data.raw["item"]["solder"].icon_mipmaps = 1 - angelsmods.functions.OV.global_replace_icon( + OV.global_replace_icon( "__bobelectronics__/graphics/icons/tinned-copper-cable.png", "__angelssmelting__/graphics/icons/wire-tin.png" ) - angelsmods.functions.OV.global_replace_icon( + OV.global_replace_icon( "__bobelectronics__/graphics/icons/gilded-copper-cable.png", "__angelssmelting__/graphics/icons/wire-gold.png" ) - angelsmods.functions.OV.global_replace_icon( + OV.global_replace_icon( "__bobelectronics__/graphics/icons/solder.png", "__angelssmelting__/graphics/icons/solder.png" ) end end +if mods["bobelectronics"] then + --add steel pre-reqs to things that formerly used electronics to req steel + --[[for _,tech in pairs( + { + "radars", + "bob-drills-1", + "bob-area-drills-1", + "bob-repair-pack-2", + "automation-2", + "solar-energy", + "pumpjack", + "water-washing-1", + "fluid-generator-1" + } + ) do + OV.add_prereq(tech,"steel-processing") + end]] + if mods["bobpower"] then + OV.add_prereq("fluid-generator-1","angels-bronze-smelting-1") + end +end +OV.add_prereq("electric-energy-distribution-1","steel-processing") diff --git a/angelssmelting/prototypes/technology/smelting-alloy-solder.lua b/angelssmelting/prototypes/technology/smelting-alloy-solder.lua index 75d68359c..1c25f1ced 100644 --- a/angelssmelting/prototypes/technology/smelting-alloy-solder.lua +++ b/angelssmelting/prototypes/technology/smelting-alloy-solder.lua @@ -3,8 +3,8 @@ data:extend( { type = "technology", name = "angels-solder-smelting-basic", - icon = "__angelssmelting__/graphics/technology/smelting-solder.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-solder-tech.png", + icon_size = 256, icon_mipmaps = 4, prerequisites = {}, effects = { { @@ -28,8 +28,8 @@ data:extend( { type = "technology", name = "angels-solder-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-solder.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-solder-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-1" @@ -63,8 +63,8 @@ data:extend( { type = "technology", name = "angels-solder-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-solder.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-solder-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-2", @@ -99,8 +99,8 @@ data:extend( { type = "technology", name = "angels-solder-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-solder.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-solder-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-3", diff --git a/angelssmelting/prototypes/technology/smelting-alloy-steel.lua b/angelssmelting/prototypes/technology/smelting-alloy-steel.lua index 65270177c..290a48122 100644 --- a/angelssmelting/prototypes/technology/smelting-alloy-steel.lua +++ b/angelssmelting/prototypes/technology/smelting-alloy-steel.lua @@ -3,8 +3,8 @@ data:extend( { type = "technology", name = "angels-steel-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-steel.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-steel-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "angels-metallurgy-2", @@ -43,12 +43,11 @@ data:extend( { type = "technology", name = "angels-steel-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-steel.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-steel-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-3", - "ore-processing-2", "strand-casting-2", "angels-steel-smelting-1", "angels-silicon-smelting-2", @@ -98,12 +97,12 @@ data:extend( { type = "technology", name = "angels-steel-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-steel.png", - icon_size = 128, + localised_name = {"", {"technology-name.angels-steel-casting"}, " 3"}, + icon = "__angelssmelting__/graphics/technology/casting-steel-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-4", - "ore-processing-3", "strand-casting-3", "angels-steel-smelting-2", "angels-nickel-smelting-3", @@ -142,4 +141,4 @@ data:extend( order = "c-a" } } -) +) \ No newline at end of file diff --git a/angelssmelting/prototypes/technology/smelting-aluminium.lua b/angelssmelting/prototypes/technology/smelting-aluminium.lua index 233affb51..52242e07d 100644 --- a/angelssmelting/prototypes/technology/smelting-aluminium.lua +++ b/angelssmelting/prototypes/technology/smelting-aluminium.lua @@ -3,15 +3,17 @@ data:extend( { type = "technology", name = "angels-aluminium-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-aluminium.png", - icon_size = 128, + localised_name = {"technology-name.angels-aluminium-metallurgy"}, + localised_description = {"technology-description.angels-aluminium-metallurgy"}, + icon = "__angelssmelting__/graphics/technology/casting-aluminium-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "ore-floatation", --"angels-metallurgy-2", "powder-metallurgy-1", "chlorine-processing-1", - "angels-coal-processing-2" + --"angels-coal-processing" }, effects = { { @@ -48,15 +50,13 @@ data:extend( { type = "technology", name = "angels-aluminium-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-aluminium.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-aluminium-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-3", "ore-processing-2", - "strand-casting-2", "angels-aluminium-smelting-1", - "angels-manganese-smelting-1", }, effects = { { @@ -69,11 +69,36 @@ data:extend( }, { type = "unlock-recipe", - recipe = "molten-aluminium-smelting-2" + recipe = "powder-aluminium" + } + }, + unit = { + count = 200, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-aluminium-casting-2", + icon = "__angelssmelting__/graphics/technology/casting-aluminium-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-3", + "strand-casting-2", + "angels-aluminium-smelting-1", + "angels-manganese-smelting-1", + }, + effects = { { type = "unlock-recipe", - recipe = "powder-aluminium" + recipe = "molten-aluminium-smelting-2" }, { type = "unlock-recipe", @@ -98,17 +123,14 @@ data:extend( { type = "technology", name = "angels-aluminium-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-aluminium.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-aluminium-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-4", "ore-processing-3", - "strand-casting-3", "angels-aluminium-smelting-2", - "angels-copper-smelting-3", - "angels-silicon-smelting-3", - "sodium-processing", + "sodium-processing" }, effects = { { @@ -122,7 +144,34 @@ data:extend( { type = "unlock-recipe", recipe = "solid-sodium-aluminate-smelting" + } + }, + unit = { + count = 250, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1}, + {type = "item", name = "production-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-aluminium-casting-3", + icon = "__angelssmelting__/graphics/technology/casting-aluminium-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-4", + "strand-casting-3", + "angels-aluminium-casting-2", + "angels-copper-smelting-3", + "angels-silicon-smelting-3" + }, + effects = { { type = "unlock-recipe", recipe = "molten-aluminium-smelting-3" diff --git a/angelssmelting/prototypes/technology/smelting-chrome.lua b/angelssmelting/prototypes/technology/smelting-chrome.lua index da1ba742a..217bc2e57 100644 --- a/angelssmelting/prototypes/technology/smelting-chrome.lua +++ b/angelssmelting/prototypes/technology/smelting-chrome.lua @@ -3,8 +3,10 @@ data:extend( { type = "technology", name = "angels-chrome-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-chrome.png", - icon_size = 128, + localised_name = {"technology-name.angels-chrome-metallurgy"}, + localised_description = {"technology-description.angels-chrome-metallurgy"}, + icon = "__angelssmelting__/graphics/technology/casting-chrome-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "ore-electro-whinning-cell", @@ -39,13 +41,12 @@ data:extend( { type = "technology", name = "angels-chrome-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-chrome.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-chrome-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-4", "ore-processing-3", - "strand-casting-3", "angels-chrome-smelting-1", }, effects = { @@ -60,7 +61,32 @@ data:extend( { type = "unlock-recipe", recipe = "powder-chrome" + } + }, + unit = { + count = 250, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1}, + {type = "item", name = "production-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-chrome-casting-2", + icon = "__angelssmelting__/graphics/technology/casting-chrome-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-4", + "strand-casting-3", + "angels-chrome-smelting-1", + }, + effects = { { type = "unlock-recipe", recipe = "roll-chrome-casting" @@ -85,15 +111,14 @@ data:extend( { type = "technology", name = "angels-chrome-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-chrome.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-chrome-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-5", "ore-processing-4", - "strand-casting-4", "angels-chrome-smelting-2", - "angels-sulfur-processing-1", -- it seems rediculous adding this prerequisite to yellow... + --"angels-sulfur-processing-1", -- it seems rediculous adding this prerequisite to yellow... "sodium-processing" }, effects = { @@ -116,7 +141,33 @@ data:extend( { type = "unlock-recipe", recipe = "solid-chrome-oxide-smelting" + } + }, + unit = { + count = 300, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1}, + {type = "item", name = "production-science-pack", amount = 1}, + {type = "item", name = "utility-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-chrome-casting-3", + icon = "__angelssmelting__/graphics/technology/casting-chrome-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-5", + "strand-casting-4", + "angels-chrome-casting-2", + }, + effects = { { type = "unlock-recipe", recipe = "roll-chrome-casting-fast" diff --git a/angelssmelting/prototypes/technology/smelting-cobalt.lua b/angelssmelting/prototypes/technology/smelting-cobalt.lua index 97ce412fe..b7ff68793 100644 --- a/angelssmelting/prototypes/technology/smelting-cobalt.lua +++ b/angelssmelting/prototypes/technology/smelting-cobalt.lua @@ -3,13 +3,15 @@ data:extend( { type = "technology", name = "angels-cobalt-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-cobalt.png", - icon_size = 128, + localised_name = {"technology-name.angels-cobalt-metallurgy"}, + localised_description = {"technology-description.angels-cobalt-metallurgy"}, + icon = "__angelssmelting__/graphics/technology/casting-cobalt-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "ore-floatation", "angels-metallurgy-2", - "angels-coal-processing-2" + "angels-coal-processing" }, effects = { { @@ -42,13 +44,12 @@ data:extend( { type = "technology", name = "angels-cobalt-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-cobalt.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-cobalt-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-3", "ore-processing-2", - "strand-casting-2", "angels-cobalt-smelting-1", "water-washing-1" }, @@ -68,7 +69,31 @@ data:extend( { type = "unlock-recipe", recipe = "powder-cobalt" + } + }, + unit = { + count = 200, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-cobalt-casting-2", + icon = "__angelssmelting__/graphics/technology/casting-cobalt-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-3", + "strand-casting-2", + "angels-cobalt-smelting-1" + }, + effects = { { type = "unlock-recipe", recipe = "roll-cobalt-casting" @@ -92,13 +117,12 @@ data:extend( { type = "technology", name = "angels-cobalt-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-cobalt.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-cobalt-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-4", "ore-processing-3", - "strand-casting-3", "angels-cobalt-smelting-2", "angels-sulfur-processing-1", "chlorine-processing-2" @@ -115,7 +139,32 @@ data:extend( { type = "unlock-recipe", recipe = "solid-cobalt-hydroxide-smelting" + } + }, + unit = { + count = 250, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1}, + {type = "item", name = "production-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-cobalt-casting-3", + icon = "__angelssmelting__/graphics/technology/casting-cobalt-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-4", + "strand-casting-3", + "angels-cobalt-casting-2" + }, + effects = { { type = "unlock-recipe", recipe = "roll-cobalt-casting-fast" diff --git a/angelssmelting/prototypes/technology/smelting-copper.lua b/angelssmelting/prototypes/technology/smelting-copper.lua index c1792f997..e6191198c 100644 --- a/angelssmelting/prototypes/technology/smelting-copper.lua +++ b/angelssmelting/prototypes/technology/smelting-copper.lua @@ -3,8 +3,10 @@ data:extend( { type = "technology", name = "angels-copper-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-copper.png", - icon_size = 128, + localised_name = {"technology-name.angels-copper-metallurgy"}, + localised_description = {"technology-description.angels-copper-metallurgy"}, + icon = "__angelssmelting__/graphics/technology/casting-copper-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "ore-crushing", @@ -36,13 +38,12 @@ data:extend( { type = "technology", name = "angels-copper-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-copper.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-copper-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-2", "ore-processing-1", - "strand-casting-1", "angels-copper-smelting-1", "basic-chemistry" }, @@ -58,7 +59,30 @@ data:extend( { type = "unlock-recipe", recipe = "powder-copper" + } + }, + unit = { + count = 150, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-copper-casting-2", + icon = "__angelssmelting__/graphics/technology/casting-copper-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-2", + "strand-casting-1", + "angels-copper-smelting-1" + }, + effects = { { type = "unlock-recipe", recipe = "angels-wire-coil-copper-casting" @@ -89,13 +113,12 @@ data:extend( { type = "technology", name = "angels-copper-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-copper.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-copper-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-3", "ore-processing-2", - "strand-casting-2", "angels-copper-smelting-2", "angels-sulfur-processing-1" }, @@ -111,7 +134,31 @@ data:extend( { type = "unlock-recipe", recipe = "anode-copper-smelting" + } + }, + unit = { + count = 200, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-copper-casting-3", + icon = "__angelssmelting__/graphics/technology/casting-copper-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-3", + "strand-casting-2", + "angels-copper-casting-2" + }, + effects = { { type = "unlock-recipe", recipe = "angels-wire-coil-copper-casting-fast" diff --git a/angelssmelting/prototypes/technology/smelting-glass.lua b/angelssmelting/prototypes/technology/smelting-glass.lua index 0d876da8b..1772fa215 100644 --- a/angelssmelting/prototypes/technology/smelting-glass.lua +++ b/angelssmelting/prototypes/technology/smelting-glass.lua @@ -4,7 +4,7 @@ data:extend( type = "technology", name = "angels-glass-smelting-1", icon = "__angelssmelting__/graphics/technology/glass-tech.png", - icon_size = 128, + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "ore-crushing", @@ -44,14 +44,14 @@ data:extend( type = "technology", name = "angels-glass-smelting-2", icon = "__angelssmelting__/graphics/technology/glass-tech.png", - icon_size = 128, + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-3", "powder-metallurgy-2", "angels-glass-smelting-1", "angels-stone-smelting-2", - "angels-lead-smelting-2" + "angels-lead-smelting-2" -- need this for the lead oxide processing }, effects = { { @@ -78,7 +78,7 @@ data:extend( type = "technology", name = "angels-glass-smelting-3", icon = "__angelssmelting__/graphics/technology/glass-tech.png", - icon_size = 128, + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-4", @@ -86,9 +86,9 @@ data:extend( --[["strand-casting-1",]] "angels-glass-smelting-2", "angels-aluminium-smelting-2", - "angels-tin-smelting-3", + "angels-tin-casting-3", "sodium-processing", - "angels-nitrogen-processing-1" + --"angels-nitrogen-processing-1" }, effects = { { diff --git a/angelssmelting/prototypes/technology/smelting-gold.lua b/angelssmelting/prototypes/technology/smelting-gold.lua index 368ab558b..91c5bfe4c 100644 --- a/angelssmelting/prototypes/technology/smelting-gold.lua +++ b/angelssmelting/prototypes/technology/smelting-gold.lua @@ -3,8 +3,10 @@ data:extend( { type = "technology", name = "angels-gold-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-gold.png", - icon_size = 128, + localised_name = {"technology-name.angels-gold-metallurgy"}, + localised_description = {"technology-description.angels-gold-metallurgy"}, + icon = "__angelssmelting__/graphics/technology/casting-gold-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "ore-floatation", @@ -42,15 +44,13 @@ data:extend( { type = "technology", name = "angels-gold-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-gold.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-gold-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-3", "ore-processing-2", - "strand-casting-2", "angels-gold-smelting-1", - "angels-copper-smelting-2", "angels-nitrogen-processing-2" }, effects = { @@ -73,7 +73,32 @@ data:extend( { type = "unlock-recipe", recipe = "powder-gold" + } + }, + unit = { + count = 200, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-gold-casting-2", + icon = "__angelssmelting__/graphics/technology/casting-gold-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-3", + "strand-casting-2", + "angels-gold-smelting-1", + "angels-copper-casting-2", + }, + effects = { { type = "unlock-recipe", recipe = "angels-wire-coil-gold-casting" @@ -105,13 +130,12 @@ data:extend( { type = "technology", name = "angels-gold-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-gold.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-gold-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-4", "ore-processing-3", - "strand-casting-3", "angels-gold-smelting-2", "sodium-processing" }, @@ -127,7 +151,32 @@ data:extend( { type = "unlock-recipe", recipe = "solid-sodium-gold-cyanide-smelting" + } + }, + unit = { + count = 250, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1}, + {type = "item", name = "production-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-gold-casting-3", + icon = "__angelssmelting__/graphics/technology/casting-gold-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-4", + "strand-casting-3", + "angels-gold-casting-2" + }, + effects = { { type = "unlock-recipe", recipe = "angels-wire-coil-gold-casting-fast" diff --git a/angelssmelting/prototypes/technology/smelting-iron.lua b/angelssmelting/prototypes/technology/smelting-iron.lua index 66f7e710c..a46abe1ac 100644 --- a/angelssmelting/prototypes/technology/smelting-iron.lua +++ b/angelssmelting/prototypes/technology/smelting-iron.lua @@ -3,8 +3,10 @@ data:extend( { type = "technology", name = "angels-iron-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-iron.png", - icon_size = 128, + localised_name = {"technology-name.angels-iron-metallurgy"}, + localised_description = {"technology-description.angels-iron-metallurgy"}, + icon = "__angelssmelting__/graphics/technology/casting-iron-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "ore-crushing", @@ -36,17 +38,14 @@ data:extend( { type = "technology", name = "angels-iron-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-iron.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-iron-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-2", "ore-processing-1", - "strand-casting-1", "angels-iron-smelting-1", - "angels-manganese-smelting-1", - "angels-silicon-smelting-1", - "angels-coal-processing-2" + "angels-coal-processing" }, effects = { { @@ -59,15 +58,40 @@ data:extend( }, { type = "unlock-recipe", - recipe = "molten-iron-smelting-2" + recipe = "powder-iron" + } + }, + unit = { + count = 150, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-iron-casting-2", + icon = "__angelssmelting__/graphics/technology/casting-iron-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-2", + "strand-casting-1", + "angels-iron-smelting-1", + "angels-manganese-smelting-1", + "angels-silicon-smelting-1", + }, + effects = { { type = "unlock-recipe", - recipe = "molten-iron-smelting-3" + recipe = "molten-iron-smelting-2" }, { type = "unlock-recipe", - recipe = "powder-iron" + recipe = "molten-iron-smelting-3" }, { type = "unlock-recipe", @@ -99,17 +123,13 @@ data:extend( { type = "technology", name = "angels-iron-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-iron.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-iron-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-3", "ore-processing-2", - "strand-casting-2", "angels-iron-smelting-2", - "angels-nickel-smelting-2", - "angels-cobalt-smelting-1", - "angels-chrome-smelting-1", "water-washing-1" }, effects = { @@ -120,7 +140,34 @@ data:extend( { type = "unlock-recipe", recipe = "pellet-iron-smelting" + } + }, + unit = { + count = 200, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-iron-casting-3", + icon = "__angelssmelting__/graphics/technology/casting-iron-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-3", + "strand-casting-2", + "angels-iron-casting-2", + "angels-nickel-smelting-2", + "angels-cobalt-smelting-1", + "angels-chrome-smelting-1" + }, + effects = { { type = "unlock-recipe", recipe = "molten-iron-smelting-4" diff --git a/angelssmelting/prototypes/technology/smelting-lead.lua b/angelssmelting/prototypes/technology/smelting-lead.lua index 38084dfb6..e6457f6f9 100644 --- a/angelssmelting/prototypes/technology/smelting-lead.lua +++ b/angelssmelting/prototypes/technology/smelting-lead.lua @@ -3,8 +3,10 @@ data:extend( { type = "technology", name = "angels-lead-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-lead.png", - icon_size = 128, + localised_name = {"technology-name.angels-lead-metallurgy"}, + localised_description = {"technology-description.angels-lead-metallurgy"}, + icon = "__angelssmelting__/graphics/technology/casting-lead-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "ore-crushing", @@ -37,15 +39,14 @@ data:extend( { type = "technology", name = "angels-lead-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-lead.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-lead-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-2", "ore-processing-1", - "strand-casting-1", "angels-lead-smelting-1", - "angels-coal-processing-2" + "angels-coal-processing" }, effects = { { @@ -63,7 +64,30 @@ data:extend( { type = "unlock-recipe", recipe = "powder-lead" + } + }, + unit = { + count = 150, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-lead-casting-2", + icon = "__angelssmelting__/graphics/technology/casting-lead-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-2", + "strand-casting-1", + "angels-lead-smelting-1", + }, + effects = { { type = "unlock-recipe", recipe = "roll-lead-casting" @@ -86,13 +110,12 @@ data:extend( { type = "technology", name = "angels-lead-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-lead.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-lead-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-3", "ore-processing-2", - "strand-casting-2", "angels-lead-smelting-2", "angels-sulfur-processing-2", "water-washing-1" @@ -129,6 +152,34 @@ data:extend( time = 30 }, order = "c-a" + }, + { + type = "technology", + name = "angels-lead-casting-3", + icon = "__angelssmelting__/graphics/technology/casting-lead-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-3", + "strand-casting-2", + "angels-lead-casting-2", + }, + effects = { + { + type = "unlock-recipe", + recipe = "roll-lead-casting-fast" + } + }, + unit = { + count = 200, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1} + }, + time = 30 + }, + order = "c-a" } } ) diff --git a/angelssmelting/prototypes/technology/smelting-manganese.lua b/angelssmelting/prototypes/technology/smelting-manganese.lua index 932c4ddfa..e32085fc2 100644 --- a/angelssmelting/prototypes/technology/smelting-manganese.lua +++ b/angelssmelting/prototypes/technology/smelting-manganese.lua @@ -3,13 +3,14 @@ data:extend( { type = "technology", name = "angels-manganese-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-manganese.png", - icon_size = 128, + localised_description = {"technology-description.angels-manganese-metallurgy"}, + icon = "__angelssmelting__/graphics/technology/casting-manganese-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "ore-advanced-crushing", "angels-metallurgy-2", - "angels-coal-processing-2" + "angels-coal-processing" }, effects = { { @@ -38,13 +39,12 @@ data:extend( { type = "technology", name = "angels-manganese-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-manganese.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-manganese-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-3", "ore-processing-2", - "strand-casting-2", "angels-manganese-smelting-1", "angels-sulfur-processing-1" }, @@ -68,7 +68,31 @@ data:extend( { type = "unlock-recipe", recipe = "powder-manganese" + } + }, + unit = { + count = 200, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-manganese-casting-2", + icon = "__angelssmelting__/graphics/technology/casting-manganese-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-3", + "strand-casting-2", + "angels-manganese-smelting-1", + }, + effects = { { type = "unlock-recipe", recipe = "roll-manganese-casting" @@ -92,13 +116,12 @@ data:extend( { type = "technology", name = "angels-manganese-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-manganese.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-manganese-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-4", "ore-processing-3", - "strand-casting-3", "angels-manganese-smelting-2", "angels-iron-smelting-3", "oil-gas-extraction" @@ -119,7 +142,32 @@ data:extend( { type = "unlock-recipe", recipe = "solid-iron-hydroxide-smelting" + } + }, + unit = { + count = 250, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1}, + {type = "item", name = "production-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-manganese-casting-3", + icon = "__angelssmelting__/graphics/technology/casting-manganese-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-4", + "strand-casting-3", + "angels-manganese-casting-2", + }, + effects = { { type = "unlock-recipe", recipe = "roll-manganese-casting-fast" diff --git a/angelssmelting/prototypes/technology/smelting-nickel.lua b/angelssmelting/prototypes/technology/smelting-nickel.lua index dcd783201..46cd817ec 100644 --- a/angelssmelting/prototypes/technology/smelting-nickel.lua +++ b/angelssmelting/prototypes/technology/smelting-nickel.lua @@ -3,8 +3,10 @@ data:extend( { type = "technology", name = "angels-nickel-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-nickel.png", - icon_size = 128, + localised_name = {"technology-name.angels-nickel-metallurgy"}, + localised_description = {"technology-description.angels-nickel-metallurgy"}, + icon = "__angelssmelting__/graphics/technology/casting-nickel-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "ore-crushing", @@ -37,13 +39,12 @@ data:extend( { type = "technology", name = "angels-nickel-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-nickel.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-nickel-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-2", "ore-processing-1", - "strand-casting-1", "angels-nickel-smelting-1", "angels-sulfur-processing-1" }, @@ -63,7 +64,30 @@ data:extend( { type = "unlock-recipe", recipe = "powder-nickel" + } + }, + unit = { + count = 150, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-nickel-casting-2", + icon = "__angelssmelting__/graphics/technology/casting-nickel-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-2", + "strand-casting-1", + "angels-nickel-smelting-1", + }, + effects = { { type = "unlock-recipe", recipe = "roll-nickel-casting" @@ -86,14 +110,14 @@ data:extend( { type = "technology", name = "angels-nickel-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-nickel.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-nickel-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-3", "ore-processing-2", - "strand-casting-2", - "angels-nickel-smelting-2" + "angels-nickel-smelting-2", + "angels-sulfur-processing-3" }, effects = { { @@ -107,7 +131,31 @@ data:extend( { type = "unlock-recipe", recipe = "solid-nickel-carbonyl-smelting" + } + }, + unit = { + count = 200, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-nickel-casting-3", + icon = "__angelssmelting__/graphics/technology/casting-nickel-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-3", + "strand-casting-2", + "angels-nickel-casting-2" + }, + effects = { { type = "unlock-recipe", recipe = "roll-nickel-casting-fast" diff --git a/angelssmelting/prototypes/technology/smelting-platinum.lua b/angelssmelting/prototypes/technology/smelting-platinum.lua index 8dc46e4d6..1faba3f54 100644 --- a/angelssmelting/prototypes/technology/smelting-platinum.lua +++ b/angelssmelting/prototypes/technology/smelting-platinum.lua @@ -3,8 +3,10 @@ data:extend( { type = "technology", name = "angels-platinum-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-platinum.png", - icon_size = 128, + localised_name = {"technology-name.angels-platinum-metallurgy"}, + localised_description = {"technology-description.angels-platinum-metallurgy"}, + icon = "__angelssmelting__/graphics/technology/casting-platinum-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "ore-electro-whinning-cell", @@ -42,15 +44,13 @@ data:extend( { type = "technology", name = "angels-platinum-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-platinum.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-platinum-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-4", "ore-processing-3", - "strand-casting-3", "angels-platinum-smelting-1", - "angels-copper-smelting-3", "angels-sulfur-processing-1", }, effects = { @@ -65,7 +65,33 @@ data:extend( { type = "unlock-recipe", recipe = "powder-platinum" + } + }, + unit = { + count = 250, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1}, + {type = "item", name = "production-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-platinum-casting-2", + icon = "__angelssmelting__/graphics/technology/casting-platinum-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-4", + "strand-casting-3", + "angels-platinum-smelting-1", + "angels-copper-casting-3", + }, + effects = { { type = "unlock-recipe", recipe = "angels-wire-coil-platinum-casting" @@ -98,13 +124,12 @@ data:extend( { type = "technology", name = "angels-platinum-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-platinum.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-platinum-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-5", "ore-processing-4", - "strand-casting-4", "angels-platinum-smelting-2", "chlorine-processing-1", -- it seems rediculous adding this prerequisite to yellow... "angels-nitrogen-processing-2" -- it seems rediculous adding this prerequisite to yellow... @@ -125,7 +150,33 @@ data:extend( { type = "unlock-recipe", recipe = "solid-ammonium-chloroplatinate-smelting" + } + }, + unit = { + count = 300, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1}, + {type = "item", name = "production-science-pack", amount = 1}, + {type = "item", name = "utility-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-platinum-casting-3", + icon = "__angelssmelting__/graphics/technology/casting-platinum-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-5", + "strand-casting-4", + "angels-platinum-casting-2", + }, + effects = { { type = "unlock-recipe", recipe = "angels-wire-coil-platinum-casting-fast" diff --git a/angelssmelting/prototypes/technology/smelting-silicon.lua b/angelssmelting/prototypes/technology/smelting-silicon.lua index 3b7ee8d01..604e7a2ec 100644 --- a/angelssmelting/prototypes/technology/smelting-silicon.lua +++ b/angelssmelting/prototypes/technology/smelting-silicon.lua @@ -3,8 +3,10 @@ data:extend( { type = "technology", name = "angels-silicon-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-silicon.png", - icon_size = 128, + localised_name = {"technology-name.angels-silicon-metallurgy"}, + localised_description = {"technology-description.angels-silicon-metallurgy"}, + icon = "__angelssmelting__/graphics/technology/casting-silicon-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "ore-crushing", @@ -46,8 +48,8 @@ data:extend( { type = "technology", name = "angels-silicon-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-silicon.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-silicon-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-2", @@ -86,8 +88,8 @@ data:extend( { type = "technology", name = "angels-silicon-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-silicon.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-silicon-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-3", @@ -107,7 +109,30 @@ data:extend( { type = "unlock-recipe", recipe = "gas-silane-smelting" + } + }, + unit = { + count = 200, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-silicon-casting-2", + icon = "__angelssmelting__/graphics/technology/casting-silicon-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + "angels-metallurgy-3", + "angels-silicon-smelting-1", + }, + effects = { { type = "unlock-recipe", recipe = "angels-mono-silicon-2" diff --git a/angelssmelting/prototypes/technology/smelting-silver.lua b/angelssmelting/prototypes/technology/smelting-silver.lua index 01dc4fb8a..4180889ee 100644 --- a/angelssmelting/prototypes/technology/smelting-silver.lua +++ b/angelssmelting/prototypes/technology/smelting-silver.lua @@ -3,8 +3,10 @@ data:extend( { type = "technology", name = "angels-silver-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-silver.png", - icon_size = 128, + localised_name = {"technology-name.angels-silver-metallurgy"}, + localised_description = {"technology-description.angels-silver-metallurgy"}, + icon = "__angelssmelting__/graphics/technology/casting-silver-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "ore-floatation", @@ -41,15 +43,13 @@ data:extend( { type = "technology", name = "angels-silver-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-silver.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-silver-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-3", "ore-processing-2", - "strand-casting-2", "angels-silver-smelting-1", - "angels-copper-smelting-2", "angels-nitrogen-processing-2" }, effects = { @@ -68,7 +68,32 @@ data:extend( { type = "unlock-recipe", recipe = "powder-silver" + } + }, + unit = { + count = 200, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-silver-casting-2", + icon = "__angelssmelting__/graphics/technology/casting-silver-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-3", + "strand-casting-2", + "angels-silver-smelting-1", + "angels-copper-casting-2", + }, + effects = { { type = "unlock-recipe", recipe = "angels-wire-coil-silver-casting" @@ -100,13 +125,13 @@ data:extend( { type = "technology", name = "angels-silver-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-silver.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-silver-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-4", "ore-processing-3", - "strand-casting-3", + "angels-silver-smelting-2", "sodium-processing" }, effects = { @@ -125,7 +150,32 @@ data:extend( { type = "unlock-recipe", recipe = "cathode-silver-smelting" + } + }, + unit = { + count = 250, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1}, + {type = "item", name = "production-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-silver-casting-3", + icon = "__angelssmelting__/graphics/technology/casting-silver-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-4", + "strand-casting-3", + "angels-silver-casting-2" + }, + effects = { { type = "unlock-recipe", recipe = "angels-wire-coil-silver-casting-fast" diff --git a/angelssmelting/prototypes/technology/smelting-support.lua b/angelssmelting/prototypes/technology/smelting-support.lua index 64e2b4d61..67cee8c21 100644 --- a/angelssmelting/prototypes/technology/smelting-support.lua +++ b/angelssmelting/prototypes/technology/smelting-support.lua @@ -44,7 +44,8 @@ data:extend( icon_mipmaps = 2, upgrade = true, prerequisites = { - "angels-metallurgy-1" + "angels-metallurgy-1", + "advanced-material-processing" }, effects = { { @@ -598,7 +599,7 @@ data:extend( icon = "__angelssmelting__/graphics/technology/coolant-tech.png", icon_size = 128, prerequisites = { - "angels-metallurgy-2", + "advanced-material-processing", "water-treatment" }, effects = { diff --git a/angelssmelting/prototypes/technology/smelting-tin.lua b/angelssmelting/prototypes/technology/smelting-tin.lua index 08bfa0399..b8e5fd786 100644 --- a/angelssmelting/prototypes/technology/smelting-tin.lua +++ b/angelssmelting/prototypes/technology/smelting-tin.lua @@ -3,8 +3,10 @@ data:extend( { type = "technology", name = "angels-tin-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-tin.png", - icon_size = 128, + localised_name = {"technology-name.angels-tin-metallurgy"}, + localised_description = {"technology-description.angels-tin-metallurgy"}, + icon = "__angelssmelting__/graphics/technology/casting-tin-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "angels-metallurgy-1", @@ -23,10 +25,10 @@ data:extend( type = "unlock-recipe", recipe = "angels-plate-tin" }, - { + --[[{ --moved to electronics type = "unlock-recipe", recipe = "basic-tinned-copper-wire" - } + }]] }, unit = { count = 100, @@ -40,16 +42,14 @@ data:extend( { type = "technology", name = "angels-tin-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-tin.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-tin-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-2", "ore-processing-1", - "strand-casting-1", "angels-tin-smelting-1", - "angels-copper-smelting-2", - "angels-coal-processing-2" + "angels-coal-processing" }, effects = { { @@ -63,7 +63,31 @@ data:extend( { type = "unlock-recipe", recipe = "powder-tin" + } + }, + unit = { + count = 150, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-tin-casting-2", + icon = "__angelssmelting__/graphics/technology/casting-tin-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-2", + "strand-casting-1", + "angels-tin-smelting-1", + "angels-copper-casting-2" + }, + effects = { { type = "unlock-recipe", recipe = "angels-wire-coil-tin-casting" @@ -94,13 +118,12 @@ data:extend( { type = "technology", name = "angels-tin-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-tin.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-tin-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-3", "ore-processing-2", - "strand-casting-2", "angels-tin-smelting-2" }, effects = { @@ -111,7 +134,31 @@ data:extend( { type = "unlock-recipe", recipe = "pellet-tin-smelting" + } + }, + unit = { + count = 200, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-tin-casting-3", + icon = "__angelssmelting__/graphics/technology/casting-tin-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-3", + "strand-casting-2", + "angels-tin-casting-2" + }, + effects = { { type = "unlock-recipe", recipe = "angels-wire-coil-tin-casting-fast" diff --git a/angelssmelting/prototypes/technology/smelting-titanium.lua b/angelssmelting/prototypes/technology/smelting-titanium.lua index 40e4ab01a..ce977e746 100644 --- a/angelssmelting/prototypes/technology/smelting-titanium.lua +++ b/angelssmelting/prototypes/technology/smelting-titanium.lua @@ -3,8 +3,10 @@ data:extend( { type = "technology", name = "angels-titanium-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-titanium.png", - icon_size = 128, + localised_name = {"technology-name.angels-titanium-metallurgy"}, + localised_description = {"technology-description.angels-titanium-metallurgy"}, + icon = "__angelssmelting__/graphics/technology/casting-titanium-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "ore-leaching", @@ -48,16 +50,13 @@ data:extend( { type = "technology", name = "angels-titanium-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-titanium.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-titanium-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-4", "ore-processing-3", - "strand-casting-3", "angels-titanium-smelting-1", - "angels-manganese-smelting-2", - "angels-nickel-smelting-3" }, effects = { { @@ -70,15 +69,42 @@ data:extend( }, { type = "unlock-recipe", - recipe = "molten-titanium-smelting-2" + recipe = "powder-titanium" + }, + }, + unit = { + count = 250, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1}, + {type = "item", name = "production-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-titanium-casting-2", + icon = "__angelssmelting__/graphics/technology/casting-titanium-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-4", + "strand-casting-3", + "angels-titanium-smelting-1", + "angels-manganese-smelting-2", + "angels-nickel-smelting-3" + }, + effects = { { type = "unlock-recipe", - recipe = "molten-titanium-smelting-3" + recipe = "molten-titanium-smelting-2" }, { type = "unlock-recipe", - recipe = "powder-titanium" + recipe = "molten-titanium-smelting-3" }, { type = "unlock-recipe", @@ -104,18 +130,13 @@ data:extend( { type = "technology", name = "angels-titanium-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-titanium.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-titanium-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-5", "ore-processing-4", - "strand-casting-4", "angels-titanium-smelting-2", - "angels-tin-smelting-3", - "angels-aluminium-smelting-3", - "angels-chrome-smelting-2", - "angels-cobalt-smelting-3", "chlorine-processing-2" }, effects = { @@ -126,7 +147,37 @@ data:extend( { type = "unlock-recipe", recipe = "pellet-titanium-smelting" + } + }, + unit = { + count = 300, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1}, + {type = "item", name = "production-science-pack", amount = 1}, + {type = "item", name = "utility-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-titanium-casting-3", + icon = "__angelssmelting__/graphics/technology/casting-titanium-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-5", + "strand-casting-4", + "angels-titanium-casting-2", + "angels-tin-smelting-3", + "angels-aluminium-smelting-3", + "angels-chrome-smelting-2", + "angels-cobalt-smelting-3", + }, + effects = { { type = "unlock-recipe", recipe = "molten-titanium-smelting-4" diff --git a/angelssmelting/prototypes/technology/smelting-tungsten.lua b/angelssmelting/prototypes/technology/smelting-tungsten.lua index c49c39388..99a011aee 100644 --- a/angelssmelting/prototypes/technology/smelting-tungsten.lua +++ b/angelssmelting/prototypes/technology/smelting-tungsten.lua @@ -3,8 +3,8 @@ data:extend( { type = "technology", name = "angels-tungsten-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-tungsten.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-tungsten-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "ore-refining", @@ -54,8 +54,8 @@ data:extend( { type = "technology", name = "angels-tungsten-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-tungsten.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-tungsten-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-4", @@ -98,8 +98,8 @@ data:extend( { type = "technology", name = "angels-tungsten-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-tungsten.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/casting-tungsten-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-5", diff --git a/angelssmelting/prototypes/technology/smelting-zinc.lua b/angelssmelting/prototypes/technology/smelting-zinc.lua index 6c62a40db..4ab7a803d 100644 --- a/angelssmelting/prototypes/technology/smelting-zinc.lua +++ b/angelssmelting/prototypes/technology/smelting-zinc.lua @@ -3,8 +3,10 @@ data:extend( { type = "technology", name = "angels-zinc-smelting-1", - icon = "__angelssmelting__/graphics/technology/smelting-zinc.png", - icon_size = 128, + localised_name = {"technology-name.angels-zinc-metallurgy"}, + localised_description = {"technology-description.angels-zinc-metallurgy"}, + icon = "__angelssmelting__/graphics/technology/casting-zinc-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { "ore-floatation", @@ -43,15 +45,14 @@ data:extend( { type = "technology", name = "angels-zinc-smelting-2", - icon = "__angelssmelting__/graphics/technology/smelting-zinc.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-zinc-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-3", "ore-processing-2", - "strand-casting-2", "angels-zinc-smelting-1", - "angels-coal-processing-2" + "angels-coal-processing" }, effects = { { @@ -65,7 +66,31 @@ data:extend( { type = "unlock-recipe", recipe = "powder-zinc" + } + }, + unit = { + count = 200, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-zinc-casting-2", + icon = "__angelssmelting__/graphics/technology/casting-zinc-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-3", + "strand-casting-2", + "angels-zinc-smelting-1" + }, + effects = { { type = "unlock-recipe", recipe = "roll-zinc-casting" @@ -89,13 +114,12 @@ data:extend( { type = "technology", name = "angels-zinc-smelting-3", - icon = "__angelssmelting__/graphics/technology/smelting-zinc.png", - icon_size = 128, + icon = "__angelssmelting__/graphics/technology/smelting-zinc-tech.png", + icon_size = 256, icon_mipmaps = 4, upgrade = true, prerequisites = { --"angels-metallurgy-4", "ore-processing-3", - "strand-casting-3", "angels-zinc-smelting-2", "angels-sulfur-processing-2" }, @@ -115,7 +139,32 @@ data:extend( { type = "unlock-recipe", recipe = "cathode-zinc-smelting" + } + }, + unit = { + count = 250, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1}, + {type = "item", name = "production-science-pack", amount = 1} }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "angels-zinc-casting-3", + icon = "__angelssmelting__/graphics/technology/casting-zinc-tech.png", + icon_size = 256, icon_mipmaps = 4, + upgrade = true, + prerequisites = { + --"angels-metallurgy-4", + "strand-casting-3", + "angels-zinc-casting-2", + }, + effects = { { type = "unlock-recipe", recipe = "roll-zinc-casting-fast" diff --git a/build.py b/build_angelmods.py similarity index 100% rename from build.py rename to build_angelmods.py diff --git a/build.sh b/build_angelmods.sh old mode 100755 new mode 100644 similarity index 100% rename from build.sh rename to build_angelmods.sh diff --git a/build_bobmods.py b/build_bobmods.py new file mode 100644 index 000000000..34487808f --- /dev/null +++ b/build_bobmods.py @@ -0,0 +1,166 @@ +import os, shutil, sys, getopt +import urllib.request +import json + +class ModDownloader: + def __init__(self, modName): + self.factorioFolderDir = None + + opts, args = getopt.getopt(sys.argv[1:], ":m:", ['dir=']) + for opt, arg in opts: + if opt in ('-m', '--factoriodir'): + self.factorioFolderDir = os.path.realpath(arg.strip()) + + if self.factorioFolderDir == None: + self.factorioFolderDir = "{0}/Factorio/".format(os.getenv('APPDATA')) + self.modFolderDir = "{0}mods/".format(self.factorioFolderDir) + + self.modData = self.__getModAPI(modName) + self.userData = self.__getUserData() + + def __str__(self): + return json.dumps(self.modData, indent=4, sort_keys=True) + + def getReleases(self): + return self.modData["releases"] + + def getLatestModVersion(self, factorioVersion = None): + fixedFactorioVersion = False if factorioVersion is None else True + + modReleases = self.getReleases() + + latestReleaseFactorioVersion = factorioVersion + latestReleaseModVersion = None + + for release in modReleases: + # compare factorio release version + releaseFactorioVersion = release["info_json"]["factorio_version"] + if not self.__compareVersion(latestReleaseFactorioVersion, releaseFactorioVersion): + continue # release is for an older version of factorio + if fixedFactorioVersion: + if not self.__compareVersion(releaseFactorioVersion, factorioVersion): + continue # release is for a newer version of factorio + else: + if not self.__compareVersion(releaseFactorioVersion, latestReleaseFactorioVersion): + # newer factorioVersion detected + latestReleaseFactorioVersion = releaseFactorioVersion + latestReleaseModVersion = release["version"] + continue # no need to compare further + + # compare mod release version + releaseModVersion = release["version"] + if not self.__compareVersion(latestReleaseModVersion, releaseModVersion): + continue # release is for an older version of the mod + if self.__compareVersion(releaseModVersion, latestReleaseModVersion): + continue # release is for the same version of the mod + latestReleaseModVersion = releaseModVersion + + if latestReleaseModVersion is None: + latestReleaseFactorioVersion = None + return [latestReleaseFactorioVersion, latestReleaseModVersion] + + def downloadModVersion(self, factorioVersion = None, modVersion = None): + print("Updating '{0}'".format(self.modData["name"])) + + # delete any local versions + self.__deleteAllVersions(self.modData["name"]) + + # download the most suitable release + if factorioVersion is None: + modVersion = None + if modVersion is None: + factorioVersion, modVersion = self.getLatestModVersion(factorioVersion) + modRelease = self.__getReleaseInfo(factorioVersion, modVersion) + print(" Creating '{0}'".format(modRelease["file_name"])) + modDownloadUrl = 'http://mods.factorio.com{0}?username={1}&token={2}'.format(modRelease["download_url"], self.userData[0], self.userData[1]) + modDownloadRequest = urllib.request.Request(modDownloadUrl) + with urllib.request.urlopen(modDownloadRequest) as downloadFile: + with open('{0}{1}'.format(self.modFolderDir, modRelease["file_name"]), 'wb+') as zipFile: + zipFile.write(downloadFile.read()) + + def download(self): + return self.downloadModVersion() + + def __getUserData(self): + with open('{}/player-data.json'.format(self.factorioFolderDir)) as playerDataFile: + playerData = json.load(playerDataFile) + return [playerData["service-username"], playerData["service-token"]] + + def __getModAPI(self, modName): + apiQuerry = urllib.request.Request('http://mods.factorio.com/api/mods/{0}'.format(modName)) + try: + apiRequest = urllib.request.urlopen(apiQuerry).read() + apiContent = json.loads(apiRequest.decode('utf-8')) + apiMessage = apiContent["message"] + except urllib.request.HTTPError: + raise NameError("Could not find a mod named '{0}'.".format(modName)) + except KeyError: + apiMessage = None + if apiMessage == "Mod not found": + raise NameError("Could not find a mod named '{0}'.".format(modName)) + return apiContent + + def __compareVersion(self, version1, version2): + """ Returns true if version 2 >= version 1 """ + # test version validity + if version1 is None: + return True + if version2 is None: + return False + + # prematurely test equality + if version1 == version2: + return True + + # compare versions graduately + version1 = version1.split('.') + version2 = version2.split('.') + for version in range(0, len(version1)): + if version2[version] < version1[version]: + return False + if version2[version] > version1[version]: + return True + + def __getReleaseInfo(self, factorioVersion, modVersion): + modReleases = self.getReleases() + for release in modReleases: + if factorioVersion == release["info_json"]["factorio_version"] and\ + modVersion == release["version"]: + return release + + def __deleteAllVersions(self, modName, deleteZip=True): + # deleting folders + folders = [folderName for folderName in next(os.walk(self.modFolderDir))[1] if folderName.find(modName) >= 0] + for folder in folders: + print(" Removing '{0}/'".format(folder)) + shutil.rmtree(self.modFolderDir + folder) + + # deleting zip folders + folders = [folderName for folderName in os.listdir(self.modFolderDir) if deleteZip and folderName.find(modName) >= 0 ] + for folder in folders: + print(" Removing '{0}'".format(folder)) + os.remove(self.modFolderDir + folder) + +if __name__ == "__main__": + bobmods = { + "bobassembly" : True, + "bobclasses" : True, + "bobelectronics" : True, + "bobenemies" : True, + "bobequipment" : True, + "bobgreenhouse" : True, + "bobinserters" : True, + "boblibrary" : True, + "boblogistics" : True, + "bobmining" : True, + "bobmodules" : True, + "bobores" : True, + "bobplates" : True, + "bobpower" : True, + "bobrevamp" : True, + "bobtech" : True, + "bobvehicleequipment": True, + "bobwarfare" : True + } + for bobmod in bobmods: + ModDownloader(bobmod).download() \ No newline at end of file