More game updates

Author: lefticus

resources/tiled/maps.tiled-session

@@ -36,7 +36,7 @@
             "scale": 12.904166666666667,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 28.052954472069743,
+                "x": 27.975460122699385,
                 "y": 32.00516628995803
             }
         }

resources/tiled/tiles/Map.tmj

@@ -58,10 +58,10 @@
             114, 115, 141, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 141, 115, 116,
             114, 115, 116, 195, 196, 196, 196, 196, 197, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 114, 115, 116,
             114, 115, 116, 221, 222, 223, 222, 223, 223, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 114, 115, 116,
-            114, 115, 116, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 114, 115, 116,
-            114, 115, 116, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 212, 262, 214, 190, 190, 190, 190, 190, 190, 190, 190, 114, 115, 116,
-            114, 115, 116, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 212, 262, 213, 263, 138, 261, 262, 214, 190, 190, 190, 190, 190, 190, 114, 115, 116,
-            114, 115, 116, 190, 190, 190, 190, 190, 190, 190, 190, 190, 212, 263, 209, 265, 210, 265, 211, 138, 261, 214, 190, 190, 190, 190, 190, 114, 115, 116,
+            114, 115, 116, 190, 190, 190, 190, 190, 190, 190, 190, 190, 215, 216, 216, 346, 217, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 114, 115, 116,
+            114, 115, 116, 190, 190, 190, 190, 190, 190, 190, 190, 190, 267, 268, 295, 293, 269, 212, 214, 190, 190, 190, 190, 190, 190, 190, 190, 114, 115, 116,
+            114, 115, 116, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 267, 269, 212, 263, 261, 262, 214, 190, 190, 190, 190, 190, 190, 114, 115, 116,
+            114, 115, 116, 190, 190, 190, 190, 190, 190, 190, 190, 190, 212, 213, 214, 190, 264, 265, 211, 138, 261, 214, 190, 190, 190, 190, 190, 114, 115, 116,
             114, 115, 116, 190, 190, 190, 190, 190, 190, 190, 190, 212, 263, 209, 266, 190, 190, 190, 238, 138, 138, 235, 190, 190, 190, 190, 190, 114, 115, 116,
             114, 115, 116, 190, 190, 190, 190, 190, 212, 262, 262, 263, 209, 266, 190, 190, 190, 190, 264, 265, 210, 266, 190, 190, 190, 190, 190, 114, 115, 116,
             114, 115, 116, 190, 190, 190, 190, 190, 264, 265, 210, 265, 266, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 140, 115, 116,

src/game.cpp

@@ -9,11 +9,19 @@ Game_Map make_map()
 {
   auto map = load_tiled_map("/home/jason/my_awesome_game/resources/tiled/tiles/Map.tmj");
 
-  map.locations.at(Point{4,5}).can_enter // NOLINT magic numbers
-    = [](const Game &, Point, Direction){ return true; };
-  map.locations.at(Point{4,5}).enter_action // NOLINT magic numbers
-    = [](Game &game, Point, Direction){ game.current_map = "store"; game.player.map_location = Point{6,6}; }; // NOLINT magic numbers
+  map.locations.at(Point{ 4, 5 }).can_enter// NOLINT magic numbers
+    = [](const Game &, Point, Direction) { return true; };
+  map.locations.at(Point{ 4, 5 }).enter_action// NOLINT magic numbers
+    = [](Game &game, Point, Direction) {
+        game.current_map = "store";
+        game.player.map_location = Point{ 6, 6 };// NOLINT magic numbers
+      };
 
+  map.locations.at(Point{ 4, 6 }).enter_action// NOLINT magic numbers
+    = [](Game &game, Point, Direction) { game.last_message = "A store"; };
+
+  map.locations.at(Point{ 4, 6 }).exit_action// NOLINT magic numbers
+    = [](Game &game, Point, Direction) { game.last_message = ""; };
 
   return map;
 }
@@ -22,6 +30,21 @@ Game_Map make_store()
 {
   auto map = load_tiled_map("/home/jason/my_awesome_game/resources/tiled/tiles/Store.tmj");
 
+  map.locations.at(Point{ 7, 6 }).enter_action// NOLINT magic numbers
+    = [](Game &game, Point, Direction) {
+        game.current_map = "main";
+        game.player.map_location = Point{ 4, 6 };// NOLINT magic numbers
+      };
+
+  map.locations.at(Point{ 3, 3 }).enter_action = [](Game &game, Point, Direction) {
+    game.set_menu(
+      Menu{ { "Ask about town", "This is the quiet town of 'Quad Corners'. The economy has been down for the last few years. People have been moving away. It's a bit depressing, really." },
+        set_flag("Tell about present", "Ah yes, the Xstation6, all of the kids want one. You'll probably have a hard time finding one of those around here.", variable{"xstation"}),
+        check_flag("Ask about Xstation6", "I think bob has one.", variable{"xstation"}),
+
+        exit_menu() });
+  };
+
   return map;
 }
 
