Merge pull request #82939 from BalthazarArgall/FixSunkenHeli

Author: Maleclypse

data/json/furniture_and_terrain/special_use/sunken_helicopter_furniture.json

@@ -1,62 +1,63 @@
 [
   {
-    "type": "terrain",
     "id": "t_sunkenhelicopter_floor",
+    "copy-from": "t_scrap_floor",
+    "type": "terrain",
+    "extend": { "flags": [ "LIQUID", "SWIMMABLE", "DEEP_WATER", "WATER_CUBE" ] },
     "name": "waterlogged aisle",
     "description": "A waterlogged aisle.  It has started to degrade after some time spent underwater.  Absolutely unrecoverable.",
-    "connect_groups": [ "INDOORFLOOR", "MULCHFLOOR" ],
-    "copy-from": "t_scrap_floor"
+    "connect_groups": [ "INDOORFLOOR", "MULCHFLOOR" ]
   },
   {
-    "type": "terrain",
     "id": "t_sunkenhelicopter_floor_rotator",
-    "connect_groups": [ "INDOORFLOOR", "MULCHFLOOR" ],
-    "copy-from": "t_sunkenhelicopter_floor"
+    "copy-from": "t_sunkenhelicopter_floor",
+    "type": "terrain",
+    "connect_groups": [ "INDOORFLOOR", "MULCHFLOOR" ]
   },
   {
-    "type": "terrain",
     "id": "t_sunkenhelicopter_wall_nw",
-    "name": "waterlogged board",
     "copy-from": "t_scrap_wall",
+    "type": "terrain",
+    "name": "waterlogged board",
     "description": "A waterlogged metal wall.  Keeps zombies outside the vehicle and prevents people from seeing through it.  It has started to degrade after some time spent underwater.  Absolutely unrecoverable."
   },
   {
-    "type": "terrain",
     "id": "t_sunkenhelicopter_wall_ne",
+    "type": "terrain",
     "copy-from": "t_sunkenhelicopter_wall_nw"
   },
   {
-    "type": "terrain",
     "id": "t_sunkenhelicopter_wall_w",
+    "type": "terrain",
     "copy-from": "t_sunkenhelicopter_wall_nw"
   },
   {
-    "type": "terrain",
     "id": "t_sunkenhelicopter_wall_e",
+    "type": "terrain",
     "copy-from": "t_sunkenhelicopter_wall_nw"
   },
   {
-    "type": "terrain",
     "id": "t_sunkenhelicopter_wall_s",
+    "type": "terrain",
     "copy-from": "t_sunkenhelicopter_wall_nw"
   },
   {
-    "type": "terrain",
     "id": "t_sunkenhelicopter_wall_sw",
+    "type": "terrain",
     "copy-from": "t_sunkenhelicopter_wall_nw"
   },
   {
-    "type": "terrain",
     "id": "t_sunkenhelicopter_wall_se",
+    "type": "terrain",
     "copy-from": "t_sunkenhelicopter_wall_nw"
   },
   {
-    "type": "terrain",
     "id": "t_sunkenhelicopter_quarterpanel_n_middle",
+    "copy-from": "t_drystone_wall_half",
+    "type": "terrain",
     "name": "waterlogged quarterpanel",
     "description": "A waterlogged half-height metal wall.  Keeps zombies outside the vehicle but allows people to see over it.  It has started to degrade after some time spent underwater.  Absolutely unrecoverable.",
-    "copy-from": "t_drystone_wall_half",
-    "flags": [ "TRANSPARENT", "NOITEM", "THIN_OBSTACLE" ],
+    "flags": [ "TRANSPARENT", "NOITEM", "THIN_OBSTACLE", "LIQUID", "SWIMMABLE", "DEEP_WATER", "WATER_CUBE" ],
     "bash": {
       "str_min": 80,
       "str_max": 200,
@@ -67,31 +68,33 @@
     }
   },
   {
-    "type": "terrain",
     "id": "t_sunkenhelicopter_quarterpanel_n_left",
+    "type": "terrain",
     "copy-from": "t_sunkenhelicopter_quarterpanel_n_middle"
   },
   {
-    "type": "terrain",
     "id": "t_sunkenhelicopter_quarterpanel_n_right",
+    "type": "terrain",
     "copy-from": "t_sunkenhelicopter_quarterpanel_n_middle"
   },
   {
-    "type": "terrain",
     "id": "t_sunkenhelicopter_windshield_n",
     "copy-from": "t_window",
+    "type": "terrain",
     "name": "waterlogged windshield",
     "description": "A waterlogged sheet of glass that lets you see outside the vehicle.  It has started to degrade after some time spent underwater.  Absolutely unrecoverable.",
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "NOITEM" ],
     "shoot": { "reduce_damage": [ 1, 4 ], "reduce_damage_laser": [ 0, 4 ], "destroy_damage": [ 1, 4 ], "no_laser_destroy": true }
   },
   {
-    "type": "terrain",
     "id": "t_sunkenhelicopter_frame",
+    "copy-from": "t_junk_floor",
+    "extend": { "flags": [ "LIQUID", "SWIMMABLE", "DEEP_WATER", "WATER_CUBE" ] },
+    "type": "terrain",
     "name": "waterlogged frame",
     "description": "A waterlogged metal framework.  Other vehicle components can be mounted on it, and it can be attached to other frames to increase the vehicle's size.  It has started to degrade after some time spent underwater.  Absolutely unrecoverable.",
-    "copy-from": "t_junk_floor"
+    "flags": [ "TRANSPARENT", "NOITEM" ]
   },
   {
     "type": "furniture",
@@ -102,17 +105,18 @@
     "rotates_to": "MULCHFLOOR"
   },
   {
-    "type": "terrain",
     "id": "t_sunkenhelicopter_roof",
+    "copy-from": "t_sunkenhelicopter_floor",
+    "extend": { "flags": [ "LIQUID", "SWIMMABLE", "DEEP_WATER", "WATER_CUBE" ] },
+    "type": "terrain",
     "name": "waterlogged roof",
-    "description": "A waterlogged metal roof.  Absolutely unrecoverable.",
-    "copy-from": "t_sunkenhelicopter_floor"
+    "description": "A waterlogged metal roof.  Absolutely unrecoverable."
   },
   {
-    "type": "terrain",
     "id": "t_sunkenhelicopter_rotor",
+    "copy-from": "t_sunkenhelicopter_floor",
+    "type": "terrain",
     "name": "waterlogged heavy-duty military Blackhawk rotors",
-    "description": "A set of four military-grade helicopter rotor blades, used to provide lift by rotation.  It has started to degrade after some time spent underwater.  Absolutely unrecoverable.",
-    "copy-from": "t_sunkenhelicopter_floor"
+    "description": "A set of four military-grade helicopter rotor blades, used to provide lift by rotation.  It has started to degrade after some time spent underwater.  Absolutely unrecoverable."
   }
 ]

