v1.1.1.5.1, preparing for PR

control.lua

@@ -3,7 +3,6 @@ _LIFECYCLE = _STAGE.control -- Control stage
 _DEBUG = false
 _DUMP_ENV = false
 
-
 require 'utils.server'
 require 'utils.server_commands'
 require 'utils.command_handler'
@@ -33,9 +32,9 @@ require 'modules.autostash'
 require 'comfy_panel.main'
 require 'comfy_panel.player_list'
 require 'comfy_panel.admin'
--- require 'comfy_panel.group'
--- require 'comfy_panel.poll'
--- require 'comfy_panel.score'
+require 'comfy_panel.group'
+require 'comfy_panel.poll'
+require 'comfy_panel.score'
 require 'comfy_panel.config'
 require 'comfy_panel.server_select'
 

maps/pirates/balance.lua

@@ -36,7 +36,7 @@ function Public.cost_to_leave_multiplier()
 	-- return Math.sloped(Common.difficulty(), 9/10)
 
 	-- extra factor now that the cost scales with time:
-	return Math.sloped(Common.difficulty(), 9/10)
+	return Math.sloped(Common.difficulty(), 8/10)
 end
 
 Public.rocket_launch_coin_reward = 5000
@@ -294,7 +294,7 @@ function Public.island_richness_avg_multiplier()
 	-- local base = 0.7 + 0.1 * (Common.overworldx()/40)^(7/10) --tuned tbh
 	local base = 0.73 + 0.110 * (Common.overworldx()/40)^(7/10) --tuned tbh
 
-	ret = base * Math.sloped(Public.crew_scale(), 1/20) --we don't really have resources scaling by player count in this resource-constrained scenario, but we scale a little, to accommodate each player filling their inventory with useful tools. also, I would do 1/14, but we go even slightly lower because we're applying this somewhat sooner than players actually get there.
+	ret = base * Math.sloped(Public.crew_scale(), 1/40) --we don't really have resources scaling by player count in this resource-constrained scenario, but we scale a little, to accommodate each player filling their inventory with useful tools. also, I would do higher than 1/40, but we go even slightly lower because we're applying this somewhat sooner than players actually get there.
 
 	return ret
 end
@@ -332,7 +332,7 @@ function Public.sandworm_evo_increase_per_spawn()
 	if _DEBUG then
 		return 1/100
 	else
-		return 1/100 * 1/15 * Math.sloped(Common.difficulty(), 1)
+		return 1/100 * 1/8 * Math.sloped(Common.difficulty(), 3/5)
 	end
 end
 

maps/pirates/coredata.lua

@@ -5,8 +5,8 @@ local inspect = require 'utils.inspect'.inspect
 local Public = {}
 
 Public.scenario_id_name = 'pirates'
-Public.version_string = '1.1.1.5.0'
-Public.version_float = 1.1150
+Public.version_string = '1.1.1.5.1'
+Public.version_float = 1.1151
 
 Public.blueprint_library_allowed = true
 Public.blueprint_importing_allowed = true

maps/pirates/gui/gui.lua

@@ -918,7 +918,7 @@ function Public.update_gui(player)
 		
 				flow1.silo_progressbar.value = consumed/needed
 		
-				local tooltip = string.format('Rocket silo charge\n\nCharge the silo to launch a rocket, gaining both doubloons and fuel.\n\nCurrent charge: %.1f/%.1f GJ', Math.floor(consumed / 100000000)/10, Math.floor(needed / 100000000)/10)
+				local tooltip = string.format('Rocket silo charge: %.1f/%.1f GJ\n\nFully charge the silo to launch a rocket, gaining both doubloons and fuel.', Math.floor(consumed / 100000000)/10, Math.floor(needed / 100000000)/10)
 				flow1.tooltip = tooltip
 				flow1.silo_label_1.tooltip = tooltip
 				flow1.silo_label_2.tooltip = tooltip

maps/pirates/overworld.lua

@@ -210,18 +210,18 @@ function Public.generate_overworld_destination(p)
 		}
 		local base_cost_3 = {
 			['electronic-circuit'] = Math.ceil(((macrop.x-2)^(2/3))*140),
-			['advanced-circuit'] = Math.ceil(((macrop.x-14)^(2/3))*20),
+			['advanced-circuit'] = Math.ceil(((macrop.x-14)^(2/3))*18),
 			['launch_rocket'] = true,
 		}
 		local base_cost_4 = {
-			['electronic-circuit'] = Math.ceil(((macrop.x-2)^(2/3))*140),
-			['advanced-circuit'] = Math.ceil(((macrop.x-14)^(2/3))*20),
+			['electronic-circuit'] = Math.ceil(((macrop.x-2)^(2/3))*100),
+			['advanced-circuit'] = Math.ceil(((macrop.x-14)^(2/3))*18),
 			['flying-robot-frame'] = Math.ceil(((macrop.x-18)^(2/3))*10),
 			['launch_rocket'] = true,
 		}
 		local base_cost_5 = {
-			['electronic-circuit'] = Math.ceil(((macrop.x-2)^(2/3))*140),
-			['advanced-circuit'] = Math.ceil(((macrop.x-14)^(2/3))*20),
+			['electronic-circuit'] = Math.ceil(((macrop.x-2)^(2/3))*100),
+			['advanced-circuit'] = Math.ceil(((macrop.x-14)^(2/3))*18),
 			['flying-robot-frame'] = Math.ceil(((macrop.x-18)^(2/3))*10),
 		}
 		if macrop.x == 0 then

