Merge pull request #1 from dashodanger/obsidian-unstable

Obsidian unstable
obsidian-level-maker · Jul 19, 2021 · 881bf21 · 881bf21
2 parents 5e45c33 + c175422
commit 881bf21
Show file tree

Hide file tree

Showing 29 changed files with 744 additions and 257 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,9 +9,7 @@ add_subdirectory(source_files/ajpoly_src)
 add_subdirectory(source_files/physfs_src)
 add_subdirectory(source_files/zdbsp_src)
 add_subdirectory(source_files/slump_src)
-add_subdirectory(source_files/fltk_src)
 add_subdirectory(source_files/zlib_src)
-add_subdirectory(source_files/fmt_src)
 
 project(
   obsidian
@@ -163,26 +161,47 @@ target_include_directories(obsidian PRIVATE source_files/ajpoly_src)
 target_include_directories(obsidian PRIVATE source_files/zdbsp_src)
 target_include_directories(obsidian PRIVATE source_files/lua_src)
 target_include_directories(obsidian PRIVATE source_files/slump_src)
-target_include_directories(obsidian PRIVATE source_files/fltk_src)
 target_include_directories(obsidian PRIVATE source_files/zlib_src)
 target_include_directories(obsidian PRIVATE source_files/fmt_src/include)
 
-if(MINGW)
+if(MINGW OR WIN32)
   target_compile_definitions(obsidian PRIVATE WIN32)
 else()
   target_compile_definitions(obsidian PRIVATE UNIX)
 endif()
 
+find_package(FLTK 1.3)
+
+if(FLTK_FOUND)
+  target_link_libraries(obsidian PRIVATE ${FLTK_LIBRARIES})
+else()
+  # use vendored version
+  add_subdirectory(source_files/fltk_src)
+  target_link_libraries(obsidian PRIVATE fltk fltk_images)
+  target_include_directories(obsidian PRIVATE source_files/fltk_src)
+endif()
+
+if(UNIX)
+  find_package(X11 REQUIRED)
+  target_link_libraries(obsidian PRIVATE X11::Xft)
+endif()
+
+# Copies executables to local install directory after build
+if(UNIX)
+  add_custom_command(TARGET obsidian POST_BUILD
+    COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_BINARY_DIR}/obsidian" "${CMAKE_CURRENT_LIST_DIR}"
+    COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_BINARY_DIR}/source_files/ff_src/filename_formatter" "${CMAKE_CURRENT_LIST_DIR}/tools"
+  )
+endif()
+
 target_link_libraries(
   obsidian
-  PRIVATE fltk
-          fltk_images
-          zlibstatic
+  PRIVATE zlibstatic
           obsidian_lua
           obsidian_physfs
           obsidian_acc
           obsidian_ajpoly
           obsidian_zdbsp
           obsidian_slump
-          fmt::fmt
+          fontconfig
 )
diff --git a/INSTALL.md b/INSTALL.md
@@ -16,7 +16,7 @@
 4. FLTK 1.3 
    * website: http://www.fltk.org/
    * package: `libfltk1.3-dev`
-   * You may also need: `libxft-dev` `libxinerama-dev` `libjpeg-dev` `libpng-dev`
+   * You may also need: `libxft-dev` `libxinerama-dev` `libjpeg-dev` `libpng-dev` `libfontconfig1-dev`
 
 5. zlib
    * website: http://www.zlib.net/
@@ -25,7 +25,7 @@
 6. FLEX
    * package: `flex`
 
-7. Code formatting tools
+7. Code formatting tools (optional)
    * package: `clang-tidy`
    * python package (install with pip): `cmakelang`
 
