2 files changed, 14 insertions, 4 deletions

@@ -150,8 +150,6 @@ def process_entrance(source_room, doors, room_obj):
 def process_panel(room_name, panel_name, panel_data):
     global PANELS_BY_ROOM
 
-    full_name = f"{room_name} - {panel_name}"
-
     # required_room can either be a single room or a list of rooms.
     if "required_room" in panel_data:
         if isinstance(panel_data["required_room"], list):
@@ -229,8 +227,13 @@ def process_panel(room_name, panel_name, panel_data):
     else:
         non_counting = False
 
+    if "location_name" in panel_data:
+        location_name = panel_data["location_name"]
+    else:
+        location_name = None
+
     panel_obj = Panel(required_rooms, required_doors, required_panels, colors, check, event, exclude_reduce,
-                      achievement, non_counting)
+                      achievement, non_counting, location_name)
     PANELS_BY_ROOM[room_name][panel_name] = panel_obj
 
 
@@ -39,11 +39,12 @@ mentioned_doors = Set[]
 mentioned_panels = Set[]
 mentioned_sunwarp_entrances = Set[]
 mentioned_sunwarp_exits = Set[]
+mentioned_paintings = Set[]
 
 door_groups = {}
 
 directives = Set["entrances", "panels", "doors", "paintings", "sunwarps", "progression"]
-panel_directives = Set["id", "required_room", "required_door", "required_panel", "colors", "check", "exclude_reduce", "tag", "link", "subtag", "achievement", "copy_to_sign", "non_counting", "hunt"]
+panel_directives = Set["id", "required_room", "required_door", "required_panel", "colors", "check", "exclude_reduce", "tag", "link", "subtag", "achievement", "copy_to_sign", "non_counting", "hunt", "location_name"]
 door_directives = Set["id", "painting_id", "panels", "item_name", "item_group", "location_name", "skip_location", "skip_item", "door_group", "include_reduce", "event", "warp_id"]
 painting_directives = Set["id", "enter_only", "exit_only", "orientation", "required_door", "required", "required_when_no_doors", "move", "req_blocked", "req_blocked_when_no_doors"]
 
@@ -257,6 +258,12 @@ config.each do |room_name, room|
       unless paintings.include? painting["id"] then
         puts "#{room_name} :::: Invalid Painting ID #{painting["id"]}"
       end
+
+      if mentioned_paintings.include?(painting["id"]) then
+        puts "Painting #{painting["id"]} is mentioned more than once"
+      else
+        mentioned_paintings.add(painting["id"])
+      end
     else
       puts "#{room_name} :::: Painting is missing an ID"
     end