trade ship: correct wait on queue

Author: s.kushnirenko

src/building/building_dock.cpp

@@ -323,6 +323,12 @@ int building_dock::trader_id() {
     return figure_get(data.dock.trade_ship_id)->trader_id;
 }
 
+int building_dock::trader_city_id() {
+    return data.dock.trade_ship_id
+                ? figure_get(data.dock.trade_ship_id)->empire_city_id
+                : 0;
+}
+
 bool building_dock::is_good_accepted(int index) {
     int goods_bit = 1 << index;
     return !(base.subtype.market_goods & goods_bit);

src/building/building_dock.h

@@ -25,6 +25,7 @@ class building_dock : public building_impl {
     virtual bool draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color color_mask) override;
 
     int trader_id();
+    int trader_city_id();
     bool is_good_accepted(int index);
     void toggle_good_accepted(int index);
     int count_idle_dockers() const;

src/figure/figure.cpp

@@ -315,6 +315,11 @@ const figure_impl::static_params &figure_impl::params(e_figure_type e) {
     return (it == figure_impl_params->end()) ? figure_impl::static_params::dummy : *it->second;
 }
 
+void figure_impl::advance_action(int action, tile2i t) {
+    advance_action(action);
+    base.destination_tile = t;
+}
+
 void figure_impl::set_destination(building *b, tile2i t) {
     base.set_destination(b);
     base.destination_tile = t;

src/figure/figure.h

@@ -549,6 +549,7 @@ class figure_impl {
     inline uint8_t direction() const { return base.direction; }
     inline const building *home() const { return base.home(); }
     inline void advance_action(int action) { int saved_action = action; base.advance_action(action); on_action_changed(saved_action); }
+           void advance_action(int action, tile2i t);
     virtual void on_action_changed(int saved_action) {}
     inline bool do_returnhome(e_terrain_usage terrainchoice, short next_action = -1) { return base.do_returnhome(terrainchoice, next_action); }
     inline bool do_gotobuilding(building *dest, bool stop_at_road = true, e_terrain_usage terrainchoice = TERRAIN_USAGE_ROADS, short NEXT_ACTION = -1, short FAIL_ACTION = -1) { return base.do_gotobuilding(dest, stop_at_road, terrainchoice, NEXT_ACTION, FAIL_ACTION); }

src/figuretype/figure_docker.cpp

@@ -239,6 +239,11 @@ int figure_docker::trader_id() {
     return dock->trader_id();
 }
 
+int figure_docker::trader_city_id() {
+    building_dock *dock = home()->dcast_dock();
+    return dock->trader_city_id();
+}
+
 bool figure_docker::deliver_import_resource(building* dock) {
     int ship_id = dock->data.dock.trade_ship_id;
     if (!ship_id) {
@@ -407,9 +412,13 @@ void figure_docker::figure_action() {
         break;
 
     case FIGURE_ACTION_137_DOCKER_EXPORT_RETURNING:
-        do_gotobuilding(destination(), true, TERRAIN_USAGE_ROADS, FIGURE_ACTION_134_DOCKER_EXPORT_QUEUE, ACTION_8_RECALCULATE);
-        if (destination()->state != BUILDING_STATE_VALID)
+        if (do_gotobuilding(destination(), true, TERRAIN_USAGE_ROADS, FIGURE_ACTION_134_DOCKER_EXPORT_QUEUE, ACTION_8_RECALCULATE)) {
+            load_resource(RESOURCE_NONE, 0);
+        }
+
+        if (destination()->state != BUILDING_STATE_VALID) {
             poof();
+        }
         break;
 
     case FIGURE_ACTION_138_DOCKER_IMPORT_RETURNING:
@@ -442,10 +451,7 @@ void figure_docker::figure_action() {
     case FIGURE_ACTION_140_DOCKER_EXPORT_AT_WAREHOUSE:
         wait_ticks++;
         if (wait_ticks > 10) {
-            int trade_city_id = b->data.dock.trade_ship_id
-                                    ? figure_get(b->data.dock.trade_ship_id)->empire_city_id
-                                    : 0;
-
+            int trade_city_id = trader_city_id();
             advance_action(FIGURE_ACTION_138_DOCKER_IMPORT_RETURNING);
             wait_ticks = 0;
             const bool can_export = try_export_resource(destination(), base.resource_id, trade_city_id);

src/figuretype/figure_docker.h

@@ -17,6 +17,7 @@ class figure_docker : public figure_carrier {
     virtual void poof() override;
 
     int trader_id();
+    int trader_city_id();
     bool deliver_import_resource(building *dock);
     tile2i get_trade_center_location();
     bool fetch_export_resource(building* dock);

src/figuretype/figure_flotsam.cpp

@@ -39,13 +39,11 @@ void figure_flotsam::figure_action() {
         if (wait_ticks <= 0) {
             base.action_state = FIGURE_ACTION_129_FLOTSAM_FLOATING;
             wait_ticks = 0;
-            if (!base.resource_id && city_god_osiris_create_shipwreck_flotsam())
+            if (!base.resource_id && city_god_osiris_create_shipwreck_flotsam()) {
                 base.min_max_seen = 1;
+            }
 
             destination_tile = scenario_map_river_exit();
-            //                map_point river_exit = scenario_map_river_exit();
-            //                destination_tile.x() = river_exit.x();
-            //                destination_tile.y() = river_exit.y();
         }
         break;
 

src/figuretype/figure_trader_ship.cpp

@@ -140,12 +140,8 @@ void figure_trade_ship::figure_action() {
             }
         }
         if (destination()->state != BUILDING_STATE_VALID) {
-            base.action_state = FIGURE_ACTION_115_TRADE_SHIP_LEAVING;
+            advance_action(FIGURE_ACTION_115_TRADE_SHIP_LEAVING, scenario_map_river_exit());
             base.wait_ticks = 0;
-            base.destination_tile = scenario_map_river_exit();
-            //                map_point river_exit = scenario_map_river_exit();
-            //                destination_tile.x() = river_exit.x();
-            //                destination_tile.y() = river_exit.y();
         }
         break;
 
@@ -211,6 +207,10 @@ void figure_trade_ship::figure_action() {
                 base.action_state = FIGURE_ACTION_113_TRADE_SHIP_GOING_TO_DOCK_QUEUE;
                 base.destination_tile = free_dock.tile;
             }
+
+            if (base.trade_ship_failed_dock_attempts >= 10) {
+                advance_action(FIGURE_ACTION_115_TRADE_SHIP_LEAVING, scenario_map_river_exit());
+            }
             base.wait_ticks = 0;
         }
         base.anim.frame = 0;
@@ -278,7 +278,7 @@ void figure_trade_ship::update_animation() {
 }
 
 void figure_trade_ship::poof() {
-    //
+    figure_carrier::poof();
 }
 
 const animations_t &figure_trade_ship::anim() const {
@@ -355,6 +355,11 @@ bool figure_trade_ship::window_info_background(object_info &c) {
 }
 
 void figure_trade_ship::update_day() {
+    const bool on_raid = action_state(FIGURE_ACTION_114_TRADE_SHIP_ANCHORED, FIGURE_ACTION_112_TRADE_SHIP_MOORED);
+    if (!on_raid) {
+        return;
+    }
+
     building* b = destination();
     for (const int docker_id: b->data.dock.docker_ids) {
         figure* docker = figure_get(docker_id);