Aftershock: Ruins of Orion I (#82770)

* Ruins of orion

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update mapgen.cpp

Revert "Update mapgen.cpp"

This reverts commit 6ed38aa.

Update mapgen.cpp

* Update src/mapgen.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Fix json omissions

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: John-Candlebury

data/mods/aftershock_exoplanet/itemgroups/loot_corpse_groups.json

@@ -21,6 +21,25 @@
       { "group": "afs_any_hand_grenade", "prob": 1 }
     ]
   },
+  {
+    "id": "afs_ancient_corpse",
+    "type": "item_group",
+    "subtype": "collection",
+    "//": "Someone who died concurrently with the Discontinuity or very shortly after.  No survival gear.",
+    "entries": [
+      {
+        "distribution": [
+          { "item": "afs_corpse_old", "prob": 70 },
+          {
+            "collection": [ { "item": "bone_human", "count": [ 5, 8 ], "prob": 100 }, { "item": "skull_human", "prob": 95 } ],
+            "prob": 30
+          }
+        ]
+      },
+      { "item": "afs_tattered_garment", "prob": 90 },
+      { "item": "afs_glass_AR_device", "prob": 5 }
+    ]
+  },
   {
     "type": "item_group",
     "id": "afs_survivor_weapon_set",

data/mods/aftershock_exoplanet/itemgroups/weapons/armories.json

@@ -10,6 +10,24 @@
       { "group": "afs_grenade_armory", "prob": 1 }
     ]
   },
+  {
+    "id": "afs_ruin_armory",
+    "type": "item_group",
+    "subtype": "distribution",
+    "//": "For ruins open to the elements, replaces some weapons with broken versions.",
+    "items": [
+      { "group": "afs_general_armory", "prob": 2 },
+      {
+        "distribution": [
+          { "item": "afs_ruined_laser_pistol", "prob": 10 },
+          { "item": "afs_ruined_laser_rifle", "prob": 10 },
+          { "item": "afs_ruined_rifle", "prob": 15 },
+          { "item": "afs_ruined_magazine", "prob": 5 }
+        ],
+        "prob": 3
+      }
+    ]
+  },
   {
     "//": "A group for Aftershock gun vendors.",
     "id": "afs_civilian_armory",

data/mods/aftershock_exoplanet/items/items.json

@@ -47,12 +47,22 @@
     "category": "other",
     "description": "Time and the elements have reduced them to a mound of filthy ribbons.",
     "weight": "1175 g",
-    "volume": "3 L",
+    "volume": "30 L",
     "price": "0 cent",
     "price_postapoc": "0 cent",
     "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "open_container": true,
+        "max_contains_volume": "10 L",
+        "max_contains_weight": "20 kg",
+        "moves": 400
+      }
+    ],
     "looks_like": "cotton_patchwork",
     "color": "brown"
   },
@@ -264,6 +274,65 @@
     "material": [ "copper", "lead", "steel" ],
     "category": "spare_parts"
   },
