ui: use js config for rating window

Author: s.kushnirenko

src/graphics/elements/button.h

@@ -7,6 +7,7 @@
 void button_none(int param1, int param2);
 
 void button_border_draw(int x, int y, int width_pixels, int height_pixels, bool has_focus);
+inline void button_border_draw(vec2i pos, vec2i size, bool has_focus) { button_border_draw(pos.x, pos.y, size.x, size.y, has_focus); }
 
 template<class T>
 bool is_button_hover(const T &button, vec2i context) {

src/graphics/elements/panel.h

@@ -2,6 +2,7 @@
 
 #include "core/vec2i.h"
 #include "game/resource.h"
+#include "city/constants.h"
 #include "ui.h"
 
 #define DEFAULT_BLOCK_SIZE 16
@@ -22,4 +23,5 @@ 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);
+    void icon(vec2i pos, e_advisor advisor);
 }

src/graphics/elements/ui.cpp

@@ -128,6 +128,13 @@ void ui::icon(vec2i pos, e_resource img) {
     ImageDraw::img_generic(ctx, image_id_resource_icon(RESOURCE_DEBEN), offset.x + pos.x, offset.y + pos.y);
 }
 
+void ui::icon(vec2i pos, e_advisor adv) {
+    const vec2i offset = g_state.offset();
+    painter ctx = game.painter();
+    ImageDraw::img_generic(ctx, image_group(IMG_ADVISOR_ICONS) + (adv - 1), offset.x + pos.x, offset.y + pos.y);
+}
+
+
 arrow_button &ui::arw_button(vec2i pos, bool up, bool tiny) {
     const vec2i offset = g_state.offset();
 

src/graphics/image_desc.h

@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-enum e_image_id : uint16_t {
+enum e_image_id {
 #define REGISTER_IMG(a, b) a = b,
 #include "graphics/indexes.h"
     IMG_SIZE

src/graphics/indexes.h

@@ -128,3 +128,5 @@ REGISTER_IMG(IMG_SMALL_MASTABA_BRICKS, 127)
 REGISTER_IMG(IMG_BUILDING_FIREHOUSE, 128)
 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)

src/js/js_game.h

@@ -7,6 +7,8 @@
 
 #include <vector>
 
+enum e_image_id;
+
 struct archive {
     js_State *vm;
     inline archive(js_State *_vm) : vm(_vm) {}
@@ -43,13 +45,19 @@ struct archive {
         return result;
     }
 
+    inline e_image_id r_image(pcstr name) { return (e_image_id)r_int(name); }
+
     inline bool r_bool(pcstr name) {
         js_getproperty(vm, -1, name);
         bool result = js_isundefined(vm, -1) ? 0 : js_toboolean(vm, -1);
         js_pop(vm, 1);
         return result;
     }
 
+    inline vec2i r_size2i(pcstr name, pcstr w = "w", pcstr h = "h") {
+        return r_vec2i(name, w, h);
+    }
+
     inline vec2i r_vec2i(pcstr name, pcstr x = "x", pcstr y = "y") {
         vec2i result(0, 0);
         r_section(name, [&] (archive arch) {

src/scripts/common.js

@@ -29,3 +29,4 @@ var building_scribal_school_info = {}
 var empire_window = {}
 var images_remap = []
 var imagepaks = []
+var advisor_rating_window = {}

src/scripts/images.js

@@ -149,6 +149,8 @@ images = [
 	{img: IMG_BUILDING_FIREHOUSE, pack:PACK_GENERAL, id:78},
 	{img: IMG_BUILDING_APOTHECARY, pack:PACK_GENERAL, id:68},
 	{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},
 ]
 
 cart_offsets = [

src/scripts/ui.js

@@ -13,8 +13,8 @@ top_menu_bar = {
 }
 
 main_menu_window = {
-	pos : {x: 192, y: 125},
-	btn : {w: 256, h: 25},
+	button_pos : {x: 192, y: 125},
+	button_size : {w: 256, h: 25},
 	button_offset : 40,
 
 	buttons : [
@@ -26,6 +26,13 @@ main_menu_window = {
 	]
 }
 
+advisor_rating_window = {
+		outer_panel_pos : {x:0, y:0},
+		outer_panel_size : {w:40, h:27},
+		advisor_icon_image : IMG_ADVISOR_RATING_ICON,
+		advisor_icon_pos : {x: 10, y: 10},
+}
+
 empire_window = {
 	trade_column_spacing : 106,
 	trade_row_spacing : 20,

src/window/advisor/advisor_ratings.cpp

@@ -13,10 +13,31 @@
 #include "scenario/property.h"
 #include "game/game.h"
 
-#define ADVISOR_HEIGHT 27
+#include "js/js_game.h"
+
+ANK_REGISTER_CONFIG_ITERATOR(config_load_advisor_rating);
 
 static void button_rating(int rating, int param2);
 
+struct advisor_rating_window {
+    vec2i outer_panel_pos;
+    vec2i outer_panel_size;
+    e_image_id advisor_icon_image;
+    vec2i advisor_icon_pos;
+};
+
+advisor_rating_window g_advisor_rating_window;
+
+void config_load_advisor_rating() {
+    g_config_arch.r_section("advisor_rating_window", [] (archive arch) {
+        auto &w = g_advisor_rating_window;
+        w.outer_panel_pos = arch.r_vec2i("outer_panel_pos");
+        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");
+    });
+}
+
 static generic_button rating_buttons[] = {
   {80, 276, 120, 60, button_rating, button_none, SELECTED_RATING_CULTURE, 0},
   {200, 276, 120, 60, button_rating, button_none, SELECTED_RATING_PROSPERITY, 0},
@@ -42,6 +63,7 @@ static void draw_rating_column(int x_offset, int y_offset, int value, int has_re
     ImageDraw::img_generic(ctx, image_base, x_offset - 4, y);
     for (int i = 0; i < 2 * value_to_draw; i++)
         ImageDraw::img_generic(ctx, image_base + 1, x_offset + 11, --y);
+
     if (has_reached)
         ImageDraw::img_generic(ctx, image_base + 2, x_offset - 6, y - 50);
 }
@@ -59,9 +81,16 @@ static void draw_rating(int id, int value, int open_play, int goal) {
 }
 
 static int draw_background() {
+    return g_advisor_rating_window.outer_panel_size.y;
+}
+
+static void draw_foreground() {
     painter ctx = game.painter();
-    outer_panel_draw(vec2i{0, 0}, 40, ADVISOR_HEIGHT);
-    ImageDraw::img_generic(ctx, image_id_from_group(GROUP_ADVISOR_ICONS) + 3, 10, 10);
+
+    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);
@@ -86,42 +115,38 @@ static int draw_background() {
     inner_panel_draw(box_x, box_y, 35, 5);
     switch (city_rating_selected()) {
     case SELECTED_RATING_CULTURE:
-        lang_text_draw(53, 1, box_x + 8, box_y + 4, FONT_NORMAL_WHITE_ON_DARK);
-        if (city_rating_culture() <= 90) {
-            lang_text_draw_multiline(53, 9 + city_rating_selected_explanation(), vec2i{box_x + 8, box_y + 22}, box_w, FONT_NORMAL_WHITE_ON_DARK);
-        } else
-            lang_text_draw_multiline(53, 50, vec2i{box_x + 8, box_y + 22}, box_w, FONT_NORMAL_WHITE_ON_DARK);
-        break;
+    lang_text_draw(53, 1, box_x + 8, box_y + 4, FONT_NORMAL_WHITE_ON_DARK);
+    if (city_rating_culture() <= 90) {
+        lang_text_draw_multiline(53, 9 + city_rating_selected_explanation(), vec2i{box_x + 8, box_y + 22}, box_w, FONT_NORMAL_WHITE_ON_DARK);
+    } else
+        lang_text_draw_multiline(53, 50, vec2i{box_x + 8, box_y + 22}, box_w, FONT_NORMAL_WHITE_ON_DARK);
+    break;
     case SELECTED_RATING_PROSPERITY:
-        lang_text_draw(53, 2, box_x + 8, box_y + 4, FONT_NORMAL_WHITE_ON_DARK);
-        if (city_rating_prosperity() <= 90) {
-            lang_text_draw_multiline(
-                53, 16 + city_rating_selected_explanation(), vec2i{box_x + 8, box_y + 22}, box_w, FONT_NORMAL_WHITE_ON_DARK);
-        } else
-            lang_text_draw_multiline(53, 51, vec2i{box_x + 8, box_y + 22}, box_w, FONT_NORMAL_WHITE_ON_DARK);
-        break;
+    lang_text_draw(53, 2, box_x + 8, box_y + 4, FONT_NORMAL_WHITE_ON_DARK);
+    if (city_rating_prosperity() <= 90) {
+        lang_text_draw_multiline(53, 16 + city_rating_selected_explanation(), vec2i{box_x + 8, box_y + 22}, box_w, FONT_NORMAL_WHITE_ON_DARK);
+    } else
+        lang_text_draw_multiline(53, 51, vec2i{box_x + 8, box_y + 22}, box_w, FONT_NORMAL_WHITE_ON_DARK);
+    break;
     case SELECTED_RATING_MONUMENT:
-        lang_text_draw(53, 3, box_x + 8, box_y + 4, FONT_NORMAL_WHITE_ON_DARK);
-        if (city_rating_monument() <= 90) {
-            lang_text_draw_multiline(53, 41 + city_rating_selected_explanation(), vec2i{box_x + 8, box_y + 22}, box_w, FONT_NORMAL_WHITE_ON_DARK);
-        } else
-            lang_text_draw_multiline(53, 52, vec2i{box_x + 8, box_y + 22}, box_w, FONT_NORMAL_WHITE_ON_DARK);
-        break;
+    lang_text_draw(53, 3, box_x + 8, box_y + 4, FONT_NORMAL_WHITE_ON_DARK);
+    if (city_rating_monument() <= 90) {
+        lang_text_draw_multiline(53, 41 + city_rating_selected_explanation(), vec2i{box_x + 8, box_y + 22}, box_w, FONT_NORMAL_WHITE_ON_DARK);
+    } else
+        lang_text_draw_multiline(53, 52, vec2i{box_x + 8, box_y + 22}, box_w, FONT_NORMAL_WHITE_ON_DARK);
+    break;
     case SELECTED_RATING_KINGDOM:
-        lang_text_draw(53, 4, box_x + 8, box_y + 4, FONT_NORMAL_WHITE_ON_DARK);
-        if (city_rating_kingdom() <= 90) {
-            lang_text_draw_multiline(53, 27 + city_rating_selected_explanation(), vec2i{box_x + 8, box_y + 22}, box_w, FONT_NORMAL_WHITE_ON_DARK);
-        } else
-            lang_text_draw_multiline(53, 53, vec2i{box_x + 8, box_y + 22}, box_w, FONT_NORMAL_WHITE_ON_DARK);
-        break;
+    lang_text_draw(53, 4, box_x + 8, box_y + 4, FONT_NORMAL_WHITE_ON_DARK);
+    if (city_rating_kingdom() <= 90) {
+        lang_text_draw_multiline(53, 27 + city_rating_selected_explanation(), vec2i{box_x + 8, box_y + 22}, box_w, FONT_NORMAL_WHITE_ON_DARK);
+    } else
+        lang_text_draw_multiline(53, 53, vec2i{box_x + 8, box_y + 22}, box_w, FONT_NORMAL_WHITE_ON_DARK);
+    break;
     default:
-        lang_text_draw_centered(53, 8, box_x + 8, 380, box_w, FONT_NORMAL_WHITE_ON_DARK);
-        break;
+    lang_text_draw_centered(53, 8, box_x + 8, 380, box_w, FONT_NORMAL_WHITE_ON_DARK);
+    break;
     }
 
-    return ADVISOR_HEIGHT;
-}
-static void draw_foreground(void) {
     button_border_draw(rating_buttons[0].x, rating_buttons[0].y, rating_buttons[0].width, rating_buttons[0].height, focus_button_id == SELECTED_RATING_CULTURE);
     button_border_draw(rating_buttons[1].x, rating_buttons[1].y, rating_buttons[1].width, rating_buttons[1].height, focus_button_id == SELECTED_RATING_PROSPERITY);
     button_border_draw(rating_buttons[2].x, rating_buttons[2].y, rating_buttons[2].width, rating_buttons[2].height, focus_button_id == SELECTED_RATING_MONUMENT);

src/window/main_menu.cpp

@@ -56,8 +56,8 @@ main_menu_data_t g_main_menu_data;
 void config_load_main_menu() {
     g_config_arch.r_section("main_menu_window", [] (archive arch) {
         auto &data = g_main_menu_data;
-        data.button_pos = arch.r_vec2i("pos");
-        data.button_size = arch.r_vec2i("btn", "w", "h");
+        data.button_pos = arch.r_vec2i("button_pos");
+        data.button_size = arch.r_size2i("button_size");
         data.button_offset = arch.r_int("button_offset");
 
         data.buttons_text.clear();