@@ -39,8 +39,6 @@ will build the Obsidian binary. (The '>' is just the prompt)
     > cmake ..
     > make (-j# optional, with # being the number of cores you'd like to use)
     > cd ..
-    > cp build/obsidian .
-    > cp build/source_files/ff_src/filename_formatter ./tools
 
 Then, obsidian can be launched with:
 
@@ -57,7 +55,7 @@ Similar to the above directions:
     > cmake .. -DCMAKE_TOOLCHAIN_FILE=../Toolchain-mingw64.cmake (use Toolchain-mingw32.cmake for a 32-bit build)
     > make (-j# optional, with # being the number of cores you'd like to use)
     > cd ..
-    > cp build/obsidian.exe
+    > cp build/obsidian.exe .
     > cp build/source_files/ff_src/filename_formatter.exe ./tools
 
 

diff --git a/games/doom/fabs/cage/gtd_cage_building_side.lua b/games/doom/fabs/cage/gtd_cage_building_side.lua
@@ -85,6 +85,8 @@ PREFABS.Cage_wall_building_terrace_tall =
   template = "Cage_wall_building_terrace",
   map = "MAP02",
 
+  height = 264,
+
   tex_CITY02 =
   {
     CITY01 = 50,

diff --git a/games/doom/fabs/cage/mogwaltz_trap_eye.lua b/games/doom/fabs/cage/mogwaltz_trap_eye.lua
@@ -1,4 +1,7 @@
-PREFABS.Cage_secret_trap_shootable_eye =
+-- TO-DO: Needs redesigning such that monsters are not left stuck inside the bunker.
+-- Switches also need to be redesigned such that it's impossible to fail triggering all lines.
+
+--[[PREFABS.Cage_secret_trap_shootable_eye =
 {
   file   = "joiner/mogwaltz_trap_eye.wad",
   map    = "MAP01",
@@ -28,4 +31,4 @@ PREFABS.Cage_secret_trap_shootable_eye_pair =
   map = "MAP02",
 
   prob = 37,
-}
+}]]
diff --git a/games/doom/fabs/item/dem_item_gamble.wad b/games/doom/fabs/item/dem_item_gamble.wad
diff --git a/games/doom/fabs/item/dem_secret_closets.wad b/games/doom/fabs/item/dem_secret_closets.wad
diff --git a/games/doom/fabs/item/mogwaltz_item_eye.lua b/games/doom/fabs/item/mogwaltz_item_eye.lua
@@ -1,4 +1,6 @@
-PREFABS.Item_secret_item_shootable_eye =
+-- TO-DO: Redesign switches to be more reliable and resolve monsters being stuck to spawn positions.
+
+--[[PREFABS.Item_secret_item_shootable_eye =
 {
   file   = "item/mogwaltz_item_eye.wad",
   map    = "MAP01",
@@ -26,4 +28,4 @@ PREFABS.Item_secret_item_shootable_eye_pair =
   map = "MAP02",
 
   prob = 37,
-}
+}]]
diff --git a/games/doom/fabs/item/scionox_secrets_tech.wad b/games/doom/fabs/item/scionox_secrets_tech.wad
diff --git a/games/doom/fabs/item/scionox_secrets_tech2.wad b/games/doom/fabs/item/scionox_secrets_tech2.wad
diff --git a/games/doom/fabs/joiner/gtd_infestation_simple.lua b/games/doom/fabs/joiner/gtd_infestation_simple.lua
@@ -2,7 +2,7 @@
 -- Disgusting eww pls
 --
 
-PREFABS.Joiner_infestation_caveout =
+--[[PREFABS.Joiner_infestation_caveout =
 {
   file   = "joiner/gtd_infestation_simple.wad",
   map    = "MAP01",
@@ -56,4 +56,4 @@ PREFABS.Joiner_natural_caveout =
     MIDVINE2 = 1,
     ZZWOLF10 = 10 -- invisibility tex
   },
-}
+}]]
diff --git a/games/doom/fabs/joiner/gtd_infestation_simple.wad b/games/doom/fabs/joiner/gtd_infestation_simple.wad
diff --git a/games/doom/fabs/joiner/mogwaltz_secret_eye.lua b/games/doom/fabs/joiner/mogwaltz_secret_eye.lua
@@ -1,4 +1,6 @@
-PREFABS.Joiner_secret_secret_shootable_eye =
+-- TO-DO: Switches need to be redesigned such that it's impossible to fail triggering all lines.
+
+--[[PREFABS.Joiner_secret_secret_shootable_eye =
 {
   file   = "joiner/mogwaltz_secret_eye.wad",
   map    = "MAP01",
@@ -23,7 +25,7 @@ PREFABS.Joiner_secret_secret_shootable_eye =
   solid_ents = true,
 }
 
---[[PREFABS.Joiner_secret_secret_shootable_eye_pick_one =
+PREFABS.Joiner_secret_secret_shootable_eye_pick_one =
 {
   template = "Joiner_secret_secret_shootable_eye",
   map = "MAP02",
@@ -37,7 +39,7 @@ PREFABS.Joiner_secret_secret_shootable_eye_pick_one_b =
   map = "MAP03",
 
   prob = 18,
-}]]
+}
 
 PREFABS.Joiner_secret_secret_shootable_eye_nodickmove =
 {
@@ -57,4 +59,4 @@ PREFABS.Joiner_secret_secret_shootable_eye_nodickmove_b =
   prob = 18,
 
   y_fit = { 128,140 },
-}
+}]]
diff --git a/games/doom/fabs/joiner/scionox_guardpost.lua b/games/doom/fabs/joiner/scionox_guardpost.lua
@@ -84,6 +84,8 @@ PREFABS.Joiner_scionox_guardpost_all =
   template = "Joiner_scionox_guardpost",
   map    = "MAP04",
 
