figures: moved wait_ticks for trader to js config

Author: dalerank

src/city/warning.h

@@ -115,3 +115,10 @@ void city_warning_clear_all();
 void city_warning_clear_outdated();
 
 void city_warning_show_console(pcstr warning_text);
+
+template<typename ... Args>
+void city_warning_show_console_var(pcstr fmt, Args... args) {
+    bstring1024 buffer;
+    buffer.printf(fmt, args...);
+    city_warning_show_console(buffer);
+}

src/figure/figure.h

@@ -458,7 +458,7 @@ class figure_impl {
         uint16_t max_roam_length;
         uint8_t speed_mult;
 
-        void load(archive arch);
+        virtual void load(archive arch);
     };
 
     figure_impl(figure *f) : base(*f), wait_ticks(f->wait_ticks), destination_tile(f->destination_tile) {}

src/figuretype/figure_kingdome_trader.cpp

@@ -31,12 +31,11 @@
 
 #include "js/js_game.h"
 
-figures::model_t<figure_trade_caravan> trade_caravan_m;
+figure_trade_caravan::static_params trade_caravan_m;
 
-ANK_REGISTER_CONFIG_ITERATOR(config_load_figure_trade_caravan);
-void config_load_figure_trade_caravan() {
-    trade_caravan_m.load();
-}
+void figure_trade_caravan::static_params::load(archive arch)  {
+    int wait_ticks_after_create = arch.r_int("wait_ticks_after_create");
+};
 
 int figure::trader_total_bought() {
     return trader_amount_bought;
@@ -50,7 +49,7 @@ int figure_create_trade_caravan(tile2i tile, int city_id) {
     figure* caravan = figure_create(FIGURE_TRADE_CARAVAN, tile, DIR_0_TOP_RIGHT);
     caravan->empire_city_id = city_id;
     caravan->action_state = FIGURE_ACTION_100_TRADE_CARAVAN_CREATED;
-    caravan->wait_ticks = 10;
+    caravan->wait_ticks = trade_caravan_m.wait_ticks_after_create;
     // donkey 1
     figure* donkey1 = figure_create(FIGURE_TRADE_CARAVAN_DONKEY, tile, DIR_0_TOP_RIGHT);
     donkey1->action_state = FIGURE_ACTION_100_TRADE_CARAVAN_CREATED;

src/figuretype/figure_kingdome_trader.h

@@ -9,6 +9,11 @@ class figure_trade_caravan : public figure_trader {
     FIGURE_METAINFO(FIGURE_TRADE_CARAVAN, figure_trade_caravan);
     figure_trade_caravan(figure *f) : figure_trader(f) {}
 
+    struct static_params : figures::model_t<figure_trade_caravan> {
+        int wait_ticks_after_create;
+        virtual void load(archive arch) override;
+    };
+
     virtual void on_create() override;
     virtual void figure_action() override;
     virtual void before_poof() override;
@@ -19,5 +24,7 @@ class figure_trade_caravan : public figure_trader {
     virtual const animations_t &anim() const override;
     virtual void update_animation() override;
 
+    const static_params &current_params() const { static_cast<const static_params &>(params()); }
+
     void go_to_next_storageyard(tile2i src_tile, int distance_to_entry);
 };

src/io/gamestate/boilerplate.cpp

@@ -205,6 +205,8 @@ static void post_load() {
     g_city.avg_coverage.update();
 
     g_city.update_allowed_foods();
+    g_city.religion.ra_no_traders_months_left = std::clamp<int>(g_city.religion.ra_no_traders_months_left, 0, 12);
+    g_city.religion.ra_harshly_reduced_trading_months_left = std::clamp<int>(g_city.religion.ra_harshly_reduced_trading_months_left, 0, 12);
 
     trade_prices_reset();
 

src/scripts/figures.js

@@ -555,6 +555,7 @@ figure_trade_caravan = {
 		walk : { pack:PACK_SPR_AMBIENT, id:20, max_frames:12 },
 		death : { pack:PACK_SPR_AMBIENT, id:21, max_frames:8, loop:false },
 	},
+	wait_ticks_after_create : 10,
 	terrain_usage : TERRAIN_USAGE_PREFER_ROADS,
 }