Move some Doom-specific assets; rework title screen gen

obsidian-level-maker · Oct 1, 2024 · d81ee0f · d81ee0f
1 parent 964f967
commit d81ee0f
Show file tree

Hide file tree

Showing 69 changed files with 1,060 additions and 616 deletions.
diff --git a/data/bg/airduct.tga b/data/bg/airduct.tga
diff --git a/data/bg/block1.tga b/data/bg/block1.tga
diff --git a/data/bg/block2.tga b/data/bg/block2.tga
diff --git a/data/bg/bodiesc.tga b/data/bg/bodiesc.tga
diff --git a/data/bg/bricks08.tga b/data/bg/bricks08.tga
diff --git a/data/bg/bricks09.tga b/data/bg/bricks09.tga
diff --git a/data/bg/bronze5.tga b/data/bg/bronze5.tga
diff --git a/data/bg/cement.tga b/data/bg/cement.tga
diff --git a/data/bg/darkf03.tga b/data/bg/darkf03.tga
diff --git a/data/bg/goth10.tga b/data/bg/goth10.tga
diff --git a/data/bg/goth36.tga b/data/bg/goth36.tga
diff --git a/data/bg/goth50.tga b/data/bg/goth50.tga
diff --git a/data/bg/goth51.tga b/data/bg/goth51.tga
diff --git a/data/bg/goth6.tga b/data/bg/goth6.tga
diff --git a/data/bg/graymet2.tga b/data/bg/graymet2.tga
diff --git a/data/bg/helmet1.tga b/data/bg/helmet1.tga
diff --git a/data/bg/helmet2.tga b/data/bg/helmet2.tga
diff --git a/data/bg/helwal1.tga b/data/bg/helwal1.tga
diff --git a/data/bg/lamp1.tga b/data/bg/lamp1.tga
diff --git a/data/bg/lamp2.tga b/data/bg/lamp2.tga
diff --git a/data/bg/lamp3.tga b/data/bg/lamp3.tga
diff --git a/data/bg/rdrok1.tga b/data/bg/rdrok1.tga
diff --git a/data/licenses/License Attribution.txt b/data/licenses/License Attribution.txt
@@ -23,6 +23,8 @@ Freedoom (Icon of Sin replacement graphics) - Copyright (c) 2001-2019 Contributo
 CC0 1.0 Universal License
 ===========================================================================================
 
+Oblige v5-v7 Prefab WAD files and colocated Lua definitions - Andrew Apted
+
 "Wind Arctic Cold" sound - cobratronik via Freesound.org
 
 "Dark Cave Drone" sound - Kinoton via Freesound.org
@@ -68,9 +70,7 @@ CC-BY-NC-3.0 Unported License
 CC-BY-4.0 International License
 ===========================================================================================
 
-Oblige v5-v7 Prefab WAD files - Copyright (c) 2013-2017 Andrew Apted
-
-ObAddon and OBSIDIAN Prefab WAD files - Copyright (c) 2018-2024 The OBSIDIAN Team
+ObAddon and OBSIDIAN Prefab WAD files and colocated Lua definitions - Copyright (c) 2018-2024 The OBSIDIAN Team
 
 "Wide Stereo Outdoor Ambience" sound - Copyright (c) 2014 Kasper August Topp via Freesound.org
 