+  engine = "!limit", -- TIL there's a lot of missing all-key lines for traditional Doom...
+
   key    = "k_ALL",
 
   y_fit = { 68,76 , 184,188 },

diff --git a/games/doom/fabs/picture/dem_pic_commercial_set.lua b/games/doom/fabs/picture/dem_pic_commercial_set.lua
@@ -4,7 +4,7 @@ PREFABS.Pic_dem_commercial_set1 =
   file   = "picture/dem_pic_commercial_set.wad",
   map    = "MAP01",
 
-rank = 1,
+  rank = 1,
 
   prob   = 250,
   theme = "urban",
@@ -13,6 +13,7 @@ rank = 1,
 
   where  = "seeds",
   height = 104,
+  deep = 16,
 
   theme  = "urban",
   env = "building",

diff --git a/games/doom/fabs/picture/dem_pic_commercial_set.wad b/games/doom/fabs/picture/dem_pic_commercial_set.wad
diff --git a/games/doom/fabs/stairs/frozsoul_620_lift_128.lua b/games/doom/fabs/stairs/frozsoul_620_lift_128.lua
@@ -1,10 +1,12 @@
-PREFABS.lift_620_128 =
+PREFABS.Lift_620_128 =
 {
   file   = "stairs/frozsoul_620_lift_128.wad",
 
   prob   = 10,
   prob_skew = 1.5,
 
+  engine = "!limit",
+
   theme  = "!hell",
   style  = "steepness",
 
@@ -22,3 +24,13 @@ PREFABS.lift_620_128 =
   delta_h = 128,
   plain_ceiling = true,
 }
+
+PREFABS.Lift_620_128_limit =
+{
+  template = "Lift_620_128",
+
+  engine = "limit",
+
+  line_13369 = 120,
+  line_13371 = 123
+}
diff --git a/games/doom/fabs/stairs/frozsoul_620_lift_128.wad b/games/doom/fabs/stairs/frozsoul_620_lift_128.wad
diff --git a/games/doom/fabs/stairs/gtd_lift_disguised_128.lua b/games/doom/fabs/stairs/gtd_lift_disguised_128.lua
@@ -6,6 +6,8 @@ PREFABS.Lift_gtd_disguised_128 =
   file = "stairs/gtd_lift_disguised_128.wad",
   map = "MAP01",
 
+  engine = "!limit",
+
   prob = 10,
   prob_skew = 2,
 
@@ -26,7 +28,16 @@ PREFABS.Lift_gtd_disguised_128 =
   plain_ceiling = true,
 }
 
-PREFABS.Lift_gtd_disguised_128_2h =
+PREFABS.Lift_gtd_disguised_128_limit =
+{
+  template = "Lift_gtd_disguised_128",
+
+  engine = "limit",
+
+  line_13364 = 123
+}
+
+--[[PREFABS.Lift_gtd_disguised_128_2h =
 {
   template = "Lift_gtd_disguised_128",
   map = "MAP02",
@@ -40,4 +51,4 @@ PREFABS.Lift_gtd_disguised_128_3h =
   map = "MAP03",
 
   seed_h = 3,
-}
+}]]
diff --git a/games/doom/fabs/stairs/gtd_lift_disguised_64.lua b/games/doom/fabs/stairs/gtd_lift_disguised_64.lua
@@ -3,6 +3,8 @@ PREFABS.Lift_gtd_disguised_64 =
   file = "stairs/gtd_lift_disguised_64.wad",
   map = "MAP01",
 
+  engine = "!limit",
+
   prob = 10,
   prob_skew = 2,
 
@@ -16,14 +18,24 @@ PREFABS.Lift_gtd_disguised_64 =
   seed_w = 1,
 
   x_fit = "frame",
+  y_fit = "top",
 
   bound_z1 = 0,
 
   delta_h = 64,
   plain_ceiling = true,
 }
 
-PREFABS.Lift_gtd_disguised_64_2h =
+PREFABS.Lift_gtd_disguised_64_limit =
+{
+  template = "Lift_gtd_disguised_64",
+
+  engine = "limit",
+
+  line_13364 = 123
+}
+
+--[[PREFABS.Lift_gtd_disguised_64_2h =
 {
   template = "Lift_gtd_disguised_64",
   map = "MAP02",
@@ -37,4 +49,4 @@ PREFABS.Lift_gtd_disguised_64_3h =
   map = "MAP03",
 
   seed_h = 3,
-}
+}]]