Skip to content

Commit

Permalink
v0.18.5.1 (#191)
Browse files Browse the repository at this point in the history
* Fixed electronic blocks in assemblers (#110)

* Fixed crash when barrreling recipe did not exist

* Component Return setting update

* Added migration for tech tree fixes for who that does not play with industries

* Fixed crash related to recipe ingredient list having empty fields due to other filthy mods

* Fixed crash related to technologies using count_formula instead of count for none-infinite tech

* Allow productivity on (all) analyzers and datacores

* Tweakes some technologies, recipes and items after the previous update

* small tweaks to nilaus

* Fixed when playing with bobs that assembling machines 1 and logistics 1 were locked behind basic labs

* Fixed production science pack required bobs chemical plant instead of angels version

#114

* Fixed the TP bot

* Added Nilaus' Floor Lamp and updated localisations

* change trigger for bobs alien tech to move for tech, not components

just a small change

* Added new Trigger icon

Beautiful work Santa

* Multiple fixes on gun turrets when playing with overhauls

Related to #124 and #125

* Fixed that the vanilla lab was not hidden when playing pure angels

#122

* Added missing prerequisite of Paper Making 1 to Red Circuits

#121

* Fixed bobmonium setting to spawn in starting area by default

* Issue #126 resolved: Added migration so rocket fuel gets enabled again (#127)

for research

* Resolves #121: Make all buildings upgradeable (#128)

- Fixed boilers with wrong number tint
- Fixed changelog refining (corrected date)

* Fixed wire recipes from plates could not be made in bobs electronics assembler

* Minor fix for 119: missed algae farm

* Fixed temperatures on molten liquids

* updated dates in changelogs for release

* Added migration to nilaus addon

* New readme for mod portal pages

* small crash fixes

    - Fixed oil refinery didn't have fast_replaceable_group set
    - Fixed crash when bob pure water was disabled

* Fixed date on changelog...

* Minor improvement for checking the upgradeability of the oil refinery

* Stone wall now require only 1 Construction Block 2 instead of 5

* Fixed missing localised description on Alien Plant Life Sample

* Fertilizer now takes twice the amount of Compost

#136

* Fermentation Base processing now produces half the amount of compost

#136

* Decrease production of Compost

#136

* Changed graphics on tree recipes to represent the trees instead of their product

* Fixed recipe icon tint on water recipes to use refining tint color

#134

* Fixed missing localisation for heavy water seperation recipes

#134

* extended make_void function

#136

* Fixed missing tin related to attempted bugfix in 0.11.4 when playing without angelssmelting

* Revert "Fixed missing tin related to attempted bugfix in 0.11.4 when playing without angelssmelting"

This reverts commit 96775d3.

* Fixed missing tin related to attempted bugfix in 0.11.4 when playing without angelssmelting

* Fixed unnatural crash... maybe resetting it will help

* Fixed failed attempt on re-enabling rocket-fuel on existing saves

#126

* Fixed missing tin related to attempted bugfix in 0.11.4 when playing without angelssmelting

* Fixed higher tier boilers required multiple of the previous tier with ingredient multiplier

#138

* Changed mining time of burner ore crusher so it's easier to pick up in early game

#130

* Excluded Chemical Plant recipe from marathon mode when it is required for science packs

* deleted old files that can't be used anymore

* Fixed recipes would use the unobtainable advanced processing blocks

* Changed the name from Non Expendable mold to Reusable Mold

#135

* Added basic recipe tints to the induction furnace + recipes

* Fixed submachine gun was unlocking with Turrets instead of Basic Military technology

* Moved angels crawler to separate mod (#145)

#124

* Implemented function for viscous liquid recipe icons

Also removed the petrochem number icons as they should use the ones from refining

* Nilaus car tweaks (#146)

Issue #143

* Changed stack size of pavement items (#105)

Also contains a setting to change it in range 200-1000 (200 by default)

* Disable bob's tech when chem plant/electroliser is disabled (#147)

* Fixed Assembling Machine 1 was locked in red science when playing with bobs Burner Assemblers disabled

* Changed Grey Circuit Board hand crafting to use the Circuit Board from wood instead of paper

* Fixed Concrete Brick and Reinforced Concrete Brick couldn't be placed next to water

* New Mold Casting recipes

I kept tungsten as is, for something different
NOTE: a potential iron duplication may occur with the otherwise useless expendable mold iron motor recipe (at the cost of tonnes of sand and cutting ingot of choice)

* - Fixed missing num_1 file

- Removed data-updates for not used crawlertrain components

* Fixes #150: Wooden pole recipe products/gives 1

* #153 adjustment

Replace global ingredient of lab with angels-basic-lab-2

* Fixed ore pastes would enable when you don't need them

* Fixed Automation 2 did not depend on Construction Components 2

I#151, PR#156

* Fixed some labs would require the base game Lab as ingredient instead of angels variant

#153

* rods/sticks did show incorrectly (#155)

* Fixes startup error

* updated changelogs

* Hotfixed nilaus lamps

* Changed build to use dotted date again

* Proper version increase in changelog nilaus

* Fixed liquid-fuel-oil fuel value typo

Also "rebalanced" the enriched fuel block and liquid-fuel values

* issue #163: Reduced expander collisionboxes (#173)

* Make a 10x10 grid for nilaus instead of 9x9

* Sintering Oven could not be crafted without sintering

- Sintering oven fix (in refining recipe-builder-fallback
- Slag in place of hydroxide for expendable mold recipe

* #167 closure

Added changelog and bumped version

* Fixed crushed bob/rub smelting showing up in spec-vanilla case

added localisation for solid-salt (was in petrochem)
pushed version
updated changelog
used recipe update check to remove recipe if not needed
 - Tested with all 3 variants

* Added in a new cheaper wall

Added in a new cheaper wall for early defensive needs
updated changelog
updated version

* Updates to BobRevamp

Clobbers the advanced lithium process in favour of the more advance angels process
Only removes nitric system if it is active
Patched new sodium carbonate recipes to match angels style (mostly)

* Updating to the standards for refining (new version and default ??? for changelog)

* Electronics should be craftable in bobs electronics assembler (#177)

* Alternative for early game liquid resin (#184)

* Implements #164 trains (#186)

* Issue #164 - Renamed most trains

- Slight rebalance for petrotrain
- Reorder of smeltingtrain

* Feedback for previous commit

* Added ability to copy paste color from locomotives/train stops to the smelter cargo wagons and virsa versa

* Added ability to copy paste color from locomotives/train stops to the smelter cargo wagons and virsa versa

* ordening of trains done

* When bob trains are present, update the tier defaults to 3

* Implemented new recipes for crawler

* finishing vanilla recipes for smelt and petro train

* added recipes for crawler with industries

* finishing up industry recipe and tech overhaul

* Updated changelog

* Issue #164: Updating Pull Request Feedback

* Issue #164: Many fixes, also a generic fix for prereq removal

- fixed cab for not executing its updates

Co-authored-by: Tim Vroom <[email protected]>

* Removal of unused file/consistend naming use

* More silent build script

* Fixes #176: Previous tier lab required for non mineable setting (#185)

* Fixes #176: Previous tier lab required for non mineable setting

* Previous lab is now required all modes where tech is enabled #176

* Added build script to create mod folder updates

* deduce appdata location

* Integration of crawler bots into component and science overhaul

* Fixed molding updates were in industries instead of smelting

* Concrete Brick and Reinforced Concrete Brick now lay tutorial grid tiles #162

* Reduced the amount of Advanced Chemical Plants required to make fish water #168

* Fixes #169: Fixing bobs burner phase with techrework (#187)

* Moved migration to proper version for angelssmelting

* Updated changelogs with release dates

* Fixing alignment (no single line if)

* Fixing migration for cargo-bot rework (auto unlock when researched)

* made early game wall upgradable

* Minor alignment fixes..

* Hotfix/bugfix for #189

* Fixing steam science for bobs burner phase

Co-authored-by: LovelySanta <[email protected]>
Co-authored-by: Pezzawinkle <[email protected]>
Co-authored-by: Thomas Ziegler <[email protected]>
Co-authored-by: Kine7ics <[email protected]>
  • Loading branch information
5 people authored Apr 12, 2020
1 parent 6dc5108 commit 9597a35
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 40 deletions.
5 changes: 5 additions & 0 deletions angelsindustries/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 0.3.8
Date: 12.04.2020
Bugfixes:
- With bobs burner phase allow steam science in the main lab #169
---------------------------------------------------------------------------------------------------
Version: 0.3.7
Date: 12.04.2020
Changes:
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.3.7",
"version": "0.3.8",
"factorio_version": "0.18",
"title": "Angel's Industries",
"author": "Arch666Angel",
Expand Down
80 changes: 41 additions & 39 deletions angelsindustries/prototypes/buildings/angels-labs-main.lua
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
local OV = angelsmods.functions.OV

local lab_item =
{
local lab_item = {
type = "item",
name = "angels-main-lab",
icons = {
{
icon = "__angelsindustries__/graphics/icons/main-lab.png",
icon_size = 64,
icon_size = 64
}
},
icon_size = 32,
Expand All @@ -17,15 +16,14 @@ local lab_item =
stack_size = 10
}

local lab_entity =
{
local lab_entity = {
type = "lab",
--name = lab_item.place_result,
icon = lab_item.icons[1].icon,
icon_size = lab_item.icons[1].icon_size,
flags = {"placeable-player", "player-creation"},
minable = {
mining_time = 1,
mining_time = 1
--result = lab_item.name
},
max_health = 5000,
Expand Down Expand Up @@ -81,14 +79,7 @@ local lab_entity =
},
energy_usage = "1000kW",
researching_speed = 1,
inputs = {
--"angels-science-pack-grey",
--"angels-science-pack-red",
--"angels-science-pack-green",
--"angels-science-pack-orange",
--"angels-science-pack-blue",
--"angels-science-pack-yellow"
},
inputs = {},
module_specification = {
module_slots = 2,
max_entity_info_module_icons_per_row = 3,
Expand All @@ -99,92 +90,103 @@ local lab_entity =

local function create_rich_text_icons(inputs)
local rich_text_icons = {""}
for _,input in pairs(inputs) do
for _, input in pairs(inputs) do
table.insert(rich_text_icons, string.format("[img=item/%s]", input))
end
return rich_text_icons
end

local lab_tiers = {
{
new_pack = "angels-science-pack-grey",
new_pack = "angels-science-pack-grey"
},
{
new_pack = "angels-science-pack-red",
health_inc = 1000,
speed_multiplier = 2,
speed_multiplier = 2
},
{
new_pack = "angels-science-pack-green",
health_inc = 1000,
speed_multiplier = 2,
speed_multiplier = 2
},
{
new_pack = "angels-science-pack-orange",
health_inc = 1000,
speed_multiplier = 2,
modules = 1,
modules = 1
},
{
new_pack = "angels-science-pack-blue",
health_inc = 1000,
speed_multiplier = 2,
modules = 1,
modules = 1
},
{
new_pack = "angels-science-pack-yellow",
health_inc = 1000,
speed_multiplier = 2,
modules = 1,
modules = 1
},
{
new_pack = "angels-science-pack-white",
health_inc = 5000,
speed_multiplier = 2,
modules = 1,
},
modules = 1
}
}
for tier_index, tier_props in pairs(lab_tiers) do
-- tier props
if tier_props then
if tier_props.new_pack then table.insert(lab_entity.inputs, tier_props.new_pack) end
if tier_props.new_pack then
table.insert(lab_entity.inputs, tier_props.new_pack)
end
lab_entity.max_health = lab_entity.max_health + (tier_props.health_inc or 0)
lab_entity.researching_speed = lab_entity.researching_speed * (tier_props.speed_multiplier or 1)
lab_entity.module_specification.module_slots = lab_entity.module_specification.module_slots + (tier_props.modules or 0)
lab_entity.module_specification.module_slots =
lab_entity.module_specification.module_slots + (tier_props.modules or 0)
end

-- item
local lab_item_tier = util.table.deepcopy(lab_item)
lab_item_tier.name = lab_item_tier.name .. string.format("-%i", tier_index)
table.insert(lab_item_tier.icons, {
icon = string.format("__angelsrefining__/graphics/icons/num_%i.png", tier_index),
tint = angelsmods.industries.number_tint,
scale = 0.32,
shift = {-12, -12},
})
table.insert(
lab_item_tier.icons,
{
icon = string.format("__angelsrefining__/graphics/icons/num_%i.png", tier_index),
tint = angelsmods.industries.number_tint,
scale = 0.32,
shift = {-12, -12}
}
)
lab_item_tier.place_result = lab_item_tier.name
lab_item_tier.order = lab_item_tier.order .. string.format("-%i", tier_index)

-- entity
local lab_entity_tier = util.table.deepcopy(lab_entity)
lab_entity_tier.name = lab_item_tier.place_result
lab_entity_tier.localised_name = {"entity-name.angels-main-lab", tier_index}
lab_entity_tier.localised_description = {"",
{"entity-description.angels-main-lab"}, "\n",
{"entity-description.angels-main-lab-warning"}, "\n",
lab_entity_tier.localised_description = {
"",
{"entity-description.angels-main-lab"},
"\n",
{"entity-description.angels-main-lab-warning"},
"\n",
{"entity-description.angels-lab-inputs", create_rich_text_icons(lab_entity_tier.inputs)}
}
lab_entity_tier.minable.result = lab_item_tier.name
lab_entity_tier.energy_usage = string.format("%iMW", lab_entity_tier.researching_speed)

data:extend({
lab_item_tier,
lab_entity_tier,
})
data:extend(
{
lab_item_tier,
lab_entity_tier
}
)

angelsmods.triggers.lab_ignore_token[lab_entity_tier.name] = true
end

-- disable base game lab as it is obsolete
OV.disable_recipe("lab")
angelsmods.functions.add_flag("lab", "hidden")
angelsmods.functions.add_flag("lab", "hidden")
8 changes: 8 additions & 0 deletions angelsindustries/prototypes/overrides/tech-mod-update.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ if mods.bobtech then
-- gets re-enabled as an unlock
OV.disable_recipe("lab")
OV.disable_technology("lab")

-- Allow steam science in main lab
for i = 1, 7 do
local lab = data.raw.lab["angels-main-lab-" .. i]
if lab then
table.insert(lab.inputs, 1, "steam-science-pack")
end
end
end
end

Expand Down

0 comments on commit 9597a35

Please sign in to comment.