diff --git a/maps/pirates/progression.lua b/maps/pirates/progression.lua index 55bd2d68..6ea43775 100644 --- a/maps/pirates/progression.lua +++ b/maps/pirates/progression.lua @@ -231,34 +231,6 @@ function Public.progress_to_destination(destination_index) -- starting_boatposition = {x = -destination_data.static_params.width/2 + BoatData.width + 10, y = Dock.Data.player_boat_top - BoatData.height/2} Common.current_destination().dynamic_data.time_remaining = 180 - -- memory.mainshop_availability_bools.sell_iron = true - memory.mainshop_availability_bools.buy_iron = true - memory.mainshop_availability_bools.buy_copper = true - -- memory.mainshop_availability_bools.buy_fast_loader = true - -- memory.mainshop_availability_bools.sell_copper = true - - memory.mainshop_availability_bools.upgrade_cannons = true - - local boat_for_sale_type = Common.current_destination().static_params.boat_for_sale_type - if boat_for_sale_type then - if boat_for_sale_type == Boats.enum.CUTTER then - memory.mainshop_availability_bools.new_boat_cutter = true - elseif boat_for_sale_type == Boats.enum.CUTTER_WITH_HOLD then - memory.mainshop_availability_bools.new_boat_cutter_with_hold = true - elseif boat_for_sale_type == Boats.enum.SLOOP_WITH_HOLD then - memory.mainshop_availability_bools.new_boat_sloop_with_hold = true - end - end - - local upgrade_for_sale = Common.current_destination().static_params.upgrade_for_sale - if upgrade_for_sale then - for _, u in pairs(Upgrades.List) do - if upgrade_for_sale == u then - memory.mainshop_availability_bools[u] = true - end - end - end - -- Delay.add(Delay.enum.PLACE_DOCK_JETTY_AND_BOATS) Task.set_timeout_in_ticks(2, place_dock_jetty_and_boats, { crew_id = memory.id }) else @@ -392,21 +364,6 @@ function Public.check_for_end_of_boat_movement(boat) Boats.place_boat(boat, CoreData.static_boat_floor, false, false) return true elseif leaving_dock and boat.position.x >= game.surfaces[boat.surface_name].map_gen_settings.width / 2 - 60 then - memory.mainshop_availability_bools.new_boat_cutter = false - memory.mainshop_availability_bools.new_boat_cutter_with_hold = false - memory.mainshop_availability_bools.new_boat_sloop_with_hold = false - -- memory.mainshop_availability_bools.sell_iron = false - memory.mainshop_availability_bools.buy_iron = false - memory.mainshop_availability_bools.buy_copper = false - -- memory.mainshop_availability_bools.buy_fast_loader = false - -- memory.mainshop_availability_bools.sell_copper = false - memory.mainshop_availability_bools.upgrade_cannons = false - - memory.mainshop_availability_bools.extra_hold = false - memory.mainshop_availability_bools.upgrade_power = false - memory.mainshop_availability_bools.unlock_merchants = false - memory.mainshop_availability_bools.rockets_for_sale = false - Public.go_from_currentdestination_to_sea() return true @@ -480,10 +437,6 @@ function Public.undock_from_dock(manual) Boats.place_boat(boat, CoreData.moving_boat_floor, false, false) - memory.mainshop_availability_bools.new_boat_cutter = false - memory.mainshop_availability_bools.new_boat_cutter_with_hold = false - memory.mainshop_availability_bools.new_boat_sloop_with_hold = false - Crew.summon_crew() local force = memory.force diff --git a/maps/pirates/surfaces/dock.lua b/maps/pirates/surfaces/dock.lua index eada911f..8bf12453 100644 --- a/maps/pirates/surfaces/dock.lua +++ b/maps/pirates/surfaces/dock.lua @@ -71,10 +71,6 @@ function Public.execute_boat_purchase() Hold.connect_up_linked_belts_to_deck() Cabin.connect_up_linked_belts_to_deck() - - -- memory.mainshop_availability_bools.new_boat_cutter_with_hold = false - -- memory.mainshop_availability_bools.new_boat_sloop_with_hold = false - -- memory.mainshop_availability_bools.new_boat_cutter = false end function Public.place_dock_jetty_and_boats()