@@ -33,19 +56,19 @@ Game make_game()
   retval.current_map = "main";
   retval.tile_size = Size{ 8, 8 };// NOLINT Magic Number
 
-  retval.variables["Task"] = "Exit game";
-  retval.display_variables.emplace_back("Task");
+  retval.variables["Cash"] = 50;// NOLINT
+  retval.variables["xstation"] = false;
+  retval.display_variables.emplace_back("Cash");
 
 
   Character player;
-  player.map_location = { 14, 17 }; // NOLINT Magic Number
+  player.map_location = { 14, 17 };// NOLINT Magic Number
   player.draw =
     [](Vector2D_Span<Color> &pixels, [[maybe_unused]] const Game &game, [[maybe_unused]] Point map_location) {
-
-      const auto &tile = game.maps.at("main").tile_sets.front().at(98); // NOLINT magic number
+      const auto &tile = game.maps.at("main").tile_sets.front().at(98);// NOLINT magic number
       for (std::size_t cur_x = 0; cur_x < pixels.size().width; ++cur_x) {
         for (std::size_t cur_y = 0; cur_y < pixels.size().height; ++cur_y) {
-          pixels.at(Point{cur_x, cur_y}) += tile.at(Point{cur_x, cur_y});
+          pixels.at(Point{ cur_x, cur_y }) += tile.at(Point{ cur_x, cur_y });
         }
       }
     };
@@ -54,10 +77,10 @@ Game make_game()
   retval.player = player;
 
   retval.popup_message =
-    "Welcome to 'Learning C++ With Game Hacking Lesson 02'\n\n"
-    "Your job, again, is to get into the special square in the bottom right corner of the map, and you'll need to "
-    "modify the code.\n\n"
-    "We need to talk about 'magic numbers' in this code, but you'll have the fun of changing some colors!";
+    "Welcome to Quad Corners.\n\nThis town is your last stop on your delivery run. Unfortunately shortly after you "
+    "arrived, some heavy rains came and washed out the road.\n\nTomorrow is your kid's birthday, and you still don't "
+    "have a present!\n\nYou're not a slacker, you were planning to get it on the way home. Now you have to see if you "
+    "can find it here, instead.";
 
   return retval;
 }

src/game_components.cpp

