v1.0.4.2

2025-03-17 20:58:13 +02:00 · 2022-03-05 23:42:47 +00:00 · 2022-03-05 23:42:47 +00:00 · 9859d0d9d8
commit 9859d0d9d8
parent 50aae02473
18 changed files with 64 additions and 49 deletions
--- a/maps/pirates/ai.lua
+++ b/maps/pirates/ai.lua
@ -717,7 +717,7 @@ function Public.revenge_group(surface, p, target, type, bonus_evo, amount_multip
 		name = Common.get_random_biter_type(memory.evolution_factor + bonus_evo)

 		if name == 'small-biter' then
-			count = 6
+			count = 5
 		elseif name == 'medium-biter' then
 			count = 3
 		elseif name == 'big-biter' then
@ -729,11 +729,11 @@ function Public.revenge_group(surface, p, target, type, bonus_evo, amount_multip
 		name = Common.get_random_spitter_type(memory.evolution_factor + bonus_evo)

 		if name == 'small-spitter' then
-			count = 10
+			count = 7
 		elseif name == 'medium-spitter' then
-			count = 6
+			count = 5
 		elseif name == 'big-spitter' then
-			count = 4
+			count = 3
 		elseif name == 'behemoth-spitter' then
 			count = 2
 		end
--- a/maps/pirates/balance.lua
+++ b/maps/pirates/balance.lua
@ -135,7 +135,7 @@ function Public.boat_passive_pollution_per_minute(time)
 		elseif time >= 60/100 * T then
 			boost = 2
 		elseif time >= 50/100 * T then
-			boost = 1
+			boost = 1.5
 		end
 	end

--- a/maps/pirates/coredata.lua
+++ b/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.0.4.1'
-Public.version_float = 1.041
+Public.version_string = '1.0.4.2'
+Public.version_float = 1.042

 Public.blueprint_library_allowed = false
 Public.blueprint_importing_allowed = true
--- a/maps/pirates/crew.lua
+++ b/maps/pirates/crew.lua
@ -75,10 +75,11 @@ function Public.update_difficulty()

 	if modal_id ~= memory.difficulty_option then
 		local color = CoreData.difficulty_options[modal_id].associated_color
-		local message = 'Difficulty [color=' .. color.r .. ',' .. color.g .. ',' .. color.b .. ']changed to ' .. CoreData.difficulty_options[modal_id].text .. '[/color].'
+		local message1 = 'Difficulty [color=' .. color.r .. ',' .. color.g .. ',' .. color.b .. ']changed to ' .. CoreData.difficulty_options[modal_id].text .. '[/color].'
+		local message2 = 'Difficulty changed to ' .. CoreData.difficulty_options[modal_id].text .. '.'

-		Common.notify_force(memory.force, message)
-		Server.to_discord_embed_raw(CoreData.comfy_emojis.kewl .. '[' .. memory.name .. '] ' .. message)
+		Common.notify_force(memory.force, message1)
+		Server.to_discord_embed_raw(CoreData.comfy_emojis.kewl .. '[' .. memory.name .. '] ' .. message2)

 		memory.difficulty_option = modal_id
 		memory.difficulty = CoreData.difficulty_options[modal_id].value
--- a/maps/pirates/gui/gui.lua
+++ b/maps/pirates/gui/gui.lua
@ -924,7 +924,7 @@ function Public.update_gui(player)
 					if tooltip == '' then tooltip = 'Quest: Worms\n\nKill enough worms for a bonus.' end
 	
 				elseif quest_type == Quest.enum.FIND then
-					if tooltip == '' then tooltip = 'Quest: Find\n\nFind the ghosts for a bonus.' end
+					if tooltip == '' then tooltip = 'Quest: Ghosts\n\nFind the ghosts for a bonus.' end
 	
 				elseif quest_type == Quest.enum.RESOURCEFLOW then
 					if tooltip == '' then tooltip = 'Quest: Resource Flow\n\nAchieve a production rate of a particular item for a bonus.' end
--- a/maps/pirates/loot.lua
+++ b/maps/pirates/loot.lua
@ -308,11 +308,11 @@ function Public.maze_camp_loot()
 end

 Public.maze_lab_loot_data_raw = {
-	{8, -0.5, 0.5, true, 'automation-science-pack', 8, 20},
-	{8, -0.6, 0.6, true, 'logistic-science-pack', 8, 20},
-	{6, -0.1, 1, true, 'military-science-pack', 8, 20},
-	{6, -0.5, 1.5, true, 'chemical-science-pack', 8, 20},
-	{6, 0, 1.5, true, 'production-science-pack', 8, 20},
+	{8, -0.5, 0.5, true, 'automation-science-pack', 5, 20},
+	{8, -0.6, 0.6, true, 'logistic-science-pack', 5, 20},
+	{6, -0.1, 1, true, 'military-science-pack', 5, 20},
+	{6, -0.5, 1.5, true, 'chemical-science-pack', 5, 20},
+	{6, 0, 1.5, true, 'production-science-pack', 5, 20},
 	-- {4, 0.4, 1.5, true, 'utility-science-pack', 16, 32},
 	-- {10, 0.5, 1.5, true, 'space-science-pack', 16, 32},
 }
@ -339,7 +339,7 @@ Public.maze_treasure_data_raw = {
 	{0.5, 0, 1, false, 'productivity-module-3', 2, 2},

 	{2, 0, 1.5, true, 'production-science-pack', 20, 25},
-	{2, 0, 1.5, true, 'coin', 5000, 10000},
+	{2, 0, 1.5, true, 'coin', 3000, 6500},

 	{1, 0.2, 1.8, true, 'explosive-rocket', 6, 8},

--- a/maps/pirates/overworld.lua
+++ b/maps/pirates/overworld.lua
@ -96,12 +96,8 @@ function Public.generate_overworld_destination(p)
 		type = Surfaces.enum.ISLAND
 		subtype = Surfaces.Island.enum.STANDARD
 	elseif macrop.x == 6 then
-		if macrop.y == 1 then
-			type = Surfaces.enum.ISLAND
-			subtype = Surfaces.Island.enum.MAZE
-		else
-			type = nil
-		end
+		type = Surfaces.enum.ISLAND
+		subtype = Surfaces.Island.enum.MAZE
 	elseif macrop.x == 8 then --game length decrease, pending more content
 		type = nil
 	-- elseif macrop.x == 9 then --just before krakens
@ -327,7 +323,7 @@ function Public.generate_overworld_destination(p)
 		end
 		static_params.abstract_ore_amounts = abstract_ore_amounts

-		static_params.radius_squared_modifier = (Math.sqrt(0.5) + 1 * Math.random())^2
+		static_params.radius_squared_modifier = (1 + 1 * Math.random())^2

 		if macrop.x == 0 then static_params.radius_squared_modifier = 1 end

--- a/maps/pirates/progression.lua
+++ b/maps/pirates/progression.lua
@ -132,15 +132,15 @@ function Public.go_from_starting_dock_to_first_destination()
 		boat.EEI_stage = 1
 		Boats.update_EEIs(boat)

-		if Common.difficulty() == 1 then
-			Boats.upgrade_chests(boat, 'iron-chest')
-			Hold.upgrade_chests(1, 'iron-chest')
-			Crowsnest.upgrade_chests('iron-chest')
-		elseif Common.difficulty() > 1 then
-			Boats.upgrade_chests(boat, 'steel-chest')
-			Hold.upgrade_chests(1, 'steel-chest')
-			Crowsnest.upgrade_chests('steel-chest')
-		end
+		-- if Common.difficulty() == 1 then
+		-- 	Boats.upgrade_chests(boat, 'iron-chest')
+		-- 	Hold.upgrade_chests(1, 'iron-chest')
+		-- 	Crowsnest.upgrade_chests('iron-chest')
+		-- elseif Common.difficulty() > 1 then
+		-- 	Boats.upgrade_chests(boat, 'steel-chest')
+		-- 	Hold.upgrade_chests(1, 'steel-chest')
+		-- 	Crowsnest.upgrade_chests('steel-chest')
+		-- end

 		memory.age = 0
 		memory.real_age = 0
@ -512,6 +512,21 @@ function Public.go_from_currentdestination_to_sea()
 	local new_boatposition = Utils.snap_coordinates_for_rails({x = Boats.get_scope(memory.boat).Data.width / 2, y = 0})
 	
 	Boats.teleport_boat(boat, seaname, new_boatposition, CoreData.static_boat_floor, 'water')
+
+	if memory.overworldx == 0 and memory.boat then
+		if Common.difficulty() >= 1 then
+			Boats.upgrade_chests(boat, 'iron-chest')
+			Hold.upgrade_chests(1, 'iron-chest')
+			Crowsnest.upgrade_chests('iron-chest')
+
+			Common.notify_force(memory.force, 'Difficulty at Normal or above: Boat chests upgraded.')
+		-- elseif Common.difficulty() > 1 then
+		-- 	Boats.upgrade_chests(boat, 'steel-chest')
+		-- 	Hold.upgrade_chests(1, 'steel-chest')
+		-- 	Crowsnest.upgrade_chests('steel-chest')
+		end
+	end
+	
 	memory.boat.state = Boats.enum_state.ATSEA_SAILING
 	memory.boat.speed = 0
 	memory.boat.position = new_boatposition
--- a/maps/pirates/roles/classes.lua
+++ b/maps/pirates/roles/classes.lua
@ -64,12 +64,12 @@ Public.display_form = {
 	[enum.QUARTERMASTER] = 'Quartermaster',
 }
 Public.explanation = {
-	[enum.DECKHAND] = 'They move faster and generate iron ore for the captain\'s cabin whilst onboard above deck, but move slower offboard.',
+	[enum.DECKHAND] = 'They move faster and generate ore for the captain\'s cabin whilst onboard above deck, but move slower offboard.',
 	[enum.FISHERMAN] = 'They fish at greater distance.',
 	[enum.SCOUT] = 'They are faster, but frail and deal less damage.',
 	[enum.SAMURAI] = 'They are tough, and *with no weapon equipped* fight well by melee, but poorly otherwise.',
 	[enum.MERCHANT] = 'They generate 40 coins per league, but are frail.',
-	[enum.SHORESMAN] = 'They move slightly faster and generate iron ore for the captain\'s cabin whilst offboard, but move slower onboard.',
+	[enum.SHORESMAN] = 'They move slightly faster and generate ore for the captain\'s cabin whilst offboard, but move slower onboard.',
 	[enum.BOATSWAIN] = 'They move faster and generate lots of ore for the captain\'s cabin whilst below deck, but move slower offboard.',
 	[enum.PROSPECTOR] = 'They find more resources when handmining ore.',
 	[enum.LUMBERJACK] = 'They find more resources when chopping trees.',
--- a/maps/pirates/structures/island_structures/roc/data.lua
+++ b/maps/pirates/structures/island_structures/roc/data.lua
@ -160,7 +160,7 @@ Public.maze_defended_camp = {
 			type = 'static_destructible',
 			force = 'ancient-hostile',
 			offset = {x = 0, y = 0},
-			bp_string = [[0eNqVkl0KgzAQhO+yzxHqT9TmKqUUrYsEdJUYS0Vy9yZKodAI5ikMzHxMllmh7mYclSQNYoWJqjHSQ9Qq2Tj9BhHnDBb3GAbyOdAE4maNsqWqcxa9jAgCpMYeGFDVO9XOFOlZKdTgYtSgI5k7AyQttcSdsonlQXNfo7IGX57BOEw2MtC30N7HGPYHSE4BymNAeq4BPyZkAX8ofQAeUsFLyEPOyH2EIuSOXkIZdEiLsNPYJiR+BsnghWra7EkZZ8U1KXjM4zS/GPMBseflYg==]],
+			bp_string = [[0eNqVkVEKgzAQRO+y3xEaa7TNVUopWhcJ6CbEpFQkd2+iFAq1UL+WgZnHMDtD03s0VpEDOcNItcmczjqr2qSfIHnJYEonMFB3TSPISzSqjuo+WdxkECQohwMwoHpIqvOUOW8tOkgxajGRwpUBklNO4UpZxHQjPzRoo2Erz8DoMUY0vQutfUJgX4D8P4D4TTjuqSC2CMWuDhERR1nGkx+vYPBAOy72/MSL6pxXggt+LA8hvAD1/I5u]],
 		},
 		{
 			type = 'entities_randomlyplaced_border',
@ -193,7 +193,7 @@ Public.maze_undefended_camp = {
 			name = 'land-mine',
 			force = 'ancient-hostile',
 			offset = {x = 0, y = 0},
-			count = 15,
+			count = 10,
 			large_r = 10,
 			small_r = 8,
 		},
--- a/maps/pirates/surfaces/islands/first/data.lua
+++ b/maps/pirates/surfaces/islands/first/data.lua
@ -22,8 +22,8 @@ Public.static_params_default = {

 function Public.base_ores() 
 	return {
-		['copper-ore'] = 2.0,
-		['iron-ore'] = 4.1,
+		['copper-ore'] = 1.9,
+		['iron-ore'] = 4.2,
 		['coal'] = 3.1,
 		['stone'] = 0.4,
 	}
--- a/maps/pirates/surfaces/islands/horseshoe/data.lua
+++ b/maps/pirates/surfaces/islands/horseshoe/data.lua
@ -21,8 +21,8 @@ Public.static_params_default = {

 function Public.base_ores() 
 	return {
-		['copper-ore'] = 2.8,
-		['iron-ore'] = 3.1,
+		['copper-ore'] = 2.4,
+		['iron-ore'] = 3.5,
 		['coal'] = 3.6,
 		['stone'] = 1.0,
 	}
--- a/maps/pirates/surfaces/islands/maze/data.lua
+++ b/maps/pirates/surfaces/islands/maze/data.lua
@ -21,8 +21,8 @@ Public.static_params_default = {

 function Public.base_ores() 
 	return {
-		['copper-ore'] = 5.0,
-		['iron-ore'] = 5.0,
+		['copper-ore'] = 3.5,
+		['iron-ore'] = 6.5,
 		['coal'] = 4.4,
 		['stone'] = 2.5,
 		['crude-oil'] = 15,
--- a/maps/pirates/surfaces/islands/standard/data.lua
+++ b/maps/pirates/surfaces/islands/standard/data.lua
@ -21,7 +21,7 @@ Public.static_params_default = {

 function Public.base_ores() 
 	return {
-		['copper-ore'] = 2.4,
+		['copper-ore'] = 1.2,
 		['iron-ore'] = 5.6,
 		['coal'] = 4.4,
 		['stone'] = 0.9,
--- a/maps/pirates/surfaces/islands/standard_variant/data.lua
+++ b/maps/pirates/surfaces/islands/standard_variant/data.lua
@ -23,7 +23,7 @@ function Public.base_ores()
 	return {
 		['copper-ore'] = 3.9,
 		['iron-ore'] = 3.9,
-		['coal'] = 4.4,
+		['coal'] = 4.5,
 		['stone'] = 2.2,
 	}
 end
--- a/maps/pirates/surfaces/islands/swamp/data.lua
+++ b/maps/pirates/surfaces/islands/swamp/data.lua
@ -22,8 +22,8 @@ Public.static_params_default = {

 function Public.base_ores() 
 	return {
-		['copper-ore'] = 2.0,
-		['iron-ore'] = 2.0,
+		['copper-ore'] = 1.4,
+		['iron-ore'] = 2.6,
 		['coal'] = 6.8,
 		['stone'] = 0.5,
 		['crude-oil'] = 50,
--- a/maps/pirates/surfaces/surfaces.lua
+++ b/maps/pirates/surfaces/surfaces.lua
@ -311,8 +311,11 @@ end

 function Public.destination_on_departure(destination)
 	local memory = Memory.get_crew_memory()
+	local boat = memory.boat

-	if memory.overworldx == 40*9 then Parrot.parrot_kraken_warning() end
+	if memory.overworldx == 40*9 then
+		Parrot.parrot_kraken_warning()
+	end

 	if destination.subtype and destination.subtype == Islands.enum.MAZE then
 		local force = memory.force
--- a/maps/pirates/tick_functions_classes.lua
+++ b/maps/pirates/tick_functions_classes.lua
@ -152,7 +152,7 @@ function Public.update_character_properties(tickinterval)
 end

 local function class_ore_grant(player, how_much)
-	if Math.random(2) == 2 then
+	if Math.random(3) == 1 then
 		Common.flying_text_small(player.surface, player.position, '[color=0.85,0.58,0.37]+[/color]')
 		Common.give_reward_items{{name = 'copper-ore', count = Math.ceil(how_much * Balance.class_resource_scale())}}
 	else