Merge branch 'main' into panels

1 files changed, 55 insertions, 0 deletions

@@ -65,8 +65,14 @@ struct APState {
   LocationChecks location_checks = kNORMAL_LOCATIONS;
   VictoryCondition victory_condition = kTHE_END;
   bool early_color_hallways = false;
+  bool pilgrimage_enabled = false;
+  bool pilgrimage_allows_roof_access = false;
+  bool pilgrimage_allows_paintings = false;
+  SunwarpAccess sunwarp_access = kSUNWARP_ACCESS_NORMAL;
+  bool sunwarp_shuffle = false;
 
   std::map<std::string, std::string> painting_mapping;
+  std::map<int, SunwarpMapping> sunwarp_mapping;
 
   void Connect(std::string server, std::string player, std::string password) {
     if (!initialized) {
@@ -138,6 +144,12 @@ struct APState {
     location_checks = kNORMAL_LOCATIONS;
     victory_condition = kTHE_END;
     early_color_hallways = false;
+    pilgrimage_enabled = false;
+    pilgrimage_allows_roof_access = false;
+    pilgrimage_allows_paintings = false;
+    sunwarp_access = kSUNWARP_ACCESS_NORMAL;
+    sunwarp_shuffle = false;
+    sunwarp_mapping.clear();
 
     connected = false;
     has_connection_result = false;
@@ -234,6 +246,19 @@ struct APState {
           slot_data["victory_condition"].get<VictoryCondition>();
       early_color_hallways = slot_data.contains("early_color_hallways") &&
                              slot_data["early_color_hallways"].get<int>() == 1;
+      pilgrimage_enabled = slot_data.contains("enable_pilgrimage") &&
+                           slot_data["enable_pilgrimage"].get<int>() == 1;
+      pilgrimage_allows_roof_access =
+          slot_data.contains("pilgrimage_allows_roof_access") &&
+          slot_data["pilgrimage_allows_roof_access"].get<int>() == 1;
+      pilgrimage_allows_paintings =
+          slot_data.contains("pilgrimage_allows_paintings") &&
+          slot_data["pilgrimage_allows_paintings"].get<int>() == 1;
+      sunwarp_access = slot_data.contains("sunwarp_access")
+                           ? slot_data["sunwarp_access"].get<SunwarpAccess>()
+                           : kSUNWARP_ACCESS_NORMAL;
+      sunwarp_shuffle = slot_data.contains("shuffle_sunwarps") &&
+                        slot_data["shuffle_sunwarps"].get<int>() == 1;
 
       if (painting_shuffle && slot_data.contains("painting_entrance_to_exit")) {
         painting_mapping.clear();
@@ -244,6 +269,18 @@ struct APState {
         }
       }
 
+      if (sunwarp_shuffle && slot_data.contains("sunwarp_permutation")) {
+        std::vector<int> inverted_sunwarps;
+        for (const auto& item : slot_data["sunwarp_permutation"]) {
+          inverted_sunwarps.push_back(item);
+        }
+
+        for (int i = 0; i < 6; i++) {
+          sunwarp_mapping[inverted_sunwarps[i]] = SunwarpMapping{
+              .dots = i + 1, .exit_index = inverted_sunwarps[i + 6]};
+        }
+      }
+
       connected = true;
       has_connection_result = true;
 
@@ -476,6 +513,24 @@ bool AP_HasAchievement(const std::string& achievement_name) {
 
 bool AP_HasEarlyColorHallways() { return GetState().early_color_hallways; }
 
+bool AP_IsPilgrimageEnabled() { return GetState().pilgrimage_enabled; }
+
+bool AP_DoesPilgrimageAllowRoofAccess() {
+  return GetState().pilgrimage_allows_roof_access;
+}
+
+bool AP_DoesPilgrimageAllowPaintings() {
+  return GetState().pilgrimage_allows_paintings;
+}
+
+SunwarpAccess AP_GetSunwarpAccess() { return GetState().sunwarp_access; }
+
+bool AP_IsSunwarpShuffle() { return GetState().sunwarp_shuffle; }
+
+const std::map<int, SunwarpMapping>& AP_GetSunwarpMapping() {
+  return GetState().sunwarp_mapping;
+}
+
 bool AP_HasReachedGoal() { return GetState().HasReachedGoal(); }
 
 std::optional<std::tuple<int, int>> AP_GetPlayerPosition() {