Skip to content
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.

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

Earlier mining speed #298

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 17 additions & 12 deletions SeaBlock/data/misc.lua
Original file line number Diff line number Diff line change
@@ -1,27 +1,32 @@
require("starting-items")
require('starting-items')

-- Populate table of starting items and script enabled techs for YAFC to read
data.script_enabled = data.script_enabled or {}

for k, _ in pairs(seablock.scripted_techs) do
table.insert(data.script_enabled, { type = "technology", name = k })
table.insert(data.script_enabled, {type = 'technology', name = k})
end

local starting_items = seablock.populate_starting_items(data.raw.item)
for k, _ in pairs(starting_items) do
table.insert(data.script_enabled, { type = "item", name = k })
table.insert(data.script_enabled, {type = 'item', name = k})
end

-- Set Angel's triggers
angelsmods.trigger.smelting_products["copper"].powder = true
angelsmods.trigger.smelting_products["nickel"].plate = false
angelsmods.trigger.smelting_products["zinc"].plate = false
angelsmods.trigger.smelting_products["cobalt"].plate = false
angelsmods.trigger.ores["platinum"] = true
angelsmods.trigger.smelting_products["platinum"].plate = true
angelsmods.trigger.smelting_products["platinum"].wire = true
angelsmods.trigger.smelting_products["gunmetal"].plate = false
angelsmods.trigger.smelting_products['copper'].powder = true
angelsmods.trigger.smelting_products['nickel'].plate = false
angelsmods.trigger.smelting_products['zinc'].plate = false
angelsmods.trigger.smelting_products['cobalt'].plate = false
angelsmods.trigger.ores['platinum'] = true
angelsmods.trigger.smelting_products['platinum'].plate = true
angelsmods.trigger.smelting_products['platinum'].wire = true
angelsmods.trigger.smelting_products['gunmetal'].plate = false
angelsmods.trigger.early_sulfuric_acid = true

-- Copy Ore Processing Machine tech icon to Mechanical Refining
seablock.lib.copy_icon(data.raw.technology["ore-crushing"], data.raw.technology["advanced-ore-refining-1"])
seablock.lib.copy_icon(data.raw.technology['ore-crushing'], data.raw.technology['advanced-ore-refining-1'])

-- Check if Bob's mining is not enabled, increase starting hand mining speed

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
-- Check if Bob's mining is not enabled, increase starting hand mining speed
-- Check if Bob's mining is disabled, increase starting hand mining speed

if not mods['bobmining'] then
data.raw.character.character.mining_speed = 0.75
end
4 changes: 0 additions & 4 deletions SeaBlock/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,11 @@
"boblogistics >= 1.1.6",
"bobores >= 1.1.6",
"bobplates >= 1.1.6",

"? angelsaddons-storage",
"? bobassembly",
"? bobenemies",
"? bobequipment",
"? bobinserters",
"? bobmining",
"? bobmodules",
"? bobpower",
"? bobrevamp",
Expand All @@ -36,10 +34,8 @@
"? LandfillPainting >= 0.5.2",
"? ScienceCostTweakerM >= 1.1.10",
"? SpaceMod >= 1.1.1",

"(?) KS_Power_quickfix",
"(?) Companion_Drones",

"! alien-biomes",
"! angelsexploration"
]
Expand Down
44 changes: 22 additions & 22 deletions SeaBlock/settings-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,36 @@ function seablock.overwrite_setting(setting_type, setting_name, value)
if data.raw[setting_type] then
local s = data.raw[setting_type][setting_name]
if s then
if setting_type == "bool-setting" then
if setting_type == 'bool-setting' then
s.forced_value = value
else
s.default_value = value
s.allowed_values = { value }
s.allowed_values = {value}
end
s.hidden = true
else
log("Error: missing setting " .. setting_name)
log('Error: missing setting ' .. setting_name)
end
else
log("Error: missing setting type " .. setting_type)
log('Error: missing setting type ' .. setting_type)
end
end

require("settings-updates/angelsbioprocessing")
require("settings-updates/angelsindustries")
require("settings-updates/angelspetrochem")
require("settings-updates/angelsrefining")
require("settings-updates/bobassembly")
require("settings-updates/bobenemies")
require("settings-updates/boblibrary")
require("settings-updates/boblogistics")
require("settings-updates/bobmining")
require("settings-updates/bobores")
require("settings-updates/bobplates")
require("settings-updates/bobpower")
require("settings-updates/bobrevamp")
require("settings-updates/bobtech")
require("settings-updates/bobwarfare")
require("settings-updates/reskins-angels")
require("settings-updates/ScienceCostTweakerM")
require("settings-updates/SpaceMod")
require('settings-updates/angelsbioprocessing')
require('settings-updates/angelsindustries')
require('settings-updates/angelspetrochem')
require('settings-updates/angelsrefining')
require('settings-updates/bobassembly')
require('settings-updates/bobenemies')
require('settings-updates/boblibrary')
require('settings-updates/boblogistics')
require('settings-updates/bobmining')
require('settings-updates/bobores')
require('settings-updates/bobplates')
require('settings-updates/bobpower')
require('settings-updates/bobrevamp')
require('settings-updates/bobtech')
require('settings-updates/bobwarfare')
require('settings-updates/reskins-angels')
require('settings-updates/ScienceCostTweakerM')
require('settings-updates/SpaceMod')