From 1ec273825497fd6feda19079fa8006096777b11d Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Tue, 2 May 2023 21:00:00 -0400 Subject: Support door shuffle --- ap_state.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ap_state.h') diff --git a/ap_state.h b/ap_state.h index d818b40..d815f93 100644 --- a/ap_state.h +++ b/ap_state.h @@ -11,7 +11,7 @@ #include "game_data.h" #include "tracker_frame.h" -enum class DoorShuffleMode { kNone, kSimple, kComplex }; +enum DoorShuffleMode { kNO_DOORS = 0, kSIMPLE_DOORS = 1, kCOMPLEX_DOORS = 2 }; class APState { public: @@ -27,6 +27,8 @@ class APState { bool HasColorItem(LingoColor color) const; + bool HasItem(const std::string& item) const; + DoorShuffleMode GetDoorShuffleMode() const { return door_shuffle_mode_; } bool IsColorShuffle() const { return color_shuffle_; } @@ -46,11 +48,10 @@ class APState { std::set checked_locations_; std::map, int64_t> ap_id_by_location_id_; - std::map ap_id_by_door_id_; - std::map ap_id_by_door_group_id_; + std::map ap_id_by_item_name_; std::map ap_id_by_color_; - DoorShuffleMode door_shuffle_mode_ = DoorShuffleMode::kNone; + DoorShuffleMode door_shuffle_mode_ = kNO_DOORS; bool color_shuffle_ = false; }; -- cgit 1.4.1