diff --git a/README.md b/README.md index f85403a32..7c560d650 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,97 @@ -# Angelsmods - -## 01. Refining -## 02. Petrochem -## 03. Smelting -## 04. BioProcessing -## 05. Industries -## 06. Infinite Ores -## 07. Exploration -## 10 AddOns - ### 10.01. C.A.B. - ### 10.02. Decorations - Nilaus - ### 10.03. Ore Silos - ### 10.04. Petrochem Train - ### 10.05. Pressure Tanks - ### 10.06. Decorations - ShredNation - ### 10.07. Smelting Train - ### 10.08. Warehouses +## Angels Mods + +- I. [Angel's Infinite Ores](https://forums.factorio.com/viewtopic.php?f=93&t=21909) +- II. [Angel's Refining](https://forums.factorio.com/viewtopic.php?f=93&t=24906) +- III. [Angel's Petrochem](https://forums.factorio.com/viewtopic.php?f=185&t=25472) +- IV. [Angel's Metallurgy Smelting](https://forums.factorio.com/viewtopic.php?f=185&t=33566) +- V. [Angel's Bio Processing](https://forums.factorio.com/viewtopic.php?f=185&t=25469) +- VI. [Angel's Industries](https://forums.factorio.com/viewtopic.php?f=185&t=58585) (Alpha) +- VII. Angel's Exploration (Beta) +- VIII. [Angel's Add-ons](https://forums.factorio.com/viewtopic.php?f=185&t=30962) + - VIII.I. [Warehouses](https://forums.factorio.com/viewtopic.php?p=396867#p396867) + - VIII.II. [Ore Silos](https://forums.factorio.com/viewtopic.php?p=396868#p396868) + - VIII.III. [Ore Silos](https://forums.factorio.com/viewtopic.php?p=396868#p396868) + - VIII.IV. [Petrochem Train](https://forums.factorio.com/viewtopic.php?p=396870#p396870) + - VIII.V. [Smelting Train](https://forums.factorio.com/viewtopic.php?p=396871#p396871) + - VIII.VI. [C.A.B.](https://forums.factorio.com/viewtopic.php?p=396874#p396874) + - VIII.VII. Decorations +- X. [Development and Discussion](https://forums.factorio.com/viewtopic.php?f=185&t=19652) +- XI. [Bugs & FAQ](https://forums.factorio.com/viewtopic.php?f=185&t=25468) +- XII. [Donations and Chocolate Fund](https://forums.factorio.com/viewtopic.php?f=185&t=38649) + +[![Ready For Angels? TRAILER](https://img.youtube.com/vi/LizA-DD9Gfo/0.jpg)](https://www.youtube.com/watch?v=LizA-DD9Gfo) + +*Be aware that removing and/or adding angel mods to a running game will mess things up (recommended is starting a new game)* + +### I. [Angel's Infinite Ores](https://forums.factorio.com/viewtopic.php?f=93&t=21909) +Add infinity ores to spawn in addition to the regular existing ores. Supports Vanilla Ores, BobsOres and YuokiOres. Usage of the [RSO mod](https://forums.factorio.com/viewforum.php?f=79) is highly recommended, it features the generation of ore patches which have a percentage of infinite ores thanks to orzelek! + +### II. [Angel's Refining](https://forums.factorio.com/viewtopic.php?f=93&t=24906) +Replaces all ores patches with new once which you have to refine prior to smelting. All the ores (from base/bobs/YI) will be replaced by 6 new compound ores (Saphirite, Stiratite, Crotinnium, Jivolite, Rubyte, Bobmonium) and a new wells (Fissure). The mined compound ores have to be refined before you are able to smelt and cast them into plates. More advanced refining methodes will result in a higher yield of processed ores and may unlock new refined ores. + +There are 2 different modes currently: Vanilla (refine for iron and copper ore), Bobs-Angels (BA, refine for a lot of modded ores). Works best in conjunction with Bobmods and supports additional mods like Yuoki Industries, Uranium Power and Nucular. + +### III. [Angel's Petrochem](https://forums.factorio.com/viewtopic.php?f=185&t=25472) +Changes and adds how Oil processing works. Aside from Coal and Oil Wells in vanilla, Gas Well are added to the game as raw carbon sources. Raw resources have to be processed and transformed though chemical processing chains to gain plastic, resin, rubber and fuels. Also adds the chemical basics for other mods to use: chlorine, nitrogen, sulfur and other chemical compounds are added. Includes alternative skin for the chemical plant matching the gfx style from petrochem. + +### IV. [Angel's Metallurgy Smelting](https://forums.factorio.com/viewtopic.php?f=185&t=33566) +Instead of putting ores into a regular furnace, Metallurgy Smelting provides advanced processing chains to produce plates and wires, increasing ore yield at the expense of space and energy. + +### V. [Angel's Bio Processing](https://forums.factorio.com/viewtopic.php?f=185&t=25469) +Explore the alien planet to find the Flora (plant life) and Fauna (animal life) and use it to your advantage. + +- Nauvis Processing + - Algae Farming: Different Algae live of a variety of liquid solutions and growth enhancer, they then can be processed for the element they metabolized while growing. **Green Algae** live of Mineralized Water and produces fibers which can replace some aspects of wood. **Brown algae** live of Saline Water and produces salts and acid that can be combined with the fibers to produce paper. **Blue Algae** live of Waste Water and produces Nitrogen heavy compounds. **Red Algae** live of Thermal Water and produces Silicate heavy comounds. + - Arboretum: By exploring the planet you find different types of deciduous tree in addition to the coniferous trees of the base game. Extract seeds out of these trees and start growing your own trees as a renewable source of wood. More advanced processing leads to more advanced tree growth, allowing you to extract Resin, Plastic and Rubber out of these special trees. +- Vegetabilis Processing + - By exploring the planet you find gardens that you can investigate and refine to seeds. These seeds allow you to grow plants yourself. Process these plants for nutrients, fuel and oils. +- Animalis Processing + - Catch fish and breed them as a renewable way of regenerating your health. Process their water to extract Alien Spores which can be processed further for alien artifacts. + - Explore the planet to find Puffer Nests to obtain Puffer Eggs. Breed your smelly puffers to obtain different ways of processing gasses. + - Do some experiments on your Puffers and maybe you can breed some tame biters yourself. Study them in order to obtain crystals from them, which can come in handy to increase your factory productivity or speed them up. + +### VI. [Angel's Industries](https://forums.factorio.com/viewtopic.php?f=185&t=58585) (Alpha) +Invest in new technologies earlier! Have some logistical advantages by using Angel's logistics. + +This mod has some new overhaul settings: + +- Industry Overhaul: Add a new mode: Pure-Angel, no Bobs mods required! (BA) Everything contained by Angels mods only. *Does also work with bobs mods.* +- Component Overhaul: All the complex machinery does not come out of the blue, add complex chains to create advanced intermediate products for your buildings. There is also an optional setting that will give you the building ingredients back instead of the building itself (without losses), because all these complex machinery is not so trivial to remove efficiently. +- Technology Overhaul: Instead of science packs, use different science analyzers and datacores to research new innovative way to grow your factory. + +### VII. Angel's Exploration (Beta) +The alien life forms do not like you as much as you may like them. Add different tiers of biters and new weapons to counter these creatures. + +### VIII. [Angel's Add-ons](https://forums.factorio.com/viewtopic.php?f=185&t=30962) +#### VIII.I. [Warehouses](https://forums.factorio.com/viewtopic.php?p=396867#p396867) +Add big buildings to store bulk amounts (768 slots) of products. Also includes (smaller, 512 slots) logistic versions! + +#### VIII.II. [Ore Silos](https://forums.factorio.com/viewtopic.php?p=396868#p396868) +Add 6 silos themed to fit with the compound ores introduced in Angel's Refining, able to store bulk amount of ores (256s lots). Also includes logistic versions! + +#### VIII.III. [Ore Silos](https://forums.factorio.com/viewtopic.php?p=396868#p396868) +Add a high volume pressure tank to store a lot of fluid, usefull when playing with Angel's Petrochem. + +#### VIII.IV. [Petrochem Train](https://forums.factorio.com/viewtopic.php?p=396870#p396870) +Add a petrochem themed train with 1 type of locomotive and 2 types of fluid wagons, themed after the oil and gas tanks added in Angel's Petrochem. There are settings to enable multiple tiers of this train. + +#### VIII.V. [Smelting Train](https://forums.factorio.com/viewtopic.php?p=396871#p396871) +Add a Metallurgy Smelting themed train with 2 types of locomotives (regular for the first locomotive and a tender for inbetween) and a high capacity cargo wagon (64 slots) for long distance traveling between your base and mining outposts! There are settings to enable multiple tiers of this train. + +#### VIII.VI. [C.A.B.](https://forums.factorio.com/viewtopic.php?p=396874#p396874) +Another type of crawler, the Crawler Autonomous Base. Deploy the C.A.B. and have a small mobile power unit so you can deploy buildings on the fly to temporary help you craft by hand! + +#### VIII.VII. Decorations +Add small decorations as tributes to the lovely community + +- Nilaus Decorations +- ShredNation Decorations + +### X. [Development and Discussion](https://forums.factorio.com/viewtopic.php?f=185&t=19652) +For discussions and information about the mods. + +### XI. [Bugs & FAQ](https://forums.factorio.com/viewtopic.php?f=185&t=25468) +For bug reports. + +### XII. [Donations and Chocolate Fund](https://forums.factorio.com/viewtopic.php?f=185&t=38649) +For chocolates! \ No newline at end of file diff --git a/angelsaddons-crawlertrain/changelog.txt b/angelsaddons-crawlertrain/changelog.txt new file mode 100644 index 000000000..c0e52c3b6 --- /dev/null +++ b/angelsaddons-crawlertrain/changelog.txt @@ -0,0 +1,7 @@ +--------------------------------------------------------------------------------------------------- +Version: 0.1.0 +Date: 02.04.2020 + Changes: + - Initial release + - Added multiple tiers for crawler train + - Separated from industries diff --git a/angelsaddons-crawlertrain/data-updates.lua b/angelsaddons-crawlertrain/data-updates.lua new file mode 100644 index 000000000..21cf5ee8d --- /dev/null +++ b/angelsaddons-crawlertrain/data-updates.lua @@ -0,0 +1,103 @@ +if angelsmods.industries then + if angelsmods.industries.components then + -- Todo: implement proper components for the train + -- require("prototypes.recipes.crawlertrain-updates") + end + + -- Add data core replace? + if angelsmods.industries.overhaul and angelsmods.industries.tech then + -- OV.set_science_pack("angels-crawler-train", "datacore-logistic-1", 2) + end + data.raw["item-subgroup"]["angels-crawler-train"].group = "angels-vehicles" + data.raw["item-subgroup"]["angels-crawler-train"].order = "bc[crawler-train]" + + -- Update equipment grid + local function update_grid(grid, add, remove) + local function flip_t(tab) + local new_t = {} + for k, v in pairs(tab) do + new_t[v] = k + end + return new_t + end + if type(add) == "string" then + add = {add} + end + if type(remove) == "string" then + remove = {remove} + end + + add = add or {} + remove = remove or {} + + local equipgrid = data.raw["equipment-grid"][grid].equipment_categories + local flip_equipgrid = flip_t(equipgrid) + for name, value in pairs(remove) do + if flip_equipgrid[value] then + equipgrid[flip_equipgrid[value]] = nil + end + end + for name, value in pairs(add) do + if not flip_equipgrid[value] then + table.insert(equipgrid, value) + end + end + end + + update_grid( + "angels-crawler-locomotive", + { + "angels-energy", + "angels-heavy-defense", + "angels-movement" + }, + "angels-void" + ) + update_grid( + "angels-crawler-loco-wagon", + { + "angels-energy", + "angels-heavy-defense", + "angels-movement" + }, + "angels-void" + ) + update_grid( + "angels-crawler-wagon", + { + "angels-energy", + "angels-repair", + "angels-heavy-defense", + "angels-movement" + }, + "angels-void" + ) + update_grid( + "angels-crawler-bot-wagon", + { + "angels-energy", + "angels-repair", + "angels-heavy-defense", + "angels-construction", + "angels-movement" + }, + "angels-void" + ) +end + +if mods["bobvehicleequipment"] then + -- crawler locomotive + table.insert(data.raw["equipment-grid"]["angels-crawler-locomotive"].equipment_categories, "train") + table.insert(data.raw["equipment-grid"]["angels-crawler-locomotive"].equipment_categories, "vehicle") + table.insert(data.raw["equipment-grid"]["angels-crawler-locomotive"].equipment_categories, "locomotive") + table.insert(data.raw["equipment-grid"]["angels-crawler-loco-wagon"].equipment_categories, "train") + table.insert(data.raw["equipment-grid"]["angels-crawler-loco-wagon"].equipment_categories, "vehicle") + table.insert(data.raw["equipment-grid"]["angels-crawler-loco-wagon"].equipment_categories, "locomotive") + -- crawler wagon + table.insert(data.raw["equipment-grid"]["angels-crawler-wagon"].equipment_categories, "train") + table.insert(data.raw["equipment-grid"]["angels-crawler-wagon"].equipment_categories, "vehicle") + -- crawler bot wagon + table.insert(data.raw["equipment-grid"]["angels-crawler-bot-wagon"].equipment_categories, "train") + table.insert(data.raw["equipment-grid"]["angels-crawler-bot-wagon"].equipment_categories, "vehicle") + table.insert(data.raw["equipment-grid"]["angels-crawler-bot-wagon"].equipment_categories, "cargo-wagon") +end diff --git a/angelsaddons-crawlertrain/data.lua b/angelsaddons-crawlertrain/data.lua new file mode 100644 index 000000000..2d3364988 --- /dev/null +++ b/angelsaddons-crawlertrain/data.lua @@ -0,0 +1,17 @@ +angelsmods = angelsmods or {} +angelsmods.addons = angelsmods.addons or {} +angelsmods.addons.crawlertrain = angelsmods.addons.crawlertrain or {} +angelsmods.addons.crawlertrain.enable_tiers = settings.startup["angels-crawlertrain-tier-enable"].value +angelsmods.addons.crawlertrain.tier_amount = settings.startup["angels-crawlertrain-tier-amount"].value +angelsmods.addons.crawlertrain.number_tint = {r = 0.95, g = 0.65, b = 0.25, a = 1} + +tech_unlocks = {} + +require("prototypes.category") +require("prototypes.equipment-grid") +require("prototypes.entities.crawler-train") +require("prototypes.entities.crawler-wagon") +require("prototypes.recipes.crawler-recipe") +require("prototypes.technology.crawler-technology") + +tech_unlocks = nil diff --git a/angelsindustries/graphics/entity/crawler-train/crawler-bot-wagon.png b/angelsaddons-crawlertrain/graphics/entity/crawler-train/crawler-bot-wagon.png similarity index 100% rename from angelsindustries/graphics/entity/crawler-train/crawler-bot-wagon.png rename to angelsaddons-crawlertrain/graphics/entity/crawler-train/crawler-bot-wagon.png diff --git a/angelsindustries/graphics/entity/crawler-train/crawler-loco-1.png b/angelsaddons-crawlertrain/graphics/entity/crawler-train/crawler-loco-1.png similarity index 100% rename from angelsindustries/graphics/entity/crawler-train/crawler-loco-1.png rename to angelsaddons-crawlertrain/graphics/entity/crawler-train/crawler-loco-1.png diff --git a/angelsindustries/graphics/entity/crawler-train/crawler-loco-2.png b/angelsaddons-crawlertrain/graphics/entity/crawler-train/crawler-loco-2.png similarity index 100% rename from angelsindustries/graphics/entity/crawler-train/crawler-loco-2.png rename to angelsaddons-crawlertrain/graphics/entity/crawler-train/crawler-loco-2.png diff --git a/angelsindustries/graphics/entity/crawler-train/crawler-loco-wagon-1.png b/angelsaddons-crawlertrain/graphics/entity/crawler-train/crawler-loco-wagon-1.png similarity index 100% rename from angelsindustries/graphics/entity/crawler-train/crawler-loco-wagon-1.png rename to angelsaddons-crawlertrain/graphics/entity/crawler-train/crawler-loco-wagon-1.png diff --git a/angelsindustries/graphics/entity/crawler-train/crawler-loco-wagon-2.png b/angelsaddons-crawlertrain/graphics/entity/crawler-train/crawler-loco-wagon-2.png similarity index 100% rename from angelsindustries/graphics/entity/crawler-train/crawler-loco-wagon-2.png rename to angelsaddons-crawlertrain/graphics/entity/crawler-train/crawler-loco-wagon-2.png diff --git a/angelsindustries/graphics/entity/crawler-train/crawler-wagon.png b/angelsaddons-crawlertrain/graphics/entity/crawler-train/crawler-wagon.png similarity index 100% rename from angelsindustries/graphics/entity/crawler-train/crawler-wagon.png rename to angelsaddons-crawlertrain/graphics/entity/crawler-train/crawler-wagon.png diff --git a/angelsindustries/graphics/icons/crawler-bot-wagon-ico.png b/angelsaddons-crawlertrain/graphics/icons/crawler-bot-wagon-ico.png similarity index 100% rename from angelsindustries/graphics/icons/crawler-bot-wagon-ico.png rename to angelsaddons-crawlertrain/graphics/icons/crawler-bot-wagon-ico.png diff --git a/angelsindustries/graphics/icons/crawler-loco-ico.png b/angelsaddons-crawlertrain/graphics/icons/crawler-loco-ico.png similarity index 100% rename from angelsindustries/graphics/icons/crawler-loco-ico.png rename to angelsaddons-crawlertrain/graphics/icons/crawler-loco-ico.png diff --git a/angelsindustries/graphics/icons/crawler-loco-wagon-ico.png b/angelsaddons-crawlertrain/graphics/icons/crawler-loco-wagon-ico.png similarity index 100% rename from angelsindustries/graphics/icons/crawler-loco-wagon-ico.png rename to angelsaddons-crawlertrain/graphics/icons/crawler-loco-wagon-ico.png diff --git a/angelsindustries/graphics/icons/crawler-wagon-ico.png b/angelsaddons-crawlertrain/graphics/icons/crawler-wagon-ico.png similarity index 100% rename from angelsindustries/graphics/icons/crawler-wagon-ico.png rename to angelsaddons-crawlertrain/graphics/icons/crawler-wagon-ico.png diff --git a/angelspetrochem/graphics/icons/num_1.png b/angelsaddons-crawlertrain/graphics/icons/num_1.png similarity index 100% rename from angelspetrochem/graphics/icons/num_1.png rename to angelsaddons-crawlertrain/graphics/icons/num_1.png diff --git a/angelspetrochem/graphics/icons/num_2.png b/angelsaddons-crawlertrain/graphics/icons/num_2.png similarity index 100% rename from angelspetrochem/graphics/icons/num_2.png rename to angelsaddons-crawlertrain/graphics/icons/num_2.png diff --git a/angelspetrochem/graphics/icons/num_3.png b/angelsaddons-crawlertrain/graphics/icons/num_3.png similarity index 100% rename from angelspetrochem/graphics/icons/num_3.png rename to angelsaddons-crawlertrain/graphics/icons/num_3.png diff --git a/angelspetrochem/graphics/icons/num_4.png b/angelsaddons-crawlertrain/graphics/icons/num_4.png similarity index 100% rename from angelspetrochem/graphics/icons/num_4.png rename to angelsaddons-crawlertrain/graphics/icons/num_4.png diff --git a/angelspetrochem/graphics/icons/num_5.png b/angelsaddons-crawlertrain/graphics/icons/num_5.png similarity index 100% rename from angelspetrochem/graphics/icons/num_5.png rename to angelsaddons-crawlertrain/graphics/icons/num_5.png diff --git a/angelsindustries/graphics/technology/crawler-loco-tech.png b/angelsaddons-crawlertrain/graphics/technology/crawlertrain.png similarity index 100% rename from angelsindustries/graphics/technology/crawler-loco-tech.png rename to angelsaddons-crawlertrain/graphics/technology/crawlertrain.png diff --git a/angelsaddons-crawlertrain/info.json b/angelsaddons-crawlertrain/info.json new file mode 100644 index 000000000..7b21f2b08 --- /dev/null +++ b/angelsaddons-crawlertrain/info.json @@ -0,0 +1,14 @@ +{ + "name": "angelsaddons-crawlertrain", + "version": "0.1.0", + "factorio_version": "0.18", + "title": "Angel's Addons - Crawler Train", + "author": "Arch666Angel", + "contact": "", + "homepage": "", + "description": "Adds a Crawler themed train", + "dependencies": [ + "base >= 0.18.0", + "? WagonColors" + ] +} \ No newline at end of file diff --git a/angelsaddons-crawlertrain/license CC BY-NC-ND 4.0.txt b/angelsaddons-crawlertrain/license CC BY-NC-ND 4.0.txt new file mode 100644 index 000000000..6f7ff2b89 --- /dev/null +++ b/angelsaddons-crawlertrain/license CC BY-NC-ND 4.0.txt @@ -0,0 +1,88 @@ +Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. + +Section 1 – Definitions. +a.Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. +b.Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. +c.Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements. +d.Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material. +e.Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License. +f.Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license. +g.Licensor means the individual(s) or entity(ies) granting rights under this Public License. +h.NonCommercial means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange. +i.Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them. +j.Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. +k.You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. + +Section 2 – Scope. +a.License grant. 1.Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: A.reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and +B.produce and reproduce, but not Share, Adapted Material for NonCommercial purposes only. + +2.Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions. +3.Term. The term of this Public License is specified in Section 6(a). +4.Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material. +5.Downstream recipients. +A.Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. +B.No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material. + +6.No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i). + + +b.Other rights. +1.Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise. +2.Patent and trademark rights are not licensed under this Public License. +3.To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes. + + +Section 3 – License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the following conditions. + +a.Attribution. + +1.If You Share the Licensed Material, You must: +A.retain the following if it is supplied by the Licensor with the Licensed Material: i.identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated); +ii.a copyright notice; +iii.a notice that refers to this Public License; +iv.a notice that refers to the disclaimer of warranties; +v.a URI or hyperlink to the Licensed Material to the extent reasonably practicable; + +B.indicate if You modified the Licensed Material and retain an indication of any previous modifications; and +C.indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License. +For the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material. +2.You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information. +3.If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable. + + +Section 4 – Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material: +a.for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only and provided You do not Share Adapted Material; +b.if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and +c.You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. +For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. +Section 5 – Disclaimer of Warranties and Limitation of Liability. +a.Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You. +b.To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You. +c.The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability. + +Section 6 – Term and Termination. +a.This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically. + +b.Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates: +1.automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or +2.upon express reinstatement by the Licensor. +For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License. +c.For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License. +d.Sections 1, 5, 6, 7, and 8 survive termination of this Public License. + +Section 7 – Other Terms and Conditions. +a.The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed. +b.Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License. + +Section 8 – Interpretation. +a.For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License. +b.To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions. +c.No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor. +d.Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. diff --git a/angelsaddons-crawlertrain/locale/en/crawlertrain.cfg b/angelsaddons-crawlertrain/locale/en/crawlertrain.cfg new file mode 100644 index 000000000..9fcdf542e --- /dev/null +++ b/angelsaddons-crawlertrain/locale/en/crawlertrain.cfg @@ -0,0 +1,30 @@ +[entity-name] +crawler-locomotive="Crawler" Construction Train Locomotive +crawler-locomotive-wagon="Crawler" Construction Train Locomotive Wagon +crawler-bot-wagon="Crawler" Construction Train Robot Wagon +crawler-wagon="Crawler" Construction Train Wagon + +[item-name] +crawler-locomotive="Crawler" Construction Train Locomotive +crawler-locomotive-wagon="Crawler" Construction Train Locomotive Wagon +crawler-bot-wagon="Crawler" Construction Train Robot Wagon +crawler-wagon="Crawler" Construction Train Wagon + +[recipe-name] +crawler-locomotive="Crawler" Construction Train Locomotive +crawler-locomotive-wagon="Crawler" Construction Train Locomotive Wagon +crawler-bot-wagon="Crawler" Construction Train Robot Wagon +crawler-wagon="Crawler" Construction Train Wagon + +[recipe-category-name] + +[item-group-name] + +[item-subgroup-name] + +[technology-name] +angels-crawler-train="Crawler" Construction Train + +[mod-setting-name] +angels-crawlertrain-tier-enable=Enable higher tier trains +angels-crawlertrain-tier-amount=Amount of tiers \ No newline at end of file diff --git a/angelsaddons-crawlertrain/prototypes/category.lua b/angelsaddons-crawlertrain/prototypes/category.lua new file mode 100644 index 000000000..378ee6d15 --- /dev/null +++ b/angelsaddons-crawlertrain/prototypes/category.lua @@ -0,0 +1,27 @@ +if not data.raw["equipment-category"]["angels-void"] then + data:extend( + { + { + type = "equipment-category", + name = "angels-void" + } + } + ) +end + +data:extend( + { + { + type = "item-subgroup", + name = "angels-crawler-train", + group = mods.angelsindustries and "angels-vehicles" or "logistics", + order = "fa" + }, + { + type = "item-subgroup", + name = "angels-vehicle-train-crawler", + group = mods.angelsindustries and "angels-vehicles" or "logistics", + order = "bb[crawler-train]" -- order bc reserved for smeltingtrain (see addon data-update) + } -- order bd reserved for petrotrain (see addon data-update) + } +) diff --git a/angelsaddons-crawlertrain/prototypes/crawler-train-functions.lua b/angelsaddons-crawlertrain/prototypes/crawler-train-functions.lua new file mode 100644 index 000000000..03c8c431f --- /dev/null +++ b/angelsaddons-crawlertrain/prototypes/crawler-train-functions.lua @@ -0,0 +1,211 @@ +require("util") + +local function generate_train_recipe(item, add_unlock) + add_unlock = add_unlock or false + local entries = {} + if angelsmods.addons.crawlertrain.enable_tiers and angelsmods.addons.crawlertrain.tier_amount > 1 then + for i = 1, angelsmods.addons.crawlertrain.tier_amount, 1 do + local copy = table.deepcopy(item) + local name = item.name + local ingredients = table.deepcopy(item.ingredients) + local multiplier = math.pow(1.2, i) + + if i > 1 then + name = name .. "-" .. i + + for _, ingredient in pairs(ingredients) do + ingredient[2] = math.floor(ingredient[2] * multiplier) + end + + table.insert( + ingredients, + { + i == 2 and item.name or (item.name .. "-" .. (i - 1)), + 1 + } + ) + end + + copy.name = name + copy.localised_name = {"", {"recipe-name." .. item.name}, " MK" .. i} + copy.localised_description = {"recipe-description." .. item.name} + copy.ingredients = ingredients + copy.result = name + + if copy.order then + copy.order = copy.order .. "-" .. i + end + + table.insert(entries, copy) + + if add_unlock then + local tech = add_unlock + if i > 1 then + tech = tech .. "-" .. i + end + if not tech_unlocks[tech] then + tech_unlocks[tech] = {} + end + + tech_unlocks[tech][name] = true + end + end + else + table.insert(entries, item) + if add_unlock then + if not tech_unlocks[add_unlock] then + tech_unlocks[add_unlock] = {} + end + tech_unlocks[add_unlock][item.name] = true + end + end + + data:extend(entries) +end + +local function generate_train_items(item) + local entries = {} + if angelsmods.addons.crawlertrain.enable_tiers and angelsmods.addons.crawlertrain.tier_amount > 1 then + for i = 1, angelsmods.addons.crawlertrain.tier_amount, 1 do + local copy = table.deepcopy(item) + local name = item.name + if i > 1 then + name = name .. "-" .. i + end + + copy.order = copy.order .. "-" .. i + copy.name = name + copy.localised_name = {"", {"item-name." .. item.name}, " MK" .. i} + copy.localised_description = {"item-description." .. item.name} + copy.place_result = name + copy.icons = { + { + icon = item.icon, + icon_size = item.icon_size + }, + { + icon = "__angelsaddons-crawlertrain__/graphics/icons/num_" .. i .. ".png", + tint = angelsmods.addons.crawlertrain.number_tint, + scale = 0.32, + shift = {12, -12} + } + } + copy.icon = nil + table.insert(entries, copy) + end + else + table.insert(entries, item) + end + + data:extend(entries) +end + +local function generate_train_entities(item) + local entries = {} + if angelsmods.addons.crawlertrain.enable_tiers and angelsmods.addons.crawlertrain.tier_amount > 1 then + if item.inventory_size then + item.inventory_size = item.inventory_size / (1.25 * 1.5) + end + + for i = 1, angelsmods.addons.crawlertrain.tier_amount, 1 do + local copy = table.deepcopy(item) + local name = item.name + if i > 1 then + name = name .. "-" .. i + end + local multiplier = math.pow(1.25, i) + + copy.name = name + copy.localised_name = {"", {"entity-name." .. item.name}, " MK" .. i} + copy.icons = { + { + icon = item.icon, + icon_size = item.icon_size + }, + { + icon = "__angelsaddons-crawlertrain__/graphics/icons/num_" .. i .. ".png", + tint = angelsmods.addons.crawlertrain.number_tint, + scale = 0.32, + shift = {12, -12} + } + } + copy.icon = nil + 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 + 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 + elseif item.type == "cargo-wagon" then + copy.inventory_size = math.floor(item.inventory_size * (multiplier * 1.5)) + elseif item.type == "fluid-wagon" then + copy.capacity = math.floor(item.capacity * i) + end + table.insert(entries, copy) + end + else + table.insert(entries, item) + end + + data:extend(entries) +end + +local function get_unlocks(tech, base_effects) + if tech_unlocks[tech] then + for name, _ in pairs(tech_unlocks[tech]) do + table.insert( + base_effects, + { + type = "unlock-recipe", + recipe = name + } + ) + end + end + + return base_effects +end + +local function generate_train_technology(item, tiers) + local entries = {} + if angelsmods.addons.crawlertrain.enable_tiers and angelsmods.addons.crawlertrain.tier_amount > 1 then + for i = 1, angelsmods.addons.crawlertrain.tier_amount, 1 do + local copy = table.deepcopy(item) + local name = item.name + local prerequisites = item.prerequisites + if i > 1 then + name = name .. "-" .. i + if i == 2 then + prerequisites = {item.name} + else + prerequisites = {item.name .. "-" .. (i - 1)} + end + end + + copy.order = copy.order .. "-" .. i + copy.name = name + copy.localised_name = {"", {"technology-name." .. item.name}, " MK" .. i} + copy.localised_description = {"technology-description." .. item.name} + copy.effects = get_unlocks(name, {}) + copy.unit = tiers[i] + copy.prerequisites = prerequisites + table.insert(entries, copy) + end + else + item.effects = get_unlocks(item.name, {}) + item.unit = item.unit or tiers[1] + table.insert(entries, item) + end + + data:extend(entries) +end + +return { + generate_train_entities = generate_train_entities, + generate_train_items = generate_train_items, + generate_train_recipe = generate_train_recipe, + generate_train_technology = generate_train_technology +} diff --git a/angelsaddons-crawlertrain/prototypes/entities/crawler-train.lua b/angelsaddons-crawlertrain/prototypes/entities/crawler-train.lua new file mode 100644 index 000000000..d49e16b70 --- /dev/null +++ b/angelsaddons-crawlertrain/prototypes/entities/crawler-train.lua @@ -0,0 +1,418 @@ +local minimap_representation = data.raw["locomotive"]["locomotive"].minimap_representation +local selected_minimap_representation = data.raw["locomotive"]["locomotive"].selected_minimap_representation + +local funcs = require("prototypes/crawler-train-functions") + +funcs.generate_train_items( + { + type = "item-with-entity-data", + name = "crawler-locomotive", + icon = "__angelsaddons-crawlertrain__/graphics/icons/crawler-loco-ico.png", + icon_size = 32, + subgroup = "angels-vehicle-train-crawler", + order = "a[crawler-locomotive]", + place_result = "crawler-locomotive", + stack_size = 5 + } +) + +funcs.generate_train_items( + { + type = "item-with-entity-data", + name = "crawler-locomotive-wagon", + icon = "__angelsaddons-crawlertrain__/graphics/icons/crawler-loco-wagon-ico.png", + icon_size = 32, + subgroup = "angels-vehicle-train-crawler", + order = "b[crawler-locomotive-wagon]", + place_result = "crawler-locomotive-wagon", + stack_size = 5 + } +) + +funcs.generate_train_entities( + { + type = "locomotive", + name = "crawler-locomotive", + icon = "__angelsaddons-crawlertrain__/graphics/icons/crawler-loco-ico.png", + icon_size = 32, + flags = {"placeable-neutral", "player-creation", "placeable-off-grid"}, + minable = {mining_time = 1, result = "crawler-locomotive"}, + mined_sound = {filename = "__core__/sound/deconstruct-medium.ogg"}, + max_health = 2500, + corpse = "medium-remnants", + dying_explosion = "medium-explosion", + collision_box = {{-0.6, -2.6}, {0.6, 2.6}}, + selection_box = {{-1, -3}, {1, 3}}, + drawing_box = {{-1, -4}, {1, 3}}, + color = {r = 0.92, g = 0.07, b = 0, a = 0.5}, + allow_manual_color = true, + weight = 3000, + max_speed = 1.2, + max_power = "800kW", + reversing_power_modifier = 0.6, + braking_force = 15, + friction_force = 0.60, + vertical_selection_shift = -0.5, + air_resistance = 0.0075, -- this is a percentage of current speed that will be subtracted + connection_distance = 3, + joint_distance = 4, + energy_per_hit_point = 5, + equipment_grid = "angels-crawler-locomotive", + allow_robot_dispatch_in_automatic_mode = true, + minimap_representation = minimap_representation, + selected_minimap_representation = selected_minimap_representation, + resistances = { + { + type = "fire", + decrease = 15, + percent = 50 + }, + { + type = "physical", + decrease = 15, + percent = 30 + }, + { + type = "impact", + decrease = 50, + percent = 60 + }, + { + type = "explosion", + decrease = 15, + percent = 30 + }, + { + type = "acid", + decrease = 10, + percent = 20 + } + }, + burner = { + fuel_category = "chemical", + effectivity = 1, + fuel_inventory_size = 3, + smoke = { + { + name = "train-smoke", + deviation = {0.3, 0.3}, + frequency = 100, + position = {0, 3}, + starting_frame = 0, + starting_frame_deviation = 60, + height = 2, + height_deviation = 0.5, + starting_vertical_speed = 0.2, + starting_vertical_speed_deviation = 0.1 + } + } + }, + front_light = { + { + type = "oriented", + minimum_darkness = 0.3, + picture = { + filename = "__core__/graphics/light-cone.png", + priority = "medium", + scale = 2, + width = 200, + height = 200 + }, + shift = {-0.6, -16}, + size = 2, + intensity = 0.6 + }, + { + type = "oriented", + minimum_darkness = 0.3, + picture = { + filename = "__core__/graphics/light-cone.png", + priority = "medium", + scale = 2, + width = 200, + height = 200 + }, + shift = {0.6, -16}, + size = 2, + intensity = 0.6 + } + }, + back_light = rolling_stock_back_light(), + stand_by_light = rolling_stock_stand_by_light(), + pictures = { + priority = "very-low", + width = 256, + height = 256, + direction_count = 128, + filenames = { + "__angelsaddons-crawlertrain__/graphics/entity/crawler-train/crawler-loco-1.png", + "__angelsaddons-crawlertrain__/graphics/entity/crawler-train/crawler-loco-2.png" + }, + line_length = 8, + lines_per_file = 8, + shift = {0.0, -0.75} + }, + wheels = standard_train_wheels, + rail_category = "regular", + stop_trigger = { + -- left side + { + type = "create-trivial-smoke", + repeat_count = 50, --125 + smoke_name = "smoke-train-stop", + initial_height = 0, + -- smoke goes to the left + speed = {-0.03, 0}, + speed_multiplier = 0.75, + speed_multiplier_deviation = 1.1, + offset_deviation = {{-0.75, -2.7}, {-0.3, -1}} + }, + -- right side + { + type = "create-trivial-smoke", + repeat_count = 50, --125 + smoke_name = "smoke-train-stop", + initial_height = 0, + -- smoke goes to the right + speed = {0.03, 0}, + speed_multiplier = 0.75, + speed_multiplier_deviation = 1.1, + offset_deviation = {{0.3, -2.7}, {0.75, -1}} + }, + { + type = "play-sound", + sound = { + { + filename = "__base__/sound/train-breaks.ogg", + volume = 0.6 + } + } + } + }, + drive_over_tie_trigger = drive_over_tie(), + tie_distance = 50, + vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, + working_sound = { + sound = { + filename = "__base__/sound/train-engine.ogg", + volume = 0.4 + }, + match_speed_to_activity = true + }, + open_sound = {filename = "__base__/sound/car-door-open.ogg", volume = 0.7}, + close_sound = {filename = "__base__/sound/car-door-close.ogg", volume = 0.7}, + sound_minimum_speed = 0.5 + } +) + +funcs.generate_train_entities( + { + type = "locomotive", + name = "crawler-locomotive-wagon", + icon = "__angelsaddons-crawlertrain__/graphics/icons/crawler-loco-wagon-ico.png", + icon_size = 32, + flags = {"placeable-neutral", "player-creation", "placeable-off-grid"}, + minable = {mining_time = 1, result = "crawler-locomotive-wagon"}, + mined_sound = {filename = "__core__/sound/deconstruct-medium.ogg"}, + max_health = 2500, + corpse = "medium-remnants", + dying_explosion = "medium-explosion", + collision_box = {{-0.6, -2.6}, {0.6, 2.6}}, + selection_box = {{-1, -3}, {1, 3}}, + drawing_box = {{-1, -4}, {1, 3}}, + color = {r = 0.92, g = 0.07, b = 0, a = 0.5}, + allow_manual_color = true, + weight = 3000, + max_speed = 1.2, + max_power = "1000kW", + reversing_power_modifier = 0.6, + braking_force = 20, + friction_force = 0.60, + vertical_selection_shift = -0.5, + air_resistance = 0.0075, -- this is a percentage of current speed that will be subtracted + connection_distance = 3, + joint_distance = 4, + energy_per_hit_point = 5, + equipment_grid = "angels-crawler-loco-wagon", + allow_robot_dispatch_in_automatic_mode = true, + minimap_representation = minimap_representation, + selected_minimap_representation = selected_minimap_representation, + resistances = { + { + type = "fire", + decrease = 15, + percent = 50 + }, + { + type = "physical", + decrease = 15, + percent = 30 + }, + { + type = "impact", + decrease = 50, + percent = 60 + }, + { + type = "explosion", + decrease = 15, + percent = 30 + }, + { + type = "acid", + decrease = 10, + percent = 20 + } + }, + burner = { + fuel_category = "chemical", + effectivity = 1, + fuel_inventory_size = 3, + smoke = { + { + name = "train-smoke", + deviation = {0.3, 0.3}, + frequency = 100, + position = {0, 3}, + starting_frame = 0, + starting_frame_deviation = 60, + height = 2, + height_deviation = 0.5, + starting_vertical_speed = 0.2, + starting_vertical_speed_deviation = 0.1 + }, + { + name = "train-smoke", + deviation = {0.3, 0.3}, + frequency = 100, + position = {0, -3}, + starting_frame = 0, + starting_frame_deviation = 60, + height = 2, + height_deviation = 0.5, + starting_vertical_speed = 0.2, + starting_vertical_speed_deviation = 0.1 + } + } + }, + front_light = { + { + type = "oriented", + minimum_darkness = 0.3, + picture = { + filename = "__core__/graphics/light-cone.png", + priority = "medium", + scale = 2, + width = 200, + height = 200 + }, + shift = {-0.6, -16}, + size = 2, + intensity = 0.6 + }, + { + type = "oriented", + minimum_darkness = 0.3, + picture = { + filename = "__core__/graphics/light-cone.png", + priority = "medium", + scale = 2, + width = 200, + height = 200 + }, + shift = {0.6, -16}, + size = 2, + intensity = 0.6 + } + }, + back_light = rolling_stock_back_light(), + stand_by_light = rolling_stock_stand_by_light(), + pictures = { + priority = "very-low", + width = 256, + height = 256, + direction_count = 128, + filenames = { + "__angelsaddons-crawlertrain__/graphics/entity/crawler-train/crawler-loco-wagon-1.png", + "__angelsaddons-crawlertrain__/graphics/entity/crawler-train/crawler-loco-wagon-2.png" + }, + line_length = 8, + lines_per_file = 8, + shift = {0.0, -0.75} + }, + wheels = standard_train_wheels, + rail_category = "regular", + stop_trigger = { + -- front left side + { + type = "create-trivial-smoke", + repeat_count = 50, --125 + smoke_name = "smoke-train-stop", + initial_height = 0, + -- smoke goes to the left + speed = {-0.03, 0}, + speed_multiplier = 0.75, + speed_multiplier_deviation = 1.1, + offset_deviation = {{-0.75, -2.7}, {-0.3, -1}} + }, + -- front right side + { + type = "create-trivial-smoke", + repeat_count = 50, --125 + smoke_name = "smoke-train-stop", + initial_height = 0, + -- smoke goes to the right + speed = {0.03, 0}, + speed_multiplier = 0.75, + speed_multiplier_deviation = 1.1, + offset_deviation = {{0.3, -2.7}, {0.75, -1}} + }, + -- rear left side + { + type = "create-trivial-smoke", + repeat_count = 50, --125 + smoke_name = "smoke-train-stop", + initial_height = 0, + -- smoke goes to the left + speed = {-0.03, 0}, + speed_multiplier = 0.75, + speed_multiplier_deviation = 1.1, + offset_deviation = {{-0.75, 2.7}, {-0.3, 1}} + }, + -- rear right side + { + type = "create-trivial-smoke", + repeat_count = 50, --125 + smoke_name = "smoke-train-stop", + initial_height = 0, + -- smoke goes to the right + speed = {0.03, 0}, + speed_multiplier = 0.75, + speed_multiplier_deviation = 1.1, + offset_deviation = {{0.3, 2.7}, {0.75, 1}} + }, + { + type = "play-sound", + sound = { + { + filename = "__base__/sound/train-breaks.ogg", + volume = 0.6 + } + } + } + }, + drive_over_tie_trigger = drive_over_tie(), + tie_distance = 50, + vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, + working_sound = { + sound = { + filename = "__base__/sound/train-engine.ogg", + volume = 0.4 + }, + match_speed_to_activity = true + }, + open_sound = {filename = "__base__/sound/car-door-open.ogg", volume = 0.7}, + close_sound = {filename = "__base__/sound/car-door-close.ogg", volume = 0.7}, + sound_minimum_speed = 0.5 + } +) diff --git a/angelsaddons-crawlertrain/prototypes/entities/crawler-wagon.lua b/angelsaddons-crawlertrain/prototypes/entities/crawler-wagon.lua new file mode 100644 index 000000000..f0c0d970f --- /dev/null +++ b/angelsaddons-crawlertrain/prototypes/entities/crawler-wagon.lua @@ -0,0 +1,215 @@ +local minimap_representation = data.raw["locomotive"]["locomotive"].minimap_representation +local selected_minimap_representation = data.raw["locomotive"]["locomotive"].selected_minimap_representation + +local cargo_minimap_representation = data.raw["cargo-wagon"]["cargo-wagon"].minimap_representation +local cargo_selected_minimap_representation = data.raw["cargo-wagon"]["cargo-wagon"].selected_minimap_representation + +local funcs = require("prototypes/crawler-train-functions") + +funcs.generate_train_items( + { + type = "item-with-entity-data", + name = "crawler-wagon", + icon = "__angelsaddons-crawlertrain__/graphics/icons/crawler-wagon-ico.png", + icon_size = 32, + subgroup = "angels-vehicle-train-crawler", + order = "c[crawler-wagon]", + place_result = "crawler-wagon", + stack_size = 5 + } +) + +funcs.generate_train_items( + { + type = "item-with-entity-data", + name = "crawler-bot-wagon", + icon = "__angelsaddons-crawlertrain__/graphics/icons/crawler-bot-wagon-ico.png", + icon_size = 32, + subgroup = "angels-vehicle-train-crawler", + order = "d[crawler-bot-wagon]", + place_result = "crawler-bot-wagon", + stack_size = 5 + } +) + +funcs.generate_train_entities( + { + type = "cargo-wagon", + name = "crawler-wagon", + icon = "__angelsaddons-crawlertrain__/graphics/icons/crawler-wagon-ico.png", + icon_size = 32, + flags = {"placeable-neutral", "player-creation", "placeable-off-grid"}, + inventory_size = 64, + minable = {mining_time = 1, result = "crawler-wagon"}, + mined_sound = {filename = "__core__/sound/deconstruct-medium.ogg"}, + max_health = 1000, + corpse = "medium-remnants", + dying_explosion = "medium-explosion", + collision_box = {{-0.6, -2.4}, {0.6, 2.4}}, + selection_box = {{-1, -2.703125}, {1, 3.296875}}, + color = {r = 0.43, g = 0.23, b = 0, a = 0.5}, + allow_manual_color = true, + vertical_selection_shift = -0.796875, + weight = 1500, + max_speed = 1.5, + braking_force = 3, + friction_force = 0.50, + air_resistance = 0.01, + connection_distance = 3, + joint_distance = 4, + energy_per_hit_point = 5, + equipment_grid = "angels-crawler-wagon", + allow_robot_dispatch_in_automatic_mode = true, + minimap_representation = cargo_minimap_representation, + selected_minimap_representation = cargo_selected_minimap_representation, + resistances = { + { + type = "fire", + decrease = 15, + percent = 50 + }, + { + type = "physical", + decrease = 15, + percent = 30 + }, + { + type = "impact", + decrease = 50, + percent = 60 + }, + { + type = "explosion", + decrease = 15, + percent = 30 + }, + { + type = "acid", + decrease = 10, + percent = 20 + } + }, + back_light = rolling_stock_back_light(), + stand_by_light = rolling_stock_stand_by_light(), + pictures = { + priority = "very-low", + width = 256, + height = 256, + direction_count = 64, + filenames = { + "__angelsaddons-crawlertrain__/graphics/entity/crawler-train/crawler-wagon.png" + }, + line_length = 8, + lines_per_file = 8, + shift = {0, -0.75} + }, + wheels = standard_train_wheels, + rail_category = "regular", + drive_over_tie_trigger = drive_over_tie(), + tie_distance = 50, + working_sound = { + sound = { + filename = "__base__/sound/train-wheels.ogg", + volume = 0.6 + }, + match_volume_to_activity = true + }, + crash_trigger = crash_trigger(), + open_sound = {filename = "__base__/sound/machine-open.ogg", volume = 0.85}, + close_sound = {filename = "__base__/sound/machine-close.ogg", volume = 0.75}, + sound_minimum_speed = 0.5, + vehicle_impact_sound = {filename = "__base__/sound/car-wood-impact.ogg", volume = 1.0} + } +) + +funcs.generate_train_entities( + { + type = "cargo-wagon", + name = "crawler-bot-wagon", + icon = "__angelsaddons-crawlertrain__/graphics/icons/crawler-bot-wagon-ico.png", + icon_size = 32, + flags = {"placeable-neutral", "player-creation", "placeable-off-grid"}, + -- inventory_size = 128, + inventory_size = 128, -- Converts to 128 + minable = {mining_time = 1, result = "crawler-bot-wagon"}, + mined_sound = {filename = "__core__/sound/deconstruct-medium.ogg"}, + max_health = 1000, + corpse = "medium-remnants", + dying_explosion = "medium-explosion", + collision_box = {{-0.6, -2.4}, {0.6, 2.4}}, + selection_box = {{-1, -2.703125}, {1, 3.296875}}, + color = {r = 0.43, g = 0.23, b = 0, a = 0.5}, + allow_manual_color = true, + vertical_selection_shift = -0.796875, + weight = 3000, + max_speed = 1.5, + braking_force = 3, + friction_force = 0.50, + air_resistance = 0.01, + connection_distance = 3, + joint_distance = 4, + energy_per_hit_point = 5, + equipment_grid = "angels-crawler-bot-wagon", + allow_robot_dispatch_in_automatic_mode = true, + minimap_representation = cargo_minimap_representation, + selected_minimap_representation = cargo_selected_minimap_representation, + resistances = { + { + type = "fire", + decrease = 15, + percent = 50 + }, + { + type = "physical", + decrease = 15, + percent = 30 + }, + { + type = "impact", + decrease = 50, + percent = 60 + }, + { + type = "explosion", + decrease = 15, + percent = 30 + }, + { + type = "acid", + decrease = 10, + percent = 20 + } + }, + back_light = rolling_stock_back_light(), + stand_by_light = rolling_stock_stand_by_light(), + pictures = { + priority = "very-low", + width = 256, + height = 256, + --back_equals_front = true, + direction_count = 64, + filenames = { + "__angelsaddons-crawlertrain__/graphics/entity/crawler-train/crawler-bot-wagon.png" + }, + line_length = 8, + lines_per_file = 8, + shift = {0, -0.75} + }, + wheels = standard_train_wheels, + rail_category = "regular", + drive_over_tie_trigger = drive_over_tie(), + tie_distance = 50, + working_sound = { + sound = { + filename = "__base__/sound/train-wheels.ogg", + volume = 0.6 + }, + match_volume_to_activity = true + }, + crash_trigger = crash_trigger(), + open_sound = {filename = "__base__/sound/machine-open.ogg", volume = 0.85}, + close_sound = {filename = "__base__/sound/machine-close.ogg", volume = 0.75}, + sound_minimum_speed = 0.5, + vehicle_impact_sound = {filename = "__base__/sound/car-wood-impact.ogg", volume = 1.0} + } +) diff --git a/angelsaddons-crawlertrain/prototypes/equipment-grid.lua b/angelsaddons-crawlertrain/prototypes/equipment-grid.lua new file mode 100644 index 000000000..b517eba0d --- /dev/null +++ b/angelsaddons-crawlertrain/prototypes/equipment-grid.lua @@ -0,0 +1,32 @@ +data:extend( + { + { + type = "equipment-grid", + name = "angels-crawler-locomotive", + width = 6, + height = 6, + equipment_categories = {"angels-void"} + }, + { + type = "equipment-grid", + name = "angels-crawler-loco-wagon", + width = 6, + height = 6, + equipment_categories = {"angels-void"} + }, + { + type = "equipment-grid", + name = "angels-crawler-wagon", + width = 12, + height = 12, + equipment_categories = {"angels-void"} + }, + { + type = "equipment-grid", + name = "angels-crawler-bot-wagon", + width = 12, + height = 12, + equipment_categories = {"angels-void"} + } + } +) diff --git a/angelsaddons-crawlertrain/prototypes/recipes/crawler-recipe.lua b/angelsaddons-crawlertrain/prototypes/recipes/crawler-recipe.lua new file mode 100644 index 000000000..b9ff055dc --- /dev/null +++ b/angelsaddons-crawlertrain/prototypes/recipes/crawler-recipe.lua @@ -0,0 +1,68 @@ +local funcs = require("prototypes/crawler-train-functions") +--TRAINS +funcs.generate_train_recipe( + { + type = "recipe", + name = "crawler-locomotive", + energy_required = 10, + enabled = false, + ingredients = { + {"engine-unit", 20}, + {"steel-plate", 75}, + {"electronic-circuit", 20}, + {"iron-gear-wheel", 25} + }, + result = "crawler-locomotive" + }, + "angels-crawler-train" +) + +funcs.generate_train_recipe( + { + type = "recipe", + name = "crawler-locomotive-wagon", + energy_required = 10, + enabled = false, + ingredients = { + {"engine-unit", 20}, + {"steel-plate", 75}, + {"electronic-circuit", 20}, + {"iron-gear-wheel", 25} + }, + result = "crawler-locomotive-wagon" + }, + "angels-crawler-train" +) + +funcs.generate_train_recipe( + { + type = "recipe", + name = "crawler-wagon", + energy_required = 10, + enabled = false, + ingredients = { + {"steel-plate", 50}, + {"iron-plate", 30}, + {"iron-gear-wheel", 25} + }, + result = "crawler-wagon" + }, + "angels-crawler-train" +) + +funcs.generate_train_recipe( + { + type = "recipe", + name = "crawler-bot-wagon", + energy_required = 10, + enabled = false, + ingredients = { + {"steel-plate", 75}, + {"iron-plate", 50}, + {"electronic-circuit", 20}, + {"iron-gear-wheel", 25} + }, + result = "crawler-bot-wagon" + }, + "angels-crawler-train" +) diff --git a/angelsaddons-crawlertrain/prototypes/recipes/crawlertrain-updates.lua b/angelsaddons-crawlertrain/prototypes/recipes/crawlertrain-updates.lua new file mode 100644 index 000000000..b0aa1cab6 --- /dev/null +++ b/angelsaddons-crawlertrain/prototypes/recipes/crawlertrain-updates.lua @@ -0,0 +1,47 @@ +angelsmods.functions.RB.build({ + { + type = "recipe", + name = "smelting-locomotive-1", + energy_required = 10, + enabled = "false", + ingredients = + { + {"motor-3", 5}, + {"mechanical-parts", 10}, + {"construction-frame-3", 5}, + {"construction-components", 20}, + {"circuit-orange-loaded", 2}, + }, + result = "smelting-locomotive-1" + }, + { + type = "recipe", + name = "smelting-locomotive-tender", + energy_required = 10, + enabled = "false", + ingredients = + { + {"motor-3", 5}, + {"mechanical-parts", 10}, + {"construction-frame-3", 5}, + {"construction-components", 20}, + {"circuit-orange-loaded", 2}, + }, + result = "smelting-locomotive-tender" + }, + { + type = "recipe", + name = "smelting-wagon-1", + energy_required = 10, + enabled = "false", + ingredients = + { + {"motor-2", 2}, + {"mechanical-parts", 5}, + {"construction-frame-2", 10}, + {"construction-components", 20}, + }, + result = "smelting-wagon-1" + }, +} +) \ No newline at end of file diff --git a/angelsaddons-crawlertrain/prototypes/technology/crawler-technology.lua b/angelsaddons-crawlertrain/prototypes/technology/crawler-technology.lua new file mode 100644 index 000000000..104908dae --- /dev/null +++ b/angelsaddons-crawlertrain/prototypes/technology/crawler-technology.lua @@ -0,0 +1,69 @@ +local funcs = require("prototypes/crawler-train-functions") + +local prerequisites = { + "railway" +} +if mods.angelsindustries then + table.insert(prerequisites, "angels-crawler") +end + +local tiers = { + { + count = 60, + ingredients = { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1} + }, + time = 15 + }, + { + count = 100, + ingredients = { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1} + }, + time = 15 + }, + { + count = 100, + ingredients = { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1} + }, + time = 15 + }, + { + count = 100, + ingredients = { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"production-science-pack", 1} + }, + time = 30 + }, + { + count = 100, + ingredients = { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"production-science-pack", 1}, + {"utility-science-pack", 1} + }, + time = 30 + } +} + +funcs.generate_train_technology( + { + type = "technology", + name = "angels-crawler-train", + icon = "__angelsaddons-crawlertrain__/graphics/technology/crawlertrain.png", + icon_size = 128, + prerequisites = prerequisites, + order = "c-a" + }, + tiers +) diff --git a/angelsaddons-crawlertrain/settings.lua b/angelsaddons-crawlertrain/settings.lua new file mode 100644 index 000000000..42ffec49a --- /dev/null +++ b/angelsaddons-crawlertrain/settings.lua @@ -0,0 +1,20 @@ +data:extend( + { + { + type = "bool-setting", + name = "angels-crawlertrain-tier-enable", + setting_type = "startup", + default_value = false, + order = "a" + }, + { + type = "int-setting", + name = "angels-crawlertrain-tier-amount", + setting_type = "startup", + default_value = 1, + minimum_value = 1, + maximum_value = 5, + order = "b" + } + } +) diff --git a/angelsaddons-nilaus/changelog.txt b/angelsaddons-nilaus/changelog.txt index 184eaa7c6..8bfaa7c1d 100644 --- a/angelsaddons-nilaus/changelog.txt +++ b/angelsaddons-nilaus/changelog.txt @@ -1,23 +1,40 @@ --------------------------------------------------------------------------------------------------- +Version: 0.3.6 +Date: 02.04.2020 + Changes: + - Updated grid size to a 9x9 grid (instead of default bob-cars size) #143 + - Hide grid button when in vanilla, aka missing vehicle grid (car, vehicle, angels-...) #143 + - Truck now stears as a car, not a tank #143 +--------------------------------------------------------------------------------------------------- +Version: 0.3.5 +Date: 24.03.2020 + Changes: + - Fixed crash +--------------------------------------------------------------------------------------------------- +Version: 0.3.4 +Date: 24.03.2020 + Changes: + - Fixed crash +--------------------------------------------------------------------------------------------------- Version: 0.3.3 -Date: 24-03-2020 +Date: 24.03.2020 Changes: - Fixed the TP bot... - Changed localised names of nilaus decorations - Added Nilaus' Floor Lamp --------------------------------------------------------------------------------------------------- Version: 0.3.2 -Date: 22-03-2020 +Date: 22.03.2020 Changes: - Tweakes some technologies, recipes and items after the previous update --------------------------------------------------------------------------------------------------- Version: 0.3.1 -Date: 20-03-2020 +Date: 20.03.2020 Changes: - Added technology prerequisites --------------------------------------------------------------------------------------------------- Version: 0.3.0 -Date: 09-02-2020 +Date: 09.02.2020 Changes: - update to 0.18 - Integrate into angels industries overhaul tabs diff --git a/angelsaddons-nilaus/control.lua b/angelsaddons-nilaus/control.lua index 3e2de289a..8b9c8ff23 100644 --- a/angelsaddons-nilaus/control.lua +++ b/angelsaddons-nilaus/control.lua @@ -148,7 +148,7 @@ script.on_nth_tick( function(event) local tick = event.tick if global.event_part < 3 and global.event_entity then -- failsafe in case it fails - if global.event_entity.valid then + if type(global.event_entity) == "table" and global.event_entity.valid then global.event_entity.destroy() end global.event_unit = -1 @@ -181,3 +181,15 @@ script.on_event( end end ) + +script.on_configuration_changed(function(configurationData) + local modChanges = configurationData.mod_changes["angelsaddons-nilaus"] + if modChanges and modChanges.new_version ~= (modChanges.old_version or "") then + log(string.format("Updating 'angelsaddons-nilaus' from version %q to version %q", modChanges.old_version or "nil", modChanges.new_version)) + -- reset event + if type(global.event_entity) == "table" and global.event_entity.valid then global.event_entity.destroy() end + global.event_unit = -1 + global.event_part = 0 + global.event_entity = nil + end +end) diff --git a/angelsaddons-nilaus/data-updates.lua b/angelsaddons-nilaus/data-updates.lua index 0f636b782..bdc4957e5 100644 --- a/angelsaddons-nilaus/data-updates.lua +++ b/angelsaddons-nilaus/data-updates.lua @@ -1,16 +1,39 @@ require("prototypes/TP-update") if aai_industry and data.raw.item["electric-motor"] then - table.insert(data.raw.recipe['nilaus-truck'].normal.ingredients, {"electric-motor", 5}) - table.insert(data.raw.recipe['nilaus-truck'].expensive.ingredients, {"electric-motor", 10}) - table.insert(data.raw.technology['nilaus-truck'].prerequisites, "electricity") + table.insert(data.raw.recipe["nilaus-truck"].normal.ingredients, {"electric-motor", 5}) + table.insert(data.raw.recipe["nilaus-truck"].expensive.ingredients, {"electric-motor", 10}) + table.insert(data.raw.technology["nilaus-truck"].prerequisites, "electricity") end -if angelsmods and angelsmods.industries then - data.raw["item-with-entity-data"]["nilaus-truck"].subgroup = "angels-vehicle-car" - data.raw["item-with-entity-data"]["nilaus-truck"].order = "a[car]-b" +local function has_vehicle_equipment() + local checks = {"car", "vehicle", "angels-movement"} + for _, check in pairs(checks) do + if data.raw["equipment-category"][check] then + return true + end + end + return false end -if mods['bobvehicleequipment'] then - data.raw["car"]["nilaus-truck"].equipment_grid = "bob-car" +local function add_equip_category_if_exists(grid, entry) + if data.raw["equipment-category"][entry] then + table.insert(data.raw["equipment-grid"][grid].equipment_categories, entry) + end +end + +if has_vehicle_equipment() then + data.raw["car"]["nilaus-truck"].equipment_grid = "deco-nilaustruck" + add_equip_category_if_exists("deco-nilaustruck", "car") + add_equip_category_if_exists("deco-nilaustruck", "vehicle") + add_equip_category_if_exists("deco-nilaustruck", "angels-energy") + add_equip_category_if_exists("deco-nilaustruck", "angels-repair") + add_equip_category_if_exists("deco-nilaustruck", "angels-heavy-defense") + add_equip_category_if_exists("deco-nilaustruck", "angels-construction") + add_equip_category_if_exists("deco-nilaustruck", "angels-movement") + + if angelsmods and angelsmods.industries then + data.raw["item-with-entity-data"]["nilaus-truck"].subgroup = "angels-vehicle-car" + data.raw["item-with-entity-data"]["nilaus-truck"].order = "a[car]-b" + end end diff --git a/angelsaddons-nilaus/info.json b/angelsaddons-nilaus/info.json index 3664e0233..829d83ca6 100644 --- a/angelsaddons-nilaus/info.json +++ b/angelsaddons-nilaus/info.json @@ -1,6 +1,6 @@ { "name": "angelsaddons-nilaus", - "version": "0.3.4", + "version": "0.3.6", "factorio_version": "0.18", "title": "Angel's Addons - Decorations - Nilaus", "author": "Arch666Angel", @@ -9,5 +9,5 @@ "description": "", "dependencies": [ "base >= 0.18.0" - ] -} + ] +} \ No newline at end of file diff --git a/angelsaddons-nilaus/prototypes/buildings/deco-nilaus.lua b/angelsaddons-nilaus/prototypes/buildings/deco-nilaus.lua index 980297bc8..278b0af04 100644 --- a/angelsaddons-nilaus/prototypes/buildings/deco-nilaus.lua +++ b/angelsaddons-nilaus/prototypes/buildings/deco-nilaus.lua @@ -1,7 +1,25 @@ require("util") +if not data.raw["equipment-category"]["equipment-void"] then + data:extend( + { + { + type = "equipment-category", + name = "equipment-void" + } + } + ) +end + data:extend( { + { + type = "equipment-grid", + name = "deco-nilaustruck", + width = 9, + height = 9, + equipment_categories = {"equipment-void"} + }, { type = "item", name = "deco-nilaus-1", @@ -505,7 +523,7 @@ data:extend( open_sound = {filename = "__base__/sound/car-door-open.ogg", volume = 0.7}, close_sound = {filename = "__base__/sound/car-door-close.ogg", volume = 0.7}, rotation_speed = 0.005, - tank_driving = true, + tank_driving = false, weight = 2000, inventory_size = 120 --guns = {}, @@ -520,7 +538,7 @@ data:extend( subgroup = "storage", order = "zd", place_result = "deco-nilaus-start", - stack_size = 10, + stack_size = 10 }, { type = "lamp", @@ -536,21 +554,19 @@ data:extend( corpse = "big-remnants", collision_box = {{-5.4, -0.4}, {5.4, 10.4}}, selection_box = {{-5.5, -0.5}, {5.5, 10.5}}, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - energy_source = - { + vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, + energy_source = { type = "electric", usage_priority = "lamp" }, energy_usage_per_tick = "50KW", darkness_for_all_lamps_on = 0.5, darkness_for_all_lamps_off = 0.3, - light = {intensity = 0.9, size = 40, color = {r=1.0, g=1.0, b=1.0}}, - light_when_colored = {intensity = 1, size = 6, color = {r=1.0, g=1.0, b=1.0}}, + light = {intensity = 0.9, size = 40, color = {r = 1.0, g = 1.0, b = 1.0}}, + light_when_colored = {intensity = 1, size = 6, color = {r = 1.0, g = 1.0, b = 1.0}}, glow_size = 6, glow_color_intensity = 0.135, - picture_off = - { + picture_off = { filename = "__angelsaddons-nilaus__/graphics/entity/deco-nilaus-start-off.png", priority = "high", width = 416, @@ -558,10 +574,9 @@ data:extend( frame_count = 1, axially_symmetrical = false, direction_count = 1, - shift = {0, 5}, + shift = {0, 5} }, - picture_on = - { + picture_on = { filename = "__angelsaddons-nilaus__/graphics/entity/deco-nilaus-start-on.png", priority = "high", width = 416, @@ -569,21 +584,19 @@ data:extend( frame_count = 1, axially_symmetrical = false, direction_count = 1, - shift = {0, 5}, + shift = {0, 5} }, - signal_to_color_mapping = - { - {type="virtual", name="signal-red", color={r=1,g=0,b=0}}, - {type="virtual", name="signal-green", color={r=0,g=1,b=0}}, - {type="virtual", name="signal-blue", color={r=0,g=0,b=1}}, - {type="virtual", name="signal-yellow", color={r=1,g=1,b=0}}, - {type="virtual", name="signal-pink", color={r=1,g=0,b=1}}, - {type="virtual", name="signal-cyan", color={r=0,g=1,b=1}} + signal_to_color_mapping = { + {type = "virtual", name = "signal-red", color = {r = 1, g = 0, b = 0}}, + {type = "virtual", name = "signal-green", color = {r = 0, g = 1, b = 0}}, + {type = "virtual", name = "signal-blue", color = {r = 0, g = 0, b = 1}}, + {type = "virtual", name = "signal-yellow", color = {r = 1, g = 1, b = 0}}, + {type = "virtual", name = "signal-pink", color = {r = 1, g = 0, b = 1}}, + {type = "virtual", name = "signal-cyan", color = {r = 0, g = 1, b = 1}} }, - circuit_wire_connection_point = circuit_connector_definitions["lamp"].points, circuit_connector_sprites = circuit_connector_definitions["lamp"].sprites, circuit_wire_max_distance = default_circuit_wire_max_distance - }, + } } ) diff --git a/angelsaddons-petrotrain/changelog.txt b/angelsaddons-petrotrain/changelog.txt index 3ed7624ad..6669058a6 100644 --- a/angelsaddons-petrotrain/changelog.txt +++ b/angelsaddons-petrotrain/changelog.txt @@ -1,6 +1,12 @@ --------------------------------------------------------------------------------------------------- +Version: 0.5.3 +Date: 02.04.2020 + Bugfixes: + - Inventory size with tiers enabled were too big + - Capacity didn't increase per tier +--------------------------------------------------------------------------------------------------- Version: 0.5.2 -Date: 20-03-2020 +Date: 20.03.2020 Changes: - Settings were surrounded by quotes - Higher tiers are now unlocked by separate techs @@ -13,7 +19,7 @@ Date: 22.02.2020 - Added option to allow higher tiers of trains --------------------------------------------------------------------------------------------------- Version: 0.5.0 -Date: 2020-02-09 +Date: 09.02.2020 Changes: - update to 0.18 - put petrotrain under angel logistics when angel industries is present diff --git a/angelsaddons-petrotrain/info.json b/angelsaddons-petrotrain/info.json index 43b5fb8f0..2d0c149f6 100644 --- a/angelsaddons-petrotrain/info.json +++ b/angelsaddons-petrotrain/info.json @@ -1,6 +1,6 @@ { "name": "angelsaddons-petrotrain", - "version": "0.5.2", + "version": "0.5.3", "factorio_version": "0.18", "title": "Angel's Addons - Petrochem Train", "author": "Arch666Angel", diff --git a/angelsaddons-petrotrain/prototypes/petro-train-functions.lua b/angelsaddons-petrotrain/prototypes/petro-train-functions.lua index 47ff3f1f0..fbd8df974 100644 --- a/angelsaddons-petrotrain/prototypes/petro-train-functions.lua +++ b/angelsaddons-petrotrain/prototypes/petro-train-functions.lua @@ -103,6 +103,9 @@ end local function generate_train_entities(item) local entries = {} if angelsmods.addons.petrotrain.enable_tiers and angelsmods.addons.petrotrain.tier_amount > 1 then + if item.inventory_size then + item.inventory_size = item.inventory_size / (1.25 * 1.5) + end for i = 1, angelsmods.addons.petrotrain.tier_amount, 1 do local copy = table.deepcopy(item) local name = item.name @@ -137,6 +140,8 @@ local function generate_train_entities(item) copy.reversing_power_modifier = item.reversing_power_modifier * multiplier elseif item.type == "cargo-wagon" then copy.inventory_size = math.floor(item.inventory_size * (multiplier * 1.5)) + elseif item.type == "fluid-wagon" then + copy.capacity = math.floor(item.capacity * i) end table.insert(entries, copy) end diff --git a/angelsaddons-smeltingtrain/changelog.txt b/angelsaddons-smeltingtrain/changelog.txt index 9c782bb2a..7b8a9bdec 100644 --- a/angelsaddons-smeltingtrain/changelog.txt +++ b/angelsaddons-smeltingtrain/changelog.txt @@ -1,6 +1,11 @@ --------------------------------------------------------------------------------------------------- +Version: 0.3.3 +Date: 02.04.2020 + Bugfixes: + - Inventory size with tiers enabled were too big +--------------------------------------------------------------------------------------------------- Version: 0.3.2 -Date: 20-03-2020 +Date: 20.03.2020 Changes: - Settings were surrounded by quotes - Higher tiers are now unlocked by separate techs diff --git a/angelsaddons-smeltingtrain/info.json b/angelsaddons-smeltingtrain/info.json index 680bcacaa..333c45376 100644 --- a/angelsaddons-smeltingtrain/info.json +++ b/angelsaddons-smeltingtrain/info.json @@ -1,6 +1,6 @@ { "name": "angelsaddons-smeltingtrain", - "version": "0.3.2", + "version": "0.3.3", "factorio_version": "0.18", "title": "Angel's Addons - Smelting Train", "author": "Arch666Angel", diff --git a/angelsaddons-smeltingtrain/prototypes/smelting-train-functions.lua b/angelsaddons-smeltingtrain/prototypes/smelting-train-functions.lua index 5ea0399c5..744438655 100644 --- a/angelsaddons-smeltingtrain/prototypes/smelting-train-functions.lua +++ b/angelsaddons-smeltingtrain/prototypes/smelting-train-functions.lua @@ -103,6 +103,9 @@ end local function generate_train_entities(item) local entries = {} if angelsmods.addons.smeltingtrain.enable_tiers and angelsmods.addons.smeltingtrain.tier_amount > 1 then + if item.inventory_size then + item.inventory_size = item.inventory_size / (1.25 * 1.5) + end for i = 1, angelsmods.addons.smeltingtrain.tier_amount, 1 do local copy = table.deepcopy(item) local name = item.name @@ -137,6 +140,8 @@ local function generate_train_entities(item) copy.reversing_power_modifier = item.reversing_power_modifier * multiplier elseif item.type == "cargo-wagon" then copy.inventory_size = math.floor(item.inventory_size * (multiplier * 1.5)) + elseif item.type == "fluid-wagon" then + copy.capacity = math.floor(item.capacity * i) end table.insert(entries, copy) end diff --git a/angelsbioprocessing/changelog.txt b/angelsbioprocessing/changelog.txt index 4721a6793..4fff24515 100644 --- a/angelsbioprocessing/changelog.txt +++ b/angelsbioprocessing/changelog.txt @@ -1,11 +1,31 @@ --------------------------------------------------------------------------------------------------- +Version: 0.7.6 +Date: 02.04.2020 + Changes: + - Changed graphics on tree recipes to represent the trees instead of their product + Balancing: + - Increase usage of bio sink (Compost) + - Fertilizer now takes twice the amount of Compost + - Fermentation Base processing now produces half the amount of compost + - Decrease production of Compost + - Require 2 vegetables to create 1 Compost (required 1 before) + - Require 20 vegetable seeds to create 1 Compost (required 1 before) + - Require 2 Gardens to create 1 Compost (required 1 before) + - Require 2 Cellulose Fibers to create 1 Compost (required 1 before) + - Require 4 Green Algae to create 1 Compost (required 1 before) + - Require 3 Brown Algae to create 1 Compost (required 1 before) + - Require 2 Blue Algae to create 1 Compost (required 1 before) + Bugfixes: + - Fixed missing localised description on Alien Plant Life Sample + - Fixed ore pastes would enable when you don't need them +--------------------------------------------------------------------------------------------------- Version: 0.7.5 -Date: 24-03-2020 +Date: 24.03.2020 Changes: - Make buildings upgradeable #119 --------------------------------------------------------------------------------------------------- Version: 0.7.4 -Date: 20-03-2020 +Date: 20.03.2020 Changes: - Removed the (unneeded) ingredient limit on different bio buildings - Fish Tank, Puffer Refugium and Biter Refugium diff --git a/angelsbioprocessing/data.lua b/angelsbioprocessing/data.lua index 2074e829d..faf4bd238 100644 --- a/angelsbioprocessing/data.lua +++ b/angelsbioprocessing/data.lua @@ -9,6 +9,28 @@ angelsmods.triggers.lab_ignore_token = angelsmods.triggers.lab_ignore_token or { angelsmods.triggers.lab_ignore_token["lab-alien"] = true angelsmods.triggers.lab_ignore_token["lab-module"] = true +angelsmods.triggers.artifacts = angelsmods.triggers.artifacts or {} +if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then + angelsmods.triggers.artifacts["red" ] = true + angelsmods.triggers.artifacts["yellow"] = true + angelsmods.triggers.artifacts["orange"] = true + angelsmods.triggers.artifacts["blue" ] = true + angelsmods.triggers.artifacts["purple"] = true + angelsmods.triggers.artifacts["green" ] = true + angelsmods.triggers.artifacts["base" ] = true -- pink +end + +angelsmods.triggers.bio_pastes = angelsmods.triggers.bio_pastes or {} +angelsmods.triggers.bio_pastes["cellulose"] = true -- required for petri dish +if angelsmods.triggers.artifacts["red" ] then angelsmods.triggers.bio_pastes["copper" ] = true end +if angelsmods.triggers.artifacts["yellow"] then angelsmods.triggers.bio_pastes["gold" ] = true end +if angelsmods.triggers.artifacts["orange"] then angelsmods.triggers.bio_pastes["tungsten"] = true end +if angelsmods.triggers.artifacts["blue" ] then angelsmods.triggers.bio_pastes["cobalt" ] = true end +if angelsmods.triggers.artifacts["purple"] then angelsmods.triggers.bio_pastes["titanium"] = true end +if angelsmods.triggers.artifacts["green" ] then angelsmods.triggers.bio_pastes["zinc" ] = true end +if angelsmods.triggers.artifacts["base" ] then angelsmods.triggers.bio_pastes["iron" ] = true end +--angelsmods.triggers.bio_pastes["silver"] = true --unused + -- set triggers for other angel mods require("prototypes.bio-processing-triggers") diff --git a/angelsbioprocessing/graphics/icons/solid-tree.png b/angelsbioprocessing/graphics/icons/solid-tree.png index 214c9179f..2e956fc6a 100644 Binary files a/angelsbioprocessing/graphics/icons/solid-tree.png and b/angelsbioprocessing/graphics/icons/solid-tree.png differ diff --git a/angelsbioprocessing/info.json b/angelsbioprocessing/info.json index bee1691b7..98ac08ddf 100644 --- a/angelsbioprocessing/info.json +++ b/angelsbioprocessing/info.json @@ -1,6 +1,6 @@ { "name": "angelsbioprocessing", - "version": "0.7.5", + "version": "0.7.6", "factorio_version": "0.18", "title": "Angel's Bio Processing", "author": "Arch666Angel", @@ -9,7 +9,7 @@ "description": "Adds ways to recycle and process waste products through biological means and make use of biological processes and farming.", "dependencies": [ "base >= 0.18.0", - "angelsrefining >= 0.11.5", + "angelsrefining >= 0.11.8", "angelspetrochem >= 0.9.2", "angelssmelting >= 0.6.1", "? bobenemies >= 0.15.0" diff --git a/angelsbioprocessing/prototypes/bio-processing-generate.lua b/angelsbioprocessing/prototypes/bio-processing-generate.lua index 51aa21a48..f66e4b085 100644 --- a/angelsbioprocessing/prototypes/bio-processing-generate.lua +++ b/angelsbioprocessing/prototypes/bio-processing-generate.lua @@ -1,56 +1,56 @@ angelsmods.functions.make_void("wood", "bio") -angelsmods.functions.make_void("cellulose-fiber", "bio") +angelsmods.functions.make_void("cellulose-fiber", "bio", 2) -angelsmods.functions.make_void("algae-green", "bio") -angelsmods.functions.make_void("algae-brown", "bio") -angelsmods.functions.make_void("algae-red", "bio") +angelsmods.functions.make_void("algae-green", "bio", 4) +angelsmods.functions.make_void("algae-brown", "bio", 3) +angelsmods.functions.make_void("algae-red", "bio", 2) angelsmods.functions.make_void("algae-blue", "bio") -angelsmods.functions.make_void("temperate-garden", "bio") -angelsmods.functions.make_void("desert-garden", "bio") -angelsmods.functions.make_void("swamp-garden", "bio") +angelsmods.functions.make_void("temperate-garden", "bio", 2) +angelsmods.functions.make_void("desert-garden", "bio", 2) +angelsmods.functions.make_void("swamp-garden", "bio", 2) -angelsmods.functions.make_void("temperate-1", "bio") -angelsmods.functions.make_void("temperate-1-seed", "bio") -angelsmods.functions.make_void("temperate-2", "bio") -angelsmods.functions.make_void("temperate-2-seed", "bio") -angelsmods.functions.make_void("temperate-3", "bio") -angelsmods.functions.make_void("temperate-3-seed", "bio") -angelsmods.functions.make_void("temperate-3-seed-dormant", "bio") -angelsmods.functions.make_void("temperate-4", "bio") -angelsmods.functions.make_void("temperate-4-seed", "bio") -angelsmods.functions.make_void("temperate-4-seed-dormant", "bio") -angelsmods.functions.make_void("temperate-5", "bio") -angelsmods.functions.make_void("temperate-5-seed", "bio") -angelsmods.functions.make_void("temperate-5-seed-dormant", "bio") +angelsmods.functions.make_void("temperate-1", "bio", 2) +angelsmods.functions.make_void("temperate-1-seed", "bio", 20) +angelsmods.functions.make_void("temperate-2", "bio", 2) +angelsmods.functions.make_void("temperate-2-seed", "bio", 20) +angelsmods.functions.make_void("temperate-3", "bio", 2) +angelsmods.functions.make_void("temperate-3-seed", "bio", 20) +angelsmods.functions.make_void("temperate-3-seed-dormant", "bio", 20) +angelsmods.functions.make_void("temperate-4", "bio", 2) +angelsmods.functions.make_void("temperate-4-seed", "bio", 20) +angelsmods.functions.make_void("temperate-4-seed-dormant", "bio", 20) +angelsmods.functions.make_void("temperate-5", "bio", 2) +angelsmods.functions.make_void("temperate-5-seed", "bio", 20) +angelsmods.functions.make_void("temperate-5-seed-dormant", "bio", 20) -angelsmods.functions.make_void("desert-1", "bio") -angelsmods.functions.make_void("desert-1-seed", "bio") -angelsmods.functions.make_void("desert-2", "bio") -angelsmods.functions.make_void("desert-2-seed", "bio") -angelsmods.functions.make_void("desert-3", "bio") -angelsmods.functions.make_void("desert-3-seed", "bio") -angelsmods.functions.make_void("desert-3-seed-dormant", "bio") -angelsmods.functions.make_void("desert-4", "bio") -angelsmods.functions.make_void("desert-4-seed", "bio") -angelsmods.functions.make_void("desert-4-seed-dormant", "bio") -angelsmods.functions.make_void("desert-5", "bio") -angelsmods.functions.make_void("desert-5-seed", "bio") -angelsmods.functions.make_void("desert-5-seed-dormant", "bio") +angelsmods.functions.make_void("desert-1", "bio", 2) +angelsmods.functions.make_void("desert-1-seed", "bio", 20) +angelsmods.functions.make_void("desert-2", "bio", 2) +angelsmods.functions.make_void("desert-2-seed", "bio", 20) +angelsmods.functions.make_void("desert-3", "bio", 2) +angelsmods.functions.make_void("desert-3-seed", "bio", 20) +angelsmods.functions.make_void("desert-3-seed-dormant", "bio", 20) +angelsmods.functions.make_void("desert-4", "bio", 2) +angelsmods.functions.make_void("desert-4-seed", "bio", 20) +angelsmods.functions.make_void("desert-4-seed-dormant", "bio", 20) +angelsmods.functions.make_void("desert-5", "bio", 2) +angelsmods.functions.make_void("desert-5-seed", "bio", 20) +angelsmods.functions.make_void("desert-5-seed-dormant", "bio", 20) -angelsmods.functions.make_void("swamp-1", "bio") -angelsmods.functions.make_void("swamp-1-seed", "bio") -angelsmods.functions.make_void("swamp-2", "bio") -angelsmods.functions.make_void("swamp-2-seed", "bio") -angelsmods.functions.make_void("swamp-3", "bio") -angelsmods.functions.make_void("swamp-3-seed", "bio") -angelsmods.functions.make_void("swamp-3-seed-dormant", "bio") -angelsmods.functions.make_void("swamp-4", "bio") -angelsmods.functions.make_void("swamp-4-seed", "bio") -angelsmods.functions.make_void("swamp-4-seed-dormant", "bio") -angelsmods.functions.make_void("swamp-5", "bio") -angelsmods.functions.make_void("swamp-5-seed", "bio") -angelsmods.functions.make_void("swamp-5-seed-dormant", "bio") +angelsmods.functions.make_void("swamp-1", "bio", 2) +angelsmods.functions.make_void("swamp-1-seed", "bio", 20) +angelsmods.functions.make_void("swamp-2", "bio", 2) +angelsmods.functions.make_void("swamp-2-seed", "bio", 20) +angelsmods.functions.make_void("swamp-3", "bio", 2) +angelsmods.functions.make_void("swamp-3-seed", "bio", 20) +angelsmods.functions.make_void("swamp-3-seed-dormant", "bio", 20) +angelsmods.functions.make_void("swamp-4", "bio", 2) +angelsmods.functions.make_void("swamp-4-seed", "bio", 20) +angelsmods.functions.make_void("swamp-4-seed-dormant", "bio", 20) +angelsmods.functions.make_void("swamp-5", "bio", 2) +angelsmods.functions.make_void("swamp-5-seed", "bio", 20) +angelsmods.functions.make_void("swamp-5-seed-dormant", "bio", 20) angelsmods.functions.make_void("gas-ethanol", "chemical") diff --git a/angelsbioprocessing/prototypes/bio-processing-override-bob-artifacts.lua b/angelsbioprocessing/prototypes/bio-processing-override-bob-artifacts.lua index 46061e9e6..c331bdb0e 100644 --- a/angelsbioprocessing/prototypes/bio-processing-override-bob-artifacts.lua +++ b/angelsbioprocessing/prototypes/bio-processing-override-bob-artifacts.lua @@ -1,404 +1,536 @@ local OV = angelsmods.functions.OV -if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then - data:extend({ - --PRE ARTIFACTS +------------------------------------------------------------------------------- +-- RED ARTIFACTS -------------------------------------------------------------- +------------------------------------------------------------------------------- +if angelsmods.triggers.artifacts["red"] then + data:extend( { - type = "item", - name = "alien-pre-artifact-red", - icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-red.png", - icon_size = 32, - subgroup = "bio-processing-alien-pre", - order = "a[red]", - stack_size = 200 - }, - { - type = "item", - name = "alien-pre-artifact-yellow", - icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-yellow.png", - icon_size = 32, - subgroup = "bio-processing-alien-pre", - order = "b[yellow]", - stack_size = 200 - }, - { - type = "item", - name = "alien-pre-artifact-orange", - icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-orange.png", - icon_size = 32, - subgroup = "bio-processing-alien-pre", - order = "c[orange]", - stack_size = 200 - }, - { - type = "item", - name = "alien-pre-artifact-blue", - icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-blue.png", - icon_size = 32, - subgroup = "bio-processing-alien-pre", - order = "d[blue]", - stack_size = 200 - }, - { - type = "item", - name = "alien-pre-artifact-purple", - icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-purple.png", - icon_size = 32, - subgroup = "bio-processing-alien-pre", - order = "e[purple]", - stack_size = 200 - }, - { - type = "item", - name = "alien-pre-artifact-green", - icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-green.png", - icon_size = 32, - subgroup = "bio-processing-alien-pre", - order = "f[green]", - stack_size = 200 - }, - { - type = "item", - name = "alien-pre-artifact-base", - icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-base.png", - icon_size = 32, - subgroup = "bio-processing-alien-pre", - order = "g[base]", - stack_size = 200 - }, - { - type = "recipe", - name = "alien-pre-artifact-red", - category = "crafting", - subgroup = "bio-processing-alien-pre", - enabled = "false", - energy_required = 5, - ingredients ={ - {type="item", name="seeded-dish", amount=1}, - {type="item", name="paste-copper", amount=1}, - -- {type="item", name="ruby-4", amount=1}, - }, - results= + --PRE ARTIFACT { - {type="item", name="alien-pre-artifact-red", amount=1}, + type = "item", + name = "alien-pre-artifact-red", + icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-red.png", + icon_size = 32, + subgroup = "bio-processing-alien-pre", + order = "a[red]", + stack_size = 200 }, - icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-red.png", - icon_size = 32, - order = "a[red]", - }, - { - type = "recipe", - name = "alien-pre-artifact-yellow", - category = "crafting", - subgroup = "bio-processing-alien-pre", - enabled = "false", - energy_required = 5, - ingredients ={ - {type="item", name="seeded-dish", amount=1}, - {type="item", name="paste-gold", amount=1}, - -- {type="item", name="diamond-4", amount=1}, - }, - results= { - {type="item", name="alien-pre-artifact-yellow", amount=1}, - }, - icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-yellow.png", - icon_size = 32, - order = "b[yellow]", - }, - { - type = "recipe", - name = "alien-pre-artifact-orange", - category = "crafting", - subgroup = "bio-processing-alien-pre", - enabled = "false", - energy_required = 5, - ingredients ={ - {type="item", name="seeded-dish", amount=1}, - {type="item", name="paste-tungsten", amount=1}, - -- {type="item", name="topaz-4", amount=1}, + type = "recipe", + name = "alien-pre-artifact-red", + category = "crafting", + subgroup = "bio-processing-alien-pre", + enabled = "false", + energy_required = 5, + ingredients = + { + {type="item", name="seeded-dish", amount=1}, + {type="item", name="paste-copper", amount=1}, + -- {type="item", name="ruby-4", amount=1}, + }, + results = + { + {type="item", name="alien-pre-artifact-red", amount=1}, + }, + icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-red.png", + icon_size = 32, + order = "a[red]", }, - results= + -- SMALL ARTIFACT { - {type="item", name="alien-pre-artifact-orange", amount=1}, + type = "recipe", + name = "small-alien-artifact-red", + category = "crafting", + subgroup = "bio-processing-alien-small", + enabled = "false", + energy_required = 5, + ingredients = + { + {type="item", name="alien-pre-artifact-red", amount=1}, + }, + results = + { + {type="item", name="small-alien-artifact-red", amount=1}, + }, + icon_size = 32, + order = "a[red]", }, - icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-orange.png", - icon_size = 32, - order = "c[orange]", - }, + } + ) + + OV.add_unlock("bio-processing-alien-1", "alien-pre-artifact-red") + OV.add_unlock("bio-processing-alien-1", "small-alien-artifact-red") + + if bobmods and bobmods.plates then + OV.patch_recipes({ + { name = "alien-pre-artifact-red", ingredients = {{"ruby-4", 1}} } + }) + end + + if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then + angelsmods.functions.move_item("small-alien-artifact-red", "bio-processing-alien-small", "a[red]") + angelsmods.functions.move_item("alien-artifact-red", "bio-processing-alien-large", "a[red]") + OV.patch_recipes({ + { name = "alien-artifact-red-from-basic", subgroup = "bio-processing-alien-large-convert" } + }) + end +end + +------------------------------------------------------------------------------- +-- YELLOW ARTIFACTS ----------------------------------------------------------- +------------------------------------------------------------------------------- +if angelsmods.triggers.artifacts["yellow"] then + data:extend( { - type = "recipe", - name = "alien-pre-artifact-blue", - category = "crafting", - subgroup = "bio-processing-alien-pre", - enabled = "false", - energy_required = 5, - ingredients ={ - {type="item", name="seeded-dish", amount=1}, - {type="item", name="paste-cobalt", amount=1}, - -- {type="item", name="sapphire-4", amount=1}, - }, - results= + --PRE ARTIFACT { - {type="item", name="alien-pre-artifact-blue", amount=1}, - }, - icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-blue.png", - icon_size = 32, - order = "d[blue]", - }, - { - type = "recipe", - name = "alien-pre-artifact-purple", - category = "crafting", - subgroup = "bio-processing-alien-pre", - enabled = "false", - energy_required = 5, - ingredients ={ - {type="item", name="seeded-dish", amount=1}, - {type="item", name="paste-titanium", amount=1}, - -- {type="item", name="amethyst-4", amount=1}, + type = "item", + name = "alien-pre-artifact-yellow", + icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-yellow.png", + icon_size = 32, + subgroup = "bio-processing-alien-pre", + order = "b[yellow]", + stack_size = 200 }, - results= { - {type="item", name="alien-pre-artifact-purple", amount=1}, + type = "recipe", + name = "alien-pre-artifact-yellow", + category = "crafting", + subgroup = "bio-processing-alien-pre", + enabled = "false", + energy_required = 5, + ingredients = + { + {type="item", name="seeded-dish", amount=1}, + {type="item", name="paste-gold", amount=1}, + -- {type="item", name="diamond-4", amount=1}, + }, + results = + { + {type="item", name="alien-pre-artifact-yellow", amount=1}, + }, + icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-yellow.png", + icon_size = 32, + order = "b[yellow]", }, - icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-purple.png", - icon_size = 32, - order = "e[purple]", - }, - { - type = "recipe", - name = "alien-pre-artifact-green", - category = "crafting", - subgroup = "bio-processing-alien-pre", - enabled = "false", - energy_required = 5, - ingredients ={ - {type="item", name="seeded-dish", amount=1}, - {type="item", name="paste-zinc", amount=1}, - -- {type="item", name="emerald-4", amount=1}, - }, - results= + -- SMALL ARTIFACT { - {type="item", name="alien-pre-artifact-green", amount=1}, + type = "recipe", + name = "small-alien-artifact-yellow", + category = "crafting", + subgroup = "bio-processing-alien-small", + enabled = "false", + energy_required = 5, + ingredients = + { + {type="item", name="alien-pre-artifact-yellow", amount=1}, + }, + results = + { + {type="item", name="small-alien-artifact-yellow", amount=1}, + }, + icon_size = 32, + order = "b[yellow]", }, - icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-green.png", - icon_size = 32, - order = "f[green]", - }, + } + ) + + OV.add_unlock("bio-processing-alien-1", "alien-pre-artifact-yellow") + OV.add_unlock("bio-processing-alien-1", "small-alien-artifact-yellow") + + if bobmods and bobmods.plates then + OV.patch_recipes({ + { name = "alien-pre-artifact-yellow", ingredients = {{"diamond-4", 1}} } + }) + end + + if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then + angelsmods.functions.move_item("small-alien-artifact-yellow", "bio-processing-alien-small", "b[yellow]") + angelsmods.functions.move_item("alien-artifact-yellow", "bio-processing-alien-large", "b[yellow]") + OV.patch_recipes({ + { name = "alien-artifact-yellow-from-basic", subgroup = "bio-processing-alien-large-convert" } + }) + end +end + +------------------------------------------------------------------------------- +-- ORANGE ARTIFACTS ----------------------------------------------------------- +------------------------------------------------------------------------------- +if angelsmods.triggers.artifacts["orange"] then + data:extend( { - type = "recipe", - name = "alien-pre-artifact-base", - category = "crafting", - subgroup = "bio-processing-alien-pre", - enabled = "false", - energy_required = 5, - ingredients ={ - {type="item", name="seeded-dish", amount=1}, - {type="item", name="paste-iron", amount=1}, - }, - results= + --PRE ARTIFACT { - {type="item", name="alien-pre-artifact-base", amount=1}, + type = "item", + name = "alien-pre-artifact-orange", + icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-orange.png", + icon_size = 32, + subgroup = "bio-processing-alien-pre", + order = "c[orange]", + stack_size = 200 }, - icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-base.png", - icon_size = 32, - order = "g[base]", - }, - --SMALL - { - type = "recipe", - name = "small-alien-artifact-red", - category = "crafting", - subgroup = "bio-processing-alien-small", - enabled = "false", - energy_required = 5, - ingredients ={ - {type="item", name="alien-pre-artifact-red", amount=1}, + { + type = "recipe", + name = "alien-pre-artifact-orange", + category = "crafting", + subgroup = "bio-processing-alien-pre", + enabled = "false", + energy_required = 5, + ingredients = + { + {type="item", name="seeded-dish", amount=1}, + {type="item", name="paste-tungsten", amount=1}, + -- {type="item", name="topaz-4", amount=1}, + }, + results = + { + {type="item", name="alien-pre-artifact-orange", amount=1}, + }, + icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-orange.png", + icon_size = 32, + order = "c[orange]", }, - results= + -- SMALL ARTIFACT { - {type="item", name="small-alien-artifact-red", amount=1}, + type = "recipe", + name = "small-alien-artifact-orange", + category = "crafting", + subgroup = "bio-processing-alien-small", + enabled = "false", + energy_required = 5, + ingredients = + { + {type="item", name="alien-pre-artifact-orange", amount=1}, + }, + results = + { + {type="item", name="small-alien-artifact-orange", amount=1}, + }, + icon_size = 32, + order = "c[orange]", }, - icon_size = 32, - order = "a[red]", - }, + } + ) + + OV.add_unlock("bio-processing-alien-1", "alien-pre-artifact-orange") + OV.add_unlock("bio-processing-alien-1", "small-alien-artifact-orange") + + if bobmods and bobmods.plates then + OV.patch_recipes({ + { name = "alien-pre-artifact-orange", ingredients = {{"topaz-4", 1}} } + }) + end + + if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then + angelsmods.functions.move_item("small-alien-artifact-orange", "bio-processing-alien-small", "c[orange]") + angelsmods.functions.move_item("alien-artifact-orange", "bio-processing-alien-large", "c[orange]") + OV.patch_recipes({ + { name = "alien-artifact-orange-from-basic", subgroup = "bio-processing-alien-large-convert" } + }) + end +end + +------------------------------------------------------------------------------- +-- BLUE ARTIFACTS ------------------------------------------------------------- +------------------------------------------------------------------------------- +if angelsmods.triggers.artifacts["blue"] then + data:extend( { - type = "recipe", - name = "small-alien-artifact-yellow", - category = "crafting", - subgroup = "bio-processing-alien-small", - enabled = "false", - energy_required = 5, - ingredients ={ - {type="item", name="alien-pre-artifact-yellow", amount=1}, - }, - results= + --PRE ARTIFACT { - {type="item", name="small-alien-artifact-yellow", amount=1}, + type = "item", + name = "alien-pre-artifact-blue", + icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-blue.png", + icon_size = 32, + subgroup = "bio-processing-alien-pre", + order = "d[blue]", + stack_size = 200 }, - icon_size = 32, - order = "b[yellow]", - }, - { - type = "recipe", - name = "small-alien-artifact-orange", - category = "crafting", - subgroup = "bio-processing-alien-small", - enabled = "false", - energy_required = 5, - ingredients ={ - {type="item", name="alien-pre-artifact-orange", amount=1}, + { + type = "recipe", + name = "alien-pre-artifact-blue", + category = "crafting", + subgroup = "bio-processing-alien-pre", + enabled = "false", + energy_required = 5, + ingredients = + { + {type="item", name="seeded-dish", amount=1}, + {type="item", name="paste-cobalt", amount=1}, + -- {type="item", name="sapphire-4", amount=1}, + }, + results = + { + {type="item", name="alien-pre-artifact-blue", amount=1}, + }, + icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-blue.png", + icon_size = 32, + order = "d[blue]", }, - results= + -- SMALL ARTIFACT { - {type="item", name="small-alien-artifact-orange", amount=1}, + type = "recipe", + name = "small-alien-artifact-blue", + category = "crafting", + subgroup = "bio-processing-alien-small", + enabled = "false", + energy_required = 5, + ingredients = + { + {type="item", name="alien-pre-artifact-blue", amount=1}, + }, + results = + { + {type="item", name="small-alien-artifact-blue", amount=1}, + }, + icon_size = 32, + order = "d[blue]", }, - icon_size = 32, - order = "c[orange]", - }, + } + ) + + OV.add_unlock("bio-processing-alien-1", "alien-pre-artifact-blue") + OV.add_unlock("bio-processing-alien-1", "small-alien-artifact-blue") + + if bobmods and bobmods.plates then + OV.patch_recipes({ + { name = "alien-pre-artifact-blue", ingredients = {{"sapphire-4", 1}} } + }) + end + + if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then + angelsmods.functions.move_item("small-alien-artifact-blue", "bio-processing-alien-small", "d[blue]") + angelsmods.functions.move_item("alien-artifact-blue", "bio-processing-alien-large", "d[blue]") + OV.patch_recipes({ + { name = "alien-artifact-blue-from-basic", subgroup = "bio-processing-alien-large-convert" } + }) + end +end + +------------------------------------------------------------------------------- +-- PURPLE ARTIFACTS ----------------------------------------------------------- +------------------------------------------------------------------------------- +if angelsmods.triggers.artifacts["purple"] then + data:extend( { - type = "recipe", - name = "small-alien-artifact-blue", - category = "crafting", - subgroup = "bio-processing-alien-small", - enabled = "false", - energy_required = 5, - ingredients ={ - {type="item", name="alien-pre-artifact-blue", amount=1}, - }, - results= + --PRE ARTIFACT { - {type="item", name="small-alien-artifact-blue", amount=1}, + type = "item", + name = "alien-pre-artifact-purple", + icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-purple.png", + icon_size = 32, + subgroup = "bio-processing-alien-pre", + order = "e[purple]", + stack_size = 200 }, - icon_size = 32, - order = "d[blue]", - }, - { - type = "recipe", - name = "small-alien-artifact-purple", - category = "crafting", - subgroup = "bio-processing-alien-small", - enabled = "false", - energy_required = 5, - ingredients ={ - {type="item", name="alien-pre-artifact-purple", amount=1}, + { + type = "recipe", + name = "alien-pre-artifact-purple", + category = "crafting", + subgroup = "bio-processing-alien-pre", + enabled = "false", + energy_required = 5, + ingredients = + { + {type="item", name="seeded-dish", amount=1}, + {type="item", name="paste-titanium", amount=1}, + -- {type="item", name="amethyst-4", amount=1}, + }, + results = + { + {type="item", name="alien-pre-artifact-purple", amount=1}, + }, + icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-purple.png", + icon_size = 32, + order = "e[purple]", }, - results= + -- SMALL ARTIFACT { - {type="item", name="small-alien-artifact-purple", amount=1}, + type = "recipe", + name = "small-alien-artifact-purple", + category = "crafting", + subgroup = "bio-processing-alien-small", + enabled = "false", + energy_required = 5, + ingredients = + { + {type="item", name="alien-pre-artifact-purple", amount=1}, + }, + results = + { + {type="item", name="small-alien-artifact-purple", amount=1}, + }, + icon_size = 32, + order = "e[purple]", }, - icon_size = 32, - order = "e[purple]", - }, + } + ) + + OV.add_unlock("bio-processing-alien-1", "alien-pre-artifact-purple") + OV.add_unlock("bio-processing-alien-1", "small-alien-artifact-purple") + + if bobmods and bobmods.plates then + OV.patch_recipes({ + { name = "alien-pre-artifact-purple", ingredients = {{"amethyst-4", 1}} } + }) + end + + if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then + angelsmods.functions.move_item("small-alien-artifact-purple", "bio-processing-alien-small", "e[purple]") + angelsmods.functions.move_item("alien-artifact-purple", "bio-processing-alien-large", "e[purple]") + OV.patch_recipes({ + { name = "alien-artifact-purple-from-basic", subgroup = "bio-processing-alien-large-convert" } + }) + end +end + +------------------------------------------------------------------------------- +-- GREEN ARTIFACTS ------------------------------------------------------------ +------------------------------------------------------------------------------- +if angelsmods.triggers.artifacts["green"] then + data:extend( { - type = "recipe", - name = "small-alien-artifact-green", - category = "crafting", - subgroup = "bio-processing-alien-small", - enabled = "false", - energy_required = 5, - ingredients ={ - {type="item", name="alien-pre-artifact-green", amount=1}, - }, - results= + --PRE ARTIFACT { - {type="item", name="small-alien-artifact-green", amount=1}, + type = "item", + name = "alien-pre-artifact-green", + icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-green.png", + icon_size = 32, + subgroup = "bio-processing-alien-pre", + order = "f[green]", + stack_size = 200 }, - icon_size = 32, - order = "f[green]", - }, - { - type = "recipe", - name = "small-alien-artifact", - category = "crafting", - subgroup = "bio-processing-alien-small", - enabled = "false", - energy_required = 5, - ingredients ={ - {type="item", name="alien-pre-artifact-base", amount=1}, + { + type = "recipe", + name = "alien-pre-artifact-green", + category = "crafting", + subgroup = "bio-processing-alien-pre", + enabled = "false", + energy_required = 5, + ingredients = + { + {type="item", name="seeded-dish", amount=1}, + {type="item", name="paste-zinc", amount=1}, + -- {type="item", name="emerald-4", amount=1}, + }, + results = + { + {type="item", name="alien-pre-artifact-green", amount=1}, + }, + icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-green.png", + icon_size = 32, + order = "f[green]", }, - results= + -- SMALL ARTIFACT { - {type="item", name="small-alien-artifact", amount=1}, + type = "recipe", + name = "small-alien-artifact-green", + category = "crafting", + subgroup = "bio-processing-alien-small", + enabled = "false", + energy_required = 5, + ingredients = + { + {type="item", name="alien-pre-artifact-green", amount=1}, + }, + results = + { + {type="item", name="small-alien-artifact-green", amount=1}, + }, + icon_size = 32, + order = "f[green]", }, - icon_size = 32, - order = "g[base]", - }, - } + } ) + OV.add_unlock("bio-processing-alien-1", "alien-pre-artifact-green") + OV.add_unlock("bio-processing-alien-1", "small-alien-artifact-green") + if bobmods and bobmods.plates then OV.patch_recipes({ - { name = "alien-pre-artifact-yellow", ingredients = {{"diamond-4", 1}} }, - { name = "alien-pre-artifact-blue", ingredients = {{"sapphire-4", 1}} }, - { name = "alien-pre-artifact-green", ingredients = {{"emerald-4", 1}} }, - { name = "alien-pre-artifact-purple", ingredients = {{"amethyst-4", 1}} }, - { name = "alien-pre-artifact-orange", ingredients = {{"topaz-4", 1}} }, - { name = "alien-pre-artifact-red", ingredients = {{"ruby-4", 1}} }, + { name = "alien-pre-artifact-green", ingredients = {{"emerald-4", 1}} } }) end - OV.add_unlock("bio-processing-alien-1", "alien-pre-artifact-base") - OV.add_unlock("bio-processing-alien-1", "alien-pre-artifact-yellow") - OV.add_unlock("bio-processing-alien-1", "alien-pre-artifact-blue") - OV.add_unlock("bio-processing-alien-1", "alien-pre-artifact-green") - OV.add_unlock("bio-processing-alien-1", "alien-pre-artifact-purple") - OV.add_unlock("bio-processing-alien-1", "alien-pre-artifact-orange") - OV.add_unlock("bio-processing-alien-1", "alien-pre-artifact-red") - OV.add_unlock("bio-processing-alien-1", "small-alien-artifact-red") - OV.add_unlock("bio-processing-alien-1", "small-alien-artifact-yellow") - OV.add_unlock("bio-processing-alien-1", "small-alien-artifact-orange") - OV.add_unlock("bio-processing-alien-1", "small-alien-artifact-blue") - OV.add_unlock("bio-processing-alien-1", "small-alien-artifact-purple") - OV.add_unlock("bio-processing-alien-1", "small-alien-artifact-green") - OV.add_unlock("bio-processing-alien-1", "small-alien-artifact") - - -- small artifacts - data.raw.item["small-alien-artifact-red"].subgroup = "bio-processing-alien-small" - data.raw.item["small-alien-artifact-red"].order = "a[red]" - data.raw.item["small-alien-artifact-yellow"].subgroup = "bio-processing-alien-small" - data.raw.item["small-alien-artifact-yellow"].order = "b[yellow]" - data.raw.item["small-alien-artifact-orange"].subgroup = "bio-processing-alien-small" - data.raw.item["small-alien-artifact-orange"].order = "c[orange]" - data.raw.item["small-alien-artifact-blue"].subgroup = "bio-processing-alien-small" - data.raw.item["small-alien-artifact-blue"].order = "d[blue]" - data.raw.item["small-alien-artifact-purple"].subgroup = "bio-processing-alien-small" - data.raw.item["small-alien-artifact-purple"].order = "e[purple]" - data.raw.item["small-alien-artifact-green"].subgroup = "bio-processing-alien-small" - data.raw.item["small-alien-artifact-green"].order = "f[green]" - data.raw.item["small-alien-artifact"].subgroup = "bio-processing-alien-small" - data.raw.item["small-alien-artifact"].order = "g[base]" + if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then + angelsmods.functions.move_item("small-alien-artifact-green", "bio-processing-alien-small", "f[green]") + angelsmods.functions.move_item("alien-artifact-green", "bio-processing-alien-large", "f[green]") + OV.patch_recipes({ + { name = "alien-artifact-green-from-basic", subgroup = "bio-processing-alien-large-convert" } + }) + end +end - -- large artifacts - data.raw.item["alien-artifact-red"].subgroup = "bio-processing-alien-large" - data.raw.item["alien-artifact-red"].order = "a[red]" - data.raw.item["alien-artifact-yellow"].subgroup = "bio-processing-alien-large" - data.raw.item["alien-artifact-yellow"].order = "b[yellow]" - data.raw.item["alien-artifact-orange"].subgroup = "bio-processing-alien-large" - data.raw.item["alien-artifact-orange"].order = "c[orange]" - data.raw.item["alien-artifact-blue"].subgroup = "bio-processing-alien-large" - data.raw.item["alien-artifact-blue"].order = "d[blue]" - data.raw.item["alien-artifact-purple"].subgroup = "bio-processing-alien-large" - data.raw.item["alien-artifact-purple"].order = "e[purple]" - data.raw.item["alien-artifact-green"].subgroup = "bio-processing-alien-large" - data.raw.item["alien-artifact-green"].order = "f[green]" - data.raw.item["alien-artifact"].subgroup = "bio-processing-alien-large" - data.raw.item["alien-artifact"].order = "g[base]" +------------------------------------------------------------------------------- +-- BASE ARTIFACTS (pink) ------------------------------------------------------ +------------------------------------------------------------------------------- +if angelsmods.triggers.artifacts["base"] then -- pink + data:extend( + { + --PRE ARTIFACT + { + type = "item", + name = "alien-pre-artifact-base", + icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-base.png", + icon_size = 32, + subgroup = "bio-processing-alien-pre", + order = "g[base]", + stack_size = 200 + }, + { + type = "recipe", + name = "alien-pre-artifact-base", + category = "crafting", + subgroup = "bio-processing-alien-pre", + enabled = "false", + energy_required = 5, + ingredients = + { + {type="item", name="seeded-dish", amount=1}, + {type="item", name="paste-iron", amount=1}, + }, + results = + { + {type="item", name="alien-pre-artifact-base", amount=1}, + }, + icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-base.png", + icon_size = 32, + order = "g[base]", + }, + -- SMALL ARTIFACT + { + type = "recipe", + name = "small-alien-artifact", + category = "crafting", + subgroup = "bio-processing-alien-small", + enabled = "false", + energy_required = 5, + ingredients = + { + {type="item", name="alien-pre-artifact-base", amount=1}, + }, + results = + { + {type="item", name="small-alien-artifact", amount=1}, + }, + icon_size = 32, + order = "g[base]", + }, + } + ) - -- conversion recipes - OV.patch_recipes({ - { name = "alien-artifact-red-from-basic", subgroup = "bio-processing-alien-large-convert" }, - { name = "alien-artifact-yellow-from-basic", subgroup = "bio-processing-alien-large-convert" }, - { name = "alien-artifact-orange-from-basic", subgroup = "bio-processing-alien-large-convert" }, - { name = "alien-artifact-blue-from-basic", subgroup = "bio-processing-alien-large-convert" }, - { name = "alien-artifact-purple-from-basic", subgroup = "bio-processing-alien-large-convert" }, - { name = "alien-artifact-green-from-basic", subgroup = "bio-processing-alien-large-convert" }, - }) + OV.add_unlock("bio-processing-alien-1", "alien-pre-artifact-base") + OV.add_unlock("bio-processing-alien-1", "small-alien-artifact") - -- result products - if bobmods and bobmods.plates then - data.raw["item-subgroup"]["bob-alien-resource"].group = "bio-processing-alien" - data.raw["item-subgroup"]["bob-alien-resource"].order = "hd" + if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then + angelsmods.functions.move_item("small-alien-artifact", "bio-processing-alien-small", "g[base]") + angelsmods.functions.move_item("alien-artifact", "bio-processing-alien-large", "g[base]") end -end \ No newline at end of file +end + +------------------------------------------------------------------------------- +if bobmods and bobmods.plates then + data.raw["item-subgroup"]["bob-alien-resource"].group = "bio-processing-alien" + data.raw["item-subgroup"]["bob-alien-resource"].order = "hd" +end diff --git a/angelsbioprocessing/prototypes/bio-processing-override-paste.lua b/angelsbioprocessing/prototypes/bio-processing-override-paste.lua new file mode 100644 index 000000000..672cb9f47 --- /dev/null +++ b/angelsbioprocessing/prototypes/bio-processing-override-paste.lua @@ -0,0 +1,49 @@ +local OV = angelsmods.functions.OV + +if angelsmods.triggers.bio_pastes["cobalt"] then +else + angelsmods.functions.add_flag("paste-cobalt", "hidden") + OV.disable_recipe({ "paste-cobalt" }) +end + +if angelsmods.triggers.bio_pastes["copper"] then +else + angelsmods.functions.add_flag("paste-copper", "hidden") + OV.disable_recipe({ "paste-copper" }) +end + +if angelsmods.triggers.bio_pastes["gold"] then +else + angelsmods.functions.add_flag("paste-gold", "hidden") + OV.disable_recipe({ "paste-gold" }) +end + +if angelsmods.triggers.bio_pastes["iron"] then +else + angelsmods.functions.add_flag("paste-iron", "hidden") + OV.disable_recipe({ "paste-iron" }) +end + +if angelsmods.triggers.bio_pastes["silver"] then +else + angelsmods.functions.add_flag("paste-silver", "hidden") + OV.disable_recipe({ "paste-silver" }) +end + +if angelsmods.triggers.bio_pastes["titanium"] then +else + angelsmods.functions.add_flag("paste-titanium", "hidden") + OV.disable_recipe({ "paste-titanium" }) +end + +if angelsmods.triggers.bio_pastes["tungsten"] then +else + angelsmods.functions.add_flag("paste-tungsten", "hidden") + OV.disable_recipe({ "paste-tungsten" }) +end + +if angelsmods.triggers.bio_pastes["zinc"] then +else + angelsmods.functions.add_flag("paste-zinc", "hidden") + OV.disable_recipe({ "paste-zinc" }) +end \ No newline at end of file diff --git a/angelsbioprocessing/prototypes/bio-processing-override.lua b/angelsbioprocessing/prototypes/bio-processing-override.lua index 28c7dda4d..21426ed2c 100644 --- a/angelsbioprocessing/prototypes/bio-processing-override.lua +++ b/angelsbioprocessing/prototypes/bio-processing-override.lua @@ -35,6 +35,9 @@ for i, labs in pairs(data.raw["lab"]) do end end +--PASTE +require("prototypes.bio-processing-override-paste") + --CONDITIONAL if angelsmods.industries then OV.patch_recipes( @@ -74,37 +77,6 @@ else else OV.modify_input("substrate-dish", {"paste-copper", "paste-silver"}) OV.disable_recipe("algae-brown-burning") - OV.disable_recipe({"paste-cobalt", "paste-gold", "paste-silver", "paste-titanium", "paste-tungsten", "paste-zinc"}) - OV.disable_recipe( - { - "alien-pre-artifact-yellow", - "alien-pre-artifact-blue", - "alien-pre-artifact-green", - "alien-pre-artifact-purple", - "alien-pre-artifact-orange", - "alien-pre-artifact-red" - } - ) - OV.disable_recipe( - { - "small-alien-artifact-red", - "small-alien-artifact-yellow", - "small-alien-artifact-orange", - "small-alien-artifact-blue", - "small-alien-artifact-purple", - "small-alien-artifact-green" - } - ) - OV.disable_recipe( - { - "alien-artifact-red", - "alien-artifact-yellow", - "alien-artifact-orange", - "alien-artifact-blue", - "alien-artifact-purple", - "alien-artifact-green" - } - ) end end @@ -266,7 +238,9 @@ if bobmods then name = "tree-arboretum-1", icons = { { - icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png" + icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png", + icon_size = 64, + scale = 0.5 }, { icon = "__angelsbioprocessing__/graphics/icons/tree-seed.png", @@ -286,7 +260,9 @@ if bobmods then name = "tree-arboretum-2", icons = { { - icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png" + icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png", + icon_size = 64, + scale = 0.5 }, { icon = "__angelsbioprocessing__/graphics/icons/tree-seed.png", @@ -306,7 +282,9 @@ if bobmods then name = "tree-arboretum-3", icons = { { - icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png" + icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png", + icon_size = 64, + scale = 0.5 }, { icon = "__angelsbioprocessing__/graphics/icons/tree-seed.png", diff --git a/angelsbioprocessing/prototypes/bio-processing-triggers.lua b/angelsbioprocessing/prototypes/bio-processing-triggers.lua index 3b918f314..c55eb7e08 100644 --- a/angelsbioprocessing/prototypes/bio-processing-triggers.lua +++ b/angelsbioprocessing/prototypes/bio-processing-triggers.lua @@ -1,21 +1,41 @@ -- set triggers for the other angels mods ---REFINING TRIGGERS -angelsmods.trigger.ores["cobalt"] = true -angelsmods.trigger.ores["copper"] = true -angelsmods.trigger.ores["gold"] = true -angelsmods.trigger.ores["iron"] = true -angelsmods.trigger.ores["silver"] = true -angelsmods.trigger.ores["titanium"] = true -angelsmods.trigger.ores["tungsten"] = true -angelsmods.trigger.ores["zinc"] = true - ---SMELTING TRIGGERS -angelsmods.trigger.smelting_products["cobalt"].powder = true -angelsmods.trigger.smelting_products["copper"].powder = true -angelsmods.trigger.smelting_products["gold"].powder = true -angelsmods.trigger.smelting_products["iron"].powder = true -angelsmods.trigger.smelting_products["silver"].powder = true -angelsmods.trigger.smelting_products["titanium"].powder = true -angelsmods.trigger.smelting_products["tungsten"].powder = true -angelsmods.trigger.smelting_products["zinc"].powder = true \ No newline at end of file +if angelsmods.triggers.bio_pastes["cobalt"] then + angelsmods.trigger.ores["cobalt"] = true + angelsmods.trigger.smelting_products["cobalt"].powder = true +end + +if angelsmods.triggers.bio_pastes["copper"] then + angelsmods.trigger.ores["copper"] = true + angelsmods.trigger.smelting_products["copper"].powder = true +end + +if angelsmods.triggers.bio_pastes["gold"] then + angelsmods.trigger.ores["gold"] = true + angelsmods.trigger.smelting_products["gold"].powder = true +end + +if angelsmods.triggers.bio_pastes["iron"] then + angelsmods.trigger.ores["iron"] = true + angelsmods.trigger.smelting_products["iron"].powder = true +end + +if angelsmods.triggers.bio_pastes["silver"] then + angelsmods.trigger.ores["silver"] = true + angelsmods.trigger.smelting_products["silver"].powder = true +end + +if angelsmods.triggers.bio_pastes["titanium"] then + angelsmods.trigger.ores["titanium"] = true + angelsmods.trigger.smelting_products["titanium"].powder = true +end + +if angelsmods.triggers.bio_pastes["tungsten"] then + angelsmods.trigger.ores["tungsten"] = true + angelsmods.trigger.smelting_products["tungsten"].powder = true +end + +if angelsmods.triggers.bio_pastes["zinc"] then + angelsmods.trigger.ores["zinc"] = true + angelsmods.trigger.smelting_products["zinc"].powder = true +end diff --git a/angelsbioprocessing/prototypes/buildings/algae-farm.lua b/angelsbioprocessing/prototypes/buildings/algae-farm.lua index 7ccf403d5..58422762b 100644 --- a/angelsbioprocessing/prototypes/buildings/algae-farm.lua +++ b/angelsbioprocessing/prototypes/buildings/algae-farm.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.bioprocessing.number_tint, scale = 0.32, shift = {-12, -12} @@ -103,7 +103,7 @@ data:extend( icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.bioprocessing.number_tint, scale = 0.32, shift = {-12, -12} @@ -199,7 +199,7 @@ data:extend( icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.bioprocessing.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelsbioprocessing/prototypes/items/bio-processing-paste.lua b/angelsbioprocessing/prototypes/items/bio-processing-paste.lua index e73f626b7..160deb67b 100644 --- a/angelsbioprocessing/prototypes/items/bio-processing-paste.lua +++ b/angelsbioprocessing/prototypes/items/bio-processing-paste.lua @@ -1,20 +1,20 @@ data:extend( { ---PASTE + --PASTE { type = "item", name = "paste-cobalt", icon = "__angelsbioprocessing__/graphics/icons/paste-cobalt.png", - icon_size = 32, + icon_size = 32, subgroup = "bio-processing-paste", order = "a[paste-cobalt]", stack_size = 200 - }, + }, { type = "item", name = "paste-copper", icon = "__angelsbioprocessing__/graphics/icons/paste-copper.png", - icon_size = 32, + icon_size = 32, subgroup = "bio-processing-paste", order = "a[paste-copper]", stack_size = 200 @@ -23,55 +23,55 @@ data:extend( type = "item", name = "paste-gold", icon = "__angelsbioprocessing__/graphics/icons/paste-gold.png", - icon_size = 32, + icon_size = 32, subgroup = "bio-processing-paste", order = "a[paste-gold]", stack_size = 200 - }, + }, { type = "item", name = "paste-iron", icon = "__angelsbioprocessing__/graphics/icons/paste-iron.png", - icon_size = 32, + icon_size = 32, subgroup = "bio-processing-paste", order = "a[paste-iron]", stack_size = 200 - }, + }, { type = "item", name = "paste-silver", icon = "__angelsbioprocessing__/graphics/icons/paste-silver.png", - icon_size = 32, + icon_size = 32, subgroup = "bio-processing-paste", order = "a[paste-silver]", stack_size = 200 - }, + }, { type = "item", name = "paste-titanium", icon = "__angelsbioprocessing__/graphics/icons/paste-titanium.png", - icon_size = 32, + icon_size = 32, subgroup = "bio-processing-paste", order = "a[paste-titanium]", stack_size = 200 - }, + }, { type = "item", name = "paste-tungsten", icon = "__angelsbioprocessing__/graphics/icons/paste-tungsten.png", - icon_size = 32, + icon_size = 32, subgroup = "bio-processing-paste", order = "a[paste-tungsten]", stack_size = 200 - }, + }, { type = "item", name = "paste-zinc", icon = "__angelsbioprocessing__/graphics/icons/paste-zinc.png", - icon_size = 32, + icon_size = 32, subgroup = "bio-processing-paste", order = "a[paste-zinc]", stack_size = 200 - }, + }, } ) \ No newline at end of file diff --git a/angelsbioprocessing/prototypes/items/crop-farming-vegetables.lua b/angelsbioprocessing/prototypes/items/crop-farming-vegetables.lua index f749db550..2e1e47442 100644 --- a/angelsbioprocessing/prototypes/items/crop-farming-vegetables.lua +++ b/angelsbioprocessing/prototypes/items/crop-farming-vegetables.lua @@ -46,7 +46,7 @@ data:extend( order = "g", stack_size = 200, durability = 1, - durability_description_key = "description.science-pack-remaining-amount", + durability_description_key = "description.science-pack-remaining-amount-key", durability_description_value = "description.science-pack-remaining-amount-value" }, diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-wood.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-wood.lua index 3464e3ea2..729bd550c 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-processing-wood.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-processing-wood.lua @@ -1,13 +1,3 @@ -local function create_recipe_icon(fluid_name, product_name) - local icon_layers = util.table.deepcopy(angelsmods.functions.get_object_icons(product_name)) - for layer_index, layer in pairs(icon_layers or {}) do - layer.shift = layer.shift or {} - layer.shift = {(layer.shift[1] or 0)/2-10, (layer.shift[2] or 0)/2-10} - layer.scale = (layer.scale or 1)/2 - end - return angelsmods.functions.add_icon_layer(angelsmods.functions.get_object_icons(fluid_name), icon_layers) -end - data:extend( { -- RAW WOOD GENERATOR @@ -128,6 +118,8 @@ data:extend( icons = { { icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png", + icon_size = 64, + scale = 0.5 }, { icon = "__angelsrefining__/graphics/icons/num_1.png", @@ -164,6 +156,8 @@ data:extend( icons = { { icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png", + icon_size = 64, + scale = 0.5 }, { icon = "__angelsrefining__/graphics/icons/num_2.png", @@ -201,6 +195,8 @@ data:extend( icons = { { icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png", + icon_size = 64, + scale = 0.5 }, { icon = "__angelsrefining__/graphics/icons/num_3.png", @@ -499,7 +495,9 @@ data:extend( }, icons = { { - icon = "__angelsbioprocessing__/graphics/icons/solid-bio-resin.png", + icon = "__angelsbioprocessing__/graphics/icons/tree-temperate.png", + icon_size = 64, + scale = 0.5 }, { icon = "__angelsrefining__/graphics/icons/num_1.png", @@ -536,7 +534,9 @@ data:extend( }, icons = { { - icon = "__angelsbioprocessing__/graphics/icons/solid-bio-resin.png", + icon = "__angelsbioprocessing__/graphics/icons/tree-temperate.png", + icon_size = 64, + scale = 0.5 }, { icon = "__angelsrefining__/graphics/icons/num_2.png", @@ -574,7 +574,9 @@ data:extend( }, main_product = "liquid-resin", always_show_products = "true", - icons = create_recipe_icon("liquid-resin", "bio-resin"), + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {255,225,155}, {255,225,155} }, { + "bio-resin" + }), order = "c[processing]", }, @@ -710,7 +712,9 @@ data:extend( }, icons = { { - icon = "__angelsbioprocessing__/graphics/icons/solid-bio-plastic.png", + icon = "__angelsbioprocessing__/graphics/icons/tree-swamp.png", + icon_size = 64, + scale = 0.5 }, { icon = "__angelsrefining__/graphics/icons/num_1.png", @@ -747,7 +751,9 @@ data:extend( }, icons = { { - icon = "__angelsbioprocessing__/graphics/icons/solid-bio-plastic.png", + icon = "__angelsbioprocessing__/graphics/icons/tree-swamp.png", + icon_size = 64, + scale = 0.5 }, { icon = "__angelsrefining__/graphics/icons/num_2.png", @@ -785,7 +791,9 @@ data:extend( }, main_product = "liquid-plastic", always_show_products = "true", - icons = create_recipe_icon("liquid-plastic", "bio-plastic"), + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {255,255,255}, {255,255,255} }, { + "bio-plastic" + }), order = "c[processing]", }, @@ -921,7 +929,9 @@ data:extend( }, icons = { { - icon = "__angelsbioprocessing__/graphics/icons/solid-bio-rubber.png", + icon = "__angelsbioprocessing__/graphics/icons/tree-desert.png", + icon_size = 64, + scale = 0.5 }, { icon = "__angelsrefining__/graphics/icons/num_1.png", @@ -958,7 +968,9 @@ data:extend( }, icons = { { - icon = "__angelsbioprocessing__/graphics/icons/solid-bio-rubber.png", + icon = "__angelsbioprocessing__/graphics/icons/tree-desert.png", + icon_size = 64, + scale = 0.5 }, { icon = "__angelsrefining__/graphics/icons/num_2.png", @@ -996,7 +1008,9 @@ data:extend( }, main_product = "liquid-rubber", always_show_products = "true", - icons = create_recipe_icon("liquid-rubber", "bio-rubber"), + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {193,197,255}, {193,197,255} }, { + "bio-rubber" + }), order = "c[processing]", }, } diff --git a/angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua b/angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua index 667490bcc..e10a8a5c0 100644 --- a/angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua +++ b/angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua @@ -525,13 +525,13 @@ data:extend( category = "crafting-with-fluid", subgroup = "bio-wood", enabled = "false", - energy_required = 2, + energy_required = 1, ingredients = { {type = "item", name = "solid-compost", amount = 2}, - {type = "fluid", name = "gas-urea", amount = 40} + {type = "fluid", name = "gas-urea", amount = 20} }, results = { - {type = "item", name = "solid-fertilizer", amount = 2} + {type = "item", name = "solid-fertilizer", amount = 1} }, icon_size = 32, order = "a[support]-ca" -- order a[support]-cb reserved for bob fertilizer diff --git a/angelsbioprocessing/prototypes/recipes/crop-farming-processing-fermentation.lua b/angelsbioprocessing/prototypes/recipes/crop-farming-processing-fermentation.lua index 0a8f59b28..b880425ad 100644 --- a/angelsbioprocessing/prototypes/recipes/crop-farming-processing-fermentation.lua +++ b/angelsbioprocessing/prototypes/recipes/crop-farming-processing-fermentation.lua @@ -1,7 +1,3 @@ -local function create_icon(name, number_icon_layer) - return angelsmods.functions.add_icon_layer(angelsmods.functions.get_object_icons(name), number_icon_layer) -end - data:extend( { { @@ -72,7 +68,7 @@ data:extend( }, results = { {type = "fluid", name = "liquid-acetic-acid", amount = 50}, - {type = "item", name = "solid-compost", amount = 1} + {type = "item", name = "solid-compost", amount = 1, probability = 0.5} }, main_product = "liquid-acetic-acid", always_show_products = "true", @@ -94,7 +90,7 @@ data:extend( }, results = { {type = "fluid", name = "gas-ethanol", amount = 50}, - {type = "item", name = "solid-compost", amount = 1} + {type = "item", name = "solid-compost", amount = 1, probability = 0.5} }, main_product = "gas-ethanol", always_show_products = "true", @@ -230,13 +226,11 @@ data:extend( }, main_product = "liquid-plastic", always_show_products = "true", - icons = create_icon("liquid-plastic", { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {255,255,255}, {255,255,255} }, {{ + icon = "__angelsrefining__/graphics/icons/num_1.png", icon_size = 32, tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12}, - }), + }}), order = "e", }, { @@ -280,13 +274,11 @@ data:extend( }, main_product = "liquid-plastic", always_show_products = "true", - icons = create_icon("liquid-plastic", { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {255,255,255}, {255,255,255} }, {{ + icon = "__angelsrefining__/graphics/icons/num_2.png", icon_size = 32, tint = angelsmods.bioprocessing.number_tint, - scale = 0.32, - shift = {-12, -12}, - }), + }}), order = "g", } } diff --git a/angelsbioprocessing/prototypes/recipes/crop-farming-processing-nutrients.lua b/angelsbioprocessing/prototypes/recipes/crop-farming-processing-nutrients.lua index 52c45733f..99b5e3c80 100644 --- a/angelsbioprocessing/prototypes/recipes/crop-farming-processing-nutrients.lua +++ b/angelsbioprocessing/prototypes/recipes/crop-farming-processing-nutrients.lua @@ -1,13 +1,3 @@ -local function create_recipe_icon(fluid_name, product_name) - local icon_layers = util.table.deepcopy(angelsmods.functions.get_object_icons(product_name)) - for layer_index, layer in pairs(icon_layers or {}) do - layer.shift = layer.shift or {} - layer.shift = {(layer.shift[1] or 0)/2-10, (layer.shift[2] or 0)/2-10} - layer.scale = (layer.scale or 1)/2 - end - return angelsmods.functions.add_icon_layer(angelsmods.functions.get_object_icons(fluid_name), icon_layers) -end - data:extend( { { @@ -24,7 +14,9 @@ data:extend( {type = "fluid", name = "liquid-nutrient-pulp", amount = 80} }, always_show_products = "true", - icons = create_recipe_icon("liquid-nutrient-pulp", "solid-beans"), + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {214,135,010}, nil, {239,168,044} }, { + "solid-beans" + }), order = "ba", }, { @@ -41,7 +33,9 @@ data:extend( {type = "fluid", name = "liquid-nutrient-pulp", amount = 70} }, always_show_products = "true", - icons = create_recipe_icon("liquid-nutrient-pulp", "solid-corn"), + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {214,135,010}, nil, {239,168,044} }, { + "solid-corn" + }), order = "bb", }, { @@ -58,7 +52,9 @@ data:extend( {type = "fluid", name = "liquid-nutrient-pulp", amount = 10} }, always_show_products = "true", - icons = create_recipe_icon("liquid-nutrient-pulp", "solid-leafs"), + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {214,135,010}, nil, {239,168,044} }, { + "solid-leafs" + }), order = "bc", }, { @@ -75,7 +71,9 @@ data:extend( {type = "fluid", name = "liquid-nutrient-pulp", amount = 40} }, always_show_products = "true", - icons = create_recipe_icon("liquid-nutrient-pulp", "solid-nuts"), + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {214,135,010}, nil, {239,168,044} }, { + "solid-nuts" + }), order = "ba", }, { @@ -92,7 +90,9 @@ data:extend( {type = "fluid", name = "liquid-nutrient-pulp", amount = 20} }, always_show_products = "true", - icons = create_recipe_icon("liquid-nutrient-pulp", "solid-pips"), + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {214,135,010}, nil, {239,168,044} }, { + "solid-pips" + }), order = "bb", }, { @@ -109,7 +109,9 @@ data:extend( {type = "fluid", name = "liquid-nutrient-pulp", amount = 60} }, always_show_products = "true", - icons = create_recipe_icon("liquid-nutrient-pulp", "solid-fruit"), + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {214,135,010}, nil, {239,168,044} }, { + "solid-fruit" + }), order = "bc", }, -- REFINING diff --git a/angelsbioprocessing/prototypes/recipes/crop-farming-processing-vegetable-oil.lua b/angelsbioprocessing/prototypes/recipes/crop-farming-processing-vegetable-oil.lua index d6aa781d8..08c63f723 100644 --- a/angelsbioprocessing/prototypes/recipes/crop-farming-processing-vegetable-oil.lua +++ b/angelsbioprocessing/prototypes/recipes/crop-farming-processing-vegetable-oil.lua @@ -1,13 +1,3 @@ -local function create_recipe_icon(fluid_name, product_name) - local icon_layers = util.table.deepcopy(angelsmods.functions.get_object_icons(product_name)) - for layer_index, layer in pairs(icon_layers or {}) do - layer.shift = layer.shift or {} - layer.shift = {(layer.shift[1] or 0)/2.3-9, (layer.shift[2] or 0)/2.3-9} - layer.scale = (layer.scale or 1)/2.3 - end - return angelsmods.functions.add_icon_layer(angelsmods.functions.get_object_icons(fluid_name), icon_layers) -end - data:extend( { { @@ -24,7 +14,9 @@ data:extend( {type = "fluid", name = "liquid-raw-vegetable-oil", amount = 50} }, always_show_products = "true", - icons = create_recipe_icon("liquid-raw-vegetable-oil", "solid-nuts"), + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {255,184,062}, {255,184,062}, {255,221,061,0.8}, {255,221,061,0.8} }, { + "solid-nuts" + }), order = "ba", }, { @@ -41,7 +33,9 @@ data:extend( {type = "fluid", name = "liquid-raw-vegetable-oil", amount = 40} }, always_show_products = "true", - icons = create_recipe_icon("liquid-raw-vegetable-oil", "solid-pips"), + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {255,184,062}, {255,184,062}, {255,221,061,0.8}, {255,221,061,0.8} }, { + "solid-pips" + }), order = "bb", }, { @@ -58,7 +52,9 @@ data:extend( {type = "fluid", name = "liquid-raw-vegetable-oil", amount = 30} }, always_show_products = "true", - icons = create_recipe_icon("liquid-raw-vegetable-oil", "solid-beans"), + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {255,184,062}, {255,184,062}, {255,221,061,0.8}, {255,221,061,0.8} }, { + "solid-beans" + }), order = "bc", }, -- PROCESSING diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index 5fb2827a3..12908b0d3 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -1,6 +1,25 @@ --------------------------------------------------------------------------------------------------- +Version: 0.3.6 +Date: 02.04.2020 + Changes: + - Removed Crawler Train - moved to separate mod #124 + - Component mode: + - Stone wall now require only 1 Construction Block 2 instead of 5 + - Fixed recipes would use the unobtainable advanced processing blocks + - Changed Grey Circuit Board hand crafting to use the Circuit Board from wood instead of paper + - Added new recipes to create molds for Motor Casting + Bugfixes: + - General: + - Fixed iron stick/rod in wrong mode to be shown (including cleanup) #154 + - Component mode: + - Fixed Submachine Gun was unlocking with Turrets instead of Basic Military technology + - Fixed Automation 2 did not depend on Construction Components 2 + - Science mode: + - Fixed Assembling Machine 1 was locked when playing with bobs Burner Assemblers disabled + - Fixed some labs would require the base game Lab as ingredient instead of angels variant +--------------------------------------------------------------------------------------------------- Version: 0.3.5 -Date: 24-03-2020 +Date: 24.03.2020 Changes: - Added dedicated graphic to the weapon trigger (it was the same as Gear before) Bugfixes: @@ -16,7 +35,7 @@ Date: 24-03-2020 - Fixed that the vanilla lab was not hidden when playing pure angels --------------------------------------------------------------------------------------------------- Version: 0.3.4 -Date: 21-03-2020 +Date: 21.03.2020 Changes: - Components: - assembling-machine-1 in vanilla requires Electronic block 0 instead of 1 #109 @@ -33,12 +52,12 @@ Date: 21-03-2020 - Disable unused bobs advanced logistic science research when playing angel science mode --------------------------------------------------------------------------------------------------- Version: 0.3.3 -Date: 21-03-2020 +Date: 21.03.2020 Changes: - Fixed an error relating to composite entities which don't have a minable property --------------------------------------------------------------------------------------------------- Version: 0.3.2 -Date: 20-03-2020 +Date: 20.03.2020 Changes: - Added dedicated icon to the Electronics Block 0 - Added dedicated researched to unlock the components diff --git a/angelsindustries/data-final-fixes.lua b/angelsindustries/data-final-fixes.lua index ca2a3c0dd..8ff60a913 100644 --- a/angelsindustries/data-final-fixes.lua +++ b/angelsindustries/data-final-fixes.lua @@ -3,7 +3,6 @@ require("prototypes.overrides.industries-override-functions") if angelsmods.industries.overhaul and angelsmods.industries.components then require("prototypes.overrides.global-components-recipe") - require("prototypes.overrides.global-components-blocks") --hide the unused advanced tech blocks data.raw.recipe["block-extraction-3"].hidden = true @@ -18,6 +17,24 @@ if angelsmods.industries.overhaul and angelsmods.industries.components then data.raw.recipe["block-bprocessing-3"].hidden = true data.raw.recipe["block-bprocessing-4"].hidden = true data.raw.recipe["block-bprocessing-5"].hidden = true + OV.global_replace_item({ + "block-extraction-3", + "block-mprocessing-3", + "block-cprocessing-3", + "block-bprocessing-3" + }, "block-production-3") + OV.global_replace_item({ + "block-extraction-4", + "block-mprocessing-4", + "block-cprocessing-4", + "block-bprocessing-4" + }, "block-production-4") + OV.global_replace_item({ + "block-extraction-5", + "block-mprocessing-5", + "block-cprocessing-5", + "block-bprocessing-5" + }, "block-production-5") OV.execute() end diff --git a/angelsindustries/data.lua b/angelsindustries/data.lua index 79cbf0d23..bb46318c4 100644 --- a/angelsindustries/data.lua +++ b/angelsindustries/data.lua @@ -101,7 +101,6 @@ require("prototypes.buildings.construction-robot") require("prototypes.buildings.chests") require("prototypes.entities.crawler") -require("prototypes.entities.crawler-train") require("prototypes.entities.equipment") require("prototypes.entities.bio-tile") diff --git a/angelsindustries/info.json b/angelsindustries/info.json index c479267a0..9130fe5d1 100644 --- a/angelsindustries/info.json +++ b/angelsindustries/info.json @@ -1,6 +1,6 @@ { "name": "angelsindustries", - "version": "0.3.5", + "version": "0.3.6", "factorio_version": "0.18", "title": "Angel's Industries", "author": "Arch666Angel", @@ -12,6 +12,7 @@ "angelsrefining >= 0.11.5", "angelspetrochem >= 0.9.0", "angelsbioprocessing >= 0.7.3", - "angelssmelting >= 0.6.1" + "angelssmelting >= 0.6.1", + "angelsaddons-crawlertrain >= 0.1.0" ] } diff --git a/angelsindustries/locale/en/components.cfg b/angelsindustries/locale/en/components.cfg index 928e858e1..310b53fc9 100644 --- a/angelsindustries/locale/en/components.cfg +++ b/angelsindustries/locale/en/components.cfg @@ -8,6 +8,7 @@ angels-assembling-machine-big-3=Big Assembling Machine 3 angels-assembling-machine-0=Assembling Machine 0 [item-name] +spent-mold-non-expendable=Fouled reusable mold circuit-grey-board=Grey Board circuit-red-board=Red Board circuit-green-board=Green Board @@ -181,6 +182,10 @@ 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 basic-tinned-copper-wire=Angels Basic Tinned Copper wire +mold=__1__ mold casting +mold-non-expendable-wash=Reusable mold cleaning +casing= Motor casing __2__ (__1__ with __3__ mold) + [recipe-category-name] [item-group-name] diff --git a/angelsindustries/locale/en/logistic.cfg b/angelsindustries/locale/en/logistic.cfg index 99e5021f3..9d7760732 100644 --- a/angelsindustries/locale/en/logistic.cfg +++ b/angelsindustries/locale/en/logistic.cfg @@ -22,10 +22,6 @@ angels-logistic-chest-storage=Big Storage Chest angels-logistic-chest-buffer=Big Buffer Chest angels-crawler="Crawler" Construction Vehicle -crawler-locomotive="Crawler" Construction Train Locomotive -crawler-locomotive-wagon="Crawler" Construction Train Locomotive Wagon -crawler-bot-wagon="Crawler" Construction Train Robot Wagon -crawler-wagon="Crawler" Construction Train Wagon [item-name] cargo-roboport=Cargo Roboport @@ -42,10 +38,6 @@ angels-logistic-chest-active-provider=Big Active Provider Chest angels-logistic-chest-Storage=Big Storage Chest angels-crawler="Crawler" Construction Vehicle -crawler-locomotive="Crawler" Construction Train Locomotive -crawler-locomotive-wagon="Crawler" Construction Train Locomotive Wagon -crawler-bot-wagon="Crawler" Construction Train Robot Wagon -crawler-wagon="Crawler" Construction Train Wagon angels-burner-generator-vequip=Vehicle Burner Generator angels-fusion-reactor-vequip=Vehicle Fusion Reactor @@ -69,10 +61,6 @@ construction-roboport=Construction Roboport angels-construction-robot=Construction Robot angels-zone-expander=Small Logistic Zone Expander angels-crawler="Crawler" Construction Vehicle -crawler-locomotive="Crawler" Construction Train Locomotive -crawler-locomotive-wagon="Crawler" Construction Train Locomotive Wagon -crawler-bot-wagon="Crawler" Construction Train Robot Wagon -crawler-wagon="Crawler" Construction Train Wagon [recipe-category-name] @@ -89,7 +77,6 @@ angels-warfare=Angel's Combat angels-construction-robots=Construction Robots cargo-robots=Cargo Robots angels-crawler="Crawler" Construction Vehicle -angels-crawler-train="Crawler" Construction Train angels-vequipment=Vehicle Equipment diff --git a/angelsindustries/prototypes/angels-industries-category.lua b/angelsindustries/prototypes/angels-industries-category.lua index 0901eff4f..7a1097c4d 100644 --- a/angelsindustries/prototypes/angels-industries-category.lua +++ b/angelsindustries/prototypes/angels-industries-category.lua @@ -1,601 +1,590 @@ data:extend( -{ - --RECIPE CATEGORY { - type = "recipe-category", - name = "bob-logistics", - }, - --EQUIPMENT CATEGORY - { - type = "equipment-category", - name = "angels-light-attack" - }, - { - type = "equipment-category", - name = "angels-heavy-attack" - }, - { - type = "equipment-category", - name = "angels-repair" - }, - { - type = "equipment-category", - name = "angels-light-defense" - }, - { - type = "equipment-category", - name = "angels-heavy-defense" - }, - { - type = "equipment-category", - name = "angels-energy" - }, - { - type = "equipment-category", - name = "angels-construction" - }, - { - type = "equipment-category", - name = "angels-movement" - }, - --SUBGROUPS - -- COMPONENTS - { - type = "item-group", - name = "angels-components", - order = "la[angels]-e[industries]-aa", - inventory_order = "la[angels]-e[industries]-a", - icons = { - { - icon = "__base__/graphics/item-group/intermediate-products.png", - icon_size = 64, - }, - { - icon = "__angelsrefining__/graphics/icons/void.png", - icon_size = 32, - scale = 64 / 32 * 0.35, - shift = {20, -20} + --RECIPE CATEGORY + { + type = "recipe-category", + name = "bob-logistics" + }, + --EQUIPMENT CATEGORY + { + type = "equipment-category", + name = "angels-light-attack" + }, + { + type = "equipment-category", + name = "angels-heavy-attack" + }, + { + type = "equipment-category", + name = "angels-repair" + }, + { + type = "equipment-category", + name = "angels-light-defense" + }, + { + type = "equipment-category", + name = "angels-heavy-defense" + }, + { + type = "equipment-category", + name = "angels-energy" + }, + { + type = "equipment-category", + name = "angels-construction" + }, + { + type = "equipment-category", + name = "angels-movement" + }, + --SUBGROUPS + -- COMPONENTS + { + type = "item-group", + name = "angels-components", + order = "la[angels]-e[industries]-aa", + inventory_order = "la[angels]-e[industries]-a", + icons = { + { + icon = "__base__/graphics/item-group/intermediate-products.png", + icon_size = 64 + }, + { + icon = "__angelsrefining__/graphics/icons/void.png", + icon_size = 32, + scale = 64 / 32 * 0.35, + shift = {20, -20} + } } - } - }, - { - type = "item-subgroup", - name = "angels-basic-intermediate", -- like what doesn't fit in other groups - group = "angels-components", - order = "a[basic]-a", - }, - { - type = "item-subgroup", - name = "angels-board", - group = "angels-components", - order = "b[electronics]-a[basic-board]", - }, - { - type = "item-subgroup", - name = "angels-circuit-board", - group = "angels-components", - order = "b[electronics]-b[circuit-board]", - }, - { - type = "item-subgroup", - name = "angels-loaded-circuit-board", - group = "angels-components", - order = "b[electronics]-c[loaded-circuit-board]", - }, - { - type = "item-subgroup", - name = "angels-circuit-components", - group = "angels-components", - order = "b[electronics]-d[circuit-components]", - }, - { - type = "item-subgroup", - name = "angels-motor-casing", - group = "angels-components", - order = "c[mechanics]-a[motor-casing]", - }, - { - type = "item-subgroup", - name = "angels-motor-block", - group = "angels-components", - order = "c[mechanics]-b[motor-block]", - }, - { - type = "item-subgroup", - name = "angels-motors", - group = "angels-components", - order = "c[mechanics]-c[motor-assembled]", - }, - { - type = "item-subgroup", - name = "angels-mechanical-parts", - group = "angels-components", - order = "c[mechanics]-d[parts]", - }, - { - type = "item-subgroup", - name = "angels-construction-grates", - group = "angels-components", - order = "d[constructions]-a[grates]", - }, - { - type = "item-subgroup", - name = "angels-construction-frames", - group = "angels-components", - order = "d[constructions]-b[frames]", - }, - { - type = "item-subgroup", - name = "angels-construction-components", - group = "angels-components", - order = "e[constructions]-c[components]", - }, - { - type = "item-subgroup", - name = "angels-weapons-body", - group = "angels-components", - order = "f[weapons]-a[body]", - }, - { - type = "item-subgroup", - name = "angels-weapons", - group = "angels-components", - order = "f[weapons]-b[weapon]", - }, - { - type = "item-subgroup", - name = "angels-weapons-parts", - group = "angels-components", - order = "f[weapons]-c[parts]", - }, - { - type = "item-subgroup", - name = "angels-cable-shielding", - group = "angels-components", - order = "g[cables]-a[shielding]", - }, - { - type = "item-subgroup", - name = "angels-cable-harness", - group = "angels-components", - order = "g[cables]-b[harness]", - }, - { - type = "item-subgroup", - name = "angels-servo-motor", - group = "angels-components", - order = "g[cables]-c[servo-motor]", - }, - { - type = "item-subgroup", - name = "angels-tool", - group = "angels-components", - order = "h[tools]", - }, - { - type = "item-group", - name = "angels-blocks", - order = "la[angels]-e[industries]-ab", - inventory_order = "la[angels]-e[industries]-ab", - icon_size = 64, - icon = "__angelsindustries__/graphics/item-group/components-tech.png", - }, - { - type = "item-subgroup", - name = "blocks-frames", - group = "angels-blocks", - order = "u[blocks]-aa[frame]", - }, - { - type = "item-subgroup", - name = "blocks-electronics", - group = "angels-blocks", - order = "u[blocks]-ab[electronics]", - }, - { - type = "item-subgroup", - name = "blocks-basic", - group = "angels-blocks", - order = "u[blocks]-ac[basic]", - }, - { - type = "item-subgroup", - name = "blocks-enhancement", - group = "angels-blocks", - order = "u[blocks]-ba[enhancement]", - }, - { - type = "item-subgroup", - name = "blocks-energy", - group = "angels-blocks", - order = "u[blocks]-bb[energy]", - }, - { - type = "item-subgroup", - name = "blocks-exploration", - group = "angels-blocks", - order = "u[blocks]-bc[exploration]", - }, - { - type = "item-subgroup", - name = "blocks-logistic", - group = "angels-blocks", - order = "u[blocks]-bd[logistic]", - }, - { - type = "item-subgroup", - name = "blocks-production", - group = "angels-blocks", - order = "u[blocks]-be[production]", - }, - { - type = "item-subgroup", - name = "blocks-processing", - group = "angels-blocks", - order = "u[blocks]-bf[processing]", - }, - { - type = "item-subgroup", - name = "blocks-warfare", - group = "angels-blocks", - order = "u[blocks]-bg[warfare]", - }, - { - type = "item-subgroup", - name = "angels-assemblers-small", - group = "production", - order = "z[assemblers]-a[small]", - }, - { - type = "item-subgroup", - name = "angels-assemblers-medium", - group = "production", - order = "z[assemblers]-b[medium]", - }, - { - type = "item-subgroup", - name = "angels-assemblers-big", - group = "production", - order = "z[assemblers]-c[big]", - }, - -- SCIENCE - { - type = "item-group", - name = "angels-tech", - order = "la[angels]-e[industries]-b", - inventory_order = "la[angels]-e[industries]-b", - icon_size = 64, - icon = "__angelsindustries__/graphics/item-group/science-group.png", - }, - { - type = "item-subgroup", - name = "angels-science-pack", - group = "angels-tech", - order = "aa", - }, - { - type = "item-subgroup", - name = "angels-pack-components", - group = "angels-tech", - order = "ab", - }, - { - type = "item-subgroup", - name = "angels-datacore-1", - group = "angels-tech", - order = "b", - }, - { - type = "item-subgroup", - name = "angels-datacore-2", - group = "angels-tech", - order = "c", - }, - { - type = "item-subgroup", - name = "angels-labs-1", - group = "angels-tech", - order = "z[labs]-a[specialized]-a[mk1]", - }, - { - type = "item-subgroup", - name = "angels-labs-2", - group = "angels-tech", - order = "z[labs]-a[specialized]-b[mk2]", - }, - { - type = "item-subgroup", - name = "angels-labs-3", - group = "angels-tech", - order = "z[labs]-a[specialized]-c[mk3]", - }, - { - type = "item-subgroup", - name = "angels-labs-4", - group = "angels-tech", - order = "z[labs]-b[archive]", - }, - -- EQUIPMENT - --{ - -- type = "item-group", - -- name = "angels-enhancement", - -- order = "la[angels]-e[industries]-c", - -- inventory_order = "la[angels]-e[industries]-c", - -- icon_size = 64, - -- icon = "__angelsindustries__/graphics/item-group/vequip.png", - --}, - --{ - -- type = "item-subgroup", - -- name = "angels-equipment-energy", - -- group = "angels-enhancement", - -- order = "a", - --}, - --{ - -- type = "item-subgroup", - -- name = "angels-equipment-movement", - -- group = "angels-enhancement", - -- order = "b", - --}, - --{ - -- type = "item-subgroup", - -- name = "angels-equipment-robo", - -- group = "angels-enhancement", - -- order = "c", - --}, - --{ - -- type = "item-subgroup", - -- name = "angels-equipment-ldef", - -- group = "angels-enhancement", - -- order = "d", - --}, - --{ - -- type = "item-subgroup", - -- name = "angels-equipment-hdef", - -- group = "angels-enhancement", - -- order = "e", - --}, - --{ - -- type = "item-subgroup", - -- name = "angels-equipment-lat", - -- group = "angels-enhancement", - -- order = "f", - --}, - --{ - -- type = "item-subgroup", - -- name = "angels-equipment-hat", - -- group = "angels-enhancement", - -- order = "g", - --}, - -- POWER - { - type = "item-group", - name = "angels-power", - order = "la[angels]-e[industries]-c", - inventory_order = "la[angels]-e[industries]-c", - icons = { - { - icon = "__angelsindustries__/graphics/technology/vequip.png", - icon_size = 128, - scale = 0.5, - }, - { - icon = "__angelsrefining__/graphics/icons/void.png", - icon_size = 32, - scale = 64 / 32 * 0.35, - shift = {20, -20} + }, + { + type = "item-subgroup", + name = "angels-basic-intermediate", -- like what doesn't fit in other groups + group = "angels-components", + order = "a[basic]-a" + }, + { + type = "item-subgroup", + name = "angels-board", + group = "angels-components", + order = "b[electronics]-a[basic-board]" + }, + { + type = "item-subgroup", + name = "angels-circuit-board", + group = "angels-components", + order = "b[electronics]-b[circuit-board]" + }, + { + type = "item-subgroup", + name = "angels-loaded-circuit-board", + group = "angels-components", + order = "b[electronics]-c[loaded-circuit-board]" + }, + { + type = "item-subgroup", + name = "angels-circuit-components", + group = "angels-components", + order = "b[electronics]-d[circuit-components]" + }, + { + type = "item-subgroup", + name = "angels-motor-casing", + group = "angels-components", + order = "c[mechanics]-a[motor-casing]" + }, + { + type = "item-subgroup", + name = "angels-motor-block", + group = "angels-components", + order = "c[mechanics]-b[motor-block]" + }, + { + type = "item-subgroup", + name = "angels-motors", + group = "angels-components", + order = "c[mechanics]-c[motor-assembled]" + }, + { + type = "item-subgroup", + name = "angels-mechanical-parts", + group = "angels-components", + order = "c[mechanics]-d[parts]" + }, + { + type = "item-subgroup", + name = "angels-construction-grates", + group = "angels-components", + order = "d[constructions]-a[grates]" + }, + { + type = "item-subgroup", + name = "angels-construction-frames", + group = "angels-components", + order = "d[constructions]-b[frames]" + }, + { + type = "item-subgroup", + name = "angels-construction-components", + group = "angels-components", + order = "e[constructions]-c[components]" + }, + { + type = "item-subgroup", + name = "angels-weapons-body", + group = "angels-components", + order = "f[weapons]-a[body]" + }, + { + type = "item-subgroup", + name = "angels-weapons", + group = "angels-components", + order = "f[weapons]-b[weapon]" + }, + { + type = "item-subgroup", + name = "angels-weapons-parts", + group = "angels-components", + order = "f[weapons]-c[parts]" + }, + { + type = "item-subgroup", + name = "angels-cable-shielding", + group = "angels-components", + order = "g[cables]-a[shielding]" + }, + { + type = "item-subgroup", + name = "angels-cable-harness", + group = "angels-components", + order = "g[cables]-b[harness]" + }, + { + type = "item-subgroup", + name = "angels-servo-motor", + group = "angels-components", + order = "g[cables]-c[servo-motor]" + }, + { + type = "item-subgroup", + name = "angels-tool", + group = "angels-components", + order = "h[tools]" + }, + { + type = "item-group", + name = "angels-blocks", + order = "la[angels]-e[industries]-ab", + inventory_order = "la[angels]-e[industries]-ab", + icon_size = 64, + icon = "__angelsindustries__/graphics/item-group/components-tech.png" + }, + { + type = "item-subgroup", + name = "blocks-frames", + group = "angels-blocks", + order = "u[blocks]-aa[frame]" + }, + { + type = "item-subgroup", + name = "blocks-electronics", + group = "angels-blocks", + order = "u[blocks]-ab[electronics]" + }, + { + type = "item-subgroup", + name = "blocks-basic", + group = "angels-blocks", + order = "u[blocks]-ac[basic]" + }, + { + type = "item-subgroup", + name = "blocks-enhancement", + group = "angels-blocks", + order = "u[blocks]-ba[enhancement]" + }, + { + type = "item-subgroup", + name = "blocks-energy", + group = "angels-blocks", + order = "u[blocks]-bb[energy]" + }, + { + type = "item-subgroup", + name = "blocks-exploration", + group = "angels-blocks", + order = "u[blocks]-bc[exploration]" + }, + { + type = "item-subgroup", + name = "blocks-logistic", + group = "angels-blocks", + order = "u[blocks]-bd[logistic]" + }, + { + type = "item-subgroup", + name = "blocks-production", + group = "angels-blocks", + order = "u[blocks]-be[production]" + }, + { + type = "item-subgroup", + name = "blocks-processing", + group = "angels-blocks", + order = "u[blocks]-bf[processing]" + }, + { + type = "item-subgroup", + name = "blocks-warfare", + group = "angels-blocks", + order = "u[blocks]-bg[warfare]" + }, + { + type = "item-subgroup", + name = "angels-assemblers-small", + group = "production", + order = "z[assemblers]-a[small]" + }, + { + type = "item-subgroup", + name = "angels-assemblers-medium", + group = "production", + order = "z[assemblers]-b[medium]" + }, + { + type = "item-subgroup", + name = "angels-assemblers-big", + group = "production", + order = "z[assemblers]-c[big]" + }, + -- SCIENCE + { + type = "item-group", + name = "angels-tech", + order = "la[angels]-e[industries]-b", + inventory_order = "la[angels]-e[industries]-b", + icon_size = 64, + icon = "__angelsindustries__/graphics/item-group/science-group.png" + }, + { + type = "item-subgroup", + name = "angels-science-pack", + group = "angels-tech", + order = "aa" + }, + { + type = "item-subgroup", + name = "angels-pack-components", + group = "angels-tech", + order = "ab" + }, + { + type = "item-subgroup", + name = "angels-datacore-1", + group = "angels-tech", + order = "b" + }, + { + type = "item-subgroup", + name = "angels-datacore-2", + group = "angels-tech", + order = "c" + }, + { + type = "item-subgroup", + name = "angels-labs-1", + group = "angels-tech", + order = "z[labs]-a[specialized]-a[mk1]" + }, + { + type = "item-subgroup", + name = "angels-labs-2", + group = "angels-tech", + order = "z[labs]-a[specialized]-b[mk2]" + }, + { + type = "item-subgroup", + name = "angels-labs-3", + group = "angels-tech", + order = "z[labs]-a[specialized]-c[mk3]" + }, + { + type = "item-subgroup", + name = "angels-labs-4", + group = "angels-tech", + order = "z[labs]-b[archive]" + }, + -- EQUIPMENT + --{ + -- type = "item-group", + -- name = "angels-enhancement", + -- order = "la[angels]-e[industries]-c", + -- inventory_order = "la[angels]-e[industries]-c", + -- icon_size = 64, + -- icon = "__angelsindustries__/graphics/item-group/vequip.png", + --}, + --{ + -- type = "item-subgroup", + -- name = "angels-equipment-energy", + -- group = "angels-enhancement", + -- order = "a", + --}, + --{ + -- type = "item-subgroup", + -- name = "angels-equipment-movement", + -- group = "angels-enhancement", + -- order = "b", + --}, + --{ + -- type = "item-subgroup", + -- name = "angels-equipment-robo", + -- group = "angels-enhancement", + -- order = "c", + --}, + --{ + -- type = "item-subgroup", + -- name = "angels-equipment-ldef", + -- group = "angels-enhancement", + -- order = "d", + --}, + --{ + -- type = "item-subgroup", + -- name = "angels-equipment-hdef", + -- group = "angels-enhancement", + -- order = "e", + --}, + --{ + -- type = "item-subgroup", + -- name = "angels-equipment-lat", + -- group = "angels-enhancement", + -- order = "f", + --}, + --{ + -- type = "item-subgroup", + -- name = "angels-equipment-hat", + -- group = "angels-enhancement", + -- order = "g", + --}, + -- POWER + { + type = "item-group", + name = "angels-power", + order = "la[angels]-e[industries]-c", + inventory_order = "la[angels]-e[industries]-c", + icons = { + { + icon = "__angelsindustries__/graphics/technology/vequip.png", + icon_size = 128, + scale = 0.5 + }, + { + icon = "__angelsrefining__/graphics/icons/void.png", + icon_size = 32, + scale = 64 / 32 * 0.35, + shift = {20, -20} + } } - } - }, - { - type = "item-subgroup", - name = "angels-power-steam", - group = "angels-power", - order = "a[steam]-a", - }, - { - type = "item-subgroup", - name = "angels-power-solar", - group = "angels-power", - order = "b[solar]-a", - }, - { - type = "item-subgroup", - name = "angels-power-nuclear", - group = "angels-power", - order = "c[nuclear]-a", - }, - { - type = "item-subgroup", - name = "angels-power-nuclear-processing", - group = "angels-power", - order = "d[nuclear-processing]-a", - }, - { - type = "item-subgroup", - name = "angels-power-poles", - group = "angels-power", - order = "e[power-poles]-a", - }, - -- LOGISTICS - { - type = "item-group", - name = "angels-logistics", - order = "la[angels]-e[industries]-d", - inventory_order = "la[angels]-e[industries]-d", - --icon = "__angelsindustries__/graphics/item-group/cargo-roboport-group.png", - --icon_size = 64, - icons = { - { - icon = "__angelsindustries__/graphics/technology/cargo-roboport-tech.png", - icon_size = 128, - scale = 0.5 - }, - { - icon = "__angelsrefining__/graphics/icons/void.png", - icon_size = 32, - scale = 64 / 32 * 0.35, - shift = {20, -20} + }, + { + type = "item-subgroup", + name = "angels-power-steam", + group = "angels-power", + order = "a[steam]-a" + }, + { + type = "item-subgroup", + name = "angels-power-solar", + group = "angels-power", + order = "b[solar]-a" + }, + { + type = "item-subgroup", + name = "angels-power-nuclear", + group = "angels-power", + order = "c[nuclear]-a" + }, + { + type = "item-subgroup", + name = "angels-power-nuclear-processing", + group = "angels-power", + order = "d[nuclear-processing]-a" + }, + { + type = "item-subgroup", + name = "angels-power-poles", + group = "angels-power", + order = "e[power-poles]-a" + }, + -- LOGISTICS + { + type = "item-group", + name = "angels-logistics", + order = "la[angels]-e[industries]-d", + inventory_order = "la[angels]-e[industries]-d", + --icon = "__angelsindustries__/graphics/item-group/cargo-roboport-group.png", + --icon_size = 64, + icons = { + { + icon = "__angelsindustries__/graphics/technology/cargo-roboport-tech.png", + icon_size = 128, + scale = 0.5 + }, + { + icon = "__angelsrefining__/graphics/icons/void.png", + icon_size = 32, + scale = 64 / 32 * 0.35, + shift = {20, -20} + } } - } - }, - { - type = "item-subgroup", - name = "angels-chests-big", - group = "angels-logistics", - order = "ab[chests-big]", - }, - { - type = "item-subgroup", - name = "angels-cargo-ports", - group = "angels-logistics", - order = "bb[carbo-port]-a", - }, - { - type = "item-subgroup", - name = "angels-cargo-expander", - group = "angels-logistics", - order = "bb[carbo-port]-b", - }, - { - type = "item-subgroup", - name = "angels-cargo-bots", - group = "angels-logistics", - order = "cb[bots]", - }, - { - type = "item-subgroup", - name = "angels-vehicles", - group = "angels-logistics", - order = "e", - }, - { - type = "item-subgroup", - name = "angels-crawler-train", - group = "angels-logistics", - order = "fa", - }, - -- VEHICLES - { - type = "item-group", - name = "angels-vehicles", - order = "la[angels]-e[industries]-e", - inventory_order = "la[angels]-e[industries]-e", - icons = { - { - icon = "__angelsindustries__/graphics/technology/crawler-tech.png", - icon_size = 128, - scale = 0.5, - }, - { - icon = "__angelsrefining__/graphics/icons/void.png", - icon_size = 32, - scale = 64 / 32 * 0.35, - shift = {20, -20} + }, + { + type = "item-subgroup", + name = "angels-chests-big", + group = "angels-logistics", + order = "ab[chests-big]" + }, + { + type = "item-subgroup", + name = "angels-cargo-ports", + group = "angels-logistics", + order = "bb[carbo-port]-a" + }, + { + type = "item-subgroup", + name = "angels-cargo-expander", + group = "angels-logistics", + order = "bb[carbo-port]-b" + }, + { + type = "item-subgroup", + name = "angels-cargo-bots", + group = "angels-logistics", + order = "cb[bots]" + }, + { + type = "item-subgroup", + name = "angels-vehicles", + group = "angels-logistics", + order = "e" + }, + -- VEHICLES + { + type = "item-group", + name = "angels-vehicles", + order = "la[angels]-e[industries]-e", + inventory_order = "la[angels]-e[industries]-e", + icons = { + { + icon = "__angelsindustries__/graphics/technology/crawler-tech.png", + icon_size = 128, + scale = 0.5 + }, + { + icon = "__angelsrefining__/graphics/icons/void.png", + icon_size = 32, + scale = 64 / 32 * 0.35, + shift = {20, -20} + } } - } - }, - { - type = "item-subgroup", - name = "angels-vehicle-car", - group = "angels-vehicles", - order = "a" - }, - { - type = "item-subgroup", - name = "angels-vehicle-train-vanilla", - group = "angels-vehicles", - order = "ba[vanilla-train]" - }, - { - type = "item-subgroup", - name = "angels-vehicle-train-crawler", - group = "angels-vehicles", - order = "bb[crawler-train]" -- order bc reserved for smeltingtrain (see addon data-update) - }, -- order bd reserved for petrotrain (see addon data-update) - { - type = "item-subgroup", - name = "angels-vehicle-train-other", - group = "angels-vehicles", - order = "c" - }, - { - 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) - -- WARFARE - { - type = "item-group", - name = "angels-warfare", - order = "la[angels]-f[warfare]-a", - inventory_order = "la[angels]-f[warfare]-a", - icons = { - { - icon = "__base__/graphics/item-group/military.png", - icon_size = 64, - }, - { - icon = "__angelsrefining__/graphics/icons/void.png", - icon_size = 32, - scale = 64 / 32 * 0.35, - shift = {20, -20} + }, + { + type = "item-subgroup", + name = "angels-vehicle-car", + group = "angels-vehicles", + order = "a" + }, + { + type = "item-subgroup", + name = "angels-vehicle-train-vanilla", + group = "angels-vehicles", + order = "ba[vanilla-train]" + }, + { + type = "item-subgroup", + name = "angels-vehicle-train-other", + group = "angels-vehicles", + order = "c" + }, + { + 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) + -- WARFARE + { + type = "item-group", + name = "angels-warfare", + order = "la[angels]-f[warfare]-a", + inventory_order = "la[angels]-f[warfare]-a", + icons = { + { + icon = "__base__/graphics/item-group/military.png", + icon_size = 64 + }, + { + icon = "__angelsrefining__/graphics/icons/void.png", + icon_size = 32, + scale = 64 / 32 * 0.35, + shift = {20, -20} + } } + }, + { + type = "item-subgroup", + name = "angels-warfare-bullet-guns", + group = "angels-warfare", + order = "b[bullets]-a[guns]" -- "b[bullets]-b[projectile]" reserved for "angels-warfare-bullet-projectiles" (see exploration override) + }, -- "b[bullets]-c[bullet]" reserved for "angels-warfare-bullet" (see exploration override) + { + -- "b[bullets]-d[magazine]" reserved for "angels-warfare-bullet-magazine" (see exploration override) + type = "item-subgroup", + name = "angels-warfare-shotgun-guns", + group = "angels-warfare", + order = "c[shotgun]-a[guns]" -- "c[shotgun]-b[shells]" reserved for "angels-warfare-shotgun-shells" (see exploration override) + }, + { + type = "item-subgroup", + name = "angels-warfare-rocket-guns", + group = "angels-warfare", + order = "d[rocket]-a[guns]" -- "d[rocket]-b[warhead]" reserved for "angels-warfare-rocket-warhead" + }, -- "d[rocket]-c[bob-rocket]" reserved for "angels-warfare-bob-rocket" + { + type = "item-subgroup", + name = "angels-warfare-flamethrower-guns", + group = "angels-warfare", + order = "e[flamethrower]-a[guns]" + }, + { + type = "item-subgroup", + name = "angels-warfare-laser-guns", + group = "angels-warfare", + order = "f[laser]-a[guns]" -- "f[laser-rifle]-b[battery]" reserved for "angels-warfare-laser-battery" + }, + { + type = "item-subgroup", + name = "angels-warfare-tank-guns", + group = "angels-warfare", + order = "g[tank]-a[guns]" + }, + { + type = "item-subgroup", + name = "angels-warfare-artillery-guns", + group = "angels-warfare", + order = "h[artillery]-a[guns]" + }, + { + type = "item-subgroup", + name = "angels-warfare-capsules-manual", + group = "angels-warfare", + order = "i[capsules]-a[manual]" + }, + { + type = "item-subgroup", + name = "angels-warfare-wall", + group = "angels-warfare", + order = "j[wall]" } - }, - { - type = "item-subgroup", - name = "angels-warfare-bullet-guns", - group = "angels-warfare", - order = "b[bullets]-a[guns]" -- "b[bullets]-b[projectile]" reserved for "angels-warfare-bullet-projectiles" (see exploration override) - }, -- "b[bullets]-c[bullet]" reserved for "angels-warfare-bullet" (see exploration override) - { -- "b[bullets]-d[magazine]" reserved for "angels-warfare-bullet-magazine" (see exploration override) - type = "item-subgroup", - name = "angels-warfare-shotgun-guns", - group = "angels-warfare", - order = "c[shotgun]-a[guns]" -- "c[shotgun]-b[shells]" reserved for "angels-warfare-shotgun-shells" (see exploration override) - }, - { - type = "item-subgroup", - name = "angels-warfare-rocket-guns", - group = "angels-warfare", - order = "d[rocket]-a[guns]" -- "d[rocket]-b[warhead]" reserved for "angels-warfare-rocket-warhead" - }, -- "d[rocket]-c[bob-rocket]" reserved for "angels-warfare-bob-rocket" - { - type = "item-subgroup", - name = "angels-warfare-flamethrower-guns", - group = "angels-warfare", - order = "e[flamethrower]-a[guns]" - }, - { - type = "item-subgroup", - name = "angels-warfare-laser-guns", - group = "angels-warfare", - order = "f[laser]-a[guns]" -- "f[laser-rifle]-b[battery]" reserved for "angels-warfare-laser-battery" - }, - { - type = "item-subgroup", - name = "angels-warfare-tank-guns", - group = "angels-warfare", - order = "g[tank]-a[guns]" - }, - { - type = "item-subgroup", - name = "angels-warfare-artillery-guns", - group = "angels-warfare", - order = "h[artillery]-a[guns]" - }, - { - type = "item-subgroup", - name = "angels-warfare-capsules-manual", - group = "angels-warfare", - order = "i[capsules]-a[manual]" - }, - { - type = "item-subgroup", - name = "angels-warfare-wall", - group = "angels-warfare", - order = "j[wall]" - }, -} + } ) diff --git a/angelsindustries/prototypes/angels-industries-override.lua b/angelsindustries/prototypes/angels-industries-override.lua index e77b86340..0dc5a55a9 100644 --- a/angelsindustries/prototypes/angels-industries-override.lua +++ b/angelsindustries/prototypes/angels-industries-override.lua @@ -7,20 +7,6 @@ if mods['bobvehicleequipment'] then table.insert(data.raw["equipment-grid"]["angels-crawler"].equipment_categories,"car") table.insert(data.raw["equipment-grid"]["angels-crawler"].equipment_categories,"vehicle") - -- crawler locomotive - table.insert(data.raw["equipment-grid"]["angels-crawler-locomotive"].equipment_categories,"train") - table.insert(data.raw["equipment-grid"]["angels-crawler-locomotive"].equipment_categories,"vehicle") - table.insert(data.raw["equipment-grid"]["angels-crawler-locomotive"].equipment_categories,"locomotive") - table.insert(data.raw["equipment-grid"]["angels-crawler-loco-wagon"].equipment_categories,"train") - table.insert(data.raw["equipment-grid"]["angels-crawler-loco-wagon"].equipment_categories,"vehicle") - table.insert(data.raw["equipment-grid"]["angels-crawler-loco-wagon"].equipment_categories,"locomotive") - -- crawler wagon - table.insert(data.raw["equipment-grid"]["angels-crawler-wagon"].equipment_categories,"train") - table.insert(data.raw["equipment-grid"]["angels-crawler-wagon"].equipment_categories,"vehicle") - -- crawler bot wagon - table.insert(data.raw["equipment-grid"]["angels-crawler-bot-wagon"].equipment_categories,"train") - table.insert(data.raw["equipment-grid"]["angels-crawler-bot-wagon"].equipment_categories,"vehicle") - table.insert(data.raw["equipment-grid"]["angels-crawler-bot-wagon"].equipment_categories,"cargo-wagon") end if angelsmods.industries.overhaul and angelsmods.industries.components then @@ -65,6 +51,7 @@ if angelsmods.industries.overhaul and angelsmods.industries.tech then 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") require("prototypes.overrides.tech-productivity-update") end diff --git a/angelsindustries/prototypes/angels-industries-triggers.lua b/angelsindustries/prototypes/angels-industries-triggers.lua index b3c193904..b62112e88 100644 --- a/angelsindustries/prototypes/angels-industries-triggers.lua +++ b/angelsindustries/prototypes/angels-industries-triggers.lua @@ -22,7 +22,6 @@ if angelsmods.industries.overhaul then --SMELTING TRIGGERS angelsmods.trigger.smelting_products["solder"].wire = true angelsmods.trigger.smelting_products["steel"].plate = true - angelsmods.trigger.smelting_products["steel"].rod = true angelsmods.trigger.smelting_products["aluminium"].plate = true angelsmods.trigger.smelting_products["copper"].plate = true angelsmods.trigger.smelting_products["copper"].wire = true @@ -30,7 +29,6 @@ if angelsmods.industries.overhaul then angelsmods.trigger.smelting_products["gold"].plate = true angelsmods.trigger.smelting_products["gold"].wire = true angelsmods.trigger.smelting_products["iron"].plate = true - angelsmods.trigger.smelting_products["iron"].rod = true angelsmods.trigger.smelting_products["lead"].plate = true angelsmods.trigger.smelting_products["platinum"].wire = true angelsmods.trigger.smelting_products["silicon"].wafer = true @@ -45,4 +43,6 @@ end if angelsmods.industries.components then angelsmods.trigger.smelting_molds = true + angelsmods.trigger.smelting_products["iron"].rod = true + angelsmods.trigger.smelting_products["steel"].rod = true end diff --git a/angelsindustries/prototypes/entities/crawler-train.lua b/angelsindustries/prototypes/entities/crawler-train.lua deleted file mode 100644 index 05da39b01..000000000 --- a/angelsindustries/prototypes/entities/crawler-train.lua +++ /dev/null @@ -1,872 +0,0 @@ -data:extend( - { - { - type = "equipment-grid", - name = "angels-crawler-locomotive", - width = 6, - height = 6, - equipment_categories = {"angels-energy", "angels-heavy-defense", "angels-movement"} - }, - { - type = "equipment-grid", - name = "angels-crawler-loco-wagon", - width = 6, - height = 6, - equipment_categories = {"angels-energy", "angels-heavy-defense", "angels-movement"} - }, - { - type = "equipment-grid", - name = "angels-crawler-wagon", - width = 12, - height = 12, - equipment_categories = {"angels-energy", "angels-repair", "angels-heavy-defense", "angels-movement"} - }, - { - type = "equipment-grid", - name = "angels-crawler-bot-wagon", - width = 12, - height = 12, - equipment_categories = { - "angels-energy", - "angels-repair", - "angels-heavy-defense", - "angels-construction", - "angels-movement" - } - }, - { - type = "item-with-entity-data", - name = "crawler-locomotive", - icon = "__angelsindustries__/graphics/icons/crawler-loco-ico.png", - icon_size = 32, - subgroup = "angels-vehicle-train-crawler", - order = "a[crawler-locomotive]", - place_result = "crawler-locomotive", - stack_size = 5 - }, - { - type = "locomotive", - name = "crawler-locomotive", - icon = "__angelsindustries__/graphics/icons/crawler-loco-ico.png", - icon_size = 32, - flags = {"placeable-neutral", "player-creation", "placeable-off-grid"}, - minable = {mining_time = 1, result = "crawler-locomotive"}, - mined_sound = {filename = "__core__/sound/deconstruct-medium.ogg"}, - max_health = 2500, - corpse = "medium-remnants", - dying_explosion = "medium-explosion", - collision_box = {{-0.6, -2.6}, {0.6, 2.6}}, - selection_box = {{-1, -3}, {1, 3}}, - drawing_box = {{-1, -4}, {1, 3}}, - color = {r = 238, g = 164, b = 61}, - allow_manual_color = true, - weight = 3000, - max_speed = 1.2, - max_power = "800kW", - reversing_power_modifier = 0.6, - braking_force = 15, - friction_force = 0.60, - vertical_selection_shift = -0.5, - air_resistance = 0.0075, -- this is a percentage of current speed that will be subtracted - connection_distance = 3, - joint_distance = 4, - energy_per_hit_point = 5, - equipment_grid = "angels-crawler-loco-wagon", - allow_robot_dispatch_in_automatic_mode = true, - resistances = { - { - type = "fire", - decrease = 15, - percent = 50 - }, - { - type = "physical", - decrease = 15, - percent = 30 - }, - { - type = "impact", - decrease = 50, - percent = 60 - }, - { - type = "explosion", - decrease = 15, - percent = 30 - }, - { - type = "acid", - decrease = 10, - percent = 20 - } - }, - burner = { - fuel_category = "chemical", - effectivity = 1, - fuel_inventory_size = 3, - smoke = { - { - name = "train-smoke", - deviation = {0.3, 0.3}, - frequency = 100, - position = {0, 3}, - starting_frame = 0, - starting_frame_deviation = 60, - height = 2, - height_deviation = 0.5, - starting_vertical_speed = 0.2, - starting_vertical_speed_deviation = 0.1 - } - } - }, - front_light = { - { - type = "oriented", - minimum_darkness = 0.3, - picture = { - filename = "__core__/graphics/light-cone.png", - priority = "medium", - scale = 2, - width = 200, - height = 200 - }, - shift = {-0.6, -16}, - size = 2, - intensity = 0.6 - }, - { - type = "oriented", - minimum_darkness = 0.3, - picture = { - filename = "__core__/graphics/light-cone.png", - priority = "medium", - scale = 2, - width = 200, - height = 200 - }, - shift = {0.6, -16}, - size = 2, - intensity = 0.6 - } - }, - back_light = rolling_stock_back_light(), - stand_by_light = rolling_stock_stand_by_light(), - color = {r = 0.92, g = 0.07, b = 0, a = 0.5}, - pictures = { - priority = "very-low", - width = 256, - height = 256, - direction_count = 128, - filenames = { - "__angelsindustries__/graphics/entity/crawler-train/crawler-loco-1.png", - "__angelsindustries__/graphics/entity/crawler-train/crawler-loco-2.png" - }, - line_length = 8, - lines_per_file = 8, - shift = {0.0, -0.75} - }, - wheels = standard_train_wheels, - rail_category = "regular", - stop_trigger = { - -- left side - { - type = "create-trivial-smoke", - repeat_count = 50, --125 - smoke_name = "smoke-train-stop", - initial_height = 0, - -- smoke goes to the left - speed = {-0.03, 0}, - speed_multiplier = 0.75, - speed_multiplier_deviation = 1.1, - offset_deviation = {{-0.75, -2.7}, {-0.3, -1}} - }, - -- right side - { - type = "create-trivial-smoke", - repeat_count = 50, --125 - smoke_name = "smoke-train-stop", - initial_height = 0, - -- smoke goes to the right - speed = {0.03, 0}, - speed_multiplier = 0.75, - speed_multiplier_deviation = 1.1, - offset_deviation = {{0.3, -2.7}, {0.75, -1}} - }, - { - type = "play-sound", - sound = { - { - filename = "__base__/sound/train-breaks.ogg", - volume = 0.6 - } - } - } - }, - drive_over_tie_trigger = drive_over_tie(), - tie_distance = 50, - vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, - working_sound = { - sound = { - filename = "__base__/sound/train-engine.ogg", - volume = 0.4 - }, - match_speed_to_activity = true - }, - open_sound = {filename = "__base__/sound/car-door-open.ogg", volume = 0.7}, - close_sound = {filename = "__base__/sound/car-door-close.ogg", volume = 0.7}, - sound_minimum_speed = 0.5, - minimap_representation = { - filename = "__base__/graphics/entity/diesel-locomotive/diesel-locomotive-minimap-representation.png", - flags = {"icon"}, - size = {20, 40}, - scale = 0.5 - }, - selected_minimap_representation = { - filename = "__base__/graphics/entity/diesel-locomotive/diesel-locomotive-selected-minimap-representation.png", - flags = {"icon"}, - size = {20, 40}, - scale = 0.5 - } - }, - { - type = "item-with-entity-data", - name = "crawler-locomotive-wagon", - icon = "__angelsindustries__/graphics/icons/crawler-loco-wagon-ico.png", - icon_size = 32, - subgroup = "angels-vehicle-train-crawler", - order = "b[crawler-locomotive-wagon]", - place_result = "crawler-locomotive-wagon", - stack_size = 5 - }, - { - type = "locomotive", - name = "crawler-locomotive-wagon", - icon = "__angelsindustries__/graphics/icons/crawler-loco-wagon-ico.png", - icon_size = 32, - flags = {"placeable-neutral", "player-creation", "placeable-off-grid"}, - minable = {mining_time = 1, result = "crawler-locomotive-wagon"}, - mined_sound = {filename = "__core__/sound/deconstruct-medium.ogg"}, - max_health = 2500, - corpse = "medium-remnants", - dying_explosion = "medium-explosion", - collision_box = {{-0.6, -2.6}, {0.6, 2.6}}, - selection_box = {{-1, -3}, {1, 3}}, - drawing_box = {{-1, -4}, {1, 3}}, - color = {r = 238, g = 164, b = 61}, - allow_manual_color = true, - weight = 3000, - max_speed = 1.2, - max_power = "1000kW", - reversing_power_modifier = 0.6, - braking_force = 20, - friction_force = 0.60, - vertical_selection_shift = -0.5, - air_resistance = 0.0075, -- this is a percentage of current speed that will be subtracted - connection_distance = 3, - joint_distance = 4, - energy_per_hit_point = 5, - equipment_grid = "angels-crawler-loco-wagon", - allow_robot_dispatch_in_automatic_mode = true, - resistances = { - { - type = "fire", - decrease = 15, - percent = 50 - }, - { - type = "physical", - decrease = 15, - percent = 30 - }, - { - type = "impact", - decrease = 50, - percent = 60 - }, - { - type = "explosion", - decrease = 15, - percent = 30 - }, - { - type = "acid", - decrease = 10, - percent = 20 - } - }, - burner = { - fuel_category = "chemical", - effectivity = 1, - fuel_inventory_size = 3, - smoke = { - { - name = "train-smoke", - deviation = {0.3, 0.3}, - frequency = 100, - position = {0, 3}, - starting_frame = 0, - starting_frame_deviation = 60, - height = 2, - height_deviation = 0.5, - starting_vertical_speed = 0.2, - starting_vertical_speed_deviation = 0.1 - }, - { - name = "train-smoke", - deviation = {0.3, 0.3}, - frequency = 100, - position = {0, -3}, - starting_frame = 0, - starting_frame_deviation = 60, - height = 2, - height_deviation = 0.5, - starting_vertical_speed = 0.2, - starting_vertical_speed_deviation = 0.1 - } - } - }, - front_light = { - { - type = "oriented", - minimum_darkness = 0.3, - picture = { - filename = "__core__/graphics/light-cone.png", - priority = "medium", - scale = 2, - width = 200, - height = 200 - }, - shift = {-0.6, -16}, - size = 2, - intensity = 0.6 - }, - { - type = "oriented", - minimum_darkness = 0.3, - picture = { - filename = "__core__/graphics/light-cone.png", - priority = "medium", - scale = 2, - width = 200, - height = 200 - }, - shift = {0.6, -16}, - size = 2, - intensity = 0.6 - } - }, - back_light = rolling_stock_back_light(), - stand_by_light = rolling_stock_stand_by_light(), - color = {r = 0.92, g = 0.07, b = 0, a = 0.5}, - pictures = { - priority = "very-low", - width = 256, - height = 256, - direction_count = 128, - filenames = { - "__angelsindustries__/graphics/entity/crawler-train/crawler-loco-wagon-1.png", - "__angelsindustries__/graphics/entity/crawler-train/crawler-loco-wagon-2.png" - }, - line_length = 8, - lines_per_file = 8, - shift = {0.0, -0.75} - }, - wheels = standard_train_wheels, - rail_category = "regular", - stop_trigger = { - -- front left side - { - type = "create-trivial-smoke", - repeat_count = 50, --125 - smoke_name = "smoke-train-stop", - initial_height = 0, - -- smoke goes to the left - speed = {-0.03, 0}, - speed_multiplier = 0.75, - speed_multiplier_deviation = 1.1, - offset_deviation = {{-0.75, -2.7}, {-0.3, -1}} - }, - -- front right side - { - type = "create-trivial-smoke", - repeat_count = 50, --125 - smoke_name = "smoke-train-stop", - initial_height = 0, - -- smoke goes to the right - speed = {0.03, 0}, - speed_multiplier = 0.75, - speed_multiplier_deviation = 1.1, - offset_deviation = {{0.3, -2.7}, {0.75, -1}} - }, - -- rear left side - { - type = "create-trivial-smoke", - repeat_count = 50, --125 - smoke_name = "smoke-train-stop", - initial_height = 0, - -- smoke goes to the left - speed = {-0.03, 0}, - speed_multiplier = 0.75, - speed_multiplier_deviation = 1.1, - offset_deviation = {{-0.75, 2.7}, {-0.3, 1}} - }, - -- rear right side - { - type = "create-trivial-smoke", - repeat_count = 50, --125 - smoke_name = "smoke-train-stop", - initial_height = 0, - -- smoke goes to the right - speed = {0.03, 0}, - speed_multiplier = 0.75, - speed_multiplier_deviation = 1.1, - offset_deviation = {{0.3, 2.7}, {0.75, 1}} - }, - { - type = "play-sound", - sound = { - { - filename = "__base__/sound/train-breaks.ogg", - volume = 0.6 - } - } - } - }, - drive_over_tie_trigger = drive_over_tie(), - tie_distance = 50, - vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65}, - working_sound = { - sound = { - filename = "__base__/sound/train-engine.ogg", - volume = 0.4 - }, - match_speed_to_activity = true - }, - open_sound = {filename = "__base__/sound/car-door-open.ogg", volume = 0.7}, - close_sound = {filename = "__base__/sound/car-door-close.ogg", volume = 0.7}, - sound_minimum_speed = 0.5, - minimap_representation = { - filename = "__base__/graphics/entity/diesel-locomotive/diesel-locomotive-minimap-representation.png", - flags = {"icon"}, - size = {20, 40}, - scale = 0.5 - }, - selected_minimap_representation = { - filename = "__base__/graphics/entity/diesel-locomotive/diesel-locomotive-selected-minimap-representation.png", - flags = {"icon"}, - size = {20, 40}, - scale = 0.5 - } - }, - { - type = "item-with-entity-data", - name = "crawler-wagon", - icon = "__angelsindustries__/graphics/icons/crawler-wagon-ico.png", - icon_size = 32, - subgroup = "angels-vehicle-train-crawler", - order = "c[crawler-wagon]", - place_result = "crawler-wagon", - stack_size = 5 - }, - { - type = "cargo-wagon", - name = "crawler-wagon", - icon = "__angelsindustries__/graphics/icons/crawler-wagon-ico.png", - icon_size = 32, - flags = {"placeable-neutral", "player-creation", "placeable-off-grid"}, - inventory_size = 64, - minable = {mining_time = 1, result = "crawler-wagon"}, - mined_sound = {filename = "__core__/sound/deconstruct-medium.ogg"}, - max_health = 1000, - corpse = "medium-remnants", - dying_explosion = "medium-explosion", - collision_box = {{-0.6, -2.4}, {0.6, 2.4}}, - selection_box = {{-1, -2.703125}, {1, 3.296875}}, - color = {r = 238, g = 164, b = 61}, - allow_manual_color = true, - vertical_selection_shift = -0.796875, - weight = 1500, - max_speed = 1.5, - braking_force = 3, - friction_force = 0.50, - air_resistance = 0.01, - connection_distance = 3, - joint_distance = 4, - energy_per_hit_point = 5, - equipment_grid = "angels-crawler-wagon", - allow_robot_dispatch_in_automatic_mode = true, - resistances = { - { - type = "fire", - decrease = 15, - percent = 50 - }, - { - type = "physical", - decrease = 15, - percent = 30 - }, - { - type = "impact", - decrease = 50, - percent = 60 - }, - { - type = "explosion", - decrease = 15, - percent = 30 - }, - { - type = "acid", - decrease = 10, - percent = 20 - } - }, - back_light = rolling_stock_back_light(), - stand_by_light = rolling_stock_stand_by_light(), - color = {r = 0.43, g = 0.23, b = 0, a = 0.5}, - pictures = { - priority = "very-low", - width = 256, - height = 256, - --back_equals_front = true, - direction_count = 64, - filenames = { - "__angelsindustries__/graphics/entity/crawler-train/crawler-wagon.png" - }, - line_length = 8, - lines_per_file = 8, - shift = {0, -0.75} - }, - -- horizontal_doors = - -- { - -- layers = - -- { - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-horizontal-end.png", - -- line_length = 1, - -- width = 220, - -- height = 33, - -- frame_count = 8, - -- shift = {0, -0.921875} - -- }, - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-horizontal-side.png", - -- line_length = 1, - -- width = 186, - -- height = 38, - -- frame_count = 8, - -- shift = {0, -0.78125} - -- }, - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-horizontal-side-mask.png", - -- width = 182, - -- height = 35, - -- line_length = 1, - -- frame_count = 8, - -- shift = {0, -0.828125}, - -- apply_runtime_tint = true - -- }, - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-horizontal-top.png", - -- line_length = 1, - -- width = 184, - -- height = 28, - -- frame_count = 8, - -- shift = {0.015625, -1.125} - -- }, - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-horizontal-top-mask.png", - -- width = 185, - -- height = 23, - -- frame_count = 8, - -- line_length = 1, - -- shift = {0.015625, -1.17188}, - -- apply_runtime_tint = true - -- } - -- } - -- }, - -- vertical_doors = - -- { - -- layers = - -- { - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-vertical-end.png", - -- line_length = 8, - -- width = 30, - -- height = 202, - -- frame_count = 8, - -- shift = {0, -0.84375} - -- }, - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-vertical-side.png", - -- line_length = 8, - -- width = 67, - -- height = 169, - -- frame_count = 8, - -- shift = {0.015625, -1.01563} - -- }, - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-vertical-side-mask.png", - -- line_length = 8, - -- width = 56, - -- height = 163, - -- frame_count = 8, - -- shift = {0, -1.10938}, - -- apply_runtime_tint = true - -- }, - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-vertical-top.png", - -- line_length = 8, - -- width = 32, - -- height = 168, - -- frame_count = 8, - -- shift = {0, -1.125} - -- }, - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-vertical-top-mask.png", - -- line_length = 8, - -- width = 32, - -- height = 166, - -- frame_count = 8, - -- shift = {0, -1.15625}, - -- apply_runtime_tint = true - -- } - -- } - -- }, - wheels = standard_train_wheels, - rail_category = "regular", - drive_over_tie_trigger = drive_over_tie(), - tie_distance = 50, - working_sound = { - sound = { - filename = "__base__/sound/train-wheels.ogg", - volume = 0.6 - }, - match_volume_to_activity = true - }, - crash_trigger = crash_trigger(), - open_sound = {filename = "__base__/sound/machine-open.ogg", volume = 0.85}, - close_sound = {filename = "__base__/sound/machine-close.ogg", volume = 0.75}, - sound_minimum_speed = 0.5, - vehicle_impact_sound = {filename = "__base__/sound/car-wood-impact.ogg", volume = 1.0}, - minimap_representation = { - filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-minimap-representation.png", - flags = {"icon"}, - size = {20, 40}, - scale = 0.5 - }, - selected_minimap_representation = { - filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-selected-minimap-representation.png", - flags = {"icon"}, - size = {20, 40}, - scale = 0.5 - } - }, - { - type = "item-with-entity-data", - name = "crawler-bot-wagon", - icon = "__angelsindustries__/graphics/icons/crawler-bot-wagon-ico.png", - icon_size = 32, - subgroup = "angels-vehicle-train-crawler", - order = "d[crawler-bot-wagon]", - place_result = "crawler-bot-wagon", - stack_size = 5 - }, - { - type = "cargo-wagon", - name = "crawler-bot-wagon", - icon = "__angelsindustries__/graphics/icons/crawler-bot-wagon-ico.png", - icon_size = 32, - flags = {"placeable-neutral", "player-creation", "placeable-off-grid"}, - inventory_size = 128, - minable = {mining_time = 1, result = "crawler-bot-wagon"}, - mined_sound = {filename = "__core__/sound/deconstruct-medium.ogg"}, - max_health = 1000, - corpse = "medium-remnants", - dying_explosion = "medium-explosion", - collision_box = {{-0.6, -2.4}, {0.6, 2.4}}, - selection_box = {{-1, -2.703125}, {1, 3.296875}}, - color = {r = 238, g = 164, b = 61}, - allow_manual_color = true, - vertical_selection_shift = -0.796875, - weight = 3000, - max_speed = 1.5, - braking_force = 3, - friction_force = 0.50, - air_resistance = 0.01, - connection_distance = 3, - joint_distance = 4, - energy_per_hit_point = 5, - equipment_grid = "angels-crawler-bot-wagon", - allow_robot_dispatch_in_automatic_mode = true, - resistances = { - { - type = "fire", - decrease = 15, - percent = 50 - }, - { - type = "physical", - decrease = 15, - percent = 30 - }, - { - type = "impact", - decrease = 50, - percent = 60 - }, - { - type = "explosion", - decrease = 15, - percent = 30 - }, - { - type = "acid", - decrease = 10, - percent = 20 - } - }, - back_light = rolling_stock_back_light(), - stand_by_light = rolling_stock_stand_by_light(), - color = {r = 0.43, g = 0.23, b = 0, a = 0.5}, - pictures = { - priority = "very-low", - width = 256, - height = 256, - --back_equals_front = true, - direction_count = 64, - filenames = { - "__angelsindustries__/graphics/entity/crawler-train/crawler-bot-wagon.png" - }, - line_length = 8, - lines_per_file = 8, - shift = {0, -0.75} - }, - -- horizontal_doors = - -- { - -- layers = - -- { - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-horizontal-end.png", - -- line_length = 1, - -- width = 220, - -- height = 33, - -- frame_count = 8, - -- shift = {0, -0.921875} - -- }, - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-horizontal-side.png", - -- line_length = 1, - -- width = 186, - -- height = 38, - -- frame_count = 8, - -- shift = {0, -0.78125} - -- }, - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-horizontal-side-mask.png", - -- width = 182, - -- height = 35, - -- line_length = 1, - -- frame_count = 8, - -- shift = {0, -0.828125}, - -- apply_runtime_tint = true - -- }, - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-horizontal-top.png", - -- line_length = 1, - -- width = 184, - -- height = 28, - -- frame_count = 8, - -- shift = {0.015625, -1.125} - -- }, - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-horizontal-top-mask.png", - -- width = 185, - -- height = 23, - -- frame_count = 8, - -- line_length = 1, - -- shift = {0.015625, -1.17188}, - -- apply_runtime_tint = true - -- } - -- } - -- }, - -- vertical_doors = - -- { - -- layers = - -- { - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-vertical-end.png", - -- line_length = 8, - -- width = 30, - -- height = 202, - -- frame_count = 8, - -- shift = {0, -0.84375} - -- }, - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-vertical-side.png", - -- line_length = 8, - -- width = 67, - -- height = 169, - -- frame_count = 8, - -- shift = {0.015625, -1.01563} - -- }, - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-vertical-side-mask.png", - -- line_length = 8, - -- width = 56, - -- height = 163, - -- frame_count = 8, - -- shift = {0, -1.10938}, - -- apply_runtime_tint = true - -- }, - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-vertical-top.png", - -- line_length = 8, - -- width = 32, - -- height = 168, - -- frame_count = 8, - -- shift = {0, -1.125} - -- }, - -- { - -- filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-door-vertical-top-mask.png", - -- line_length = 8, - -- width = 32, - -- height = 166, - -- frame_count = 8, - -- shift = {0, -1.15625}, - -- apply_runtime_tint = true - -- } - -- } - -- }, - wheels = standard_train_wheels, - rail_category = "regular", - drive_over_tie_trigger = drive_over_tie(), - tie_distance = 50, - working_sound = { - sound = { - filename = "__base__/sound/train-wheels.ogg", - volume = 0.6 - }, - match_volume_to_activity = true - }, - crash_trigger = crash_trigger(), - open_sound = {filename = "__base__/sound/machine-open.ogg", volume = 0.85}, - close_sound = {filename = "__base__/sound/machine-close.ogg", volume = 0.75}, - sound_minimum_speed = 0.5, - vehicle_impact_sound = {filename = "__base__/sound/car-wood-impact.ogg", volume = 1.0}, - minimap_representation = { - filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-minimap-representation.png", - flags = {"icon"}, - size = {20, 40}, - scale = 0.5 - }, - selected_minimap_representation = { - filename = "__base__/graphics/entity/cargo-wagon/cargo-wagon-selected-minimap-representation.png", - flags = {"icon"}, - size = {20, 40}, - scale = 0.5 - } - } - } -) diff --git a/angelsindustries/prototypes/entities/crawler.lua b/angelsindustries/prototypes/entities/crawler.lua index f3d7e439e..4cf4c10db 100644 --- a/angelsindustries/prototypes/entities/crawler.lua +++ b/angelsindustries/prototypes/entities/crawler.lua @@ -329,7 +329,6 @@ data:extend( tank_driving = false, weight = 20000, inventory_size = 768, - --guns = {}, equipment_grid = "angels-crawler" } } diff --git a/angelsindustries/prototypes/overrides/components-base-entity-update.lua b/angelsindustries/prototypes/overrides/components-base-entity-update.lua index 50876c795..3e4754270 100644 --- a/angelsindustries/prototypes/overrides/components-base-entity-update.lua +++ b/angelsindustries/prototypes/overrides/components-base-entity-update.lua @@ -6,10 +6,32 @@ 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 = { + {"block-construction-2", 1} + } + }, + { + name = "small-electric-pole", + ingredients = { + {"wood", 1}, + {"cable-harness-1", 1} + }, + results = { + {"small-electric-pole", 1} }, minable = { results = { - {"block-electronics-0", "block-electronics-1"} + {"wood", 1}, + {"cable-harness-1", 1} } } } @@ -33,3 +55,4 @@ if not (mods["bobassembly"] or mods["bobelectronics"]) then } ) end +OV.add_prereq("automation-2", "angels-components-construction-2") diff --git a/angelsindustries/prototypes/overrides/components-base-recipe-update.lua b/angelsindustries/prototypes/overrides/components-base-recipe-update.lua new file mode 100644 index 000000000..9d6f732d0 --- /dev/null +++ b/angelsindustries/prototypes/overrides/components-base-recipe-update.lua @@ -0,0 +1,5 @@ +local OV = angelsmods.functions.OV + +-- submachine gun +OV.remove_unlock("military", "submachine-gun") +OV.add_unlock("angels-components-weapons-basic", "submachine-gun") diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update.lua index 07030c3d8..e16c120b4 100644 --- a/angelsindustries/prototypes/overrides/components-bobs-entity-update.lua +++ b/angelsindustries/prototypes/overrides/components-bobs-entity-update.lua @@ -18,5 +18,4 @@ if mods["bobassembly"] then } } ) - OV.add_prereq("automation-2", "angels-components-construction-2") end diff --git a/angelsindustries/prototypes/overrides/components-recipe-update.lua b/angelsindustries/prototypes/overrides/components-recipe-update.lua index 24fb0e50c..651021d7c 100644 --- a/angelsindustries/prototypes/overrides/components-recipe-update.lua +++ b/angelsindustries/prototypes/overrides/components-recipe-update.lua @@ -18,9 +18,9 @@ OV.disable_recipe({"processing-unit"}) ------------------------------------------------------------------------------- -- INTERMEDIATES -------------------------------------------------------------- ------------------------------------------------------------------------------- -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-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") @@ -33,3 +33,8 @@ OV.disable_recipe({"engine-unit"}) OV.global_replace_item("electric-engine-unit", "motor-4") angelsmods.functions.add_flag("electric-engine-unit", "hidden") OV.disable_recipe({"electric-engine-unit"}) + +-- custom fixes +OV.execute() +require("prototypes.overrides.components-base-recipe-update") +OV.execute() \ No newline at end of file diff --git a/angelsindustries/prototypes/overrides/global-components-blocks.lua b/angelsindustries/prototypes/overrides/global-components-blocks.lua deleted file mode 100644 index 43da15f01..000000000 --- a/angelsindustries/prototypes/overrides/global-components-blocks.lua +++ /dev/null @@ -1,36 +0,0 @@ -local OV = angelsmods.functions.OV - -if angelsmods.industries.overhaul and angelsmods.industries.components then - -- MODIFY MINABLE RESULTS TO DROP BLOCKS - --[[for _, recipes in pairs(data.raw.recipe) do - if recipes.normal and recipes.normal.ingredients then - for _, subtab in pairs(recipes.normal.ingredients) do - for _, ingredient in pairs(subtab) do - if type(ingredient) == "string" and string.sub(ingredient, 1, 6) == "block-" then - if data.raw["assembling-machine"][recipes.normal.result] then - data.raw["assembling-machine"][recipes.normal.result].minable.results = recipes.normal.ingredients - OV.patch_recipes({{name = recipes.normal.result, energy_required = 0.5}}) - end - if data.raw["furnace"][recipes.normal.result] then - data.raw["furnace"][recipes.normal.result].minable.results = recipes.normal.ingredients - OV.patch_recipes({{name = recipes.normal.result, energy_required = 0.5}}) - end - if data.raw["mining-drill"][recipes.normal.result] then - data.raw["mining-drill"][recipes.normal.result].minable.results = recipes.normal.ingredients - OV.patch_recipes({{name = recipes.normal.result, energy_required = 0.5}}) - end - if data.raw["offshore-pump"][recipes.normal.result] then - data.raw["offshore-pump"][recipes.normal.result].minable.results = recipes.normal.ingredients - OV.patch_recipes({{name = recipes.normal.result, energy_required = 0.5}}) - end - end - end - end - end - end - OV.execute()]] - - -- UPDATE TECH TO ANGELS COMPONENTS - OV.global_replace_technology("engine", "angels-components-mechanical-2") - OV.global_replace_technology("electric-engine", "angels-components-mechanical-4") -end diff --git a/angelsindustries/prototypes/overrides/global-components-recipe.lua b/angelsindustries/prototypes/overrides/global-components-recipe.lua index ab5ea244c..02252d5f9 100644 --- a/angelsindustries/prototypes/overrides/global-components-recipe.lua +++ b/angelsindustries/prototypes/overrides/global-components-recipe.lua @@ -12,7 +12,9 @@ OV.global_replace_item("processing-unit", "circuit-blue-loaded") ------------------------------------------------------------------------------- -- INTERMEDIATES -------------------------------------------------------------- ------------------------------------------------------------------------------- -OV.global_replace_item("iron-stick", "angels-rod-iron") +-- 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") OV.global_replace_item("electric-engine-unit", "motor-4") +OV.global_replace_technology("electric-engine", "angels-components-mechanical-4") diff --git a/angelsindustries/prototypes/overrides/global-tech-base-cores.lua b/angelsindustries/prototypes/overrides/global-tech-base-cores.lua index 4463fd62d..3b74b4a86 100644 --- a/angelsindustries/prototypes/overrides/global-tech-base-cores.lua +++ b/angelsindustries/prototypes/overrides/global-tech-base-cores.lua @@ -89,7 +89,6 @@ core_replace("energy-weapons-damage-7","war","energy") OV.set_science_pack("angels-fluid-control", "datacore-logistic-1", 2) -- INDUSTRIES OV.set_science_pack("angels-crawler", "datacore-logistic-1", 2) -OV.set_science_pack("angels-crawler-train", "datacore-logistic-1", 2) OV.set_science_pack("angels-yellow-loader", "datacore-logistic-1", 2) OV.set_science_pack("angels-red-loader", "datacore-logistic-1", 2) OV.set_science_pack("angels-blue-loader", "datacore-logistic-1", 2) diff --git a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua index b2fe3b519..b3b7f377e 100644 --- a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua +++ b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua @@ -28,8 +28,6 @@ for _,tech_name in pairs({ end OV.remove_prereq("turrets", "military") OV.add_prereq("turrets","angels-components-weapons-basic") -OV.remove_unlock("military", "submachine-gun") -OV.add_unlock("turrets", "submachine-gun") ------------------------------------------------------------------------------- -- RED SCIENCE PACKS ---------------------------------------------------------- diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua index 87e03645e..cef1167ab 100644 --- a/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua +++ b/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua @@ -27,29 +27,33 @@ end -- BOB ASSMBLY ---------------------------------------------------------------- ------------------------------------------------------------------------------- if mods['bobassembly'] then - core_replace("basic-automation","processing","basic") - + --assemblers + if settings.startup["bobmods-assembly-burner"].value == true then + core_replace("basic-automation","processing","basic") + else + core_replace("automation","processing","basic") + end --chemplants if settings.startup["bobmods-assembly-chemicalplants"].value == true then core_replace("chemical-plant-2", "basic", "processing") core_replace("chemical-plant-3", "basic", "processing") end --oil-furnaces (and metal-mixing) - if settings.startup["bobmods-assembly-oilfurnaces"] then + if settings.startup["bobmods-assembly-oilfurnaces"].value then core_replace("oil-steel-furnace","basic","processing") core_replace("oil-mixing-steel-furnace","basic","processing") core_replace("oil-chemical-steel-furnace","basic","processing") end - if settings.startup["bobmods-assembly-multipurposefurnaces"] then + if settings.startup["bobmods-assembly-multipurposefurnaces"].value then core_replace("multi-purpose-furnace-1","basic","processing") end --electrolysers - if settings.startup["bobmods-assembly-electrolysers"] then + if settings.startup["bobmods-assembly-electrolysers"].value then core_replace("electrolyser-2","basic","processing") core_replace("electrolyser-3","basic","processing") end --distillery - if settings.startup["bobmods-assembly-distilleries"] then + if settings.startup["bobmods-assembly-distilleries"].value then core_replace("bob-distillery-2","basic","processing") core_replace("bob-distillery-3","basic","processing") end @@ -117,7 +121,6 @@ end if mods['boblogistics'] then core_replace("logistics-0","logistic","basic") core_replace("logistics","basic","logistic") - core_replace("automation","basic","processing") -- toolbelts core_replace("toolbelt-2","basic","enhance") core_replace("toolbelt-4","basic","enhance") diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua index 362c99ccb..4fbd48a07 100644 --- a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua +++ b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua @@ -25,12 +25,12 @@ end ------------------------------------------------------------------------------- if mods["bobassembly"] then --adds bobassembly stuffs - -- burner assemblers + -- burner assemblers and/ore tier 1 electric if settings.startup["bobmods-assembly-burner"].value == true then pack_replace("basic-automation", "red", "grey") + pack_replace("automation", "grey", "red") end - --higher assembly - pack_replace("automation", "grey", "red") + -- assemblers tier 2+ OV.add_prereq("automation-3", "tech-orange-circuit") pack_replace("automation-4", "blue", "orange") OV.remove_prereq("automation-4", "chemical-science-pack") @@ -40,15 +40,15 @@ if mods["bobassembly"] then if settings.startup["bobmods-assembly-chemicalplants"].value == true then end --oil-furnaces (and metal-mixing) - if settings.startup["bobmods-assembly-oilfurnaces"] then + if settings.startup["bobmods-assembly-oilfurnaces"].value then end - if settings.startup["bobmods-assembly-multipurposefurnaces"] then + if settings.startup["bobmods-assembly-multipurposefurnaces"].value then end --electrolysers - if settings.startup["bobmods-assembly-electrolysers"] then + if settings.startup["bobmods-assembly-electrolysers"].value then end --distillery - if settings.startup["bobmods-assembly-distilleries"] then + if settings.startup["bobmods-assembly-distilleries"].value then pack_replace("bob-distillery-3", "blue", "orange") OV.remove_prereq("bob-distillery-3", "chemical-science-pack") OV.add_prereq("tech-blue-circuit", "bob-distillery-3") diff --git a/angelsindustries/prototypes/overrides/industries-override-functions.lua b/angelsindustries/prototypes/overrides/industries-override-functions.lua index d856971e1..73bc2908b 100644 --- a/angelsindustries/prototypes/overrides/industries-override-functions.lua +++ b/angelsindustries/prototypes/overrides/industries-override-functions.lua @@ -663,8 +663,8 @@ function replace_gen_mats() OV.remove_unlock("electric-engine", "electric-engine-unit") data.raw.recipe["electric-engine-unit"].hidden = true data.raw.item["electric-engine-unit"].hidden = true - OV.global_replace_item("iron-stick", "angels-rod-iron") - data.raw.recipe["iron-stick"].hidden = true + -- OV.global_replace_item("iron-stick", "angels-rod-iron") + -- data.raw.recipe["iron-stick"].hidden = true OV.execute() end diff --git a/angelsindustries/prototypes/recipes/components-electronics-recipes.lua b/angelsindustries/prototypes/recipes/components-electronics-recipes.lua index 8321e3e19..49c945857 100644 --- a/angelsindustries/prototypes/recipes/components-electronics-recipes.lua +++ b/angelsindustries/prototypes/recipes/components-electronics-recipes.lua @@ -258,6 +258,7 @@ data:extend( category = "crafting", subgroup = "angels-board", enabled = "false", + allow_as_intermediate = "false", -- prefer the wood recipe for handcrafing ingredients = { {type="item", name="solid-paper", amount=2}, diff --git a/angelsindustries/prototypes/recipes/components-mechanical-recipes.lua b/angelsindustries/prototypes/recipes/components-mechanical-recipes.lua index 397b60c10..104e43d41 100644 --- a/angelsindustries/prototypes/recipes/components-mechanical-recipes.lua +++ b/angelsindustries/prototypes/recipes/components-mechanical-recipes.lua @@ -1,789 +1,664 @@ data:extend( -{ - ----------------------------------------------------------------------------- - -- MOTOR CASTING ------------------------------------------------------------ - ----------------------------------------------------------------------------- { - type = "recipe", - name = "angels-casing-iron-plate", - category = "crafting", - subgroup = "angels-iron-casting", - energy_required = 0.5, - enabled = "false", - ingredients = - { - {type = "item", name = "angels-plate-iron", amount = 2} - }, - results = - { - {type = "item", name = "motor-casing-1", amount = 1} - }, - icons = - { - { - icon = "__angelsindustries__/graphics/icons/motor-casing-1.png" + ----------------------------------------------------------------------------- + -- MOTOR CASTING ------------------------------------------------------------ + ----------------------------------------------------------------------------- + -- STEP 1: craft a soft material motor by hand to be used in mold making + { + type = "recipe", + name = "angels-casing-iron-plate", + category = "crafting", + subgroup = "angels-iron-casting", + energy_required = 0.5, + enabled = "false", + ingredients = { + {type = "item", name = "angels-plate-iron", amount = 5} }, - { - icon = "__angelssmelting__/graphics/icons/plate-iron.png", - scale = 0.4375, - shift = {-10, -10} + results = { + {type = "item", name = "motor-casing-1", amount = 1} + }, + icons = { + { + icon = "__angelsindustries__/graphics/icons/motor-casing-1.png" + }, + { + icon = "__angelssmelting__/graphics/icons/plate-iron.png", + scale = 0.4375, + shift = {-10, -10} + } + }, + icon_size = 32, + order = "n[motor-casing-1]-a" + } + } +) +--STEP 2 Perishable: Sand baking a negative +--override default smelting recipe +local m_e = data.raw.recipe["mold-expendable"] +m_e.category = "sintering" +m_e.ingredients = { + {type = "item", name = "motor-casing-1", amount = 1}, + {type = "item", name = "solid-sand", amount = 40} +} +m_e.results = { + {type = "item", name = "mold-expendable", amount = 1}, + {type = "item", name = "solid-iron-hydroxide", amount = 3} +} +m_e.icons = { + {icon = "__angelssmelting__/graphics/icons/expendable-mold.png"}, + { + icon = "__angelsindustries__/graphics/icons/motor-casing-1.png", + scale = 0.4375, + shift = {10, -10} + } +} +m_e.localised_name = {"recipe-name.mold", "Expendable"} +--data:extend(m_e) +--STEP 2 Advanced: Clay baking a negative +local m_ne = data.raw.recipe["mold-non-expendable"] +m_ne.category = "sintering" +m_ne.ingredients = { + {type = "item", name = "motor-casing-1", amount = 1}, + {type = "item", name = "solid-clay", amount = 50} +} +m_ne.results = { + {type = "item", name = "mold-non-expendable", amount = 1}, + {type = "item", name = "solid-iron-hydroxide", amount = 4} +} +m_ne.icons = { + {icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png"}, + { + icon = "__angelsindustries__/graphics/icons/motor-casing-1.png", + scale = 0.4375, + shift = {10, -10} + }, + { + icon = "__angelsrefining__/graphics/icons/num_1.png", + tint = {r = 0.8, g = 0.8, b = 0.8, a = 0.5}, + scale = 0.32, + shift = {-12, -12} + } +} +m_ne.localised_name = {"recipe-name.mold", "Reusable"} +--data:extend(m_ne) +--STEP 3 Perishable: use the die +for _, metal in pairs({"iron", "steel", "aluminium", "titanium" --[[,"tungsten"]]}) do --all of the metals in one go + if metal == "iron" then + num = 1 + molten1 = {type = "fluid", name = "liquid-molten-iron", amount = 15} + molten2 = {type = "fluid", name = "liquid-molten-iron", amount = 20} + elseif metal == "steel" then + num = 2 + molten1 = {type = "fluid", name = "liquid-molten-steel", amount = 15} + molten2 = {type = "fluid", name = "liquid-molten-steel", amount = 20} + elseif metal == "aluminium" then + num = 3 + molten1 = {type = "fluid", name = "liquid-molten-aluminium", amount = 15} + molten2 = {type = "fluid", name = "liquid-molten-aluminium", amount = 20} + elseif metal == "titanium" then + num = 4 + molten1 = {type = "fluid", name = "liquid-molten-titanium", amount = 15} + molten2 = {type = "fluid", name = "liquid-molten-titanium", amount = 20} + --[[elseif metal=="tungsten" then + num=5 + molten1={type = "item", name = "casting-powder-tungsten", amount = 3} + molten2={type = "item", name = "casting-powder-tungsten", amount = 20}]] + end + data:extend( + { + { + type = "recipe", + name = "angels-casing-" .. metal .. "-1", + category = "casting", + subgroup = "angels-" .. metal .. "-casting", + localised_name = {"recipe-name.casing", metal, num, "expendable"}, + enabled = "false", + energy_required = 3 * num, + ingredients = { + molten1, + --{type = "fluid", name = "liquid-molten-steel", amount = 15}, + {type = "item", name = "mold-expendable", amount = 1} + }, + results = { + {type = "item", name = "motor-casing-" .. num, amount = 1}, + {type = "item", name = "solid-sand", amount = 10} + }, + icons = { + { + icon = "__angelsindustries__/graphics/icons/motor-casing-" .. num .. ".png" + }, + { + icon = "__angelssmelting__/graphics/icons/expendable-mold.png", + scale = 0.4375, + shift = {-10, -10} + } + }, + icon_size = 32, + order = "n[motor-casing-" .. num .. "]-b" + }, + --STEP 3 Advanced: use the die with coolant + { + type = "recipe", + name = "angels-casing-" .. metal .. "-2", + category = "casting", + subgroup = "angels-" .. metal .. "-casting", + localised_name = {"recipe-name.casing", metal, num, "reusable"}, + enabled = "false", + energy_required = 2 * num, + ingredients = { + molten2, + --{type = "fluid", name = "liquid-molten-steel", amount = 20}, + {type = "item", name = "mold-non-expendable", amount = 1}, + {type = "fluid", name = "liquid-coolant", amount = 10, maximum_temperature = 50} + }, + results = { + {type = "item", name = "motor-casing-" .. num, amount = 2}, + {type = "item", name = "spent-mold-non-expendable", amount = 1, catalyst_amount = 1}, + {type = "fluid", name = "liquid-coolant-used", amount = 10, temperature = 300} + }, + icons = { + { + icon = "__angelsindustries__/graphics/icons/motor-casing-" .. num .. ".png" + }, + { + icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png", + scale = 0.4375, + shift = {-10, -10} + } + }, + icon_size = 32, + order = "n[motor-casing-" .. num .. "]-c" } - }, - icon_size = 32, - order = "n[motor-casing-1]-a" - }, + } + ) +end +--spent-non-expendable mold +data:extend( { - type = "recipe", - name = "angels-casing-iron-1", - category = "casting", - subgroup = "angels-iron-casting", - enabled = "false", - energy_required = 4, - ingredients = - { - {type = "fluid", name = "liquid-molten-iron", amount = 15}, - {type = "item", name = "mold-expendable", amount = 1} - }, - results = - { - {type = "item", name = "motor-casing-1", amount = 1}, - --{type = "item", name = "mold-expendable", amount = 1, catalyst_amount=1} - }, - main_product = "motor-casing-1", - icons = { - { - icon = "__angelsindustries__/graphics/icons/motor-casing-1.png" + type = "item", + name = "spent-mold-non-expendable", + icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png", + icon_size = 32, + subgroup = "angels-mold-casting", + order = "c", + stack_size = 200 + }, + --non-expendable mold washing + { + type = "recipe", + name = "mold-non-expendable-wash", + category = "crafting-with-fluid", + subgroup = "angels-mold-casting", + energy_required = 3, + enabled = "true", + icons = { + { + icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png" + }, + { + icon = "__angelsrefining__/graphics/icons/num_2.png", + tint = {r = 0.8, g = 0.8, b = 0.8, a = 0.5}, + scale = 0.32, + shift = {-12, -12} + } }, - { - icon = "__angelssmelting__/graphics/icons/expendable-mold.png", - scale = 0.4375, - shift = {-10, -10} + icon_size = 32, + ingredients = { + {type = "item", name = "spent-mold-non-expendable", amount = 1}, + {type = "fluid", name = "liquid-nitric-acid", amount = 20} }, - }, - icon_size = 32, - order = "n[motor-casing-1]-b" - }, - { - type = "recipe", - name = "angels-casing-iron-2", - category = "casting", - subgroup = "angels-iron-casting", - enabled = "false", - energy_required = 2, - ingredients = - { - {type = "fluid", name = "liquid-molten-iron", amount = 10}, - {type = "item", name = "mold-non-expendable", amount = 1}, - {type = "fluid", name = "liquid-coolant", amount = 10, maximum_temperature = 50} - }, - results = - { - {type = "item", name = "motor-casing-1", amount = 1}, - {type = "item", name = "mold-non-expendable", amount = 1, probability = 0.80, catalyst_amount=1}, - {type = "fluid", name = "liquid-coolant-used", amount = 10, temperature = 300} - }, - main_product = "motor-casing-1", - icons = - { - { - icon = "__angelsindustries__/graphics/icons/motor-casing-1.png" + results = { + {type = "item", name = "mold-non-expendable", amount = 1, probability = 0.90, catalyst_amount = 1}, + {type = "fluid", name = "water-red-waste", amount = 20} }, - { - icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png", - scale = 0.4375, - shift = {-10, -10} + order = "c" + }, + -- TUNGSTEN MOTORS, keep interesting... + { + type = "recipe", + name = "angels-casing-tungsten-1", + category = "sintering", + subgroup = "angels-tungsten-casting", + enabled = "false", + energy_required = 20, + ingredients = { + {type = "item", name = "casting-powder-tungsten", amount = 3}, + {type = "item", name = "mold-expendable", amount = 1} }, - }, - icon_size = 32, - order = "n[motor-casing-1]-c" - }, - { - type = "recipe", - name = "angels-casing-steel-1", - category = "casting", - subgroup = "angels-steel-casting", - enabled = "false", - energy_required = 6, - ingredients = - { - {type = "fluid", name = "liquid-molten-steel", amount = 15}, - {type = "item", name = "mold-expendable", amount = 1} - }, - results = - { - {type = "item", name = "motor-casing-2", amount = 1}, - --{type = "item", name = "mold-expendable", amount = 1, catalyst_amount=1} - }, - main_product = "motor-casing-2", - icons = - { - { - icon = "__angelsindustries__/graphics/icons/motor-casing-2.png" + results = { + {type = "item", name = "motor-casing-5", amount = 1}, + {type = "item", name = "solid-sand", amount = 10} }, - { - icon = "__angelssmelting__/graphics/icons/expendable-mold.png", - scale = 0.4375, - shift = {-10, -10} + main_product = "motor-casing-5", + icons = { + { + icon = "__angelsindustries__/graphics/icons/motor-casing-5.png" + }, + { + icon = "__angelssmelting__/graphics/icons/expendable-mold.png", + scale = 0.4375, + shift = {-10, -10} + } }, - }, - icon_size = 32, - order = "n[motor-casing-2]-a" - }, - { - type = "recipe", - name = "angels-casing-steel-2", - category = "casting", - subgroup = "angels-steel-casting", - enabled = "false", - energy_required = 3, - ingredients = - { - {type = "fluid", name = "liquid-molten-steel", amount = 10}, - {type = "item", name = "mold-non-expendable", amount = 1}, - {type = "fluid", name = "liquid-coolant", amount = 10, maximum_temperature = 50} - }, - results = - { - {type = "item", name = "motor-casing-2", amount = 1}, - {type = "item", name = "mold-non-expendable", amount = 1, probability = 0.80, catalyst_amount=1}, - {type = "fluid", name = "liquid-coolant-used", amount = 10, temperature = 300} - }, - main_product = "motor-casing-2", - icons = - { - { - icon = "__angelsindustries__/graphics/icons/motor-casing-2.png" + icon_size = 32, + order = "m[motor-casing-5]-ba" + }, + { + type = "recipe", + name = "angels-casing-tungsten-green", + category = "crafting", + subgroup = "angels-tungsten-casting", + enabled = "false", + energy_required = 10, + ingredients = { + {type = "item", name = "casting-powder-tungsten", amount = 2}, + {type = "item", name = "mold-non-expendable", amount = 1} }, - { - icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png", - scale = 0.4375, - shift = {-10, -10} + results = { + {type = "item", name = "motor-casing-5-green", amount = 1}, + {type = "item", name = "spent-mold-non-expendable", amount = 1, probability = 0.90, catalyst_amount = 1} }, - }, - icon_size = 32, - order = "n[motor-casing-2]-b" - }, - { - type = "recipe", - name = "angels-casing-aluminium-1", - category = "casting", - subgroup = "angels-aluminium-casting", - enabled = "false", - energy_required = 8, - ingredients = - { - {type = "fluid", name = "liquid-molten-aluminium", amount = 15}, - {type = "item", name = "mold-expendable", amount = 1} - }, - results = - { - {type = "item", name = "motor-casing-3", amount = 1}, - --{type = "item", name = "mold-expendable", amount = 1, catalyst_amount=1} - }, - main_product = "motor-casing-3", - icons = - { - { - icon = "__angelsindustries__/graphics/icons/motor-casing-3.png" + main_product = "motor-casing-5-green", + icons = { + { + icon = "__angelsindustries__/graphics/icons/motor-casing-5.png", + tint = {r = 0.7, g = 0.7, b = 0.7} + }, + { + icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png", + scale = 0.4375, + shift = {-10, -10} + } }, - { - icon = "__angelssmelting__/graphics/icons/expendable-mold.png", - scale = 0.4375, - shift = {-10, -10} + icon_size = 32, + order = "m[motor-casing-5]-a" + }, + { + type = "recipe", + name = "angels-casing-tungsten-2", + category = "sintering", + subgroup = "angels-tungsten-casting", + enabled = "false", + energy_required = 10, + ingredients = { + {type = "item", name = "motor-casing-5-green", amount = 1} }, - }, - icon_size = 32, - order = "l[motor-casing-3]-a" - }, - { - type = "recipe", - name = "angels-casing-aluminium-2", - category = "casting", - subgroup = "angels-aluminium-casting", - enabled = "false", - energy_required = 4, - ingredients = - { - {type = "fluid", name = "liquid-molten-aluminium", amount = 10}, - {type = "item", name = "mold-non-expendable", amount = 1}, - {type = "fluid", name = "liquid-coolant", amount = 10, maximum_temperature = 50} - }, - results = - { - {type = "item", name = "motor-casing-3", amount = 1}, - {type = "item", name = "mold-non-expendable", amount = 1, probability = 0.80, catalyst_amount=1}, - {type = "fluid", name = "liquid-coolant-used", amount = 10, temperature = 300} - }, - main_product = "motor-casing-3", - icons = - { - { - icon = "__angelsindustries__/graphics/icons/motor-casing-3.png" + results = { + {type = "item", name = "motor-casing-5", amount = 1} }, - { - icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png", - scale = 0.4375, - shift = {-10, -10} + main_product = "motor-casing-5", + icons = { + { + icon = "__angelsindustries__/graphics/icons/motor-casing-5.png" + }, + { + icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png", + scale = 0.4375, + shift = {-10, -10} + } }, - }, - icon_size = 32, - order = "l[motor-casing-3]-b" - }, - { - type = "recipe", - name = "angels-casing-titanium-1", - category = "casting", - subgroup = "angels-titanium-casting", - enabled = "false", - energy_required = 14, - ingredients = - { - {type = "fluid", name = "liquid-molten-titanium", amount = 15}, - {type = "item", name = "mold-expendable", amount = 1} - }, - results = - { - {type = "item", name = "motor-casing-4", amount = 1}, - --{type = "item", name = "mold-expendable", amount = 1, catalyst_amount=1} - }, - main_product = "motor-casing-4", - icons = - { - { - icon = "__angelsindustries__/graphics/icons/motor-casing-4.png" + icon_size = 32, + order = "m[motor-casing-5]-bb" + }, + ----------------------------------------------------------------------------- + -- MOTOR BLOCKS ------------------------------------------------------------- + ----------------------------------------------------------------------------- + { + type = "recipe", + name = "motor-block-1", + enabled = "false", + category = "crafting", + energy_required = 1, -- 1:2 ratio with motor + ingredients = { + {type = "item", name = "motor-casing-1", amount = 1}, + {type = "item", name = "cellulose-fiber", amount = 1} }, - { - icon = "__angelssmelting__/graphics/icons/expendable-mold.png", - scale = 0.4375, - shift = {-10, -10} + results = { + {type = "item", name = "motor-block-1", amount = 1} }, + icon_size = 32 }, - icon_size = 32, - order = "k[motor-casing-4]-a" - }, - { - type = "recipe", - name = "angels-casing-titanium-2", - category = "casting", - subgroup = "angels-titanium-casting", - enabled = "false", - energy_required = 7, - ingredients = - { - {type = "fluid", name = "liquid-molten-titanium", amount = 10}, - {type = "item", name = "mold-non-expendable", amount = 1}, - {type = "fluid", name = "liquid-coolant", amount = 10, maximum_temperature = 50} - }, - results = { - {type = "item", name = "motor-casing-4", amount = 1}, - {type = "item", name = "mold-non-expendable", amount = 1, probability = 0.80, catalyst_amount=1}, - {type = "fluid", name = "liquid-coolant-used", amount = 10, temperature = 300} - }, - main_product = "motor-casing-4", - icons = - { - { - icon = "__angelsindustries__/graphics/icons/motor-casing-4.png" + type = "recipe", + name = "motor-block-2", + enabled = "false", + category = "advanced-crafting", + energy_required = 2, -- 2:3 ratio with motor + ingredients = { + {type = "item", name = "motor-casing-2", amount = 1}, + {type = "item", name = "cellulose-fiber", amount = 1} }, - { - icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png", - scale = 0.4375, - shift = {-10, -10} + results = { + {type = "item", name = "motor-block-2", amount = 1} }, - }, - icon_size = 32, - order = "k[motor-casing-4]-b" - }, - { - type = "recipe", - name = "angels-casing-tungsten-1", - category = "sintering", - subgroup = "angels-tungsten-casting", - enabled = "false", - energy_required = 20, - ingredients = - { - {type = "item", name = "casting-powder-tungsten", amount = 3}, - {type = "item", name = "mold-expendable", amount = 1} - }, - results = - { - {type = "item", name = "motor-casing-5", amount = 1}, - --{type = "item", name = "mold-expendable", amount = 1, catalyst_amount=1} - }, - main_product = "motor-casing-5", - icons = - { - { - icon = "__angelsindustries__/graphics/icons/motor-casing-5.png" + icon_size = 32 + }, + { + type = "recipe", + name = "motor-block-3", + enabled = "false", + category = "advanced-crafting", + energy_required = 3, -- 3:4 ratio with motor + ingredients = { + {type = "item", name = "motor-casing-3", amount = 1}, + {type = "item", name = "solid-rubber", amount = 1} + --{type = "fluid", name = "lubricant", amount = 10} }, - { - icon = "__angelssmelting__/graphics/icons/expendable-mold.png", - scale = 0.4375, - shift = {-10, -10} + results = { + {type = "item", name = "motor-block-3", amount = 1} }, - }, - icon_size = 32, - order = "m[motor-casing-5]-ba" - }, - { - type = "recipe", - name = "angels-casing-tungsten-green", - category = "crafting", - subgroup = "angels-tungsten-casting", - enabled = "false", - energy_required = 10, - ingredients = - { - {type = "item", name = "casting-powder-tungsten", amount = 2}, - {type = "item", name = "mold-non-expendable", amount = 1} - }, - results = - { - {type = "item", name = "motor-casing-5-green", amount = 1}, - {type = "item", name = "mold-non-expendable", amount = 1, probability = 0.80, catalyst_amount=1} - }, - main_product = "motor-casing-5-green", - icons = - { - { - icon = "__angelsindustries__/graphics/icons/motor-casing-5.png", - tint={r=0.7, g=0.7, b=0.7} + icon_size = 32 + }, + { + type = "recipe", + name = "motor-block-4", + enabled = "false", + category = "advanced-crafting", + energy_required = 4, -- 4:7 ratio with motor + ingredients = { + {type = "item", name = "motor-casing-4", amount = 1}, + {type = "item", name = "solid-rubber", amount = 1}, + {type = "fluid", name = "lubricant", amount = 10} }, - { - icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png", - scale = 0.4375, - shift = {-10, -10} + results = { + {type = "item", name = "motor-block-4", amount = 1} }, - }, - icon_size = 32, - order = "m[motor-casing-5]-a" - }, - { - type = "recipe", - name = "angels-casing-tungsten-2", - category = "sintering", - subgroup = "angels-tungsten-casting", - enabled = "false", - energy_required = 10, - ingredients = - { - {type = "item", name = "motor-casing-5-green", amount = 1} - }, - results = - { - {type = "item", name = "motor-casing-5", amount = 1} - }, - main_product = "motor-casing-5", - icons = - { - { - icon = "__angelsindustries__/graphics/icons/motor-casing-5.png" + icon_size = 32 + }, + { + type = "recipe", + name = "motor-block-5", + enabled = "false", + category = "advanced-crafting", + energy_required = 6, -- 3:5 ratio with motor + ingredients = { + {type = "item", name = "motor-casing-5", amount = 1}, + {type = "item", name = "solid-rubber", amount = 1}, + {type = "fluid", name = "lubricant", amount = 15} }, - { - icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png", - scale = 0.4375, - shift = {-10, -10} + results = { + {type = "item", name = "motor-block-5", amount = 1} }, - }, - icon_size = 32, - order = "m[motor-casing-5]-bb" - }, - ----------------------------------------------------------------------------- - -- MOTOR BLOCKS ------------------------------------------------------------- - ----------------------------------------------------------------------------- - { - type = "recipe", - name = "motor-block-1", - enabled = "false", - category = "crafting", - energy_required = 1, -- 1:2 ratio with motor - ingredients = - { - {type = "item", name = "motor-casing-1", amount = 1}, - {type = "item", name = "cellulose-fiber", amount = 1} - }, - results = - { - {type = "item", name = "motor-block-1", amount = 1} - }, - icon_size = 32 - }, - { - type = "recipe", - name = "motor-block-2", - enabled = "false", - category = "advanced-crafting", - energy_required = 2, -- 2:3 ratio with motor - ingredients = - { - {type = "item", name = "motor-casing-2", amount = 1}, - {type = "item", name = "cellulose-fiber", amount = 1} - }, - results = - { - {type = "item", name = "motor-block-2", amount = 1} - }, - icon_size = 32 - }, - { - type = "recipe", - name = "motor-block-3", - enabled = "false", - category = "advanced-crafting", - energy_required = 3, -- 3:4 ratio with motor - ingredients = - { - {type = "item", name = "motor-casing-3", amount = 1}, - {type = "item", name = "solid-rubber", amount = 1}, - --{type = "fluid", name = "lubricant", amount = 10} - }, - results = - { - {type = "item", name = "motor-block-3", amount = 1} - }, - icon_size = 32 - }, - { - type = "recipe", - name = "motor-block-4", - enabled = "false", - category = "advanced-crafting", - energy_required = 4, -- 4:7 ratio with motor - ingredients = - { - {type = "item", name = "motor-casing-4", amount = 1}, - {type = "item", name = "solid-rubber", amount = 1}, - {type = "fluid", name = "lubricant", amount = 10} - }, - results = - { - {type = "item", name = "motor-block-4", amount = 1} - }, - icon_size = 32 - }, - { - type = "recipe", - name = "motor-block-5", - enabled = "false", - category = "advanced-crafting", - energy_required = 6, -- 3:5 ratio with motor - ingredients = - { - {type = "item", name = "motor-casing-5", amount = 1}, - {type = "item", name = "solid-rubber", amount = 1}, - {type = "fluid", name = "lubricant", amount = 15} - }, - results = - { - {type = "item", name = "motor-block-5", amount = 1} - }, - icon_size = 32 - }, - ----------------------------------------------------------------------------- - -- MOTORS ------------------------------------------------------------------- - ----------------------------------------------------------------------------- - { - type = "recipe", - name = "motor-1", - energy_required = 2, - category = "crafting", - enabled = "false", - ingredients = - { - {type = "item", name = "motor-block-1", amount = 1}, - {type = "item", name = "angels-gear", amount = 1} - }, - result = "motor-1", - icon_size = 32 - }, - { - type = "recipe", - name = "motor-2", - energy_required = 3, - category = "advanced-crafting", - enabled = "false", - ingredients = - { - {type = "item", name = "motor-block-2", amount = 1}, - {type = "item", name = "angels-gear", amount = 1}, - {type = "item", name = "angels-axle", amount = 1} - }, - result = "motor-2", - icon_size = 32 - }, - { - type = "recipe", - name = "motor-3", - energy_required = 4, - category = "advanced-crafting", - enabled = "false", - ingredients = - { - {type = "item", name = "motor-block-3", amount = 1}, - {type = "item", name = "angels-gear", amount = 1}, - {type = "item", name = "angels-axle", amount = 1}, - {type = "item", name = "angels-roller-chain", amount = 1} - }, - result = "motor-3", - icon_size = 32 - }, - { - type = "recipe", - name = "motor-4", - energy_required = 7, - category = "advanced-crafting", - enabled = "false", - ingredients = - { - {type = "item", name = "motor-block-4", amount = 1}, - {type = "item", name = "angels-gear", amount = 1}, - {type = "item", name = "angels-axle", amount = 1}, - {type = "item", name = "angels-roller-chain", amount = 1}, - {type = "item", name = "angels-spring", amount = 1} - }, - result = "motor-4", - icon_size = 32 - }, - { - type = "recipe", - name = "motor-5", - energy_required = 10, - category = "advanced-crafting", - enabled = "false", - ingredients = - { - {type = "item", name = "motor-block-5", amount = 1}, - {type = "item", name = "angels-gear", amount = 1}, - {type = "item", name = "angels-axle", amount = 1}, - {type = "item", name = "angels-roller-chain", amount = 1}, - {type = "item", name = "angels-spring", amount = 1}, - {type = "item", name = "angels-bearing", amount = 1} - }, - result = "motor-5", - icon_size = 32 - }, - ----------------------------------------------------------------------------- - -- MECHANICAL SUBCOMPONENTS ------------------------------------------------- - ----------------------------------------------------------------------------- - { - type = "recipe", - name = "angels-gear", - energy_required = 1, - category = "crafting", - enabled = "true", -- enabled from the start - ingredients = - { - {type = "item", name = "angels-rod-iron", amount = 1} - }, - results = - { - {type = "item", name = "angels-gear", amount = 2} - }, - icon_size = 32 - }, - { - type = "recipe", - name = "angels-axle", - energy_required = 1, - category = "advanced-crafting", - enabled = "false", - ingredients = - { - {type = "item", name = "angels-rod-steel", amount = 1} - }, - result = "angels-axle", - icon_size = 32 - }, - { - type = "recipe", - name = "angels-roller-chain", - energy_required = 1.5, - category = "advanced-crafting", - enabled = "false", - ingredients = - { - {type = "item", name = "angels-plate-aluminium", amount = 1} - }, - result = "angels-roller-chain", - icon_size = 32 - }, - { - type = "recipe", - name = "angels-spring", - energy_required = 2, - category = "advanced-crafting", - enabled = "false", - ingredients = - { - {type = "item", name = "angels-plate-titanium", amount = 1} - }, - result = "angels-spring", - icon_size = 32 - }, - { - type = "recipe", - name = "angels-bearing", - energy_required = 2.5, - category = "advanced-crafting", - enabled = "false", - ingredients = - { - {type = "item", name = "angels-plate-tungsten", amount = 1}, - {type = "item", name = "steel-plate", amount = 1}, - {type = "fluid", name = "lubricant", amount = 1} - }, - result = "angels-bearing", - icon_size = 32 - }, - ----------------------------------------------------------------------------- - -- MECHANICAL COMPONENTS ---------------------------------------------------- - ----------------------------------------------------------------------------- - { - type = "recipe", - name = "mechanical-parts-gear", - subgroup = "angels-mechanical-parts", - order = "f", - energy_required = 3, - category = "crafting", - enabled = "true", -- enabled from the start - ingredients = - { - {type = "item", name = "angels-gear", amount = 2} - }, - results = - { - {type = "item", name = "mechanical-parts", amount = 2} - }, - icons = - { - { - icon = "__angelsindustries__/graphics/icons/mechanical-parts.png" + icon_size = 32 + }, + ----------------------------------------------------------------------------- + -- MOTORS ------------------------------------------------------------------- + ----------------------------------------------------------------------------- + { + type = "recipe", + name = "motor-1", + energy_required = 2, + category = "crafting", + enabled = "false", + ingredients = { + {type = "item", name = "motor-block-1", amount = 1}, + {type = "item", name = "angels-gear", amount = 1} }, - { - icon = "__angelsindustries__/graphics/icons/gear.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32 - }, - { - type = "recipe", - name = "mechanical-parts-axle", - subgroup = "angels-mechanical-parts", - order = "g", - energy_required = 3, - category = "advanced-crafting", - enabled = "false", - ingredients = - { - {type = "item", name = "angels-axle", amount = 2} - }, - results = - { - {type = "item", name = "mechanical-parts", amount = 3} - }, - icons = - { - { - icon = "__angelsindustries__/graphics/icons/mechanical-parts.png" + result = "motor-1", + icon_size = 32 + }, + { + type = "recipe", + name = "motor-2", + energy_required = 3, + category = "advanced-crafting", + enabled = "false", + ingredients = { + {type = "item", name = "motor-block-2", amount = 1}, + {type = "item", name = "angels-gear", amount = 1}, + {type = "item", name = "angels-axle", amount = 1} }, - { - icon = "__angelsindustries__/graphics/icons/axle.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32 - }, - { - type = "recipe", - name = "mechanical-parts-roller-chain", - subgroup = "angels-mechanical-parts", - order = "h", - energy_required = 3, - category = "advanced-crafting", - enabled = "false", - ingredients = - { - {type = "item", name = "angels-roller-chain", amount = 2} - }, - results = - { - {type = "item", name = "mechanical-parts", amount = 4} - }, - icons = - { - { - icon = "__angelsindustries__/graphics/icons/mechanical-parts.png" + result = "motor-2", + icon_size = 32 + }, + { + type = "recipe", + name = "motor-3", + energy_required = 4, + category = "advanced-crafting", + enabled = "false", + ingredients = { + {type = "item", name = "motor-block-3", amount = 1}, + {type = "item", name = "angels-gear", amount = 1}, + {type = "item", name = "angels-axle", amount = 1}, + {type = "item", name = "angels-roller-chain", amount = 1} }, - { - icon = "__angelsindustries__/graphics/icons/roller-chain.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32 - }, - { - type = "recipe", - name = "mechanical-parts-spring", - subgroup = "angels-mechanical-parts", - order = "i", - energy_required = 3, - category = "advanced-crafting", - enabled = "false", - ingredients = - { - {type = "item", name = "angels-spring", amount = 2} - }, - results = - { - {type = "item", name = "mechanical-parts", amount = 5} - }, - icons = - { - { - icon = "__angelsindustries__/graphics/icons/mechanical-parts.png" + result = "motor-3", + icon_size = 32 + }, + { + type = "recipe", + name = "motor-4", + energy_required = 7, + category = "advanced-crafting", + enabled = "false", + ingredients = { + {type = "item", name = "motor-block-4", amount = 1}, + {type = "item", name = "angels-gear", amount = 1}, + {type = "item", name = "angels-axle", amount = 1}, + {type = "item", name = "angels-roller-chain", amount = 1}, + {type = "item", name = "angels-spring", amount = 1} }, - { - icon = "__angelsindustries__/graphics/icons/spring.png", - scale = 0.4375, - shift = {-10, -10} - } + result = "motor-4", + icon_size = 32 + }, + { + type = "recipe", + name = "motor-5", + energy_required = 10, + category = "advanced-crafting", + enabled = "false", + ingredients = { + {type = "item", name = "motor-block-5", amount = 1}, + {type = "item", name = "angels-gear", amount = 1}, + {type = "item", name = "angels-axle", amount = 1}, + {type = "item", name = "angels-roller-chain", amount = 1}, + {type = "item", name = "angels-spring", amount = 1}, + {type = "item", name = "angels-bearing", amount = 1} + }, + result = "motor-5", + icon_size = 32 + }, + ----------------------------------------------------------------------------- + -- MECHANICAL SUBCOMPONENTS ------------------------------------------------- + ----------------------------------------------------------------------------- + { + type = "recipe", + name = "angels-gear", + energy_required = 1, + category = "crafting", + enabled = "true", -- enabled from the start + ingredients = { + {type = "item", name = "angels-rod-iron", amount = 1} + }, + results = { + {type = "item", name = "angels-gear", amount = 2} + }, + icon_size = 32 }, - icon_size = 32 - }, - { - type = "recipe", - name = "mechanical-parts-bearing", - subgroup = "angels-mechanical-parts", - order = "j", - energy_required = 3, - category = "advanced-crafting", - enabled = "false", - ingredients = { - {type = "item", name = "angels-bearing", amount = 2} + type = "recipe", + name = "angels-axle", + energy_required = 1, + category = "advanced-crafting", + enabled = "false", + ingredients = { + {type = "item", name = "angels-rod-steel", amount = 1} + }, + result = "angels-axle", + icon_size = 32 }, - results = { - {type = "item", name = "mechanical-parts", amount = 6} + type = "recipe", + name = "angels-roller-chain", + energy_required = 1.5, + category = "advanced-crafting", + enabled = "false", + ingredients = { + {type = "item", name = "angels-plate-aluminium", amount = 1} + }, + result = "angels-roller-chain", + icon_size = 32 }, - icons = { - { - icon = "__angelsindustries__/graphics/icons/mechanical-parts.png" + type = "recipe", + name = "angels-spring", + energy_required = 2, + category = "advanced-crafting", + enabled = "false", + ingredients = { + {type = "item", name = "angels-plate-titanium", amount = 1} }, - { - icon = "__angelsindustries__/graphics/icons/bearing.png", - scale = 0.4375, - shift = {-10, -10} - } - }, - icon_size = 32 - }, -}) + result = "angels-spring", + icon_size = 32 + }, + { + type = "recipe", + name = "angels-bearing", + energy_required = 2.5, + category = "advanced-crafting", + enabled = "false", + ingredients = { + {type = "item", name = "angels-plate-tungsten", amount = 1}, + {type = "item", name = "steel-plate", amount = 1}, + {type = "fluid", name = "lubricant", amount = 1} + }, + result = "angels-bearing", + icon_size = 32 + }, + ----------------------------------------------------------------------------- + -- MECHANICAL COMPONENTS ---------------------------------------------------- + ----------------------------------------------------------------------------- + { + type = "recipe", + name = "mechanical-parts-gear", + subgroup = "angels-mechanical-parts", + order = "f", + energy_required = 3, + category = "crafting", + enabled = "true", -- enabled from the start + ingredients = { + {type = "item", name = "angels-gear", amount = 2} + }, + results = { + {type = "item", name = "mechanical-parts", amount = 2} + }, + icons = { + { + icon = "__angelsindustries__/graphics/icons/mechanical-parts.png" + }, + { + icon = "__angelsindustries__/graphics/icons/gear.png", + scale = 0.4375, + shift = {-10, -10} + } + }, + icon_size = 32 + }, + { + type = "recipe", + name = "mechanical-parts-axle", + subgroup = "angels-mechanical-parts", + order = "g", + energy_required = 3, + category = "advanced-crafting", + enabled = "false", + ingredients = { + {type = "item", name = "angels-axle", amount = 2} + }, + results = { + {type = "item", name = "mechanical-parts", amount = 3} + }, + icons = { + { + icon = "__angelsindustries__/graphics/icons/mechanical-parts.png" + }, + { + icon = "__angelsindustries__/graphics/icons/axle.png", + scale = 0.4375, + shift = {-10, -10} + } + }, + icon_size = 32 + }, + { + type = "recipe", + name = "mechanical-parts-roller-chain", + subgroup = "angels-mechanical-parts", + order = "h", + energy_required = 3, + category = "advanced-crafting", + enabled = "false", + ingredients = { + {type = "item", name = "angels-roller-chain", amount = 2} + }, + results = { + {type = "item", name = "mechanical-parts", amount = 4} + }, + icons = { + { + icon = "__angelsindustries__/graphics/icons/mechanical-parts.png" + }, + { + icon = "__angelsindustries__/graphics/icons/roller-chain.png", + scale = 0.4375, + shift = {-10, -10} + } + }, + icon_size = 32 + }, + { + type = "recipe", + name = "mechanical-parts-spring", + subgroup = "angels-mechanical-parts", + order = "i", + energy_required = 3, + category = "advanced-crafting", + enabled = "false", + ingredients = { + {type = "item", name = "angels-spring", amount = 2} + }, + results = { + {type = "item", name = "mechanical-parts", amount = 5} + }, + icons = { + { + icon = "__angelsindustries__/graphics/icons/mechanical-parts.png" + }, + { + icon = "__angelsindustries__/graphics/icons/spring.png", + scale = 0.4375, + shift = {-10, -10} + } + }, + icon_size = 32 + }, + { + type = "recipe", + name = "mechanical-parts-bearing", + subgroup = "angels-mechanical-parts", + order = "j", + energy_required = 3, + category = "advanced-crafting", + enabled = "false", + ingredients = { + {type = "item", name = "angels-bearing", amount = 2} + }, + results = { + {type = "item", name = "mechanical-parts", amount = 6} + }, + icons = { + { + icon = "__angelsindustries__/graphics/icons/mechanical-parts.png" + }, + { + icon = "__angelsindustries__/graphics/icons/bearing.png", + scale = 0.4375, + shift = {-10, -10} + } + }, + icon_size = 32 + } + } +) diff --git a/angelsindustries/prototypes/recipes/vehicles-recipe.lua b/angelsindustries/prototypes/recipes/vehicles-recipe.lua index 2d3627783..cd35f453f 100644 --- a/angelsindustries/prototypes/recipes/vehicles-recipe.lua +++ b/angelsindustries/prototypes/recipes/vehicles-recipe.lua @@ -5,7 +5,7 @@ data:extend( type = "recipe", name = "angels-crawler", energy_required = 10, - enabled = "false", + enabled = false, ingredients = { {"engine-unit", 20}, {"steel-plate", 75}, @@ -14,62 +14,6 @@ data:extend( }, result = "angels-crawler", icon_size = 32 - }, - --TRAINS - { - type = "recipe", - name = "crawler-locomotive", - energy_required = 10, - enabled = "false", - ingredients = { - {"engine-unit", 20}, - {"steel-plate", 75}, - {"electronic-circuit", 20}, - {"iron-gear-wheel", 25} - }, - result = "crawler-locomotive", - icon_size = 32 - }, - { - type = "recipe", - name = "crawler-locomotive-wagon", - energy_required = 10, - enabled = "false", - ingredients = { - {"engine-unit", 20}, - {"steel-plate", 75}, - {"electronic-circuit", 20}, - {"iron-gear-wheel", 25} - }, - result = "crawler-locomotive-wagon", - icon_size = 32 - }, - { - type = "recipe", - name = "crawler-wagon", - energy_required = 10, - enabled = "false", - ingredients = { - {"steel-plate", 50}, - {"iron-plate", 30}, - {"iron-gear-wheel", 25} - }, - result = "crawler-wagon", - icon_size = 32 - }, - { - type = "recipe", - name = "crawler-bot-wagon", - energy_required = 10, - enabled = "false", - ingredients = { - {"steel-plate", 75}, - {"iron-plate", 50}, - {"electronic-circuit", 20}, - {"iron-gear-wheel", 25} - }, - result = "crawler-bot-wagon", - icon_size = 32 } } ) diff --git a/angelsindustries/prototypes/technology/logistics-technology.lua b/angelsindustries/prototypes/technology/logistics-technology.lua index 00832ea97..d1da996fb 100644 --- a/angelsindustries/prototypes/technology/logistics-technology.lua +++ b/angelsindustries/prototypes/technology/logistics-technology.lua @@ -1,242 +1,189 @@ data:extend( -{ - { - type = "technology", - name = "cargo-robots", - icon = "__angelsindustries__/graphics/technology/robot-tech.png", - icon_size = 128, - prerequisites = - { - "engine", - }, - effects = - { - { - type = "unlock-recipe", - recipe = "cargo-box" - }, - { - type = "unlock-recipe", - recipe = "cargo-robot" - }, - { - type = "unlock-recipe", - recipe = "angels-construction-robot" - }, - { - type = "unlock-recipe", - recipe = "angels-construction-zone-expander" - }, - { - type = "unlock-recipe", - recipe = "angels-zone-expander" - }, - { - type = "unlock-recipe", - recipe = "angels-relay-station" - }, - { - type = "unlock-recipe", - recipe = "angels-big-chest" - }, - { - type = "unlock-recipe", - recipe = "angels-logistic-chest-requester" - }, - { - type = "unlock-recipe", - recipe = "angels-logistic-chest-passive-provider" - }, - }, - unit = - { - count = 50, - ingredients = { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1} - }, - time = 30 - }, - order = "c-a" - }, - { - type = "technology", - name = "cargo-robots-2", - icon = "__angelsindustries__/graphics/technology/robot-tech.png", - icon_size = 128, - prerequisites = - { - "cargo-robots", - }, - effects = - { - { - type = "unlock-recipe", - recipe = "cargo-hub" - }, - { - type = "unlock-recipe", - recipe = "angels-zone-expander-2" - }, - { - type = "unlock-recipe", - recipe = "angels-relay-station-2" - }, - { - type = "unlock-recipe", - recipe = "angels-construction-zone-expander-2" - }, - { - type = "unlock-recipe", - recipe = "angels-logistic-chest-storage" - }, - { - type = "unlock-recipe", - recipe = "angels-logistic-chest-active-provider" - }, - { - type = "unlock-recipe", - recipe = "angels-logistic-chest-buffer" - }, - }, - unit = - { - count = 100, - ingredients = { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1} - }, - time = 30 - }, - order = "c-a" - }, - { - type = "technology", - name = "cargo-robots-3", - icon = "__angelsindustries__/graphics/technology/robot-tech.png", - icon_size = 128, - prerequisites = - { - "cargo-robots-2", - }, - effects = - { - { - type = "unlock-recipe", - recipe = "angels-charging-station" - }, - { - type = "unlock-recipe", - recipe = "cargo-robot-2" - }, - - }, - unit = - { - count = 100, - ingredients = { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1} - }, - time = 30 - }, - order = "c-a" - }, ---VEHICLES - { - type = "technology", - name = "angels-crawler", - icon = "__angelsindustries__/graphics/technology/crawler-tech.png", - icon_size = 128, - prerequisites = - { - "angels-vequipment-1", - }, - effects = - { - { - type = "unlock-recipe", - recipe = "angels-crawler" - }, - { - type = "unlock-recipe", - recipe = "angels-construction-roboport-vequip" - }, - }, - unit = - { - count = 60, - ingredients = { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1}, - }, - time = 15 - }, - order = "c-a" - }, - { - type = "technology", - name = "angels-crawler-train", - icon = "__angelsindustries__/graphics/technology/crawler-loco-tech.png", - icon_size = 128, - prerequisites = - { - "angels-crawler", - "railway", - }, - effects = - { - { - type = "unlock-recipe", - recipe = "crawler-locomotive" - }, - { - type = "unlock-recipe", - recipe = "crawler-locomotive-wagon" - }, - { - type = "unlock-recipe", - recipe = "crawler-wagon" - }, - { - type = "unlock-recipe", - recipe = "crawler-bot-wagon" - }, - }, - unit = - { - count = 60, - ingredients = { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1}, - }, - time = 15 - }, - order = "c-a" - }, ---LOADERS + { + { + type = "technology", + name = "cargo-robots", + icon = "__angelsindustries__/graphics/technology/robot-tech.png", + icon_size = 128, + prerequisites = { + "engine" + }, + effects = { + { + type = "unlock-recipe", + recipe = "cargo-box" + }, + { + type = "unlock-recipe", + recipe = "cargo-robot" + }, + { + type = "unlock-recipe", + recipe = "angels-construction-robot" + }, + { + type = "unlock-recipe", + recipe = "angels-construction-zone-expander" + }, + { + type = "unlock-recipe", + recipe = "angels-zone-expander" + }, + { + type = "unlock-recipe", + recipe = "angels-relay-station" + }, + { + type = "unlock-recipe", + recipe = "angels-big-chest" + }, + { + type = "unlock-recipe", + recipe = "angels-logistic-chest-requester" + }, + { + type = "unlock-recipe", + recipe = "angels-logistic-chest-passive-provider" + } + }, + unit = { + count = 50, + ingredients = { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1} + }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "cargo-robots-2", + icon = "__angelsindustries__/graphics/technology/robot-tech.png", + icon_size = 128, + prerequisites = { + "cargo-robots" + }, + effects = { + { + type = "unlock-recipe", + recipe = "cargo-hub" + }, + { + type = "unlock-recipe", + recipe = "angels-zone-expander-2" + }, + { + type = "unlock-recipe", + recipe = "angels-relay-station-2" + }, + { + type = "unlock-recipe", + recipe = "angels-construction-zone-expander-2" + }, + { + type = "unlock-recipe", + recipe = "angels-logistic-chest-storage" + }, + { + type = "unlock-recipe", + recipe = "angels-logistic-chest-active-provider" + }, + { + type = "unlock-recipe", + recipe = "angels-logistic-chest-buffer" + } + }, + unit = { + count = 100, + ingredients = { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1} + }, + time = 30 + }, + order = "c-a" + }, + { + type = "technology", + name = "cargo-robots-3", + icon = "__angelsindustries__/graphics/technology/robot-tech.png", + icon_size = 128, + prerequisites = { + "cargo-robots-2" + }, + effects = { + { + type = "unlock-recipe", + recipe = "angels-charging-station" + }, + { + type = "unlock-recipe", + recipe = "cargo-robot-2" + } + }, + unit = { + count = 100, + ingredients = { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1} + }, + time = 30 + }, + order = "c-a" + }, + --VEHICLES + { + type = "technology", + name = "angels-crawler", + icon = "__angelsindustries__/graphics/technology/crawler-tech.png", + icon_size = 128, + prerequisites = { + "angels-vequipment-1" + }, + effects = { + { + type = "unlock-recipe", + recipe = "angels-crawler" + }, + { + type = "unlock-recipe", + recipe = "angels-construction-roboport-vequip" + } + }, + unit = { + count = 60, + ingredients = { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1} + }, + time = 15 + }, + order = "c-a" + }, + --LOADERS -- { -- type = "technology", -- name = "angels-yellow-loader", -- icon = "__angelsindustries__/graphics/technology/yellow-loader-tech.png", - -- icon_size = 128, - -- prerequisites = + -- icon_size = 128, + -- prerequisites = -- { -- }, -- effects = -- { - -- { - -- type = "unlock-recipe", - -- recipe = "loader" - -- }, + -- { + -- type = "unlock-recipe", + -- recipe = "loader" + -- }, -- }, -- unit = -- { - -- count = 60, - -- ingredients = { - -- {"automation-science-pack", 1}, - -- }, - -- time = 15 + -- count = 60, + -- ingredients = { + -- {"automation-science-pack", 1}, + -- }, + -- time = 15 -- }, -- order = "c-a" -- }, @@ -244,25 +191,25 @@ data:extend( -- type = "technology", -- name = "angels-red-loader", -- icon = "__angelsindustries__/graphics/technology/red-loader-tech.png", - -- icon_size = 128, - -- prerequisites = + -- icon_size = 128, + -- prerequisites = -- { -- }, -- effects = -- { - -- { - -- type = "unlock-recipe", - -- recipe = "fast-loader" - -- }, + -- { + -- type = "unlock-recipe", + -- recipe = "fast-loader" + -- }, -- }, -- unit = -- { - -- count = 60, - -- ingredients = { - -- {"automation-science-pack", 1}, - -- {"logistic-science-pack", 1}, - -- }, - -- time = 15 + -- count = 60, + -- ingredients = { + -- {"automation-science-pack", 1}, + -- {"logistic-science-pack", 1}, + -- }, + -- time = 15 -- }, -- order = "c-a" -- }, @@ -270,30 +217,28 @@ data:extend( -- type = "technology", -- name = "angels-blue-loader", -- icon = "__angelsindustries__/graphics/technology/blue-loader-tech.png", - -- icon_size = 128, - -- prerequisites = + -- icon_size = 128, + -- prerequisites = -- { -- }, -- effects = -- { - -- { - -- type = "unlock-recipe", - -- recipe = "express-loader" - -- }, + -- { + -- type = "unlock-recipe", + -- recipe = "express-loader" + -- }, -- }, -- unit = -- { - -- count = 60, - -- ingredients = { - -- {"automation-science-pack", 1}, - -- {"logistic-science-pack", 1}, - -- {"chemical-science-pack", 1}, - -- }, - -- time = 15 + -- count = 60, + -- ingredients = { + -- {"automation-science-pack", 1}, + -- {"logistic-science-pack", 1}, + -- {"chemical-science-pack", 1}, + -- }, + -- time = 15 -- }, -- order = "c-a" -- }, -} + } ) - - diff --git a/angelspetrochem/changelog.txt b/angelspetrochem/changelog.txt index 1147da0d8..60979728e 100644 --- a/angelspetrochem/changelog.txt +++ b/angelspetrochem/changelog.txt @@ -1,6 +1,19 @@ --------------------------------------------------------------------------------------------------- +Version: 0.9.6 +Date: 02.04.2020 + Changes: + - Excluded Chemical Plant recipe from marathon mode when it is required for science packs + - Remove tech for electrolyser/chem plant 2+ when its disabled #132 + Bugfixes: + - Fixed oil refinery didn't have fast_replaceable_group set + - Fixed crash when bob pure water was disabled + - Fixed missing localisation for heavy water seperation recipes + - Fixed failed attempt (in 0.9.5) on re-enabling rocket-fuel on existing saves + - Fixed higher tier boilers required multiple of the previous tier with ingredient multiplier + - Fixed startup error with bobrevamp and missing bobplates +--------------------------------------------------------------------------------------------------- Version: 0.9.5 -Date: 24-03-2020 +Date: 24.03.2020 Changes: - Make buildings upgradeable #119 Bugfixes: @@ -8,7 +21,7 @@ Date: 24-03-2020 - Re-enable rocket-fuel on existing saves. --------------------------------------------------------------------------------------------------- Version: 0.9.4 -Date: 20-03-2020 +Date: 20.03.2020 Changes: - Chemical recipes now always show the result products for lookup convenience - Added high resolution gas and liquid icons, including higher resolution molecules diff --git a/angelspetrochem/info.json b/angelspetrochem/info.json index 1f8d2ad8c..de220e3bd 100644 --- a/angelspetrochem/info.json +++ b/angelspetrochem/info.json @@ -1,6 +1,6 @@ { "name": "angelspetrochem", - "version": "0.9.5", + "version": "0.9.6", "factorio_version": "0.18", "title": "Angel's Petro Chemical Processing", "author": "Arch666Angel", @@ -9,7 +9,7 @@ "description": "PetroChems changes and adds Oil and Gas processing to a bobmods game, as well as a more complex web of chemical producation. Includes overrides and tie ins to bobs technologies and recipes. Depedencies: Angels Refining", "dependencies": [ "base >= 0.18.0", - "angelsrefining >= 0.11.5", + "angelsrefining >= 0.11.8", "? bobplates >= 0.15.0", "? bobassembly >= 0.15.0", "? bobrevamp >= 0.18.0" diff --git a/angelspetrochem/locale/en/petrochem.cfg b/angelspetrochem/locale/en/petrochem.cfg index 52cd73582..d3724f6bd 100644 --- a/angelspetrochem/locale/en/petrochem.cfg +++ b/angelspetrochem/locale/en/petrochem.cfg @@ -158,8 +158,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 Seperation angels-heavy-water-cooling=Heavy Water Cooling -angels-water-heavy-separation=Heavy Water Electrolysis: Deuterium, Oxygen -angels-water-heavy-separation-2=Heavy Water Electrolysis: Deuterium, Oxygen, Used Electrode +angels-heavy-water-separation=Heavy Water Electrolysis: Deuterium, Oxygen +angels-heavy-water-separation-2=Heavy Water Electrolysis: Deuterium, Oxygen, Used Electrode solid-plastic-1=Propene Plastic solid-plastic-2=Polyethylene Plastic diff --git a/angelspetrochem/migrations/angelspetrochem_0.9.5.lua b/angelspetrochem/migrations/angelspetrochem_0.9.6.lua similarity index 100% rename from angelspetrochem/migrations/angelspetrochem_0.9.5.lua rename to angelspetrochem/migrations/angelspetrochem_0.9.6.lua diff --git a/angelspetrochem/prototypes/buildings/advanced-chemical-plant.lua b/angelspetrochem/prototypes/buildings/advanced-chemical-plant.lua index 9b0836b74..af3819680 100644 --- a/angelspetrochem/prototypes/buildings/advanced-chemical-plant.lua +++ b/angelspetrochem/prototypes/buildings/advanced-chemical-plant.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -28,7 +28,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -144,7 +144,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -164,7 +164,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelspetrochem/prototypes/buildings/advanced-gas-refinery.lua b/angelspetrochem/prototypes/buildings/advanced-gas-refinery.lua index bd292535c..9ffa9e5ab 100644 --- a/angelspetrochem/prototypes/buildings/advanced-gas-refinery.lua +++ b/angelspetrochem/prototypes/buildings/advanced-gas-refinery.lua @@ -9,7 +9,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -29,7 +29,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -154,7 +154,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -174,7 +174,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -299,7 +299,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -319,7 +319,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -443,7 +443,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -463,7 +463,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/gas-refinery.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelspetrochem/prototypes/buildings/air-filter.lua b/angelspetrochem/prototypes/buildings/air-filter.lua index 11acacaa6..821be8bc8 100644 --- a/angelspetrochem/prototypes/buildings/air-filter.lua +++ b/angelspetrochem/prototypes/buildings/air-filter.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/air-filter.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -28,7 +28,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/air-filter.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -104,7 +104,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/air-filter.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -124,7 +124,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/air-filter.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelspetrochem/prototypes/buildings/chemical-plant.lua b/angelspetrochem/prototypes/buildings/chemical-plant.lua index b0a55f1a0..c30b33cff 100644 --- a/angelspetrochem/prototypes/buildings/chemical-plant.lua +++ b/angelspetrochem/prototypes/buildings/chemical-plant.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/chemical-plant.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -28,7 +28,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/chemical-plant.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -161,7 +161,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/chemical-plant.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -181,7 +181,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/chemical-plant.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -314,7 +314,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/chemical-plant.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -334,7 +334,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/chemical-plant.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -467,7 +467,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/chemical-plant.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -487,7 +487,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/chemical-plant.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelspetrochem/prototypes/buildings/electric-boiler.lua b/angelspetrochem/prototypes/buildings/electric-boiler.lua index bd4b6920f..fd176a19f 100644 --- a/angelspetrochem/prototypes/buildings/electric-boiler.lua +++ b/angelspetrochem/prototypes/buildings/electric-boiler.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/electric-boiler.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.refining.number_tint, scale = 0.32, shift = {-12, -12} @@ -28,7 +28,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/electric-boiler.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.refining.number_tint, scale = 0.32, shift = {-12, -12} @@ -164,7 +164,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/electric-boiler.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.refining.number_tint, scale = 0.32, shift = {-12, -12} @@ -184,7 +184,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/electric-boiler.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.refining.number_tint, scale = 0.32, shift = {-12, -12} @@ -320,7 +320,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/electric-boiler.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.refining.number_tint, scale = 0.32, shift = {-12, -12} @@ -340,7 +340,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/electric-boiler.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.refining.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelspetrochem/prototypes/buildings/electrolyser.lua b/angelspetrochem/prototypes/buildings/electrolyser.lua index d06bd2e84..a4fbe77b4 100644 --- a/angelspetrochem/prototypes/buildings/electrolyser.lua +++ b/angelspetrochem/prototypes/buildings/electrolyser.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/electrolyser.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -28,7 +28,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/electrolyser.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -143,7 +143,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/electrolyser.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -163,7 +163,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/electrolyser.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -278,7 +278,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/electrolyser.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -298,7 +298,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/electrolyser.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -413,7 +413,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/electrolyser.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -433,7 +433,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/electrolyser.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelspetrochem/prototypes/buildings/gas-refinery.lua b/angelspetrochem/prototypes/buildings/gas-refinery.lua index 230f6ff3f..aff387636 100644 --- a/angelspetrochem/prototypes/buildings/gas-refinery.lua +++ b/angelspetrochem/prototypes/buildings/gas-refinery.lua @@ -9,7 +9,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -29,7 +29,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -134,7 +134,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -154,7 +154,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -259,7 +259,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -279,7 +279,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -384,7 +384,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -404,7 +404,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelspetrochem/prototypes/buildings/oil-refinery.lua b/angelspetrochem/prototypes/buildings/oil-refinery.lua index c81ca2845..1ee108b18 100644 --- a/angelspetrochem/prototypes/buildings/oil-refinery.lua +++ b/angelspetrochem/prototypes/buildings/oil-refinery.lua @@ -1,6 +1,11 @@ -- mark default oil ref to be upgradeable to oil-refinery-2 - -data.raw["assembling-machine"]["oil-refinery"].next_upgrade = "oil-refinery-2" +local oilrefinery = data.raw["assembling-machine"]["oil-refinery"] +if not oilrefinery.fast_replaceable_group then + oilrefinery.fast_replaceable_group = "oil-refinery" +end +if not oilrefinery.next_upgrade then + oilrefinery.next_upgrade = "oil-refinery-2" +end data:extend( { @@ -13,7 +18,7 @@ data:extend( icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -34,7 +39,7 @@ data:extend( icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -180,7 +185,7 @@ data:extend( icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -201,7 +206,7 @@ data:extend( icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -347,7 +352,7 @@ data:extend( icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -368,7 +373,7 @@ data:extend( icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelspetrochem/prototypes/buildings/separator.lua b/angelspetrochem/prototypes/buildings/separator.lua index 9242310bb..a076cd4a9 100644 --- a/angelspetrochem/prototypes/buildings/separator.lua +++ b/angelspetrochem/prototypes/buildings/separator.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/separator.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -28,7 +28,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/separator.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -128,7 +128,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/separator.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -148,7 +148,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/separator.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -248,7 +248,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/separator.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -268,7 +268,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/separator.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -368,7 +368,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/separator.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -388,7 +388,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/separator.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelspetrochem/prototypes/buildings/steam-cracker.lua b/angelspetrochem/prototypes/buildings/steam-cracker.lua index 91a0e6046..e0e6313eb 100644 --- a/angelspetrochem/prototypes/buildings/steam-cracker.lua +++ b/angelspetrochem/prototypes/buildings/steam-cracker.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/steam-cracker.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -28,7 +28,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/steam-cracker.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -169,7 +169,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/steam-cracker.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -189,7 +189,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/steam-cracker.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -314,7 +314,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/steam-cracker.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -334,7 +334,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/steam-cracker.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -459,7 +459,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/steam-cracker.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -479,7 +479,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/steam-cracker.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelspetrochem/prototypes/global-override/bobplates.lua b/angelspetrochem/prototypes/global-override/bobplates.lua index 22e725036..d458c7aa0 100644 --- a/angelspetrochem/prototypes/global-override/bobplates.lua +++ b/angelspetrochem/prototypes/global-override/bobplates.lua @@ -140,7 +140,7 @@ if bobmods then icon = "__bobplates__/graphics/icons/resin.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -156,7 +156,7 @@ if bobmods then icon = "__bobplates__/graphics/icons/resin.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -193,7 +193,7 @@ if bobmods then icon = "__bobplates__/graphics/icons/rubber.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -210,7 +210,7 @@ if bobmods then icon = "__bobplates__/graphics/icons/rubber.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -243,12 +243,18 @@ if bobmods then OV.disable_recipe("electrolyser-2") OV.disable_recipe("electrolyser-3") OV.disable_recipe("electrolyser-4") + OV.disable_recipe("electrolyser-5") + OV.disable_technology("electrolyser-2") + OV.disable_technology("electrolyser-3") + OV.disable_technology("electrolyser-4") + OV.disable_technology("electrolyser-5") else table.insert(data.raw["assembling-machine"]["electrolyser"].crafting_categories, "petrochem-electrolyser") if bobmods.assembly and data.raw["assembling-machine"]["electrolyser-2"] then table.insert(data.raw["assembling-machine"]["electrolyser-2"].crafting_categories, "petrochem-electrolyser") table.insert(data.raw["assembling-machine"]["electrolyser-3"].crafting_categories, "petrochem-electrolyser") table.insert(data.raw["assembling-machine"]["electrolyser-4"].crafting_categories, "petrochem-electrolyser") + table.insert(data.raw["assembling-machine"]["electrolyser-5"].crafting_categories, "petrochem-electrolyser") end end @@ -259,12 +265,15 @@ if bobmods then --angelsmods.functions.add_flag("chemical-plant-2", "hidden") OV.global_replace_item("chemical-plant-2", "angels-chemical-plant-2") OV.disable_recipe("chemical-plant-2") + OV.disable_technology("chemical-plant-2") --angelsmods.functions.add_flag("chemical-plant-3", "hidden") OV.global_replace_item("chemical-plant-3", "angels-chemical-plant-3") OV.disable_recipe("chemical-plant-3") + OV.disable_technology("chemical-plant-3") --angelsmods.functions.add_flag("chemical-plant-4", "hidden") OV.global_replace_item("chemical-plant-4", "angels-chemical-plant-4") OV.disable_recipe("chemical-plant-4") + OV.disable_technology("chemical-plant-4") end move_item("heavy-water", "water-treatment-fluid", "eb") @@ -350,10 +359,15 @@ if bobmods then ) OV.add_unlock("angels-oil-processing", "liquid-fuel") move_item("enriched-fuel", "petrochem-fuel", "a[solid-fuel]-b") - data.raw["fluid"]["liquid-fuel"].icons = angelsmods.functions.create_liquid_fluid_icon(nil, { {237,212,104}, {247,216,081}, {247,216,081} }) + data.raw["fluid"]["liquid-fuel"].icons = + angelsmods.functions.create_liquid_fluid_icon(nil, {{237, 212, 104}, {247, 216, 081}, {247, 216, 081}}) data.raw["fluid"]["liquid-fuel"].icon = nil OV.patch_recipes({{name = "enriched-fuel-from-liquid-fuel", subgroup = "petrochem-fuel", order = "g"}}) - data.raw["recipe"]["liquid-fuel"].icons = angelsmods.functions.create_liquid_recipe_icon({ "liquid-fuel" }, { {237,212,104}, {247,216,081}, {247,216,081} }) + data.raw["recipe"]["liquid-fuel"].icons = + angelsmods.functions.create_liquid_recipe_icon( + {"liquid-fuel"}, + {{237, 212, 104}, {247, 216, 081}, {247, 216, 081}} + ) data.raw["recipe"]["liquid-fuel"].icon = nil data.raw["recipe"]["liquid-fuel"].always_show_products = "true" diff --git a/angelspetrochem/prototypes/global-override/bobrevamp.lua b/angelspetrochem/prototypes/global-override/bobrevamp.lua index d334802d0..7d9f45f88 100644 --- a/angelspetrochem/prototypes/global-override/bobrevamp.lua +++ b/angelspetrochem/prototypes/global-override/bobrevamp.lua @@ -3,31 +3,35 @@ if bobmods then if mods.bobrevamp then -- Move solid fuels arround - local function create_solid_fuel_recipe_icon(fluid_name) - local icon_layers = util.table.deepcopy(angelsmods.functions.get_object_icons(fluid_name)) - for layer_index, layer in pairs(icon_layers or {}) do - layer.shift = layer.shift or {} - layer.shift = {(layer.shift[1] or 0)/2-8, (layer.shift[2] or 0)/2+8} - layer.scale = (layer.scale or 1)/2 - end - return angelsmods.functions.add_icon_layer(angelsmods.functions.get_object_icons("solid-fuel"), icon_layers) - end - - OV.remove_unlock("angels-oil-processing", "liquid-fuel") - OV.remove_unlock("angels-oil-processing", "solid-fuel-from-hydrogen") + OV.disable_technology({"solid-fuel"}) + OV.remove_unlock("angels-oil-processing", "solid-fuel-fuel-oil") OV.remove_unlock("angels-oil-processing", "solid-fuel-naphtha") OV.remove_unlock("gas-processing", "solid-fuel-methane") - OV.add_unlock("flammables", "solid-fuel-from-hydrogen") - data.raw.recipe["solid-fuel-from-hydrogen"].icons = create_solid_fuel_recipe_icon("gas-hydrogen") + OV.add_unlock("flammables", "solid-fuel-naphtha") OV.add_unlock("flammables", "solid-fuel-fuel-oil") - OV.add_unlock("flammables", "liquid-fuel") OV.add_unlock("angels-advanced-gas-processing", "solid-fuel-methane") + OV.add_prereq("angels-advanced-gas-processing", "flammables") - OV.add_prereq("angels-nitrogen-processing-3", "flammables") - OV.add_prereq("chemical-processing-3", "flammables") OV.add_prereq("gas-synthesis", "flammables") - OV.disable_technology({"solid-fuel"}) + OV.add_prereq("angels-nitrogen-processing-3", "flammables") + + if mods.bobplates then + OV.remove_unlock("angels-oil-processing", "liquid-fuel") + OV.remove_unlock("angels-oil-processing", "solid-fuel-from-hydrogen") + + OV.add_unlock("flammables", "liquid-fuel") + OV.add_unlock("flammables", "solid-fuel-from-hydrogen") + + OV.add_prereq("chemical-processing-3", "flammables") + data.raw.recipe["solid-fuel-from-hydrogen"].icons = + angelsmods.functions.create_solid_recipe_icon( + { + {"__angelspetrochem__/graphics/icons/molecules/hydrogen.png", 72} + }, + "solid-fuel" + ) + end end end diff --git a/angelspetrochem/prototypes/petrochem-global-override.lua b/angelspetrochem/prototypes/petrochem-global-override.lua index 896fa47f6..ae7a2bc60 100644 --- a/angelspetrochem/prototypes/petrochem-global-override.lua +++ b/angelspetrochem/prototypes/petrochem-global-override.lua @@ -51,7 +51,7 @@ data.raw["recipe"]["explosives"].icons = { icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelspetrochem/prototypes/petrochem-override.lua b/angelspetrochem/prototypes/petrochem-override.lua index 5f0ee021e..43811e0c9 100644 --- a/angelspetrochem/prototypes/petrochem-override.lua +++ b/angelspetrochem/prototypes/petrochem-override.lua @@ -373,7 +373,9 @@ if not angelsmods.trigger.enableconverter and mods.bobplates then data.raw["fluid"]["hydrogen-chloride"].hidden = true data.raw["fluid"]["ferric-chloride-solution"].hidden = true data.raw["fluid"]["chlorine"].hidden = true - data.raw["fluid"]["pure-water"].hidden = true + if settings.startup["bobmods-plates-purewater"].value == true then + data.raw["fluid"]["pure-water"].hidden = true + end if mods.bobrevamp then data.raw["fluid"]["ammonia"].hidden = true data.raw["fluid"]["dinitrogen-tetroxide"].hidden = true diff --git a/angelspetrochem/prototypes/recipes/petrochem-basics.lua b/angelspetrochem/prototypes/recipes/petrochem-basics.lua index 13b33df98..e535710ba 100644 --- a/angelspetrochem/prototypes/recipes/petrochem-basics.lua +++ b/angelspetrochem/prototypes/recipes/petrochem-basics.lua @@ -1,13 +1,3 @@ -local function create_steam_recipe_icon(fluid_name) - local icon_layers = util.table.deepcopy(angelsmods.functions.get_object_icons(fluid_name)) - for layer_index, layer in pairs(icon_layers or {}) do - layer.shift = layer.shift or {} - layer.shift = {(layer.shift[1] or 0)/2.3-9, (layer.shift[2] or 0)/2.3-9} - layer.scale = (layer.scale or 1)/2.3 - end - return angelsmods.functions.add_icon_layer(angelsmods.functions.get_object_icons("steam"), icon_layers) -end - data:extend( { --BASIC CHEMISTRY @@ -25,7 +15,11 @@ data:extend( {type = "fluid", name = "steam", amount = 40, temperature = 165, fluidbox_index = 2} }, always_show_products = true, - icons = create_steam_recipe_icon("water"), + icons = angelsmods.functions.create_gas_recipe_icon({ + "steam" + }, "www", { + "water" + }), order = "a[steam]-b" }, { @@ -42,7 +36,11 @@ data:extend( {type = "fluid", name = "steam", amount = 40, temperature = 165, fluidbox_index = 2} }, always_show_products = true, - icons = create_steam_recipe_icon("water-purified"), + icons = angelsmods.functions.create_gas_recipe_icon({ + "steam" + }, "www", { + "water-purified" + }), order = "a[steam]-b" }, { @@ -70,7 +68,7 @@ data:extend( { { { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", icon_size = 32, tint = angelsmods.petrochem.number_tint --scale = 0.32, @@ -114,7 +112,7 @@ data:extend( { { { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", icon_size = 32, tint = angelsmods.petrochem.number_tint --scale = 0.32, @@ -155,7 +153,7 @@ data:extend( { { { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", icon_size = 32, tint = angelsmods.petrochem.number_tint --scale = 0.32, @@ -198,7 +196,7 @@ data:extend( { { { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", icon_size = 32, tint = angelsmods.petrochem.number_tint --scale = 0.32, @@ -499,7 +497,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/solid-carbon.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -535,7 +533,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/solid-carbon.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -584,7 +582,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/solid-coke.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -613,7 +611,7 @@ data:extend( icon = "__angelspetrochem__/graphics/icons/solid-coke.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12} @@ -673,7 +671,7 @@ data:extend( { icon = "__angelsrefining__/graphics/icons/num_1.png", icon_size = 32, - tint = angelsmods.petrochem.number_tint + tint = angelsmods.refining.number_tint }, { icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-sulfide.png", @@ -711,7 +709,7 @@ data:extend( { icon = "__angelsrefining__/graphics/icons/num_2.png", icon_size = 32, - tint = angelsmods.petrochem.number_tint + tint = angelsmods.refining.number_tint }, { icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-sulfide.png", @@ -749,7 +747,7 @@ data:extend( { icon = "__angelsrefining__/graphics/icons/num_3.png", icon_size = 32, - tint = angelsmods.petrochem.number_tint + tint = angelsmods.refining.number_tint }, { icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-sulfide.png", @@ -785,7 +783,7 @@ data:extend( { icon = "__angelsrefining__/graphics/icons/num_1.png", icon_size = 32, - tint = angelsmods.petrochem.number_tint + tint = angelsmods.refining.number_tint }, mods["angelssmelting"] and { @@ -823,7 +821,7 @@ data:extend( { icon = "__angelsrefining__/graphics/icons/num_2.png", icon_size = 32, - tint = angelsmods.petrochem.number_tint + tint = angelsmods.refining.number_tint }, mods["angelssmelting"] and { @@ -861,7 +859,7 @@ data:extend( { icon = "__angelsrefining__/graphics/icons/num_3.png", icon_size = 32, - tint = angelsmods.petrochem.number_tint + tint = angelsmods.refining.number_tint }, mods["angelssmelting"] and { @@ -959,7 +957,7 @@ data:extend( { { { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", icon_size = 32, tint = angelsmods.petrochem.number_tint --scale = 0.32, @@ -1002,7 +1000,7 @@ data:extend( { { { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", icon_size = 32, tint = angelsmods.petrochem.number_tint --scale = 0.32, diff --git a/angelspetrochem/prototypes/recipes/petrochem-entity-angels.lua b/angelspetrochem/prototypes/recipes/petrochem-entity-angels.lua index 3ab702b7a..f6debfb1b 100644 --- a/angelspetrochem/prototypes/recipes/petrochem-entity-angels.lua +++ b/angelspetrochem/prototypes/recipes/petrochem-entity-angels.lua @@ -999,7 +999,7 @@ angelsmods.functions.RB.build( }, result = "angels-chemical-plant" }, - expensive = { + expensive = angelsmods.industries and angelsmods.industries.tech and { energy_required = 5 * buildingtime, enabled = false, ingredients = { @@ -1010,6 +1010,17 @@ angelsmods.functions.RB.build( {"t1-pipe", 4 * buildingmulti} }, result = "angels-chemical-plant" + } or { -- chem plant required for science, excluding it from marathon effects + energy_required = 5, + enabled = false, + ingredients = { + {"chem-1", 1}, + {"t1-plate", 2}, + {"t1-gears", 1}, + {"t1-circuit", 1}, + {"t1-pipe", 4} + }, + result = "angels-chemical-plant" } }, { @@ -1130,11 +1141,11 @@ angelsmods.functions.RB.build( energy_required = 5, enabled = false, ingredients = { + {"angels-electric-boiler", 1}, {"t2-plate", 1}, {"t2-circuit", 2}, {"t2-brick", 1}, - {"t2-pipe", 5}, - {"angels-electric-boiler", 1} + {"t2-pipe", 5} }, result = "angels-electric-boiler-2" }, @@ -1142,11 +1153,11 @@ angelsmods.functions.RB.build( energy_required = 5 * buildingtime, enabled = false, ingredients = { + {"angels-electric-boiler", 1}, {"t2-plate", 1 * buildingmulti}, {"t2-circuit", 2 * buildingmulti}, {"t2-brick", 1 * buildingmulti}, - {"t2-pipe", 5 * buildingmulti}, - {"angels-electric-boiler", 1 * buildingmulti} + {"t2-pipe", 5 * buildingmulti} }, result = "angels-electric-boiler-2" } @@ -1158,11 +1169,11 @@ angelsmods.functions.RB.build( energy_required = 5, enabled = false, ingredients = { + {"angels-electric-boiler-2", 1}, {"t3-plate", 1}, {"t3-circuit", 2}, {"t3-brick", 1}, - {"t3-pipe", 5}, - {"angels-electric-boiler-2", 1} + {"t3-pipe", 5} }, result = "angels-electric-boiler-3" }, @@ -1170,11 +1181,11 @@ angelsmods.functions.RB.build( energy_required = 5 * buildingtime, enabled = false, ingredients = { + {"angels-electric-boiler-2", 1}, {"t3-plate", 1 * buildingmulti}, {"t3-circuit", 2 * buildingmulti}, {"t3-brick", 1 * buildingmulti}, - {"t3-pipe", 5 * buildingmulti}, - {"angels-electric-boiler-2", 1 * buildingmulti} + {"t3-pipe", 5 * buildingmulti} }, result = "angels-electric-boiler-3" } diff --git a/angelspetrochem/prototypes/recipes/petrochem-entity.lua b/angelspetrochem/prototypes/recipes/petrochem-entity.lua index a93497512..fdca6f401 100644 --- a/angelspetrochem/prototypes/recipes/petrochem-entity.lua +++ b/angelspetrochem/prototypes/recipes/petrochem-entity.lua @@ -534,5 +534,25 @@ data:extend( }, result= "angels-electric-boiler", }, + { + type = "recipe", + name = "angels-electric-boiler-2", + energy_required = 5, + enabled = false, + ingredients ={ + {"angels-electric-boiler", 1}, + }, + result= "angels-electric-boiler-2", + }, + { + type = "recipe", + name = "angels-electric-boiler-3", + energy_required = 5, + enabled = false, + ingredients ={ + {"angels-electric-boiler-2", 1}, + }, + result= "angels-electric-boiler-3", + }, } ) diff --git a/angelspetrochem/prototypes/recipes/petrochem-nitrogen.lua b/angelspetrochem/prototypes/recipes/petrochem-nitrogen.lua index c3c7d8f9b..4f5631991 100644 --- a/angelspetrochem/prototypes/recipes/petrochem-nitrogen.lua +++ b/angelspetrochem/prototypes/recipes/petrochem-nitrogen.lua @@ -1,4 +1,3 @@ - data:extend( { --NITROGEN diff --git a/angelspetrochem/prototypes/recipes/petrochem-solids.lua b/angelspetrochem/prototypes/recipes/petrochem-solids.lua index a53b7fb51..6adf63ba7 100644 --- a/angelspetrochem/prototypes/recipes/petrochem-solids.lua +++ b/angelspetrochem/prototypes/recipes/petrochem-solids.lua @@ -1,19 +1,5 @@ local intermediatemulti = angelsmods.marathon.intermediatemulti -local function create_icon(name, number_icon_layer) - return angelsmods.functions.add_icon_layer(angelsmods.functions.get_object_icons(name), number_icon_layer) -end - -local function create_solid_fuel_recipe_icon(fluid_name) - local icon_layers = util.table.deepcopy(angelsmods.functions.get_object_icons(fluid_name)) - for layer_index, layer in pairs(icon_layers or {}) do - layer.shift = layer.shift or {} - layer.shift = {(layer.shift[1] or 0)/2-8, (layer.shift[2] or 0)/2+8} - layer.scale = (layer.scale or 1)/2 - end - return angelsmods.functions.add_icon_layer(angelsmods.functions.get_object_icons("solid-fuel"), icon_layers) -end - data:extend( { --SOLIDS @@ -67,13 +53,11 @@ data:extend( {type="fluid", name="liquid-plastic", amount=10}, }, always_show_products = "true", - icons = create_icon("liquid-plastic", { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {255,255,255}, {255,255,255} }, {{ + icon = "__angelsrefining__/graphics/icons/num_1.png", icon_size = 32, tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - }), + }}), order = "a[plastic]-a[liquid]-a", }, { @@ -93,13 +77,11 @@ data:extend( {type="fluid", name="liquid-plastic", amount=20}, }, always_show_products = "true", - icons = create_icon("liquid-plastic", { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {255,255,255}, {255,255,255} }, {{ + icon = "__angelsrefining__/graphics/icons/num_2.png", icon_size = 32, tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - }), + }}), order = "a[plastic]-a[liquid]-b", }, { @@ -119,13 +101,11 @@ data:extend( {type="fluid", name="liquid-plastic", amount=30}, }, always_show_products = "true", - icons = create_icon("liquid-plastic", { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {255,255,255}, {255,255,255} }, {{ + icon = "__angelsrefining__/graphics/icons/num_3.png", icon_size = 32, tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - }), + }}), order = "a[plastic]-a[liquid]-c", }, --RESIN @@ -182,13 +162,11 @@ data:extend( {type="fluid", name="liquid-resin", amount=10}, }, always_show_products = "true", - icons = create_icon("liquid-resin", { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {255,225,155}, {255,225,155} }, {{ + icon = "__angelsrefining__/graphics/icons/num_1.png", icon_size = 32, tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - }), + }}), order = "b[resin]-a[liquid]-a", }, { @@ -208,13 +186,11 @@ data:extend( {type="fluid", name="liquid-resin", amount=20}, }, always_show_products = "true", - icons = create_icon("liquid-resin", { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {255,225,155}, {255,225,155} }, {{ + icon = "__angelsrefining__/graphics/icons/num_2.png", icon_size = 32, tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - }), + }}), order = "b[resin]-a[liquid]-b", }, { @@ -234,13 +210,11 @@ data:extend( {type="fluid", name="liquid-resin", amount=30}, }, always_show_products = "true", - icons = create_icon("liquid-resin", { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {255,225,155}, {255,225,155} }, {{ + icon = "__angelsrefining__/graphics/icons/num_3.png", icon_size = 32, tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - }), + }}), order = "b[resin]-a[liquid]-c", }, --RUBBER @@ -297,13 +271,11 @@ data:extend( {type="fluid", name="liquid-rubber", amount=10}, }, always_show_products = "true", - icons = create_icon("liquid-rubber", { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {193,197,255}, {193,197,255} }, {{ + icon = "__angelsrefining__/graphics/icons/num_1.png", icon_size = 32, tint = angelsmods.petrochem.number_tint, - scale = 0.32, - shift = {-12, -12}, - }), + }}), order = "b[rubber]-a[liquid]", }, --GLASS @@ -363,7 +335,9 @@ data:extend( { {type="item", name="solid-fuel", amount=2}, }, - icons = create_solid_fuel_recipe_icon("gas-methane"), + icons = angelsmods.functions.create_solid_recipe_icon({ + { "__angelspetrochem__/graphics/icons/molecules/methane.png", 72 } + }, "solid-fuel"), order = "a[solid-fuel-methane]", }, { @@ -382,7 +356,9 @@ data:extend( { {type="item", name="solid-fuel", amount=2}, }, - icons = create_solid_fuel_recipe_icon("liquid-naphtha"), + icons = angelsmods.functions.create_solid_recipe_icon({ + "liquid-naphtha" + }, "solid-fuel"), order = "b[solid-fuel-naphtha]", }, { @@ -401,7 +377,9 @@ data:extend( { {type="item", name="solid-fuel", amount=2}, }, - icons = create_solid_fuel_recipe_icon("liquid-fuel-oil"), + icons = angelsmods.functions.create_solid_recipe_icon({ + "liquid-fuel-oil" + }, "solid-fuel"), order = "c[solid-fuel-fuel-oil]", }, { @@ -420,7 +398,9 @@ data:extend( { {type="item", name="solid-fuel", amount=2}, }, - icons = create_solid_fuel_recipe_icon("gas-synthesis"), + icons = angelsmods.functions.create_solid_recipe_icon({ + "gas-synthesis" + }, "solid-fuel"), order = "d[solid-fuel-synthesis]", }, { @@ -438,7 +418,9 @@ data:extend( { {type="item", name="solid-fuel", amount=2}, }, - icons = create_solid_fuel_recipe_icon("gas-hydrazine"), + icons = angelsmods.functions.create_solid_recipe_icon({ + { "__angelspetrochem__/graphics/icons/molecules/hydrazine.png", 72 } + }, "solid-fuel"), order = "e[solid-fuel-hydrazine]", }, --CATALYSTS @@ -612,7 +594,7 @@ data:extend( icon_size=64, }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, @@ -647,7 +629,7 @@ data:extend( icon_size=64, }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.petrochem.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelsrefining/changelog.txt b/angelsrefining/changelog.txt index 9ccc35aed..ed3311d8c 100644 --- a/angelsrefining/changelog.txt +++ b/angelsrefining/changelog.txt @@ -1,6 +1,21 @@ --------------------------------------------------------------------------------------------------- +Version: 0.11.8 +Date: 02.04.2020 + Changes: + - Changed mining time of Burner Ore Crusher so it's easier to pick up in early game + - Added setting to change stack size of (all) pavement items between 200 to 1000 (default 200) + - Changed stack size of Stone Brick to use the pavement item stack size (was 100, now 200 by default) + - Changed stack size of (all) Concrete to use the pavement item stack size (was 100, now 200 by default) + - Changed stack size of Landfill to use the pavement item stack size (was 100, now 200 by default) + Bugfixes: + - Fixed missing Tin related to attempted bugfix in 0.11.4 when playing without angelssmelting + Modding: + - angelsmods.functions.make_void(...) now supports an optional quantity as input argument + - added equivalent function to create viscous liquid recipe icons + - added equivalent function to create solid recipe icons +--------------------------------------------------------------------------------------------------- Version: 0.11.7 -Date: 24-03-2020 +Date: 24.03.2020 Changes: - Make buildings upgradeable #119 Bugfixes: @@ -12,7 +27,7 @@ Date: 21-03-2020 - Fixed crash when barrreling recipe did not exist --------------------------------------------------------------------------------------------------- Version: 0.11.5 -Date: 20-03-2020 +Date: 20.03.2020 Changes: - Added new graphics for fluid icons - Powdered refining depends on lubricant tech now diff --git a/angelsrefining/data.lua b/angelsrefining/data.lua index 3273d2e58..ac3680b68 100644 --- a/angelsrefining/data.lua +++ b/angelsrefining/data.lua @@ -9,6 +9,7 @@ angelsmods.trigger = angelsmods.trigger or {} angelsmods.trigger.enable_auto_barreling = settings.startup["angels-enable-auto-barreling"].value angelsmods.trigger.enable_hide_void = settings.startup["angels-enable-hide-void"].value angelsmods.trigger.starting_resource_base = settings.startup["angels-starting-resource-base"].value -- Unused so far +angelsmods.trigger.pavement_stack_size = settings.startup["angels-pavement-stack-size"].value -- Stack size for items you can use to pave the world angelsmods.trigger.washing_tech = angelsmods.trigger.washing_tech or false --REFINERY SORTING TRIGGERS diff --git a/angelsrefining/info.json b/angelsrefining/info.json index 303cab16c..78ccba3bb 100644 --- a/angelsrefining/info.json +++ b/angelsrefining/info.json @@ -1,6 +1,6 @@ { "name": "angelsrefining", - "version": "0.11.7", + "version": "0.11.8", "factorio_version": "0.18", "title": "Angel's Refining", "author": "Arch666Angel", diff --git a/angelsrefining/locale/en/ore-refining.cfg b/angelsrefining/locale/en/ore-refining.cfg index 1f8ad198c..9ddd179e8 100644 --- a/angelsrefining/locale/en/ore-refining.cfg +++ b/angelsrefining/locale/en/ore-refining.cfg @@ -339,6 +339,8 @@ angels-starting-resource-ore4=Starting resource __ENTITY__angels-ore4__ angels-starting-resource-ore5=Starting resource __ENTITY__angels-ore5__ angels-starting-resource-ore6=Starting resource __ENTITY__angels-ore6__ +angels-pavement-stack-size=Stack size of pavement items + [mod-setting-description] angels-enable-auto-barreling=If enabled hides all barreling recipes and converts the barreling pump to a furnace type angels-tryptophobia-friendly-stiratite=If enabled replaces the new style hole-y graphics with the classic solid ones. @@ -355,6 +357,8 @@ angels-starting-resource-ore4=If enabled will spawn [img=item/angels-ore4] __ENT angels-starting-resource-ore5=If enabled will spawn [img=item/angels-ore5] __ENTITY__angels-ore5__ in the starting area\nDefault: enabled angels-starting-resource-ore6=If enabled will spawn [img=item/angels-ore6] __ENTITY__angels-ore6__ in the starting area\nDefault: disabled +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 diff --git a/angelsrefining/prototypes/angels-functions.lua b/angelsrefining/prototypes/angels-functions.lua index 8a0bb0950..2d138e253 100644 --- a/angelsrefining/prototypes/angels-functions.lua +++ b/angelsrefining/prototypes/angels-functions.lua @@ -758,6 +758,403 @@ function angelsmods.functions.create_viscous_liquid_fluid_icon(molecule_icon, ti } end +-- CREATE VISCOUS LIQUID RECIPE ICONS (NOT FOR FLUIDS) +function angelsmods.functions.create_viscous_liquid_recipe_icon(bot_molecules_icon, tints, top_molecules_icon) + -- bot_molecules_icon is a table of molecule_icon, which can be a string + -- (assumes icon_size 32) or be a table with size defined + bot_molecules_icon = bot_molecules_icon or {} + for molecule_index ,molecule_icon in pairs(bot_molecules_icon) do + if type(molecule_icon) ~= "table" and get_icons(molecule_icon) ~= "__angelsrefining__/graphics/icons/void.png" then + bot_molecules_icon[molecule_index] = util.table.deepcopy(get_icons(molecule_icon)) + end + end + + for molecule_index,molecule_icon in pairs(bot_molecules_icon) do + if type(molecule_icon) ~= "table" then + bot_molecules_icon[molecule_index] = { + { + icon = molecule_icon, + icon_size = 32 + } + } + elseif type(molecule_icon[1]) ~= "table" then + local mi = util.table.deepcopy(molecule_icon) + bot_molecules_icon[molecule_index] = { + { + icon = mi.icon or mi[1] or nil, + shift = mi.shift or mi[3] or nil, + scale = mi.scale or mi[4] or nil, + tint = mi.tint or mi[5] or nil, + } + } + if bot_molecules_icon[molecule_index][1].icon then + bot_molecules_icon[molecule_index][1].icon_size = mi.icon_size or mi[2] or 32 + if bot_molecules_icon[molecule_index][1].icon_size ~= 32 then + bot_molecules_icon[molecule_index][1].scale = (bot_molecules_icon[molecule_index][1].scale or 1) * 32/bot_molecules_icon[molecule_index][1].icon_size + end + else + --something is wrong here but we need to return something + bot_molecules_icon[molecule_index] = { + { + icon = "__angelsrefining__/graphics/icons/void.png", + icon_size = 32 + } + } + end + else + for molecule_icon_layer_index,molecule_icon_layer in pairs(molecule_icon) do + if not molecule_icon_layer.icon_size then + bot_molecules_icon[molecule_index][molecule_icon_layer_index].icon_size = 32 + end + end + end + molecule_icon = bot_molecules_icon[molecule_index] + + -- now shift this icon to its correct position + molecule_shift = ({ {-11.5, 12}, {11.5, 12}, {0, 12} })[molecule_index] or {0,0} + molecule_scale = 10.24/32 -- assume base size 32 + for layer_index, layer in pairs(molecule_icon) do + layer.scale = layer.scale or 1 + layer.shift = {(layer.shift or {})[1] or 0, (layer.shift or {})[2] or 0} + + layer.shift = {layer.shift[1] * molecule_scale + molecule_shift[1], layer.shift[2] * molecule_scale + molecule_shift[2]} + layer.scale = layer.scale * molecule_scale + + molecule_icon[layer_index].scale = layer.scale + molecule_icon[layer_index].shift = layer.shift + end + bot_molecules_icon[molecule_index] = clean_table(molecule_icon) + end + bot_molecules_icon = clean_table(bot_molecules_icon) + + top_molecules_icon = top_molecules_icon or {} + for molecule_index ,molecule_icon in pairs(top_molecules_icon) do + if type(molecule_icon) ~= "table" and get_icons(molecule_icon) ~= "__angelsrefining__/graphics/icons/void.png" then + top_molecules_icon[molecule_index] = util.table.deepcopy(get_icons(molecule_icon)) + end + end + + for molecule_index,molecule_icon in pairs(top_molecules_icon) do + if type(molecule_icon) ~= "table" then + top_molecules_icon[molecule_index] = { + { + icon = molecule_icon, + icon_size = 32 + } + } + elseif type(molecule_icon[1]) ~= "table" then + local mi = util.table.deepcopy(molecule_icon) + top_molecules_icon[molecule_index] = { + { + icon = mi.icon or mi[1] or nil, + shift = mi.shift or mi[3] or nil, + scale = mi.scale or mi[4] or nil, + tint = mi.tint or mi[5] or nil, + } + } + if top_molecules_icon[molecule_index][1].icon then + top_molecules_icon[molecule_index][1].icon_size = mi.icon_size or mi[2] or 32 + if top_molecules_icon[molecule_index][1].icon_size ~= 32 then + top_molecules_icon[molecule_index][1].scale = (top_molecules_icon[molecule_index][1].scale or 1) * 32/top_molecules_icon[molecule_index][1].icon_size + end + else + --something is wrong here but we need to return something + top_molecules_icon[molecule_index] = { + { + icon = "__angelsrefining__/graphics/icons/void.png", + icon_size = 32 + } + } + end + else + for molecule_icon_layer_index,molecule_icon_layer in pairs(molecule_icon) do + if not molecule_icon_layer.icon_size then + top_molecules_icon[molecule_index][molecule_icon_layer_index].icon_size = 32 + end + end + end + molecule_icon = top_molecules_icon[molecule_index] + + -- now shift this icon to its correct position + molecule_shift = ({ {-11.5, -12}, {11.5, -12}, {0, -12} })[molecule_index] or {0,0} + molecule_scale = 10.24/32 -- assume base size 32 + for layer_index, layer in pairs(molecule_icon) do + layer.scale = layer.scale or 1 + layer.shift = {(layer.shift or {})[1] or 0, (layer.shift or {})[2] or 0} + + layer.shift = {layer.shift[1] * molecule_scale + molecule_shift[1], layer.shift[2] * molecule_scale + molecule_shift[2]} + layer.scale = layer.scale * molecule_scale + + molecule_icon[layer_index].scale = layer.scale + molecule_icon[layer_index].shift = layer.shift + end + top_molecules_icon[molecule_index] = clean_table(molecule_icon) + end + top_molecules_icon = clean_table(top_molecules_icon) + + -- tints is a table of 5 tints, for the top, bot_left top_mask, bot_mask, bot_right, + -- if bot_left is present, but not bot_right (nil), then both bottom sides will have + -- the same tint as defined in bot_left + if tints then + if type(tints) ~= "table" then + tints = { + -- TODO + } + else + tints.top = unify_tint(tints.top or tints[1] or nil) + tints.bot_left = unify_tint(tints.bot_left or tints[2] or nil) + tints.bot_right = unify_tint(tints.bot_right or tints[5] or nil) + + tints.top_mask = unify_tint(tints.top_mask or tints[3] or nil) + tints.bot_mask = unify_tint(tints.bot_mask or tints[4] or nil) + + if tints.bot_left and tints.bot_right then + tints.bot = nil + else + tints.bot = tints.bot_left or tints.bot_right or nil + tints.bot_left = nil + tints.bot_right = nil + end + end + else + tints = {} + end + + local recipe_icons = + { + (tints.bot or tints.bot_left or tints.bot_right or tints.bot_mask) and { -- base layer required for background shadow + icon = "__angelsrefining__/graphics/icons/angels-liquid/liquid-viscous-item-base.png", + icon_size = 256, + scale = 32/256, + tint = {r=0.25,g=0.25,b=0.25,a=0.7}, + shift = molecule_icon and {3.5, 0} or nil, + } or nil, + tints.bot and { + icon = "__angelsrefining__/graphics/icons/angels-liquid/liquid-viscous-item-bot.png", + icon_size = 256, + scale = 32/256, + tint = tints.bot, + shift = molecule_icon and {3.5, 0} or nil, + } or nil, + tints.bot_left and { + icon = "__angelsrefining__/graphics/icons/angels-liquid/liquid-viscous-item-bot-left.png", + icon_size = 256, + scale = 32/256, + tint = tints.bot_left, + shift = molecule_icon and {3.5, 0} or nil, + } or nil, + tints.bot_left and { + icon = "__angelsrefining__/graphics/icons/angels-liquid/liquid-viscous-item-bot-right.png", + icon_size = 256, + scale = 32/256, + tint = tints.bot_right, + shift = molecule_icon and {3.5, 0} or nil, + } or nil, + tints.bot_mask and { + icon = "__angelsrefining__/graphics/icons/angels-liquid/liquid-viscous-item-bot-mask.png", + icon_size = 256, + scale = 32/256, + tint = tints.bot_mask, + shift = molecule_icon and {3.5, 0} or nil, + } or nil, + { + icon = "__angelsrefining__/graphics/icons/angels-liquid/liquid-viscous-item-top.png", + icon_size = 256, + scale = 32/256, + tint = tints.top, + shift = molecule_icon and {3.5, 0} or nil, + }, + tints.top_mask and { + icon = "__angelsrefining__/graphics/icons/angels-liquid/liquid-viscous-item-top-mask.png", + icon_size = 256, + scale = 32/256, + tint = tints.top_mask, + shift = molecule_icon and {3.5, 0} or nil, + } or nil, + } + for _,bot_molecule_icon in pairs(bot_molecules_icon) do + for _,bot_molecule_icon_layer in pairs(bot_molecule_icon) do + table.insert(recipe_icons, bot_molecule_icon_layer) + end + end + for _,top_molecule_icon in pairs(top_molecules_icon) do + for _,top_molecule_icon_layer in pairs(top_molecule_icon) do + table.insert(recipe_icons, top_molecule_icon_layer) + end + end + return clean_table(recipe_icons) +end + +-- CREATE SOLID RECIPE ICONS (NOT FOR ICONS) +function angelsmods.functions.create_solid_recipe_icon(bot_molecules_icon, solid_item_name, top_molecules_icon) +-- bot_molecules_icon is a table of molecule_icon, which can be a string + -- (assumes icon_size 32) or be a table with size defined + bot_molecules_icon = bot_molecules_icon or {} + for molecule_index ,molecule_icon in pairs(bot_molecules_icon) do + if type(molecule_icon) ~= "table" and get_icons(molecule_icon) ~= "__angelsrefining__/graphics/icons/void.png" then + bot_molecules_icon[molecule_index] = util.table.deepcopy(get_icons(molecule_icon)) + end + end + + for molecule_index,molecule_icon in pairs(bot_molecules_icon) do + if type(molecule_icon) ~= "table" then + bot_molecules_icon[molecule_index] = { + { + icon = molecule_icon, + icon_size = 32 + } + } + elseif type(molecule_icon[1]) ~= "table" then + local mi = util.table.deepcopy(molecule_icon) + bot_molecules_icon[molecule_index] = { + { + icon = mi.icon or mi[1] or nil, + shift = mi.shift or mi[3] or nil, + scale = mi.scale or mi[4] or nil, + tint = mi.tint or mi[5] or nil, + } + } + if bot_molecules_icon[molecule_index][1].icon then + bot_molecules_icon[molecule_index][1].icon_size = mi.icon_size or mi[2] or 32 + if bot_molecules_icon[molecule_index][1].icon_size ~= 32 then + bot_molecules_icon[molecule_index][1].scale = (bot_molecules_icon[molecule_index][1].scale or 1) * 32/bot_molecules_icon[molecule_index][1].icon_size + end + else + --something is wrong here but we need to return something + bot_molecules_icon[molecule_index] = { + { + icon = "__angelsrefining__/graphics/icons/void.png", + icon_size = 32 + } + } + end + else + for molecule_icon_layer_index,molecule_icon_layer in pairs(molecule_icon) do + if not molecule_icon_layer.icon_size then + bot_molecules_icon[molecule_index][molecule_icon_layer_index].icon_size = 32 + end + end + end + molecule_icon = bot_molecules_icon[molecule_index] + + -- now shift this icon to its correct position + molecule_shift = ({ {-11.5, 12}, {11.5, 12}, {0, 12} })[molecule_index] or {0,0} + molecule_scale = 10.24/32 -- assume base size 32 + for layer_index, layer in pairs(molecule_icon) do + layer.scale = layer.scale or 1 + layer.shift = {(layer.shift or {})[1] or 0, (layer.shift or {})[2] or 0} + + layer.shift = {layer.shift[1] * molecule_scale + molecule_shift[1], layer.shift[2] * molecule_scale + molecule_shift[2]} + layer.scale = layer.scale * molecule_scale + + molecule_icon[layer_index].scale = layer.scale + molecule_icon[layer_index].shift = layer.shift + end + bot_molecules_icon[molecule_index] = clean_table(molecule_icon) + end + bot_molecules_icon = clean_table(bot_molecules_icon) + + top_molecules_icon = top_molecules_icon or {} + for molecule_index ,molecule_icon in pairs(top_molecules_icon) do + if type(molecule_icon) ~= "table" and get_icons(molecule_icon) ~= "__angelsrefining__/graphics/icons/void.png" then + top_molecules_icon[molecule_index] = util.table.deepcopy(get_icons(molecule_icon)) + end + end + + for molecule_index,molecule_icon in pairs(top_molecules_icon) do + if type(molecule_icon) ~= "table" then + top_molecules_icon[molecule_index] = { + { + icon = molecule_icon, + icon_size = 32 + } + } + elseif type(molecule_icon[1]) ~= "table" then + local mi = util.table.deepcopy(molecule_icon) + top_molecules_icon[molecule_index] = { + { + icon = mi.icon or mi[1] or nil, + shift = mi.shift or mi[3] or nil, + scale = mi.scale or mi[4] or nil, + tint = mi.tint or mi[5] or nil, + } + } + if top_molecules_icon[molecule_index][1].icon then + top_molecules_icon[molecule_index][1].icon_size = mi.icon_size or mi[2] or 32 + if top_molecules_icon[molecule_index][1].icon_size ~= 32 then + top_molecules_icon[molecule_index][1].scale = (top_molecules_icon[molecule_index][1].scale or 1) * 32/top_molecules_icon[molecule_index][1].icon_size + end + else + --something is wrong here but we need to return something + top_molecules_icon[molecule_index] = { + { + icon = "__angelsrefining__/graphics/icons/void.png", + icon_size = 32 + } + } + end + else + for molecule_icon_layer_index,molecule_icon_layer in pairs(molecule_icon) do + if not molecule_icon_layer.icon_size then + top_molecules_icon[molecule_index][molecule_icon_layer_index].icon_size = 32 + end + end + end + molecule_icon = top_molecules_icon[molecule_index] + + -- now shift this icon to its correct position + molecule_shift = ({ {-11.5, -12}, {11.5, -12}, {0, -12} })[molecule_index] or {0,0} + molecule_scale = 10.24/32 -- assume base size 32 + for layer_index, layer in pairs(molecule_icon) do + layer.scale = layer.scale or 1 + layer.shift = {(layer.shift or {})[1] or 0, (layer.shift or {})[2] or 0} + + layer.shift = {layer.shift[1] * molecule_scale + molecule_shift[1], layer.shift[2] * molecule_scale + molecule_shift[2]} + layer.scale = layer.scale * molecule_scale + + molecule_icon[layer_index].scale = layer.scale + molecule_icon[layer_index].shift = layer.shift + end + top_molecules_icon[molecule_index] = clean_table(molecule_icon) + end + top_molecules_icon = clean_table(top_molecules_icon) + + local recipe_icons = get_icons(solid_item_name) + + for _,bot_molecule_icon in pairs(bot_molecules_icon) do + for _,bot_molecule_icon_layer in pairs(bot_molecule_icon) do + table.insert(recipe_icons, bot_molecule_icon_layer) + end + end + for _,top_molecule_icon in pairs(top_molecules_icon) do + for _,top_molecule_icon_layer in pairs(top_molecule_icon) do + table.insert(recipe_icons, top_molecule_icon_layer) + end + end + return recipe_icons +end + +function angelsmods.functions.get_fluid_recipe_tint(fluid_name) + -- returns a crafting_machine_tint depending on the fluid color + local fluid = data.raw.fluid[fluid_name] + return fluid and { + primary = + { + r = fluid.base_color.r or 0, + g = fluid.base_color.g or 0, + b = fluid.base_color.b or 0, + a = 185/255 + }, + secondary = + { + r = fluid.flow_color.r or 0, + g = fluid.flow_color.g or 0, + b = fluid.flow_color.b or 0, + a = 185/255 + } + } or nil +end + --COMPARES ARGUMENT (ARG) AGAINST A TABLE (EXCEP), RETURNS FALSE IF ARG == EXCEP ELSE TRUE function angelsmods.functions.check_exception(arg, excep) for _, exception in pairs(excep) do @@ -882,62 +1279,85 @@ function angelsmods.functions.modify_barreling_recipes() end --CREATE VOID RECIPES -function angelsmods.functions.make_void(fluid_name, void_category) --categories: chemical (flare-stack), water(clarifier) - --LOCAL DEFINITIONS - local void_hidden = angelsmods.trigger.enable_hide_void +function angelsmods.functions.make_void(fluid_name, void_category, void_amount) --categories: chemical (flare-stack), water(clarifier) + --LOCAL DEFINITIONS --amount(optional): amount of input/output local recipe = {} - if data.raw.fluid[fluid_name] then + if data.raw.fluid[fluid_name] then -- fluid voids local fluid_icon = get_icons(fluid_name) - if type(fluid_icon) == "table" then - recipe.icons = fluid_icon + recipe.icons = type(fluid_icon) == "table" and fluid_icon or nil + recipe.icon = type(fluid_icon) ~= "table" and fluid_icon or nil + recipe.icon_size = data.raw.fluid[fluid_name].icon_size or 32 + + if void_category == "water" then + void_amount = void_amount or 400 + void_input_amount = void_amount >= 1 and void_amount or 1 + void_input_type = "fluid" + void_process_time = 5 + void_output_item = "water-void" + void_output_amount = void_amount < 1 and void_amount or 1 + void_output_probability = 0 + + elseif void_category == "chemical" then + void_amount = void_amount or 100 + void_input_amount = void_amount >= 1 and void_amount or 1 + void_input_type = "fluid" + void_process_time = 1 + void_output_item = "chemical-void" + void_output_amount = void_amount < 1 and void_amount or 1 + void_output_probability = 0 + else - recipe.icon = fluid_icon + recipe = nil -- no valid void category found end - if data.raw.fluid[fluid_name].icon_size then - recipe.icon_size = data.raw.fluid[fluid_name].icon_size + + elseif data.raw.item[fluid_name] then -- item voids + if void_category == "bio" then + void_amount = void_amount or 1 + void_input_amount = void_amount >= 1 and void_amount or 1 + void_input_type = "item" + void_process_time = 1 + void_output_item = "solid-compost" + void_output_amount = void_amount < 1 and 1/void_amount or 1 + void_output_probability = 1 + else - recipe.icon_size = 32 - end - if void_category == "water" then - void_amount = 400 - void_item = "water-void" - void_time = 5 - void_type = "fluid" - void = 0 - end - if void_category == "chemical" then - void_amount = 100 - void_item = "chemical-void" - void_time = 1 - void_type = "fluid" - void = 0 + recipe = nil -- no valid void category found end + else - if data.raw.item[fluid_name] then - fluid_icon = data.raw.item[fluid_name].icon - if void_category == "bio" then - void_amount = 1 - void_item = "solid-compost" - void_time = 1 - void_type = "item" - void = 1 - end - end + recipe = nil -- no valid void object found end - recipe.type = "recipe" - recipe.name = "angels-" .. void_category .. "-void-" .. fluid_name - recipe.category = "angels-" .. void_category .. "-void" - recipe.enabled = "true" - recipe.hidden = void_hidden - recipe.energy_required = void_time - recipe.ingredients = {{type = void_type, name = fluid_name, amount = void_amount}} - recipe.results = {{type = "item", name = void_item, amount = 1, probability = void}} - recipe.subgroup = "angels-void" - recipe.order = "angels-" .. void_category .. "-void-" .. fluid_name - - data:extend({recipe}) + if recipe then -- valid + recipe.type = "recipe" + 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.energy_required = void_process_time + recipe.ingredients = + { + { + type = void_input_type, + name = fluid_name, + amount = void_input_amount + } + } + recipe.results = + { + { + type = "item", + name = void_output_item, + amount = void_output_amount, + probability = void_output_probability + } + } + recipe.subgroup = "angels-void" + recipe.order = "angels-" .. void_category .. "-void-" .. fluid_name + + data:extend({recipe}) + end end --CREATE CONVERTER RECIPES (PETROCHEM) diff --git a/angelsrefining/prototypes/buildings/ore-crusher.lua b/angelsrefining/prototypes/buildings/ore-crusher.lua index 9a5dfb2d9..a748477d5 100644 --- a/angelsrefining/prototypes/buildings/ore-crusher.lua +++ b/angelsrefining/prototypes/buildings/ore-crusher.lua @@ -37,7 +37,7 @@ data:extend( }, icon_size = 32, flags = {"placeable-neutral", "player-creation"}, - minable = {mining_time = 1, result = "burner-ore-crusher"}, + minable = {mining_time = 0.5, result = "burner-ore-crusher"}, fast_replaceable_group = "ore-crusher", next_upgrade = "ore-crusher", max_health = 300, diff --git a/angelsrefining/prototypes/override/refining-override-smelting.lua b/angelsrefining/prototypes/override/refining-override-smelting.lua index a78cbfbdb..cd58ce324 100644 --- a/angelsrefining/prototypes/override/refining-override-smelting.lua +++ b/angelsrefining/prototypes/override/refining-override-smelting.lua @@ -13,25 +13,25 @@ OV.disable_recipe("solid-lithium") ------------------------------------------------------------------------------- -- CRUSHED SMELTING ----------------------------------------------------------- ------------------------------------------------------------------------------- -if mods["angelssmelting"] and ore_exists("lead") then +if ore_exists("lead") then OV.patch_recipes({ { name = "angelsore5-crushed-smelting", results = { {"!!"}, - {"angels-plate-lead", 1} + {mods["angelssmelting"] and "angels-plate-lead" or "lead-plate", 1} }, icon = "__angelsrefining__/graphics/icons/lead-plate-crushed.png" } }) end -if mods["angelssmelting"] and ore_exists("tin") then +if ore_exists("tin") then OV.patch_recipes({ { name = "angelsore6-crushed-smelting", results = { {"!!"}, - {"angels-plate-tin", 1} + {mods["angelssmelting"] and "angels-plate-tin" or "tin-plate", 1} }, icon = "__angelsrefining__/graphics/icons/tin-plate-crushed.png" } diff --git a/angelsrefining/prototypes/recipes/water-treatment-recipes.lua b/angelsrefining/prototypes/recipes/water-treatment-recipes.lua index e56aa57ff..c68a66958 100644 --- a/angelsrefining/prototypes/recipes/water-treatment-recipes.lua +++ b/angelsrefining/prototypes/recipes/water-treatment-recipes.lua @@ -1,14 +1,3 @@ -local function create_recipe_icon(fluid_name, overlay_icon) - if not overlay_icon then return angelsmods.functions.get_object_icons(fluid_name) end - local icon_layers = util.table.deepcopy(angelsmods.functions.get_object_icons(overlay_icon)) - for layer_index, layer in pairs(icon_layers) do - layer.shift = layer.shift or {} - layer.shift = {(layer.shift[1] or 0)/2.3-9, (layer.shift[2] or 0)/2.3-9} - layer.scale = (layer.scale or 1)/2.3 - end - return angelsmods.functions.add_icon_layer(angelsmods.functions.get_object_icons(fluid_name), icon_layers) -end - data:extend( { { @@ -194,7 +183,9 @@ data:extend( }, main_product = "water-saline", always_show_products = "true", - icons = create_recipe_icon("water-saline", "water"), + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {039,112,194}, {168,173,173}, {070,133,232}, {185,185,185,0.8} }, { + "water" + }), order = "a[water-saline]-a[water]" }, { @@ -215,7 +206,9 @@ data:extend( }, main_product = "water-saline", always_show_products = "true", - icons = create_recipe_icon("water-saline", "solid-salt"), + icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { {039,112,194}, {168,173,173}, {070,133,232}, {185,185,185,0.8} }, { + "solid-salt" + }), order = "a[water-saline]-b[salt]" }, { @@ -234,7 +227,7 @@ data:extend( {type = "item", name = "solid-salt", amount = 25} }, main_product = "solid-salt", - icons = create_recipe_icon("solid-salt", "water-saline"), + icons = angelsmods.functions.create_solid_recipe_icon(nil, "solid-salt", {"water-saline"}), order = "b[solid-salt-from-saline]" }, { @@ -253,7 +246,7 @@ data:extend( {type = "item", name = "solid-salt", amount = 10} }, main_product = "solid-salt", - icons = create_recipe_icon("solid-salt", "water"), + icons = angelsmods.functions.create_solid_recipe_icon(nil, "solid-salt", {"water"}), order = "c[solid-salt]" }, { diff --git a/angelsrefining/prototypes/refining-override.lua b/angelsrefining/prototypes/refining-override.lua index 620b4ac0d..6ace0cc06 100644 --- a/angelsrefining/prototypes/refining-override.lua +++ b/angelsrefining/prototypes/refining-override.lua @@ -13,12 +13,20 @@ require("prototypes.override.refining-override-smelting") --OVERRIDE FOR WATER TREATMENT require("prototypes.override.refining-override-water-treatment") +--OVERRIDE FOR ANGELs +-- change stack size +data.raw.item["stone-brick"].stack_size = angelsmods.trigger.pavement_stack_size +data.raw.item["concrete"].stack_size = angelsmods.trigger.pavement_stack_size +data.raw.item["hazard-concrete"].stack_size = angelsmods.trigger.pavement_stack_size +data.raw.item["refined-concrete"].stack_size = angelsmods.trigger.pavement_stack_size +data.raw.item["refined-hazard-concrete"].stack_size = angelsmods.trigger.pavement_stack_size +data.raw.item["landfill"].stack_size = angelsmods.trigger.pavement_stack_size + --OVERRIDE FOR BOBs --if bobmods and bobmods.plates then require("prototypes.override.refining-override-bobgems") if mods["bobplates"] then - --OVERRIDE BARRELING if data.raw["item-subgroup"]["bob-gas-bottle"] then data.raw.item["empty-canister"].subgroup = "angels-fluid-control" diff --git a/angelsrefining/settings.lua b/angelsrefining/settings.lua index 0c038ccaf..b126a3c5d 100644 --- a/angelsrefining/settings.lua +++ b/angelsrefining/settings.lua @@ -108,5 +108,14 @@ data:extend( maximum_value = 1000000, order = "cb" }, + { + type = "int-setting", + name = "angels-pavement-stack-size", + setting_type = "startup", + default_value = 200, + minimum_value = 200, + maximum_value = 1000, + order = "d" + }, } ) diff --git a/angelssmelting/changelog.txt b/angelssmelting/changelog.txt index 93e47e9d7..1f35a0e3a 100644 --- a/angelssmelting/changelog.txt +++ b/angelssmelting/changelog.txt @@ -1,6 +1,16 @@ --------------------------------------------------------------------------------------------------- +Version: 0.6.4 +Date: 02.04.2020 + Changes: + - Changed the name from Non Expendable mold to Reusable Mold + - Added basic recipe tints to the induction furnace + recipes + - Changed stack size of pavement items to use refinings setting (was 1000, now 200 by default) + Bugfixes: + - Fixed Concrete Brick and Reinforced Concrete Brick couldn't be placed next to water + - Ensures iron-rods are properly updated/disabled when need be #154 +--------------------------------------------------------------------------------------------------- Version: 0.6.3 -Date: 24-03-2020 +Date: 24.03.2020 Changes: - Make buildings upgradeable #119 Bugfixes: @@ -8,7 +18,7 @@ Date: 24-03-2020 - Fixed temperatures on molten liquids --------------------------------------------------------------------------------------------------- Version: 0.6.2 -Date: 20-03-2020 +Date: 20.03.2020 Changes: - Moved the unlocks for the molds further away: - Expendable Mold from Metalurgy 1 to Stone Smelting 1 diff --git a/angelssmelting/graphics/entity/induction-furnace/induction-furnace-working-visualisation.png b/angelssmelting/graphics/entity/induction-furnace/induction-furnace-working-visualisation.png new file mode 100644 index 000000000..a6c030512 Binary files /dev/null and b/angelssmelting/graphics/entity/induction-furnace/induction-furnace-working-visualisation.png differ diff --git a/angelssmelting/info.json b/angelssmelting/info.json index 75fab9ebf..a2907c82f 100644 --- a/angelssmelting/info.json +++ b/angelssmelting/info.json @@ -1,6 +1,6 @@ { "name": "angelssmelting", - "version": "0.6.3", + "version": "0.6.4", "factorio_version": "0.18", "title": "Angel's Smelting", "author": "Arch666Angel", @@ -10,7 +10,7 @@ "dependencies": [ "base >= 0.18.0", "angelspetrochem >= 0.9.4", - "angelsrefining >= 0.11.5", + "angelsrefining >= 0.11.8", "? bobplates >= 0.15.0" ] } \ No newline at end of file diff --git a/angelssmelting/locale/en/smelting.cfg b/angelssmelting/locale/en/smelting.cfg index 21da6207d..7306eb8b1 100644 --- a/angelssmelting/locale/en/smelting.cfg +++ b/angelssmelting/locale/en/smelting.cfg @@ -290,7 +290,7 @@ angels-plate-zinc=Zinc Plate angels-roll-zinc=Zinc Sheet Coil mold-expendable=Expendable Mold -mold-non-expendable=Non Expendable Mold +mold-non-expendable=Reusable Mold angels-plate-bronze=Bronze Plate angels-plate-brass=Brass Plate diff --git a/angelssmelting/prototypes/buildings/blast-furnace.lua b/angelssmelting/prototypes/buildings/blast-furnace.lua index c53a78de5..3a72824e2 100644 --- a/angelssmelting/prototypes/buildings/blast-furnace.lua +++ b/angelssmelting/prototypes/buildings/blast-furnace.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/blast-furnace.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -28,7 +28,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/blast-furnace.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -108,7 +108,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/blast-furnace.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -128,7 +128,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/blast-furnace.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -208,7 +208,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/blast-furnace.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -228,7 +228,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/blast-furnace.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -308,7 +308,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/blast-furnace.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -328,7 +328,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/blast-furnace.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelssmelting/prototypes/buildings/casting-machine.lua b/angelssmelting/prototypes/buildings/casting-machine.lua index 1484ead22..51cdda887 100644 --- a/angelssmelting/prototypes/buildings/casting-machine.lua +++ b/angelssmelting/prototypes/buildings/casting-machine.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/casting-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -28,7 +28,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/casting-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -122,7 +122,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/casting-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -142,7 +142,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/casting-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -236,7 +236,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/casting-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -256,7 +256,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/casting-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -350,7 +350,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/casting-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -370,7 +370,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/casting-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelssmelting/prototypes/buildings/chemical-furnace.lua b/angelssmelting/prototypes/buildings/chemical-furnace.lua index 81edb5654..22cc28a8b 100644 --- a/angelssmelting/prototypes/buildings/chemical-furnace.lua +++ b/angelssmelting/prototypes/buildings/chemical-furnace.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/chemical-furnace.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -28,7 +28,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/chemical-furnace.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -110,7 +110,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/chemical-furnace.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -130,7 +130,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/chemical-furnace.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -212,7 +212,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/chemical-furnace.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -232,7 +232,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/chemical-furnace.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -314,7 +314,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/chemical-furnace.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -334,7 +334,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/chemical-furnace.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelssmelting/prototypes/buildings/induction-furnace.lua b/angelssmelting/prototypes/buildings/induction-furnace.lua index b45a39006..37c29264c 100644 --- a/angelssmelting/prototypes/buildings/induction-furnace.lua +++ b/angelssmelting/prototypes/buildings/induction-furnace.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/induction-furnace.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -28,7 +28,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/induction-furnace.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -59,25 +59,43 @@ data:extend( }, energy_usage = "150kW", ingredient_count = 2, - animation ={ - layers={ + animation = + { + layers = { - filename = "__angelssmelting__/graphics/entity/induction-furnace/induction-furnace.png", - width = 224, - height = 256, - line_length = 6, - frame_count = 36, - shift = {0, -0.5}, - animation_speed = 0.5, - }, - -- { - -- filename = "__angelssmelting__/graphics/entity/3x3-overlay.png", - -- tint = {r=1, g=0, b=0}, - -- width = 224, - -- height = 224, - -- frame_count = 1, - -- shift = {0, 0}, - -- }, + { + filename = "__angelssmelting__/graphics/entity/induction-furnace/induction-furnace.png", + width = 224, + height = 256, + line_length = 6, + frame_count = 36, + shift = {0, -0.5}, + animation_speed = 0.5, + }, + -- { + -- filename = "__angelssmelting__/graphics/entity/3x3-overlay.png", + -- tint = {r=1, g=0, b=0}, + -- width = 224, + -- height = 224, + -- frame_count = 1, + -- shift = {0, 0}, + -- }, + } + }, + working_visualisations = + { + { + apply_recipe_tint = "primary", + animation = + { + filename = "__angelssmelting__/graphics/entity/induction-furnace/induction-furnace-working-visualisation.png", + width = 224, + height = 256, + line_length = 6, + frame_count = 36, + shift = {0, -0.5}, + animation_speed = 0.5, + } } }, fluid_boxes = @@ -114,7 +132,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/induction-furnace.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -134,7 +152,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/induction-furnace.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -165,25 +183,41 @@ data:extend( }, energy_usage = "200kW", ingredient_count = 4, - animation ={ - layers={ + animation = { + layers = { + { + filename = "__angelssmelting__/graphics/entity/induction-furnace/induction-furnace.png", + width = 224, + height = 256, + line_length = 6, + frame_count = 36, + shift = {0, -0.5}, + animation_speed = 0.5, + }, + -- { + -- filename = "__angelssmelting__/graphics/entity/3x3-overlay.png", + -- tint = {r=1, g=0, b=0}, + -- width = 224, + -- height = 224, + -- frame_count = 1, + -- shift = {0, 0}, + -- }, + } + }, + working_visualisations = + { { - filename = "__angelssmelting__/graphics/entity/induction-furnace/induction-furnace.png", - width = 224, - height = 256, - line_length = 6, - frame_count = 36, - shift = {0, -0.5}, - animation_speed = 0.5, - }, - -- { - -- filename = "__angelssmelting__/graphics/entity/3x3-overlay.png", - -- tint = {r=1, g=0, b=0}, - -- width = 224, - -- height = 224, - -- frame_count = 1, - -- shift = {0, 0}, - -- }, + apply_recipe_tint = "primary", + animation = + { + filename = "__angelssmelting__/graphics/entity/induction-furnace/induction-furnace-working-visualisation.png", + width = 224, + height = 256, + line_length = 6, + frame_count = 36, + shift = {0, -0.5}, + animation_speed = 0.5, + } } }, fluid_boxes = @@ -212,7 +246,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/induction-furnace.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -232,7 +266,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/induction-furnace.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -263,25 +297,41 @@ data:extend( }, energy_usage = "250kW", ingredient_count = 6, - animation ={ - layers={ + animation = { + layers = { + { + filename = "__angelssmelting__/graphics/entity/induction-furnace/induction-furnace.png", + width = 224, + height = 256, + line_length = 6, + frame_count = 36, + shift = {0, -0.5}, + animation_speed = 0.5, + }, + -- { + -- filename = "__angelssmelting__/graphics/entity/3x3-overlay.png", + -- tint = {r=1, g=0, b=0}, + -- width = 224, + -- height = 224, + -- frame_count = 1, + -- shift = {0, 0}, + -- }, + } + }, + working_visualisations = + { { - filename = "__angelssmelting__/graphics/entity/induction-furnace/induction-furnace.png", - width = 224, - height = 256, - line_length = 6, - frame_count = 36, - shift = {0, -0.5}, - animation_speed = 0.5, - }, - -- { - -- filename = "__angelssmelting__/graphics/entity/3x3-overlay.png", - -- tint = {r=1, g=0, b=0}, - -- width = 224, - -- height = 224, - -- frame_count = 1, - -- shift = {0, 0}, - -- }, + apply_recipe_tint = "primary", + animation = + { + filename = "__angelssmelting__/graphics/entity/induction-furnace/induction-furnace-working-visualisation.png", + width = 224, + height = 256, + line_length = 6, + frame_count = 36, + shift = {0, -0.5}, + animation_speed = 0.5, + } } }, fluid_boxes = @@ -310,7 +360,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/induction-furnace.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -330,7 +380,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/induction-furnace.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -360,26 +410,42 @@ data:extend( }, energy_usage = "250kW", ingredient_count = 6, - animation ={ - layers={ + animation = { + layers = { + { + filename = "__angelssmelting__/graphics/entity/induction-furnace/induction-furnace.png", + width = 224, + height = 256, + line_length = 6, + frame_count = 36, + shift = {0, -0.5}, + animation_speed = 0.5, + }, + -- { + -- filename = "__angelssmelting__/graphics/entity/3x3-overlay.png", + -- tint = {r=1, g=0, b=0}, + -- width = 224, + -- height = 224, + -- frame_count = 1, + -- shift = {0, 0}, + -- }, + } + }, + working_visualisations = { - filename = "__angelssmelting__/graphics/entity/induction-furnace/induction-furnace.png", - width = 224, - height = 256, - line_length = 6, - frame_count = 36, - shift = {0, -0.5}, - animation_speed = 0.5, - }, - -- { - -- filename = "__angelssmelting__/graphics/entity/3x3-overlay.png", - -- tint = {r=1, g=0, b=0}, - -- width = 224, - -- height = 224, - -- frame_count = 1, - -- shift = {0, 0}, - -- }, - } + { + apply_recipe_tint = "primary", + animation = + { + filename = "__angelssmelting__/graphics/entity/induction-furnace/induction-furnace-working-visualisation.png", + width = 224, + height = 256, + line_length = 6, + frame_count = 36, + shift = {0, -0.5}, + animation_speed = 0.5, + } + } }, fluid_boxes = { diff --git a/angelssmelting/prototypes/buildings/ore-processing-machine.lua b/angelssmelting/prototypes/buildings/ore-processing-machine.lua index d70784704..2228eb2fe 100644 --- a/angelssmelting/prototypes/buildings/ore-processing-machine.lua +++ b/angelssmelting/prototypes/buildings/ore-processing-machine.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -28,7 +28,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -93,7 +93,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -113,7 +113,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -178,7 +178,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -198,7 +198,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -263,7 +263,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -283,7 +283,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelssmelting/prototypes/buildings/pellet-press.lua b/angelssmelting/prototypes/buildings/pellet-press.lua index 9e04d29cc..f927f3360 100644 --- a/angelssmelting/prototypes/buildings/pellet-press.lua +++ b/angelssmelting/prototypes/buildings/pellet-press.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/pellet-press.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -28,7 +28,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/pellet-press.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -93,7 +93,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/pellet-press.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -113,7 +113,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/pellet-press.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -178,7 +178,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/pellet-press.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -198,7 +198,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/pellet-press.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -263,7 +263,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/pellet-press.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -283,7 +283,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/pellet-press.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelssmelting/prototypes/buildings/powder-mixer.lua b/angelssmelting/prototypes/buildings/powder-mixer.lua index ded995f8f..5c3488392 100644 --- a/angelssmelting/prototypes/buildings/powder-mixer.lua +++ b/angelssmelting/prototypes/buildings/powder-mixer.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -28,7 +28,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -94,7 +94,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -114,7 +114,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -180,7 +180,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -200,7 +200,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -266,7 +266,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -286,7 +286,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelssmelting/prototypes/buildings/sintering-oven.lua b/angelssmelting/prototypes/buildings/sintering-oven.lua index c929ea7a6..651ef3489 100644 --- a/angelssmelting/prototypes/buildings/sintering-oven.lua +++ b/angelssmelting/prototypes/buildings/sintering-oven.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/sintering-oven.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -28,7 +28,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/sintering-oven.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -93,7 +93,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/sintering-oven.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -113,7 +113,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/sintering-oven.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -178,7 +178,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/sintering-oven.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -198,7 +198,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/sintering-oven.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -263,7 +263,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/sintering-oven.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -283,7 +283,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/sintering-oven.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelssmelting/prototypes/buildings/strand-casting-machine.lua b/angelssmelting/prototypes/buildings/strand-casting-machine.lua index 029a5f344..742cd23d4 100644 --- a/angelssmelting/prototypes/buildings/strand-casting-machine.lua +++ b/angelssmelting/prototypes/buildings/strand-casting-machine.lua @@ -8,7 +8,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -28,7 +28,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -125,7 +125,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -145,7 +145,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -242,7 +242,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -262,7 +262,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -359,7 +359,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} @@ -379,7 +379,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png" }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12} diff --git a/angelssmelting/prototypes/items/angels-stone.lua b/angelssmelting/prototypes/items/angels-stone.lua index 2943110ec..f8cbc0b16 100644 --- a/angelssmelting/prototypes/items/angels-stone.lua +++ b/angelssmelting/prototypes/items/angels-stone.lua @@ -37,11 +37,11 @@ data:extend( icon_size = 32, subgroup = "angels-stone", order = "e", - stack_size = 1000, + stack_size = angelsmods.trigger.pavement_stack_size, place_as_tile = { result = "clay-bricks", - condition_size = 4, + condition_size = 2, condition = { "water-tile" } } }, @@ -72,11 +72,11 @@ data:extend( icon_size = 32, subgroup = "angels-stone-casting", order = "i", - stack_size = 1000, + stack_size = angelsmods.trigger.pavement_stack_size, place_as_tile = { result = "concrete", - condition_size = 4, + condition_size = 1, condition = { "water-tile" } } }, @@ -87,11 +87,11 @@ data:extend( icon_size = 32, subgroup = "angels-stone-casting", order = "j", - stack_size = 1000, + stack_size = angelsmods.trigger.pavement_stack_size, place_as_tile = { result = "concrete", - condition_size = 4, + condition_size = 1, condition = { "water-tile" } } }, diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-brass.lua b/angelssmelting/prototypes/override/smelting-override-alloy-brass.lua index f31f50f65..86147a068 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-brass.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-brass.lua @@ -28,6 +28,8 @@ if angelsmods.trigger.smelting_products["brass"].plate then flow_to_energy_ratio = 0.59, auto_barrel = false }, + }) + data:extend({ --SMELTING { type = "recipe", @@ -50,14 +52,15 @@ if angelsmods.trigger.smelting_products["brass"].plate then icon = "__angelssmelting__/graphics/icons/molten-brass.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, } }, icon_size = 32, - order = "b[brass]-a[liquid-molten-brass]-a" + order = "b[brass]-a[liquid-molten-brass]-a", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-brass") }, { type = "recipe", @@ -81,14 +84,15 @@ if angelsmods.trigger.smelting_products["brass"].plate then icon = "__angelssmelting__/graphics/icons/molten-brass.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, } }, icon_size = 32, - order = "b[brass]-a[liquid-molten-brass]-b" + order = "b[brass]-a[liquid-molten-brass]-b", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-brass") }, { type = "recipe", @@ -112,14 +116,15 @@ if angelsmods.trigger.smelting_products["brass"].plate then icon = "__angelssmelting__/graphics/icons/molten-brass.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, } }, icon_size = 32, - order = "b[brass]-a[liquid-molten-brass]-c" + order = "b[brass]-a[liquid-molten-brass]-c", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-brass") }, --CASTING { diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua b/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua index 36876f08b..8193ce73f 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua @@ -28,6 +28,8 @@ if angelsmods.trigger.smelting_products["bronze"].plate then flow_to_energy_ratio = 0.59, auto_barrel = false }, + }) + data:extend({ --SMELTING { type = "recipe", @@ -50,7 +52,7 @@ if angelsmods.trigger.smelting_products["bronze"].plate then icon = "__angelssmelting__/graphics/icons/molten-bronze.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -58,6 +60,7 @@ if angelsmods.trigger.smelting_products["bronze"].plate then }, icon_size = 32, order = "a[bronze]-a[liquid-molten-bronze]-a", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-bronze") }, { type = "recipe", @@ -81,7 +84,7 @@ if angelsmods.trigger.smelting_products["bronze"].plate then icon = "__angelssmelting__/graphics/icons/molten-bronze.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -89,6 +92,7 @@ if angelsmods.trigger.smelting_products["bronze"].plate then }, icon_size = 32, order = "a[bronze]-a[liquid-molten-bronze]-b", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-bronze") }, { type = "recipe", @@ -111,7 +115,7 @@ if angelsmods.trigger.smelting_products["bronze"].plate then icon = "__angelssmelting__/graphics/icons/molten-bronze.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -119,6 +123,7 @@ if angelsmods.trigger.smelting_products["bronze"].plate then }, icon_size = 32, order = "a[bronze]-a[liquid-molten-bronze]-c", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-bronze") }, --CASTING { diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-cobalt-steel.lua b/angelssmelting/prototypes/override/smelting-override-alloy-cobalt-steel.lua index 1514eb345..f939e5509 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-cobalt-steel.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-cobalt-steel.lua @@ -28,6 +28,8 @@ if angelsmods.trigger.smelting_products["cobalt-steel"].plate then flow_to_energy_ratio = 0.59, auto_barrel = false }, + }) + data:extend({ --SMELTING { type = "recipe", @@ -50,14 +52,15 @@ if angelsmods.trigger.smelting_products["cobalt-steel"].plate then icon = "__angelssmelting__/graphics/icons/molten-cobalt-steel.png", }, -- { - -- icon = "__angelspetrochem__/graphics/icons/num_1.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]" + order = "e[cobalt-steel]-a[liquid-molten-cobalt-steel]", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-cobalt-steel") }, --CASTING { diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-gunmetal.lua b/angelssmelting/prototypes/override/smelting-override-alloy-gunmetal.lua index bb4b845e0..7af0dc31d 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-gunmetal.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-gunmetal.lua @@ -28,6 +28,8 @@ if angelsmods.trigger.smelting_products["gunmetal"].plate then flow_to_energy_ratio = 0.59, auto_barrel = false }, + }) + data:extend({ --SMELTING { type = "recipe", @@ -51,14 +53,15 @@ if angelsmods.trigger.smelting_products["gunmetal"].plate then icon = "__angelssmelting__/graphics/icons/molten-gunmetal.png", }, -- { - -- icon = "__angelspetrochem__/graphics/icons/num_1.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]" + order = "c[gunmetal]-a[liquid-molten-gunmetal]", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-gunmetal") }, --CASTING { diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-invar.lua b/angelssmelting/prototypes/override/smelting-override-alloy-invar.lua index 0b297c056..3c2f8bec1 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-invar.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-invar.lua @@ -30,6 +30,8 @@ if angelsmods.trigger.smelting_products["invar"].plate then flow_to_energy_ratio = 0.59, auto_barrel = false }, + }) + data:extend({ --RECIPES --SMELTING { @@ -53,14 +55,15 @@ if angelsmods.trigger.smelting_products["invar"].plate then icon = "__angelssmelting__/graphics/icons/molten-invar.png", }, -- { - -- icon = "__angelspetrochem__/graphics/icons/num_1.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]" + order = "d[invar]-a[liquid-molten-invar]", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-invar") }, --CASTING { diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-nitinol.lua b/angelssmelting/prototypes/override/smelting-override-alloy-nitinol.lua index 4fb2d4928..f9db1944d 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-nitinol.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-nitinol.lua @@ -28,6 +28,8 @@ if angelsmods.trigger.smelting_products["nitinol"].plate then flow_to_energy_ratio = 0.59, auto_barrel = false }, + }) + data:extend({ --SMELTING { type = "recipe", @@ -49,14 +51,15 @@ if angelsmods.trigger.smelting_products["nitinol"].plate then icon = "__angelssmelting__/graphics/icons/molten-nitinol.png", }, -- { - -- icon = "__angelspetrochem__/graphics/icons/num_1.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]" + order = "f[nitinol]-a[liquid-molten-nitinol]", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-nitinol") }, --CASTING { diff --git a/angelssmelting/prototypes/override/smelting-override-iron.lua b/angelssmelting/prototypes/override/smelting-override-iron.lua index 86b2b9bfc..854437c56 100644 --- a/angelssmelting/prototypes/override/smelting-override-iron.lua +++ b/angelssmelting/prototypes/override/smelting-override-iron.lua @@ -11,23 +11,26 @@ end ------------------------------------------------------------------------------- -- ORE ------------------------------------------------------------------------ ------------------------------------------------------------------------------- -angelsmods.functions.override_item_conditions({ - value = 200, - list = { - "iron-ore", +angelsmods.functions.override_item_conditions( + { + value = 200, + list = { + "iron-ore" + } } -}) +) angelsmods.functions.move_item("iron-ore", "angels-iron", "a") ------------------------------------------------------------------------------- -- INGOT ---------------------------------------------------------------------- ------------------------------------------------------------------------------- if angelsmods.trigger.smelting_products["iron"].ingot then - if angelsmods.trigger.smelting_products["lead"].plate or - angelsmods.trigger.smelting_products["tin"].plate then + if angelsmods.trigger.smelting_products["lead"].plate or angelsmods.trigger.smelting_products["tin"].plate then else -- special vanilla - OV.disable_recipe({"molten-iron-smelting-2", "molten-iron-smelting-3", "molten-iron-smelting-4", "molten-iron-smelting-5"}) + OV.disable_recipe( + {"molten-iron-smelting-2", "molten-iron-smelting-3", "molten-iron-smelting-4", "molten-iron-smelting-5"} + ) end else --todo @@ -37,59 +40,58 @@ end -- PLATE ---------------------------------------------------------------------- ------------------------------------------------------------------------------- if angelsmods.trigger.smelting_products["iron"].plate then - OV.patch_recipes({ + OV.patch_recipes( { - name = "iron-plate", - energy_required = 10.5, - normal = { - ingredients = - { - { name = "iron-ore", type = "item", amount = "+3" } + name = "iron-plate", + energy_required = 10.5, + normal = { + ingredients = { + {name = "iron-ore", type = "item", amount = "+3"} + }, + results = { + {name = "iron-plate", type = "item", amount = "+2"} + } }, - results = - { - { name = "iron-plate", type = "item", amount = "+2" } - } - }, - expensive = - { - ingredients = - { {"!!"}, - { name = "iron-ore", type = "item", amount = 5 * intermediatemulti } + expensive = { + ingredients = { + {"!!"}, + {name = "iron-ore", type = "item", amount = 5 * intermediatemulti} + }, + results = { + {name = "iron-plate", type = "item", amount = "+2"} + } }, - results = - { - { name = "iron-plate", type = "item", amount = "+2" } - } - }, - icons = { - { - icon = "__angelssmelting__/graphics/icons/plate-iron.png", + icons = { + { + icon = "__angelssmelting__/graphics/icons/plate-iron.png" + }, + { + icon = "__base__/graphics/icons/iron-ore.png", + icon_size = 64, + scale = 32 / 64 * 0.4375, + shift = {-10, -10} + } }, - { - icon = "__base__/graphics/icons/iron-ore.png", - icon_size = 64, - scale = 32/64 * 0.4375, - shift = { -10, -10}, - } - }, - icon_size = 32, - subgroup = "angels-iron-casting", - order = "l[angels-plate-iron]-b" - }, - }) + icon_size = 32, + subgroup = "angels-iron-casting", + order = "l[angels-plate-iron]-b" + } + } + ) OV.global_replace_item("angels-plate-iron", "iron-plate") angelsmods.functions.add_flag("angels-plate-iron", "hidden") if angelsmods.refining then - OV.patch_recipes({ + OV.patch_recipes( { - name = "angelsore1-crushed-smelting", - subgroup = "angels-iron-casting", - order = "l[angels-plate-iron]-a" - }, - }) + { + name = "angelsore1-crushed-smelting", + subgroup = "angels-iron-casting", + order = "l[angels-plate-iron]-a" + } + } + ) end else --todo @@ -101,14 +103,17 @@ end if angelsmods.trigger.smelting_products["iron"].powder then else angelsmods.functions.add_flag("powder-iron", "hidden") - OV.disable_recipe({ "powder-iron" }) + OV.disable_recipe({"powder-iron"}) 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"}) 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" }) + OV.disable_recipe({"rod-stack-iron-casting", "rod-stack-iron-casting-fast"}) + OV.disable_recipe({"angels-rod-iron-plate", "angels-rod-stack-iron-converting"}) end diff --git a/angelssmelting/prototypes/override/smelting-override-stone.lua b/angelssmelting/prototypes/override/smelting-override-stone.lua index fabda6e48..e076291e4 100644 --- a/angelssmelting/prototypes/override/smelting-override-stone.lua +++ b/angelssmelting/prototypes/override/smelting-override-stone.lua @@ -27,7 +27,7 @@ OV.patch_recipes({ icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelssmelting/prototypes/override/smelting-override-tungsten.lua b/angelssmelting/prototypes/override/smelting-override-tungsten.lua index 323146c5e..d87fb64a9 100644 --- a/angelssmelting/prototypes/override/smelting-override-tungsten.lua +++ b/angelssmelting/prototypes/override/smelting-override-tungsten.lua @@ -65,7 +65,7 @@ if angelsmods.trigger.smelting_products["tungsten"].plate then icon_size = 64, }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -83,7 +83,7 @@ if angelsmods.trigger.smelting_products["tungsten"].plate then icon_size = 64, }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelssmelting/prototypes/recipes/smelting-alloys.lua b/angelssmelting/prototypes/recipes/smelting-alloys.lua index 6820ea032..255f7d360 100644 --- a/angelssmelting/prototypes/recipes/smelting-alloys.lua +++ b/angelssmelting/prototypes/recipes/smelting-alloys.lua @@ -61,7 +61,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-steel.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -69,6 +69,8 @@ data:extend( }, icon_size = 32, order = "i[liquid-molten-steel]-a", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") + }, { type = "recipe", @@ -91,7 +93,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-steel.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -99,6 +101,7 @@ data:extend( }, icon_size = 32, order = "i[liquid-molten-steel]-b", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") }, { type = "recipe", @@ -121,7 +124,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-steel.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -129,6 +132,7 @@ data:extend( }, icon_size = 32, order = "i[liquid-molten-steel]-c", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") }, { type = "recipe", @@ -152,7 +156,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-steel.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -160,6 +164,7 @@ data:extend( }, icon_size = 32, order = "i[liquid-molten-steel]-d", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") }, { type = "recipe", @@ -183,7 +188,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-steel.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_5.png", + icon = "__angelsrefining__/graphics/icons/num_5.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -191,6 +196,7 @@ data:extend( }, icon_size = 32, order = "i[liquid-molten-steel]-e", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel") }, { type = "recipe", @@ -230,7 +236,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-steel.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -281,7 +287,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-steel.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -328,7 +334,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/rod-stack-steel.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -379,7 +385,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/rod-stack-steel.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -561,7 +567,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-solder.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -569,6 +575,7 @@ data:extend( }, icon_size = 32, order = "b[liquid-molten-solder]-a", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-solder") }, { type = "recipe", @@ -591,7 +598,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-solder.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -599,6 +606,7 @@ data:extend( }, icon_size = 32, order = "b[liquid-molten-solder]-b", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-solder") }, { type = "recipe", @@ -621,7 +629,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-solder.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -629,6 +637,7 @@ data:extend( }, icon_size = 32, order = "b[liquid-molten-solder]-c", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-solder") }, { type = "recipe", @@ -652,7 +661,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-solder.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -660,6 +669,7 @@ data:extend( }, icon_size = 32, order = "b[liquid-molten-solder]-d", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-solder") }, { type = "recipe", @@ -699,7 +709,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-solder.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -750,7 +760,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-solder.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelssmelting/prototypes/recipes/smelting-aluminium.lua b/angelssmelting/prototypes/recipes/smelting-aluminium.lua index 4af84037d..1523fd912 100644 --- a/angelssmelting/prototypes/recipes/smelting-aluminium.lua +++ b/angelssmelting/prototypes/recipes/smelting-aluminium.lua @@ -85,7 +85,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/solid-aluminium-hydroxide.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -115,7 +115,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/solid-aluminium-hydroxide.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -144,7 +144,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/solid-aluminium-oxide.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -177,7 +177,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/solid-aluminium-oxide.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -245,7 +245,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-aluminium.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -253,6 +253,7 @@ data:extend( }, icon_size = 32, order = "i[liquid-molten-aluminium]-a", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-aluminium") }, { type = "recipe", @@ -275,7 +276,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-aluminium.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.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}, @@ -283,6 +284,7 @@ data:extend( }, icon_size = 32, order = "i[liquid-molten-aluminium]-b", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-aluminium") }, { type = "recipe", @@ -306,7 +308,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-aluminium.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.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}, @@ -314,6 +316,7 @@ data:extend( }, icon_size = 32, order = "i[liquid-molten-aluminium]-c", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-aluminium") }, { type = "recipe", @@ -353,7 +356,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-aluminium.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.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}, @@ -404,7 +407,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-aluminium.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.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}, diff --git a/angelssmelting/prototypes/recipes/smelting-chrome.lua b/angelssmelting/prototypes/recipes/smelting-chrome.lua index 204e8b812..4ad2e3327 100644 --- a/angelssmelting/prototypes/recipes/smelting-chrome.lua +++ b/angelssmelting/prototypes/recipes/smelting-chrome.lua @@ -128,7 +128,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-chrome.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -160,7 +160,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-chrome.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -192,7 +192,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-chrome.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -237,6 +237,7 @@ data:extend( }, icon_size = 32, order = "i[liquid-molten-chrome]", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-chrome") }, { type = "recipe", @@ -276,7 +277,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-chrome.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.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}, @@ -327,7 +328,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-chrome.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.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}, diff --git a/angelssmelting/prototypes/recipes/smelting-cobalt.lua b/angelssmelting/prototypes/recipes/smelting-cobalt.lua index ee43ee308..23c112247 100644 --- a/angelssmelting/prototypes/recipes/smelting-cobalt.lua +++ b/angelssmelting/prototypes/recipes/smelting-cobalt.lua @@ -80,7 +80,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/solid-cobalt-oxide.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -110,7 +110,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/solid-cobalt-oxide.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -141,7 +141,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-cobalt.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -171,7 +171,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-cobalt.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -216,6 +216,7 @@ data:extend( }, icon_size = 32, order = "h[liquid-molten-cobalt]", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-cobalt") }, { type = "recipe", @@ -255,7 +256,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-cobalt.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.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}, @@ -306,7 +307,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-cobalt.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.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}, diff --git a/angelssmelting/prototypes/recipes/smelting-copper.lua b/angelssmelting/prototypes/recipes/smelting-copper.lua index b4dc81b0b..1174977b4 100644 --- a/angelssmelting/prototypes/recipes/smelting-copper.lua +++ b/angelssmelting/prototypes/recipes/smelting-copper.lua @@ -82,7 +82,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-copper.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -111,7 +111,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-copper.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -141,7 +141,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-copper.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -186,6 +186,7 @@ data:extend( }, icon_size = 32, order = "g[liquid-molten-copper]", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-copper") }, { type = "recipe", @@ -225,7 +226,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-copper.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -277,7 +278,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-copper.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -324,7 +325,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/wire-coil-copper.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -375,7 +376,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/wire-coil-copper.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelssmelting/prototypes/recipes/smelting-glass.lua b/angelssmelting/prototypes/recipes/smelting-glass.lua index 6b09293f8..f42d3f8e9 100644 --- a/angelssmelting/prototypes/recipes/smelting-glass.lua +++ b/angelssmelting/prototypes/recipes/smelting-glass.lua @@ -25,7 +25,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/glass-mixture.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -55,7 +55,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/glass-mixture.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -86,7 +86,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/glass-mixture.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -118,7 +118,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/glass-mixture.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -145,6 +145,7 @@ data:extend( }, icon_size = 32, order = "b[liquid-molten-glass]", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-glass") }, { type = "recipe", @@ -217,7 +218,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/plate-glass.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -268,7 +269,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/plate-glass.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -321,7 +322,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/plate-glass.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelssmelting/prototypes/recipes/smelting-gold.lua b/angelssmelting/prototypes/recipes/smelting-gold.lua index 1678c571e..7b0053fcf 100644 --- a/angelssmelting/prototypes/recipes/smelting-gold.lua +++ b/angelssmelting/prototypes/recipes/smelting-gold.lua @@ -110,7 +110,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/cathode-gold.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -139,7 +139,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/cathode-gold.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -170,7 +170,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-gold.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -199,7 +199,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-gold.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -246,6 +246,7 @@ data:extend( --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") }, { type = "recipe", @@ -285,7 +286,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-gold.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.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}, @@ -336,7 +337,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-gold.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.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}, @@ -385,7 +386,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/wire-coil-gold.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -438,7 +439,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/wire-coil-gold.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelssmelting/prototypes/recipes/smelting-iron.lua b/angelssmelting/prototypes/recipes/smelting-iron.lua index ce8a2c135..42691a9ff 100644 --- a/angelssmelting/prototypes/recipes/smelting-iron.lua +++ b/angelssmelting/prototypes/recipes/smelting-iron.lua @@ -62,7 +62,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-iron.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -92,7 +92,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-iron.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -123,7 +123,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-iron.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -155,7 +155,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-iron.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -205,7 +205,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-iron.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -213,6 +213,7 @@ data:extend( }, icon_size = 32, order = "i[liquid-molten-iron]-a", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-iron") }, { type = "recipe", @@ -235,7 +236,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-iron.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -243,6 +244,7 @@ data:extend( }, icon_size = 32, order = "i[liquid-molten-iron]-b", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-iron") }, { type = "recipe", @@ -265,7 +267,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-iron.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -273,6 +275,7 @@ data:extend( }, icon_size = 32, order = "i[liquid-molten-iron]-c", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-iron") }, { type = "recipe", @@ -296,7 +299,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-iron.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -304,6 +307,7 @@ data:extend( }, icon_size = 32, order = "i[liquid-molten-iron]-d", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-iron") }, { type = "recipe", @@ -327,7 +331,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-iron.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_5.png", + icon = "__angelsrefining__/graphics/icons/num_5.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -335,6 +339,7 @@ data:extend( }, icon_size = 32, order = "i[liquid-molten-iron]-e", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-iron") }, { type = "recipe", @@ -374,7 +379,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-iron.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -425,7 +430,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-iron.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -472,7 +477,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/rod-stack-iron.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -523,7 +528,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/rod-stack-iron.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelssmelting/prototypes/recipes/smelting-lead.lua b/angelssmelting/prototypes/recipes/smelting-lead.lua index 0aed93546..5ccebae15 100644 --- a/angelssmelting/prototypes/recipes/smelting-lead.lua +++ b/angelssmelting/prototypes/recipes/smelting-lead.lua @@ -131,7 +131,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-lead.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -162,7 +162,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-lead.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -194,7 +194,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-lead.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -239,6 +239,7 @@ data:extend( }, icon_size = 32, order = "i[liquid-molten-lead]", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-lead") }, { type = "recipe", @@ -278,7 +279,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-lead.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -329,7 +330,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-lead.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelssmelting/prototypes/recipes/smelting-manganese.lua b/angelssmelting/prototypes/recipes/smelting-manganese.lua index afd735fd3..e12870d23 100644 --- a/angelssmelting/prototypes/recipes/smelting-manganese.lua +++ b/angelssmelting/prototypes/recipes/smelting-manganese.lua @@ -80,7 +80,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/cathode-manganese.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -113,7 +113,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/cathode-manganese.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -144,7 +144,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-manganese.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -173,7 +173,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-manganese.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -218,6 +218,7 @@ data:extend( }, icon_size = 32, order = "h[liquid-molten-manganese]", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-manganese") }, { type = "recipe", @@ -257,7 +258,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-manganese.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.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}, @@ -308,7 +309,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-manganese.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.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}, diff --git a/angelssmelting/prototypes/recipes/smelting-nickel.lua b/angelssmelting/prototypes/recipes/smelting-nickel.lua index c04f42b52..eac6fdc5e 100644 --- a/angelssmelting/prototypes/recipes/smelting-nickel.lua +++ b/angelssmelting/prototypes/recipes/smelting-nickel.lua @@ -101,7 +101,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-nickel.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -130,7 +130,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-nickel.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -160,7 +160,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-nickel.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -205,6 +205,7 @@ data:extend( }, icon_size = 32, order = "h[liquid-molten-nickel]", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-nickel") }, { type = "recipe", @@ -244,7 +245,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-nickel.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.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}, @@ -295,7 +296,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-nickel.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.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}, diff --git a/angelssmelting/prototypes/recipes/smelting-platinum.lua b/angelssmelting/prototypes/recipes/smelting-platinum.lua index 1cc73adcc..3d7d37bbf 100644 --- a/angelssmelting/prototypes/recipes/smelting-platinum.lua +++ b/angelssmelting/prototypes/recipes/smelting-platinum.lua @@ -102,7 +102,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-platinum.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -132,7 +132,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-platinum.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -161,7 +161,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-platinum.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -205,6 +205,7 @@ data:extend( }, icon_size = 32, order = "h[liquid-molten-platinum]", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-platinum") }, { type = "recipe", @@ -244,7 +245,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-platinum.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -295,7 +296,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-platinum.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -344,7 +345,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/wire-coil-platinum.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -397,7 +398,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/wire-coil-platinum.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelssmelting/prototypes/recipes/smelting-silicon.lua b/angelssmelting/prototypes/recipes/smelting-silicon.lua index 190f2dc83..7a265be5d 100644 --- a/angelssmelting/prototypes/recipes/smelting-silicon.lua +++ b/angelssmelting/prototypes/recipes/smelting-silicon.lua @@ -115,7 +115,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-silicon.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -145,7 +145,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-silicon.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -175,7 +175,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-silicon.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -222,6 +222,7 @@ data:extend( --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") }, { type = "recipe", @@ -332,7 +333,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/silicon-mono.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -385,7 +386,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/silicon-mono.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelssmelting/prototypes/recipes/smelting-silver.lua b/angelssmelting/prototypes/recipes/smelting-silver.lua index 7cd3cc425..f0bfe518c 100644 --- a/angelssmelting/prototypes/recipes/smelting-silver.lua +++ b/angelssmelting/prototypes/recipes/smelting-silver.lua @@ -121,7 +121,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-silver.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -150,7 +150,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-silver.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -179,7 +179,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-silver.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -224,6 +224,7 @@ data:extend( }, icon_size = 32, order = "j[liquid-molten-silver]", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-silver") }, { type = "recipe", @@ -263,7 +264,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-silver.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.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}, @@ -314,7 +315,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-silver.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.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}, @@ -363,7 +364,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/wire-coil-silver.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -416,7 +417,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/wire-coil-silver.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelssmelting/prototypes/recipes/smelting-stone.lua b/angelssmelting/prototypes/recipes/smelting-stone.lua index f9b5e1ce1..808ac90ca 100644 --- a/angelssmelting/prototypes/recipes/smelting-stone.lua +++ b/angelssmelting/prototypes/recipes/smelting-stone.lua @@ -46,7 +46,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/solid-cement.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -78,7 +78,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/solid-cement.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -149,7 +149,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-concrete.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -181,7 +181,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-concrete.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -212,7 +212,7 @@ data:extend( icon_size = 64 }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelssmelting/prototypes/recipes/smelting-support.lua b/angelssmelting/prototypes/recipes/smelting-support.lua index 0721b4e9f..f61e49392 100644 --- a/angelssmelting/prototypes/recipes/smelting-support.lua +++ b/angelssmelting/prototypes/recipes/smelting-support.lua @@ -113,7 +113,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/liquid-coolant-used.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.refining.number_tint, scale = 0.32, shift = {-12, -12}, @@ -145,7 +145,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/liquid-coolant-used.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.refining.number_tint, scale = 0.32, shift = {-12, -12}, @@ -177,7 +177,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/liquid-coolant-used.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.refining.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelssmelting/prototypes/recipes/smelting-tin.lua b/angelssmelting/prototypes/recipes/smelting-tin.lua index 8f113c4d8..aa09ce6a6 100644 --- a/angelssmelting/prototypes/recipes/smelting-tin.lua +++ b/angelssmelting/prototypes/recipes/smelting-tin.lua @@ -61,7 +61,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-tin.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -91,7 +91,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-tin.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -121,7 +121,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-tin.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -167,6 +167,7 @@ data:extend( 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") }, { type = "recipe", @@ -206,7 +207,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-tin.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.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}, @@ -257,7 +258,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-tin.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.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}, @@ -306,7 +307,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/wire-coil-tin.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -359,7 +360,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/wire-coil-tin.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelssmelting/prototypes/recipes/smelting-titanium.lua b/angelssmelting/prototypes/recipes/smelting-titanium.lua index 6ff272a9b..1e049bd14 100644 --- a/angelssmelting/prototypes/recipes/smelting-titanium.lua +++ b/angelssmelting/prototypes/recipes/smelting-titanium.lua @@ -63,7 +63,7 @@ data:extend( { "__angelssmelting__/graphics/icons/molecule-titanium-tetrachloride.png", 72 } }, "ill", { { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", icon_size = 32, tint = angelsmods.smelting.number_tint, } @@ -93,7 +93,7 @@ data:extend( { "__angelssmelting__/graphics/icons/molecule-titanium-tetrachloride.png", 72 } }, "ill", { { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", icon_size = 32, tint = angelsmods.smelting.number_tint, } @@ -139,7 +139,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-titanium.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -172,7 +172,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-titanium.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -220,7 +220,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-titanium.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -228,6 +228,7 @@ data:extend( }, icon_size = 32, order = "h[liquid-molten-titanium]-a", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-titanium") }, { type = "recipe", @@ -250,7 +251,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-titanium.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -258,6 +259,7 @@ data:extend( }, icon_size = 32, order = "h[liquid-molten-titanium]-b", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-titanium") }, { type = "recipe", @@ -280,7 +282,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-titanium.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -288,6 +290,7 @@ data:extend( }, icon_size = 32, order = "h[liquid-molten-titanium]-c", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-titanium") }, { type = "recipe", @@ -311,7 +314,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-titanium.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_4.png", + icon = "__angelsrefining__/graphics/icons/num_4.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -319,6 +322,7 @@ data:extend( }, icon_size = 32, order = "h[liquid-molten-titanium]-d", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-titanium") }, { type = "recipe", @@ -342,7 +346,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/molten-titanium.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_5.png", + icon = "__angelsrefining__/graphics/icons/num_5.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -350,6 +354,7 @@ data:extend( }, icon_size = 32, order = "h[liquid-molten-titanium]-e", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-titanium") }, { type = "recipe", @@ -389,7 +394,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-titanium.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -440,7 +445,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-titanium.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelssmelting/prototypes/recipes/smelting-tungsten.lua b/angelssmelting/prototypes/recipes/smelting-tungsten.lua index 8d77613bf..ba38643d5 100644 --- a/angelssmelting/prototypes/recipes/smelting-tungsten.lua +++ b/angelssmelting/prototypes/recipes/smelting-tungsten.lua @@ -81,7 +81,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/solid-tungsten-oxide.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -111,7 +111,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/solid-tungsten-oxide.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -183,7 +183,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -213,7 +213,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -244,7 +244,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/powder-tungsten-mixture.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -274,7 +274,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/powder-tungsten-mixture.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, diff --git a/angelssmelting/prototypes/recipes/smelting-zinc.lua b/angelssmelting/prototypes/recipes/smelting-zinc.lua index 49ee31e70..6b4639d4e 100644 --- a/angelssmelting/prototypes/recipes/smelting-zinc.lua +++ b/angelssmelting/prototypes/recipes/smelting-zinc.lua @@ -110,7 +110,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-zinc.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.png", + icon = "__angelsrefining__/graphics/icons/num_1.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -143,7 +143,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-zinc.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.png", + icon = "__angelsrefining__/graphics/icons/num_2.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -172,7 +172,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/ingot-zinc.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_3.png", + icon = "__angelsrefining__/graphics/icons/num_3.png", tint = angelsmods.smelting.number_tint, scale = 0.32, shift = {-12, -12}, @@ -217,6 +217,7 @@ data:extend( }, icon_size = 32, order = "h[liquid-molten-zinc]", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-zinc") }, { type = "recipe", @@ -256,7 +257,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-zinc.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_1.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}, @@ -307,7 +308,7 @@ data:extend( icon = "__angelssmelting__/graphics/icons/roll-zinc.png", }, { - icon = "__angelspetrochem__/graphics/icons/num_2.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}, diff --git a/mod-list.json b/mod-list.json deleted file mode 100644 index ef4dcef20..000000000 --- a/mod-list.json +++ /dev/null @@ -1,186 +0,0 @@ - -{ - "mods": - [ - - { - "name": "base", - "enabled": true - }, - - { - "name": "angelsaddons-cab", - "enabled": false - }, - - { - "name": "angelsaddons-liquidrobot", - "enabled": false - }, - - { - "name": "angelsaddons-nilaus", - "enabled": false - }, - - { - "name": "angelsaddons-oresilos", - "enabled": false - }, - - { - "name": "angelsaddons-petrotrain", - "enabled": false - }, - - { - "name": "angelsaddons-pressuretanks", - "enabled": false - }, - - { - "name": "angelsaddons-shred", - "enabled": false - }, - - { - "name": "angelsaddons-smeltingtrain", - "enabled": false - }, - - { - "name": "angelsaddons-warehouses", - "enabled": false - }, - - { - "name": "angelsbioprocessing", - "enabled": false - }, - - { - "name": "angelsexploration", - "enabled": false - }, - - { - "name": "angelsindustries", - "enabled": false - }, - - { - "name": "angelsinfiniteores", - "enabled": true - }, - - { - "name": "angelspetrochem", - "enabled": false - }, - - { - "name": "angelsrefining", - "enabled": false - }, - - { - "name": "angelssmelting", - "enabled": false - }, - - { - "name": "bobassembly", - "enabled": true - }, - - { - "name": "bobelectronics", - "enabled": true - }, - - { - "name": "bobenemies", - "enabled": true - }, - - { - "name": "bobequipment", - "enabled": true - }, - - { - "name": "bobgreenhouse", - "enabled": true - }, - - { - "name": "bobinserters", - "enabled": true - }, - - { - "name": "boblibrary", - "enabled": true - }, - - { - "name": "boblogistics", - "enabled": true - }, - - { - "name": "bobmining", - "enabled": true - }, - - { - "name": "bobmodules", - "enabled": true - }, - - { - "name": "bobores", - "enabled": true - }, - - { - "name": "bobplates", - "enabled": true - }, - - { - "name": "bobpower", - "enabled": true - }, - - { - "name": "bobrevamp", - "enabled": true - }, - - { - "name": "bobtech", - "enabled": true - }, - - { - "name": "bobvehicleequipment", - "enabled": true - }, - - { - "name": "bobwarfare", - "enabled": true - }, - - { - "name": "FNEI", - "enabled": false - }, - - { - "name": "helmod", - "enabled": false - } - ] -} diff --git a/mod-settings.dat b/mod-settings.dat deleted file mode 100644 index d8bd940bd..000000000 Binary files a/mod-settings.dat and /dev/null differ