From d02a4beb569d4ba5be26276bcffca5b43408f7df Mon Sep 17 00:00:00 2001 From: danielmartin0 Date: Sun, 15 Sep 2024 22:53:32 +0100 Subject: [PATCH] no long waits at docks --- maps/pirates/api_on_tick.lua | 11 ++++++----- maps/pirates/progression.lua | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/maps/pirates/api_on_tick.lua b/maps/pirates/api_on_tick.lua index af02fb0e..d1c2cc55 100644 --- a/maps/pirates/api_on_tick.lua +++ b/maps/pirates/api_on_tick.lua @@ -1150,11 +1150,12 @@ function Public.loading_update(tickinterval) local fraction = memory.loadingticks / (total + (memory.extra_time_at_sea or 0)) if fraction > Common.fraction_of_map_loaded_at_sea then - boat.state = Boats.enum_state.ATSEA_WAITING_TO_SAIL - memory.at_sea_waiting_game_tick = game.tick - - local force = memory.force - if not (force and force.valid) then return end + if currentdestination.type == Surfaces.enum.DOCK then + Progression.progress_to_destination(destination_index) + else + boat.state = Boats.enum_state.ATSEA_WAITING_TO_SAIL + memory.at_sea_waiting_game_tick = game.tick + end else PiratesApiEvents.load_some_map_chunks_random_order(surface, currentdestination, fraction) --random order is good for maze world if currentdestination.subtype == IslandEnum.enum.CAVE then diff --git a/maps/pirates/progression.lua b/maps/pirates/progression.lua index 6ea43775..776bf372 100644 --- a/maps/pirates/progression.lua +++ b/maps/pirates/progression.lua @@ -29,7 +29,7 @@ local Roles = require 'maps.pirates.roles.roles' local Overworld = require 'maps.pirates.overworld' local Hold = require 'maps.pirates.surfaces.hold' local Cabin = require 'maps.pirates.surfaces.cabin' -local Upgrades = require 'maps.pirates.shop.boat_upgrades' +-- local Upgrades = require 'maps.pirates.shop.boat_upgrades' local Task = require 'utils.task' local Token = require 'utils.token' local ShopDock = require 'maps.pirates.shop.dock'