diff --git a/maps/cave_miner_v2/constants.lua b/maps/cave_miner_v2/constants.lua index d9f55e28..54df9c29 100644 --- a/maps/cave_miner_v2/constants.lua +++ b/maps/cave_miner_v2/constants.lua @@ -96,7 +96,8 @@ Public.pickaxe_tiers = { "Tungsten", "Corundum", "Tungsten", - "Diamond", + "Diamond", + "Netherite", "Penumbrite", "Meteorite", "Crimtane", diff --git a/maps/cave_miner_v2/functions.lua b/maps/cave_miner_v2/functions.lua index f7a45c27..0817f3b7 100644 --- a/maps/cave_miner_v2/functions.lua +++ b/maps/cave_miner_v2/functions.lua @@ -88,7 +88,7 @@ function Public.update_top_gui(cave_miner) for _, player in pairs(game.connected_players) do local element = player.gui.top.cave_miner if element and element.valid then - element.children[1].caption = "Tier: " .. pickaxe_tiers[cave_miner.pickaxe_tier] .. " | " + element.children[1].caption = "Tier " .. cave_miner.pickaxe_tier .. " - " .. pickaxe_tiers[cave_miner.pickaxe_tier] .. " | " element.children[1].tooltip = "Mining speed " .. (1 + game.forces.player.manual_mining_speed_modifier) * 100 .. "%" element.children[2].caption = "Rocks broken: " .. cave_miner.rocks_broken diff --git a/maps/cave_miner_v2/main.lua b/maps/cave_miner_v2/main.lua index 5f43a556..a28b5190 100644 --- a/maps/cave_miner_v2/main.lua +++ b/maps/cave_miner_v2/main.lua @@ -39,6 +39,7 @@ local function on_player_joined_game(event) end end + if player.online_time > 0 then return end for name, count in pairs(Constants.starting_items) do player.insert({name = name, count = count}) end @@ -125,9 +126,9 @@ local function init(cave_miner) local surface = game.surfaces.nauvis surface.min_brightness = 0.01 surface.brightness_visual_weights = {0.99, 0.99, 0.99} - surface.daytime = 0.42 + surface.daytime = 0.43 surface.freeze_daytime = true - surface.solar_power_multiplier = 999 + surface.solar_power_multiplier = 5 cave_miner.reveal_queue = {} cave_miner.rocks_broken = 0 @@ -206,6 +207,9 @@ local function on_init() game.map_settings.enemy_evolution.destroy_factor = 0 game.map_settings.enemy_evolution.pollution_factor = 0 game.map_settings.enemy_evolution.time_factor = 0 + + global.rocks_yield_ore_veins.amount_modifier = 0.25 + global.rocks_yield_ore_veins.chance = 756 end Event.on_init(on_init) diff --git a/maps/cave_miner_v2/market.lua b/maps/cave_miner_v2/market.lua index 4dee2aed..b9f682b2 100644 --- a/maps/cave_miner_v2/market.lua +++ b/maps/cave_miner_v2/market.lua @@ -6,6 +6,13 @@ local LootRaffle = require "functions.loot_raffle" local loot_blacklist = { ["landfill"] = true, + ["loader"] = true, + ["fast-loader"] = true, + ["express-loader"] = true, + ["wood"] = true, + ["raw-fish"] = true, + ["discharge-defense-remote"] = true, + ["railgun-dart"] = true, } function Public.refresh_offers(market, cave_miner) diff --git a/maps/cave_miner_v2/terrain.lua b/maps/cave_miner_v2/terrain.lua index 54428de7..addb85b8 100644 --- a/maps/cave_miner_v2/terrain.lua +++ b/maps/cave_miner_v2/terrain.lua @@ -36,7 +36,7 @@ function Public.roll_source_surface() }, } local surface = game.create_surface("cave_miner_source", map_gen_settings) - surface.request_to_generate_chunks({x = 0, y = 0}, 2) + surface.request_to_generate_chunks({x = 0, y = 0}, 1) surface.force_generate_chunk_requests() end diff --git a/modules/rocks_yield_ore_veins.lua b/modules/rocks_yield_ore_veins.lua index e5b7e106..cf1cd9bb 100644 --- a/modules/rocks_yield_ore_veins.lua +++ b/modules/rocks_yield_ore_veins.lua @@ -54,7 +54,8 @@ local function set_raffle() end local function get_amount(position) - local distance_to_center = math.sqrt(position.x^2 + position.y^2) * 4 + 1500 + local distance_to_center = math.sqrt(position.x^2 + position.y^2) * 2 + 1500 + distance_to_center = distance_to_center * global.rocks_yield_ore_veins.amount_modifier local m = (75 + math_random(0, 50)) * 0.01 return distance_to_center * m end @@ -154,6 +155,7 @@ local function on_init() global.rocks_yield_ore_veins.raffle = {} global.rocks_yield_ore_veins.mixed_ores = {} global.rocks_yield_ore_veins.chance = 768 + global.rocks_yield_ore_veins.amount_modifier = 1 set_raffle() end