juggler school: redesigned spawn logic for jugglers

Author: dalerank

src/building/building.cpp

@@ -1198,7 +1198,7 @@ static void read_type_data(io_buffer *iob, building *b, size_t version) {
         iob->bind(BIND_SIGNATURE_UINT8, &b->data.entertainment.ent_reserved_u8);
         iob->bind____skip(6);
         iob->bind(BIND_SIGNATURE_UINT8, &b->data.entertainment.consume_material_id);
-        iob->bind(BIND_SIGNATURE_UINT8, &b->data.entertainment.spawned_entertainer_this_month);
+        iob->bind(BIND_SIGNATURE_UINT8, &b->data.entertainment.spawned_entertainer_days);
         iob->bind(BIND_SIGNATURE_UINT32, &b->data.entertainment.booth_corner_grid_offset);
     }
 }

src/building/building.h

@@ -245,7 +245,7 @@ class building {
             unsigned char worker_id;
         } industry;
         struct entertainment_t {
-            bool spawned_entertainer_this_month;
+            uint8_t spawned_entertainer_days;
             uint8_t num_shows;
             uint8_t juggler_visited;
             uint8_t musician_visited;

src/building/building_health.h

@@ -21,7 +21,7 @@ class building_apothecary : public building_impl {
     virtual bool draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color color_mask) override;
     virtual void update_graphic() override;
 
-    static const static_params &current_params() { return (const static_params &)building_impl::params(TYPE); }
+    static const static_params &current_params() { return (const static_params &)params(TYPE); }
 };
 
 class building_mortuary : public building_impl {
@@ -43,5 +43,5 @@ class building_mortuary : public building_impl {
     virtual void update_graphic() override;
     virtual void update_count() const override;
 
-    static const static_params &current_params() { return (const static_params &)building_impl::params(TYPE); }
+    static const static_params &current_params() { return (const static_params &)params(TYPE); }
 };

src/building/building_jugler_school.cpp

@@ -10,10 +10,18 @@
 
 #include "js/js_game.h"
 
-buildings::model_t<building_juggler_school> juggler_school_m;
+building_juggler_school::static_params juggler_school_m;
 
-void building_juggler_school::update_month() {
-    data.entertainment.spawned_entertainer_this_month = false;
+void building_juggler_school::static_params::load(archive arch) {
+    spawn_interval = arch.r_int("spawn_interval", 10);
+}
+
+void building_juggler_school::update_day() {
+    building_impl::update_day();
+
+    if (data.entertainment.spawned_entertainer_days > 0) {
+        data.entertainment.spawned_entertainer_days--;
+    }
 }
 
 void building_juggler_school::update_graphic() {
@@ -28,7 +36,7 @@ void building_juggler_school::spawn_figure() {
         return;
     }
 
-    if (data.entertainment.spawned_entertainer_this_month) {
+    if (data.entertainment.spawned_entertainer_days > 0) {
         return;
     }
 
@@ -37,7 +45,7 @@ void building_juggler_school::spawn_figure() {
     building* dest = building_get(venue_destination);
     if (dest->id > 0) {
         create_figure_with_destination(FIGURE_JUGGLER, dest, FIGURE_ACTION_92_ENTERTAINER_GOING_TO_VENUE);
-        data.entertainment.spawned_entertainer_this_month = true;
+        data.entertainment.spawned_entertainer_days = current_params().spawn_interval;
     } else {
         common_spawn_roamer(FIGURE_JUGGLER, 50, FIGURE_ACTION_90_ENTERTAINER_AT_SCHOOL_CREATED);
     }

src/building/building_jugler_school.h

@@ -9,10 +9,17 @@ class building_juggler_school : public building_impl {
     building_juggler_school(building &b) : building_impl(b) {}
     virtual building_juggler_school *dcast_juggler_school() override { return this; }
 
+    struct static_params : public buildings::model_t<building_juggler_school> {
+        uint8_t spawn_interval;
+        virtual void load(archive arch) override;
+    };
+
     virtual e_overlay get_overlay() const override { return OVERLAY_BOOTH; }
     virtual void spawn_figure() override;
-    virtual void update_month() override;
+    virtual void update_day() override;
     virtual void update_graphic() override;
     virtual e_sound_channel_city sound_channel() const { return SOUND_CHANNEL_CITY_JUGGLER_SCHOOL; }
     virtual bool draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color color_mask) override;
+
+    static const static_params &current_params() { return (const static_params &)params(TYPE); }
 };

src/scripts/building_info.js

@@ -766,6 +766,7 @@ building_juggler_school = {
     base : { pos : [0, 0], pack:PACK_GENERAL, id:46 },
     work : { pos : [33, -38], pack:PACK_GENERAL, id:46, offset:1, max_frames:12, duration:3 }
   },
+  spawn_interval : 10,
   window_info_height_id : 1,
   info_help_id:75,
   info_text_id:77,