buildings: warship wharf now request for works and show animation

Author: dalerank

src/building/building_fishing_wharf.cpp

@@ -108,14 +108,6 @@ void building_fishing_wharf::update_graphic() {
     set_animation(animkey);
 }
 
-void building_fishing_wharf::on_tick(bool refresh_only) {
-    auto &anim_wharf = base.anim;
-    if (anim_wharf.valid()) {
-        data.dock.docker_anim_frame++;
-        data.dock.docker_anim_frame %= (anim_wharf.max_frames * anim_wharf.frame_duration);
-    }
-}
-
 void building_fishing_wharf::spawn_figure() {
     check_labor_problem();
 

src/building/building_fishing_wharf.h

@@ -18,7 +18,6 @@ class building_fishing_wharf : public building_industry {
     virtual void update_count() const override;
     virtual void update_day() override;
     virtual void update_graphic() override;
-    virtual void on_tick(bool refresh_only) override;
     virtual void spawn_figure() override;
     virtual void on_place_checks() override;
     virtual void on_undo() override;

src/building/building_warship_wharf.cpp

@@ -3,17 +3,17 @@
 #include "js/js_game.h"
 #include "city/labor.h"
 #include "grid/water.h"
+#include "grid/figure.h"
+#include "grid/image.h"
 #include "grid/building_tiles.h"
+#include "city/city.h"
+#include "building/count.h"
 
 building_warship_wharf::static_params warship_wharf_m;
 
 void building_warship_wharf::static_params::load(archive arch) {
 }
 
-void building_warship_wharf::on_create(int orientation) {
-    data.wharf.orientation = orientation;
-}
-
 void building_warship_wharf::on_place(int orientation, int variant) {
     int orientation_rel = city_view_relative_orientation(orientation);
     map_water_add_building(id(), tile(), params().building_size, anim(animkeys().base).first_img() + orientation_rel);
@@ -32,6 +32,31 @@ void building_warship_wharf::update_map_orientation(int orientation) {
     map_water_add_building(id(), tile(), size(), image_id);
 }
 
-void building_warship_wharf::bind_dynamic(io_buffer *iob, size_t version) {
-    iob->bind(BIND_SIGNATURE_UINT8, &data.wharf.orientation);
+void building_warship_wharf::spawn_figure() {
+    check_labor_problem();
+
+    if (has_road_access()) {
+        common_spawn_labor_seeker(100);
+    }
+}
+
+void building_warship_wharf::update_count() const {
+    if (num_workers() > 0 && base.has_open_water_access) {
+        const figure *boat = get_figure(BUILDING_SLOT_BOAT);
+        if (!boat->is_valid()) {
+            g_city.buildings.request_warship_boat();
+        }
+    }
+
+    building_increase_type_count(BUILDING_WARSHIP_WHARF, num_workers() > 0);
+}
+
+bool building_warship_wharf::ship_moored() const {
+    figure *f = base.get_figure(BUILDING_SLOT_BOAT);
+    if (!f->is_valid()) {
+        return false;
+    }
+
+    const bool moored = f->action_state == FIGURE_ACTION_203_WARSHIP_MOORED;
+    return moored;
 }

src/building/building_warship_wharf.h

@@ -11,11 +11,12 @@ class building_warship_wharf : public building_wharf {
         virtual void load(archive arch) override;
     };
 
-    virtual void on_create(int orientation) override;
     virtual void on_place(int orientation, int variant) override;
     virtual void on_place_update_tiles(int orientation, int variant) override;
     virtual void update_map_orientation(int orientation) override;
-    virtual void bind_dynamic(io_buffer *iob, size_t version) override;
+    virtual void spawn_figure() override;
+    virtual void update_count() const override;
+    virtual bool ship_moored() const override;
 
     static const static_params &current_params() { return (const static_params &)params(TYPE); }
 };

src/building/building_wharf.cpp

@@ -1,8 +1,8 @@
 #include "building_wharf.h"
 
-#include "js/js_game.h"
 #include "city/labor.h"
 #include "grid/water.h"
+#include "grid/image.h"
 
 building_transport_wharf::static_params transport_wharf_m;
 
@@ -18,3 +18,52 @@ void building_wharf::on_place_update_tiles(int orientation, int variant) {
     int orientation_rel = city_view_relative_orientation(orientation);
     map_water_add_building(id(), tile(), transport_wharf_m.building_size, anim(animkeys().base).first_img() + orientation_rel);
 }
+
+void building_wharf::bind_dynamic(io_buffer *iob, size_t version) {
+    iob->bind(BIND_SIGNATURE_UINT8, &data.wharf.orientation);
+}
+
+inline void building_wharf::on_tick(bool refresh_only) {
+    auto &anim_wharf = base.anim;
+    if (anim_wharf.valid()) {
+        data.dock.docker_anim_frame++;
+        data.dock.docker_anim_frame %= (anim_wharf.max_frames * anim_wharf.frame_duration);
+    }
+}
+
+void building_wharf::update_graphic() {
+    building_impl::update_graphic();
+
+    if (!can_play_animation()) {
+        set_animation(animkeys().none);
+        return;
+    }
+
+    int image_warf = map_image_at(tile());
+    int image_warf_base = anim(animkeys().base).first_img();
+    xstring animkey;
+    if (!ship_moored()) {
+        if (image_warf == image_warf_base) animkey = animkeys().wait_n;
+        else if (image_warf == image_warf_base + 1) animkey = animkeys().wait_w;
+        else if (image_warf == image_warf_base + 2) animkey = animkeys().wait_s;
+        else animkey = animkeys().wait_e;
+    } else {
+        if (image_warf == image_warf_base) animkey = animkeys().work_n;
+        else if (image_warf == image_warf_base + 1) animkey = animkeys().work_w;
+        else if (image_warf == image_warf_base + 2) animkey = animkeys().work_s;
+        else animkey = animkeys().work_e;
+    }
+
+    set_animation(animkey);
+}
+
+bool building_wharf::draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color color_mask) {
+    auto &anim_wharf = base.anim;
+    if (anim_wharf.valid()) {
+        int img_id = anim_wharf.start() + (data.dock.docker_anim_frame / anim_wharf.frame_duration) * 4;
+        const image_t *img = image_get(img_id);
+        ImageDraw::img_generic(ctx, img_id, point + anim_wharf.pos, color_mask, 1.f, true);
+    }
+
+    return true;
+}

src/building/building_wharf.h

@@ -8,8 +8,12 @@ class building_wharf : public building_impl {
 
     virtual void on_create(int orientation) override;
     virtual void on_place_update_tiles(int orientation, int variant) override;
-    //virtual void window_info_background(object_info &c) override;
-    //virtual void spawn_figure() override;
+    virtual void on_tick(bool refresh_only) override;
+    virtual void bind_dynamic(io_buffer *iob, size_t version) override;
+    virtual void update_graphic() override;
+    virtual bool draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color color_mask) override;
+
+    virtual bool ship_moored() const { return false; }
 };
 
 class building_transport_wharf : public building_wharf {

src/building/building_workshop_papyrus.cpp

@@ -20,11 +20,6 @@
 
 buildings::model_t<building_papyrus_maker> papyrus_maker_m;
 
-ANK_REGISTER_CONFIG_ITERATOR(config_load_building_papyrus_maker);
-void config_load_building_papyrus_maker() {
-    papyrus_maker_m.load();
-}
-
 declare_console_command(addpapyrus, game_cheat_add_resource<RESOURCE_PAPYRUS>);
 
 void building_papyrus_maker::on_create(int orientation) {
@@ -36,12 +31,12 @@ void building_papyrus_maker::update_count() const {
 }
 
 bool building_papyrus_maker::draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color color_mask) {
-    building_draw_normal_anim(ctx, point, &base, tile, papyrus_maker_m.anim["work"], color_mask);
+    building_draw_normal_anim(ctx, point, &base, tile, anim(animkeys().work), color_mask);
 
     int amount = std::min<int>(2, ceil((float)base.stored_amount() / 100.0) - 1);
     if (amount >= 0) {
-        const auto &anim = papyrus_maker_m.anim["reed"];
-        ImageDraw::img_generic(ctx, anim.first_img() + amount, point + anim.pos, color_mask);
+        const auto &ranim = anim("reed");
+        ImageDraw::img_generic(ctx, ranim.first_img() + amount, point + ranim.pos, color_mask);
     }
     return true;
 }

src/city/buildings.h

@@ -32,6 +32,7 @@ struct city_buildings_t {
     int8_t triumphal_arches_placed;
 
     int8_t shipyard_boats_requested;
+    int8_t warship_boats_requested;
 
     using tracked_building_ids = std::vector<building_id>;
     using tracked_buildings_t = std::array<tracked_building_ids, BUILDING_MAX>;
@@ -69,6 +70,7 @@ struct city_buildings_t {
 
     void clear_fishing_boat_requests() { shipyard_boats_requested = 0; }
     void request_fishing_boat() { ++shipyard_boats_requested; }
+    void request_warship_boat() { ++warship_boats_requested; }
 
     bool has_working_dock() const { return !tracked_buildings->at(BUILDING_DOCK).empty(); }
     bool has_working_shipyard() const { return !tracked_buildings->at(BUILDING_SHIPWRIGHT).empty(); }

src/city/city.cpp

@@ -763,7 +763,9 @@ io_buffer* iob_city_data = new io_buffer([](io_buffer* iob, size_t version) {
         iob->bind(BIND_SIGNATURE_INT32, &data.unused.unused_4524[i]);
     }
 
-    iob->bind(BIND_SIGNATURE_INT32, &data.buildings.shipyard_boats_requested);
+    iob->bind(BIND_SIGNATURE_INT8, &data.buildings.shipyard_boats_requested);
+    iob->bind(BIND_SIGNATURE_INT8, &data.buildings.warship_boats_requested);
+    iob->bind____skip(2);
     iob->bind(BIND_SIGNATURE_INT32, &data.figures.enemies);
     iob->bind(BIND_SIGNATURE_INT32, &data.sentiment.wages);
     iob->bind(BIND_SIGNATURE_INT32, &data.population.people_in_huts);

src/figure/action.h

@@ -181,6 +181,7 @@ enum e_figure_action {
     FIGURE_ACTION_200_HIPPODROME_HORSE_CREATED = 200,
     FIGURE_ACTION_201_HIPPODROME_HORSE_RACING = 201,
     FIGURE_ACTION_202_HIPPODROME_HORSE_DONE = 202,
+    FIGURE_ACTION_203_WARSHIP_MOORED = 203,
 
     FIGURE_ACTION_10_HIPPO_MOVING = 10,
     FIGURE_ACTION_19_HIPPO_IDLE = 19,

src/scripts/building_info.js

@@ -1214,8 +1214,14 @@ building_warship_wharf = {
   animations : {
     preview : { pack:PACK_TERRAIN, id:28 },
     base : { pack:PACK_TERRAIN, id:28 },
-    work_n : { pos:[135, -7], pack:PACK_SPR_AMBIENT, id:55, offset:3, max_frames:25, duration:8 },
-    // work : { pack:PACK_TERRAIN, id:18, offset:1 }
+    work_n : { pos:[65, 0], pack:PACK_SPR_AMBIENT, id:47, offset:0, max_frames:24, duration:1 },
+    work_w : { pos:[80, 7], pack:PACK_SPR_AMBIENT, id:47, offset:0, max_frames:24, duration:3 },
+    work_s : { pos:[65, 7], pack:PACK_SPR_AMBIENT, id:56, offset:1, max_frames:20, duration:4 },
+    work_e : { pos:[55, -27], pack:PACK_SPR_AMBIENT, id:46, offset:3, max_frames:24, duration:4 },
+    wait_n : { pos:[85, 20], pack:PACK_SPR_AMBIENT, id:55, offset:3, max_frames:25, duration:8 },
+    wait_w : { pos:[85, 7], pack:PACK_SPR_AMBIENT, id:55, offset:0, max_frames:25, duration:3 },
+    wait_s : { pos:[65, 22], pack:PACK_SPR_AMBIENT, id:55, offset:1, max_frames:25, duration:4 },
+    wait_e : { pos:[55, -27], pack:PACK_SPR_AMBIENT, id:55, offset:3, max_frames:25, duration:4 },
   },
   building_size : 3,
   fire_proof : true,