1 files changed, 3 insertions, 30 deletions
diff --git a/Archipelago/client.gd b/Archipelago/client.gd
index 0944352..e5e930f 100644
--- a/Archipelago/client.gd
+++ b/Archipelago/client.gd

@@ -36,38 +36,11 @@ const door_progressive_items = {
        ["1 Sunwarp", "2 Sunwarp", "3 Sunwarp", "4 Sunwarp", "5 Sunwarp", "6 Sunwarp"]
 }
 const panel_progressive_items = {
-        "Progressive Hallway Room":
+        "Progressive Hallway Room": ["First Door", "Second Door", "Third Door", "Fourth Door"],
-        [
-                {"item": "Hallway Room - First Room Panels", "display": "First Door"},
-                {"item": "Hallway Room - Second Room Panels", "display": "Second Door"},
-                {"item": "Hallway Room - Third Room Panels", "display": "Third Door"},
-                {"item": "Hallway Room - WHEEL", "display": "Fourth Door"},
-        ],
        "Progressive Colorful":
-        [
+        ["White", "Black", "Red", "Yellow", "Blue", "Purple", "Orange", "Green", "Brown", "Gray"],
-                {"item": "The Colorful - BEGIN (Panel)", "display": "White"},
-                {"item": "The Colorful - FOUND (Panel)", "display": "Black"},
-                {"item": "The Colorful - LOAF (Panel)", "display": "Red"},
-                {"item": "The Colorful - CREAM (Panel)", "display": "Yellow"},
-                {"item": "The Colorful - SUN (Panel)", "display": "Blue"},
-                {"item": "The Colorful - SPOON (Panel)", "display": "Purple"},
-                {"item": "The Colorful - LETTERS (Panel)", "display": "Orange"},
-                {"item": "The Colorful - WALLS (Panel)", "display": "Green"},
-                {"item": "The Colorful - IRON (Panel)", "display": "Brown"},
-                {"item": "The Colorful - OBSTACLE (Panel)", "display": "Gray"},
-        ],
        "Progressive Number Hunt":
-        [
+        ["Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Zero"]
-                {"item": "Two Panels", "display": "Two"},
-                {"item": "Three Panels", "display": "Three"},
-                {"item": "Four Panels", "display": "Four"},
-                {"item": "Five Panels", "display": "Five"},
-                {"item": "Six Panels", "display": "Six"},
-                {"item": "Seven Panels", "display": "Seven"},
-                {"item": "Eight Panels", "display": "Eight"},
-                {"item": "Nine Panels", "display": "Nine"},
-                {"item": "Outside The Undeterred - ZERO (Panel)", "display": "Zero"},
-        ]
 }
 const kTHE_END = 0

diff --git a/Archipelago/client.gd b/Archipelago/client.gd index 0944352..e5e930f 100644 --- a/Archipelago/client.gd +++ b/Archipelago/client.gd
@@ -36,38 +36,11 @@ const door_progressive_items = {
36	["1 Sunwarp", "2 Sunwarp", "3 Sunwarp", "4 Sunwarp", "5 Sunwarp", "6 Sunwarp"]	36	["1 Sunwarp", "2 Sunwarp", "3 Sunwarp", "4 Sunwarp", "5 Sunwarp", "6 Sunwarp"]
37	}	37	}
38	const panel_progressive_items = {	38	const panel_progressive_items = {
39	"Progressive Hallway Room":	39	"Progressive Hallway Room": ["First Door", "Second Door", "Third Door", "Fourth Door"],
40	[
41	{"item": "Hallway Room - First Room Panels", "display": "First Door"},
42	{"item": "Hallway Room - Second Room Panels", "display": "Second Door"},
43	{"item": "Hallway Room - Third Room Panels", "display": "Third Door"},
44	{"item": "Hallway Room - WHEEL", "display": "Fourth Door"},
45	],
46	"Progressive Colorful":	40	"Progressive Colorful":
47	[	41	["White", "Black", "Red", "Yellow", "Blue", "Purple", "Orange", "Green", "Brown", "Gray"],
48	{"item": "The Colorful - BEGIN (Panel)", "display": "White"},
49	{"item": "The Colorful - FOUND (Panel)", "display": "Black"},
50	{"item": "The Colorful - LOAF (Panel)", "display": "Red"},
51	{"item": "The Colorful - CREAM (Panel)", "display": "Yellow"},
52	{"item": "The Colorful - SUN (Panel)", "display": "Blue"},
53	{"item": "The Colorful - SPOON (Panel)", "display": "Purple"},
54	{"item": "The Colorful - LETTERS (Panel)", "display": "Orange"},
55	{"item": "The Colorful - WALLS (Panel)", "display": "Green"},
56	{"item": "The Colorful - IRON (Panel)", "display": "Brown"},
57	{"item": "The Colorful - OBSTACLE (Panel)", "display": "Gray"},
58	],
59	"Progressive Number Hunt":	42	"Progressive Number Hunt":
60	[	43	["Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Zero"]
61	{"item": "Two Panels", "display": "Two"},
62	{"item": "Three Panels", "display": "Three"},
63	{"item": "Four Panels", "display": "Four"},
64	{"item": "Five Panels", "display": "Five"},
65	{"item": "Six Panels", "display": "Six"},
66	{"item": "Seven Panels", "display": "Seven"},
67	{"item": "Eight Panels", "display": "Eight"},
68	{"item": "Nine Panels", "display": "Nine"},
69	{"item": "Outside The Undeterred - ZERO (Panel)", "display": "Zero"},
70	]
71	}	44	}
72		45
73	const kTHE_END = 0	46	const kTHE_END = 0