Merge pull request #660 from GTD-Carthage/content-unstable

Upstream sync
obsidian-level-maker · Jun 26, 2024 · 25e2510 · 25e2510
2 parents be687b5 + 3b2e337
commit 25e2510
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 3 deletions.
diff --git a/games/doom/data/ObAddon_Textures_2.wad b/games/doom/data/ObAddon_Textures_2.wad
diff --git a/modules/prefab_controller.lua b/modules/prefab_controller.lua
@@ -151,7 +151,7 @@ function PREFAB_CONTROL.fine_tune_filters()
     any_copperRust = 2,
 
     tech_silver_grate = 1.25,
-    tech_bumblebee = 1.25,
+    tech_bumblebee = 2,
     tech_aww2 = 2,
     tech_iStuff = 2,
     tech_beigetownTech = 3,

diff --git a/scripts/shapes.lua b/scripts/shapes.lua
@@ -5594,16 +5594,76 @@ GROW_LIQUID_OVAL_SPLIT_SOLID_PILLAR =
     "........","~~%11/~~",
     "........","~~~11~~~",
     "xxx..xxx","xxx11xxx",
-    "xxx..xxx","xxx11xxx",
+    "xxx..xxx","xxx11xxx"
   },
 
   diagonals =
   {
          "~1","1~",
     "~1","1.",".1","1~",
     "~1","1.",".1","1~",
-         "~1","1~",
+         "~1","1~"
+  }
+},
+
+GROW_OVAL_SPLIT_NEW_AREA =
+{
+  prob = 20,
+  skip_prob = 85,
+
+  structure =
+  {
+    "xx11xx","xx11xx",
+    "xx..xx","xx11xx",
+    "x....x","x/1/%x",
+    "......","/1/%A%",
+    "......","11..AA",
+    "......","11..AA",
+    "......","%1%/A/",
+    "x....x","x%1%/x",
+    "xx..xx","xx11xx",
+    "xx..xx","xx11xx"
   },
+
+  diagonals =
+  {
+      ".1",".A","A.",
+    ".1","1.",".A","A.",
+    ".1","1.",".A","A.",
+      ".1","1.","A."
+  }
+},
+
+GROW_OVAL_SPLIT_NEW_AREA_BIG =
+{
+  prob = 25,
+  skip_prob = 80,
+
+  structure =
+  {
+    "xxx11xxx","xxx11xxx",
+    "xxx..xxx","xxx11xxx",
+    "xx....xx","xx/1/%xx",
+    "x......x","x/1/%A%x",
+    "........","/11..AA%",
+    "........","111..AAA",
+    "........","111..AAA",
+    "........","%11..AA/",
+    "x......x","x%1%/A/x",
+    "xx....xx","xx%1%/xx",
+    "xxx..xxx","xxx11xxx",
+    "xxx..xxx","xxx11xxx"
+  },
+
+  diagonals =
+  {
+      ".1",".A","A.",
+    ".1","1.",".A","A.",
+          "1.",".A",
+          "1.",".A",
+    ".1","1.",".A","A.",
+      ".1","1.","A."
+  }
 },
 
 -- MSSP's ramps and all sorts of stuff. [RAMPS]