Skip to content

Commit e35d462

Browse files
KiwiHawkKiwiHawk
committed
Move Bricks Later in Tech Tree #991 
1 parent 7aeff2c commit e35d462

23 files changed

+93
-70
lines changed

‎angelsbioprocessing/changelog.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ Version: 0.7.28
33
Date: ???
44
Changes:
55
- Limited animation speed of fish, puffer, and biter refugiums (987)
6+
- Tech tree changes: (991)
7+
- Moved Garden Processing and Farming 1 techs from Red Science to Green Science
8+
- Reduced the tier of Algae farm 2's ingredients
9+
- Made Biters require Purple Science
610
---------------------------------------------------------------------------------------------------
711
Version: 0.7.27
812
Date: 21.02.2024

‎angelsbioprocessing/info.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"homepage": "https://forums.factorio.com/viewforum.php?f=185",
99
"description": "Adds ways to recycle and process waste products through biological means and make use of biological processes and farming.",
1010
"dependencies": [
11-
"angelsrefining >= 0.12.1",
12-
"angelspetrochem >= 0.9.25",
13-
"angelssmelting >= 0.6.17"
11+
"angelsrefining >= 0.12.8",
12+
"angelspetrochem >= 0.9.27",
13+
"angelssmelting >= 0.6.24"
1414
]
1515
}

‎angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ else
5050
"bio-arboretum-temperate-3",
5151
})
5252
OV.remove_prereq("bio-wood-processing-2", "bio-farm-1")
53+
OV.remove_unlock("bio-wood-processing-2", "bio-processor")
5354
end
5455

5556
if angelsmods.trigger.bio_plastic then

‎angelsbioprocessing/prototypes/overrides/bio-processing-override-bobgreenhouse.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ if mods["bobgreenhouse"] then
214214
})
215215

216216
-- update tech
217+
OV.set_science_pack("bob-greenhouse", "logistic-science-pack", 1)
217218
OV.add_prereq("bob-greenhouse", "gardens")
218219
OV.add_unlock("bob-greenhouse", "wood-sawing-manual")
219220
OV.add_prereq("bob-greenhouse", "bio-arboretum-1")

