Remove some references to the v20 generic prefab set

obsidian-level-maker · May 21, 2024 · 8b3f0a1 · 8b3f0a1
1 parent 6d91f46
commit 8b3f0a1
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 23 deletions.
diff --git a/games/doom/base.lua b/games/doom/base.lua
@@ -57,8 +57,6 @@ OB_GAMES["doom2"] =
   game_dir = "doom",
   iwad_name = "doom2.wad",
 
-  use_generics = true,
-
   tables =
   {
     DOOM

diff --git a/games/doom/entities.lua b/games/doom/entities.lua
@@ -142,14 +142,6 @@ DOOM.ENTITIES =
 
 }
 
-DOOM.GENERIC_REQS =
-{
-  -- These are used for fulfilling fab pick requirements in prefab.lua
-  Generic_Key_One = { kind = "k_one", rkind = "k_blue" },
-  Generic_Key_Two = { kind = "k_two", rkind = "k_yellow" },
-  Generic_Key_Three = { kind = "k_three", rkind = "k_red" }
-}
-
 ----------------------------------------------------------------
 
 DOOM.PLAYER_MODEL =

diff --git a/games/doom/x_doom1.lua b/games/doom/x_doom1.lua
@@ -888,14 +888,6 @@ ULTDOOM.ENTITIES =
   pool_brains   = { id=10, r=20, h=16, pass=true },
 }
 
-ULTDOOM.GENERIC_REQS =
-{
-  -- These are used for fulfilling fab pick requirements in prefab.lua
-  Generic_Key_One = { kind = "k_one", rkind = "k_blue" },
-  Generic_Key_Two = { kind = "k_two", rkind = "k_yellow" },
-  Generic_Key_Three = { kind = "k_three", rkind = "k_red" }
-}
-
 --------------------------------------------------------------------
 
 ULTDOOM.THEMES =

diff --git a/scripts/area.lua b/scripts/area.lua
@@ -758,11 +758,7 @@ function Junction_make_wall(junc)
     local plain_wall_prob = 0
 
     if PARAM.wall_prob and PARAM.wall_prob ~= "fab_default" then
-      if not ob_match_game({game = "doomish"}) then
-        plain_wall_prob = plain_wall_prob + ((PREFAB_CONTROL_GENERIC.WALL_REDUCTION_ODDS[PARAM.wall_prob] or 0) * 100)
-      else
-        plain_wall_prob = plain_wall_prob + ((PREFAB_CONTROL.WALL_REDUCTION_ODDS[PARAM.wall_prob] or 0) * 100)
-      end
+      plain_wall_prob = plain_wall_prob + ((PREFAB_CONTROL.WALL_REDUCTION_ODDS[PARAM.wall_prob] or 0) * 100)
       plain_wall_prob = math.clamp(0, plain_wall_prob, 100)
     end