1 files changed, 83 insertions, 13 deletions

@@ -12,24 +12,43 @@ CLASSIFICATION_SMALL_SPHERE_ONE = 8
 
 panel_to_id = {}
 door_groups = {}
+panel_groups = {}
 warp_groups = {}
 
 panel_output = []
 door_ids_by_item_id = {}
 painting_ids_by_item_id = {}
+panel_ids_by_item_id = {}
 warp_ids_by_item_id = {}
 panel_ids_by_location_id = {}
 classification_by_location_id = {}
 sunwarps = Array.new(12) {Hash.new}
 mentioned_doors = Set[]
 mentioned_paintings = Set[]
+mentioned_panels = Set[]
 mentioned_warps = Set[]
 painting_output = {}
-items_by_progressive_id = {}
+door_items_by_progressive_id = {}
+panel_items_by_progressive_id = {}
+panel_location_ids = []
+solve_index_by_location = {}
 
 ids_config = YAML.load_file(idspath)
-
 config = YAML.load_file(configpath)
+
+config.each do |room_name, room_data|
+  if room_data.include? "panels"
+    room_data["panels"].each do |panel_name, panel|
+      location_id = ids_config["panels"][room_name][panel_name]
+      panel_location_ids << location_id
+    end
+  end
+end
+
+panel_location_ids.sort.each_with_index do |location_id, index|
+  solve_index_by_location[location_id] = index
+end
+
 config.each do |room_name, room_data|
   if room_data.include? "panels"
     room_data["panels"].each do |panel_name, panel|
@@ -41,6 +60,7 @@ config.each do |room_name, room_data|
       ret = {}
       ret["id"] = "\"#{panel["id"]}\""
       ret["loc"] = location_id
+      ret["solve_index"] = solve_index_by_location[location_id]
       if panel.include? "colors"
         if panel["colors"].kind_of? String
           ret["color"] = "[\"#{panel["colors"]}\"]"
@@ -69,9 +89,6 @@ config.each do |room_name, room_data|
       if panel.include? "achievement"
         ret["achievement"] = "\"#{panel["achievement"]}\""
       end
-      if panel.include? "hunt" and panel["hunt"]
-        ret["hunt"] = "true"
-      end
       panel_output << ret
 
       panel_ids_by_location_id[location_id] = [panel["id"]]
@@ -110,15 +127,29 @@ config.each do |room_name, room_data|
   end
 
   if room_data.include? "progression"
-    room_data["progression"].each do |progressive_item_name, progression|
+    room_data["progression"].each do |progressive_item_name, pdata|
       progressive_id = ids_config["progression"][progressive_item_name]
-      items_by_progressive_id[progressive_id] = []
 
-      progression.each do |item|
-        item_room_name = (item.kind_of? Hash) ? item["room"] : room_name
-        item_item_name = (item.kind_of? Hash) ? item["door"] : item
+      if pdata.include? "doors"
+        door_items_by_progressive_id[progressive_id] = []
+
+        pdata["doors"].each do |item|
+          item_room_name = (item.kind_of? Hash) ? item["room"] : room_name
+          item_item_name = (item.kind_of? Hash) ? item["door"] : item
+
+          door_items_by_progressive_id[progressive_id] << ids_config["doors"][item_room_name][item_item_name]["item"]
+        end
+      end
+
+      if pdata.include? "panel_doors"
+        panel_items_by_progressive_id[progressive_id] = []
 
-        items_by_progressive_id[progressive_id] << ids_config["doors"][item_room_name][item_item_name]["item"]
+        pdata["panel_doors"].each do |item|
+          item_room_name = (item.kind_of? Hash) ? item["room"] : room_name
+          item_item_name = (item.kind_of? Hash) ? item["panel_door"] : item
+
+          panel_items_by_progressive_id[progressive_id] << ids_config["panel_doors"][item_room_name][item_item_name]
+        end
       end
     end
   end
@@ -206,6 +237,26 @@ config.each do |room_name, room_data|
       end
     end
   end
+
+  if room_data.include? "panel_doors"
+    room_data["panel_doors"].each do |panel_door_name, panel_door|
+      item_id = ids_config["panel_doors"][room_name][panel_door_name]
+
+      panel_ids_by_item_id[item_id] = panel_door["panels"].map do |panel_identifier|
+        other_room_name = (panel_identifier.kind_of? String) ? room_name : panel_identifier["room"]
+        other_panel_name = (panel_identifier.kind_of? String) ? panel_identifier : panel_identifier["panel"]
+        
+        config[other_room_name]["panels"][other_panel_name]["id"]
+      end
+
+      mentioned_panels.merge(panel_ids_by_item_id[item_id])
+
+      if panel_door.include? "panel_group"
+        panel_groups[panel_door["panel_group"]] ||= Set[]
+        panel_groups[panel_door["panel_group"]].merge(panel_ids_by_item_id[item_id])
+      end
+    end
+  end
 end
 
 door_groups.each do |group_name, door_ids|
@@ -213,6 +264,11 @@ door_groups.each do |group_name, door_ids|
   door_ids_by_item_id[item_id] = door_ids.to_a
 end
 
+panel_groups.each do |group_name, panel_ids|
+  item_id = ids_config["panel_groups"][group_name]
+  panel_ids_by_item_id[item_id] = panel_ids.to_a
+end
+
 warp_groups.each do |group_name, warp_ids|
   item_id = ids_config["door_groups"][group_name]
   warp_ids_by_item_id[item_id] = warp_ids.to_a
@@ -231,6 +287,12 @@ File.open(outputpath, "w") do |f|
       "\"#{door_id}\""
     end.join(",") + "]"
   end.join(","))
+  f.write "}\nvar panel_ids_by_item_id = {"
+  f.write(panel_ids_by_item_id.map do |item_id, panel_ids|
+    "#{item_id}:[" + panel_ids.map do |panel_id|
+      "\"#{panel_id}\""
+    end.join(",") + "]"
+  end.join(","))
   f.write "}\nvar painting_ids_by_item_id = {"
   f.write(painting_ids_by_item_id.map do |item_id, painting_ids|
     "#{item_id}:[" + painting_ids.map do |painting_id|
@@ -257,6 +319,10 @@ File.open(outputpath, "w") do |f|
   f.write(mentioned_paintings.map do |painting_id|
     "\"#{painting_id}\""
   end.join(","))
+  f.write "]\nvar mentioned_panels = ["
+  f.write(mentioned_panels.map do |panel_id|
+    "\"#{panel_id}\""
+  end.join(","))
   f.write "]\nvar mentioned_warps = ["
   f.write(mentioned_warps.map do |warp_id|
     "\"#{warp_id}\""
@@ -273,8 +339,12 @@ File.open(outputpath, "w") do |f|
   f.write(sunwarps.map do |sunwarp|
     "{\"orientation\":\"#{sunwarp["orientation"]}\",\"entrance_indicator_pos\":#{sunwarp["entrance_indicator_pos"].to_s}}"
   end.join(","))
-  f.write "]\nvar items_by_progressive_id = {"
-  f.write(items_by_progressive_id.map do |item_id, progression_ids|
+  f.write "]\nvar door_items_by_progressive_id = {"
+  f.write(door_items_by_progressive_id.map do |item_id, progression_ids|
+    "#{item_id}:[" + progression_ids.map(&:to_s).join(",") + "]"
+  end.join(","))
+  f.write "}\nvar panel_items_by_progressive_id = {"
+  f.write(panel_items_by_progressive_id.map do |item_id, progression_ids|
     "#{item_id}:[" + progression_ids.map(&:to_s).join(",") + "]"
   end.join(","))
   f.write "}"