‎angelsbioprocessing/prototypes/recipes/bio-processing-entity-angels.lua

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ angelsmods.functions.RB.build({
8585
enabled = false,
8686
ingredients = {
8787
{ type = "item", name = "algaefarm-1", amount = 1 },
88-
{ type = "item", name = "t0-plate", amount = 11 },
89-
{ type = "item", name = "t0-circuit", amount = 4 },
90-
{ type = "item", name = "t0-brick", amount = 11 },
91-
{ type = "item", name = "t0-pipe", amount = 18 },
88+
{ type = "item", name = "t0-plate", amount = 6 },
89+
{ type = "item", name = "t0-circuit", amount = 2 },
90+
{ type = "item", name = "t0-brick", amount = 6 },
91+
{ type = "item", name = "t0-pipe", amount = 9 },
9292
},
9393
result = "algae-farm",
9494
},
@@ -97,10 +97,10 @@ angelsmods.functions.RB.build({
9797
enabled = false,
9898
ingredients = {
9999
{ type = "item", name = "algaefarm-1", amount = 1 },
100-
{ type = "item", name = "t0-plate", amount = 11 * buildingmulti },
101-
{ type = "item", name = "t0-circuit", amount = 4 * buildingmulti },
102-
{ type = "item", name = "t0-brick", amount = 11 * buildingmulti },
103-
{ type = "item", name = "t0-pipe", amount = 18 * buildingmulti },
100+
{ type = "item", name = "t0-plate", amount = 6 * buildingmulti },
101+
{ type = "item", name = "t0-circuit", amount = 2 * buildingmulti },
102+
{ type = "item", name = "t0-brick", amount = 6 * buildingmulti },
103+
{ type = "item", name = "t0-pipe", amount = 9 * buildingmulti },
104104
},
105105
result = "algae-farm",
106106
},
@@ -113,10 +113,10 @@ angelsmods.functions.RB.build({
113113
enabled = false,
114114
ingredients = {
115115
{ type = "item", name = "algaefarm-2", amount = 1 },
116-
{ type = "item", name = "t1-plate", amount = 11 },
117-
{ type = "item", name = "t1-circuit", amount = 4 },
118-
{ type = "item", name = "t1-brick", amount = 11 },
119-
{ type = "item", name = "t1-pipe", amount = 18 },
116+
{ type = "item", name = "t0-plate", amount = 11 },
117+
{ type = "item", name = "t0-circuit", amount = 4 },
118+
{ type = "item", name = "t0-brick", amount = 11 },
119+
{ type = "item", name = "t0-pipe", amount = 18 },
120120
},
121121
result = "algae-farm-2",
122122
},

‎angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@ data:extend({
2929
icon_size = 128,
3030
order = "c-a",
3131
prerequisites = {
32-
"bio-farm-1",
3332
"bio-wood-processing",
3433
},
3534
effects = {
35+
{
36+
type = "unlock-recipe",
37+
recipe = "bio-processor",
38+
},
3639
{
3740
type = "unlock-recipe",
3841
recipe = "wood-charcoal",

‎angelsbioprocessing/prototypes/technology/bio-refugium.lua

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ data:extend({
280280
order = "c-a",
281281
prerequisites = {
282282
"bio-refugium-puffer-3",
283-
"production-science-pack",
284283
},
285284
effects = {
286285
{
@@ -310,7 +309,6 @@ data:extend({
310309
{ type = "item", name = "automation-science-pack", amount = 1 },
311310
{ type = "item", name = "logistic-science-pack", amount = 1 },
312311
{ type = "item", name = "chemical-science-pack", amount = 1 },
313-
{ type = "item", name = "production-science-pack", amount = 1 },
314312
{ type = "item", name = "token-bio", amount = 1 },
315313
},
316314
time = 30,
@@ -328,6 +326,7 @@ data:extend({
328326
"bio-refugium-butchery-2",
329327
"bio-refugium-puffer-2",
330328
"bio-processing-crystal-splinter-2",
329+
"production-science-pack",
331330
"stone-wall",
332331
},
333332
effects = {
@@ -370,6 +369,7 @@ data:extend({
370369
{ type = "item", name = "automation-science-pack", amount = 1 },
371370
{ type = "item", name = "logistic-science-pack", amount = 1 },
372371
{ type = "item", name = "chemical-science-pack", amount = 1 },
372+
{ type = "item", name = "production-science-pack", amount = 1 },
373373
{ type = "item", name = "token-bio", amount = 1 },
374374
},
375375
time = 30,
@@ -417,6 +417,7 @@ data:extend({
417417
{ type = "item", name = "automation-science-pack", amount = 1 },
418418
{ type = "item", name = "logistic-science-pack", amount = 1 },
419419
{ type = "item", name = "chemical-science-pack", amount = 1 },
420+
{ type = "item", name = "production-science-pack", amount = 1 },
420421
{ type = "item", name = "token-bio", amount = 1 },
421422
},
422423
time = 30,

‎angelsbioprocessing/prototypes/technology/crop-farming.lua

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ data:extend({
1818
type = "unlock-recipe",
1919
recipe = "solid-soil",
2020
},
21+
{
22+
type = "unlock-recipe",
23+
recipe = "solid-sand",
24+
},
2125
{
2226
type = "unlock-recipe",
2327
recipe = "solid-soil-alternative",
@@ -39,7 +43,7 @@ data:extend({
3943
icon_size = 128,
4044
order = "c-a",
4145
prerequisites = {
42-
"steel-processing",
46+
"logistic-science-pack"
4347
},
4448
effects = {
4549
{
@@ -63,6 +67,7 @@ data:extend({
6367
count = 50,
6468
ingredients = {
6569
{ type = "item", name = "automation-science-pack", amount = 1 },
70+
{ type = "item", name = "logistic-science-pack", amount = 1 },
6671
},
6772
time = 30,
6873
},
@@ -157,6 +162,7 @@ data:extend({
157162
count = 50,
158163
ingredients = {
159164
{ type = "item", name = "automation-science-pack", amount = 1 },
165+
{ type = "item", name = "logistic-science-pack", amount = 1 },
160166
},
161167
time = 30,
162168
},

‎angelsindustries/info.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"description": "Adds industrial equipment as well as the tools you need to expand and grow your base. Adds extra components [BETA] and a tech [ALPHA] overhaul.",
1010
"dependencies": [
1111
"angelsrefining >= 0.12.8",
12-
"angelspetrochem >= 0.9.25",
13-
"angelssmelting >= 0.6.17",
14-
"angelsbioprocessing >= 0.7.21",
12+
"angelspetrochem >= 0.9.27",
13+
"angelssmelting >= 0.6.24",
14+
"angelsbioprocessing >= 0.7.28",
1515
"(?) aai-industry >= 0.4.12"
1616
]
1717
}

‎angelsindustries/prototypes/overrides/components-base-recipe-update.lua

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ if angelsmods.industries.components then
4949
AI.replace_recipe_ing("battery-mk2-equipment", "battery-equipment", "battery-4")
5050
OV.add_prereq("battery-mk2-equipment", "angels-components-batteries-4")
5151

52-
OV.add_prereq("angels-cobalt-smelting-1", "water-washing-1")
53-
OV.remove_prereq("angels-cobalt-smelting-2", "water-washing-1")
54-
5552
-- roboports
5653
AI.replace_recipe_ing("personal-roboport-equipment", "battery-1", "battery-4")
5754
AI.replace_recipe_ing("personal-roboport-mk2-equipment", "battery-1", "battery-5")

‎angelsindustries/prototypes/overrides/components-block-update.lua

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ if angelsmods.industries.components then
33
-----------------------------------------------------------------------------
44
-- PREREQUISITES FOR COMPONENTS TO WORK CORRECTLY ---------------------------
55
-----------------------------------------------------------------------------
6-
-- move molds from stone 2 to stone 1 to be at red science
7-
OV.remove_unlock("angels-stone-smelting-2", "angels-casing-resin-mold")
8-
OV.add_unlock("angels-stone-smelting-1", "angels-casing-resin-mold")
9-
OV.remove_unlock("angels-stone-smelting-2", "mold-expendable")
10-
OV.add_unlock("angels-stone-smelting-1", "mold-expendable")
6+
-- move molds from stone 2 to stone 1 to be at green science
117
OV.remove_prereq("angels-stone-smelting-2", "bio-arboretum-1")
128
OV.add_prereq("angels-stone-smelting-1", "bio-wood-processing-2")
139
OV.add_prereq("angels-stone-smelting-1", "angels-components-mechanical-1")

‎angelsindustries/prototypes/overrides/global-tech-base-packs.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ if angelsmods.industries.tech then
4747
OV.remove_prereq("automation-2", "tech-green-packs")
4848
-- SMELTING
4949
OV.add_prereq("angels-metallurgy-1", "tech-specialised-labs-basic-processing-1")
50+
AI.pack_replace("angels-stone-smelting-1", "green", "red")
5051
-- BIO PROCESSING
52+
AI.pack_replace("bio-farm-1", "green", "red")
5153
AI.pack_count_update("bio-temperate-farming", "angels-science-pack-red", 4)
5254
AI.pack_replace("bio-fermentation", "green", "red")
5355
OV.remove_prereq("bio-fermentation", "tech-green-packs")
@@ -59,6 +61,7 @@ if angelsmods.industries.tech then
5961
AI.pack_replace("bio-desert-farming-1", "green", "red")
6062
AI.pack_replace("bio-swamp-farming-1", "green", "red")
6163
AI.pack_replace("bio-temperate-farming-1", "green", "red")
64+
AI.pack_replace("gardens", "green", "red")
6265
-- INDUSTRIES
6366
AI.pack_replace("tech-green-circuit", "green", "red")
6467
OV.remove_prereq("tech-green-circuit", "resins")
@@ -76,6 +79,8 @@ if angelsmods.industries.tech then
7679
AI.pack_replace("lubricant", "blue", "green")
7780
-- PETROCHEM
7881
AI.pack_replace("sodium-processing-1", "blue", "green")
82+
-- SMELTING
83+
AI.pack_replace("angels-stone-smelting-2", "blue", "green")
7984
-- BIO PROCESSING
8085
OV.add_prereq("bio-refugium-fish-1", "water-treatment-2")
8186
AI.pack_replace("bio-paper-2", "blue", "green")
@@ -158,6 +163,7 @@ if angelsmods.industries.tech then
158163
AI.pack_replace("angels-silicon-smelting-2", "blue", "orange")
159164
AI.pack_replace("angels-silicon-casting-2", "blue", "orange")
160165
AI.pack_replace("angels-stone-smelting-3", "blue", "orange")
166+
OV.remove_prereq("angels-stone-smelting-3", "production-science-pack")
161167
AI.pack_replace("angels-tin-smelting-3", "blue", "orange")
162168
AI.pack_replace("angels-tin-casting-3", "blue", "orange")
163169
AI.pack_replace("angels-iron-smelting-3", "blue", "orange")

‎angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ if angelsmods.industries.tech then
8686
-------------------------------------------------------------------------------
8787
if mods["bobgreenhouse"] then
8888
--adds bob greenhouse stuffs
89+
AI.pack_replace("bob-greenhouse", "green", "red")
8990
end
9091

9192
-------------------------------------------------------------------------------

‎angelsindustries/prototypes/technology/components-mechanical-technology.lua

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ if angelsmods.industries.components then
4747

4848
OV.add_unlock("angels-iron-smelting-2", "angels-casing-iron-1")
4949
OV.add_prereq("angels-iron-smelting-2", "angels-components-mechanical-1")
50-
OV.add_prereq("angels-iron-smelting-2", "angels-stone-smelting-2")
50+
OV.add_prereq("angels-iron-smelting-2", "angels-stone-smelting-1")
5151

5252
OV.add_unlock("angels-iron-smelting-3", "angels-casing-iron-2")
53-
OV.add_prereq("angels-iron-smelting-3", "angels-stone-smelting-3")
53+
OV.add_prereq("angels-iron-smelting-3", "angels-stone-smelting-2")
5454

5555
-------------------------------------------------------------------------------
5656
-- MECHANICAL PARTS 2 ---------------------------------------------------------
@@ -64,7 +64,7 @@ if angelsmods.industries.components then
6464
icon_mipmaps = 4,
6565
prerequisites = {
6666
"angels-components-mechanical-1",
67-
"angels-stone-smelting-2",
67+
"angels-stone-smelting-1",
6868
"logistic-science-pack",
6969
"steel-processing",
7070
"angels-iron-smelting-1",
@@ -105,7 +105,7 @@ if angelsmods.industries.components then
105105

106106
OV.add_unlock("angels-steel-smelting-3", "angels-casing-steel-2")
107107
OV.add_prereq("angels-steel-smelting-3", "angels-components-mechanical-2")
108-
OV.add_prereq("angels-steel-smelting-3", "angels-stone-smelting-3")
108+
OV.add_prereq("angels-steel-smelting-3", "angels-stone-smelting-2")
109109

110110
-------------------------------------------------------------------------------
111111
-- MECHANICAL PARTS 3 ---------------------------------------------------------
@@ -119,7 +119,7 @@ if angelsmods.industries.components then
119119
icon_mipmaps = 4,
120120
prerequisites = {
121121
"angels-components-mechanical-2",
122-
--"angels-stone-smelting-2",
122+
--"angels-stone-smelting-1",
123123
"angels-aluminium-smelting-1",
124124
},
125125
effects = {
@@ -158,7 +158,7 @@ if angelsmods.industries.components then
158158

159159
OV.add_unlock("angels-aluminium-smelting-2", "angels-casing-aluminium-2")
160160
OV.add_prereq("angels-aluminium-smelting-2", "angels-components-mechanical-3")
161-
OV.add_prereq("angels-aluminium-smelting-2", "angels-stone-smelting-3")
161+
OV.add_prereq("angels-aluminium-smelting-2", "angels-stone-smelting-2")
162162

163163
-------------------------------------------------------------------------------
164164
-- MECHANICAL PARTS 4 ---------------------------------------------------------
@@ -172,7 +172,7 @@ if angelsmods.industries.components then
172172
icon_mipmaps = 4,
173173
prerequisites = {
174174
"angels-components-mechanical-3",
175-
--"angels-stone-smelting-2",
175+
--"angels-stone-smelting-1",
176176
"angels-titanium-smelting-1",
177177
"lubricant",
178178
},
@@ -213,7 +213,7 @@ if angelsmods.industries.components then
213213

214214
OV.add_unlock("angels-titanium-smelting-2", "angels-casing-titanium-2")
215215
OV.add_prereq("angels-titanium-smelting-2", "angels-components-mechanical-4")
216-
OV.add_prereq("angels-titanium-smelting-2", "angels-stone-smelting-3")
216+
OV.add_prereq("angels-titanium-smelting-2", "angels-stone-smelting-2")
217217

218218
-------------------------------------------------------------------------------
219219
-- MECHANICAL PARTS 5 ---------------------------------------------------------
@@ -227,7 +227,7 @@ if angelsmods.industries.components then
227227
icon_mipmaps = 4,
228228
prerequisites = {
229229
"angels-components-mechanical-4",
230-
--"angels-stone-smelting-2",
230+
--"angels-stone-smelting-1",
231231
"angels-tungsten-smelting-1",
232232
},
233233
effects = {
@@ -269,5 +269,5 @@ if angelsmods.industries.components then
269269
OV.add_unlock("angels-tungsten-smelting-2", "angels-casing-tungsten-green")
270270
OV.add_unlock("angels-tungsten-smelting-2", "angels-casing-tungsten-2")
271271
OV.add_prereq("angels-tungsten-smelting-2", "angels-components-mechanical-5")
272-
OV.add_prereq("angels-tungsten-smelting-2", "angels-stone-smelting-3")
272+
OV.add_prereq("angels-tungsten-smelting-2", "angels-stone-smelting-2")
273273
end

‎angelspetrochem/info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
"homepage": "https://forums.factorio.com/viewforum.php?f=185",
99
"description": "Angel's Petrochemical processing changes Oil processing and adds Gas processing, as well as a more complex web of chemical production. Includes overrides and tie-ins to Bob's technologies and recipes. Dependencies: Angel's Refining",
1010
"dependencies": [
11-
"angelsrefining >= 0.12.3"
11+
"angelsrefining >= 0.12.8"
1212
]
1313
}

‎angelsrefining/prototypes/technology/water-treatment-technology.lua

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -234,18 +234,6 @@ data:extend({
234234
type = "unlock-recipe",
235235
recipe = "washing-5",
236236
},
237-
{
238-
type = "unlock-recipe",
239-
recipe = "solid-clay",
240-
},
241-
{
242-
type = "unlock-recipe",
243-
recipe = "solid-limestone",
244-
},
245-
{
246-
type = "unlock-recipe",
247-
recipe = "solid-sand",
248-
},
249237
},
250238
unit = {
251239
count = 10,

‎angelssmelting/changelog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Date: ???
44
Changes:
55
- Rebalance Tungsten Smelting Recipes (980)
66
- Adjusted the recipes for Bob's Assembling Machines (985)
7+
- Moved Cement Processing techs up a science pack tier so Clay Bricks are not available so early in the game (991)
78
---------------------------------------------------------------------------------------------------
89
Version: 0.6.23
910
Date: 21.02.2024

‎angelssmelting/info.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"homepage": "https://forums.factorio.com/viewforum.php?f=185",
99
"description": "Angel's Smelting provides alternative ways to produce plate and increase ore yield at the expense of space and energy.",
1010
"dependencies": [
11-
"angelsrefining >= 0.12.1",
12-
"angelspetrochem >= 0.9.25"
11+
"angelsrefining >= 0.12.8",
12+
"angelspetrochem >= 0.9.27"
1313
]
1414
}

‎angelssmelting/prototypes/override/smelting-override-cobalt.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ if angelsmods.trigger.smelting_products["cobalt"].ingot then
6666
),
6767
},
6868
})
69-
OV.remove_prereq("angels-cobalt-smelting-1", "water-washing-1")
70-
OV.add_prereq("angels-cobalt-smelting-2", "water-washing-1")
69+
OV.remove_prereq("angels-cobalt-smelting-1", "angels-stone-smelting-1")
70+
OV.add_prereq("angels-cobalt-smelting-2", "angels-stone-smelting-1")
7171
OV.remove_prereq("angels-cobalt-smelting-1", "ore-processing-2")
7272
OV.add_prereq("angels-cobalt-smelting-1", "angels-metallurgy-3")
7373
end

0 commit comments

Comments
 (0)