Separate non-free and unclassified assets into independent addon in t…

…he interim
obsidian-level-maker · Sep 30, 2024 · 06b92b7 · 06b92b7
1 parent d6db8d8
commit 06b92b7
Show file tree

Hide file tree

Showing 98 changed files with 2,959 additions and 3,004 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@ obsidian
 Obsidian.exe
 obsidian.exe
 
-#Logs/configs (Windows version)
+#Logs/configs
 CONFIG.txt
 OPTIONS.txt
 THEME.txt
@@ -32,23 +32,8 @@ cmake-build-*
 build/
 
 # User dirs
-addons/*
 !addons/.gitkeep
 
-# Quake files (not redistributable)
-quake_tex.wd2
-pak0.pak
-pak1.pak
-
-tools/filename_formatter
-tools/filename_formatter.exe
-tools/qsavetex
-tools/qsavetex.exe
-tools/qsavetex_log.txt
-
-web/out
-web/shots
-
 _work
 *~
 install/

diff --git a/games/doom/data/ADVCR1.png → ...on-Free Addons/games/doom/data/ADVCR1.png b/games/doom/data/ADVCR1.png → ...on-Free Addons/games/doom/data/ADVCR1.png
diff --git a/games/doom/data/ADVCR2.png → ...on-Free Addons/games/doom/data/ADVCR2.png b/games/doom/data/ADVCR2.png → ...on-Free Addons/games/doom/data/ADVCR2.png
diff --git a/games/doom/data/ADVCR3.png → ...on-Free Addons/games/doom/data/ADVCR3.png b/games/doom/data/ADVCR3.png → ...on-Free Addons/games/doom/data/ADVCR3.png
diff --git a/games/doom/data/ADVCR4.png → ...on-Free Addons/games/doom/data/ADVCR4.png b/games/doom/data/ADVCR4.png → ...on-Free Addons/games/doom/data/ADVCR4.png
diff --git a/games/doom/data/ADVCR5.png → ...on-Free Addons/games/doom/data/ADVCR5.png b/games/doom/data/ADVCR5.png → ...on-Free Addons/games/doom/data/ADVCR5.png
diff --git a/games/doom/data/ADVDE1.png → ...on-Free Addons/games/doom/data/ADVDE1.png b/games/doom/data/ADVDE1.png → ...on-Free Addons/games/doom/data/ADVDE1.png
diff --git a/games/doom/data/ADVDE2.png → ...on-Free Addons/games/doom/data/ADVDE2.png b/games/doom/data/ADVDE2.png → ...on-Free Addons/games/doom/data/ADVDE2.png
diff --git a/games/doom/data/ADVDE3.png → ...on-Free Addons/games/doom/data/ADVDE3.png b/games/doom/data/ADVDE3.png → ...on-Free Addons/games/doom/data/ADVDE3.png
diff --git a/games/doom/data/ADVDE4.png → ...on-Free Addons/games/doom/data/ADVDE4.png b/games/doom/data/ADVDE4.png → ...on-Free Addons/games/doom/data/ADVDE4.png
diff --git a/games/doom/data/ADVDE5.png → ...on-Free Addons/games/doom/data/ADVDE5.png b/games/doom/data/ADVDE5.png → ...on-Free Addons/games/doom/data/ADVDE5.png
diff --git a/games/doom/data/ADVDE6.png → ...on-Free Addons/games/doom/data/ADVDE6.png b/games/doom/data/ADVDE6.png → ...on-Free Addons/games/doom/data/ADVDE6.png
diff --git a/games/doom/data/ADVDE7.png → ...on-Free Addons/games/doom/data/ADVDE7.png b/games/doom/data/ADVDE7.png → ...on-Free Addons/games/doom/data/ADVDE7.png
diff --git a/games/doom/data/ARCD10.png → ...on-Free Addons/games/doom/data/ARCD10.png b/games/doom/data/ARCD10.png → ...on-Free Addons/games/doom/data/ARCD10.png
diff --git a/games/doom/data/ARCD11.png → ...on-Free Addons/games/doom/data/ARCD11.png b/games/doom/data/ARCD11.png → ...on-Free Addons/games/doom/data/ARCD11.png
diff --git a/games/doom/data/ARCD2.png → ...Non-Free Addons/games/doom/data/ARCD2.png b/games/doom/data/ARCD2.png → ...Non-Free Addons/games/doom/data/ARCD2.png
diff --git a/games/doom/data/ARCD3.png → ...Non-Free Addons/games/doom/data/ARCD3.png b/games/doom/data/ARCD3.png → ...Non-Free Addons/games/doom/data/ARCD3.png
diff --git a/games/doom/data/ARCD4.png → ...Non-Free Addons/games/doom/data/ARCD4.png b/games/doom/data/ARCD4.png → ...Non-Free Addons/games/doom/data/ARCD4.png
diff --git a/games/doom/data/ARCD5.png → ...Non-Free Addons/games/doom/data/ARCD5.png b/games/doom/data/ARCD5.png → ...Non-Free Addons/games/doom/data/ARCD5.png
diff --git a/games/doom/data/ARCD6.png → ...Non-Free Addons/games/doom/data/ARCD6.png b/games/doom/data/ARCD6.png → ...Non-Free Addons/games/doom/data/ARCD6.png
diff --git a/games/doom/data/ARCD7.png → ...Non-Free Addons/games/doom/data/ARCD7.png b/games/doom/data/ARCD7.png → ...Non-Free Addons/games/doom/data/ARCD7.png
diff --git a/games/doom/data/ARCD8.png → ...Non-Free Addons/games/doom/data/ARCD8.png b/games/doom/data/ARCD8.png → ...Non-Free Addons/games/doom/data/ARCD8.png
diff --git a/games/doom/data/ARCD9.png → ...Non-Free Addons/games/doom/data/ARCD9.png b/games/doom/data/ARCD9.png → ...Non-Free Addons/games/doom/data/ARCD9.png
diff --git a/games/doom/data/CRATJOKE.png → ...-Free Addons/games/doom/data/CRATJOKE.png b/games/doom/data/CRATJOKE.png → ...-Free Addons/games/doom/data/CRATJOKE.png
diff --git a/games/doom/data/Fly.wad → ...n Non-Free Addons/games/doom/data/Fly.wad b/games/doom/data/Fly.wad → ...n Non-Free Addons/games/doom/data/Fly.wad
diff --git a/games/doom/data/G7DODSLS.png → ...-Free Addons/games/doom/data/G7DODSLS.png b/games/doom/data/G7DODSLS.png → ...-Free Addons/games/doom/data/G7DODSLS.png
diff --git a/games/doom/data/NAHIDA.png → ...on-Free Addons/games/doom/data/NAHIDA.png b/games/doom/data/NAHIDA.png → ...on-Free Addons/games/doom/data/NAHIDA.png
diff --git a/games/doom/data/OBVNMCH1.png → ...-Free Addons/games/doom/data/OBVNMCH1.png b/games/doom/data/OBVNMCH1.png → ...-Free Addons/games/doom/data/OBVNMCH1.png
diff --git a/games/doom/data/OBVNMCH2.png → ...-Free Addons/games/doom/data/OBVNMCH2.png b/games/doom/data/OBVNMCH2.png → ...-Free Addons/games/doom/data/OBVNMCH2.png
diff --git a/games/doom/data/OBVNMCH3.png → ...-Free Addons/games/doom/data/OBVNMCH3.png b/games/doom/data/OBVNMCH3.png → ...-Free Addons/games/doom/data/OBVNMCH3.png
diff --git a/games/doom/data/OBVNMCH4.png → ...-Free Addons/games/doom/data/OBVNMCH4.png b/games/doom/data/OBVNMCH4.png → ...-Free Addons/games/doom/data/OBVNMCH4.png
diff --git a/games/doom/data/OBVNMCH5.png → ...-Free Addons/games/doom/data/OBVNMCH5.png b/games/doom/data/OBVNMCH5.png → ...-Free Addons/games/doom/data/OBVNMCH5.png
diff --git a/games/doom/data/ObAddon_Textures.wad → ...dons/games/doom/data/ObAddon_Textures.wad b/games/doom/data/ObAddon_Textures.wad → ...dons/games/doom/data/ObAddon_Textures.wad
diff --git a/games/doom/data/ObAddon_Textures_2.wad → ...ns/games/doom/data/ObAddon_Textures_2.wad b/games/doom/data/ObAddon_Textures_2.wad → ...ns/games/doom/data/ObAddon_Textures_2.wad
diff --git a/games/doom/data/ObAddon_Textures_3.wad → ...ns/games/doom/data/ObAddon_Textures_3.wad b/games/doom/data/ObAddon_Textures_3.wad → ...ns/games/doom/data/ObAddon_Textures_3.wad
diff --git a/...doom/data/ObAddon_Textures_Brightmaps.wad → ...doom/data/ObAddon_Textures_Brightmaps.wad b/...doom/data/ObAddon_Textures_Brightmaps.wad → ...doom/data/ObAddon_Textures_Brightmaps.wad
diff --git a/games/doom/data/Rats.wad → ... Non-Free Addons/games/doom/data/Rats.wad b/games/doom/data/Rats.wad → ... Non-Free Addons/games/doom/data/Rats.wad
diff --git a/games/doom/data/TAG1.png → ... Non-Free Addons/games/doom/data/TAG1.png b/games/doom/data/TAG1.png → ... Non-Free Addons/games/doom/data/TAG1.png
diff --git a/games/doom/data/TAG10.png → ...Non-Free Addons/games/doom/data/TAG10.png b/games/doom/data/TAG10.png → ...Non-Free Addons/games/doom/data/TAG10.png
diff --git a/games/doom/data/TAG11.png → ...Non-Free Addons/games/doom/data/TAG11.png b/games/doom/data/TAG11.png → ...Non-Free Addons/games/doom/data/TAG11.png
diff --git a/games/doom/data/TAG12.png → ...Non-Free Addons/games/doom/data/TAG12.png b/games/doom/data/TAG12.png → ...Non-Free Addons/games/doom/data/TAG12.png
diff --git a/games/doom/data/TAG2.png → ... Non-Free Addons/games/doom/data/TAG2.png b/games/doom/data/TAG2.png → ... Non-Free Addons/games/doom/data/TAG2.png
diff --git a/games/doom/data/TAG3.png → ... Non-Free Addons/games/doom/data/TAG3.png b/games/doom/data/TAG3.png → ... Non-Free Addons/games/doom/data/TAG3.png
diff --git a/games/doom/data/TAG4.png → ... Non-Free Addons/games/doom/data/TAG4.png b/games/doom/data/TAG4.png → ... Non-Free Addons/games/doom/data/TAG4.png
diff --git a/games/doom/data/TAG5.png → ... Non-Free Addons/games/doom/data/TAG5.png b/games/doom/data/TAG5.png → ... Non-Free Addons/games/doom/data/TAG5.png
diff --git a/games/doom/data/TAG6.png → ... Non-Free Addons/games/doom/data/TAG6.png b/games/doom/data/TAG6.png → ... Non-Free Addons/games/doom/data/TAG6.png
diff --git a/games/doom/data/TAG7.png → ... Non-Free Addons/games/doom/data/TAG7.png b/games/doom/data/TAG7.png → ... Non-Free Addons/games/doom/data/TAG7.png
diff --git a/games/doom/data/TAG8.png → ... Non-Free Addons/games/doom/data/TAG8.png b/games/doom/data/TAG8.png → ... Non-Free Addons/games/doom/data/TAG8.png
diff --git a/games/doom/data/TAG9.png → ... Non-Free Addons/games/doom/data/TAG9.png b/games/doom/data/TAG9.png → ... Non-Free Addons/games/doom/data/TAG9.png
diff --git a/games/doom/data/TAGCR1.png → ...on-Free Addons/games/doom/data/TAGCR1.png b/games/doom/data/TAGCR1.png → ...on-Free Addons/games/doom/data/TAGCR1.png
diff --git a/games/doom/data/TAGCR10.png → ...n-Free Addons/games/doom/data/TAGCR10.png b/games/doom/data/TAGCR10.png → ...n-Free Addons/games/doom/data/TAGCR10.png
diff --git a/games/doom/data/TAGCR11.png → ...n-Free Addons/games/doom/data/TAGCR11.png b/games/doom/data/TAGCR11.png → ...n-Free Addons/games/doom/data/TAGCR11.png
diff --git a/games/doom/data/TAGCR12.png → ...n-Free Addons/games/doom/data/TAGCR12.png b/games/doom/data/TAGCR12.png → ...n-Free Addons/games/doom/data/TAGCR12.png
diff --git a/games/doom/data/TAGCR13.png → ...n-Free Addons/games/doom/data/TAGCR13.png b/games/doom/data/TAGCR13.png → ...n-Free Addons/games/doom/data/TAGCR13.png
diff --git a/games/doom/data/TAGCR14.png → ...n-Free Addons/games/doom/data/TAGCR14.png b/games/doom/data/TAGCR14.png → ...n-Free Addons/games/doom/data/TAGCR14.png
diff --git a/games/doom/data/TAGCR15.png → ...n-Free Addons/games/doom/data/TAGCR15.png b/games/doom/data/TAGCR15.png → ...n-Free Addons/games/doom/data/TAGCR15.png
diff --git a/games/doom/data/TAGCR16.png → ...n-Free Addons/games/doom/data/TAGCR16.png b/games/doom/data/TAGCR16.png → ...n-Free Addons/games/doom/data/TAGCR16.png
diff --git a/games/doom/data/TAGCR2.png → ...on-Free Addons/games/doom/data/TAGCR2.png b/games/doom/data/TAGCR2.png → ...on-Free Addons/games/doom/data/TAGCR2.png
diff --git a/games/doom/data/TAGCR3.png → ...on-Free Addons/games/doom/data/TAGCR3.png b/games/doom/data/TAGCR3.png → ...on-Free Addons/games/doom/data/TAGCR3.png
diff --git a/games/doom/data/TAGCR4.png → ...on-Free Addons/games/doom/data/TAGCR4.png b/games/doom/data/TAGCR4.png → ...on-Free Addons/games/doom/data/TAGCR4.png
diff --git a/games/doom/data/TAGCR5.png → ...on-Free Addons/games/doom/data/TAGCR5.png b/games/doom/data/TAGCR5.png → ...on-Free Addons/games/doom/data/TAGCR5.png
diff --git a/games/doom/data/TAGCR6.png → ...on-Free Addons/games/doom/data/TAGCR6.png b/games/doom/data/TAGCR6.png → ...on-Free Addons/games/doom/data/TAGCR6.png
diff --git a/games/doom/data/TAGCR7.png → ...on-Free Addons/games/doom/data/TAGCR7.png b/games/doom/data/TAGCR7.png → ...on-Free Addons/games/doom/data/TAGCR7.png
diff --git a/games/doom/data/TAGCR8.png → ...on-Free Addons/games/doom/data/TAGCR8.png b/games/doom/data/TAGCR8.png → ...on-Free Addons/games/doom/data/TAGCR8.png
diff --git a/games/doom/data/TAGCR9.png → ...on-Free Addons/games/doom/data/TAGCR9.png b/games/doom/data/TAGCR9.png → ...on-Free Addons/games/doom/data/TAGCR9.png
diff --git a/games/doom/data/TAGS1.png → ...Non-Free Addons/games/doom/data/TAGS1.png b/games/doom/data/TAGS1.png → ...Non-Free Addons/games/doom/data/TAGS1.png
diff --git a/games/doom/data/TAGS2.png → ...Non-Free Addons/games/doom/data/TAGS2.png b/games/doom/data/TAGS2.png → ...Non-Free Addons/games/doom/data/TAGS2.png
diff --git a/games/doom/data/TAGS3.png → ...Non-Free Addons/games/doom/data/TAGS3.png b/games/doom/data/TAGS3.png → ...Non-Free Addons/games/doom/data/TAGS3.png
diff --git a/games/doom/data/TAGS4.png → ...Non-Free Addons/games/doom/data/TAGS4.png b/games/doom/data/TAGS4.png → ...Non-Free Addons/games/doom/data/TAGS4.png
diff --git a/games/doom/data/blood_pack.wad → ...ree Addons/games/doom/data/blood_pack.wad b/games/doom/data/blood_pack.wad → ...ree Addons/games/doom/data/blood_pack.wad
diff --git a/games/doom/data/burning_debris.wad → ...Addons/games/doom/data/burning_debris.wad b/games/doom/data/burning_debris.wad → ...Addons/games/doom/data/burning_debris.wad
diff --git a/games/doom/data/burning_top.wad → ...ee Addons/games/doom/data/burning_top.wad b/games/doom/data/burning_top.wad → ...ee Addons/games/doom/data/burning_top.wad
diff --git a/games/doom/data/doom_falls.wad → ...ree Addons/games/doom/data/doom_falls.wad b/games/doom/data/doom_falls.wad → ...ree Addons/games/doom/data/doom_falls.wad
diff --git a/games/doom/data/lift_flat.wad → ...Free Addons/games/doom/data/lift_flat.wad b/games/doom/data/lift_flat.wad → ...Free Addons/games/doom/data/lift_flat.wad
diff --git a/games/doom/data/metal_step.wad → ...ree Addons/games/doom/data/metal_step.wad b/games/doom/data/metal_step.wad → ...ree Addons/games/doom/data/metal_step.wad
diff --git a/games/doom/data/short_bars.wad → ...ree Addons/games/doom/data/short_bars.wad b/games/doom/data/short_bars.wad → ...ree Addons/games/doom/data/short_bars.wad
diff --git a/games/doom/data/vine_dude.wad → ...Free Addons/games/doom/data/vine_dude.wad b/games/doom/data/vine_dude.wad → ...Free Addons/games/doom/data/vine_dude.wad
diff --git a/modules/gzdoom_fauna.lua → ... Non-Free Addons/modules/gzdoom_fauna.lua b/modules/gzdoom_fauna.lua → ... Non-Free Addons/modules/gzdoom_fauna.lua
diff --git a/modules/zdoom_armaetus_doom1_themes.lua → ...s/modules/zdoom_armaetus_doom1_themes.lua b/modules/zdoom_armaetus_doom1_themes.lua → ...s/modules/zdoom_armaetus_doom1_themes.lua
diff --git a/modules/zdoom_armaetus_entities.lua → ...ddons/modules/zdoom_armaetus_entities.lua b/modules/zdoom_armaetus_entities.lua → ...ddons/modules/zdoom_armaetus_entities.lua
diff --git a/modules/zdoom_armaetus_epic_textures.lua → .../modules/zdoom_armaetus_epic_textures.lua b/modules/zdoom_armaetus_epic_textures.lua → .../modules/zdoom_armaetus_epic_textures.lua
diff --git a/...les/zdoom_armaetus_epic_texturex_lump.lua → ...les/zdoom_armaetus_epic_texturex_lump.lua b/...les/zdoom_armaetus_epic_texturex_lump.lua → ...les/zdoom_armaetus_epic_texturex_lump.lua
diff --git a/modules/zdoom_armaetus_materials.lua → ...dons/modules/zdoom_armaetus_materials.lua b/modules/zdoom_armaetus_materials.lua → ...dons/modules/zdoom_armaetus_materials.lua
diff --git a/modules/zdoom_armaetus_themes.lua → ... Addons/modules/zdoom_armaetus_themes.lua b/modules/zdoom_armaetus_themes.lua → ... Addons/modules/zdoom_armaetus_themes.lua
diff --git a/modules/zdoom_internal_scripts/AISprite.wad → ...dules/zdoom_internal_scripts/AISprite.wad b/modules/zdoom_internal_scripts/AISprite.wad → ...dules/zdoom_internal_scripts/AISprite.wad
diff --git a/.../zdoom_internal_scripts/ObAddon_trees.wad → .../zdoom_internal_scripts/ObAddon_trees.wad b/.../zdoom_internal_scripts/ObAddon_trees.wad → .../zdoom_internal_scripts/ObAddon_trees.wad
diff --git a/modules/zdoom_orp_generative_resources.lua → ...odules/zdoom_orp_generative_resources.lua b/modules/zdoom_orp_generative_resources.lua → ...odules/zdoom_orp_generative_resources.lua
diff --git a/data/licenses/License Attribution.txt b/data/licenses/License Attribution.txt
@@ -17,6 +17,8 @@ BSD 3-Clause License
 
 Blasphemer (HERETIC1 loading image) - Copyright (c) 2021 Contributors to the Blasphemer project
 
+Freedoom (Icon of Sin replacement graphics) - Copyright (c) 2001-2019 Contributors to the Freedoom project
+
 ===========================================================================================
 CC0 1.0 Universal License
 ===========================================================================================

diff --git a/games/doom/data/hang_lamp.wad b/games/doom/data/hang_lamp.wad
diff --git a/games/doom/fabs/decor/hang_lamp.lua b/games/doom/fabs/decor/hang_lamp.lua
diff --git a/games/doom/fabs/decor/hang_lamp.wad b/games/doom/fabs/decor/hang_lamp.wad
diff --git a/games/doom/resources.lua b/games/doom/resources.lua
@@ -944,18 +944,18 @@ function DOOM.all_done()
 
   local dir = "games/doom/data/"
 
-  gui.wad_merge_sections(dir .. "doom_falls.wad")
-  gui.wad_merge_sections(dir .. "lift_flat.wad")
-  gui.wad_merge_sections(dir .. "metal_step.wad")
-  gui.wad_merge_sections(dir .. "vine_dude.wad")
+  --gui.wad_merge_sections(dir .. "doom_falls.wad")
+  --gui.wad_merge_sections(dir .. "lift_flat.wad")
+  --gui.wad_merge_sections(dir .. "metal_step.wad")
+  --gui.wad_merge_sections(dir .. "vine_dude.wad")
   gui.wad_merge_sections(dir .. "logos.wad")
   gui.wad_merge_sections(dir .. "invisible_wall.wad")
 
   if OB_CONFIG.game == "doom1" or OB_CONFIG.game == "ultdoom" then
-    gui.wad_merge_sections(dir .. "short_bars.wad")
+    --gui.wad_merge_sections(dir .. "short_bars.wad")
   end
 
-  if ob_mod_enabled("compress_output") == 1 and OB_CONFIG.port ~= "dsda" then -- DSDA (I think) needs everything in the WAD still
+  if ob_mod_enabled("compress_output") == 1 then
     gui.pk3_insert_file("data/endoom/ENDOOM.bin", "ENDOOM.bin")
   else
     gui.wad_insert_file("data/endoom/ENDOOM.bin", "ENDOOM")

diff --git a/games/heretic/base.lua b/games/heretic/base.lua
@@ -40,10 +40,6 @@ gui.import("stories")
 ------------------------------------------------------------
 
 function HERETIC.all_done()
-  if ob_match_port("advanced") then
-	  local wad_file = "games/heretic/data/HER_EXIT.wad"
-	  gui.wad_merge_sections(wad_file)
-  end
   gui.wad_insert_file("data/endoom/ENDOOM.bin", "ENDTEXT")
 end
 

diff --git a/games/heretic/data/HER_EXIT.wad b/games/heretic/data/HER_EXIT.wad
diff --git a/games/heretic/vanilla_mats.lua b/games/heretic/vanilla_mats.lua
@@ -2,8 +2,6 @@ HERETIC.VANILLA_MATS =
 {
     -- There are always added by Obsidian regardless of Engine selected
     "O_BOLT",
-    -- Added for exit sign variants
-    "HER_EXIT",
     -- Vanilla Flats
     "FLAT500",
     "FLAT502",

diff --git a/scripts/monster.lua b/scripts/monster.lua
@@ -460,7 +460,8 @@ function Monster_zone_palettes(LEVEL)
     total = total - quants[1]
 
     quants[3] = total
-    assert(total >= 0)
+
+    if total < 0 then total = 0 end
 
     return quants
   end

diff --git a/scripts/render.lua b/scripts/render.lua
@@ -26,10 +26,7 @@ function Render_add_exit_sign(E, z, SEEDS, LEVEL)
 
   if PARAM.bool_exit_signs ~= 1 then return end
 
-  -- These games need an engine that supports TX_START/TX_END merging
-  if ob_match_game({ game = { heretic=1} }) then
-     if not ob_match_port({ port = { edge=1, zdoom=1 } }) then return end
-  end
+  if ob_match_game({ game = "doomish" }) then return end
 
   local def
 

diff --git a/source/main.cc b/source/main.cc
@@ -1037,7 +1037,7 @@ void Main_SetSeed()
 static void Module_Defaults()
 {
     ob_set_mod_option("sky_generator", "self", "1");
-    ob_set_mod_option("armaetus_epic_textures", "self", "1");
+    //ob_set_mod_option("armaetus_epic_textures", "self", "1");
     ob_set_mod_option("music_swapper", "self", "1");
     ob_set_mod_option("compress_output", "self", "1");
 }