Merge pull request #26 from GTD-Carthage/obsidian

aaaaaaaaaaaaaa
obsidian-level-maker · Apr 18, 2021 · d895df1 · d895df1
2 parents 5342d7d + f31b102
commit d895df1
Show file tree

Hide file tree

Showing 8 changed files with 118 additions and 45 deletions.
diff --git a/games/doom/data/ObAddon_Textures_2.wad b/games/doom/data/ObAddon_Textures_2.wad
diff --git a/games/doom/fabs/picture/armaetus_pic_EPIC_wall_vending.lua b/games/doom/fabs/picture/armaetus_pic_EPIC_wall_vending.lua
@@ -0,0 +1,34 @@
+PREFABS.Pic_in_wall_vending_machines =
+{
+  file = "wall/armaetus_pic_EPIC_wall_vending.wad",
+  map = "MAP01",
+
+  prob = 25,
+  env = "building",
+  theme = "!hell",
+
+  texture_pack = "armaetus",
+
+  where  = "seeds",
+
+  height = 128,
+
+  seed_w = 2,
+  seed_h = 1,
+
+  bound_z1 = 0,
+  bound_z2 = 128,
+
+  tex_OBVNMCH1 =
+  {
+    OBVNMCH1 = 50,
+    OBVNMCH2 = 50,
+    OBVNMCH3 = 50,
+    OBVNMCH4 = 50,
+    OBVNMCH5 = 50,
+  },
+
+  z_fit = "top",
+
+  --sound = "Vending_Machine_Hum", -- Needs ambient sound thing applied!
+}
diff --git a/games/doom/fabs/picture/armaetus_pic_EPIC_wall_vending.wad b/games/doom/fabs/picture/armaetus_pic_EPIC_wall_vending.wad
diff --git a/games/doom/fabs/wall/armaetus_EPIC_wallvending.lua b/games/doom/fabs/wall/armaetus_EPIC_wallvending.lua
diff --git a/games/doom/fabs/wall/armaetus_EPIC_wallvending.wad b/games/doom/fabs/wall/armaetus_EPIC_wallvending.wad
diff --git a/games/doom/fabs/wall/gtd_wall_tech_top_corner_light_set.lua b/games/doom/fabs/wall/gtd_wall_tech_top_corner_light_set.lua
@@ -30,6 +30,7 @@ PREFABS.Wall_tech_windows_top_corner_light_diag =
 PREFABS.Wall_tech_windows_top_corner_light_hell =
 {
   template = "Wall_tech_windows_top_corner_light",
+
   theme = "hell",
 
   tex_TEKLITE2 = "SKINEDGE",
@@ -39,6 +40,8 @@ PREFABS.Wall_tech_windows_top_corner_light_hell =
 PREFABS.Wall_tech_windows_top_corner_light_diag_hell =
 {
   template = "Wall_tech_windows_top_corner_light",
+  map = "MAP02",
+
   theme = "hell",
 
   where  = "diagonal",

diff --git a/modules/zdoom_armaetus_materials.lua b/modules/zdoom_armaetus_materials.lua
@@ -1330,6 +1330,11 @@ ARMAETUS_MATERIALS = {
   OBTBSLV4 = { t="OBTBSLV4", f="SHINY03"},
   OBTBSLV5 = { t="OBTBSLV5", f="FLAT3"},
 
+  -- silver wall, bronze-framed (256px)
+  OBTSVBZ1 = { t="OBTSVBZ1", f="G8_BRNF1"},
+  OBTSVBZ2 = { t="OBTSVBZ2", f="G8_BRNF2"},
+  OBTSVBZ3 = { t="OBTSVBZ3", f="G8_BRNF3"},
+
   -- silver walls (128px)
   OBTBSTX1 = { t="OBTBSTX1", f="SHINY03"},
   OBTBSTX2 = { t="OBTBSTX2", f="GRATE1"},

diff --git a/modules/zdoom_armaetus_themes.lua b/modules/zdoom_armaetus_themes.lua
@@ -173,7 +173,7 @@ ARMAETUS_ROOM_THEMES =
       FLAT1 = 1
     }
   },
-  -- END OF HALLWAY THEMES
+-- END OF HALLWAY THEMES
 
   tech_GrayMet =
   {
@@ -263,7 +263,11 @@ ARMAETUS_ROOM_THEMES =
       G8_BR2GY = 20,
       G8_BR3GY = 20,
 
-      OBTSBGRE = 10
+      OBTSBGRE = 10,
+
+      OBTSVBZ1 = 20,
+      OBTSVBZ2 = 20,
+      OBTSVBZ3 = 20,
     },
 
     floors =
@@ -800,7 +804,12 @@ ARMAETUS_ROOM_THEMES =
 
       OBTBSTX1 = 15,
       OBTBSTX2 = 15,
-      OBTBSTX3 = 15
+      OBTBSTX3 = 15,
+
+      OBTSVBZ1 = 15,
+      OBTSVBZ2 = 15,
+      OBTSVBZ3 = 15,
+
     },
 
     floors =
