Skip to content

Commit adcd71f

Browse files
LovelySantaLovelySanta
authored
Release refining update
2 parents f7d8061 + 80d791d commit adcd71f

File tree

443 files changed

+7887
-4024
lines changed

Some content is hidden

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

443 files changed

+7887
-4024
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1+
# Factorio files
12
*.zip
23
*.dat
34
mod-list.json
5+
# Python
6+
__pycache__/
7+
# IDE config
48
.idea/
59
.vscode/
10+
run_unit_tests_PWJ.bat

‎Config_Testing_Regime.txt‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
-------------------------------
2+
-- Special Vanilla ------------
3+
-------------------------------
4+
Refining
5+
Petrochem
6+
Smelting
7+
Bioprocessing
8+
Industries (no overhaul)
9+
-------------------------------
10+
-- Special VanillaBobs --------
11+
-- This is with NO bobplates
12+
-- Quite likely to break things
13+
--[[ Add each in isolation:
14+
== boblogistics
15+
== bobassembly
16+
== bobelectronics
17+
== bobmodules
18+
== bobpower
19+
== bobmining
20+
== bobrevamp
21+
== bobwarfare ]]
22+
-- Run full bobs (minus plates)
23+
-------------------------------
24+
Refining
25+
Petrochem
26+
Smelting
27+
Bioprocessing
28+
Industries (no overhaul)
29+
-------------------------------
30+
-- Full Angels ----------------
31+
-------------------------------
32+
Industries (overhaul)
33+
Industries (components)
34+
Industries (tech)
35+
Exploration (no comp/tech)
36+
-------------------------------
37+
-- ANGELBOBS ------------------
38+
-- This is with bobplates/ores
39+
-- considered standard set
40+
-- default bob settings
41+
--[[ Add each in isolation:
42+
== boblogistics
43+
== bobassembly
44+
== bobelectronics
45+
== bobmodules
46+
== bobpower
47+
== bobmining
48+
== bobrevamp
49+
== bobwarfare ]]
50+
-- Run full bobs
51+
-------------------------------
52+
Refining
53+
Petrochem
54+
Smelting
55+
Bioprocessing
56+
Industries (no overhaul)
57+
Industries (overhaul)
58+
Industries (components)
59+
Industries (tech)
60+
Exploration (no comp/tech)
61+
-------------------------------
62+
-- BOB Configs ----------------
63+
-- Run with Industries (Overhaul)
64+
-- Each mod in isolation
65+
-- with and without plates
66+
-------------------------------
67+
-- Assembly: Burner/steam assembling machines
68+
-- Assembly: IF CHANGED ANY OF THE OTHER UNITS
69+
--== those settings
70+
-- Logistics: Belt overhaul (not the speed overhaul)
71+
-- Logistics: Inserterter overhaul
72+
-- Plates: New Steel (should be forced and hidden with smelting?)
73+
-- Plates: Nuclear fuel update
74+
-- Mining: Large area Mining
75+
-- Mining: Steam mining drills
76+
-- Mining: Water mining pumpjacks
77+
-- Ores: Enable water ores
78+
-- Ores: Enable infinite (should be off and hidden with refining?)
79+
-- Power: New nuclear generators
80+
-- Power: Fluid burning generators
81+
-- Power: Burner and fluid powered heat sources
82+
-- Power: New steam power related entities
83+
-- Revamp: Extra Chemistry
84+
-- Revamp: Nuclear power overhaul
85+
-- Revamp: RTG
86+
-- Tech: Burner phase

‎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.8
3+
Date: ##.##.202#
4+
Changes:
5+
- Added tips and tricks for the CAB
6+
---------------------------------------------------------------------------------------------------
27
Version: 0.2.7
38
Date: 26.05.2021
49
Changes:

‎angelsaddons-cab/data-updates.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
require("prototypes.recipes.cab-updates")
2-
require "prototypes.entities.cab-updates"
2+
require("prototypes.entities.cab-updates")
3+
require("prototypes.tips-and-tricks.tips-and-tricks")
34

45
if angelsmods.industries then
56
local OV = angelsmods.functions.OV

‎angelsaddons-cab/info.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "angelsaddons-cab",
3-
"version": "0.2.7",
3+
"version": "0.2.8",
44
"factorio_version": "1.1",
55
"title": "Angel's Addons - C.A.B.",
66
"author": "Arch666Angel, lovely_santa",
77
"contact": "",
88
"homepage": "",
99
"description": "Adds another type of Crawler.",
1010
"dependencies": [
11-
"? angelsindustries >= 0.4.9",
11+
"? angelsindustries >= 0.4.14",
1212
"base >= 1.1.33"
1313
]
1414
}

