Merge pull request #27 from GTD-Carthage/obsidian

mlem

games/doom/fabs/wall/gtd_wall_hideous_cover.lua → attic/obaddon_stuff/unused/gtd_wall_hideous_cover.lua

@@ -7,9 +7,6 @@ PREFABS.Wall_HD_crate_pile =
   file   = "wall/gtd_wall_hideous_cover.wad",
   map    = "MAP01",
 
-  is_hideous_destructor_fab = true,
-  on_liquids = "never",
-
   prob   = 15,
   env   = "building",
 

games/doom/fabs/cage/dem_cages.lua

@@ -466,5 +466,37 @@ PREFABS.Cage_dem_cabinamb =
     dead_zombie = 50,
     dead_shooter = 50,
     dead_imp = 50,
-  }
+  },
 }
+
+---- a dug up grave with a monster rising when you get close. ----
+
+PREFABS.Decor_Dem_Graveamb1 =
+{
+  file   = "cage/dem_cages.wad",
+  map    = "MAP49",
+
+  group = "dem_wall_graveyard",
+
+  engine = "zdoom",
+
+  prob   = 100,
+  theme  = "!tech",
+  env    = "park",
+
+  where  = "point",
+  size   = 128,
+
+  bound_z1 = 0,
+  bound_z2 = 128,
+
+  delta = 116,
+
+  z_fit = "top",
+
+  on_liquids = "never",
+
+  sink_mode = "never_liquids",
+
+}
+

games/doom/fabs/decor/dem_graves.lua

@@ -0,0 +1,100 @@
+--
+-- Graves for outdoor urban and hell
+--
+
+-- a dug up grave with a closed casket
+
+PREFABS.Decor_Dem_Grave1 =
+{
+  file   = "decor/dem_graves.wad",
+  map    = "MAP01",
+
+  -- group = "dem_wall_graveyard", --MSSP-TODO: Re-add later
+
+  engine = "zdoom",
+
+  prob   = 15000, --100
+  theme  = "!tech",
+  env    = "park",
+
+  where  = "point",
+  size   = 64,
+
+  bound_z1 = 0,
+  bound_z2 = 128,
+
+  delta = 64,
+
+  z_fit = "top",
+
+  on_liquids = "never",
+}
+
+-- a dug up grave with an open casket
+
+PREFABS.Decor_Dem_Grave2 =
+{
+  template = "Decor_Dem_Grave1",
+  map = "MAP02",
+}
+
+-- a dug up grave
+
+PREFABS.Decor_Dem_Grave3 =
+{
+  template = "Decor_Dem_Grave1",
+  map = "MAP03",
+
+  thing_24 =
+  {
+    gibs = 50,
+    gibbed_player = 50,
+    dead_player = 50,
+    dead_zombie = 50,
+    dead_shooter = 50,
+    dead_imp = 50,
+    Nothing = 50,
+  },
+}
+
+-- a regular grave
+
+PREFABS.Decor_Dem_Grave4 =
+{
+  template = "Decor_Dem_Grave1",
+  map = "MAP04",
+}
+
+-- a fancier regular grave
+
+PREFABS.Decor_Dem_Grave5 =
+{
+  template = "Decor_Dem_Grave1",
+  map = "MAP05",
+}
+
+-- a tall regular grave
+
+PREFABS.Decor_Dem_Grave6 =
+{
+  template = "Decor_Dem_Grave1",
+  map = "MAP06",
+
+  texture_pack = "armaetus",
+}
+
+-- a fresh regular grave
+
+PREFABS.Decor_Dem_Grave7 =
+{
+  template = "Decor_Dem_Grave1",
+  map = "MAP07",
+}
+
+-- a fresh regular grave2
+
+PREFABS.Decor_Dem_Grave8 =
+{
+  template = "Decor_Dem_Grave1",
+  map = "MAP08",
+}

games/doom/fabs/decor/gtd_ceil_light_generic_EPIC.lua

