Hospitals now have a chance of piled up corpses in body bags on the p…

…orch (CleverRaven#65359) * hospitals are now overburdened by dead people * fix density * i am literally just copying that item, dont bother me about the density please * minor sentence rewording
katemonster33 · May 17, 2023 · a7fdfff · a7fdfff
1 parent bacef5f
commit a7fdfff
Show file tree

Hide file tree

Showing 5 changed files with 130 additions and 20 deletions.
diff --git a/data/json/itemgroups/corpses.json b/data/json/itemgroups/corpses.json
@@ -90,6 +90,8 @@
       [ "corpse_generic_boy", 15 ],
       [ "corpse_generic_girl", 15 ],
       [ "corpse_generic_human", 10 ],
+      [ "corpse_generic_gunned", 40 ],
+      [ "corpse_generic_infected", 40 ],
       [ "corpse_bloody", 10 ],
       [ "corpse_painful", 10 ],
       [ "corpse_scorched", 10 ],
@@ -102,6 +104,11 @@
       [ "corpse_oldwoman_jewelry", 10 ]
     ]
   },
+  {
+    "id": "corpses_bodybag",
+    "type": "item_group",
+    "items": [ { "group": "corpses", "prob": 100, "container-item": "bag_body_bag" } ]
+  },
   {
     "id": "corpse_male",
     "type": "item_group",

diff --git a/data/json/items/corpses/corpses.json b/data/json/items/corpses/corpses.json
@@ -49,7 +49,7 @@
     "id": "corpse_generic_human",
     "copy-from": "corpse",
     "name": { "str": "corpse" },
-    "description": "A dead human body.",
+    "description": "A lifeless human body.",
     "material": [ "hflesh" ]
   },
   {
@@ -263,5 +263,33 @@
         "text": "The corpse of a tall woman unblemished but for the bloody hole atop her head, her thick black hair intermixed now with brain, viscera and shotgun pellets."
       }
     ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "corpse_generic_infected",
+    "//": "Died due to an untreated, infected wound.",
+    "copy-from": "corpse",
+    "name": { "str": "corpse" },
+    "description": "The dead body of a person.  There is a bloody bite wound on their forearm.  Dry filth surrounds it.",
+    "looks_like": "corpse_generic_human",
+    "material": [ "hflesh" ],
+    "snippet_category": [
+      {
+        "id": "generic_infected_01",
+        "text": "The dead body of a person.  There is a bloody bite wound on their forearm.  Dry filth surrounds it but the body seems otherwise unharmed."
+      },
+      {
+        "id": "generic_infected_02",
+        "text": "One of this deceased persons shoulders is disfigured by a deep bite wound with a distinct shape, obviously caused by a human."
+      },
+      {
+        "id": "generic_infected_03",
+        "text": "This unlucky fellow has a deep, straight cut wound on their hand.  The blackened veins suggest it got infected."
+      },
+      {
+        "id": "generic_infected_04",
+        "text": "This lifeless body is covered in myriads of uneven scratches.  Some of them look pretty swollen."
+      }
+    ]
   }
 ]