‎angelsaddons-cab/locale/en/cab.cfg‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,11 @@ angels-cab-energy-transfer-rate=__1__ power transfer
5858
5959
[mod-setting-description]
6060
angels-cab-energy-transfer-rate=The power transfer this transfer port can deliver, in watts.\nDefault: __1__ W
61+
62+
63+
[tips-and-tricks-name]
64+
angelsaddons-cab=Crawler Autonomous Base (C.A.B.)
65+
66+
[tips-and-tricks-description]
67+
angelsaddons-cab=The highly experimental crawler is an drivable vehicle that can draw and provide power to a network. This can allow for a temporary mobile crafting site while out exploring the map. More features are planned.
68+
angelsaddons-cab-notes=\n\n[font=default-bold]NOTES[/font]: To operate simply set the vehicle in deployed mode to provide the power to the network the vehicle is residing in.\nPower may be supplied by mobile generators or specialised charged batteries.

‎angelsaddons-cab/prototypes/entities/cab.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ data:extend(
655655
icon = "__angelsaddons-cab__/graphics/icons/cab-icon.png",
656656
icon_size = 32,
657657
flags = {"not-blueprintable", "not-deconstructable", "not-on-map", "hide-alt-info"},
658-
--minable = {hardness = 0.2, mining_time = 0.5, result = "medium-electric-pole"},
658+
--minable = {mining_time = 0.5, result = "medium-electric-pole"},
659659
max_health = 200,
660660
corpse = "small-remnants",
661661
track_coverage_during_build_by_moving = false,

‎angelsaddons-cab/prototypes/entities/equipment.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ data:extend{{
116116
flags = {"not-blueprintable", "not-deconstructable", "not-on-map", "hide-alt-info"},
117117
enable_gui = false,
118118
allow_copy_paste = false,
119-
--minable = {hardness = 0.2, mining_time = 1, result = energyInterfaceItem.name},
119+
--minable = {mining_time = 1, result = energyInterfaceItem.name},
120120
max_health = 50,
121121
corpse = "small-remnants",
122122
collision_box = {{-0.35, -0.35}, {0.35, 0.35}},
@@ -238,7 +238,7 @@ data:extend{{
238238
flags = {"not-blueprintable", "not-deconstructable", "not-on-map", "hide-alt-info"},
239239
enable_gui = false,
240240
allow_copy_paste = false,
241-
--minable = {hardness = 0.2, mining_time = 1, result = energyInterfaceItem.name},
241+
--minable = {mining_time = 1, result = energyInterfaceItem.name},
242242
max_health = 50,
243243
corpse = "small-remnants",
244244
collision_box = {{-0.35, -0.35}, {0.35, 0.35}},

‎angelsaddons-cab/prototypes/tips-and-tricks/1-angelsaddons-cab/1-angelsaddons-cab-description.lua‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
return {
2+
"",
3+
{"tips-and-tricks-description.angelsaddons-cab"},
4+
{"tips-and-tricks-description.angelsaddons-cab-notes"}
5+
}

‎angelsaddons-cab/prototypes/tips-and-tricks/1-angelsaddons-cab/1-angelsaddons-cab.lua‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
data:extend(
2+
{
3+
{
4+
type = "tips-and-tricks-item-category",
5+
name = "angelsaddons-cab",
6+
order = "c-aa[angesaddons-cab]"
7+
},
8+
9+
{
10+
type = "tips-and-tricks-item",
11+
name = "angelsaddons-cab",
12+
13+
is_title = true,
14+
tag = "[entity=angels-cab]",
15+
localised_name = {"tips-and-tricks-name.angelsaddons-cab"},
16+
localised_description = require "prototypes.tips-and-tricks.1-angelsaddons-cab.1-angelsaddons-cab-description",
17+
18+
category = "angelsaddons-cab",
19+
order = "aa-[cab]",
20+
indent = 0,
21+
22+
starting_status = "locked",
23+
dependencies = nil,
24+
trigger =
25+
{
26+
type = "research",
27+
technology = "angels-cab"
28+
},
29+
30+
--simulation = require "prototypes.tips-and-tricks.1-angelsaddons-cab.1-angelsaddons-cab-simulation",
31+
}
32+
}
33+
)

0 commit comments

Comments
 (0)