diff --git a/map_gen/presets/crash_site.lua b/map_gen/presets/crash_site.lua index f0dc0a45..a4863e35 100644 --- a/map_gen/presets/crash_site.lua +++ b/map_gen/presets/crash_site.lua @@ -8,8 +8,8 @@ local Random = require 'map_gen.shared.random' local OutpostBuilder = require 'map_gen.presets.crash_site.outpost_builder' local Perlin = require 'map_gen.shared.perlin_noise' -local outpost_seed = 2000 -local ore_seed = 3000 +local outpost_seed = 7000 +local ore_seed = 9000 local enemy_seed = 420420 local outpost_random = Random.new(outpost_seed, outpost_seed * 2) @@ -292,7 +292,7 @@ local function enemy(x, y, world) --[[ if Perlin.noise(x * scale_factor, y * scale_factor, enemy_seed) < 0 then return nil end ]] - local spawner_chance = d - 128 + local spawner_chance = d - 144 if spawner_chance > 0 then spawner_chance = spawner_chance * spawner_chance_factor diff --git a/map_gen/presets/crash_site/market.lua b/map_gen/presets/crash_site/market.lua index 1b7036c1..985811bd 100644 --- a/map_gen/presets/crash_site/market.lua +++ b/map_gen/presets/crash_site/market.lua @@ -152,6 +152,26 @@ Gui.on_custom_close( end ) +Event.add( + defines.events.on_player_died, + function(event) + local player = game.players[event.player_index or 0] + + if not player or not player.valid then + return + end + + local element = player.gui.center + + if element and element.valid then + element = element[market_frame_name] + if element and element.valid then + Gui.destroy(element) + end + end + end +) + Gui.on_value_changed( count_slider_name, function(event) diff --git a/resources/regulars.lua b/resources/regulars.lua index d480b33b..3918a463 100644 --- a/resources/regulars.lua +++ b/resources/regulars.lua @@ -84,7 +84,6 @@ return { ['chessindustries'] = true, ['chukles'] = true, ['circit'] = true, - ['claude47'] = true, ['cogito123'] = true, ['collin08'] = true, ['coogan'] = true, @@ -520,5 +519,13 @@ return { ['SnowDrifter'] = true, ['brockmasters'] = true, ['monkee'] = true, - ['blacksunshine693'] = true + ['blacksunshine693'] = true, + ['Claude47'] = true, + ['Winged_Shade'] = true, + ['NWABroseidon'] = true, + ['Lusquifer'] = true, + ['Cruelcoder'] = true, + ['Unrealrules'] = true, + ['Lithidoria'] = true, + ['LordElmi'] = true }