Updated date chooser. Added help.

deck.cpp

@@ -1145,25 +1145,61 @@ door::Panel make_about(void) {
       std::make_unique<door::Line>("This door was written by Bugz.", W));
   about.addLine(std::make_unique<door::Line>("", W));
   about.addLine(std::make_unique<door::Line>(
-      "It is written in door++, using c++, only support Linux.", W));
+      "It is written in door++ using c++ and only supports Linux.", W));
+  return about;
+}
 
+door::Panel make_help(void) {
+  const int W = 60;
+  door::Panel help(W);
+  help.setStyle(door::BorderStyle::DOUBLE_SINGLE);
+  help.setColor(door::ANSIColor(door::COLOR::YELLOW, door::COLOR::BLUE,
+                                door::ATTR::BOLD));
+
+  help.addLine(std::make_unique<door::Line>("Help", W));
+  help.addLine(std::make_unique<door::Line>(
+      "---------------------------------", W,
+      door::ANSIColor(door::COLOR::CYAN, door::COLOR::BLUE, door::ATTR::BOLD)));
   /*
-    door::updateFunction updater = [](void) -> std::string {
-      std::string text = "Currently: ";
-      text.append(return_current_time_and_date());
-      return text;
-    };
-    std::string current = updater();
-    door::Line active(current, 60);
-    active.setUpdater(updater);
-    active.setRender(statusValue(
-        door::ANSIColor(door::COLOR::WHITE, door::COLOR::BLUE,
-    door::ATTR::BOLD), door::ANSIColor(door::COLOR::YELLOW,
-    door::COLOR::BLUE, door::ATTR::BOLD)));
-    about.addLine(std::make_unique<door::Line>(active));
-  */
+  123456789012345678901234567890123456789012345678901234567890-60
 
-  return about;
+  Use Left/Right arrow keys, or 4/6 keys to move marker.
+  Select card to play with Space or 5.  Enter draws another card.
+  A card can play if it is higher or lower in rank by 1.
+
+  Example: A Jack could select either a Ten or a Queen.
+  Example: A King could select either an Ace or a Queen.
+
+
+  The more cards in your streak, the more points you earn.
+
+   */
+  help.addLine(std::make_unique<door::Line>(SPACEACE " v" SPACEACE_VERSION, W));
+  std::string copyright = SPACEACE_COPYRIGHT;
+  if (door::unicode) {
+    replace(copyright, "(C)", "\u00a9");
+  }
+
+  help.addLine(std::make_unique<door::Line>(copyright, W));
+  help.addLine(std::make_unique<door::Line>("", W));
+  help.addLine(std::make_unique<door::Line>(
+      "Use Left/Right arrow keys, or 4/6 keys to move marker.", W));
+  help.addLine(
+      std::make_unique<door::Line>("Select card to play with Space or 5.", W));
+
+  help.addLine(std::make_unique<door::Line>(
+      "A card can play if it is higher or lower in rank by 1.", W));
+  help.addLine(std::make_unique<door::Line>("", W));
+  help.addLine(std::make_unique<door::Line>("Enter draws another card.", W));
+  help.addLine(std::make_unique<door::Line>("", W));
+  help.addLine(std::make_unique<door::Line>(
+      "Example: A Jack could select either a Ten or a Queen.", W));
+  help.addLine(std::make_unique<door::Line>(
+      "Example: A King could select either an Ace or a Queen.", W));
+  help.addLine(std::make_unique<door::Line>("", W));
+  help.addLine(std::make_unique<door::Line>(
+      "The more cards in your streak, the more points you earn.", W));
+  return help;
 }
 
 void display_starfield(door::Door &door, std::mt19937 &rng) {
@@ -1417,7 +1453,10 @@ door::Menu make_deck_menu(void) {
     char c = (*iter)[0];
     m.addSelection(c, (*iter).c_str());
   }
-  m.addSelection('S', "Yellow Red Blue Green Cyan");
+
+  // This verifies the render routine is working great.
+  // Now, I just need to support multiple color selections like this.
+  // m.addSelection('S', "Yellow Red Blue Green Cyan");
   /*
   m.addSelection('A', "All");
   m.addSelection('B', "Blue");

deck.h

@@ -165,6 +165,7 @@ door::ANSIColor stringToANSIColor(std::string colorCode);
 std::string stringFromColorOptions(int opt);
 
 door::Panel make_about(void);
+door::Panel make_help(void);
 void display_starfield(door::Door &door, std::mt19937 &rng);
 void display_space_ace(door::Door &door);
 void display_starfield_space_ace(door::Door &door, std::mt19937 &rng);

main.cpp

@@ -23,70 +23,6 @@ door::ANSIColor stringToANSIColor(std::string colorCode);
 std::function<std::ofstream &(void)> get_logger;
 std::function<void(void)> cls_display_starfield;
 
-/**
- * @brief Make renderFunction that colors status: value
- *
- * "status:" text is status color, the rest is value color.
- *
- * If ":" is not located in the string, text is displayed in status
- * color, digits are displayed in value color.
- *
- * @param status
- * @param value
- * @return door::renderFunction
- */
-door::renderFunction statusValue(door::ANSIColor status,
-                                 door::ANSIColor value) {
-  door::renderFunction rf = [status,
-                             value](const std::string &txt) -> door::Render {
-    door::Render r(txt);
-    door::ColorOutput co;
-
-    co.pos = 0;
-    co.len = 0;
-    co.c = status;
-
-    size_t pos = txt.find(':');
-    if (pos == std::string::npos) {
-      // failed to find :, render digits/numbers in value color
-      int tpos = 0;
-      for (char const &c : txt) {
-        if (std::isdigit(c)) {
-          if (co.c != value) {
-            r.outputs.push_back(co);
-            co.reset();
-            co.pos = tpos;
-            co.c = value;
-          }
-        } else {
-          if (co.c != status) {
-            r.outputs.push_back(co);
-            co.reset();
-            co.pos = tpos;
-            co.c = status;
-          }
-        }
-        co.len++;
-        tpos++;
-      }
-      if (co.len != 0)
-        r.outputs.push_back(co);
-    } else {
-      pos++; // Have : in status color
-      co.len = pos;
-      r.outputs.push_back(co);
-      co.reset();
-      co.pos = pos;
-      co.c = value;
-      co.len = txt.length() - pos;
-      r.outputs.push_back(co);
-    }
-
-    return r;
-  };
-  return rf;
-}
-
 std::string return_current_time_and_date() {
   auto now = std::chrono::system_clock::now();
   auto in_time_t = std::chrono::system_clock::to_time_t(now);
@@ -211,72 +147,6 @@ int configure(door::Door &door, DBData &db) {
   return r;
 }
 
-/*
-door::Panel make_score_panel(door::Door &door) {
-  const int W = 25;
-  door::Panel p(W);
-  p.setStyle(door::BorderStyle::NONE);
-  door::ANSIColor statusColor(door::COLOR::WHITE, door::COLOR::BLUE,
-                              door::ATTR::BOLD);
-  door::ANSIColor valueColor(door::COLOR::YELLOW, door::COLOR::BLUE,
-                             door::ATTR::BOLD);
-  door::renderFunction svRender = statusValue(statusColor, valueColor);
-  // or use renderStatus as defined above.
-  // We'll stick with these for now.
-
-  {
-    std::string userString = "Name: ";
-    userString += door.username;
-    door::Line username(userString, W);
-    username.setRender(svRender);
-    p.addLine(std::make_unique<door::Line>(username));
-  }
-  {
-    door::updateFunction scoreUpdate = [](void) -> std::string {
-      std::string text = "Score: ";
-      text.append(std::to_string(score));
-      return text;
-    };
-    std::string scoreString = scoreUpdate();
-    door::Line score(scoreString, W);
-    score.setRender(svRender);
-    score.setUpdater(scoreUpdate);
-    p.addLine(std::make_unique<door::Line>(score));
-  }
-  {
-    door::updateFunction timeUpdate = [&door](void) -> std::string {
-      std::stringstream ss;
-      std::string text;
-      ss << "Time used: " << setw(3) << door.time_used << " / " << setw(3)
-         << door.time_left;
-      text = ss.str();
-      return text;
-    };
-    std::string timeString = timeUpdate();
-    door::Line time(timeString, W);
-    time.setRender(svRender);
-    time.setUpdater(timeUpdate);
-    p.addLine(std::make_unique<door::Line>(time));
-  }
-  {
-    door::updateFunction handUpdate = [](void) -> std::string {
-      std::string text = "Playing Hand ";
-      text.append(std::to_string(hand));
-      text.append(" of ");
-      text.append(std::to_string(total_hands));
-      return text;
-    };
-    std::string handString = handUpdate();
-    door::Line hands(handString, W);
-    hands.setRender(svRender);
-    hands.setUpdater(handUpdate);
-    p.addLine(std::make_unique<door::Line>(hands));
-  }
-
-  return p;
-}
-*/
-
 int main(int argc, char *argv[]) {
 
   door::Door door("space-ace", argc, argv);
@@ -331,13 +201,6 @@ int main(int argc, char *argv[]) {
     update_config = true;
   }
 
-  /*
-    if (config["hands_per_day"]) {
-      get_logger() << "hands_per_day: " << config["hands_per_day"].as<int>()
-                   << std::endl;
-    }
-  */
-
   // save configuration -- something was updated
   if (update_config) {
     std::ofstream fout("space-ace.yaml");
@@ -360,12 +223,18 @@ int main(int argc, char *argv[]) {
     std::chrono::_V2::system_clock::time_point maint_date = now;
     firstOfMonthDate(maint_date);
 
-    spacedb.expireScores(std::chrono::system_clock::to_time_t(maint_date));
+    if (spacedb.expireScores(
+            std::chrono::system_clock::to_time_t(maint_date))) {
+      if (get_logger)
+        get_logger() << "maint completed" << std::endl;
+      door << "Thanks for waiting..." << door::nl;
+    }
   }
 
   // Have they used this door before?
   if (last_call != 0) {
-    door << "Welcome Back!" << door::nl;
+    door << door::ANSIColor(door::COLOR::YELLOW, door::ATTR::BOLD)
+         << "Welcome Back!" << door::nl;
     auto nowClock = std::chrono::system_clock::from_time_t(now_t);
     auto lastClock = std::chrono::system_clock::from_time_t(last_call);
     auto delta = nowClock - lastClock;
@@ -378,47 +247,29 @@ int main(int argc, char *argv[]) {
     int secs = chrono::duration_cast<chrono::seconds>(delta).count();
 
     if (days > 1) {
-      door << "It's been " << days << " days since you last played."
+      door << door::ANSIColor(door::COLOR::GREEN, door::ATTR::BOLD)
+           << "It's been " << days << " days since you last played."
            << door::nl;
     } else {
       if (hours > 1) {
-        door << "It's been " << hours << " hours since you last played."
-             << door::nl;
+        door << door::ANSIColor(door::COLOR::CYAN) << "It's been " << hours
+             << " hours since you last played." << door::nl;
       } else {
         if (minutes > 1) {
-          door << "It's been " << minutes << " minutes since you last played."
-               << door::nl;
+          door << door::ANSIColor(door::COLOR::CYAN) << "It's been " << minutes
+               << " minutes since you last played." << door::nl;
         } else {
-          door << "It's been " << secs << " seconds since you last played."
+          door << door::ANSIColor(door::COLOR::YELLOW, door::ATTR::BOLD)
+               << "It's been " << secs << " seconds since you last played."
                << door::nl;
           door << "It's like you never left." << door::nl;
         }
       }
     }
+    door << door::reset;
     press_a_key(door);
   }
 
-  /*
-  // example:  saving the door.log() for global use.
-
-  std::function<std::ofstream &(void)> get_logger;
-
-  get_logger = [&door]() -> ofstream & { return door.log(); };
-
-  if (get_logger) {
-    get_logger() << "MEOW" << std::endl;
-    get_logger() << "hey! It works!" << std::endl;
-  }
-
-  get_logger = nullptr;  // before door destruction
-  */
-
-  // https://stackoverflow.com/questions/5008804/generating-random-integer-from-a-range
-
-  // random-number engine used (Mersenne-Twister in this case)
-  // std::uniform_int_distribution<int> uni(min, max); // guaranteed
-  // unbiased
-
   int mx, my; // Max screen width/height
   if (door.width == 0) {
     // screen detect failed, use sensible defaults
@@ -439,9 +290,12 @@ int main(int argc, char *argv[]) {
   door::Panel timeout = make_timeout(mx, my);
   door::Menu m = make_main_menu();
   door::Panel about = make_about(); // 8 lines
+  door::Panel help = make_help();
 
   // center the about box
   about.set((mx - 60) / 2, (my - 9) / 2);
+  // center the help box
+  help.set((mx - 60) / 2, (my - 15) / 2);
 
   int r = 0;
   while ((r >= 0) and (r != 6)) {
@@ -503,7 +357,8 @@ int main(int argc, char *argv[]) {
       break;
 
     case 4: // help
-      door << "Help!  Need some help here..." << door::nl;
+      display_starfield(door, rng);
+      door << help << door::nl;
       r = press_a_key(door);
       break;
 

play.cpp

@@ -131,10 +131,14 @@ int PlayCards::play(void) {
 
   if (played == 0) {
     // playing today
+    door << "Let's play today..." << door::nl;
+    std::this_thread::sleep_for(std::chrono::seconds(1));
     hand = 1;
     return play_cards();
   } else {
     if (played < total_hands) {
+      door << "Let's finish today..." << door::nl;
+      std::this_thread::sleep_for(std::chrono::seconds(1));
       hand = played + 1;
       return play_cards();
     }
@@ -170,9 +174,14 @@ int PlayCards::play(void) {
   }
 
   door << door::nl;
-  door << "Choose, eh? ";
+  door << "Please choose day : " << door::SaveCursor;
+
+AGAIN:
+
   std::string toplay = door.input_string(3);
 
+  door << door::RestoreCursor;
+
   int number;
   try {
     number = std::stoi(toplay);
@@ -182,6 +191,7 @@ int PlayCards::play(void) {
 
   if (number == 0)
     return ' ';
+
   int status;
   if (get_logger)
     get_logger() << "number " << number;
@@ -207,8 +217,11 @@ int PlayCards::play(void) {
         return play_cards();
       }
     }
+    goto AGAIN;
   };
 
+  return ' ';
+
   int r = press_a_key();
   if (r < 0) // timeout!  exit!
     return r;