adjustments

control.lua

@@ -111,7 +111,7 @@ require 'utils.freeplay'
 --require 'maps.chronosphere.main'
 
 --![[Adventure as a crew of pirates]]--
---require 'maps.pirates.main'
+require 'maps.pirates.main'
 
 --![[Launch rockets in increasingly harder getting worlds.]]--
 --require 'maps.journey.main'

maps/pirates/balance.lua

@@ -45,7 +45,9 @@ Public.rocket_launch_coin_reward = 6000
 function Public.crew_scale()
 	local ret = Common.activecrewcount()/10
 	if ret == 0 then ret = 1/10 end --if all players are afk
-	if ret > 2.4 then ret = 2.4 end --we have to cap this because you need time to mine the ore... and big crews are a mess anyway. currently this value matches the 24 player capacity setting
+	if ret > 2.1 then ret = 2.1 end --An upper cap on this is important, for two reasons:
+	-- large crews become disorganised
+	-- Higher values of this scale lower the amount of time you get on each island. But the amount of time certain island tasks take is fixed; e.g. the amount of ore is mostly invariant, and you need time to mine it.
 	return ret
 end
 

maps/pirates/common.lua

@@ -9,6 +9,9 @@ local _inspect = require 'utils.inspect'.inspect
 -- local perlin_noise = require 'utils.perlin_noise'
 -- local Force_health_booster = require 'modules.force_health_booster'
 
+-- == Common variables and functions used throughout pirate ship files
+
+
 local Public = {}
 
 -- Public.active_crews_cap = 1

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.2.2.2'
-Public.version_float = 1.1222
+Public.version_string = '1.2.1' --will now try to stick to major.minor.patch versioning, to match factorio mod portal
+Public.version_float = 1.21
 
 Public.blueprint_library_allowed = true
 Public.blueprint_importing_allowed = true

maps/pirates/crew.lua

