buildings: statue config variants redesigned, make it with model paradigm

Author: s.kushnirenko

src/building/building.cpp

@@ -245,15 +245,6 @@ static void building_new_fill_in_data_for_type(building* b, e_building_type type
         b->subtype.market_goods = 0x0000;
         break;
 
-    case BUILDING_SMALL_STATUE:
-    case BUILDING_MEDIUM_STATUE:
-    case BUILDING_LARGE_STATUE: {
-            int orientation = (4 + building_rotation_global_rotation() + city_view_orientation() / 2) % 4;
-            b->data.monuments.variant = building_rotation_get_building_variant();
-            b->data.monuments.statue_offset = rand() % 4;
-        }
-        break;
-
     case BUILDING_TEMPLE_COMPLEX_OSIRIS:
     case BUILDING_TEMPLE_COMPLEX_RA:
     case BUILDING_TEMPLE_COMPLEX_PTAH:
@@ -346,6 +337,12 @@ building_impl *building::dcast() {
         _ptr = new building_tax_collector(*this);
         break;
 
+    case BUILDING_SMALL_STATUE:
+    case BUILDING_MEDIUM_STATUE:
+    case BUILDING_LARGE_STATUE:
+        _ptr = new building_statue(*this);
+        break;
+
     case BUILDING_SHRINE_OSIRIS:
     case BUILDING_SHRINE_RA:
     case BUILDING_SHRINE_PTAH:

src/building/building_pottery.h

@@ -6,6 +6,7 @@ class building_pottery : public building_impl {
 public:
     building_pottery(building &b) : building_impl(b) {}
     virtual void on_create() override;
+    virtual bool is_workshop() const override { return true; }
     virtual void window_info_background(object_info &c) override;
     virtual bool draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color color_mask) override;
 };

src/building/building_statue.cpp

@@ -1,6 +1,7 @@
 #include "building_statue.h"
 
 #include "building/building.h"
+#include "building/rotation.h"
 #include "city/object_info.h"
 #include "game/resource.h"
 #include "graphics/elements/panel.h"
@@ -15,53 +16,70 @@
 
 #include "js/js_game.h"
 
-void building_statue_draw_info(object_info &c) {
+namespace model {
+    struct small_statue_t {
+        std::vector<image_desc> var;
+    };
+    small_statue_t small_statue;
+
+    struct medium_statue_t {
+        std::vector<image_desc> var;
+    };
+    medium_statue_t medium_statue;
+
+    struct big_statue_t {
+        std::vector<image_desc> var;
+    };
+    big_statue_t big_statue;
+
+    template<typename T>
+    void config_load_statue(pcstr key, T& model) {
+        model.var.clear();
+        g_config_arch.r_section(key, [&model] (archive model_arch) {
+            model_arch.r_array("variants", [&model] (archive arch) {
+                int pack = arch.r_int("pack");
+                int id = arch.r_int("id");
+                int offset = arch.r_int("offset");
+                model.var.push_back({pack, id, offset});
+            });
+        });
+    }
+}
+
+void building_statue::on_create() {
+    int orientation = (4 + building_rotation_global_rotation() + city_view_orientation() / 2) % 4;
+    data.monuments.variant = building_rotation_get_building_variant();
+    data.monuments.statue_offset = rand() % 4;
+}
+
+void building_statue::window_info_background(object_info &c) {
     c.help_id = 79;
     window_building_play_sound(&c, snd::get_building_info_sound("statue"));
     outer_panel_draw(c.offset, c.width_blocks, c.height_blocks);
     lang_text_draw_centered(80, 0, c.offset.x, c.offset.y + 10, 16 * c.width_blocks, FONT_LARGE_BLACK_ON_LIGHT);
     window_building_draw_description_at(c, 16 * c.height_blocks - 158, 80, 1);
 }
 
-svector<image_desc, 10> small_statues_img;
-svector<image_desc, 10> medium_statue_images;
-svector<image_desc, 10> big_statues_img;
-
-ANK_REGISTER_CONFIG_ITERATOR(config_load_small_statue_images);
-ANK_REGISTER_CONFIG_ITERATOR(config_load_medium_statue_images);
-ANK_REGISTER_CONFIG_ITERATOR(config_load_big_statue_images);
-
-template<typename T>
-void config_load_statue_images_t(pcstr key, T& config) {
-    config.clear();
-    g_config_arch.r_array(key, [&] (archive arch) {
-        int pack = arch.r_int("pack");
-        int id = arch.r_int("id");
-        int offset = arch.r_int("offset");
-        config.push_back({pack, id, offset});
-    });
-}
+ANK_REGISTER_CONFIG_ITERATOR(config_load_statue_models);
 
-void config_load_small_statue_images() {
-    config_load_statue_images_t("small_statue_images", small_statues_img);
+void config_load_statue_models() {
+    model::config_load_statue("building_small_statue", model::small_statue);
+    model::config_load_statue("building_medium_statue", model::medium_statue);
+    model::config_load_statue("building_big_statue", model::big_statue);
 }
 
-void config_load_medium_statue_images() {
-    config_load_statue_images_t("medium_statue_images", medium_statue_images);
-}
+int building_statue_get_variant_size(int type) {
+    switch (type) {
+    case BUILDING_SMALL_STATUE: return model::small_statue.var.size(); break;
+    case BUILDING_MEDIUM_STATUE: return model::medium_statue.var.size(); break;
+    case BUILDING_LARGE_STATUE: return model::big_statue.var.size(); break;
+    }
 
-void config_load_big_statue_images() {
-    config_load_statue_images_t("big_statue_images", big_statues_img);
+    return 0;
 }
 
 int building_statue_random_variant(int type, int variant) {
-    int size = 1;
-    switch (type) {
-    case BUILDING_SMALL_STATUE: size = small_statues_img.size(); break;
-    case BUILDING_MEDIUM_STATUE: size = medium_statue_images.size(); break;
-    case BUILDING_LARGE_STATUE: size = big_statues_img.size(); break;
-    }
-
+    int size = building_statue_get_variant_size(type);
     return rand() % size;
 }
 
@@ -70,13 +88,7 @@ int building_statue_next_variant(int type, int variant) {
         return 0;
     }
 
-    int size = 0;
-    switch (type) {
-    case BUILDING_SMALL_STATUE: size = small_statues_img.size(); break;
-    case BUILDING_MEDIUM_STATUE: size = medium_statue_images.size(); break;
-    case BUILDING_LARGE_STATUE: size = big_statues_img.size(); break;
-    }
-
+    int size = building_statue_get_variant_size(type);
     if (!size) {
         return variant;
     }
@@ -88,27 +100,28 @@ int building_statue_next_variant(int type, int variant) {
 int building_statue_get_image(int type, int orientation, int variant) {
     int image_id = 0;
 
-    while (orientation < 0)
-        orientation += 4;
-    while (orientation > 3)
-        orientation -= 4;
-    while (variant < 0)
-        variant += 4;
-    while (variant > 3)
-        variant -= 4;
+    int size = building_statue_get_variant_size(type);
+    //
+    while (orientation < 0) { orientation += 4; }
+    //
+    while (orientation > 3) { orientation -= 4; }
+
+    while (variant < 0) { variant += 4; }
+
+    while (variant > (size - 1)) { variant -= size; }
 
     switch (type) {
     case BUILDING_SMALL_STATUE:
-        variant %= small_statues_img.size();
-        return image_group(small_statues_img[variant]);
+        variant %= size;
+        return image_group(model::small_statue.var[variant]);
 
     case BUILDING_MEDIUM_STATUE:
-        variant %= medium_statue_images.size();
-        return image_group(medium_statue_images[variant]);
+        variant %= size;
+        return image_group(model::medium_statue.var[variant]);
 
     case BUILDING_LARGE_STATUE:
-        variant %= big_statues_img.size();
-        return image_group(big_statues_img[variant]);
+        variant %= size;
+        return image_group(model::big_statue.var[variant]);
     }
 
     return image_id;

src/building/building_statue.h

@@ -1,8 +1,15 @@
 #pragma once
 
-struct object_info;
+#include "building/building.h"
 
-void building_statue_draw_info(object_info &c);
+class building_statue : public building_impl {
+public:
+    building_statue(building &b) : building_impl(b) {}
+    virtual void on_create() override;
+    virtual bool is_workshop() const override { return true; }
+    virtual void window_info_background(object_info &c) override;
+    virtual e_sound_channel_city sound_channel() const { return SOUND_CHANNEL_CITY_STATUE; }
+};
 
 int building_statue_random_variant(int type, int variant);
 int building_statue_next_variant(int type, int variant);

src/building/building_tax_collector.h

@@ -5,7 +5,7 @@
 class building_tax_collector : public building_impl {
 public:
     building_tax_collector(building &b) : building_impl(b) {}
-    virtual bool is_workshop() const override { return true; }
+    virtual bool is_workshop() const override { return false; }
     virtual void window_info_background(object_info &c) override;
     virtual e_overlay get_overlay() const override { return OVERLAY_TAX_INCOME; }
     virtual void update_month() override;

src/building/construction/build_planner.cpp

@@ -1726,6 +1726,9 @@ void BuildPlanner::update_orientations(bool check_if_changed) {
         relative_orientation = global_rotation + 1;
         variant = 0;
         break;
+
+    default:
+        break;
     }
     relative_orientation = relative_orientation % 4;
     absolute_orientation = city_view_absolute_orientation(relative_orientation);

src/scripts/building_info.js

@@ -25,6 +25,34 @@ building_info = [
   { help_id:92, type:"bricklayers_guild", text_id:172},
 ]
 
+building_small_statue = {
+  variants : [
+    {pack: PACK_GENERAL, id: 61, offset:1},
+    {pack: PACK_GENERAL, id: 61, offset:5},
+    {pack: PACK_EXPANSION, id: 37, offset:1},
+    {pack: PACK_EXPANSION, id: 37, offset:5},
+    {pack: PACK_TEMPLE_RA, id: 1, offset:27},
+  ]
+}
+
+building_medium_statue = {
+  variants : [
+    {pack: PACK_GENERAL, id: 8, offset:1},
+    {pack: PACK_GENERAL, id: 8, offset:5},
+    {pack: PACK_EXPANSION, id: 36, offset:1},
+    {pack: PACK_EXPANSION, id: 36, offset:5},
+  ]
+}
+
+building_big_statue = {
+  variants : [
+    {pack: PACK_GENERAL, id: 7, offset:1},
+    {pack: PACK_GENERAL, id: 7, offset:5},
+    {pack: PACK_EXPANSION, id: 35, offset:1},
+    {pack: PACK_EXPANSION, id: 35, offset:5},
+  ]
+}
+
 building_personal_mansion = {
   animations : {
     work : { pos : [-1, -1], anim_id: IMG_PERSONAL_MANSION }

src/scripts/common.js

@@ -22,6 +22,9 @@ var medium_statue_images = []
 var big_statue_images = []
 var top_menu_bar = {}
 var main_menu_window = {}
+var building_small_statue = {}
+var building_medium_statue = {}
+var building_big_statue = {}
 var building_booth = {}
 var building_conservatory = {}
 var building_pottery = {}

src/scripts/images.js

@@ -1,27 +1,5 @@
 log_info("akhenaten: images started")
 
-small_statue_images = [
-	{pack: PACK_GENERAL, id: 61, offset:1},
-	{pack: PACK_GENERAL, id: 61, offset:5},
-	{pack: PACK_EXPANSION, id: 37, offset:1},
-	{pack: PACK_EXPANSION, id: 37, offset:5},
-	{pack: PACK_TEMPLE_RA, id: 1, offset:27},
-]
-
-medium_statue_images = [
-	{pack: PACK_GENERAL, id: 8, offset:1},
-	{pack: PACK_GENERAL, id: 8, offset:5},
-	{pack: PACK_EXPANSION, id: 36, offset:1},
-	{pack: PACK_EXPANSION, id: 36, offset:5},
-]
-
-big_statue_images = [
-	{pack: PACK_GENERAL, id: 7, offset:1},
-	{pack: PACK_GENERAL, id: 7, offset:5},
-	{pack: PACK_EXPANSION, id: 35, offset:1},
-	{pack: PACK_EXPANSION, id: 35, offset:5},
-]
-
 images = [
 	{img: IMG_IMMIGRANT, pack: PACK_SPR_MAIN, id: 14},// 886
 	//{img: IMG_IMMIGRANT_DEATH, pack: PACK_SPR_MAIN, id: 15} // 982

src/sound/city.cpp

@@ -89,11 +89,6 @@ int building_type_to_channel(building *b) {
     case BUILDING_DANCE_SCHOOL: return SOUND_CHANNEL_CITY_DANCE_SCHOOL;
     case BUILDING_GARDENS: return SOUND_CHANNEL_CITY_GARDEN;
 
-    case BUILDING_SMALL_STATUE:
-    case BUILDING_MEDIUM_STATUE:
-    case BUILDING_LARGE_STATUE:
-        return SOUND_CHANNEL_CITY_STATUE;
-
     case BUILDING_APOTHECARY: return SOUND_CHANNEL_CITY_APOTHECARY;
     case BUILDING_MORTUARY: return SOUND_CHANNEL_CITY_MORTUARY;
     case BUILDING_DENTIST: return SOUND_CHANNEL_CITY_DENTIST;

src/widget/debug_console.cpp

@@ -15,6 +15,8 @@
 #include "imgui/backends/imgui_impl_sdlrenderer.h"
 #include "imgui/backends/imgui_impl_sdl.h"
 
+#include <iostream>
+
 dev::imgui_qconsole *_debug_console = nullptr;
 
 dev::imgui_qconsole &debug_console() {

src/widget/debug_console.h

@@ -3,6 +3,7 @@
 #include "core/string.h"
 
 #include <functional>
+#include <iosfwd>
 
 void game_debug_cli_draw();
 void game_debug_cli_message(pcstr msg);

src/window/window_building_info.cpp

@@ -616,12 +616,6 @@ static void draw_refresh_background() {
             case BUILDING_WATER_LIFT: window_building_draw_water_lift(&context); break;
             case BUILDING_MENU_BEAUTIFICATION: window_building_draw_fountain(&context); break;
 
-            case BUILDING_SMALL_STATUE:
-            case BUILDING_MEDIUM_STATUE:
-            case BUILDING_LARGE_STATUE:
-                building_statue_draw_info(context);
-                break;
-
             case BUILDING_RESERVED_TRIUMPHAL_ARCH_56: window_building_draw_triumphal_arch(&context); break;
             case BUILDING_POLICE_STATION: window_building_draw_prefect(&context); break;