Merge pull request #30 from GTD-Carthage/obsidian

Beta 20 preview 2 pull
obsidian-level-maker · Apr 29, 2021 · 8b16976 · 8b16976
2 parents 0a86d03 + f5af89c
commit 8b16976
Show file tree

Hide file tree

Showing 133 changed files with 1,097 additions and 465 deletions.
diff --git a/engines/vanilla.lua b/engines/vanilla.lua
@@ -21,7 +21,7 @@ OB_ENGINES["vanilla"] =
 {
   label = _("Vanilla DOOM"),
 
-  priority = 100,  -- this makes it toppest-most, and the most defaultest engine
+  priority = 100,
 
   game = "doomish",
 

diff --git a/engines/zdoom.lua b/engines/zdoom.lua
@@ -60,7 +60,7 @@ end
 OB_ENGINES["zdoom"] =
 {
   label = _("ZDoom-ish"),
-  priority = 95,
+  priority = 101,
 
   extends = "boom",
 

diff --git a/games/chex/levels.lua b/games/chex/levels.lua
@@ -180,19 +180,10 @@ function CHEX3.get_levels()
       end
     end
 
- -- handling for street mode
+    -- handling for street mode
     -- actual handling for urban percentages are done
-    -- MSSP-TODO: Clean this up! Down with cascading elseif statements!
     if not LEV.is_procedural_gotcha or not LEV.prebuilt then
-      if OB_CONFIG.streets_mode == "75" and rand.odds(75) then
-        LEV.has_streets = true
-      elseif OB_CONFIG.streets_mode == "50" and rand.odds(50) then
-        LEV.has_streets = true
-      elseif OB_CONFIG.streets_mode == "25" and rand.odds(25) then
-        LEV.has_streets = true
-      elseif OB_CONFIG.streets_mode == "13" and rand.odds(13) then
-        LEV.has_streets = true
-      elseif OB_CONFIG.streets_mode == "all" then
+      if rand.odds(gui.get_module_slider_value("ui_arch", "float_streets_mode")) then
         LEV.has_streets = true
       end
     end

diff --git a/games/doom/data/ObAddon_Textures.wad b/games/doom/data/ObAddon_Textures.wad
diff --git a/games/doom/data/ROAD1.png b/games/doom/data/ROAD1.png
diff --git a/games/doom/data/ROAD2.png b/games/doom/data/ROAD2.png
diff --git a/games/doom/data/ROAD3.png b/games/doom/data/ROAD3.png
diff --git a/games/doom/data/ROAD4.png b/games/doom/data/ROAD4.png