@@ -664,7 +664,7 @@ function Public.initialise_crew(accepted_proposal)
 
 	global_memory.crew_active_ids[#global_memory.crew_active_ids + 1] = new_id
 
-	Memory.reset_crew_memory(new_id)
+	Memory.initialise_crew_memory(new_id)
 	Memory.set_working_id(new_id)
 
 	game.reset_time_played() -- affects the multiplayer lobby view

maps/pirates/gui/gui.lua

@@ -779,7 +779,7 @@ function Public.process_siloframe_and_questframe_updates(flowsilo, flowquest, bo
 
 				if quest_complete and quest_reward then
 					tooltip = 'This island\'s quest is complete, and this is the reward.'
-					flow1.quest_label_1.caption = 'Quest:'
+					flow1.quest_label_1.caption = 'Island Quest:'
 					flow1.quest_label_1.style.font_color = GuiCommon.achieved_font_color
 					flow1.quest_label_2.visible = true
 					flow1.quest_label_3.visible = false
@@ -787,7 +787,7 @@ function Public.process_siloframe_and_questframe_updates(flowsilo, flowquest, bo
 					flow1.quest_label_2.caption = quest_reward.display_amount .. ' ' .. quest_reward.display_sprite
 				elseif quest_reward then
 					if quest_progress < quest_progressneeded then
-						flow1.quest_label_1.caption = 'Quest:'
+						flow1.quest_label_1.caption = 'Island Quest:'
 						flow1.quest_label_1.style.font_color = GuiCommon.bold_font_color
 						flow1.quest_label_2.visible = true
 						flow1.quest_label_3.visible = true
@@ -801,7 +801,7 @@ function Public.process_siloframe_and_questframe_updates(flowsilo, flowquest, bo
 					end
 
 					if quest_type == Quest.enum.TIME then
-						if tooltip == '' then tooltip = 'Quest: Time\n\nLaunch a rocket before the countdown completes for a bonus.' end
+						if tooltip == '' then tooltip = 'Island Quest: Time\n\nLaunch a rocket before the countdown completes for a bonus.' end
 
 						if quest_progress >= 0 then
 							flow1.quest_label_3.caption = string.format('%.0fm%.0fs', Math.floor(quest_progress / 60), quest_progress % 60)
@@ -824,13 +824,13 @@ function Public.process_siloframe_and_questframe_updates(flowsilo, flowquest, bo
 						end
 
 					elseif quest_type == Quest.enum.WORMS then
-						if tooltip == '' then tooltip = 'Quest: Worms\n\nKill enough worms for a bonus.' end
+						if tooltip == '' then tooltip = 'Island Quest: Worms\n\nKill enough worms for a bonus.' end
 
 					elseif quest_type == Quest.enum.FIND then
-						if tooltip == '' then tooltip = 'Quest: Ghosts\n\nFind the ghosts for a bonus.' end
+						if tooltip == '' then tooltip = 'Island 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
+						if tooltip == '' then tooltip = 'Island Quest: Resource Flow\n\nAchieve a production rate of a particular item for a bonus.' end
 
 						-- out of date:
 						if quest_progressneeded/60 % 1 == 0 then
@@ -842,12 +842,12 @@ function Public.process_siloframe_and_questframe_updates(flowsilo, flowquest, bo
 						end
 
 					elseif quest_type == Quest.enum.RESOURCECOUNT then
-						if tooltip == '' then tooltip = 'Quest: Item Production\n\nSimply produce a particular number of items for a bonus, anywhere on the map.' end
+						if tooltip == '' then tooltip = 'Island Quest: Item Production\n\nSimply complete production of these items for a bonus, anywhere on the map.' end
 
 						flow1.quest_label_2.caption = string.format('%s ', '[item=' .. quest_params.item .. ']')
 
 					elseif quest_type == Quest.enum.NODAMAGE then
-						if tooltip == '' then tooltip = 'Quest: No Damage\n\nLaunch a rocket without the silo taking damage.' end
+						if tooltip == '' then tooltip = 'Island Quest: No Damage\n\nLaunch a rocket without the silo taking damage.' end
 
 						if bools.approaching_bool or (dynamic_data.rocketsilos and dynamic_data.rocketsilos[1] and dynamic_data.rocketsilos[1].valid and dynamic_data.rocketsilohp == dynamic_data.rocketsilomaxhp) then
 							flow1.quest_label_3.caption = string.format('OK')

maps/pirates/highscore.lua

@@ -21,6 +21,9 @@ local score_key_debug = 'pirate_ship_scores_debug'
 local score_key_modded = 'pirate_ship_scores_modded'
 
 
+-- == This code is mostly a fork of the file from Mountain Fortress
+
+
 local Public = {}
 local insert = table.insert
 local this = {

maps/pirates/loot.lua

@@ -42,7 +42,7 @@ Public.buried_treasure_loot_data_raw = {
 
 Public.chest_loot_data_raw = {
 	{80, 0, 1, false, 'coin', 400, 700},
-	{30, 0, 1, false, 'rail-signal', 25, 110},
+	{30, 0, 1, false, 'rail-signal', 50, 50},
 	{1, 0.2, 1, false, 'electric-engine-unit', 1, 2},
 	{3, 0, 1, false, 'small-lamp', 4, 16},
 	{10, 0, 1, false, 'coal', 60, 100},
@@ -336,7 +336,7 @@ Public.maze_treasure_data_raw = {
 
 	{2, 0, 1, false, 'uranium-rounds-magazine', 15, 25},
 	{2, 0, 1, false, 'artillery-shell', 5, 7},
-	{2, 0, 1, false, 'rail-signal', 400, 500},
+	{2, 0, 1, false, 'rail-signal', 400, 400},
 	{2, 0, 1, false, 'electric-engine-unit', 3, 4},
 	{2, 0, 1, false, 'cluster-grenade', 8, 12},
 

maps/pirates/memory.lua

@@ -40,7 +40,7 @@ end
 
 
 
-function Public.reset_crew_memory(id) --mostly serves as a dev reference of memory entries
+function Public.initialise_crew_memory(id) --mostly serves as a dev reference of memory entries
 	-- but not _everything_ is stored here, it's just a guide to the most important things
 
 	pirates_global_memory.crew_memories[id] = {}

maps/pirates/surfaces/cabin.lua

@@ -101,7 +101,7 @@ Public.cabin_shop_data = {
 		offer = {type='give-item', item = 'artillery-shell', count = 5},
 	},
 	{
-		price = {{'coin', 1000}, {'electronic-circuit', 30}},
+		price = {{'coin', 1000}, {'electronic-circuit', 25}},
 		offer = {type='give-item', item = 'rail-signal', count = 100},
 	},
 	{