28 files changed, 561 insertions, 26 deletions

@@ -2522,3 +2522,85 @@ connections {
   }
   oneway: true
 }
+connections {
+  from {
+    panel {
+      map: "the_entry"
+      room: "Starting Room"
+      name: "Gift Maps"
+      answer: "souvey"
+    }
+  }
+  to {
+    room {
+      map: "the_charismatic"
+      name: "Main Area"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    port {
+      map: "the_charismatic"
+      room: "Main Area"
+      name: "WORLDPORT"
+    }
+  }
+  to {
+    room {
+      map: "the_entry"
+      name: "Starting Room"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    panel {
+      map: "the_entry"
+      room: "Starting Room"
+      name: "Gift Maps"
+      answer: "q"
+    }
+  }
+  to {
+    room {
+      map: "the_crystalline"
+      name: "Main Area"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    port {
+      map: "the_crystalline"
+      room: "Main Area"
+      name: "WORLDPORT"
+    }
+  }
+  to {
+    room {
+      map: "the_entry"
+      name: "Starting Room"
+    }
+  }
+  oneway: true
+}
+connections {
+  # Possibly the most cursed connection in the entire game.
+  from {
+    room {
+      map: "the_crystalline"
+      name: "Flip Area"
+    }
+  }
+  to {
+    room {
+      map: "icarus"
+      name: "Welcome Spine (Obverse)"
+    }
+  }
+  oneway: true
+}
@@ -1229,6 +1229,9 @@ maps:
         panels:
           DIAGNOSIS: 2882
           QUEEN: 2883
+      Mastery:
+        masteries:
+          MASTERY: 2994
       Maze:
         panels:
           ANALYSIS: 2887
@@ -1288,11 +1291,13 @@ maps:
           PRINCE: 2921
       Trans Rights:
         panels:
+          SERVANT (1): 2926
+          SERVANT (2): 2927
+      Trans Rights Panels:
+        panels:
           AGENDER: 2923
           HUMAN (3): 2924
           HUMAN (4): 2925
-          SERVANT (1): 2926
-          SERVANT (2): 2927
       Welcome Spine (Obverse):
         panels:
           FISHWIFE: 2928
@@ -1540,6 +1545,41 @@ maps:
       Mastery:
         masteries:
           MASTERY: 140
+  the_charismatic:
+    rooms:
+      Latitude Middle:
+        panels:
+          FUNNY: 2972
+      Latitude North:
+        panels:
+          DEPENDABLE: 2973
+      Latitude South:
+        panels:
+          CHARISMA: 2974
+      Longitude East:
+        panels:
+          FUN: 2975
+      Longitude Middle:
+        panels:
+          INTELLIGENT: 2976
+      Longitude West:
+        panels:
+          CREATIVE: 2977
+      Main Area:
+        panels:
+          AQUA: 2981
+          ARC: 2978
+          Blank: 2987
+          HERE: 2984
+          IT: 2985
+          KING: 2979
+          NAIL: 2983
+          PINS: 2986
+          TILE: 2982
+          TIP: 2980
+      Mastery:
+        masteries:
+          MASTERY: 2988
   the_colorful:
     rooms:
       Black Room:
@@ -1656,6 +1696,19 @@ maps:
       Obverse Magenta Door: 173
       Obverse Yellow Door: 178
       Obverse Yellow Puzzles: 179
+  the_crystalline:
+    rooms:
+      Flip Area:
+        panels:
+          SUCCEED: 2989
+      Main Area:
+        panels:
+          DROP: 2991
+          LEAP: 2990
+          SPIN: 2992
+      Mastery:
+        masteries:
+          MASTERY: 2993
   the_darkroom:
     rooms:
       First Room:
@@ -607,6 +607,21 @@ connections {
   }
   oneway: true
 }
+connections {
+  from_room: "Trans Rights"
+  to_room: "Trans Rights Panels"
+  oneway: true
+}
+connections {
+  from_room: "Above Trans Rights"
+  to_room: "Trans Rights Panels"
+  oneway: true
+}
+connections {
+  from_room: "Welcome Spine (Obverse)"
+  to_room: "Mastery"
+  door { name: "Mastery" }
+}
 # It is possible to fall out of the map from every room, which always sends you
 # back to the beginning.
 connections {
@@ -2,14 +2,14 @@ doors {
   name: "Agender Door"
   type: STANDARD
   receivers: "Components/Doors/quicktravel3"
-  panels { room: "Trans Rights" name: "AGENDER" }
-  location_room: "Trans Rights"
+  panels { room: "Trans Rights Panels" name: "AGENDER" }
+  location_room: "Trans Rights Panels"
 }
 doors {
   name: "Quick Travel 3"
   type: ITEM_ONLY
   receivers: "Components/Paintings/QuickTravel/go3"
-  panels { room: "Trans Rights" name: "AGENDER" }
+  panels { room: "Trans Rights Panels" name: "AGENDER" }
 }
 doors {
   name: "Pea Door"
@@ -224,3 +224,63 @@ doors {
   panels { room: "Spiral Ramp" name: "FIREMAN" }
   location_room: "Spiral Ramp"
 }
+doors {
+  name: "Mastery"
+  type: EVENT
+  panels { room: "Above Trans Rights" name: "ANT" }
+  panels { room: "Big U" name: "DECK" }
+  panels { room: "Big U" name: "COLONY" }
+  panels { room: "Big U" name: "MANOR" }
+  panels { room: "Fatherland" name: "FATHERLAND" }
+  panels { room: "Highest Point" name: "DIAGNOSIS" }
+  panels { room: "Highest Point" name: "QUEEN" }
+  panels { room: "Maze Back" name: "THESE" }
+  panels { room: "Maze King Panel" name: "KING (2)" }
+  panels { room: "Maze" name: "KING (1)" }
+  panels { room: "Maze" name: "ANALYSIS" }
+  panels { room: "Maze" name: "MANSLAUGHTER" }
+  panels { room: "Maze" name: "MEDIUMS" }
+  panels { room: "Maze" name: "BOOKS" }
+  panels { room: "Mini Icarus 2" name: "BATTERY" }
+  panels { room: "Mini Icarus 2" name: "TROUPE" }
+  panels { room: "Mini Icarus 2" name: "ANIMALS" }
+  panels { room: "Mini Icarus 2" name: "ARROWS" }
+  panels { room: "Mini Icarus 2" name: "SQUAD" }
+  panels { room: "Pillar Ramp" name: "ASTEROID" }
+  panels { room: "Pillar Ramp" name: "BUNCH" }
+  panels { room: "Pillar Ramp" name: "PRINCES" }
+  panels { room: "Pillar Ramp" name: "PATRICIDE" }
+  panels { room: "Pillar Ramp" name: "DRONE" }
+  panels { room: "Pillar Ramp" name: "PEA (1)" }
+  panels { room: "Spiral Ramp" name: "FIREMAN" }
+  panels { room: "The Orb" name: "ADDERS" }
+  panels { room: "The Orb" name: "PUPPY" }
+  panels { room: "The Orb" name: "NEEDLE" }
+  panels { room: "The Orb" name: "US" }
+  panels { room: "The Orb" name: "FISH" }
+  panels { room: "The Orb" name: "DEADLINE" }
+  panels { room: "The Orb" name: "PEA (2)" }
+  panels { room: "The Orb" name: "THESIS" }
+  panels { room: "The Orb" name: "CLUTCH (1)" }
+  panels { room: "The Orb" name: "BASIS (2)" }
+  panels { room: "The Orb" name: "AXIS" }
+  panels { room: "The Orb" name: "STRAIGHT" }
+  panels { room: "The Orb" name: "HISS" }
+  panels { room: "The Orb" name: "DISCUS" }
+  panels { room: "The Orb" name: "SON" }
+  panels { room: "The Orb" name: "CLUTCH (2)" }
+  panels { room: "Through Woman (Obverse)" name: "HUMAN (2)" }
+  panels { room: "Through Woman (Obverse)" name: "COW" }
+  panels { room: "Through Woman (Reverse)" name: "PRINCE" }
+  panels { room: "Through Woman (Reverse)" name: "BASIS (1)" }
+  panels { room: "Trans Rights" name: "SERVANT (1)" }
+  panels { room: "Trans Rights" name: "SERVANT (2)" }
+  panels { room: "Trans Rights Panels" name: "AGENDER" }
+  panels { room: "Trans Rights Panels" name: "HUMAN (3)" }
+  panels { room: "Trans Rights Panels" name: "HUMAN (4)" }
+  panels { room: "Welcome Spine (Obverse)" name: "FISHWIFE" }
+  panels { room: "Welcome Spine (Obverse)" name: "HUMAN (1)" }
+  panels { room: "Welcome Spine (Reverse)" name: "FATHER" }
+  panels { room: "Welcome Spine (Reverse)" name: "TERMITE" }
+  panels { room: "Welcome Spine (Reverse)" name: "SISTER" }
+}
@@ -1,2 +1,4 @@
 display_name: "Icarus"
 type: ICARUS
+# The map's mastery is created at runtime.
+custom_nodes: "Components/Collectables/collectable"
@@ -0,0 +1,5 @@
+name: "Mastery"
+masteries {
+  name: "MASTERY"
+  path: "Components/Collectables/collectable"
+}
@@ -0,0 +1,22 @@
+name: "Trans Rights Panels"
+panels {
+  name: "AGENDER"
+  path: "Panels/Room_1/human4"
+  clue: "agender"
+  answer: "human"
+  symbols: GENDER
+}
+panels {
+  name: "HUMAN (3)"
+  path: "Panels/Room_1/human5"
+  clue: "human"
+  answer: "female"
+  symbols: GENDER
+}
+panels {
+  name: "HUMAN (4)"
+  path: "Panels/Room_1/human6"
+  clue: "human"
+  answer: "male"
+  symbols: GENDER
+}
@@ -1,27 +1,6 @@
 name: "Trans Rights"
 # slay
 panels {
-  name: "AGENDER"
-  path: "Panels/Room_1/human4"
-  clue: "agender"
-  answer: "human"
-  symbols: GENDER
-}
-panels {
-  name: "HUMAN (3)"
-  path: "Panels/Room_1/human5"
-  clue: "human"
-  answer: "female"
-  symbols: GENDER
-}
-panels {
-  name: "HUMAN (4)"
-  path: "Panels/Room_1/human6"
-  clue: "human"
-  answer: "male"
-  symbols: GENDER
-}
-panels {
   name: "SERVANT (1)"
   path: "Panels/Room_1/servant"
   clue: "servant"
@@ -0,0 +1,35 @@
+connections {
+  from_room: "Main Area"
+  to_room: "Latitude South"
+  door { name: "Latitude South Door" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Latitude Middle"
+  door { name: "Latitude Middle Door" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Latitude North"
+  door { name: "Latitude North Door" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Longitude West"
+  door { name: "Longitude West Door" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Longitude Middle"
+  door { name: "Longitude Middle Door" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Longitude East"
+  door { name: "Longitude East Door" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Mastery"
+  door { name: "Mastery Door" }
+}
@@ -0,0 +1,56 @@
+doors {
+  name: "Latitude South Door"
+  type: EVENT
+  panels { room: "Main Area" name: "TIP" }
+  panels { room: "Main Area" name: "KING" }
+  panels { room: "Main Area" name: "ARC" }
+}
+doors {
+  name: "Latitude Middle Door"
+  type: EVENT
+  panels { room: "Main Area" name: "NAIL" }
+  panels { room: "Main Area" name: "TILE" }
+  panels { room: "Main Area" name: "AQUA" }
+}
+doors {
+  name: "Latitude North Door"
+  type: EVENT
+  panels { room: "Main Area" name: "PINS" }
+  panels { room: "Main Area" name: "IT" }
+  panels { room: "Main Area" name: "HERE" }
+}
+doors {
+  name: "Longitude West Door"
+  type: EVENT
+  panels { room: "Main Area" name: "ARC" }
+  panels { room: "Main Area" name: "AQUA" }
+  panels { room: "Main Area" name: "HERE" }
+}
+doors {
+  name: "Longitude Middle Door"
+  type: EVENT
+  panels { room: "Main Area" name: "KING" }
+  panels { room: "Main Area" name: "TILE" }
+  panels { room: "Main Area" name: "IT" }
+}
+doors {
+  name: "Longitude East Door"
+  type: EVENT
+  panels { room: "Main Area" name: "TIP" }
+  panels { room: "Main Area" name: "NAIL" }
+  panels { room: "Main Area" name: "PINS" }
+}
+doors {
+  name: "Mastery Door"
+  type: EVENT
+  panels { room: "Main Area" name: "HERE" }
+  panels { room: "Main Area" name: "TILE" }
+  panels { room: "Main Area" name: "TIP" }
+  panels { room: "Main Area" name: "Blank" }
+  panels { room: "Latitude South" name: "CHARISMA" }
+  panels { room: "Latitude Middle" name: "FUNNY" }
+  panels { room: "Latitude North" name: "DEPENDABLE" }
+  panels { room: "Longitude West" name: "CREATIVE" }
+  panels { room: "Longitude Middle" name: "INTELLIGENT" }
+  panels { room: "Longitude East" name: "FUN" }
+}
@@ -0,0 +1,4 @@
+display_name: "The Charismatic"
+type: GIFT_MAP
+# The map's mastery is created at runtime.
+custom_nodes: "Components/Collectables/collectable"
@@ -0,0 +1,8 @@
+name: "Latitude Middle"
+panels {
+  name: "FUNNY"
+  path: "Panels/Room 2/panel_h"
+  clue: "funny"
+  answer: "hilarious"
+  symbols: PYRAMID
+}
@@ -0,0 +1,8 @@
+name: "Latitude North"
+panels {
+  name: "DEPENDABLE"
+  path: "Panels/Room 2/panel_r"
+  clue: "dependable"
+  answer: "reliable"
+  symbols: SUN
+}
@@ -0,0 +1,8 @@
+name: "Latitude South"
+panels {
+  name: "CHARISMA"
+  path: "Panels/Room 2/panel_c"
+  clue: "charisma"
+  answer: "charismatic"
+  symbols: QUESTION
+}
@@ -0,0 +1,8 @@
+name: "Longitude East"
+panels {
+  name: "FUN"
+  path: "Panels/Room 2/panel_s2"
+  clue: "fun"
+  answer: "silly"
+  symbols: SUN
+}
@@ -0,0 +1,8 @@
+name: "Longitude Middle"
+panels {
+  name: "INTELLIGENT"
+  path: "Panels/Room 2/panel_s"
+  clue: "intelligent"
+  answer: "smart"
+  symbols: SUN
+}
@@ -0,0 +1,8 @@
+name: "Longitude West"
+panels {
+  name: "CREATIVE"
+  path: "Panels/Room 2/panel_i"
+  clue: "creative"
+  answer: "imaginative"
+  symbols: SUN
+}
@@ -0,0 +1,78 @@
+name: "Main Area"
+panels {
+  name: "ARC"
+  path: "Panels/Room_1/panel_1"
+  clue: "arc"
+  answer: "arctic"
+  symbols: QUESTION
+}
+panels {
+  name: "KING"
+  path: "Panels/Room_1/panel_2"
+  clue: "king"
+  answer: "tacking"
+  symbols: QUESTION
+}
+panels {
+  name: "TIP"
+  path: "Panels/Room_1/panel_3"
+  clue: "tip"
+  answer: "tiptoe"
+  symbols: QUESTION
+}
+panels {
+  name: "AQUA"
+  path: "Panels/Room_1/panel_4"
+  clue: "aqua"
+  answer: "aquatic"
+  symbols: QUESTION
+}
+panels {
+  name: "TILE"
+  path: "Panels/Room_1/panel_5"
+  clue: "tile"
+  answer: "tactile"
+  symbols: QUESTION
+}
+panels {
+  name: "NAIL"
+  path: "Panels/Room_1/panel_6"
+  clue: "nail"
+  answer: "toenail"
+  symbols: QUESTION
+}
+panels {
+  name: "HERE"
+  path: "Panels/Room_1/panel_7"
+  clue: "here"
+  answer: "heretic"
+  symbols: QUESTION
+}
+panels {
+  name: "IT"
+  path: "Panels/Room_1/panel_8"
+  clue: "it"
+  answer: "tacit"
+  symbols: QUESTION
+}
+panels {
+  name: "PINS"
+  path: "Panels/Room_1/panel_9"
+  clue: "pins"
+  answer: "pintoes"
+  symbols: QUESTION
+}
+panels {
+  name: "Blank"
+  path: "Panels/Room 3/panel_10"
+  clue: ""
+  answer: "tactic"
+  symbols: QUESTION
+}
+ports {
+  name: "WORLDPORT"
+  display_name: "Entrance"
+  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 9.5 }
+  rotation: 0
+}
@@ -0,0 +1,5 @@
+name: "Mastery"
+masteries {
+  name: "MASTERY"
+  path: "Components/Collectables/collectable"
+}
@@ -0,0 +1,25 @@
+connections {
+  from_room: "Main Area"
+  to_room: "Painting Divot"
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Painting Divot"
+      name: "SNAKE"
+    }
+  }
+  to {
+    painting {
+      room: "Flip Area"
+      name: "SNAKE2"
+    }
+  }
+  oneway: true
+}
+connections {
+  from_room: "Flip Area"
+  to_room: "Mastery"
+  door { name: "Mastery" }
+}
@@ -0,0 +1,5 @@
+doors {
+  name: "Mastery"
+  type: EVENT
+  panels { room: "Flip Area" name: "SUCCEED" }
+}
@@ -0,0 +1,4 @@
+display_name: "The Crystalline"
+type: GIFT_MAP
+# The map's mastery is created at runtime.
+custom_nodes: "Components/Collectables/collectable"
@@ -0,0 +1,14 @@
+name: "Flip Area"
+panels {
+  name: "SUCCEED"
+  path: "Panels/Room_1/panel_3"
+  clue: "succeed"
+  answer: "win"
+  symbols: SUN
+}
+paintings {
+  name: "SNAKE2"
+  path: "Components/snake2"
+  exit_only: true
+  gravity: Y_PLUS
+}
@@ -0,0 +1,29 @@
+name: "Main Area"
+panels {
+  name: "LEAP"
+  path: "Panels/Room_1/panel_1"
+  clue: "leap"
+  answer: "jump"
+  symbols: SUN
+}
+panels {
+  name: "DROP"
+  path: "Panels/Room_1/panel_2"
+  clue: "drop"
+  answer: "fall"
+  symbols: SUN
+}
+panels {
+  name: "SPIN"
+  path: "Panels/Room_1/panel_4"
+  clue: "spin"
+  answer: "flip"
+  symbols: SUN
+}
+ports {
+  name: "WORLDPORT"
+  display_name: "Entrance"
+  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 9.5 }
+  rotation: 0
+}
@@ -0,0 +1,5 @@
+name: "Mastery"
+masteries {
+  name: "MASTERY"
+  path: "Components/Collectables/collectable"
+}
@@ -0,0 +1,5 @@
+name: "Painting Divot"
+paintings {
+  name: "SNAKE"
+  path: "Components/snake"
+}
@@ -14,3 +14,5 @@ excluded_nodes: "Panels/Entry/entry_proxied_fake"
 # The gift map entrance is created by the mod.
 custom_nodes: "Components/GiftMapEntrance/IcelyPanel"
 custom_nodes: "Components/GiftMapEntrance/Panel"
+custom_nodes: "Components/GiftMapEntrance/QPanel"
+custom_nodes: "Components/GiftMapEntrance/SouveyPanel"
@@ -56,6 +56,8 @@ panels {
   # for fun.
   symbols: QUESTION
   proxies { answer: "icely" path: "Components/GiftMapEntrance/IcelyPanel" }
+  proxies { answer: "q" path: "Components/GiftMapEntrance/QPanel" }
+  proxies { answer: "souvey" path: "Components/GiftMapEntrance/SouveyPanel" }
   required_door { name: "Gift Maps Entrance" }
 }
 letters {