Feature/god advisor

CMakeLists.txt

@@ -675,6 +675,7 @@ set(WINDOW_FILES
     ${PROJECT_SOURCE_DIR}/src/window/editor/start_year.c
     ${PROJECT_SOURCE_DIR}/src/window/editor/starting_conditions.c
     ${PROJECT_SOURCE_DIR}/src/window/editor/win_criteria.c
+    ${PROJECT_SOURCE_DIR}/src/window/epithets.c
     ${PROJECT_SOURCE_DIR}/src/window/cck_selection.c
     ${PROJECT_SOURCE_DIR}/src/window/city.c
     ${PROJECT_SOURCE_DIR}/src/window/config.c

res/assets/Graphics/ui.xml

@@ -45,6 +45,7 @@
 	<image id="Panth M2 Icon" src="Pantheon_Temple_Complex_Module2_Banner"/>
 	<image id="Venus M Icon" src="Venus_Temple_Complex_Module_Banner"/>
 	<image id="Venus M2 Icon" src="Venus_Temple_Complex_Module2_Banner"/>
+
 	<!-- Note: Banner images for Construction Sites -->
 	<image id="Construction_Banner_01" src="Construction_Banner_01"/>
 	<image id="Construction_Banner_02" src="Construction_Banner_02"/>

src/graphics/color.h

@@ -17,7 +17,9 @@ typedef uint32_t color_t;
 #define COLOR_SIDEBAR 0xffbdb592
 
 #define COLOR_BORDER_GREEN 0xfffae094   //light yellow
+#define COLOR_BORDER_ORANGE 0xffffb584
 #define COLOR_BORDER_RED 0xffac5446
+#define COLOR_BORDER_BROWN 0xff684a34
 
 #define COLOR_FONT_RED COLOR_RED
 #define COLOR_FONT_BLUE 0xff0055ff

src/graphics/window.h

@@ -48,6 +48,7 @@ typedef enum {
     WINDOW_TRADE_PRICES,
     WINDOW_RESOURCE_SETTINGS,
     WINDOW_HOLD_FESTIVAL,
+    WINDOW_EPITHETS,
     // empire and dialog
     WINDOW_EMPIRE,
     WINDOW_TRADE_OPENED,

src/translation/english.c

@@ -1626,6 +1626,14 @@ static translation_string all_strings[] = {
     {TR_BUILDING_NATIVE_WATCHTOWER_DESC,"Using these structures, the natives observe our every movement and exploit our weak points. Unless we manage to deal with the locals, the guards watching us from the towers will prevent us from expanding into this area."},
     {TR_BUILDING_INFO_CARAVANSERAI_MONTHLY_CONSUMPTION, "Monthly food consumption:"},
     {TR_CONFIG_CARAVANS_MOVE_OFF_ROAD, "Trade caravans do not prioritise road networks"},
+    {TR_WINDOW_ADVISOR_EPITHETS, "Powers of the Gods"},
+    {TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP, "Divine powers granted by Great Temples"},
+    {TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_CERES, "Ceres divine powers"},
+    {TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_NEPTUNE, "Neptune divine powers"},
+    {TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_MERCURY, "Mercury divine powers"},
+    {TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_MARS, "Mars divine powers"},
+    {TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_VENUS, "Venus divine powers"},
+    {TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_PANTHEON, "Pantheon divine powers"},
 };
 
 void translation_english(const translation_string **strings, int *num_strings)

src/translation/french.c

@@ -1610,6 +1610,14 @@ static translation_string all_strings[] = {
     {TR_BUILDING_LATRINES_UNNECESSARY, "Ces latrines sont superflues, car aucun logement à proximité n'en a l'utilité."},
     {TR_BUILDING_LATRINES_NO_HOUSES, "Ces latrines sont actuellement inutiles, car aucun logement ne se trouve à proximité."},
     {TR_CONFIG_DRAW_ASCLEPIUS, "Afficher le Bâton d'Asclépios pour le menu d'hygiène"},
+    {TR_WINDOW_ADVISOR_EPITHETS, "Pouvoirs des Dieux"},
+    {TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP, "Pouvoirs divins conférés par les Temples monumentaux"},
+    {TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_CERES, "Pouvoirs divins de Cérès"},
+    {TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_NEPTUNE, "Pouvoirs divins de Neptune"},
+    {TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_MERCURY, "Pouvoirs divins de Mercure"},
+    {TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_MARS, "Pouvoirs divins de Mars"},
+    {TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_VENUS, "Pouvoirs divins de Vénus"},
+    {TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_PANTHEON, "Pouvoirs divins du Panthéon"},
 };
 
 void translation_french(const translation_string **strings, int *num_strings)

src/translation/translation.h

@@ -1445,7 +1445,7 @@ typedef enum {
     TR_BUILDING_OVERGROWN_GARDENS,
     TR_WINDOW_ADVISOR_RELIGION_ALTARS_HEADER,
     TR_REPLAY_MAP_NOT_FOUND_TITLE,
-    TR_REPLAY_MAP_NOT_FOUND_MESSAGE,
+    TR_REPLAY_MAP_NOT_FOUND_MESSAGE,    
     TR_BUILDING_FORT_AUXILIA_INFANTRY,
     TR_WINDOW_ADVISOR_MILITARY_INFANTRY,
     TR_WINDOW_ADVISOR_MILITARY_ARCHER,
@@ -1620,6 +1620,14 @@ typedef enum {
     TR_BUILDING_NATIVE_WATCHTOWER_DESC,
     TR_BUILDING_INFO_CARAVANSERAI_MONTHLY_CONSUMPTION,
     TR_CONFIG_CARAVANS_MOVE_OFF_ROAD,
+    TR_WINDOW_ADVISOR_EPITHETS,
+    TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP,
+    TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_CERES,
+    TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_NEPTUNE,
+    TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_MERCURY,
+    TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_MARS,
+    TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_VENUS,
+    TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP_PANTHEON,
     TRANSLATION_MAX_KEY
 } translation_key;
 

src/window/advisor/military.c

@@ -31,7 +31,7 @@ static void button_empire_service(const generic_button *button);
 static void button_return_all_to_fort(const generic_button *button);
 static void on_scroll(void);
 
-static scrollbar_type scrollbar = { 592, 70, 272, 576, MAX_VISIBLE_LEGIONS, on_scroll };
+static scrollbar_type scrollbar = { 592, 70, 270, 576, MAX_VISIBLE_LEGIONS, on_scroll,  0, 4};
 
 static generic_button fort_buttons[] = {
     {384, 83, 30, 30, button_go_to_legion, 0, 1},

src/window/advisor/religion.c

@@ -13,11 +13,14 @@
 #include "graphics/panel.h"
 #include "graphics/text.h"
 #include "window/hold_festival.h"
+#include "window/epithets.h"
 
 static void button_hold_festival(const generic_button *button);
+static void button_epithets(const generic_button *button);
 
 static generic_button hold_festival_button[] = {
     {102, 340, 300, 20, button_hold_festival},
+    {590, 20, 32, 24, button_epithets}
 };
 
 static unsigned int focus_button_id;
@@ -170,11 +173,15 @@ static void draw_foreground(void)
     if (!city_festival_is_planned()) {
         button_border_draw(102, 335, 300, 20, focus_button_id == 1);
     }
+
+    button_border_draw(590, 20, 32, 24, focus_button_id == 2);
+
+    image_draw(982, 594, 24, COLOR_MASK_NONE, SCALE_NONE);
 }
 
 static int handle_mouse(const mouse *m)
 {
-    return generic_buttons_handle_mouse(m, 0, 0, hold_festival_button, 1, &focus_button_id);
+    return generic_buttons_handle_mouse(m, 0, 0, hold_festival_button, 2, &focus_button_id);
 }
 
 static void button_hold_festival(const generic_button *button)
@@ -184,10 +191,17 @@ static void button_hold_festival(const generic_button *button)
     }
 }
 
+static void button_epithets(const generic_button *button)
+{
+    window_epithets_show();
+}
+
 static void get_tooltip_text(advisor_tooltip_result *r)
 {
-    if (focus_button_id) {
+    if (focus_button_id == 1) {
         r->text_id = 112;
+    } else if (focus_button_id == 2) {
+        r->translation_key = TR_WINDOW_ADVISOR_EPITHETS_TOOLTIP;
     }
 }