ui: redesigned tax collector window info

Author: s.kushnirenko

src/building/building.cpp

@@ -9,6 +9,7 @@
 #include "building/building_bazaar.h"
 #include "building/building_firehouse.h"
 #include "building_architect_post.h"
+#include "building/building_tax_collector.h"
 #include "building/storage_yard.h"
 #include "building/building_brewery.h"
 #include "building/monument_mastaba.h"
@@ -332,6 +333,10 @@ building_impl *building::dcast() {
     case BUILDING_POTTERY_WORKSHOP: _ptr = new building_pottery(*this); break;
     case BUILDING_WELL: _ptr = new building_well(*this); break;
     case BUILDING_BREWERY_WORKSHOP: _ptr = new building_brewery(*this); break;
+    case BUILDING_TAX_COLLECTOR:
+    case BUILDING_TAX_COLLECTOR_UPGRADED:
+        _ptr = new building_tax_collector(*this);
+        break;
 
     case BUILDING_SHRINE_OSIRIS:
     case BUILDING_SHRINE_RA:
@@ -504,7 +509,6 @@ e_overlay building::get_overlay() const {
         case BUILDING_FIREHOUSE: return OVERLAY_FIRE;
         case BUILDING_POLICE_STATION: return OVERLAY_CRIME;
         case BUILDING_APOTHECARY: return OVERLAY_APOTHECARY;
-        case BUILDING_TAX_COLLECTOR: return OVERLAY_TAX_INCOME;
         case BUILDING_WATER_SUPPLY: return OVERLAY_WATER;
         case BUILDING_COURTHOUSE: return OVERLAY_COUTHOUSE;
         case BUILDING_SCRIBAL_SCHOOL: return OVERLAY_SCRIBAL_SCHOOL;

src/building/building_tax_collector.cpp

@@ -2,6 +2,7 @@
 
 #include "building/building.h"
 #include "city/object_info.h"
+#include "figure/figure.h"
 #include "game/resource.h"
 #include "graphics/elements/panel.h"
 #include "graphics/view/view.h"
@@ -13,38 +14,62 @@
 #include "sound/sound_building.h"
 #include "game/game.h"
 
-void building_tax_collector_draw_info(object_info* c) {
-    painter ctx = game.painter();
-    c->help_id = e_text_building_tax_collector;
-    window_building_play_sound(c, snd::get_building_info_sound("tax_collector"));
-    outer_panel_draw(c->offset, c->width_blocks, c->height_blocks);
-    lang_text_draw_centered(106, 0, c->offset.x, c->offset.y + 10, 16 * c->width_blocks, FONT_LARGE_BLACK_ON_LIGHT);
-    ImageDraw::img_generic(ctx, image_id_resource_icon(RESOURCE_DEBEN), c->offset.x + 16, c->offset.y + 36);
+void building_tax_collector::window_info_background(object_info &c) {
+    ui::begin_window(c.offset);
 
-    building* b = building_get(c->building_id);
-    int width = lang_text_draw(106, 2, c->offset.x + 44, c->offset.y + 43, FONT_NORMAL_BLACK_ON_LIGHT);
+    c.help_id = e_text_building_tax_collector;
+    c.go_to_advisor.left_a = ADVISOR_RATINGS;
+    c.go_to_advisor.left_b = ADVISOR_FINANCIAL;
+
+    window_building_play_sound(&c, snd::get_building_info_sound("tax_collector"));
+
+    {
+        ui::panel(vec2i{0, 0}, {c.width_blocks, c.height_blocks}, UiFlags_PanelOuter);
+        ui::label(106, 0, vec2i{0, 10}, 16 * c.width_blocks, FONT_LARGE_BLACK_ON_LIGHT, UiFlags_LabelCentered);
+        ui::icon(vec2i{16, 36}, RESOURCE_DEBEN);
+    }
+
+    building* b = building_get(c.building_id);
+    int width = lang_text_draw(106, 2, c.offset.x + 44, c.offset.y + 43, FONT_NORMAL_BLACK_ON_LIGHT);
     if (config_get(CONFIG_GP_CH_NEW_TAX_COLLECTION_SYSTEM)) {
-        lang_text_draw_amount(8, 0, b->deben_storage, c->offset.x + 44 + width, c->offset.y + 43, FONT_NORMAL_BLACK_ON_LIGHT);
+        lang_text_draw_amount(8, 0, b->deben_storage, c.offset.x + 44 + width, c.offset.y + 43, FONT_NORMAL_BLACK_ON_LIGHT);
     } else {
-        lang_text_draw_amount(8, 0, b->tax_income_or_storage, c->offset.x + 44 + width, c->offset.y + 43, FONT_NORMAL_BLACK_ON_LIGHT);
+        lang_text_draw_amount(8, 0, b->tax_income_or_storage, c.offset.x + 44 + width, c.offset.y + 43, FONT_NORMAL_BLACK_ON_LIGHT);
     }
 
-    if (!c->has_road_access) {
+    if (!c.has_road_access) {
         window_building_draw_description(c, 69, 25);
     } else if (b->num_workers <= 0) {
         window_building_draw_description_at(c, 72, 106, 10);
-    } else if (c->worker_percentage >= 100) {
+    } else if (c.worker_percentage >= 100) {
         window_building_draw_description_at(c, 72, 106, 5);
-    } else if (c->worker_percentage >= 75) {
+    } else if (c.worker_percentage >= 75) {
         window_building_draw_description_at(c, 72, 106, 6);
-    } else if (c->worker_percentage >= 50) {
+    } else if (c.worker_percentage >= 50) {
         window_building_draw_description_at(c, 72, 106, 7);
-    } else if (c->worker_percentage >= 25) {
+    } else if (c.worker_percentage >= 25) {
         window_building_draw_description_at(c, 72, 106, 8);
     } else {
         window_building_draw_description_at(c, 72, 106, 9);
     }
 
-    inner_panel_draw(c->offset.x + 16, c->offset.y + 136, c->width_blocks - 2, 4);
-    window_building_draw_employment(c, 142);
+    inner_panel_draw(c.offset.x + 16, c.offset.y + 136, c.width_blocks - 2, 4);
+    window_building_draw_employment(&c, 142);
+}
+
+void building_tax_collector::update_month() {
+    if (!config_get(CONFIG_GP_CH_NEW_TAX_COLLECTION_SYSTEM)) {
+        return;
+    }
+
+    if (base.has_figure_of_type(BUILDING_SLOT_CARTPUSHER, FIGURE_CART_PUSHER)) {
+        return;
+    }
+
+    if (base.has_road_access && base.deben_storage > 100) {
+        int may_send = std::min<int>((base.deben_storage / 100) * 100, 400);
+        figure *f = base.create_cartpusher(RESOURCE_GOLD, may_send, FIGURE_ACTION_20_CARTPUSHER_INITIAL, BUILDING_SLOT_CARTPUSHER);
+        base.deben_storage -= may_send;
+        f->sender_building_id = base.id;
+    }
 }

src/building/building_tax_collector.h

@@ -1,5 +1,13 @@
 #pragma once
 
-struct object_info;
+#include "building/building.h"
 
-void building_tax_collector_draw_info(object_info* c);
+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 void window_info_background(object_info &c) override;
+    virtual e_overlay get_overlay() const override { return OVERLAY_TAX_INCOME; }
+    virtual void update_month() override;
+    virtual e_sound_channel_city sound_channel() const override { return SOUND_CHANNEL_CITY_TAX_COLLECTOR; }
+};

src/building/figure.cpp

@@ -1108,24 +1108,6 @@ void building::update_month() {
         data.entertainment.spawned_entertainer_this_month = false;
         break;
 
-    case BUILDING_TAX_COLLECTOR:
-    case BUILDING_TAX_COLLECTOR_UPGRADED:
-        if (!config_get(CONFIG_GP_CH_NEW_TAX_COLLECTION_SYSTEM)) {
-            break;
-        }
-
-        if (has_figure_of_type(BUILDING_SLOT_CARTPUSHER, FIGURE_CART_PUSHER)) {
-            break;
-        }
-
-        if (has_road_access && deben_storage > 100) {
-            int may_send = std::min<int>((deben_storage / 100) * 100, 400);
-            figure *f = create_cartpusher(RESOURCE_GOLD, may_send, FIGURE_ACTION_20_CARTPUSHER_INITIAL, BUILDING_SLOT_CARTPUSHER);
-            deben_storage -= may_send;
-            f->sender_building_id = this->id;
-        }
-        break;
-
     case BUILDING_WATER_SUPPLY: {
             int avg_desirability = map_desirabilty_avg(tile, 4);
             if (avg_desirability > 30) {

src/graphics/elements/button.cpp

@@ -3,8 +3,6 @@
 #include "graphics/boilerplate.h"
 #include "graphics/view/view.h"
 #include "game/game.h"
-#include "generic_button.h"
-#include "image_button.h"
 
 void button_none(int param1, int param2) {
 }
@@ -52,69 +50,4 @@ void button_border_draw(int x, int y, int width_pixels, int height_pixels, bool
             }
         }
     }
-}
-
-namespace ui {
-    struct state {
-        vec2i offset;
-        std::vector<generic_button> buttons;
-        std::vector<image_button> img_buttons;
-    };
-
-    state g_state;
-    generic_button dummy;
-}
-
-void ui::begin_window(vec2i offset) {
-    g_state.offset = offset;
-    g_state.buttons.clear();
-    g_state.img_buttons.clear();
-}
-
-bool ui::handle_mouse(const mouse *m) {
-    bool handle = false;
-    int tmp_btn = 0;
-    handle |= !!generic_buttons_handle_mouse(m, g_state.offset, g_state.buttons, tmp_btn);
-    handle |= image_buttons_handle_mouse(m, g_state.offset, g_state.img_buttons, tmp_btn);
-
-    return handle;
-}
-
-int ui::button_hover(const mouse *m) {
-    for (auto &btn : g_state.buttons) {
-        if (is_button_hover(btn, g_state.offset)) {
-            return (std::distance(&g_state.buttons.front(), &btn) + 1);
-        }
-    }
-
-    return 0;
-}
-
-generic_button &ui::button(pcstr label, vec2i pos, vec2i size) {
-    const vec2i offset = g_state.offset;
-
-    g_state.buttons.push_back({pos.x, pos.y, size.x + 4, size.y + 4, button_none, button_none, 0, 0});
-    int focused = is_button_hover(g_state.buttons.back(), offset);
-
-    button_border_draw(offset.x + pos.x, offset.y + pos.y, size.x, size.y, focused ? 1 : 0);
-    text_draw_centered((uint8_t *)label, offset.x + pos.x + 1, offset.y + pos.y + 4, 20, FONT_NORMAL_BLACK_ON_LIGHT, 0);
-
-    return g_state.buttons.back();
-}
-
-generic_button &ui::button(uint32_t id) {
-    return (id < g_state.buttons.size()) ? g_state.buttons[id] : dummy;
-}
-
-image_button &ui::img_button(uint32_t group, uint32_t id, vec2i pos, vec2i size, int offset) {
-    const vec2i img_offset = g_state.offset;
-    const mouse *m = mouse_get();
-
-    g_state.img_buttons.push_back({pos.x, pos.y, size.x + 4, size.y + 4, IB_NORMAL, group, id, offset, button_none, button_none, 0, 0, true});
-    auto &button = g_state.img_buttons.back();
-    button.focused = is_button_hover(g_state.img_buttons.back(), img_offset);
-    button.pressed = button.focused && m->left.is_down;
-    image_buttons_draw(img_offset, button);
-
-    return g_state.img_buttons.back();
 }

src/graphics/elements/button.h

@@ -22,8 +22,6 @@ struct mouse;
 
 namespace ui {
 
-void begin_window(vec2i offset);
-bool handle_mouse(const mouse *m);
 int button_hover(const mouse *m);
 generic_button &button(pcstr label, vec2i pos, vec2i size);
 generic_button &button(uint32_t id);

src/graphics/elements/lang_text.h

@@ -3,6 +3,7 @@
 #include "graphics/color.h"
 #include "core/vec2i.h"
 #include "graphics/font.h"
+#include "ui.h"
 
 int lang_text_get_width(int group, int number, font_t font);
 int lang_text_get_width(const char* str, font_t font);
@@ -29,3 +30,7 @@ int lang_text_draw_year(int year, int x_offset, int y_offset, font_t font);
 void lang_text_draw_month_year_max_width(int month, int year, int x_offset, int y_offset, int box_width, font_t font, color color);
 
 int lang_text_draw_multiline(int group, int number, vec2i offset, int box_width, font_t font);
+
+namespace ui {
+    void label(int group, int number, vec2i pos, int box_width, font_t font, UiFlags_ flags); 
+}

src/graphics/elements/panel.h

@@ -1,7 +1,8 @@
 #pragma once
 
-#include <cstdint>
 #include "core/vec2i.h"
+#include "game/resource.h"
+#include "ui.h"
 
 #define DEFAULT_BLOCK_SIZE 16
 
@@ -17,3 +18,8 @@ void label_draw(int x, int y, int width_blocks, int type);
 void label_draw_colored(painter &ctx, int x, int y, int width_blocks, int type, uint32_t mask);
 
 void large_label_draw(int x, int y, int width_blocks, int type);
+
+namespace ui {
+    void panel(vec2i pos, vec2i size, UiFlags_ flags);
+    void icon(vec2i pos, e_resource img);
+}

src/graphics/elements/ui.cpp

@@ -0,0 +1,93 @@
+#include "ui.h"
+
+#include "generic_button.h"
+#include "image_button.h"
+#include "lang_text.h"
+#include "panel.h"
+#include "game/game.h"
+#include "graphics/boilerplate.h"
+
+namespace ui {
+    struct state {
+        vec2i offset;
+        std::vector<generic_button> buttons;
+        std::vector<image_button> img_buttons;
+    };
+
+    state g_state;
+    generic_button dummy;
+}
+
+void ui::begin_window(vec2i offset) {
+    g_state.offset = offset;
+    g_state.buttons.clear();
+    g_state.img_buttons.clear();
+}
+
+bool ui::handle_mouse(const mouse *m) {
+    bool handle = false;
+    int tmp_btn = 0;
+    handle |= !!generic_buttons_handle_mouse(m, g_state.offset, g_state.buttons, tmp_btn);
+    handle |= image_buttons_handle_mouse(m, g_state.offset, g_state.img_buttons, tmp_btn);
+
+    return handle;
+}
+
+int ui::button_hover(const mouse *m) {
+    for (auto &btn : g_state.buttons) {
+        if (is_button_hover(btn, g_state.offset)) {
+            return (std::distance(&g_state.buttons.front(), &btn) + 1);
+        }
+    }
+
+    return 0;
+}
+
+generic_button &ui::button(pcstr label, vec2i pos, vec2i size) {
+    const vec2i offset = g_state.offset;
+
+    g_state.buttons.push_back({pos.x, pos.y, size.x + 4, size.y + 4, button_none, button_none, 0, 0});
+    int focused = is_button_hover(g_state.buttons.back(), offset);
+
+    button_border_draw(offset.x + pos.x, offset.y + pos.y, size.x, size.y, focused ? 1 : 0);
+    text_draw_centered((uint8_t *)label, offset.x + pos.x + 1, offset.y + pos.y + 4, 20, FONT_NORMAL_BLACK_ON_LIGHT, 0);
+
+    return g_state.buttons.back();
+}
+
+generic_button &ui::button(uint32_t id) {
+    return (id < g_state.buttons.size()) ? g_state.buttons[id] : dummy;
+}
+
+image_button &ui::img_button(uint32_t group, uint32_t id, vec2i pos, vec2i size, int offset) {
+    const vec2i img_offset = g_state.offset;
+    const mouse *m = mouse_get();
+
+    g_state.img_buttons.push_back({pos.x, pos.y, size.x + 4, size.y + 4, IB_NORMAL, group, id, offset, button_none, button_none, 0, 0, true});
+    auto &button = g_state.img_buttons.back();
+    button.focused = is_button_hover(g_state.img_buttons.back(), img_offset);
+    button.pressed = button.focused && m->left.is_down;
+    image_buttons_draw(img_offset, button);
+
+    return g_state.img_buttons.back();
+}
+
+void ui::label(int group, int number, vec2i pos, int box_width, font_t font, UiFlags_ flags) {
+    const vec2i offset = g_state.offset;
+    if (!!(flags & UiFlags_LabelCentered)) {
+        lang_text_draw_centered(group, number, offset.x + pos.x, offset.y + pos.y, box_width, font);
+    }
+}
+
+void ui::panel(vec2i pos, vec2i size, UiFlags_ flags) {
+    const vec2i offset = g_state.offset;
+    if (!!(flags & UiFlags_PanelOuter)) {
+        outer_panel_draw(offset + pos, size.x, size.y);
+    }
+}
+
+void ui::icon(vec2i pos, e_resource img) {
+    const vec2i offset = g_state.offset;
+    painter ctx = game.painter();
+    ImageDraw::img_generic(ctx, image_id_resource_icon(RESOURCE_DEBEN), offset.x + pos.x, offset.y + pos.y);
+}