diff --git a/data/masks/compgreen.tga b/data/masks/compgreen.tga
diff --git a/data/masks/fireblu.tga b/data/masks/fireblu.tga
diff --git a/data/masks/groovy1.tga b/data/masks/groovy1.tga
diff --git a/data/masks/redrock.tga b/data/masks/redrock.tga
diff --git a/data/masks/shawn_r.tga b/data/masks/shawn_r.tga
diff --git a/data/masks/yellowish.tga b/data/masks/yellowish.tga
diff --git a/games/doom/base.lua b/games/doom/base.lua
@@ -64,6 +64,7 @@ OB_GAMES["doom2"] =
 
   hooks =
   {
+    setup = DOOM.setup,
     factory_setup = DOOM.factory_setup,
     slump_setup = DOOM.slump_setup,
     get_levels = DOOM.get_levels,

diff --git a/data/loading/loading_screens.wad → games/doom/data/loading/loading_screens.wad b/data/loading/loading_screens.wad → games/doom/data/loading/loading_screens.wad
diff --git a/data/music/D_DM2INT.ogg → games/doom/data/music/D_DM2INT.ogg b/data/music/D_DM2INT.ogg → games/doom/data/music/D_DM2INT.ogg
diff --git a/data/sounds/ARCTIC.ogg → games/doom/data/sounds/ARCTIC.ogg b/data/sounds/ARCTIC.ogg → games/doom/data/sounds/ARCTIC.ogg
diff --git a/data/sounds/BATHFAN.ogg → games/doom/data/sounds/BATHFAN.ogg b/data/sounds/BATHFAN.ogg → games/doom/data/sounds/BATHFAN.ogg
diff --git a/data/sounds/CAVEAMB.ogg → games/doom/data/sounds/CAVEAMB.ogg b/data/sounds/CAVEAMB.ogg → games/doom/data/sounds/CAVEAMB.ogg
diff --git a/data/sounds/COMPSTN.ogg → games/doom/data/sounds/COMPSTN.ogg b/data/sounds/COMPSTN.ogg → games/doom/data/sounds/COMPSTN.ogg
diff --git a/data/sounds/CONVMECH.ogg → games/doom/data/sounds/CONVMECH.ogg b/data/sounds/CONVMECH.ogg → games/doom/data/sounds/CONVMECH.ogg
diff --git a/data/sounds/DSRAT.ogg → games/doom/data/sounds/DSRAT.ogg b/data/sounds/DSRAT.ogg → games/doom/data/sounds/DSRAT.ogg
diff --git a/data/sounds/FANSND.ogg → games/doom/data/sounds/FANSND.ogg b/data/sounds/FANSND.ogg → games/doom/data/sounds/FANSND.ogg
diff --git a/data/sounds/HELLIND.ogg → games/doom/data/sounds/HELLIND.ogg b/data/sounds/HELLIND.ogg → games/doom/data/sounds/HELLIND.ogg
diff --git a/data/sounds/HELLOUT.ogg → games/doom/data/sounds/HELLOUT.ogg b/data/sounds/HELLOUT.ogg → games/doom/data/sounds/HELLOUT.ogg
diff --git a/data/sounds/MACHNAIR.ogg → games/doom/data/sounds/MACHNAIR.ogg b/data/sounds/MACHNAIR.ogg → games/doom/data/sounds/MACHNAIR.ogg
diff --git a/data/sounds/MACHVENT.ogg → games/doom/data/sounds/MACHVENT.ogg b/data/sounds/MACHVENT.ogg → games/doom/data/sounds/MACHVENT.ogg
diff --git a/data/sounds/PIPELINE.ogg → games/doom/data/sounds/PIPELINE.ogg b/data/sounds/PIPELINE.ogg → games/doom/data/sounds/PIPELINE.ogg
diff --git a/data/sounds/RAINAMB.ogg → games/doom/data/sounds/RAINAMB.ogg b/data/sounds/RAINAMB.ogg → games/doom/data/sounds/RAINAMB.ogg
diff --git a/data/sounds/SPARKING.ogg → games/doom/data/sounds/SPARKING.ogg b/data/sounds/SPARKING.ogg → games/doom/data/sounds/SPARKING.ogg
diff --git a/data/sounds/STREETAM.ogg → games/doom/data/sounds/STREETAM.ogg b/data/sounds/STREETAM.ogg → games/doom/data/sounds/STREETAM.ogg
diff --git a/data/sounds/TECHAMB.ogg → games/doom/data/sounds/TECHAMB.ogg b/data/sounds/TECHAMB.ogg → games/doom/data/sounds/TECHAMB.ogg
diff --git a/data/sounds/TECHIND.ogg → games/doom/data/sounds/TECHIND.ogg b/data/sounds/TECHIND.ogg → games/doom/data/sounds/TECHIND.ogg
diff --git a/data/sounds/TEMPPARK.ogg → games/doom/data/sounds/TEMPPARK.ogg b/data/sounds/TEMPPARK.ogg → games/doom/data/sounds/TEMPPARK.ogg
diff --git a/data/sounds/TOILETRN.ogg → games/doom/data/sounds/TOILETRN.ogg b/data/sounds/TOILETRN.ogg → games/doom/data/sounds/TOILETRN.ogg
diff --git a/data/sounds/VENDHUM.ogg → games/doom/data/sounds/VENDHUM.ogg b/data/sounds/VENDHUM.ogg → games/doom/data/sounds/VENDHUM.ogg
diff --git a/data/sounds/WATDRAIN.ogg → games/doom/data/sounds/WATDRAIN.ogg b/data/sounds/WATDRAIN.ogg → games/doom/data/sounds/WATDRAIN.ogg
diff --git a/data/sounds/WATFALL.ogg → games/doom/data/sounds/WATFALL.ogg b/data/sounds/WATFALL.ogg → games/doom/data/sounds/WATFALL.ogg
diff --git a/data/sounds/WATSTRM.ogg → games/doom/data/sounds/WATSTRM.ogg b/data/sounds/WATSTRM.ogg → games/doom/data/sounds/WATSTRM.ogg
diff --git a/data/sounds/WATTANK.ogg → games/doom/data/sounds/WATTANK.ogg b/data/sounds/WATTANK.ogg → games/doom/data/sounds/WATTANK.ogg
diff --git a/games/doom/data/title/barrel1.tga b/games/doom/data/title/barrel1.tga
diff --git a/games/doom/data/title/brushedmetal.tga b/games/doom/data/title/brushedmetal.tga
diff --git a/games/doom/data/title/techbg1.tga b/games/doom/data/title/techbg1.tga