@@ -106,7 +106,8 @@ Game_Map load_tiled_map(const std::filesystem::path &map_json)// NOLINT cofnitiv
 
 
   for (const auto &[point, tile_data] : points) {
-    map.locations.at(point).draw = [tiles = tile_data](Vector2D_Span<Color> &pixels, const Game &game, Point, Layer layer) {
+    map.locations.at(point).draw = [tiles = tile_data](
+                                     Vector2D_Span<Color> &pixels, const Game &game, Point, Layer layer) {
       const auto &tile_sets = game.get_current_map().tile_sets;
       bool first_tile = true;
       for (const auto &tile : tiles) {
@@ -134,11 +135,48 @@ Game_Map load_tiled_map(const std::filesystem::path &map_json)// NOLINT cofnitiv
     map.locations.at(point).can_enter = [tiles = tile_data](const Game &game, Point, Direction) {
       const auto &tile_sets = game.get_current_map().tile_sets;
       return std::ranges::all_of(tiles, [&](const auto &tile) {
-        return tile.foreground || tile.background || tile.tileid == 0 || tile_sets[0].properties.at(tile.tileid).passable;
+        return tile.foreground || tile.background || tile.tileid == 0
+               || tile_sets[0].properties.at(tile.tileid).passable;
       });
     };
   }
 
   return map;
 }
+
+Menu::MenuItem::MenuItem(std::string text_,
+  std::function<void(Game &)> action_,
+  std::function<bool(const Game &)> visible_)
+  : text{ std::move(text_) }, action{ std::move(action_) }, visible{ std::move(visible_) }
+{}
+
+Menu::MenuItem::MenuItem(std::string text_, std::string message_, std::function<bool(const Game &)> visible_)
+  : MenuItem(
+    std::move(text_),
+    [message = std::move(message_)](Game &game) { game.popup_message = message; },
+    std::move(visible_))
+{}
+
+Menu::MenuItem exit_menu()
+{
+  return { "Exit", [](Game &game) { game.clear_menu(); } };
+}
+
+Menu::MenuItem set_flag(std::string text, std::string message, variable var)
+{
+  return { std::move(text), [message = std::move(message), var = std::move(var)](Game &game) {
+            game.popup_message = message;
+            if (game.variables[var.name] != Variable{ true }) {
+              game.variables[var.name] = true;
+              game.set_menu(game.get_menu());
+            }
+          } };
+}
+
+Menu::MenuItem check_flag(std::string text, std::string message, variable var)
+{
+  return { std::move(text), std::move(message), std::move(var) == true };
+}
+
+
 }// namespace lefticus::awesome_game

src/game_components.hpp

@@ -55,12 +55,65 @@ struct Game_Map
 
 Game_Map load_tiled_map(const std::filesystem::path &map_json);
 
+
+using Variable = std::variant<double, std::int64_t, std::string, bool>;
+
+template<typename Comparitor> struct Variable_Comparison
+{
+  Comparitor comparitor;
+
+  bool operator()(const Game &game) const { return comparitor(game); }
+};
+
+template<typename T> Variable_Comparison(T t) -> Variable_Comparison<T>;
+
+
+template<typename LHS, typename RHS> auto operator&&(Variable_Comparison<LHS> lhs, Variable_Comparison<RHS> rhs)
+{
+  return Variable_Comparison{ [lhs = std::move(lhs.comparitor), rhs = std::move(rhs.comparitor)](
+                                const Game &game) { return lhs(game) && rhs(game); } };
+}
+
+template<typename LHS, typename RHS> auto operator||(Variable_Comparison<LHS> lhs, Variable_Comparison<RHS> rhs)
+{
+  return Variable_Comparison{ [lhs = std::move(lhs.comparitor), rhs = std::move(rhs.comparitor)](
+                                const Game &game) { return lhs(game) || rhs(game); } };
+}
+
+struct variable
+{
+  std::string name;
+};
+
+
+
+
+inline std::string to_string(const Variable &variable)
+{
+  return std::visit([](const auto &value) { return fmt::format("{}", value); }, variable);
+}
+
 struct Menu
 {
   struct MenuItem
   {
     std::string text;
     std::function<void(Game &)> action;
+    std::function<bool(const Game &)> visible;
+    MenuItem(std::string text_, std::string message_, std::function<bool (const Game &)> = {});
+
+    template<typename Compare>
+    MenuItem(std::string text_, std::string message_, Variable_Comparison<Compare> comp)
+     : MenuItem(std::move(text_), std::move(message_), std::function<bool(const Game &)>(std::move(comp.comparitor)))
+    {
+    }
+
+    MenuItem(std::string text_, std::function<void(Game &)> action_, std::function<bool (const Game &)> visible_ = {});
+    
+    template<typename Compare>
+    MenuItem(std::string text_, std::function<void(Game &)> action_, Variable_Comparison<Compare> comp)
+      : MenuItem(std::move(text_), std::move(action_), std::function<bool(const Game &)>(std::move(comp.comparitor)))
+    {}
   };
 
   std::vector<MenuItem> items;
@@ -70,13 +123,6 @@ struct Menu
   explicit Menu(std::initializer_list<MenuItem> items_) : items{ items_ } {}
 };
 
-using Variable = std::variant<double, std::int64_t, std::string, bool>;
-
-inline std::string to_string(const Variable &variable)
-{
-  return std::visit([](const auto &value) { return fmt::format("{}", value); }, variable);
-}
-
 struct Game
 {
 
@@ -132,6 +178,84 @@ struct Game
   bool menu_is_new = false;
 };
 
+template<typename Value> auto operator==(variable var, Value value)
+{
+  return Variable_Comparison{ [name = std::move(var.name), value = Variable{ std::move(value) }](
+                                const Game &game) { return game.variables.at(name) == value; } };
+}
+
+template<typename Value> auto operator==(Value value, variable var)
+{
+  return Variable_Comparison{ [name = std::move(var.name), value = Variable{ std::move(value) }](
+                                const Game &game) { return value == game.variables.at(name); } };
+}
+
+
+template<typename Value> auto operator!=(variable var, Value value)
+{
+  return Variable_Comparison{ [name = std::move(var.name), value = Variable{ std::move(value) }](
+                                const Game &game) { return game.variables.at(name) != value; } };
+}
+
+template<typename Value> auto operator!=(Value value, variable var)
+{
+  return Variable_Comparison{ [name = std::move(var.name), value = Variable{ std::move(value) }](
+                                const Game &game) { return value != game.variables.at(name); } };
+}
+
+template<typename Value> auto operator<(variable var, Value value)
+{
+  return Variable_Comparison{ [name = std::move(var.name), value = Variable{ std::move(value) }](
+                                const Game &game) { return game.variables.at(name) < value; } };
+}
+
+template<typename Value> auto operator<(Value value, variable var)
+{
+  return Variable_Comparison{ [name = std::move(var.name), value = Variable{ std::move(value) }](
+                                const Game &game) { return value < game.variables.at(name); } };
+}
+
+
+template<typename Value> auto operator<=(variable var, Value value)
+{
+  return Variable_Comparison{ [name = std::move(var.name), value = Variable{ std::move(value) }](
+                                const Game &game) { return game.variables.at(name) <= value; } };
+}
+
+template<typename Value> auto operator<=(Value value, variable var)
+{
+  return Variable_Comparison{ [name = std::move(var.name), value = Variable{ std::move(value) }](
+                                const Game &game) { return value <= game.variables.at(name); } };
+}
+
+template<typename Value> auto operator>(variable var, Value value)
+{
+  return Variable_Comparison{ [name = std::move(var.name), value = Variable{ std::move(value) }](
+                                const Game &game) { return game.variables.at(name) > value; } };
+}
+
+template<typename Value> auto operator>(Value value, variable var)
+{
+  return Variable_Comparison{ [name = std::move(var.name), value = Variable{ std::move(value) }](
+                                const Game &game) { return value > game.variables.at(name); } };
+}
+
+template<typename Value> auto operator>=(variable var, Value value)
+{
+  return Variable_Comparison{ [name = std::move(var.name), value = Variable{ std::move(value) }](
+                                const Game &game) { return game.variables.at(name) >= value; } };
+}
+
+template<typename Value> auto operator>=(Value value, variable var)
+{
+  return Variable_Comparison{ [name = std::move(var.name), value = Variable{ std::move(value) }](
+                                const Game &game) { return value >= game.variables.at(name); } };
+}
+
+Menu::MenuItem exit_menu();
+Menu::MenuItem set_flag(std::string text, std::string message, variable var);
+Menu::MenuItem check_flag(std::string text, std::string message, variable var);
+
 }// namespace lefticus::awesome_game
 
 #endif// AWESOME_GAME_GAME_COMPONENTS_HPP