diff --git a/data/json/mapgen/hospital.json b/data/json/mapgen/hospital.json
@@ -1,4 +1,70 @@
 [
+  {
+    "id": "pickup_corpses",
+    "type": "vehicle",
+    "name": "Pickup Truck",
+    "blueprint": [
+      [ "-o--+o-" ],
+      [ "==='#'|" ],
+      [ "==='#'|" ],
+      [ "-o--+o-" ]
+    ],
+    "parts": [
+      { "x": 0, "y": 0, "parts": [ "frame_cross", "seat_windshield", "seatbelt", "controls", "stereo" ] },
+      { "x": 0, "y": 0, "parts": [ "dashboard", "vehicle_clock", "vehicle_alarm", "horn_car" ] },
+      { "x": 0, "y": 0, "part": "roof" },
+      { "x": 0, "y": -1, "parts": [ "frame_vertical_left", "door_nw" ] },
+      { "x": 0, "y": 1, "parts": [ "frame_cross", "seat_windshield", "seatbelt", "roof" ] },
+      { "x": 0, "y": 2, "parts": [ "frame_vertical_right", "door_ne" ] },
+      { "x": 1, "y": -1, "parts": [ "frame_vertical_T_left", "windshield_wheel_left" ] },
+      { "x": 1, "y": -1, "parts": [ "wheel_mount_medium_steerable", "wheel" ] },
+      { "x": 1, "y": 0, "parts": [ "frame_horizontal_2", "windshield_cover_left" ] },
+      { "x": 1, "y": 1, "parts": [ "frame_horizontal_2", "windshield_cover_right" ] },
+      { "x": 1, "y": 2, "parts": [ "frame_vertical_T_right", "windshield_wheel_right" ] },
+      { "x": 1, "y": 2, "parts": [ "wheel_mount_medium_steerable", "wheel" ] },
+      { "x": 2, "y": -1, "parts": [ "frame_nw", "halfboard_nw", "headlight" ] },
+      { "x": 2, "y": 0, "parts": [ "frame_horizontal_front", "halfboard_cover_left" ] },
+      { "x": 2, "y": 0, "parts": [ "engine_v6", "alternator_truck", "battery_car" ] },
+      { "x": 2, "y": 1, "parts": [ "frame_horizontal_front", "halfboard_cover_right" ] },
+      { "x": 2, "y": 2, "parts": [ "frame_ne", "halfboard_ne", "headlight" ] },
+      { "x": -1, "y": -1, "parts": [ "frame_vertical_left", "windshield_sw" ] },
+      { "x": -1, "y": 0, "parts": [ "frame_cross", "windshield_horizontal_rear", "roof" ] },
+      { "x": -1, "y": 1, "parts": [ "frame_cross", "windshield_horizontal_rear", "roof" ] },
+      { "x": -1, "y": 2, "parts": [ "frame_vertical_right", "windshield_se" ] },
+      { "x": -2, "y": -1, "parts": [ "frame_vertical_left", "halfboard_vertical_left" ] },
+      { "x": -2, "y": -1, "part": "tank", "fuel": "gasoline" },
+      { "x": -2, "y": 0, "parts": [ "frame_cross", "cargo_space", "muffler" ] },
+      { "x": -2, "y": 1, "parts": [ "frame_cross", "cargo_space" ] },
+      { "x": -2, "y": 2, "parts": [ "frame_vertical_right", "halfboard_vertical_right" ] },
+      { "x": -3, "y": -1, "parts": [ "frame_vertical_left", "halfboard_wheel_left" ] },
+      { "x": -3, "y": -1, "parts": [ "wheel_mount_medium", "wheel" ] },
+      { "x": -3, "y": 0, "parts": [ "frame_cross", "cargo_space" ] },
+      { "x": -3, "y": 1, "parts": [ "frame_cross", "cargo_space" ] },
+      { "x": -3, "y": 2, "parts": [ "frame_vertical_right", "halfboard_wheel_right" ] },
+      { "x": -3, "y": 2, "parts": [ "wheel_mount_medium", "wheel" ] },
+      { "x": -4, "y": -1, "parts": [ "frame_sw", "halfboard_sw" ] },
+      { "x": -4, "y": 0, "parts": [ "frame_horizontal_rear", "cargo_space" ] },
+      { "x": -4, "y": 1, "parts": [ "frame_horizontal_rear", "cargo_space" ] },
+      { "x": -4, "y": 2, "parts": [ "frame_se", "halfboard_se" ] }
+    ],
+    "items": [
+      { "x": -2, "y": 0, "chance": 90, "item_groups": [ "corpses_bodybag" ] },
+      { "x": -2, "y": 1, "chance": 90, "item_groups": [ "corpses_bodybag" ] },
+      { "x": -3, "y": 0, "chance": 90, "item_groups": [ "corpses_bodybag" ] },
+      { "x": -3, "y": 1, "chance": 90, "item_groups": [ "corpses_bodybag" ] },
+      { "x": -4, "y": 0, "chance": 90, "item_groups": [ "corpses_bodybag" ] },
+      { "x": -4, "y": 1, "chance": 90, "item_groups": [ "corpses_bodybag" ] }
+    ]
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "pile_bodybag_corpses",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "place_items": [ { "item": "corpses_bodybag", "x": [ 0, 2 ], "y": [ 0, 2 ], "chance": 100, "repeat": [ 20, 40 ] } ]
+    }
+  },
   {
     "type": "mapgen",
     "method": "json",
@@ -13,7 +79,7 @@
       "rows": [
         "_______________________________________________________########;########",
         "_______________________________________________________#...cT#...#Tc...#",
-        "_:____:____:____:_________:____:____:____:____:____:___#BB...+...+...BB#",
+        "_:__=_:__=_:__=_:____=____:__=_:__=_:__=_:__=_:__=_:___#BB...+...+...BB#",
         "_:____:____:____:_________:____:____:____:____:____:___#BB...+...+...BB#",
         "_:____:____:____:_________:____:____:____:____:____:___#....l#...#l....#",
         "_:____:____:____:_________:____:____:____:____:____:___#######...#######",
@@ -85,7 +151,7 @@
         "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#######################;;#################"
       ],
       "palettes": [ "hospital" ],
-      "terrain": { "5": "t_floor", "H": "t_floor", "X": [ "t_door_metal_locked", "t_door_metal_elocked" ] },
+      "terrain": { "5": "t_floor", "H": "t_floor", "X": [ "t_door_metal_locked", "t_door_metal_elocked" ], "=": "t_pavement" },
       "furniture": { "H": "f_locker" },
       "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
       "computers": {
@@ -101,6 +167,8 @@
           "failures": [ { "action": "destroy_blood" } ]
         }
       },
