1 files changed, 6 insertions, 8 deletions

@@ -722,16 +722,21 @@ func processItem(item, index, from, flags):
         var is_progressive_door = int(item) in gamedata.door_items_by_progressive_id
         var is_progressive_panel = int(item) in gamedata.panel_items_by_progressive_id
         var progitems = null
+        var prognames = null
 
         if is_progressive_door and is_progressive_panel:
                 if _door_shuffle:
                         progitems = gamedata.door_items_by_progressive_id[int(item)]
+                        prognames = door_progressive_items
                 else:
                         progitems = gamedata.panel_items_by_progressive_id[int(item)]
+                        prognames = panel_progressive_items
         elif is_progressive_door:
                 progitems = gamedata.door_items_by_progressive_id[int(item)]
+                prognames = door_progressive_items
         elif is_progressive_panel:
                 progitems = gamedata.panel_items_by_progressive_id[int(item)]
+                prognames = panel_progressive_items
 
         if progitems != null:
                 if not int(item) in _progressive_progress:
@@ -741,6 +746,7 @@ func processItem(item, index, from, flags):
                         var subitem_id = progitems[_progressive_progress[int(item)]]
                         global._print("Subitem: %d" % subitem_id)
                         processItem(subitem_id, null, null, null)
+                        item_name += " (%s)" % prognames[item_name][_progressive_progress[int(item)]]
                         _progressive_progress[int(item)] += 1
 
         if _color_shuffle and color_items.has(_item_id_to_name[item]):
@@ -754,14 +760,6 @@ func processItem(item, index, from, flags):
                 _last_new_item = index
                 saveLocaldata()
 
-                if _door_shuffle and item_name in door_progressive_items:
-                        var subitem = door_progressive_items[item_name][_progressive_progress[int(item)] - 1]
-                        item_name += " (%s)" % subitem["display"]
-
-                if _panel_door_shuffle and item_name in panel_progressive_items:
-                        var subitem = panel_progressive_items[item_name][_progressive_progress[int(item)] - 1]
-                        item_name += " (%s)" % subitem["display"]
-
                 var player_name = "Unknown"
                 if _player_name_by_slot.has(from):
                         player_name = _player_name_by_slot[from]