Merge branch 'future'

2 files changed, 19 insertions, 0 deletions

@@ -47,6 +47,7 @@ const kREARRANGE_PANELS = 1
 const kCLASSIFICATION_LOCAL_NORMAL = 1
 const kCLASSIFICATION_LOCAL_REDUCED = 2
 const kCLASSIFICATION_LOCAL_INSANITY = 4
+const kCLASSIFICATION_LOCAL_SMALL_SPHERE_ONE = 8
 
 const kCLASSIFICATION_REMOTE_NORMAL = 0
 const kCLASSIFICATION_REMOTE_REDUCED = 1
@@ -272,8 +273,12 @@ func _on_data():
                                 _victory_condition = _slot_data["victory_condition"]
                         if _slot_data.has("shuffle_colors"):
                                 _color_shuffle = _slot_data["shuffle_colors"]
+
                         if _slot_data.has("shuffle_doors"):
                                 _door_shuffle = (_slot_data["shuffle_doors"] > 0)
+                        else:
+                                _door_shuffle = false
+
                         if _slot_data.has("shuffle_paintings"):
                                 _painting_shuffle = _slot_data["shuffle_paintings"]
                         if _slot_data.has("shuffle_panels"):
@@ -290,6 +295,7 @@ func _on_data():
                                 _mastery_achievements = _slot_data["mastery_achievements"]
                         if _slot_data.has("level_2_requirement"):
                                 _level_2_requirement = _slot_data["level_2_requirement"]
+
                         if _slot_data.has("location_checks"):
                                 if _slot_data["location_checks"] == kCLASSIFICATION_REMOTE_NORMAL:
                                         _location_classification_bit = kCLASSIFICATION_LOCAL_NORMAL
@@ -297,8 +303,13 @@ func _on_data():
                                         _location_classification_bit = kCLASSIFICATION_LOCAL_REDUCED
                                 elif _slot_data["location_checks"] == kCLASSIFICATION_REMOTE_INSANITY:
                                         _location_classification_bit = kCLASSIFICATION_LOCAL_INSANITY
+                        else:
+                                _location_classification_bit = kCLASSIFICATION_LOCAL_NORMAL
+
                         if _slot_data.has("early_color_hallways"):
                                 _early_color_hallways = _slot_data["early_color_hallways"]
+                        else:
+                                _early_color_hallways = false
                         if _slot_data.has("enable_pilgrimage"):
                                 _pilgrimage_enabled = _slot_data["enable_pilgrimage"]
                         else:
@@ -319,6 +330,9 @@ func _on_data():
                         if _slot_data.has("sunwarp_permutation"):
                                 _sunwarp_mapping = _slot_data["sunwarp_permutation"]
 
+                        if _door_shuffle and not _early_color_hallways:
+                                _location_classification_bit += kCLASSIFICATION_LOCAL_SMALL_SPHERE_ONE
+
                         if track_player:
                                 setValue("PlayerPos", {"x": 0, "z": 0})
                         else:
@@ -8,6 +8,7 @@ outputpath = ARGV[2]
 CLASSIFICATION_NORMAL = 1
 CLASSIFICATION_REDUCED = 2
 CLASSIFICATION_INSANITY = 4
+CLASSIFICATION_SMALL_SPHERE_ONE = 8
 
 panel_to_id = {}
 door_groups = {}
@@ -85,6 +86,10 @@ config.each do |room_name, room_data|
           classification_by_location_id[location_id] += CLASSIFICATION_REDUCED
         end
       end
+
+      if room_name == "Starting Room"
+        classification_by_location_id[location_id] += CLASSIFICATION_SMALL_SPHERE_ONE
+      end
     end
   end