maps/pirates/shop/captains.lua

@@ -109,7 +109,7 @@ Public.main_shop_data_2 = {
 	uranium_ore = {
 		tooltip = '10 green rocks of unknown origin.',
 		what_you_get_sprite_buttons = {['item/uranium-238'] = 10},
-		base_cost = {coins = 1000, fuel = 80},
+		base_cost = {coins = 1000, fuel = 100},
 	},
 	extra_time = {
 		tooltip = 'Relax at sea for an extra minute. (Increases the next destination\'s loading time.)',

maps/pirates/structures/island_structures/roc/data.lua

@@ -177,7 +177,7 @@ Public.maze_defended_camp = {
 			force = 'ancient-friendly',
 			offset = {x = 0, y = 0},
 			count = 13,
-			r = 5,
+			r = 4,
 		},
 	},
 }
@@ -203,7 +203,7 @@ Public.maze_undefended_camp = {
 			force = 'ancient-friendly',
 			offset = {x = 0, y = 0},
 			count = 7,
-			r = 5,
+			r = 4,
 		},
 	},
 }

maps/pirates/surfaces/hold.lua

@@ -161,7 +161,7 @@ function Public.create_hold_surface(nth)
 	Common.build_small_loco(surface, Public.Data.loco_offset, memory.force, {255, 106, 52})
 
 	local items = subtype == enum.INITIAL and Balance.starting_items_crew_downstairs() or {}
-	Common.surface_place_random_obstacle_boxes(Public.get_hold_surface(nth), {x=0,y=0}, Public.Data.width, Public.Data.height, 'rocket-silo', {[1] = 0, [2] = 5, [3] = 3, [4] = 2}, items)
+	Common.surface_place_random_obstacle_boxes(Public.get_hold_surface(nth), {x=0,y=0}, Public.Data.width, Public.Data.height, 'rocket-silo', {[1] = 0, [2] = 5, [3] = 4, [4] = 2}, items)
 	-- Public.hold_place_random_obstacle_boxes(nth, {[1] = 0, [2] = 9, [3] = 3, [4] = 1}, items)
 
 	if not boat.downstairs_poles then boat.downstairs_poles = {} end

maps/pirates/surfaces/islands/horseshoe/data.lua

@@ -5,7 +5,7 @@ local Math = require 'maps.pirates.math'
 
 local Public = {}
 
-Public.display_names = {'Horseshoe Keys'}
+Public.display_names = {'Shark Keys', 'Little Keys', 'Little Keys'}
 
 Public.terraingen_frame_width = 896
 Public.terraingen_frame_height = 896

maps/pirates/surfaces/islands/maze/maze.lua

@@ -136,7 +136,7 @@ end
 local free_labyrinth_cell_raffle = {
 	empty = 16.5,
 	maze_labs = 0.6,
-	maze_defended_camp = 1,
+	maze_defended_camp = 0.85,
 	maze_undefended_camp = 0.25,
 	maze_worms = 0.8,
 	small_abandoned_refinery = 0.05,
@@ -145,7 +145,7 @@ local free_labyrinth_cell_raffle = {
 	maze_belts_2 = 0.2,
 	maze_belts_3 = 0.2,
 	maze_belts_4 = 0.2,
-	maze_mines = 0.2,
+	maze_mines = 0.1,
 	maze_treasure = 0.7,
 }
 
@@ -243,8 +243,8 @@ function Public.chunk_structures(args)
 
 		return {
 			placeable = noises.farness(p) > 0.66,
-			-- spawners_indestructible = noises.farness(p) > 0.7,
-			spawners_indestructible = true,
+			spawners_indestructible = noises.farness(p) > 0.7,
+			-- spawners_indestructible = true,
 			density_perchunk = 150 * Math.slopefromto(noises.farness(p), 0.3, 1)^2 * args.biter_base_density_scale,
 		}
 	end

maps/pirates/tick_functions.lua

@@ -1164,7 +1164,7 @@ function Public.silo_update(tickinterval)
 						memory.floating_pollution = memory.floating_pollution + pollution/2
 						game.surfaces[destination.surface_name].pollute(p, pollution/2)
 
-						if memory.overworldx >= 500 and dynamic_data.rocketsiloenergyconsumed >= 0.25 * dynamic_data.rocketsiloenergyneeded and (not dynamic_data.parrot_silo_warned) then
+						if memory.overworldx >= 200 and dynamic_data.rocketsiloenergyconsumed >= 0.25 * dynamic_data.rocketsiloenergyneeded and (not dynamic_data.parrot_silo_warned) then
 							dynamic_data.parrot_silo_warned = true
 							Common.parrot_speak(memory.force, 'Just a warning... the silo is attracting biters...')
 						elseif dynamic_data.rocketsiloenergyconsumed >= dynamic_data.rocketsiloenergyneeded and (not (silo.rocket_parts == 100)) and (dynamic_data.silocharged == false) and (not memory.game_lost) then