Merge pull request #664 from GTD-Carthage/content-unstable

Replaced some flats on the green bulkhead theme with contrasting vers…
obsidian-level-maker · Jul 18, 2024 · fd7ec05 · fd7ec05
2 parents 3539089 + f6fb7b9
commit fd7ec05
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 125 deletions.
diff --git a/games/doom/data/ObAddon_Textures_2.wad b/games/doom/data/ObAddon_Textures_2.wad
diff --git a/modules/zdoom_orp_generative_resources.lua b/modules/zdoom_orp_generative_resources.lua
@@ -82,9 +82,9 @@ OBS_RESOURCE_PACK_GENAI_MATERIALS =
   SDSLDWL6 = { t="SDSLDWL6", f="SDSLDFT6"},
   SDSLDWL7 = { t="SDSLDWL7", f="SDSLDFT7"},
   SDSLDWL8 = { t="SDSLDWL8", f="SDSLDFT8"},
-  SDSLDWL9 = { t="SDSLDWL9", f="SDSLDFT9"},
-  SDSLDWLA = { t="SDSLDWLA", f="SDSLDFT1"},
-  SDSLDWLB = { t="SDSLDWLB", f="SDSLDFT4"},
+  SDSLDWL9 = { t="SDSLDWL9", f="SDSLDFT1"},
+  SDSLDWLA = { t="SDSLDWLA", f="SDSLDFT3"},
+  SDSLDWLB = { t="SDSLDWLB", f="SDSLDFT5"},
   SDSLDWLC = { t="SDSLDWLC", f="SDSLDFT7"},
   -- flats: dark green
   SDSLDFT1 = { t="SDSLDWL1", f="SDSLDFT1"},
@@ -95,12 +95,15 @@ OBS_RESOURCE_PACK_GENAI_MATERIALS =
   SDSLDFT6 = { t="SDSLDWL6", f="SDSLDFT6"},
   SDSLDFT7 = { t="SDSLDWL7", f="SDSLDFT7"},
   SDSLDFT8 = { t="SDSLDWL8", f="SDSLDFT8"},
-  SDSLDFT9 = { t="SDSLDWL9", f="SDSLDFT9"},
-  SDSLDFTA = { t="SDSLDWLA", f="SDSLDFTA"},
-  SDSLDFTB = { t="SDSLDWLB", f="SDSLDFTB"},
-  SDSLDFTC = { t="SDSLDWLC", f="SDSLDFTC"},
-  SDSLDFTD = { t="SDSLDWL4", f="SDSLDFTD"},
-  SDSLDFTE = { t="SDSLDWL9", f="SDSLDFTE"},
+  -- full-green ceiling variations
+  SDSLDCL1 = { t="SDSLDWL9", f="SDSLDCL1"},
+  SDSLDCL2 = { t="SDSLDWLA", f="SDSLDCL2"},
+  SDSLDCL3 = { t="SDSLDWLB", f="SDSLDCL3"},
+  SDSLDCL4 = { t="SDSLDWLC", f="SDSLDCL4"},
+  SDSLDCL5 = { t="SDSLDWL4", f="SDSLDCL5"},
+  SDSLDCL6 = { t="SDSLDWL7", f="SDSLDCL6"},
+  SDSLDCL7 = { t="SDSLDWLA", f="SDSLDCL7"},
+  SDSLDCL8 = { t="SDSLDWLC", f="SDSLDCL8"},
 
   -- computers 256px
   SDMSRCP1 = { t="SDMSRCP1", f="SDOM_FT1"},
@@ -197,11 +200,11 @@ OBS_RESOURCE_PACK_GENAI_MATERIALS =
   SD_TWLW6 = { t="SD_TWLW6", f="SD_TWLF6"},
   SD_TWLW7 = { t="SD_TWLW7", f="SD_TWLF7"},
   SD_TWLW8 = { t="SD_TWLW8", f="SD_TWLF8"},
-  SD_TWLW9 = { t="SD_TWLW9", f="SD_TWLF9"},
-  SD_TWLWA = { t="SD_TWLWA", f="SD_TWLFA"},
-  SD_TWLWB = { t="SD_TWLWB", f="SD_TWLF1"},
-  SD_TWLWC = { t="SD_TWLWC", f="SD_TWLF4"},
-  SD_TWLWD = { t="SD_TWLWD", f="SD_TWLF7"},
+  SD_TWLW9 = { t="SD_TWLW9", f="SD_TWLF1"},
+  SD_TWLWA = { t="SD_TWLWA", f="SD_TWLF3"},
+  SD_TWLWB = { t="SD_TWLWB", f="SD_TWLF4"},
+  SD_TWLWC = { t="SD_TWLWC", f="SD_TWLF6"},
+  SD_TWLWD = { t="SD_TWLWD", f="SD_TWLF8"},
   -- flats
   SD_TWLF1 = { t="SD_TWLW1", f="SD_TWLF1"},
   SD_TWLF2 = { t="SD_TWLW3", f="SD_TWLF2"},