+      "vehicles": { "=": { "vehicle": "pickup_corpses", "chance": 10, "rotation": 270, "status": 1 } },
+      "nested": { "=": { "chunks": [ [ "null", 70 ], [ "pile_bodybag_corpses", 30 ] ] } },
       "items": {
         "b": { "item": "magazines", "chance": 50 },
         "B": { "item": "hospital_bed", "chance": 80 },

diff --git a/data/json/mapgen/urban_35_hospital.json b/data/json/mapgen/urban_35_hospital.json
@@ -111,11 +111,11 @@
         }
       },
       "place_monsters": [
-        { "monster": "GROUP_ZOMBIE", "x": [ 1, 22 ], "y": [ 5, 22 ], "density": 0.6 },
-        { "monster": "GROUP_ZOMBIE", "x": [ 25, 31 ], "y": [ 5, 22 ], "density": 0.6 },
-        { "monster": "GROUP_ZOMBIE", "x": [ 32, 42 ], "y": [ 17, 22 ], "density": 0.8 },
-        { "monster": "GROUP_ZOMBIE", "x": [ 1, 22 ], "y": [ 25, 31 ], "density": 0.5 },
-        { "monster": "GROUP_ZOMBIE", "x": [ 25, 41 ], "y": [ 25, 30 ], "density": 0.6 }
+        { "monster": "GROUP_HOSPITAL", "x": [ 1, 22 ], "y": [ 5, 22 ], "density": 0.6 },
+        { "monster": "GROUP_HOSPITAL", "x": [ 25, 31 ], "y": [ 5, 22 ], "density": 0.6 },
+        { "monster": "GROUP_HOSPITAL", "x": [ 32, 42 ], "y": [ 17, 22 ], "density": 0.8 },
+        { "monster": "GROUP_HOSPITAL", "x": [ 1, 22 ], "y": [ 25, 31 ], "density": 0.5 },
+        { "monster": "GROUP_HOSPITAL", "x": [ 25, 41 ], "y": [ 25, 30 ], "density": 0.6 }
       ]
     }
   },
@@ -128,15 +128,15 @@
       "fill_ter": "t_linoleum_white",
       "rows": [
         ",,,%%%%%%%%,,,,%%%%%%%%%%%%%%%%%,;;;;,[,,,,,[,;;;;;;;;,,,,,,,,,,,,,,,,,,",
-        "#################################;;;;,,,,,,,,,;;;;;;;________________;,,",
+        "#############oo##################;;;;,,,,,,,,,;;;;;;;________________;,,",
         "#56JJOJ65|R  Г  ƃ|zb4| cz|QeA  Q#;;;;,[,,,,,[,;;;;;;_________________;,,",
         "# A    A |S     h|Ad |Ad |Q ւ4 s#;;;;,,,,,,,,,;;;;;__________________;,,",
         "#|o|**|o||&**|  h|jjk|jkj|g    s#;;;;;;;;;;;;;;;_____________________;,,",
         "#        |---|ւ  |o*o|o*o|D   jj#;;__________________________________;,,",
         "# Ƨ   Ƨ  |---|          4|    j3#;;__________________________________;,,",
         "#uuUuuUuY|&**|  uuYu     |$$||||#;;__________________________________;,,",
-        "# h  h       $  UA u         |  #;;__________________________________;,,",
-        "#            $  u AU         $  $;;__________________________________;,,",
+        "o h  h       $  UA u         |  #;;__________________________________;,,",
+        "o            $  u AU         $  $;;__________________________________;,,",
         "#riiiiy  ||+||4 uYuu         $  $;;__________________________________;,,",
         "#||||||  |T L|ƃ        |||||||$|#;;__________________________________;,,",
         "#АXXXX|  ||||||+|||||  +       i#;;__________________________________;,,",
@@ -159,9 +159,9 @@
         "#VHHVE     ƃƃhy|RS<|CtttttC|C h|  |T|C h|Ch ##;;_____________________;,,",
         "#H             *   $    Ƨ  | vv|  + | vv| vv##;;_____________________;,,",
         "#H  E          *  >|  Ƨ    | hh|  |L| hh| hh##;;_____________________;,,",
-        "#              |ooo|vUvvvUv|*oo|  |||*oo|*oo#!;;______________˽˽˽˽˽˽˽;,,",
-        "#ƃ      v Ƨv   yiiiy                        #!;;_____________________;,,",
-        "#H  E   vvUv                      Vhh VhhVhh#!;;_____________________;,,",
+        "o              |ooo|vUvvvUv|*oo|  |||*oo|*oo#!;;______________˽˽˽˽˽˽˽;,,",
+        "#ƃ      v Ƨv   yiiiy                        o!;;_____________________;,,",
+        "#H  E   vvUv                      Vhh VhhVhho!;;_____________________;,,",
         "#H  E                                       ##;;_____________________;,,",
         "#V            yiiziiy     ziiiy iiiiy VhhVhh##;;_____________________;,,",
         "##oooo##o**o#o#######o#**#oooo##oooo##oooo####;;_____________________;,,",
@@ -171,13 +171,14 @@
         ",%;;;_________________;;;;_________________;;!;;_____________________;,,",
         ",%;;__________________;;;;__________________;!;;_____________________;,,",
         ",;;;__________________;;;;__________________;;;______________________;,,",
-        ",;;#_________________;;;;;;_________________#;;______________________;,,",
+        ",;;#_=_=_____________;;;;;;_____________=_=_#;;______________________;,,",
         ",;;__________________;;;;;;__________________________________________;,,",
         ",;;__________________________________________________________________;,,",
         ",;;__________________________________________________________________;,,"
       ],
       "palettes": [ "hospital_2" ],
       "furniture": { "А": "f_locker" },
