17 files changed, 45 insertions, 40 deletions
diff --git a/data/maps/the_colorful/doors.txtpb b/data/maps/the_colorful/doors.txtpb
index 32470b2..3ce5f71 100644
--- a/data/maps/the_colorful/doors.txtpb
+++ b/data/maps/the_colorful/doors.txtpb

@@ -1,4 +1,3 @@
-# TODO: gallery painting
 doors {
  name: "White Door"
  type: STANDARD
@@ -46,13 +45,14 @@ doors {
  type: STANDARD
  receivers: "Components/Doors/entry_7"
  panels { room: "Yellow Room" name: "CIRCLE" }
-  panels { room: "Purple Room" name: "FISH" }
+  panels { room: "Purple Room" name: "FISH" answer: "fish" }
  location_room: "Purple Room"
 }
 doors {
  name: "Purple Side Entrance"
  type: STANDARD
  receivers: "Components/Doors/entry_7b3"
+  receivers: "Components/Doors/entry_7b4"
  panels { room: "Cyan Hallway" name: "KOI" }
  panels { room: "Cyan Hallway" name: "WISH" }
  location_room: "Cyan Hallway"
@@ -103,3 +103,10 @@ doors {
  panels { room: "Gray Room" name: "MEND" }
  location_room: "Gray Room"
 }
+doors {
+  name: "Chaos Panel"
+  type: LOCATION_ONLY
+  panels { room: "Cyan Hallway" name: "CHAOS" }
+  location_room: "Cyan Hallway"
+  location_name: "CHAOS"
+}
diff --git a/data/maps/the_colorful/metadata.txtpb b/data/maps/the_colorful/metadata.txtpb
new file mode 100644
index 0000000..5e67428
--- /dev/null
+++ b/data/maps/the_colorful/metadata.txtpb

@@ -0,0 +1,3 @@
+display_name: "The Colorful"
+# This has something to do with the FISH/FISHES proxy.
+excluded_nodes: "Components/panel_fake"
diff --git a/data/maps/the_colorful/rooms/Black Room.txtpb b/data/maps/the_colorful/rooms/Black Room.txtpb
index fc8039b..21a0d41 100644
--- a/data/maps/the_colorful/rooms/Black Room.txtpb
+++ b/data/maps/the_colorful/rooms/Black Room.txtpb

@@ -1,9 +1,8 @@
 name: "Black Room"
-display_name: "Black Room"
 panels {
  name: "STARK"
  path: "Panels/Hallway/panel_2"
  clue: "stark"
  answer: "dark"
-  symbols: "zero"
+  symbols: ZERO
 }
diff --git a/data/maps/the_colorful/rooms/Blue Room.txtpb b/data/maps/the_colorful/rooms/Blue Room.txtpb
index e6d2efa..ec9337d 100644
--- a/data/maps/the_colorful/rooms/Blue Room.txtpb
+++ b/data/maps/the_colorful/rooms/Blue Room.txtpb

@@ -1,9 +1,8 @@
 name: "Blue Room"
-display_name: "Blue Room"
 panels {
  name: "VINE"
  path: "Panels/Hallway/panel_4"
  clue: "vine"
  answer: "wine"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
diff --git a/data/maps/the_colorful/rooms/Brown Room.txtpb b/data/maps/the_colorful/rooms/Brown Room.txtpb
index a62821d..a5f590b 100644
--- a/data/maps/the_colorful/rooms/Brown Room.txtpb
+++ b/data/maps/the_colorful/rooms/Brown Room.txtpb

@@ -1,9 +1,8 @@
 name: "Brown Room"
-display_name: "Brown Room"
 panels {
  name: "FIRE"
  path: "Panels/Hallway/panel_9"
  clue: "fire"
  answer: "ash"
-  symbols: "age"
+  symbols: AGE
 }
diff --git a/data/maps/the_colorful/rooms/Cyan Hallway.txtpb b/data/maps/the_colorful/rooms/Cyan Hallway.txtpb
index 78bfdc6..d94a0a6 100644
--- a/data/maps/the_colorful/rooms/Cyan Hallway.txtpb
+++ b/data/maps/the_colorful/rooms/Cyan Hallway.txtpb

@@ -1,34 +1,37 @@
 name: "Cyan Hallway"
-display_name: "Cyan Hallway"
 panels {
  name: "KOI"
  path: "Panels/Extra/panel_12"
  clue: "koi"
  answer: "koi"
-  symbols: "planet"
+  symbols: PLANET
 }
 panels {
  name: "WISH"
  path: "Panels/Extra/panel_13"
  clue: "wish"
  answer: "wishes"
-  symbols: "planet"
+  symbols: PLANET
 }
 panels {
  name: "CHAOS"
  path: "Panels/Extra/panel_14"
  clue: "chaos"
  answer: "order"
-  symbols: "sun"
+  symbols: SUN
  required_room { name: "P2 Room" }
 }
 ports {
  name: "STURDY"
+  display_name: "North Cyan Worldport"
  path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: -17 y: 0 z: -75 }
+  rotation: 270
 }
 ports {
  name: "DARKROOM"
+  display_name: "South Cyan Worldport"
  path: "Components/Warps/worldport2"
-  orientation: "west"
+  destination { x: -17 y: 0 z: -51 }
+  rotation: 270
 }
diff --git a/data/maps/the_colorful/rooms/Cyan Room.txtpb b/data/maps/the_colorful/rooms/Cyan Room.txtpb
index 259fba1..3568ec1 100644
--- a/data/maps/the_colorful/rooms/Cyan Room.txtpb
+++ b/data/maps/the_colorful/rooms/Cyan Room.txtpb

@@ -1,30 +1,29 @@
 name: "Cyan Room"
-display_name: "Cyan Room"
 panels {
  name: "BROTHER"
  path: "Panels/Cyan/panel_cyan_1"
  clue: "brother"
  answer: "sister"
-  symbols: "gender"
+  symbols: GENDER
 }
 panels {
  name: "MISTER"
  path: "Panels/Cyan/panel_cyan_2"
  clue: "mister"
  answer: "sister"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
  name: "LOST"
  path: "Panels/Cyan/panel_cyan_3"
  clue: "lost"
  answer: "missing"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
  name: "SING"
  path: "Panels/Cyan/panel_cyan_4"
  clue: "sing"
  answer: "missing"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
diff --git a/data/maps/the_colorful/rooms/Ending.txtpb b/data/maps/the_colorful/rooms/Ending.txtpb
index 8e38d4f..3aa2b3c 100644
--- a/data/maps/the_colorful/rooms/Ending.txtpb
+++ b/data/maps/the_colorful/rooms/Ending.txtpb

@@ -1,3 +1,5 @@
 name: "Ending"
-display_name: "Ending"
+endings {
-# TODO: Gray Ending
+  name: "GRAY"
+  path: "Components/Endings/gray_ending"
+}
diff --git a/data/maps/the_colorful/rooms/Gray Room.txtpb b/data/maps/the_colorful/rooms/Gray Room.txtpb
index 3dd2219..6ae6c9c 100644
--- a/data/maps/the_colorful/rooms/Gray Room.txtpb
+++ b/data/maps/the_colorful/rooms/Gray Room.txtpb

@@ -1,9 +1,8 @@
 name: "Gray Room"
-display_name: "Gray Room"
 panels {
  name: "MEND"
  path: "Panels/Hallway/panel_11"
  clue: "mend"
  answer: "end"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
diff --git a/data/maps/the_colorful/rooms/Green Room.txtpb b/data/maps/the_colorful/rooms/Green Room.txtpb
index 8fc1088..e438176 100644
--- a/data/maps/the_colorful/rooms/Green Room.txtpb
+++ b/data/maps/the_colorful/rooms/Green Room.txtpb

@@ -1,9 +1,8 @@
 name: "Green Room"
-display_name: "Green Room"
 panels {
  name: "MOTHER"
  path: "Panels/Hallway/panel_5"
  clue: "mother"
  answer: "father"
-  symbols: "gender"
+  symbols: GENDER
 }
diff --git a/data/maps/the_colorful/rooms/Orange Room.txtpb b/data/maps/the_colorful/rooms/Orange Room.txtpb
index 38798f5..6728080 100644
--- a/data/maps/the_colorful/rooms/Orange Room.txtpb
+++ b/data/maps/the_colorful/rooms/Orange Room.txtpb

@@ -1,9 +1,8 @@
 name: "Orange Room"
-display_name: "Orange Room"
 panels {
  name: "CLOUD"
  path: "Panels/Hallway/panel_8"
  clue: "cloud"
  answer: "storm"
-  symbols: "cross"
+  symbols: CROSS
 }
diff --git a/data/maps/the_colorful/rooms/P2 Room.txtpb b/data/maps/the_colorful/rooms/P2 Room.txtpb
index 8c7e0f1..054d4b4 100644
--- a/data/maps/the_colorful/rooms/P2 Room.txtpb
+++ b/data/maps/the_colorful/rooms/P2 Room.txtpb

@@ -1,7 +1,6 @@
 name: "P2 Room"
-display_name: "Cyan Room"
 letters {
  key: "p"
-  double: true
+  level2: true
  path: "Components/Collectables/p2"
 }
diff --git a/data/maps/the_colorful/rooms/Purple Room.txtpb b/data/maps/the_colorful/rooms/Purple Room.txtpb
index 978e761..71b6ad6 100644
--- a/data/maps/the_colorful/rooms/Purple Room.txtpb
+++ b/data/maps/the_colorful/rooms/Purple Room.txtpb

@@ -1,10 +1,10 @@
 name: "Purple Room"
-display_name: "Purple Room"
 panels {
  name: "FISH"
  path: "Panels/Hallway/panel_7"
  clue: "fish"
  answer: "fish"
-  symbols: "planet"
+  symbols: PLANET
+  proxies { answer: "fish" path: "Panels/Hallway/panel_7a" }
  proxies { answer: "fishes" path: "Panels/Hallway/panel_7b" }
 }
diff --git a/data/maps/the_colorful/rooms/Red Room.txtpb b/data/maps/the_colorful/rooms/Red Room.txtpb
index f04ccb6..53bbd3a 100644
--- a/data/maps/the_colorful/rooms/Red Room.txtpb
+++ b/data/maps/the_colorful/rooms/Red Room.txtpb

@@ -1,9 +1,8 @@
 name: "Red Room"
-display_name: "Red Room"
 panels {
  name: "SANDWICH"
  path: "Panels/Hallway/panel_3"
  clue: "sandwich"
  answer: "bread"
-  symbols: "boxes"
+  symbols: BOXES
 }
diff --git a/data/maps/the_colorful/rooms/White Room.txtpb b/data/maps/the_colorful/rooms/White Room.txtpb
index 6a4a73e..73557ed 100644
--- a/data/maps/the_colorful/rooms/White Room.txtpb
+++ b/data/maps/the_colorful/rooms/White Room.txtpb

@@ -1,14 +1,15 @@
 name: "White Room"
-display_name: "White Room"
 panels {
  name: "BRIGHT"
  path: "Panels/Hallway/panel_1"
  clue: "bright"
  answer: "light"
-  symbols: "sun"
+  symbols: SUN
 }
 ports {
  name: "GREAT"
+  display_name: "Main Entrance"
  path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3.5 y: 0 z: 19 }
+  rotation: 270
 }
diff --git a/data/maps/the_colorful/rooms/Window Room.txtpb b/data/maps/the_colorful/rooms/Window Room.txtpb
index e7b64c7..e11d88c 100644
--- a/data/maps/the_colorful/rooms/Window Room.txtpb
+++ b/data/maps/the_colorful/rooms/Window Room.txtpb

@@ -1,9 +1,8 @@
 name: "Window Room"
-display_name: "Window Room"
 panels {
  name: "FADING"
  path: "Panels/Hallway/panel_10"
  clue: "fading"
  answer: "gone"
-  symbols: "pyramid"
+  symbols: PYRAMID
 }
diff --git a/data/maps/the_colorful/rooms/Yellow Room.txtpb b/data/maps/the_colorful/rooms/Yellow Room.txtpb
index f1857e9..40a4b14 100644
--- a/data/maps/the_colorful/rooms/Yellow Room.txtpb
+++ b/data/maps/the_colorful/rooms/Yellow Room.txtpb

@@ -1,9 +1,8 @@
 name: "Yellow Room"
-display_name: "Yellow Room"
 panels {
  name: "CIRCLE"
  path: "Panels/Hallway/panel_6"
  clue: "circle"
  answer: "shape"
-  symbols: "example"
+  symbols: EXAMPLE
 }