diff --git a/maps/pirates/balance.lua b/maps/pirates/balance.lua index 8da2c871..a12d3238 100644 --- a/maps/pirates/balance.lua +++ b/maps/pirates/balance.lua @@ -510,9 +510,9 @@ function Public.player_gun_speed_modifiers() end -Public.starting_items_player = {['pistol'] = 1, ['firearm-magazine'] = 12, ['raw-fish'] = 1, ['iron-plate'] = 12, ['medium-electric-pole'] = 4} +Public.starting_items_player = {['pistol'] = 1, ['firearm-magazine'] = 20, ['raw-fish'] = 4, ['medium-electric-pole'] = 20, ['iron-plate'] = 50, ['copper-plate'] = 20, ['iron-gear-wheel'] = 6, ['copper-cable'] = 20, ['burner-inserter'] = 2} -Public.starting_items_player_late = {['pistol'] = 1, ['firearm-magazine'] = 5} +Public.starting_items_player_late = {['pistol'] = 1, ['firearm-magazine'] = 10, ['raw-fish'] = 4, ['small-electric-pole'] = 20, ['iron-plate'] = 50, ['copper-plate'] = 20, ['iron-gear-wheel'] = 6, ['copper-cable'] = 20, ['burner-inserter'] = 2} function Public.starting_items_crew_upstairs() return { diff --git a/maps/pirates/crew.lua b/maps/pirates/crew.lua index 04815c68..e108a143 100644 --- a/maps/pirates/crew.lua +++ b/maps/pirates/crew.lua @@ -377,7 +377,7 @@ function Public.join_crew(player, crewid, rejoin) memory.crewplayerindices[#memory.crewplayerindices + 1] = player.index -- don't give them items if they've been in the crew recently: - if not (memory.tempbanned_from_joining_data and memory.tempbanned_from_joining_data[player.index] and game.tick < memory.tempbanned_from_joining_data[player.index] + 8 * Common.ban_from_rejoining_crew_ticks) and (not rejoin) then + if not (memory.tempbanned_from_joining_data and memory.tempbanned_from_joining_data[player.index]) and (not rejoin) then --just using tempbanned_from_joining_data as a quick proxy for whether the player has ever been in this run before for item, amount in pairs(Balance.starting_items_player_late) do player.insert({name = item, count = amount}) end