- Attempted to fix issue with street room entries being shorn off by the street shape clean-up rules, resulting in joiner or direct connections being unable to meet (therefore causing an assert)

- Decreased maximum seed grid size again.

Author: GTD-Carthage

src/scripts/defs.lua

@@ -111,8 +111,8 @@ LENGTH_CHOICES =
 SEED_SIZE = 128
 
 -- largest map size
-SEED_W    = 96 --112
-SEED_H    = 96 --112
+SEED_W    = 90 --112
+SEED_H    = 90 --112
 -- MSSP: the absolute maximum size is tightened down to the largest
 -- agreed map size for performance's sake. Current agreed maximum is 74 W.
 -- any higher will cause skyboxes and teleporter rooms to start merging with

src/scripts/seed.lua

@@ -1061,9 +1061,17 @@ function Edge_new(kind, S, dir, long)
   -- add it into each seed
   for i = 1, long do
     if not S then
-      print(table.tostr(R))
-      print(table.tostr(A))
+      gui.printf(kind .. "\n")
+      gui.printf(table.tostr(R .. "\n"))
+      gui.printf(table.tostr(A .. "\n"))
+      -- note: this mostly only happens when a
+      -- room-to-room connection (direct or via joiner)
+      -- does not perfectly meet
+      -- each other on the edge
+      -- check shape rules for misbehaved shapes
+      error("OH GOD I CAN'T COMPUTER PLS TO HELP")
     end
+
     assert(S)
 
     if S.edge[dir] then

src/scripts/shapes.lua

@@ -6814,10 +6814,10 @@ STREETS_ENTRY_RSVOL_4 =
 
   structure =
   {
+    "....","1111"
     "11..","1111"
     "11..","1111"
     "....","1111"
-    "....","1111"
   }
 }
 
@@ -6829,6 +6829,7 @@ STREETS_ENTRY_RSVOL_6 =
 
   structure =
   {
+    "....","1111"
     "11..","1111"
     "11..","1111"
     "11..","1111"
@@ -6844,10 +6845,12 @@ STREETS_ENTRY_RSVOL_8 =
 
   structure =
   {
+    "....","1111"
     "11..","1111"
     "11..","1111"
     "11..","1111"
     "11..","1111"
+    "....","1111"
   }
 }