1 files changed, 15 insertions, 8 deletions

@@ -192,6 +192,10 @@ class StateCalculator {
       : options_(options) {}
 
   void Calculate() {
+    painting_mapping_ = AP_GetPaintingMapping();
+    checked_paintings_ = AP_GetCheckedPaintings();
+    sunwarp_mapping_ = AP_GetSunwarpMapping();
+
     std::list<int> panel_boundary;
     std::list<int> painting_boundary;
     std::list<Exit> flood_boundary;
@@ -231,12 +235,12 @@ class StateCalculator {
           reachable_changed = true;
 
           PaintingExit cur_painting = GD_GetPaintingExit(painting_id);
-          if (AP_GetPaintingMapping().count(cur_painting.internal_id) &&
-              AP_GetCheckedPaintings().count(cur_painting.internal_id)) {
+          if (painting_mapping_.count(cur_painting.internal_id) &&
+              checked_paintings_.count(cur_painting.internal_id)) {
             Exit painting_exit;
             PaintingExit target_painting =
                 GD_GetPaintingExit(GD_GetPaintingByName(
-                    AP_GetPaintingMapping().at(cur_painting.internal_id)));
+                    painting_mapping_.at(cur_painting.internal_id)));
             painting_exit.source_room = cur_painting.room;
             painting_exit.destination_room = target_painting.room;
             painting_exit.type = EntranceType::kPainting;
@@ -295,8 +299,8 @@ class StateCalculator {
 
           if (AP_IsSunwarpShuffle()) {
             for (int index : room_obj.sunwarps) {
-              if (AP_GetSunwarpMapping().count(index)) {
-                const SunwarpMapping& sm = AP_GetSunwarpMapping().at(index);
+              if (sunwarp_mapping_.count(index)) {
+                const SunwarpMapping& sm = sunwarp_mapping_.at(index);
 
                 new_boundary.push_back(
                     {.source_room = room_exit.destination_room,
@@ -317,8 +321,7 @@ class StateCalculator {
           if (AP_IsPilgrimageEnabled()) {
             int pilgrimage_start_id = GD_GetRoomByName("Hub Room");
             if (AP_IsSunwarpShuffle()) {
-              for (const auto& [start_index, mapping] :
-                   AP_GetSunwarpMapping()) {
+              for (const auto& [start_index, mapping] : sunwarp_mapping_) {
                 if (mapping.dots == 1) {
                   pilgrimage_start_id = GD_GetRoomForSunwarp(start_index);
                 }
@@ -578,7 +581,7 @@ class StateCalculator {
       if (AP_IsSunwarpShuffle()) {
         pilgrimage_pairs = std::vector<std::tuple<int, int>>(5);
 
-        for (const auto& [start_index, mapping] : AP_GetSunwarpMapping()) {
+        for (const auto& [start_index, mapping] : sunwarp_mapping_) {
           if (mapping.dots > 1) {
             std::get<1>(pilgrimage_pairs[mapping.dots - 2]) = start_index;
           }
@@ -649,6 +652,10 @@ class StateCalculator {
   bool pilgrimage_doable_ = false;
 
   std::map<int, std::list<int>> paths_;
+
+  std::map<std::string, std::string> painting_mapping_;
+  std::set<std::string> checked_paintings_;
+  std::map<int, SunwarpMapping> sunwarp_mapping_;
 };
 
 }  // namespace