Prep work for Magiclysm dragon lair and adds underground terrains/fur…

…niture (#33877) * add new terrains * black dragon lair draft * add lair layers * add 2 furniture emitters, minor changes * suppress special * fix test * Update data/json/furniture_and_terrain/furniture.json Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
CleverRaven · Sep 8, 2019 · 92a1956 · 92a1956
1 parent f629f3c
commit 92a1956
Show file tree

Hide file tree

Showing 10 changed files with 936 additions and 0 deletions.
diff --git a/data/json/emit.json b/data/json/emit.json
@@ -242,5 +242,18 @@
     "type": "emit",
     "field": "fd_fungal_haze",
     "qty": 200
+  },
+  {
+    "id": "emit_swamp_gas_leak",
+    "type": "emit",
+    "field": "fd_swamp_gas",
+    "intensity": 1,
+    "chance": 15
+  },
+  {
+    "id": "emit_fog_plume",
+    "type": "emit",
+    "field": "fd_fog",
+    "qty": 200
   }
 ]
diff --git a/data/json/field_type.json b/data/json/field_type.json
@@ -654,6 +654,40 @@
     "display_items": false,
     "display_field": true
   },
+  {
+    "id": "fd_swamp_gas",
+    "type": "field_type",
+    "legacy_enum_id": 13,
+    "intensity_levels": [ { "name": "swamp gas", "sym": ".", "dangerous": true, "translucency": 5 } ],
+    "decay_amount_factor": 5,
+    "gas_absorption_factor": 15,
+    "percent_spread": 25,
+    "outdoor_age_speedup": "1 minutes",
+    "dirty_transparency_cache": true,
+    "has_fume": true,
+    "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ] },
+    "priority": 8,
+    "half_life": "25 minutes",
+    "phase": "gas",
+    "display_items": false,
+    "display_field": true
+  },
+  {
+    "id": "fd_fog",
+    "type": "field_type",
+    "intensity_levels": [ { "name": "fog", "sym": "~", "dangerous": false, "transparent": false, "translucency": 2 } ],
+    "decay_amount_factor": 15,
+    "gas_absorption_factor": 5,
+    "percent_spread": 55,
+    "outdoor_age_speedup": "5 minutes",
+    "dirty_transparency_cache": true,
+    "has_fume": true,
+    "priority": 8,
+    "half_life": "50 minutes",
+    "phase": "gas",
+    "display_items": false,
+    "display_field": true
+  },
   {
     "id": "fd_fungal_haze",
     "type": "field_type",

diff --git a/data/json/furniture_and_terrain/furniture.json b/data/json/furniture_and_terrain/furniture.json
@@ -4883,5 +4883,35 @@
     "move_cost_mod": 2,
     "required_str": -1,
     "flags": [ "NOITEM" ]
+  },
+  {
+    "type": "furniture",
+    "id": "f_swamp_gas",
+    "name": "swamp gas",
+    "description": "This is a pool of murkey water, it occassionaly bubbles, releasing a mildly toxic gas.",
+    "looks_like": "t_water_sh",
+    "symbol": "~",
+    "color": "blue",
+    "move_cost_mod": 1,
+    "coverage": 0,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "EMITTER" ],
+    "emissions": [ "emit_swamp_gas_leak" ],
+    "//": "a very mild toxicant, inducing nausea.",
+    "bash": { "str_min": 30, "str_max": 60, "sound": "splash!", "sound_fail": "splash!", "furn_set": "f_swamp_gas" }
+  },
+  {
+    "type": "furniture",
+    "id": "f_fog",
+    "name": "fog",
+    "description": "This is a misty cloud of fog.",
+    "looks_like": "t_moss",
+    "symbol": "^",
+    "color": "light_gray",
+    "move_cost_mod": 2,
+    "coverage": 0,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "EMITTER" ],
+    "emissions": [ "emit_fog_plume" ]
   }
 ]
diff --git a/data/json/furniture_and_terrain/terrain-floors-outdoors.json b/data/json/furniture_and_terrain/terrain-floors-outdoors.json
@@ -21,6 +21,18 @@
     "flags": [ "TRANSPARENT", "DIGGABLE", "FLAT" ],
     "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 50, "str_max": 100, "str_min_supported": 100, "bash_below": true }
   },