@@ -211,8 +214,6 @@ OBS_RESOURCE_PACK_GENAI_MATERIALS =
   SD_TWLF6 = { t="SD_TWLWA", f="SD_TWLF6"},
   SD_TWLF7 = { t="SD_TWLWB", f="SD_TWLF7"},
   SD_TWLF8 = { t="SD_TWLWC", f="SD_TWLF8"},
-  SD_TWLF9 = { t="SD_TWLWD", f="SD_TWLF9"},
-  SD_TWLFA = { t="SD_TWLW2", f="SD_TWLFA"},
 
   -- silver grate
   SD_TSGW1 = { t="SD_TSGW1", f="SD_TSGF1"},
@@ -947,12 +948,6 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
       SDSLDFT6 = 5,
       SDSLDFT7 = 5,
       SDSLDFT8 = 5,
-      SDSLDFT9 = 5,
-      SDSLDFTA = 5,
-      SDSLDFTB = 5,
-      SDSLDFTC = 5,
-      SDSLDFTD = 5,
-      SDSLDFTE = 5,
 
       FLOOR7_2 = 1,
       SLIME13 = 1,
@@ -975,20 +970,14 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
 
     ceilings =
     {
-      SDSLDFT1 = 5,
-      SDSLDFT2 = 5,
-      SDSLDFT3 = 5,
-      SDSLDFT4 = 5,
-      SDSLDFT5 = 5,
-      SDSLDFT6 = 5,
-      SDSLDFT7 = 5,
-      SDSLDFT8 = 5,
-      SDSLDFT9 = 5,
-      SDSLDFTA = 5,
-      SDSLDFTB = 5,
-      SDSLDFTC = 5,
-      SDSLDFTD = 5,
-      SDSLDFTE = 5,
+      SDSLDCL1 = 5,
+      SDSLDCL2 = 5,
+      SDSLDCL3 = 5,
+      SDSLDCL4 = 5,
+      SDSLDCL5 = 5,
+      SDSLDCL6 = 5,
+      SDSLDCL7 = 5,
+      SDSLDCL8 = 5,
 
       FLOOR7_2 = 1,
       SLIME13 = 1,
@@ -1299,8 +1288,6 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
       SD_TWLF6 = 5,
       SD_TWLF7 = 5,
       SD_TWLF8 = 5,
-      SD_TWLF9 = 5,
-      SD_TWLFA = 5,
 
       FLAT5_1 = 5,
       FLAT5_2 = 5,
@@ -1330,8 +1317,6 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
       SD_TWLF6 = 5,
       SD_TWLF7 = 5,
       SD_TWLF8 = 5,
-      SD_TWLF9 = 5,
-      SD_TWLFA = 5,
 
       FLAT5_1 = 5,
       FLAT5_2 = 5,
@@ -1971,12 +1956,6 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
       SDSLDFT6 = 12,
       SDSLDFT7 = 12,
       SDSLDFT8 = 12,
-      SDSLDFT9 = 12,
-      SDSLDFTA = 12,
-      SDSLDFTB = 12,
-      SDSLDFTC = 12,
-      SDSLDFTD = 12,
-      SDSLDFTE = 12,
 
       SD_TSGF3 = 15,
       SD_TSGF4 = 15,
@@ -2039,12 +2018,6 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
       SDSLDFT6 = 12,
       SDSLDFT7 = 12,
       SDSLDFT8 = 12,
-      SDSLDFT9 = 12,
-      SDSLDFTA = 12,
-      SDSLDFTB = 12,
-      SDSLDFTC = 12,
-      SDSLDFTD = 12,
-      SDSLDFTE = 12,
 
       SD_TSGF3 = 15,
       SD_TSGF4 = 15,
@@ -2644,13 +2617,7 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
       SDSLDFT5 = 12,
       SDSLDFT6 = 12,
       SDSLDFT7 = 12,
-      SDSLDFT8 = 12,
-      SDSLDFT9 = 12,
-      SDSLDFTA = 12,
-      SDSLDFTB = 12,
-      SDSLDFTC = 12,
-      SDSLDFTD = 12,
-      SDSLDFTE = 12
+      SDSLDFT8 = 12
     },
 
     ceilings =
@@ -2695,20 +2662,14 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
       QFLAT09 = 5,
       QFLAT10 = 5,
 
