Version 1.1.3 (#953)

.gitignore

@@ -12,4 +12,7 @@ __pycache__/
 
 # Unit test files
 angelsdev-unit-test/log/
-run_unit_tests_PWJ.bat
+run_unit_tests_PWJ.bat
+
+# Windows explorer cache
+Thumbs.db

angelsaddons-cab/changelog.txt

@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.2.9
+Date: 22.12.2023
+  Changes:
+    - Cleanup of prototype data
+---------------------------------------------------------------------------------------------------
 Version: 0.2.8
 Date: 19.12.2021
   Changes:

angelsaddons-cab/info.json

@@ -1,6 +1,6 @@
 {
   "name": "angelsaddons-cab",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "factorio_version": "1.1",
   "title": "Angel's Addons - C.A.B.",
   "author": "Arch666Angel, lovely_santa",

angelsaddons-cab/prototypes/entities/equipment.lua

@@ -92,19 +92,6 @@ data:extend({
       --output_flow_limit = "0W",
     },
     energy_input = "0W",
-    tint = { r = 1, g = 1, b = 1, a = 0 },
-    desaturation_params = {
-      smoothstep_min = 0.1,
-      smoothstep_max = 0.7,
-      minimum = 0.3,
-      maximum = 1.0,
-    },
-    light_params = {
-      smoothstep_min = 0.1,
-      smoothstep_max = 0.7,
-      minimum = 0.666,
-      maximum = 1.0,
-    },
     categories = { "angels-cab" },
     darkness_to_turn_on = 0,
     color_lookup = { { 0.5, "__core__/graphics/color_luts/nightvision.png" } },
@@ -119,7 +106,6 @@ data:extend({
     icon = "__angelsaddons-cab__/graphics/icons/cab-icon.png",
     icon_size = 32,
     flags = { "not-blueprintable", "not-deconstructable", "not-on-map", "hide-alt-info" },
-    enable_gui = false,
     allow_copy_paste = false,
     --minable = {mining_time = 1, result = energyInterfaceItem.name},
     max_health = 50,
@@ -139,7 +125,7 @@ data:extend({
       render_no_power_icon = false,
     },
     energy_production = "0kW",
-    energy_consumption = "0kW",
+    energy_usage = "0kW",
     picture = {
       filename = "__core__/graphics/empty.png",
       priority = "low",

angelsbioprocessing/changelog.txt

@@ -1,4 +1,24 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.7.25
+Date: 22.12.2023
+  Changes:
+    - Added support for alien artifacts outside of bob enemies
+    - Compatibility with Bob's changes (911)
+    - Recipes that consume Gardens will now only buffer enough ingredients for 1 craft (918)
+    - Adjusted techs and added a new recipe (Sodium hypochlorite decomposition) to make Paper 2 viable when it is unlocked (922)
+    - Rebalanced paper and pulp recipes to make each tier feel like a significant upgrade (923)
+    - Made wood production available earlier (932)
+      - Recipe changes for Tree seed generators, Arboretum, and Composter
+      - Tech tree changes
+    - Added custom error message for when trying to insert invalid items into butchery, composter, or hatchery (933)
+    - Reworked recipes for Bob's circuit boards (936)
+      - Removed recipe paper to wooden boards
+      - Modified phenolic board recipe to require paper + liquid resin
+    - Prevent Bob's mods from enabling Agriculture Modules for non bio recipes (937)
+    - Remove unnecessary prerequisites from Alien Farming (943)
+  Bugfixes:
+    - Fixed Gaseous atmosphere puffing recipe missing product Acid gas (942)
+---------------------------------------------------------------------------------------------------
 Version: 0.7.24
 Date: 23.02.2023
   Bugfixes:

angelsbioprocessing/control.lua

@@ -213,3 +213,31 @@ script.on_event(defines.events.on_player_main_inventory_changed, function(event)
     end
   end
 end)
+
+script.on_event(defines.events.on_entity_died, function(event)
+  local loot = event.loot
+  local killing_force = event.force
+  if (not killing_force) or loot.is_empty() then
+    return
+  end
+  loot = loot.get_contents()
+  for loot_item_name, loot_technology_to_research in pairs({
+    ["small-alien-artifact"] = "angels-alien-artifact",
+    ["small-alien-artifact-red"] = "angels-alien-artifact-red",
+    ["small-alien-artifact-yellow"] = "angels-alien-artifact-yellow",
+    ["small-alien-artifact-orange"] = "angels-alien-artifact-orange",
+    ["small-alien-artifact-blue"] = "angels-alien-artifact-blue",
+    ["small-alien-artifact-purple"] = "angels-alien-artifact-purple",
+    ["small-alien-artifact-green"] = "angels-alien-artifact-green",
+  }) do
+    if loot[loot_item_name] then
+      local technology = killing_force.technologies[loot_technology_to_research]
+      if technology then
+        technology.researched = true
+      end
+    end
+  end
+end, {
+  { mode = "or", filter = "type", type = "unit" },
+  { mode = "or", filter = "type", type = "unit-spawner" },
+})

angelsbioprocessing/data.lua

@@ -57,9 +57,11 @@ angelsmods.triggers.bio_plastic = angelsmods.triggers.bio_plastic
   or (angelsmods.trigger.plastic and (angelsmods.triggers.bio_resin or angelsmods.triggers.bio_rubber))
   or false
 
-angelsmods.triggers.paper = not angelsmods.functions.is_special_vanilla()
+angelsmods.triggers.paper = (not angelsmods.functions.is_special_vanilla())
+  or (mods["bobelectronics"] and true or false)
 if angelsmods.triggers.paper then
   angelsmods.trigger.water_red_waste = true
+  angelsmods.trigger.early_chemical_furnace = true
 end
 angelsmods.triggers.crystals_full = (not angelsmods.functions.is_special_vanilla())
   or (mods["bobmodules"] and true or false)
@@ -125,6 +127,7 @@ require("prototypes.recipes.bio-refugium-hogger")
 require("prototypes.recipes.bio-module")
 
 require("prototypes.technology.bio-processing-algae")
+require("prototypes.technology.bio-processing-artifacts")
 require("prototypes.technology.bio-processing-wood-paper")
 require("prototypes.technology.bio-processing-alien")
 require("prototypes.technology.crop-farming")

angelsbioprocessing/info.json

@@ -1,6 +1,6 @@
 {
   "name": "angelsbioprocessing",
-  "version": "0.7.24",
+  "version": "0.7.25",
   "factorio_version": "1.1",
   "title": "Angel's Bioprocessing",
   "author": "Arch666Angel",
@@ -9,8 +9,9 @@
   "description": "Adds ways to recycle and process waste products through biological means and make use of biological processes and farming.",
   "dependencies": [
     "angelsrefining >= 0.12.1",
-    "angelspetrochem >= 0.9.21",
+    "angelspetrochem >= 0.9.25",
     "angelssmelting >= 0.6.17",
-    "? bobenemies >= 1.1.5"
+    "? bobenemies >= 1.1.5",
+    "? boblibrary >= 1.2.0"
   ]
 }

angelsbioprocessing/locale/en/bio-processing.cfg

@@ -129,12 +129,26 @@ alien-pre-artifact-purple=Purple alien pre-artifact
 alien-pre-artifact-red=Red alien pre-artifact
 alien-pre-artifact-yellow=Yellow alien pre-artifact
 
+small-alien-artifact=Small alien artifact
+small-alien-artifact-red=Small red alien artifact
+small-alien-artifact-orange=Small orange alien artifact
+small-alien-artifact-yellow=Small yellow alien artifact
+small-alien-artifact-green=Small green alien artifact
+small-alien-artifact-blue=Small blue alien artifact
+small-alien-artifact-purple=Small purple alien artifact
+
+alien-artifact=Alien artifact
+alien-artifact-red=Red alien artifact
+alien-artifact-orange=Orange alien artifact
+alien-artifact-yellow=Yellow alien artifact
+alien-artifact-green=Green alien artifact
+alien-artifact-blue=Blue alien artifact
+alien-artifact-purple=Purple alien artifact
+
 alien-egg-red=Red alien egg
 alien-egg-green=Green alien egg
 alien-egg-blue=Blue alien egg
 
-small-alien-artifact=Small alien artifact
-
 temperate-tree=Temperate tree
 swamp-tree=Swamp tree
 desert-tree=Desert tree
@@ -336,6 +350,8 @@ angels-bio-yield-module=A module that increases productivity, but only usable fo
 angels-bio-yield-module-2=A module that increases productivity, but only usable for agricultural processes.
 angels-bio-yield-module-3=A module that increases productivity, but only usable for agricultural processes.
 
+alien-artifact-tool=Kill alien enemies to obtain these remnants to learn to understanding these native creatures better.
+
 [fluid-name]
 alien-spores=Alien spores
 alien-goo=Alien goo
@@ -373,10 +389,6 @@ paste-from-sodium-hydroxide=Paste from sodium hydroxide
 paste-from-gas-chlor-methane=Paste from chloromethane gas
 cellulose-fiber-raw-wood=Cellulose fiber from raw wood
 
-wood-from-cellulose=Wood from cellulose and paste
-wood-from-cellulose-resin=Wood from cellulose and resin
-wood-pellets=Wood pellets
-wood-bricks=Wood bricks
 gas-carbon-dioxide-from-wood=Carbon dioxide gas from wood
 gas-methanol-from-wood=Methanol gas from wood
 sulfite-pulping=Sulfite pulping
@@ -387,6 +399,7 @@ kraft-causting=Kraft process causting
 paper-bleaching-1=Paper bleaching 1
 paper-bleaching-2=Paper bleaching 2
 paper-bleaching-3=Paper bleaching 3
+solid-sodium-hypochlorite-decomposition=__ITEM__solid-sodium-hypochlorite__ decomposition
 
 tree-arboretum-0=Rare tree cultivation
 temperate-tree-arboretum-1=Temperate tree cultivation
@@ -551,6 +564,7 @@ bio-processing-crystal-shard=Crystal shard processing
 bio-processing-crystal-full=Crystal processing
 bio-processing-paste=Paste processing
 
+angels-composting=Composting
 gardens=Garden processing
 angels-garden-mutations=Garden mutations
 bio-farm=Farming
@@ -596,6 +610,7 @@ bio-processing-crystal-shard=Shards of crystals made from a combination of organ
 bio-processing-crystal-full=Crystals made from a combination of organic and inorganic material.
 bio-processing-paste=A paste from cellulose can act as growth medium for microbial cultures.
 
+angels-composting=Recycling of left-over organic materials
 gardens=Allows you to extract seeds and plant-life samples from gardens growing on this alien planet.
 angels-garden-mutations=Artificial mutation of gardens via radioactive material.
 bio-farm=Basic technology for growing and processing crops.
@@ -638,3 +653,8 @@ angels-bio-tile-pollution-absorbtion-multiplier=Biologically active tile polluti
 
 [mod-setting-description]
 angels-bio-tile-pollution-absorbtion-multiplier=Increases the pollution absorption to reduce the pollution cloud in your base.
+
+[cant_insert]
+angels-butchery-limitation=__1__ cannot be butchered.
+angels-composter-limitation=__1__ cannot be composted.
+angels-hatchery-limitation=__1__ cannot be incubated.

angelsbioprocessing/prototypes/bio-processing-override.lua

@@ -2,6 +2,7 @@ require("prototypes.overrides.bio-processing-override-special-vanilla")
 --UPDATE BUILDING RECIPES
 require("prototypes.recipes.bio-processing-entity-angels")
 --UPDATE BIO PRODUCT RECIPES
+require("prototypes.overrides.bio-processing-override-artifacts")
 require("prototypes.overrides.bio-processing-override-arboretum")
 require("prototypes.overrides.bio-processing-override-paste")
 -- UPDATE OTHER STUFF
@@ -57,7 +58,7 @@ if angelsmods.trigger.smelting_products["glass"].plate then
       },
     },
   })
-  OV.remove_prereq("bio-processing-alien-1", "plastics")
+  OV.remove_prereq("bio-processing-alien-2", "plastics")
 end
 
 if angelsmods.functions.is_special_vanilla() then
@@ -104,35 +105,6 @@ if data.raw.tile["frozen-snow-0"] then
     alien_biomes.list_tiles(alien_biomes.exclude_tags(alien_biomes.all_tiles(), { "frozen", "volcanic" }))
 end
 
---ADDED RECIPES BOBS
-if bobmods then
-  if bobmods.electronics and angelsmods.triggers.paper then
-    data:extend({
-      --CIRCUIT BOARD
-      {
-        type = "recipe",
-        name = "wooden-board-paper",
-        category = "advanced-crafting",
-        subgroup = "bio-paper",
-        enabled = false,
-        energy_required = 4,
-        ingredients = {
-          { type = "item", name = "solid-paper", amount = 2 },
-        },
-        results = {
-          { type = "item", name = "wooden-board", amount = 1 },
-        },
-        icon_size = 32,
-        order = "m",
-      },
-    })
-    OV.add_unlock("bio-paper-1", "wooden-board-paper")
-  end
-end
-
---ADDED RECIPES FOR BOBS ARTIFACTS
-require("prototypes.overrides.bio-processing-override-bob-artifacts")
-
 --OTHER BOB OVERRIDES
 require("prototypes.overrides.bio-processing-override-bob")
 require("prototypes.overrides.bio-processing-override-bobmodules")

angelsbioprocessing/prototypes/bio-processing-triggers.lua

@@ -2,6 +2,9 @@
 
 if angelsmods.triggers.bio_pastes["cobalt"] then
   angelsmods.trigger.ores["cobalt"] = true
+  if mods["bobores"] then
+    bobmods.ores.cobalt.enabled = true
+  end
   angelsmods.trigger.smelting_products["cobalt"].powder = true
 end
 
@@ -39,3 +42,6 @@ if angelsmods.triggers.bio_pastes["zinc"] then
   angelsmods.trigger.ores["zinc"] = true
   angelsmods.trigger.smelting_products["zinc"].powder = true
 end
+
+angelsmods.trigger.gas_acetone = true
+angelsmods.trigger.gas_urea = true

angelsbioprocessing/prototypes/buildings/butchery.lua

@@ -23,6 +23,7 @@ data:extend({
     selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
     drawing_box = { { -1.5, -1.75 }, { 1.5, 1.5 } },
     crafting_categories = { "bio-butchery" },
+    cant_insert_at_source_message_key = "cant_insert.angels-butchery-limitation",
     module_specification = {
       module_slots = 2,
     },

angelsbioprocessing/prototypes/buildings/composter.lua

@@ -22,6 +22,7 @@ data:extend({
     collision_box = { { -1.4, -1.4 }, { 1.4, 1.4 } },
     selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
     crafting_categories = { "angels-bio-void" },
+    cant_insert_at_source_message_key = "cant_insert.angels-composter-limitation",
     module_specification = {
       module_slots = 2,
     },

angelsbioprocessing/prototypes/buildings/hatchery.lua

@@ -23,6 +23,7 @@ data:extend({
     selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
     drawing_box = { { -1.5, -1.75 }, { 1.5, 1.5 } },
     crafting_categories = { "bio-hatchery" },
+    cant_insert_at_source_message_key = "cant_insert.angels-hatchery-limitation",
     module_specification = {
       module_slots = 2,
     },

angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua

@@ -1,8 +1,8 @@
 local OV = angelsmods.functions.OV
 
-if angelsmods.trigger.smelting_products["glass"].board then --only change it if glass is actually active
+if angelsmods.trigger.smelting_products["glass"].mixture then --only change it if glass is actually active
   OV.modify_input("bio-tile", { type = "item", name = "solid-glass-mixture", amount = 1 })
-  OV.add_prereq("bio-farm-2", "angels-glass-smelting-1")
+  OV.add_prereq("gardens-3", "angels-glass-smelting-1")
 end
 
 if angelsmods.industries and angelsmods.industries.overhaul then
@@ -38,7 +38,6 @@ else
   OV.modify_input("bio-tile", { type = "item", name = "steel-plate", amount = 1 })
   OV.disable_recipe("algae-brown-burning")
 end
-OV.add_unlock("bio-farm-2", "bio-tile")
 
 -- FARMING TOOLTIPS
 for _, item_name in pairs({ "solid-beans", "solid-corn", "solid-leafs", "solid-nuts", "solid-pips", "solid-fruit" }) do