Skip to content

Feature/0.18 update #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
triffid wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/0.18 update #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea0c063
Bring repository up to date with 5.0.2 release from mods.factorio.com
triffid Mar 1, 2020
00d4fad
Update mod for 0.18 - tested and works perfectly
triffid Mar 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions auto-research/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
---------------------------------------------------------------------------------------------------
Version: 5.0.1.
Version: 5.0.2
Date: 09. 04. 2019
Changes:
- Fixed setting research which broke with Factorio 0.17.26.
- Made the research strategy options look better.
---------------------------------------------------------------------------------------------------
Version: 5.0.1
Date: 03. 03. 2019
Changes:
- Keybinding (Shift-T) should work again.
- Filtering search results by ingredients should work properly again.
---------------------------------------------------------------------------------------------------
Version: 5.0.0.
Version: 5.0.0
Date: 03. 03. 2019
Changes:
- Updated for Factorio 0.17.
Expand Down
47 changes: 28 additions & 19 deletions auto-research/control.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,9 @@ function startNextResearch(force, override_spam_detection)
end
end

force.current_research = next_research
if next_research then
force.add_research(next_research)
end
end

function onResearchFinished(event)
Expand Down Expand Up @@ -287,24 +289,31 @@ gui = {
style = "auto_research_header_label",
caption = {"auto_research_gui.research_strategy"}
}
local research_strategies_one = frameflow.add{
local research_strategies_outer = frameflow.add{
type = "flow",
style = "auto_research_tech_flow",
name = "research_strategies_one",
name = "research_strategies_outer",
direction = "horizontal"
}
research_strategies_one.add{type = "radiobutton", name = "auto_research_research_fast", caption = {"auto_research_gui.research_fast"}, tooltip = {"auto_research_gui.research_fast_tooltip"}, state = config.research_strategy == "fast"}
research_strategies_one.add({type = "radiobutton", name = "auto_research_research_cheap", caption = {"auto_research_gui.research_cheap"}, tooltip = {"auto_research_gui.research_cheap_tooltip"}, state = config.research_strategy == "cheap"}).style.left_padding = 15
research_strategies_one.add({type = "radiobutton", name = "auto_research_research_balanced", caption = {"auto_research_gui.research_balanced"}, tooltip = {"auto_research_gui.research_balanced_tooltip"}, state = config.research_strategy == "balanced"}).style.left_padding = 15
local research_strategies_two = frameflow.add{
local research_strategies_left = research_strategies_outer.add{
type = "flow",
style = "auto_research_tech_flow",
name = "research_strategies_two",
direction = "horizontal"
style = "auto_research_list_flow",
name = "research_strategies_left",
direction = "vertical"
}
research_strategies_left.add{type = "radiobutton", name = "auto_research_research_fast", caption = {"auto_research_gui.research_fast"}, tooltip = {"auto_research_gui.research_fast_tooltip"}, state = config.research_strategy == "fast"}
research_strategies_left.add{type = "radiobutton", name = "auto_research_research_cheap", caption = {"auto_research_gui.research_cheap"}, tooltip = {"auto_research_gui.research_cheap_tooltip"}, state = config.research_strategy == "cheap"}
research_strategies_left.add{type = "radiobutton", name = "auto_research_research_balanced", caption = {"auto_research_gui.research_balanced"}, tooltip = {"auto_research_gui.research_balanced_tooltip"}, state = config.research_strategy == "balanced"}
local research_strategies_right = research_strategies_outer.add{
type = "flow",
style = "auto_research_list_flow",
name = "research_strategies_right",
direction = "vertical"
}
research_strategies_two.add{type = "radiobutton", name = "auto_research_research_slow", caption = {"auto_research_gui.research_slow"}, tooltip = {"auto_research_gui.research_slow_tooltip"}, state = config.research_strategy == "slow"}
research_strategies_two.add({type = "radiobutton", name = "auto_research_research_expensive", caption = {"auto_research_gui.research_expensive"}, tooltip = {"auto_research_gui.research_expensive_tooltip"}, state = config.research_strategy == "expensive"}).style.left_padding = 15
research_strategies_two.add({type = "radiobutton", name = "auto_research_research_random", caption = {"auto_research_gui.research_random"}, tooltip = {"auto_research_gui.research_random_tooltip"}, state = config.research_strategy == "random"}).style.left_padding = 15
research_strategies_right.style.left_padding = 15
research_strategies_right.add{type = "radiobutton", name = "auto_research_research_slow", caption = {"auto_research_gui.research_slow"}, tooltip = {"auto_research_gui.research_slow_tooltip"}, state = config.research_strategy == "slow"}
research_strategies_right.add{type = "radiobutton", name = "auto_research_research_expensive", caption = {"auto_research_gui.research_expensive"}, tooltip = {"auto_research_gui.research_expensive_tooltip"}, state = config.research_strategy == "expensive"}
research_strategies_right.add{type = "radiobutton", name = "auto_research_research_random", caption = {"auto_research_gui.research_random"}, tooltip = {"auto_research_gui.research_random_tooltip"}, state = config.research_strategy == "random"}

-- allowed ingredients
frameflow.add{
Expand Down Expand Up @@ -433,12 +442,12 @@ gui = {
end
elseif string.find(name, "auto_research_research") then
config.research_strategy = string.match(name, "^auto_research_research_(.*)$")
player.gui.top.auto_research_gui.flow.research_strategies_one.auto_research_research_fast.state = (config.research_strategy == "fast")
player.gui.top.auto_research_gui.flow.research_strategies_one.auto_research_research_cheap.state = (config.research_strategy == "cheap")
player.gui.top.auto_research_gui.flow.research_strategies_one.auto_research_research_balanced.state = (config.research_strategy == "balanced")
player.gui.top.auto_research_gui.flow.research_strategies_two.auto_research_research_slow.state = (config.research_strategy == "slow")
player.gui.top.auto_research_gui.flow.research_strategies_two.auto_research_research_expensive.state = (config.research_strategy == "expensive")
player.gui.top.auto_research_gui.flow.research_strategies_two.auto_research_research_random.state = (config.research_strategy == "random")
player.gui.top.auto_research_gui.flow.research_strategies_outer.research_strategies_left.auto_research_research_fast.state = (config.research_strategy == "fast")
player.gui.top.auto_research_gui.flow.research_strategies_outer.research_strategies_left.auto_research_research_cheap.state = (config.research_strategy == "cheap")
player.gui.top.auto_research_gui.flow.research_strategies_outer.research_strategies_left.auto_research_research_balanced.state = (config.research_strategy == "balanced")
player.gui.top.auto_research_gui.flow.research_strategies_outer.research_strategies_right.auto_research_research_slow.state = (config.research_strategy == "slow")
player.gui.top.auto_research_gui.flow.research_strategies_outer.research_strategies_right.auto_research_research_expensive.state = (config.research_strategy == "expensive")
player.gui.top.auto_research_gui.flow.research_strategies_outer.research_strategies_right.auto_research_research_random.state = (config.research_strategy == "random")
-- start new research
startNextResearch(force)
else
Expand Down
4 changes: 2 additions & 2 deletions auto-research/data-final-fixes.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ for _, tool in pairs(data.raw.tool) do
name = "auto_research_tool_" .. tool.name,
filename = tool.icon or (tool.icons[1] and tool.icons[1].icon) or nil,
priority = "extra-high-no-scale",
width = 32,
height = 32
width = 64,
height = 64
}
})
end
Expand Down
6 changes: 3 additions & 3 deletions auto-research/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "auto-research",
"version": "5.0.1",
"factorio_version": "0.17",
"version": "5.0.3",
"factorio_version": "0.18",
"title": "Auto Research",
"author": "canidae",
"contact": "canidae@exent.net",
"homepage": "http://exent.net",
"description": "Automates research. Toggle GUI with Shift+T (customizable).",
"dependencies": ["base >= 0.17.0"]
"dependencies": ["base >= 0.18.0"]
}
Binary file added auto-research/thumbnail.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.