-      SDSLDFT1 = 12,
-      SDSLDFT2 = 12,
-      SDSLDFT3 = 12,
-      SDSLDFT4 = 12,
-      SDSLDFT5 = 12,
-      SDSLDFT6 = 12,
-      SDSLDFT7 = 12,
-      SDSLDFT8 = 12,
-      SDSLDFT9 = 12,
-      SDSLDFTA = 12,
-      SDSLDFTB = 12,
-      SDSLDFTC = 12,
-      SDSLDFTD = 12,
-      SDSLDFTE = 12
+      SDSLDCL1 = 15,
+      SDSLDCL2 = 15,
+      SDSLDCL3 = 15,
+      SDSLDCL4 = 15,
+      SDSLDCL5 = 15,
+      SDSLDCL6 = 15,
+      SDSLDCL7 = 15,
+      SDSLDCL8 = 15
     }
   },
 
@@ -3249,20 +3210,14 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
       GRENFLOR = 50,
       STARG1F = 25,
 
-      SDSLDFT1 = 15,
-      SDSLDFT2 = 15,
-      SDSLDFT3 = 15,
-      SDSLDFT4 = 15,
-      SDSLDFT5 = 15,
-      SDSLDFT6 = 15,
-      SDSLDFT7 = 15,
-      SDSLDFT8 = 15,
-      SDSLDFT9 = 15,
-      SDSLDFTA = 15,
-      SDSLDFTB = 15,
-      SDSLDFTC = 15,
-      SDSLDFTD = 15,
-      SDSLDFTE = 15
+      SDSLDCL1 = 15,
+      SDSLDCL2 = 15,
+      SDSLDCL3 = 15,
+      SDSLDCL4 = 15,
+      SDSLDCL5 = 15,
+      SDSLDCL6 = 15,
+      SDSLDCL7 = 15,
+      SDSLDCL8 = 15
     },
 
     ceilings =
@@ -3279,20 +3234,14 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
       GRENFLOR = 50,
       STARG1F = 25,
 
-      SDSLDFT1 = 15,
-      SDSLDFT2 = 15,
-      SDSLDFT3 = 15,
-      SDSLDFT4 = 15,
-      SDSLDFT5 = 15,
-      SDSLDFT6 = 15,
-      SDSLDFT7 = 15,
-      SDSLDFT8 = 15,
-      SDSLDFT9 = 15,
-      SDSLDFTA = 15,
-      SDSLDFTB = 15,
-      SDSLDFTC = 15,
-      SDSLDFTD = 15,
-      SDSLDFTE = 15
+      SDSLDCL1 = 15,
+      SDSLDCL2 = 15,
+      SDSLDCL3 = 15,
+      SDSLDCL4 = 15,
+      SDSLDCL5 = 15,
+      SDSLDCL6 = 15,
+      SDSLDCL7 = 15,
+      SDSLDCL8 = 15
     }
   },
 
@@ -3329,12 +3278,6 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
       SDSLDFT6 = 5,
       SDSLDFT7 = 5,
       SDSLDFT8 = 5,
-      SDSLDFT9 = 5,
-      SDSLDFTA = 5,
-      SDSLDFTB = 5,
-      SDSLDFTC = 5,
-      SDSLDFTD = 5,
-      SDSLDFTE = 5,
 
       FLOOR7_2 = 1,
       SLIME13 = 1,
@@ -3357,20 +3300,14 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
 
     ceilings =
     {
-      SDSLDFT1 = 5,
-      SDSLDFT2 = 5,
-      SDSLDFT3 = 5,
-      SDSLDFT4 = 5,
-      SDSLDFT5 = 5,
-      SDSLDFT6 = 5,
-      SDSLDFT7 = 5,
-      SDSLDFT8 = 5,
-      SDSLDFT9 = 5,
-      SDSLDFTA = 5,
-      SDSLDFTB = 5,
-      SDSLDFTC = 5,
-      SDSLDFTD = 5,
-      SDSLDFTE = 5,
+      SDSLDCL1 = 5,
+      SDSLDCL2 = 5,
+      SDSLDCL3 = 5,
+      SDSLDCL4 = 5,
+      SDSLDCL5 = 5,
+      SDSLDCL6 = 5,
+      SDSLDCL7 = 5,
+      SDSLDCL8 = 5,
 
       FLOOR7_2 = 1,
       SLIME13 = 1,
@@ -3572,8 +3509,6 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
       SD_TWLF6 = 5,
       SD_TWLF7 = 5,
       SD_TWLF8 = 5,
-      SD_TWLF9 = 5,
-      SD_TWLFA = 5,
 
       FLAT5_1 = 5,
       FLAT5_2 = 5,
@@ -3603,8 +3538,6 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
       SD_TWLF6 = 5,
       SD_TWLF7 = 5,
       SD_TWLF8 = 5,
-      SD_TWLF9 = 5,
-      SD_TWLFA = 5,
 
       FLAT5_1 = 5,
       FLAT5_2 = 5,