@@ -0,0 +1,50 @@
+PREFABS.Light_gtd_black_diamond_quad_white =
+{
+  file   = "decor/gtd_ceil_light_generic_EPIC.wad",
+  map    = "MAP01",
+
+  prob   = 35,
+  env    = "building",
+
+  kind   = "light",
+  where  = "point",
+
+  texture_pack = "armaetus",
+
+  height = 128,
+
+  bound_z1 = -32,
+  bound_z2 = 0,
+
+  light_color = "white",
+
+  -- use the occasional-blink FX (fairly rarely)
+  sector_1  = { [0]=90, [1]=15 }
+}
+
+PREFABS.Light_gtd_black_diamond_quad_red =
+{
+  template = "Light_gtd_black_diamond_quad_white",
+
+  light_color = "red",
+
+  flat_LIGHTS3 = "LIGHTS1"
+}
+
+PREFABS.Light_gtd_black_diamond_quad_green =
+{
+  template = "Light_gtd_black_diamond_quad_white",
+
+  light_color = "green",
+
+  flat_LIGHTS3 = "LIGHTS2"
+}
+
+PREFABS.Light_gtd_black_diamond_quad_blue =
+{
+  template = "Light_gtd_black_diamond_quad_white",
+
+  light_color = "blue",
+
+  flat_LIGHTS3 = "LIGHTS4"
+}

games/doom/fabs/decor/gtd_ceil_light_tech.lua

@@ -19,7 +19,6 @@ PREFABS.Light_gtd_detailed =
 
   -- use the occasional-blink FX (fairly rarely)
   sector_1  = { [0]=90, [1]=15 }
-
 }
 
 -- red circles with green cover
@@ -72,6 +71,7 @@ PREFABS.Light_gtd_flourescent_lamp_alt =
   flat_FLAT23 = "FLAT14",
 }
 
+--
 PREFABS.Light_gtd_round =
 {
   template = "Light_gtd_detailed",
@@ -97,6 +97,7 @@ PREFABS.Light_gtd_round_alt =
   flat_FLAT23 = "FLAT22",
 }
 
+--
 PREFABS.Light_gtd_tall_light =
 {
   template = "Light_gtd_detailed",
@@ -125,3 +126,109 @@ PREFABS.Light_gtd_tall_light_alt =
   tex_EXITDOOR = "LITEBLU1",
   flat_FLAT23 = "FLAT14",
 }
+
+----------------------------------------------
+-- TLITE circles arranged in a quad pattern --
+----------------------------------------------
+PREFABS.Light_gtd_circle_quad_tight =
+{
+  template = "Light_gtd_detailed",
+  map = "MAP05",
+
+  light_color = "beige"
+}
+
+PREFABS.Light_gtd_circle_quad_tight_red =
+{
+  template = "Light_gtd_detailed",
+  map = "MAP05",
+
+  light_color = "red",
+
+  flat_TLITE6_6 = "TLITE6_5"
+}
+
+-- epic versions
+PREFABS.Light_gtd_circle_quad_tightwhite_EPIC =
+{
+  template = "Light_gtd_detailed",
+  map = "MAP05",
+
+  light_color = "white",
+
+  texture_pack = "armaetus",
+
+  flat_TLITE6_6 = "TLITE5_3"
+}
+
+PREFABS.Light_gtd_circle_quad_tight_blue_EPIC =
+{
+  template = "Light_gtd_detailed",
+  map = "MAP05",
+
+  light_color = "blue",
+
+  texture_pack = "armaetus",
+
+  flat_TLITE6_6 = "TLITE65B"
+}
+
+PREFABS.Light_gtd_circle_quad_tight_green_EPIC =
+{
+  template = "Light_gtd_detailed",
+  map = "MAP05",
+
+  light_color = "green",
+
+  texture_pack = "armaetus",
+
+  flat_TLITE6_6 = "TLITE65G"
+}
+
+PREFABS.Light_gtd_circle_quad_tight_orange_EPIC =
+{
+  template = "Light_gtd_detailed",
+  map = "MAP05",
+
+  light_color = "orange",
+
+  texture_pack = "armaetus",
+
+  flat_TLITE6_6 = "TLITE65O"
+}
+
+PREFABS.Light_gtd_circle_quad_tight_yellow_EPIC =
+{
+  template = "Light_gtd_detailed",
+  map = "MAP05",
+
+  light_color = "yellow",
+
+  texture_pack = "armaetus",
+
+  flat_TLITE6_6 = "TLITE65Y"
+}
+
+----------------------------------------------
+-- TLITE circles arranged in a quad pattern --
+----------------------------------------------
+PREFABS.Light_gtd_diamond_tight =
+{
+  template = "Light_gtd_detailed",
+  map = "MAP06",
+
+  light_color = "beige"
+}
+
+-- epic version
+PREFABS.Light_gtd_diamond_tight_white_EPIC =
+{
+  template = "Light_gtd_detailed",
+  map = "MAP06",
+
+  light_color = "white",
+
+  texture_pack = "armaetus",
+
+  flat_TLITE6_4 = "TLITE5_1"
+}