+  {
+    "id": "afs_ruined_laser_pistol",
+    "type": "ITEM",
+    "name": { "str": "ruined energy pistol" },
+    "description": "A mass of corroded metal and plastic, identifiable as a pistol only due to its general shape.  Some of its components might still be salvageable.",
+    "weight": "380 g",
+    "volume": "750 ml",
+    "price": "7 USD",
+    "price_postapoc": "7 USD",
+    "material": [ "qt_steel", "plastic" ],
+    "symbol": "(",
+    "color": "light_gray",
+    "category": "spare_parts"
+  },
+  {
+    "id": "afs_ruined_laser_rifle",
+    "type": "ITEM",
+    "name": { "str": "ruined energy rifle" },
+    "description": "Pitted and corroded, this weapon is barely recognizable as a rifle.  Some of its components might still be salvageable.",
+    "weight": "2640 g",
+    "volume": "3817 ml",
+    "longest_side": "511 mm",
+    "price": "7 USD",
+    "price_postapoc": "7 USD",
+    "material": [ "qt_steel", "plastic" ],
+    "symbol": "(",
+    "color": "light_gray",
+    "category": "spare_parts"
+  },
+  {
+    "id": "afs_ruined_rifle",
+    "type": "ITEM",
+    "name": { "str": "ruined long gun" },
+    "description": "Not much of this weapon remains, at most it could be used to bar a door.",
+    "weight": "2640 g",
+    "volume": "3817 ml",
+    "longest_side": "511 mm",
+    "price": "7 USD",
+    "price_postapoc": "7 USD",
+    "material": [ "qt_steel", "plastic" ],
+    "symbol": "(",
+    "color": "light_gray",
+    "category": "spare_parts"
+  },
+  {
+    "id": "afs_ruined_magazine",
+    "type": "ITEM",
+    "name": { "str": "ruined magazine" },
+    "description": "A small box of heavily corroded metal.  Its more fragile internal components wasted away long ago.",
+    "weight": "2640 g",
+    "volume": "3817 ml",
+    "longest_side": "511 mm",
+    "price": "7 USD",
+    "price_postapoc": "7 USD",
+    "material": [ "qt_steel", "plastic" ],
+    "symbol": "(",
+    "color": "light_gray",
+    "category": "spare_parts"
+  },
   {
     "id": "afs_glass_device",
     "type": "ITEM",

data/mods/aftershock_exoplanet/maps/furniture_and_terrain/terrain_groundxeno.json

@@ -36,8 +36,8 @@
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "DIGGABLE", "SNOW_SOURCE", "FLAT", "ROUGH" ],
     "bash": {
-      "str_min": 50,
-      "str_max": 100,
+      "str_min": 800,
+      "str_max": 1000,
       "sound": "splosh!",
       "sound_fail": "fweet!",
       "ter_set": "t_null",
@@ -183,7 +183,7 @@
       "str_max": 100,
       "sound": "splosh!",
       "sound_fail": "fweet!",
-      "ter_set": "t_deaddirt",
+      "ter_set": "t_ice",
       "str_min_supported": 100
     }
   },
@@ -202,7 +202,26 @@
       "str_max": 100,
       "sound": "splosh!",
       "sound_fail": "fweet!",
-      "ter_set": "t_deaddirt",
+      "ter_set": "t_ice",
+      "str_min_supported": 100
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_snow_metal_floor",
+    "name": "snow",
+    "looks_like": "t_snow",
+    "description": "A patch of thick snow, very cold.",
+    "symbol": ".",
+    "color": "light_blue",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "SNOW_SOURCE", "FLAT", "ROUGH" ],
+    "bash": {
+      "str_min": 8,
+      "str_max": 100,
+      "sound": "splosh!",
+      "sound_fail": "fweet!",
+      "ter_set": "t_metal_floor",
       "str_min_supported": 100
     }
   },

data/mods/aftershock_exoplanet/maps/mapgen/formless_ruins/aeolian_formless_ruin.json

@@ -1,4 +1,10 @@
 [
+  {
+    "type": "mapgen",
+    "om_terrain": [ "afs_ruins_dynamic" ],
+    "weight": 3,
+    "object": { "predecessor_mapgen": "field" }
+  },
   {
     "type": "mapgen",
     "om_terrain": [ "afs_formless_ruins_aeolian" ],

data/mods/aftershock_exoplanet/maps/mapgen/formless_ruins/formless_ruins_dynamic.json

@@ -756,7 +756,7 @@
       "items": {
         "W": [
           { "item": "afs_experimental_combat_gear", "chance": 10, "repeat": [ 1, 2 ] },
-          { "item": "afs_general_armory", "chance": 50, "repeat": [ 1, 2 ] }
+          { "item": "afs_ruin_armory", "chance": 50, "repeat": [ 3, 6 ] }
         ],
         "C": [
           { "item": "afs_robotics_scrapgroup", "chance": 20, "repeat": [ 1, 2 ] },
@@ -791,7 +791,7 @@
       "furniture": { "C": "f_counter", "W": "f_rack" },
       "items": {
         "W": [
-          { "item": "afs_general_armory", "chance": 80, "repeat": [ 1, 2 ] },
+          { "item": "afs_ruin_armory", "chance": 80, "repeat": [ 3, 6 ] },
           { "item": "afs_any_energy_mag", "chance": 50, "repeat": [ 1, 2 ] }
         ],
         "C": [