@@ -871,6 +880,11 @@ ARMAETUS_ROOM_THEMES =
       G8_BR3GY = 10,
 
       OBTSBGRE = 8,
+
+      OBTSVBZ1 = 10,
+      OBTSVBZ2 = 10,
+      OBTSVBZ3 = 10,
+
     },
 
     floors =
@@ -980,7 +994,12 @@ ARMAETUS_ROOM_THEMES =
       G8_BR2GY = 20,
       G8_BR3GY = 20,
 
-      OBTSBGRE = 8
+      OBTSBGRE = 8,
+
+      OBTSVBZ1 = 15,
+      OBTSVBZ2 = 15,
+      OBTSVBZ3 = 15,
+
     },
 
     floors =
@@ -1051,7 +1070,11 @@ ARMAETUS_ROOM_THEMES =
 
       G8_BRNW1 = 20,
       G8_BRNW2 = 20,
-      G8_BRNW3 = 20
+      G8_BRNW3 = 20,
+
+      OBTSVBZ1 = 10,
+      OBTSVBZ2 = 10,
+      OBTSVBZ3 = 10,
     },
 
     floors =
@@ -1343,6 +1366,14 @@ ARMAETUS_ROOM_THEMES =
       GOTH48 = 15,
       GOTH49 = 15,
 
+      --
+      BRIC9GRN = 15,
+      BRIC9GRY = 15,
+      BRIC9TAN = 15,
+      BRICEGRN = 15,
+      BRICEGRY = 15,
+
+      --
       OBTBSLB3 = 15,
       OBTBSLB4 = 15,
 
@@ -1528,6 +1559,10 @@ ARMAETUS_ROOM_THEMES =
       HELLCMT2 = 20,
       HELLCMT7 = 15,
       HELLCMT8 = 15,
+
+      OBTSVBZ1 = 15,
+      OBTSVBZ2 = 15,
+      OBTSVBZ3 = 15,
     },
 
     floors =
@@ -1739,6 +1774,8 @@ ARMAETUS_ROOM_THEMES =
       EGYPT04 = 50,
       EGYPT05 = 50,
       EGYPT06 = 50,
+
+      BRIC9TAN = 50,
     },
 
     floors =
@@ -1862,6 +1899,10 @@ ARMAETUS_ROOM_THEMES =
       G7_GOGN1 = 10,
       G7_GOGN2 = 10,
       G7_GOGN3 = 10,
+
+      OBTSVBZ1 = 10,
+      OBTSVBZ2 = 10,
+      OBTSVBZ3 = 10,
     },
 
     floors =
@@ -2791,7 +2832,11 @@ ARMAETUS_ROOM_THEMES =
       G8_BRNW3 = 10,
       G8_BR1GY = 10,
       G8_BR2GY = 10,
-      G8_BR3GY = 10
+      G8_BR3GY = 10,
+
+      OBTSVBZ1 = 10,
+      OBTSVBZ2 = 10,
+      OBTSVBZ3 = 10
     },
 
     floors =
@@ -4341,7 +4386,11 @@ ARMAETUS_THEMES =
       G8_BRNW3 = 10,
       G8_BR1GY = 10,
       G8_BR2GY = 10,
-      G8_BR3GY = 10
+      G8_BR3GY = 10,
+
+      OBTSVBZ1 = 15,
+      OBTSVBZ2 = 15,
+      OBTSVBZ3 = 15,
     },
 
     fences = 
@@ -4663,6 +4712,14 @@ ARMAETUS_THEMES =
       BRONZE1 = 10,
       BRONZE3 = 10,
 
+      --
+      BRIC9GRN = 15,
+      BRIC9GRY = 15,
+      BRIC9TAN = 15,
+      BRICEGRN = 15,
+      BRICEGRY = 15,
+
+      --
       OBTBSLV1 = 15,
       OBTBSLV2 = 15,
 
@@ -4676,7 +4733,11 @@ ARMAETUS_THEMES =
 
       OBTBSB2B = 15,
       OBTBSB3B = 15,
-      OBTBSB4B = 15
+      OBTBSB4B = 15,
+
+      OBTSVBZ1 = 15,
+      OBTSVBZ2 = 15,
+      OBTSVBZ3 = 15,
     },
 
     fences =
@@ -5088,6 +5149,13 @@ ARMAETUS_THEMES =
       CRGRSWLL = 7,
       CRHRTWLL = 7,
 
+      --
+      BRIC9GRN = 15,
+      BRIC9GRY = 15,
+      BRIC9TAN = 15,
+      BRICEGRN = 15,
+      BRICEGRY = 15,
+
       -- MSSP stuff
       OBTBSLB2 = 15,
       OBTBSLB3 = 15,