Skip to content

Commit 9087697

Browse files
authored
Version 1.1.3 (#953)
1 parent 87bc8a8 commit 9087697

File tree

169 files changed

+3593
-1144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+3593
-1144
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@ __pycache__/
1212

1313
# Unit test files
1414
angelsdev-unit-test/log/
15-
run_unit_tests_PWJ.bat
15+
run_unit_tests_PWJ.bat
16+
17+
# Windows explorer cache
18+
Thumbs.db

angelsaddons-cab/changelog.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
---------------------------------------------------------------------------------------------------
2+
Version: 0.2.9
3+
Date: 22.12.2023
4+
Changes:
5+
- Cleanup of prototype data
6+
---------------------------------------------------------------------------------------------------
27
Version: 0.2.8
38
Date: 19.12.2021
49
Changes:

angelsaddons-cab/info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angelsaddons-cab",
3-
"version": "0.2.8",
3+
"version": "0.2.9",
44
"factorio_version": "1.1",
55
"title": "Angel's Addons - C.A.B.",
66
"author": "Arch666Angel, lovely_santa",

angelsaddons-cab/prototypes/entities/equipment.lua

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,6 @@ data:extend({
9292
--output_flow_limit = "0W",
9393
},
9494
energy_input = "0W",
95-
tint = { r = 1, g = 1, b = 1, a = 0 },
96-
desaturation_params = {
97-
smoothstep_min = 0.1,
98-
smoothstep_max = 0.7,
99-
minimum = 0.3,
100-
maximum = 1.0,
101-
},
102-
light_params = {
103-
smoothstep_min = 0.1,
104-
smoothstep_max = 0.7,
105-
minimum = 0.666,
106-
maximum = 1.0,
107-
},
10895
categories = { "angels-cab" },
10996
darkness_to_turn_on = 0,
11097
color_lookup = { { 0.5, "__core__/graphics/color_luts/nightvision.png" } },
@@ -119,7 +106,6 @@ data:extend({
119106
icon = "__angelsaddons-cab__/graphics/icons/cab-icon.png",
120107
icon_size = 32,
121108
flags = { "not-blueprintable", "not-deconstructable", "not-on-map", "hide-alt-info" },
122-
enable_gui = false,
123109
allow_copy_paste = false,
124110
--minable = {mining_time = 1, result = energyInterfaceItem.name},
125111
max_health = 50,
@@ -139,7 +125,7 @@ data:extend({
139125
render_no_power_icon = false,
140126
},
141127
energy_production = "0kW",
142-
energy_consumption = "0kW",
128+
energy_usage = "0kW",
143129
picture = {
144130
filename = "__core__/graphics/empty.png",
145131
priority = "low",

angelsbioprocessing/changelog.txt

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

angelsbioprocessing/control.lua

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,3 +213,31 @@ script.on_event(defines.events.on_player_main_inventory_changed, function(event)
213213
end
214214
end
215215
end)
216+
217+
script.on_event(defines.events.on_entity_died, function(event)
218+
local loot = event.loot
219+
local killing_force = event.force
220+
if (not killing_force) or loot.is_empty() then
221+
return
222+
end
223+
loot = loot.get_contents()
224+
for loot_item_name, loot_technology_to_research in pairs({
225+
["small-alien-artifact"] = "angels-alien-artifact",
226+
["small-alien-artifact-red"] = "angels-alien-artifact-red",
227+
["small-alien-artifact-yellow"] = "angels-alien-artifact-yellow",
228+
["small-alien-artifact-orange"] = "angels-alien-artifact-orange",
229+
["small-alien-artifact-blue"] = "angels-alien-artifact-blue",
230+
["small-alien-artifact-purple"] = "angels-alien-artifact-purple",
231+
["small-alien-artifact-green"] = "angels-alien-artifact-green",
232+
}) do
233+
if loot[loot_item_name] then
234+
local technology = killing_force.technologies[loot_technology_to_research]
235+
if technology then
236+
technology.researched = true
237+
end
238+
end
239+
end
240+
end, {
241+
{ mode = "or", filter = "type", type = "unit" },
242+
{ mode = "or", filter = "type", type = "unit-spawner" },
243+
})

angelsbioprocessing/data.lua

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,11 @@ angelsmods.triggers.bio_plastic = angelsmods.triggers.bio_plastic
5757
or (angelsmods.trigger.plastic and (angelsmods.triggers.bio_resin or angelsmods.triggers.bio_rubber))
5858
or false
5959

60-
angelsmods.triggers.paper = not angelsmods.functions.is_special_vanilla()
60+
angelsmods.triggers.paper = (not angelsmods.functions.is_special_vanilla())
61+
or (mods["bobelectronics"] and true or false)
6162
if angelsmods.triggers.paper then
6263
angelsmods.trigger.water_red_waste = true
64+
angelsmods.trigger.early_chemical_furnace = true
6365
end
6466
angelsmods.triggers.crystals_full = (not angelsmods.functions.is_special_vanilla())
6567
or (mods["bobmodules"] and true or false)
@@ -125,6 +127,7 @@ require("prototypes.recipes.bio-refugium-hogger")
125127
require("prototypes.recipes.bio-module")
126128

127129
require("prototypes.technology.bio-processing-algae")
130+
require("prototypes.technology.bio-processing-artifacts")
128131
require("prototypes.technology.bio-processing-wood-paper")
129132
require("prototypes.technology.bio-processing-alien")
130133
require("prototypes.technology.crop-farming")
1.02 KB
Loading
1008 Bytes
Loading
1 KB
Loading

0 commit comments

Comments
 (0)