ui: more options for rating window in js config

Author: s.kushnirenko

src/building/building_tax_collector.cpp

@@ -35,7 +35,7 @@ void building_tax_collector::window_info_background(object_info &c) {
     building* b = building_get(c.building_id);
     int width = ui::label(106, 2, {44, 43});
     int amount = config_get(CONFIG_GP_CH_NEW_TAX_COLLECTION_SYSTEM) ? b->deben_storage : b->tax_income_or_storage;
-    ui::label_num(8, 0, amount, {44 + width, 43});
+    ui::label_amount(8, 0, amount, {44 + width, 43});
 
     int tax_block = c.width_blocks * 16 / 2;
     ui::label(60, 1, {tax_block + 50, 44});

src/core/bstring.h

@@ -65,13 +65,17 @@ class bstring {
 
     inline ref ncat(const char* s, size_t cnt) { ::strncat(_data, s, cnt); return *this; }
 
-    inline ref append(const char* s) {
+    template <typename... Args>
+    inline ref append(const char* fmt, Args&&... args) {
         size_t size = this->len();
         char* dest = _data + size;
         size_t remain = _size - size;
-        snprintf(dest, remain, "%s", s);
+        if (remain > 0) {
+            snprintf(dest, remain, fmt, std::forward<Args>(args)...);
+        }
         return *this;
     }
+
     inline ref append(char s) {
         size_t size = this->len();
         char* dest = _data + size;
@@ -83,6 +87,7 @@ class bstring {
 
         return *this;
     }
+
     inline ref itoa(int n) { ::snprintf(_data, _size, "%d", n); return *this; }
     inline int atoi() { return ::atoi(_data); }
     inline float atof() { return ::atof(_data); }

src/graphics/elements/lang_text.cpp

@@ -18,9 +18,10 @@ int lang_text_draw(int group, int number, int x_offset, int y_offset, font_t fon
     return text_draw(str, x_offset, y_offset, font, 0);
 }
 
-int lang_text_draw(const char* str, int x_offset, int y_offset, font_t font) {
-    return text_draw((const uint8_t*)str, x_offset, y_offset, font, 0);
+int lang_text_draw(pcstr str, vec2i pos, font_t font) {
+    return text_draw((const uint8_t*)str, pos.x, pos.y, font, 0);
 }
+
 int lang_text_draw_colored(int group, int number, int x_offset, int y_offset, font_t font, color color) {
     const uint8_t* str = lang_get_string(group, number);
     return text_draw(str, x_offset, y_offset, font, color);

src/graphics/elements/lang_text.h

@@ -3,14 +3,15 @@
 #include "graphics/color.h"
 #include "core/vec2i.h"
 #include "graphics/font.h"
+#include "core/string.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);
 
 int lang_text_draw(int group, int number, int x_offset, int y_offset, font_t font);
 inline int lang_text_draw(int group, int number, vec2i offset, font_t font) { return lang_text_draw(group, number, offset.x, offset.y, font); }
-int lang_text_draw(const char* str, int x_offset, int y_offset, font_t font);
+int lang_text_draw(pcstr str, vec2i pos, font_t font);
 int lang_text_draw_colored(int group, int number, int x_offset, int y_offset, font_t font, color color);
 
 int lang_text_draw_left(int group, int number, int x_offset, int y_offset, font_t font);
@@ -33,6 +34,8 @@ int lang_text_draw_multiline(int group, int number, vec2i offset, int box_width,
 
 namespace ui {
     int label(int group, int number, vec2i pos, font_t font = FONT_NORMAL_BLACK_ON_LIGHT, UiFlags_ flags = UiFlags_None, int box_width = 0);
-    int label_num(int group, int number, int amount, vec2i pos, font_t font = FONT_NORMAL_BLACK_ON_LIGHT, pcstr postfix = "");
+    int label(pcstr, vec2i pos, font_t font = FONT_NORMAL_BLACK_ON_LIGHT, UiFlags_ flags = UiFlags_None, int box_width = 0);
+    int label_amount(int group, int number, int amount, vec2i pos, font_t font = FONT_NORMAL_BLACK_ON_LIGHT, pcstr postfix = "");
     int label_percent(int amount, vec2i pos, font_t font = FONT_NORMAL_BLACK_ON_LIGHT);
+    void image(e_image_id img, vec2i pos);
 }

src/graphics/elements/ui.cpp

@@ -8,6 +8,7 @@
 #include "panel.h"
 #include "game/game.h"
 #include "graphics/boilerplate.h"
+#include "io/gamefiles/lang.h"
 
 #include <stack>
 
@@ -56,6 +57,10 @@ bool ui::handle_mouse(const mouse *m) {
     return handle;
 }
 
+pcstr ui::str(int group, int id) {
+    return (pcstr)lang_get_string(group, id);
+}
+
 int ui::button_hover(const mouse *m) {
     for (auto &btn : g_state.buttons) {
         if (is_button_hover(btn, g_state.offset())) {
@@ -96,16 +101,21 @@ image_button &ui::img_button(uint32_t group, uint32_t id, vec2i pos, vec2i size,
 }
 
 int ui::label(int group, int number, vec2i pos, font_t font, UiFlags_ flags, int box_width) {
+    pcstr str = (pcstr)lang_get_string(group, number);
+    return label(str, pos, font, flags, box_width);
+}
+
+int ui::label(pcstr label, vec2i pos, font_t font, UiFlags_ flags, int box_width) {
     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);
+        lang_text_draw_centered(label, offset.x + pos.x, offset.y + pos.y, box_width, font);
         return box_width;
     } else {
-        return lang_text_draw(group, number, offset + pos, font);
+        return lang_text_draw(label, offset + pos, font);
     }
 }
 
-int ui::label_num(int group, int number, int amount, vec2i pos, font_t font, pcstr postfix) {
+int ui::label_amount(int group, int number, int amount, vec2i pos, font_t font, pcstr postfix) {
     const vec2i offset = g_state.offset();
     return lang_text_draw_amount(group, number, amount, offset.x + pos.x, offset.y + pos.y, font, postfix);
 }
@@ -115,6 +125,11 @@ int ui::label_percent(int amount, vec2i pos, font_t font) {
     return text_draw_percentage(amount, offset.x + pos.x, offset.y + pos.y, font);
 }
 
+void ui::image(e_image_id img, vec2i pos) {
+    painter ctx = game.painter();
+    ImageDraw::img_generic(ctx, image_group(img), pos);
+}
+
 void ui::panel(vec2i pos, vec2i size, UiFlags_ flags) {
     const vec2i offset = g_state.offset();
     if (!!(flags & UiFlags_PanelOuter)) {

src/graphics/elements/ui.h

@@ -22,5 +22,6 @@ void begin_frame();
 void begin_widget(vec2i offset, bool relative = false);
 void end_widget();
 bool handle_mouse(const mouse *m);
+pcstr str(int group, int id);
 
 }

src/graphics/image_groups.h

@@ -291,7 +291,7 @@ enum e_pack {
 
 #define GROUP_SYSTEM_GRAPHICS PACK_UNLOADED, 0
 #define GROUP_FORT_FORMATIONS PACK_UNLOADED, 1            // 197
-#define GROUP_ADVISOR_RATINGS_BACKGROUND PACK_UNLOADED, 2 // 195
+//#define GROUP_ADVISOR_RATINGS_BACKGROUND PACK_UNLOADED, 2 // 195
 #define GROUP_BIGPEOPLE PACK_UNLOADED, 3
 #define GROUP_PROMO_3 PACK_UNLOADED, 4           // 188
 #define GROUP_PROMO_2 PACK_UNLOADED, 5           // 187

src/graphics/indexes.h

@@ -130,3 +130,4 @@ REGISTER_IMG(IMG_BUILDING_APOTHECARY, 128)
 REGISTER_IMG(IMG_PERSONAL_MANSION, 129)
 REGISTER_IMG(IMG_ADVISOR_RATING_ICON, 130)
 REGISTER_IMG(IMG_ADVISOR_ICONS, 131)
+REGISTER_IMG(IMG_ADVISOR_BACKGROUND, 132)

src/scripts/images.js

@@ -151,6 +151,7 @@ images = [
 	{img: IMG_PERSONAL_MANSION, pack:PACK_GENERAL, id:85},
 	{img: IMG_ADVISOR_RATING_ICON, pack:PACK_GENERAL, id:128, offset:3},
 	{img: IMG_ADVISOR_ICONS, pack:PACK_GENERAL, id:128, offset:0},
+	{img: IMG_ADVISOR_BACKGROUND, pack:PACK_UNLOADED, id:2, offset:0},
 ]
 
 cart_offsets = [

src/scripts/ui.js

@@ -31,6 +31,11 @@ advisor_rating_window = {
 		outer_panel_size : {w:40, h:27},
 		advisor_icon_image : IMG_ADVISOR_RATING_ICON,
 		advisor_icon_pos : {x: 10, y: 10},
+		header_pos : {x:60, y:17},
+		header_population_pos : {x: 160, y:20},
+		background_img : IMG_ADVISOR_BACKGROUND,
+		background_img_pos: {x:60, y:38},
+		column_offset : {x: 30, y:-11}
 }
 
 empire_window = {

src/widget/top_menu.cpp

@@ -337,8 +337,8 @@ void menu_bar_draw(const std::span<menu_bar_item>& items) {
         int current_id = std::distance(items.begin(), &item) + 1;
         font_t font = (current_id == data.focus_menu_id) ? hightlight_font : FONT_NORMAL_BLACK_ON_LIGHT;
         int text_length = item.text_raw
-                                ? lang_text_draw(item.text_raw, x_offset, data.y_offset, font)
-                                : lang_text_draw(item.text_group, 0, x_offset, data.y_offset, font);
+                                ? lang_text_draw(item.text_raw, vec2i{x_offset, data.y_offset}, font)
+                                : lang_text_draw(item.text_group, 0, vec2i{x_offset, data.y_offset}, font);
         x_offset += text_length;
         item.x_end = x_offset;
         x_offset += data.spacing;
@@ -405,12 +405,12 @@ void menu_draw(menu_bar_item& menu, int focus_item_id) {
         // Set color/font on the menu item mouse hover
         if (i == focus_item_id - 1) {
             sub->text_raw
-                    ? lang_text_draw(sub->text_raw, menu.x_start + 8, y_offset, FONT_NORMAL_YELLOW)
-                    : lang_text_draw(sub->text_group, sub->text_number, menu.x_start + 8, y_offset, FONT_NORMAL_YELLOW);
+                    ? lang_text_draw(sub->text_raw, vec2i{menu.x_start + 8, y_offset}, FONT_NORMAL_YELLOW)
+                    : lang_text_draw(sub->text_group, sub->text_number, vec2i{menu.x_start + 8, y_offset}, FONT_NORMAL_YELLOW);
         } else {
             sub->text_raw 
-                    ? lang_text_draw(sub->text_raw, menu.x_start + 8, y_offset, FONT_NORMAL_BLACK_ON_LIGHT)
-                    : lang_text_draw(sub->text_group, sub->text_number, menu.x_start + 8, y_offset, FONT_NORMAL_BLACK_ON_LIGHT);
+                    ? lang_text_draw(sub->text_raw, vec2i{menu.x_start + 8, y_offset}, FONT_NORMAL_BLACK_ON_LIGHT)
+                    : lang_text_draw(sub->text_group, sub->text_number, vec2i{menu.x_start + 8, y_offset}, FONT_NORMAL_BLACK_ON_LIGHT);
         }
         y_offset += data.item_height;
     }

src/window/advisor/advisor_ratings.cpp

@@ -24,6 +24,11 @@ struct advisor_rating_window {
     vec2i outer_panel_size;
     e_image_id advisor_icon_image;
     vec2i advisor_icon_pos;
+    vec2i header_pos;
+    vec2i header_population_pos;
+    vec2i background_img_pos;
+    e_image_id background_img;
+    vec2i column_offset;
 };
 
 advisor_rating_window g_advisor_rating_window;
@@ -35,6 +40,11 @@ void config_load_advisor_rating() {
         w.outer_panel_size = arch.r_size2i("outer_panel_size");
         w.advisor_icon_image = arch.r_image("advisor_icon_image");
         w.advisor_icon_pos = arch.r_vec2i("advisor_icon_pos");
+        w.header_pos = arch.r_vec2i("header_pos");
+        w.header_population_pos = arch.r_vec2i("header_population_pos");
+        w.background_img = arch.r_image("background_img");
+        w.background_img_pos = arch.r_vec2i("background_img_pos");
+        w.column_offset = arch.r_vec2i("column_offset");
     });
 }
 
@@ -69,6 +79,7 @@ static void draw_rating_column(int x_offset, int y_offset, int value, int has_re
 }
 
 static void draw_rating(int id, int value, int open_play, int goal) {
+    auto &w = g_advisor_rating_window;
     //    int value = city_rating_culture();
     int enabled = !open_play && goal;
     button_border_draw(rating_buttons[id].x, rating_buttons[id].y, rating_buttons[id].width, rating_buttons[id].height, focus_button_id == SELECTED_RATING_CULTURE);
@@ -77,28 +88,27 @@ static void draw_rating(int id, int value, int open_play, int goal) {
     int width = text_draw_number(enabled ? goal : 0, '@', " ", rating_buttons[id].x + 5, rating_buttons[id].y + 45, FONT_NORMAL_BLACK_ON_LIGHT);
     lang_text_draw(53, 5, rating_buttons[id].x + 5 + width, rating_buttons[id].y + 45, FONT_NORMAL_BLACK_ON_LIGHT);
     int has_reached = !enabled || value >= goal;
-    draw_rating_column(rating_buttons[id].x + 30, rating_buttons[id].y, value, has_reached);
+    draw_rating_column(rating_buttons[id].x + w.column_offset.x, rating_buttons[id].y + w.column_offset.y, value, has_reached);
 }
 
 static int draw_background() {
     return g_advisor_rating_window.outer_panel_size.y;
 }
 
 static void draw_foreground() {
-    painter ctx = game.painter();
-
     auto &w = g_advisor_rating_window;
     ui::panel(w.outer_panel_pos, w.outer_panel_size, UiFlags_PanelOuter);
     ui::icon(w.advisor_icon_pos, ADVISOR_RATINGS);
 
-    int width = lang_text_draw(53, 0, 60, 12, FONT_LARGE_BLACK_ON_LIGHT);
-    if (!winning_population() || scenario_is_open_play()) {
-        lang_text_draw(53, 7, 80 + width, 17, FONT_NORMAL_BLACK_ON_LIGHT);
-    } else {
-        width += lang_text_draw(53, 6, 80 + width, 17, FONT_NORMAL_BLACK_ON_LIGHT);
-        text_draw_number(winning_population(), '@', ")", 80 + width, 17, FONT_NORMAL_BLACK_ON_LIGHT);
+    ui::label(53, 0, w.header_pos, FONT_LARGE_BLACK_ON_LIGHT);
+    bstring128 caption = (pcstr)ui::str(53, 7);
+    if (!(!winning_population() || scenario_is_open_play())) {
+        caption = (pcstr)ui::str(53, 6);
+        caption.append("%u", winning_population());
     }
-    ImageDraw::img_generic(ctx, image_id_from_group(GROUP_ADVISOR_RATINGS_BACKGROUND), 60, 48 - 10);
+
+    ui::label(caption, w.header_population_pos, FONT_NORMAL_BLACK_ON_LIGHT);
+    ui::image(w.background_img, w.background_img_pos);
 
     int open_play = scenario_is_open_play();
 

src/window/main_menu.cpp

@@ -106,7 +106,7 @@ static void draw_foreground() {
     graphics_set_to_dialog();
 
     for (int i = 0; i < std::size(data.buttons); i++) {
-        auto text = data.buttons_text[i];
+        auto text = (i >= data.buttons_text.size()) ? std::pair{0, 0} : data.buttons_text[i];
         large_label_draw(data.buttons[i].x, data.buttons[i].y, data.buttons[i].width / 16, data.focus_button_id == i + 1 ? 1 : 0);
         lang_text_draw_centered(text.first, text.second, data.button_pos.x, data.button_pos.y + 40 * i + 6, data.button_size.x, FONT_NORMAL_BLACK_ON_LIGHT);
     }