+  {
+    "type": "terrain",
+    "id": "t_mud",
+    "name": "mud",
+    "description": "An area of wet, slick mud.",
+    "symbol": ".",
+    "color": "brown",
+    "looks_like": "t_dirt",
+    "move_cost": 3,
+    "flags": [ "TRANSPARENT", "DIGGABLE", "FLAT" ],
+    "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 50, "str_max": 100, "str_min_supported": 100, "bash_below": true }
+  },
   {
     "type": "terrain",
     "id": "t_clay",

diff --git a/data/json/furniture_and_terrain/terrain-floors_indoor.json b/data/json/furniture_and_terrain/terrain-floors_indoor.json
@@ -668,5 +668,94 @@
         { "item": "lead", "count": [ 12, 18 ] }
       ]
     }
+  },
+  {
+    "type": "terrain",
+    "id": "t_dirt_underground",
+    "//": "for caverns and other natural underground formations.",
+    "name": "dirt",
+    "description": "It's dirt.  Looks like some fine soil for tillage.  Could also be dug out for construction projects.",
+    "symbol": ".",
+    "color": "brown",
+    "move_cost": 2,
+    "looks_like": "t_dirt",
+    "roof": "t_rock_roof",
+    "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD", "PLOWABLE", "DIGGABLE" ],
+    "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 50, "str_max": 100, "str_min_supported": 100, "bash_below": true }
+  },
+  {
+    "type": "terrain",
+    "id": "t_sand_underground",
+    "name": "sand",
+    "//": "for caverns and other natural underground formations.",
+    "description": "A large area of fine sand that could be useful in a number of ways, if it was extracted properly.",
+    "symbol": ".",
+    "color": "yellow",
+    "looks_like": "t_sand",
+    "move_cost": 3,
+    "roof": "t_rock_roof",
+    "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT", "DIGGABLE" ],
+    "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 50, "str_max": 100, "str_min_supported": 100, "bash_below": true }
+  },
+  {
+    "type": "terrain",
+    "id": "t_mud_underground",
+    "//": "for caverns and other natural underground formations.",
+    "name": "mud",
+    "looks_like": "t_dirt",
+    "description": "An area of wet, slick mud.",
+    "symbol": ".",
+    "color": "brown",
+    "move_cost": 3,
+    "roof": "t_rock_roof",
+    "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT", "DIGGABLE" ],
+    "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 50, "str_max": 100, "str_min_supported": 100, "bash_below": true }
+  },
+  {
+    "type": "terrain",
+    "id": "t_moss_underground",
+    "name": "moss",
+    "//": "for caverns and other natural underground formations.",
+    "looks_like": "t_grass",
+    "roof": "t_rock_roof",
+    "description": "Moist spongy moss.",
+    "symbol": ".",
+    "color": "light_green",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "DIGGABLE", "FLAT", "SUPPORTS_ROOF", "INDOORS" ],
+    "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 40, "str_max": 100, "str_min_supported": 100, "bash_below": true }
+  },
+  {
+    "type": "terrain",
+    "id": "t_clay_underground",
+    "name": "clay",
+    "//": "for caverns and other natural underground formations.",
+    "description": "A field full of malleable clay, suitable for kiln firing if it was extracted properly.",
+    "symbol": ".",
+    "color": "light_red",
+    "move_cost": 2,
+    "roof": "t_rock_roof",
+    "flags": [ "TRANSPARENT", "DIGGABLE", "FLAT", "SUPPORTS_ROOF", "INDOORS" ],
+    "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 50, "str_max": 100, "str_min_supported": 100, "bash_below": true }
+  },
+  {
+    "type": "terrain",
+    "id": "t_claymound_underground",
+    "name": "mound of clay",
+    "description": "A mound of clay soil.",
+    "//": "for caverns and other natural underground formations.",
+    "symbol": "#",
+    "color": "brown",
+    "move_cost": 5,
+    "roof": "t_rock_roof",
+    "flags": [ "TRANSPARENT", "BURROWABLE", "SUPPORTS_ROOF", "INDOORS" ],
+    "bash": {
+      "str_min": 2,
+      "str_max": 4,
+      "sound": "splosh!",
+      "sound_fail": "splosh!",
+      "ter_set": "t_water_dp",
+      "items": [ { "item": "clay_lump", "count": [ 6, 12 ] } ]
+    }
   }
 ]