- Revised street entry code to create cleaner transitions.

Author: GTD-Carthage

src/scripts/grower.lua

@@ -3478,7 +3478,9 @@ function Grower_grammatical_room(R, pass, is_emergency)
   elseif pass == "streets" then
     apply_num = rand.irange(5,10)
 
-  elseif pass == "streets_entry" then
+  elseif pass == "streets_entry_4"
+  or pass == "streets_entry_6"
+  or pass == "streets_entry_8" then
     apply_num = 1
 
   elseif pass == "sidewalk" then
@@ -3751,7 +3753,16 @@ end
 function Grower_make_street(R)
   if R.is_streeted then return end
 
-  Grower_grammatical_room(R, "streets_entry")
+  R.areas[1]:calc_volume()
+  R.svolume = R.areas[1].svolume
+  if R.svolume == 4 then
+    Grower_grammatical_room(R, "streets_entry_4")
+  elseif R.svolume == 6 then
+    Grower_grammatical_room(R, "streets_entry_6")
+  elseif R.svolume == 8 then
+    Grower_grammatical_room(R, "streets_entry_8")
+  end
+
   Grower_grammatical_room(R, "streets")
   Grower_grammatical_room(R, "street_fixer")
 
@@ -3769,7 +3780,6 @@ function Grower_make_street(R)
 
   -- sanity check: failed street rooms shall now become just
   -- regular rooms
-  R.areas[1]:calc_volume()
   if R.areas[1].svolume < 16 then
     R.is_street = false
     R.areas[1].is_road = false

src/scripts/shapes.lua

@@ -6804,33 +6804,48 @@ GROW_SEWER_STAIRS_SIDE_EXIT_NEW_AREA =
 -- It works now. Cheer up, buddy. -- March, 2019
 -- MSSP's city streets. ExperiMENTAL. [STREETS]
 
-STREETS_ENTRY =
+STREETS_ENTRY_RSVOL_4 =
 {
-  prob = 500
+  prob = 5
 
-  pass = "streets_entry"
+  pass = "streets_entry_4"
 
   structure =
   {
-    "xx....","xx1111"
-    "11....","111111"
-    "11....","111111"
-    "xx....","xx1111"
+    "11..","1111"
+    "11..","1111"
+    "....","1111"
+    "....","1111"
   }
 }
 
-STREETS_ENTRY_LONG_OFFSET =
+STREETS_ENTRY_RSVOL_6 =
 {
-  prob = 500
+  prob = 5
 
-  pass = "streets_entry"
+  pass = "streets_entry_6"
 
   structure =
   {
-    "xxxx....","xxxx1111"
-    "1111....","11111111"
-    "1111....","11111111"
-    "xxxx....","xxxx1111"
+    "11..","1111"
+    "11..","1111"
+    "11..","1111"
+    "....","1111"
+  }
+}
+
+STREETS_ENTRY_RSVOL_8 =
+{
+  prob = 5
+
+  pass = "streets_entry_8"
+
+  structure =
+  {
+    "11..","1111"
+    "11..","1111"
+    "11..","1111"
+    "11..","1111"
   }
 }