6 files changed, 40 insertions, 0 deletions

@@ -52,6 +52,7 @@ std::map<int64_t, std::string> progressive_item_by_ap_id;
 DoorShuffleMode door_shuffle_mode = kNO_DOORS;
 bool color_shuffle = false;
 bool painting_shuffle = false;
+int mastery_requirement = 21;
 
 std::map<std::string, std::string> painting_mapping;
 
@@ -116,6 +117,7 @@ void AP_Connect(std::string server, std::string player, std::string password) {
   color_shuffle = false;
   painting_shuffle = false;
   painting_mapping.clear();
+  mastery_requirement = 21;
 
   connected = false;
   has_connection_result = false;
@@ -166,6 +168,7 @@ void AP_Connect(std::string server, std::string player, std::string password) {
     door_shuffle_mode = slot_data["shuffle_doors"].get<DoorShuffleMode>();
     color_shuffle = slot_data["shuffle_colors"].get<bool>();
     painting_shuffle = slot_data["shuffle_paintings"].get<bool>();
+    mastery_requirement = slot_data["mastery_achievements"].get<int>();
 
     if (painting_shuffle && slot_data.contains("painting_entrance_to_exit")) {
       painting_mapping.clear();
@@ -321,3 +324,5 @@ bool AP_IsPaintingShuffle() { return painting_shuffle; }
 const std::map<std::string, std::string> AP_GetPaintingMapping() {
   return painting_mapping;
 }
+
+int AP_GetMasteryRequirement() { return mastery_requirement; }
@@ -28,4 +28,6 @@ bool AP_IsPaintingShuffle();
 
 const std::map<std::string, std::string> AP_GetPaintingMapping();
 
+int AP_GetMasteryRequirement();
+
 #endif /* end of include guard: AP_STATE_H_664A4180 */
@@ -105,6 +105,8 @@
     map: [908, 1632]

   The Wanderer:

     map: [1587, 1765]

+  Outside The Wanderer:

+    fold_into: The Wanderer

   Rhyme Room (Smiley):

     fold_into: Rhyme Room

   Rhyme Room (Cross):

@@ -157,6 +157,14 @@ GameData::GameData() {
           panel_obj.check = panel_it.second["check"].as<bool>();
         }
 
+        if (panel_it.second["achievement"]) {
+          panel_obj.achievement = panel_it.second["achievement"].as<bool>();
+
+          if (panel_obj.achievement) {
+            achievement_panels_.push_back(panel_id);
+          }
+        }
+
         if (panel_it.second["exclude_reduce"]) {
           panel_obj.exclude_reduce =
               panel_it.second["exclude_reduce"].as<bool>();
@@ -28,6 +28,7 @@ struct Panel {
   std::vector<int> required_doors;
   bool check = false;
   bool exclude_reduce = false;
+  bool achievement = false;
 };
 
 struct ProgressiveRequirement {
@@ -104,6 +105,10 @@ class GameData {
     return room_by_painting_.at(painting_id);
   }
 
+  const std::vector<int>& GetAchievementPanels() const {
+    return achievement_panels_;
+  }
+
  private:
   int AddOrGetRoom(std::string room);
   int AddOrGetDoor(std::string room, std::string door);
@@ -121,6 +126,8 @@ class GameData {
   std::map<std::string, int> area_by_id_;
 
   std::map<std::string, int> room_by_painting_;
+
+  std::vector<int> achievement_panels_;
 };
 
 const GameData& GetGameData();
@@ -16,6 +16,22 @@ bool IsPanelReachable_Helper(int panel_id,
     return false;
   }
 
+  if (panel_obj.name == "THE MASTER") {
+    int achievements_accessible = 0;
+
+    for (int achieve_id : GetGameData().GetAchievementPanels()) {
+      if (IsPanelReachable_Helper(achieve_id, reachable_rooms)) {
+        achievements_accessible++;
+
+        if (achievements_accessible >= AP_GetMasteryRequirement()) {
+          break;
+        }
+      }
+    }
+
+    return (achievements_accessible >= AP_GetMasteryRequirement());
+  }
+
   for (int room_id : panel_obj.required_rooms) {
     if (!reachable_rooms.count(room_id)) {
       return false;