Use priority value to chose between multiple end screens with valid c…

…onditions
CleverRaven · Jul 5, 2024 · b9b5c72 · b9b5c72
1 parent a49db66
commit b9b5c72
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/data/json/ascii_art/graveyard.json b/data/json/ascii_art/graveyard.json
@@ -8,7 +8,7 @@
       "               >  _     _ (",
       "              |  |_) | |_) |",
       "              |  | \\ | |   |",
-      "   ______.__%_|            |________  __",
+      "   ______.__<color_green>%</color>_|            |________  __",
       " _/                                \\|  |",
       "|                                       <",
       "|                                       |",
@@ -20,11 +20,11 @@
       "              |            |",
       "              |   _        |",
       "              |__/         |",
-      "             % / `--.      |%",
-      "         * .%%|          -< @%%%",
-      "         `\\%`@|            |@@%@%%",
-      "       .%%%@@@|%     `   % @@@%%@%%%%",
-      "  _.%%%%%%@@@@@@%%%__/\\%@@%%@@@@@@@%%%%%%"
+      "             <color_green>%</color> / `--.      |<color_green>%</color>",
+      "         <color_red>*</color> .<color_green>%%</color>|          -< <color_brown>@</color><color_green>%%%</color>",
+      "         `\\<color_green>%</color>`<color_brown>@</color>|            |<color_brown>@@</color><color_green>%</color><color_brown>@</color><color_green>%%</color>",
+      "       .<color_green>%%%</color><color_brown>@@@</color>|<color_green>%</color>     `   <color_green>%</color> <color_brown>@@@</color><color_green>%%</color><color_brown>@</color><color_green>%%%%</color>",
+      "  _.<color_green>%%%%%%</color><color_brown>@@@@@@</color><color_green>%%%</color>__/\\<color_green>%</color><color_brown>@@</color><color_green>%%</color><color_brown>@@@@@@@</color><color_green>%%%%%%</color>"
     ]
   },
   {
@@ -34,8 +34,8 @@
       "           _________  ____           ",
       "         _/         `/    \\_         ",
       "       _/      _     _      \\_.      ",
-      "     _%\\      |_) | |_)       \\_     ",
-      "   _/ \/      | \\ | |           \\_   ",
+      "     _<color_green>%</color>\\      |_) | |_)       \\_     ",
+      "   _/ \\/      | \\ | |           \\_   ",
       " _/                               \\_ ",
       "|                                   |",
       " )                                 < ",
@@ -47,11 +47,11 @@
       "|                                  ( ",
       "|                                   |",
       "|                                   |",
-      "|     %                         .   |",
-      "|  @`                            %% |",
-      "| %@%@%\\                *      %`%@%|",
-      "%%@@@.%@%\\%%            `\\  %%.%%@@%@",
-      "@%@@%%%%%@@@@@@%%%%%%%%@@%%@@@%%%@%%@"
+      "|     <color_green>%</color>                         .   |",
+      "|  <color_brown>@</color>`                            <color_green>%%</color> |",
+      "| <color_green>%</color><color_brown>@</color><color_green>%</color><color_brown>@</color><color_green>%</color>\\                <color_red>*</color>      <color_green>%</color>`<color_green>%</color><color_brown>@</color><color_green>%</color>|",
+      "<color_green>%%</color><color_brown>@@@</color>.<color_green>%</color><color_brown>@</color><color_green>%</color>\\<color_green>%%</color>            `\\  <color_green>%%</color>.<color_green>%%</color><color_brown>@@</color><color_green>%</color><color_brown>@</color>",
+      "<color_brown>@</color><color_green>%</color><color_brown>@@</color><color_green>%%%%%</color><color_brown>@@@@@@</color><color_green>%%%%%%%%</color><color_brown>@@</color><color_green>%%</color><color_brown>@@@</color><color_green>%%%</color><color_brown>@</color><color_green>%%</color><color_brown>@</color>"
     ]
   }
 ]
diff --git a/src/end_screen.cpp b/src/end_screen.cpp
@@ -29,6 +29,7 @@ void end_screen::load( const JsonObject &jo, std::string_view )
 {
     mandatory( jo, was_loaded, "id", id );
     mandatory( jo, was_loaded, "picture_id", picture_id );
+    mandatory( jo, was_loaded, "priority", priority );
     read_condition( jo, "condition", condition, false );
 
     optional( jo, was_loaded, "added_info", added_info );

diff --git a/src/end_screen.h b/src/end_screen.h
@@ -23,6 +23,7 @@ class end_screen
         end_screen_id id;
         ascii_art_id picture_id;
         std::function<bool( dialogue & )> condition;
+        int priority;
         std::vector<std::pair<std::pair<int, int>, std::string>> added_info;
         std::string last_words_label;
 };

diff --git a/src/game.cpp b/src/game.cpp
@@ -2846,7 +2846,15 @@ void end_screen_ui_impl::draw_controls()
     dialogue d( get_talker_for( u ), nullptr );
     std::string input_label;
     std::vector<std::pair<std::pair<int, int>, std::string>> added_info;
-    for( const end_screen &e_screen : end_screen::get_all() ) {
+
+    //Sort end_screens in order of decreasing priority
+    std::vector<end_screen> sorted_screens = end_screen::get_all();
+    std::sort( sorted_screens.begin(), sorted_screens.end(), []( end_screen const & a,
+    end_screen const & b ) {
+        return a.priority > b.priority;
+    } );
+
+    for( const end_screen &e_screen : sorted_screens ) {
         if( e_screen.condition( d ) ) {
             art = e_screen.picture_id;
             if( !e_screen.added_info.empty() ) {
@@ -2855,6 +2863,7 @@ void end_screen_ui_impl::draw_controls()
             if( !e_screen.last_words_label.empty() ) {
                 input_label = e_screen.last_words_label;
             }
+            break;
         }
     }