+      "terrain": { "=": "t_pavement" },
       "items": {
         "x": { "item": "beauty", "chance": 20, "repeat": [ 1, 2 ] },
         "P": { "item": "vitamin_shop", "chance": 20, "repeat": [ 1, 2 ] },
@@ -214,6 +215,7 @@
           { "item": "hospital_medical_items", "chance": 20, "repeat": [ 1, 2 ] }
         ]
       },
+      "nested": { "=": { "chunks": [ [ "null", 70 ], [ "pile_bodybag_corpses", 30 ] ] } },
       "place_loot": [ { "group": "autodoc_installation_programs", "x": 1, "y": [ 12, 14 ], "chance": 75, "repeat": 3 } ],
       "computers": {
         "6": {
@@ -223,18 +225,22 @@
         }
       },
       "place_monsters": [
-        { "monster": "GROUP_ZOMBIE", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.6 },
-        { "monster": "GROUP_ZOMBIE", "x": [ 25, 46 ], "y": [ 1, 22 ], "density": 0.6 },
-        { "monster": "GROUP_ZOMBIE", "x": [ 1, 22 ], "y": [ 25, 46 ], "density": 0.6 },
-        { "monster": "GROUP_ZOMBIE", "x": [ 25, 46 ], "y": [ 25, 46 ], "density": 0.6 }
+        { "monster": "GROUP_HOSPITAL", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.6 },
+        { "monster": "GROUP_HOSPITAL", "x": [ 25, 46 ], "y": [ 1, 22 ], "density": 0.6 },
+        { "monster": "GROUP_HOSPITAL", "x": [ 1, 22 ], "y": [ 25, 46 ], "density": 0.6 },
+        { "monster": "GROUP_HOSPITAL", "x": [ 25, 46 ], "y": [ 25, 46 ], "density": 0.6 }
       ],
       "place_vehicles": [
         { "vehicle": "ambulance", "x": 41, "y": 9, "chance": 90, "rotation": 0 },
         { "vehicle": "ambulance", "x": 30, "y": 44, "chance": 90, "rotation": 180 },
         { "vehicle": "car_sports", "x": 65, "y": 16, "chance": 50, "rotation": 0 },
         { "vehicle": "pickup", "x": 64, "y": 22, "chance": 50, "rotation": 180 },
         { "vehicle": "electric_car", "x": 65, "y": 29, "chance": 50, "rotation": 0 },
-        { "vehicle": "policecar", "x": 65, "y": 36, "chance": 50, "rotation": 180 }
+        { "vehicle": "policecar", "x": 65, "y": 36, "chance": 50, "rotation": 180 },
+        { "vehicle": "pickup_corpses", "x": 50, "y": 28, "chance": 10, "rotation": 90, "status": 1 },
+        { "vehicle": "pickup_corpses", "x": 50, "y": 34, "chance": 10, "rotation": 90, "status": 1 },
+        { "vehicle": "pickup_corpses", "x": 50, "y": 42, "chance": 10, "rotation": 90, "status": 1 },
+        { "vehicle": "pickup_corpses", "x": 12, "y": 42, "chance": 10, "rotation": 180 }
       ]
     }
   },

diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json
@@ -188,6 +188,7 @@
       "hi_q_shatter",
       "meal_bone",
       "corpse_generic_gunned",
+      "corpse_generic_infected",
       "bellywrap_leather",
       "survivor_scope",
       "triffid_fungicide",