data/json/mapgen/sunken_helicopter_mapgen.json

@@ -43,6 +43,7 @@
         "w": "t_sunkenhelicopter_quarterpanel_n_middle",
         "e": "t_sunkenhelicopter_quarterpanel_n_right",
         ".": "t_sunkenhelicopter_floor",
+        "h": "t_sunkenhelicopter_floor",
         ",": "t_sunkenhelicopter_floor_rotator",
         "x": "t_sunkenhelicopter_frame"
       },

data/json/monsters/nether.json

@@ -2254,16 +2254,16 @@
     "id": "mon_nether_cucumber",
     "type": "MONSTER",
     "name": { "str": "waterbed skulker" },
-    "description": "Pink and translucent, with all of its otherworldly organs visible through its skin, this meter-high conical creature creeps along the seabed with its stubby, furry legs.  It contracts some kind of retracted barbed filaments into an orifice at its rear as it aims it at potential prey.",
+    "description": "Pink and translucent, with all of its otherworldly organs visible through its skin, this meter-high conical creature creeps along the seabed with its stubby, furry legs.  It retracts some sort of barbed filaments into an orifice at its rear as it aims at potential prey.",
     "species": "NETHER",
-    "hp": 100,
+    "hp": 50,
     "diff": 15,
     "weight": "75 kg",
     "volume": "70 L",
     "symbol": "s",
     "color": "pink",
     "default_faction": "nether",
-    "speed": 100,
+    "speed": 80,
     "move_skills": { "swim": 2 },
     "melee_damage": [ { "damage_type": "bash", "amount": 0 } ],
     "special_attacks": [
@@ -2279,7 +2279,7 @@
     "bodytype": "snake",
     "harvest": "mutant_mollusk",
     "zombify_into": "mon_meat_cocoon_tiny",
-    "flags": [ "AQUATIC", "SMELLS", "SEES", "HEARS", "GRABS" ],
+    "flags": [ "AQUATIC", "SEES", "HEARS", "GRABS" ],
     "weakpoints": [
       {
         "name": "filaments",