1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-03-11 14:49:24 +02:00

Merge pull request #346 from ComfyFactory/fixes

Fixes to autostash and Mtn v3
This commit is contained in:
Gerkiz 2022-10-25 20:11:38 +02:00 committed by GitHub
commit 67eb88808f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View File

@ -1141,10 +1141,10 @@ function Public.boost_difficulty()
WPT.set('bonus_xp_on_join', 300)
WD.set('next_wave', game.tick + 3600 * 8)
WPT.set('spidertron_unlocked_at_zone', 8)
WD.set_normal_unit_current_health(1.6)
WD.set_unit_health_increment_per_wave(0.5)
WD.set_normal_unit_current_health(1.4)
WD.set_unit_health_increment_per_wave(0.3)
WD.set_boss_unit_current_health(3)
WD.set_boss_health_increment_per_wave(5)
WD.set_boss_health_increment_per_wave(3)
WD.set('death_mode', false)
WPT.set('difficulty_set', true)
local damage_warning = ({'main.damage_mode_warning'})
@ -1188,10 +1188,10 @@ function Public.boost_difficulty()
WPT.set('bonus_xp_on_join', 50)
WD.set('next_wave', game.tick + 3600 * 5)
WPT.set('spidertron_unlocked_at_zone', 6)
WD.set_normal_unit_current_health(2)
WD.set_unit_health_increment_per_wave(1)
WD.set_normal_unit_current_health(1.6)
WD.set_unit_health_increment_per_wave(0.5)
WD.set_boss_unit_current_health(4)
WD.set_boss_health_increment_per_wave(10)
WD.set_boss_health_increment_per_wave(6)
WD.set('death_mode', true)
WPT.set('difficulty_set', true)
Core.iter_players(

View File

@ -622,10 +622,10 @@ local function do_whitelist()
this.whitelist = {}
for k, _ in pairs(resources) do
if resources[k] and resources[k].type == 'resource' and resources[k].mineable_properties then
if resources[k].mineable_properties.products[1] then
if resources[k].mineable_properties.products and resources[k].mineable_properties.products[1] then
local r = resources[k].mineable_properties.products[1].name
this.whitelist[r] = true
elseif resources[k].mineable_properties.products[2] then
elseif resources[k].mineable_properties.products and resources[k].mineable_properties.products[2] then
local r = resources[k].mineable_properties.products[2].name
this.whitelist[r] = true
end