difficulty tweaks

functions/basic_markets.lua

@@ -125,12 +125,12 @@ market.vehicles = {
 	["train-stop"] = {value = 32, rarity = 3},
 	["rail-signal"] = {value = 8, rarity = 5},
 	["rail-chain-signal"] = {value = 8, rarity = 5},
-	["locomotive"] = {value = 640, rarity = 4},
-	["cargo-wagon"] = {value = 320, rarity = 4},
-	["fluid-wagon"] = {value = 480, rarity = 5},
+	["locomotive"] = {value = 400, rarity = 4},
+	["cargo-wagon"] = {value = 200, rarity = 4},
+	["fluid-wagon"] = {value = 300, rarity = 5},
 	["artillery-wagon"] = {value = 8192, rarity = 8},
 	["car"] = {value = 80, rarity = 1},
-	["tank"] = {value = 1800, rarity = 5},	
+	["tank"] = {value = 1800, rarity = 5},
 }
 
 market.wire = {

maps/spooky_forest.lua

@@ -14,7 +14,6 @@ require "modules.biters_avoid_damage"
 require "modules.biters_double_damage"
 require "modules.spawners_contain_biters"
 require "modules.rocks_broken_paint_tiles"
-require "modules.rocks_yield_ore"
 require "modules.rpg"
 require "modules.hunger"
 
@@ -393,6 +392,7 @@ local ore_spawn_raffle = {
 	}
 
 local function on_entity_died(event)
+	if not event.entity.valid then return end
 	local surface = event.entity.surface
 	
 	if event.entity.name == "biter-spawner" or event.entity.name == "spitter-spawner" then		
@@ -448,7 +448,7 @@ local function on_player_joined_game(event)
 		local turret_positions = {{6, 6}, {-5, -5}, {-5, 6}, {6, -5}}
 		for _, pos in pairs(turret_positions) do
 			local turret = surface.create_entity({name = "gun-turret", position = pos, force = "player"})
-			turret.insert({name = "firearm-magazine", count = 32})
+			turret.insert({name = "firearm-magazine", count = 64})
 		end
 		
 		local radius = 320
@@ -465,7 +465,6 @@ local function on_player_joined_game(event)
 		player.insert({name = "land-mine", count = 2})
 		player.insert({name = "light-armor", count = 1})
 		player.insert({name = "firearm-magazine", count = 64})
-		if global.show_floating_killscore then global.show_floating_killscore[player.name] = false end
 	end
 	
 	local surface = game.surfaces["spooky_forest"]
@@ -637,4 +636,7 @@ event.add(defines.events.on_player_mined_entity, on_player_mined_entity)
 event.add(defines.events.on_entity_died, on_entity_died)
 event.add(defines.events.on_chunk_generated, on_chunk_generated)
 event.add(defines.events.on_player_changed_position, on_player_changed_position)
-event.add(defines.events.on_player_joined_game, on_player_joined_game)
+event.add(defines.events.on_player_joined_game, on_player_joined_game)
+
+require "modules.rocks_yield_ore"
+global.rocks_yield_ore_base_amount = 100

modules/trees_randomly_die.lua

@@ -81,7 +81,7 @@ local function kill_random_tree(surface)
 end
 
 local function tick(event)
-	local r = 16
+	local r = 48
 	if global.difficulty_vote_index then r = difficulties_votes[global.difficulty_vote_index] end
 	if math_random(1, r) ~= 1 then return end
 	local surface = game.players[1].surface	

modules/wave_defense/main.lua

@@ -106,8 +106,8 @@ local function set_enemy_evolution()
 		evolution_factor = 1
 	end
 
-	if wave_defense_table.threat > 0 then
-		biter_health_boost = math.round(biter_health_boost + wave_defense_table.threat * 0.000033, 3)
+	if wave_defense_table.threat > 50000 then
+		biter_health_boost = math.round(biter_health_boost + (wave_defense_table.threat - 50000) * 0.000033, 3)
 		--damage_increase = math.round(damage_increase + wave_defense_table.threat * 0.0000025, 3)
 	end
 
@@ -187,7 +187,9 @@ local function set_next_wave()
 	if wave_defense_table.group_size > wave_defense_table.max_group_size then wave_defense_table.group_size = wave_defense_table.max_group_size end
 	
 	local threat_gain = wave_defense_table.wave_number * wave_defense_table.threat_gain_multiplier
-	threat_gain = threat_gain * (wave_defense_table.wave_number * 0.001 + 1)
+	if wave_defense_table.wave_number > 1000 then
+		threat_gain = threat_gain * (wave_defense_table.wave_number * 0.001)
+	end
 	
 	wave_defense_table.threat = wave_defense_table.threat + math.floor(threat_gain)	
 	wave_defense_table.last_wave = wave_defense_table.next_wave