src/game_hacking_lesson_00.cpp

@@ -9,32 +9,32 @@ Game_Map make_map()// NOLINT cognitive complexity
   Game_Map map{ Size{ 10, 10 } };// NOLINT magic numbers
 
 
-  auto empty_draw =
-    [](Vector2D_Span<Color> &pixels, [[maybe_unused]] const Game &game, [[maybe_unused]] Point map_location, Layer layer) {
-      if (layer == Layer::Foreground) {
-        return;
-      }
-      // just a grey
-      fill(pixels, Color{ 25, 25, 25, 255 });// NOLINT magic number
-    };
+  auto empty_draw = [](Vector2D_Span<Color> &pixels,
+                      [[maybe_unused]] const Game &game,
+                      [[maybe_unused]] Point map_location,
+                      Layer layer) {
+    if (layer == Layer::Foreground) { return; }
+    // just a grey
+    fill(pixels, Color{ 25, 25, 25, 255 });// NOLINT magic number
+  };
 
   auto cannot_enter = [](const Game &, Point, Direction) -> bool { return false; };
 
-  auto water_draw =
-    [](Vector2D_Span<Color> &pixels, [[maybe_unused]] const Game &game, [[maybe_unused]] Point map_location, Layer layer) {
-      if (layer == Layer::Foreground) { return; }
-      fill(pixels, Color{ 0, 0, 250, 255 });// NOLINT magic number
-    };
+  auto water_draw = [](Vector2D_Span<Color> &pixels,
+                      [[maybe_unused]] const Game &game,
+                      [[maybe_unused]] Point map_location,
+                      Layer layer) {
+    if (layer == Layer::Foreground) { return; }
+    fill(pixels, Color{ 0, 0, 250, 255 });// NOLINT magic number
+  };
 
 
   auto wall_draw = []([[maybe_unused]] Vector2D_Span<Color> &pixels,
                      [[maybe_unused]] const Game &game,
                      [[maybe_unused]] Point map_location,
                      Layer layer) {
-    if (layer == Layer::Foreground) {
-      return;
-    }
-    
+    if (layer == Layer::Foreground) { return; }
+
     static constexpr auto wall_color = Color{ 100, 100, 100, 128 };
 
     // We fill in the wall with a color, the color alternates by the second
@@ -134,10 +134,8 @@ Game_Map make_map()// NOLINT cognitive complexity
   map.locations.at(special_location).enter_action = [](Game &game, Point, Direction) {
     game.last_message = "You found the secret room! Now change the call to `play_game` to start lesson 01";
     Menu menu;
-    menu.items.push_back(
-      Menu::MenuItem{ "Continue Game", [](Game &menu_action_game) { menu_action_game.clear_menu(); } });
-    menu.items.push_back(
-      Menu::MenuItem{ "Exit Game", [](Game &menu_action_game) { menu_action_game.exit_game = true; } });
+    menu.items.emplace_back("Continue Game", [](Game &menu_action_game) { menu_action_game.clear_menu(); });
+    menu.items.emplace_back("Exit Game", [](Game &menu_action_game) { menu_action_game.exit_game = true; });
     game.set_menu(menu);
   };