Skip to content

Commit

Permalink
Version 1.1.3 patch 1 (#965)
Browse files Browse the repository at this point in the history
  • Loading branch information
LovelySanta authored Jan 4, 2024
2 parents 9087697 + a6c17bf commit 1c0005b
Show file tree
Hide file tree
Showing 16 changed files with 86 additions and 13 deletions.
9 changes: 9 additions & 0 deletions angelsbioprocessing/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
---------------------------------------------------------------------------------------------------
Version: 0.7.26
Date: 04.01.2024
Changes:
- Adjust paper volume (964):
- Halve the output of the paper recipes
- Halve the amount of paper required for Phenolic boards
Bugfixes:
- Fixed compatibility issue with AAI Industry and Bob's Assembling Machines (960)
---------------------------------------------------------------------------------------------------
Version: 0.7.25
Date: 22.12.2023
Changes:
Expand Down
2 changes: 1 addition & 1 deletion angelsbioprocessing/info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angelsbioprocessing",
"version": "0.7.25",
"version": "0.7.26",
"factorio_version": "1.1",
"title": "Angel's Bioprocessing",
"author": "Arch666Angel",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ if bobmods then
})
end

if mods["bobassembly"] and settings.startup["bobmods-assembly-burner"].value == true then
if mods["bobassembly"] and data.raw.technology["basic-automation"] then
OV.remove_prereq("bio-processing-brown", "automation")
OV.add_prereq("bio-processing-brown", "basic-automation")
OV.remove_prereq("basic-chemistry", "automation")
Expand All @@ -81,7 +81,7 @@ if mods["bobelectronics"] then
ingredients = {
{ "!!" },
{ type = "fluid", name = "liquid-resin", amount = 10 },
{ type = "item", name = "solid-paper", amount = 10 },
{ type = "item", name = "solid-paper", amount = 5 },
},
category = "electronics-with-fluid",
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,9 @@ data:extend({
category = "crafting",
subgroup = "bio-paper",
enabled = false,
energy_required = 4,
energy_required = 8,
ingredients = {
{ type = "item", name = "solid-wood-pulp", amount = 2 },
{ type = "item", name = "solid-wood-pulp", amount = 4 },
},
results = {
{ type = "item", name = "solid-paper", amount = 3 },
Expand All @@ -366,7 +366,7 @@ data:extend({
{ type = "fluid", name = "gas-chlorine", amount = 80 },
},
results = {
{ type = "item", name = "solid-paper", amount = 4 },
{ type = "item", name = "solid-paper", amount = 2 },
{ type = "item", name = "solid-sodium-hypochlorite", amount = 2 },
},
allow_decomposition = false,
Expand Down Expand Up @@ -414,7 +414,7 @@ data:extend({
{ type = "fluid", name = "water", amount = 100 },
},
results = {
{ type = "item", name = "solid-paper", amount = 10 },
{ type = "item", name = "solid-paper", amount = 5 },
{ type = "item", name = "solid-sodium-carbonate", amount = 2 },
{ type = "fluid", name = "gas-oxygen", amount = 40 },
{ type = "fluid", name = "water-yellow-waste", amount = 100 },
Expand Down
10 changes: 10 additions & 0 deletions angelsindustries/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
---------------------------------------------------------------------------------------------------
Version: 0.4.20
Date: 04.01.2024
Changes:
- Compatibility changes for YAFC when Components or Technology Overhauls are enabled (962)
- Science mode:
- Added AAI Loaders compatibility #963
Bugfixes:
- Fixed soft lock when using Components Overhaul (955)
- Fixed compatibility issue with AAI Industry and Bob's Assembling Machines (960)
---------------------------------------------------------------------------------------------------
Version: 0.4.19
Date: 22.12.2023
Changes:
Expand Down
12 changes: 12 additions & 0 deletions angelsindustries/data-final-fixes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ if angelsmods.industries.tech then
"datacore-processing-6",
})
OV.execute()

-- Populate table of starting items for YAFC to read
if data.data_crawler then
data.script_enabled = data.script_enabled or {}
table.insert(data.script_enabled, { type = "item", name = "angels-main-lab-0" })
end
end

--tech updates part 1
Expand All @@ -99,6 +105,12 @@ if angelsmods.industries.components then
angelsmods.functions.AI.add_minable_results()
end
OV.execute()

-- Populate table of starting items for YAFC to read
if data.data_crawler then
data.script_enabled = data.script_enabled or {}
table.insert(data.script_enabled, { type = "item", name = "stone-furnace" })
end
end

--OTHER OVERRIDES
Expand Down
2 changes: 1 addition & 1 deletion angelsindustries/info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angelsindustries",
"version": "0.4.19",
"version": "0.4.20",
"factorio_version": "1.1",
"title": "Angel's Industries",
"author": "Arch666Angel",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ if angelsmods.industries.tech then
OV.remove_prereq("bio-arboretum-temperate-1", "resins")
OV.remove_science_pack("bio-arboretum-temperate-1", "token-bio")
OV.add_prereq("bio-arboretum-temperate-2", "resins")
AI.pack_replace("bio-desert-farming-1", "green", "red")
AI.pack_replace("bio-swamp-farming-1", "green", "red")
AI.pack_replace("bio-temperate-farming-1", "green", "red")
-- INDUSTRIES
AI.pack_replace("tech-green-circuit", "green", "red")
OV.remove_prereq("tech-green-circuit", "resins")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ if angelsmods.industries.tech then
-------------------------------------------------------------------------------
if mods["bobassembly"] then
--assemblers
if settings.startup["bobmods-assembly-burner"].value == true then
if data.raw.technology["basic-automation"] then
AI.core_replace("basic-automation", "processing", "basic")
AI.core_replace("automation", "basic", "processing")
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ if angelsmods.industries.tech then
if mods["bobassembly"] then
--adds bobassembly stuffs
-- burner assemblers and/ore tier 1 electric
if settings.startup["bobmods-assembly-burner"].value == true then
if data.raw.technology["basic-automation"] then
AI.pack_replace("basic-automation", "red", "grey")
AI.pack_replace("automation", "grey", "red")
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,29 @@ if angelsmods.industries.tech then
AI.pack_replace("warehouse-logistics-research-1", "green", "orange")
end

-------------------------------------------------------------------------------
-- AAI LOADERS ----------------------------------------------------------------
-------------------------------------------------------------------------------
if mods["aai-loaders"] then
AI.core_replace("aai-basic-loader", "basic", "logistic")
AI.core_replace("aai-loader", "basic", "logistic")
AI.core_replace("aai-fast-loader", "basic", "logistic")
AI.core_replace("aai-express-loader", "basic", "logistic")
AI.core_replace("aai-turbo-loader", "basic", "logistic")
AI.core_replace("aai-ultimate-loader", "basic", "logistic")

OV.remove_prereq("aai-express-loader", "advanced-electronics-2")
OV.remove_prereq("aai-express-loader", "production-science-pack")
OV.remove_science_pack("aai-express-loader", "production-science-pack")
OV.remove_science_pack("aai-express-loader", "advanced-logistic-science-pack")
OV.remove_science_pack("aai-turbo-loader", "production-science-pack")
OV.remove_science_pack("aai-turbo-loader", "advanced-logistic-science-pack")
OV.remove_science_pack("aai-ultimate-loader", "production-science-pack")
OV.remove_science_pack("aai-ultimate-loader", "advanced-logistic-science-pack")

AI.pack_replace("aai-fast-loader", "blue", "orange")
end

-------------------------------------------------------------------------------
-- AAI INDUSTRIES -------------------------------------------------------------
-------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@ if angelsmods.industries.components then
OV.add_unlock("bio-paper-1", "circuit-grey-board-alternative")
OV.remove_science_pack("bio-paper-1", "logistic-science-pack")
OV.remove_prereq("bio-paper-1", "logistic-science-pack")
OV.remove_prereq("bio-paper-1", "basic-chemistry")
OV.patch_recipes({
{
name = "solid-wood-pulp",
category = "crafting",
ingredients = {
{ type = "fluid", name = "water", amount = 0 },
},
},
})
OV.execute()

data:extend({
Expand Down
6 changes: 6 additions & 0 deletions angelsrefining/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
---------------------------------------------------------------------------------------------------
Version: 0.12.6
Date: 04.01.2024
Bugfixes:
- Fixed compatibility issue with AAI Industry and Bob's Assembling Machines (960)
- Fixed compatibility issue with Transport Drones mod (961)
---------------------------------------------------------------------------------------------------
Version: 0.12.5
Date: 22.12.2023
Changes:
Expand Down
2 changes: 1 addition & 1 deletion angelsrefining/info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angelsrefining",
"version": "0.12.5",
"version": "0.12.6",
"factorio_version": "1.1",
"title": "Angel's Refining",
"author": "Arch666Angel",
Expand Down
2 changes: 1 addition & 1 deletion angelsrefining/prototypes/buildings/sea-pump.lua
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ data:extend({
},
},
},
--map_color = {0.78, 0.2, 0.77},
map_color = { 0, 0, 0, 0 },
--map_grid = false
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ if mods["bobplates"] then

if mods["bobassembly"] and settings.startup["bobmods-assembly-multipurposefurnaces"].value then
-- keep metal mixing furnaces around
if mods["bobassembly"] and settings.startup["bobmods-assembly-burner"].value == true then
if mods["bobassembly"] and data.raw.technology["basic-automation"] then
OV.add_unlock("basic-automation", "stone-mixing-furnace")
else
OV.add_unlock("automation", "stone-mixing-furnace")
Expand Down

0 comments on commit 1c0005b

Please sign in to comment.