Merge pull request #30872 from anothersimulacrum/merge-afs-bn

Merge Aftershock and Bright Nights, add new Fast Healing mod

data/json/items/migration.json

@@ -561,5 +561,15 @@
     "id": "hk_ucp",
     "type": "MIGRATION",
     "replace": "hk_mp7"
+  },
+  {
+    "id": "rechargable_battery",
+    "type": "MIGRATION",
+    "replace": "heavy_battery_cell"
+  },
+  {
+    "id": "hd_battery",
+    "type": "MIGRATION",
+    "replace": "heavy_plus_battery_cell"
   }
 ]

data/mods/Aftershock/items/afs__items.json

@@ -142,5 +142,35 @@
     "ammo_type": "battery",
     "capacity": 100000,
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "RECHARGE" ]
+  },
+  {
+    "id": "nuclear_waste",
+    "type": "GENERIC",
+    "name": "nuclear waste",
+    "description": "A small pellet of silvery metal, still warm to the touch.",
+    "weight": 30,
+    "volume": 1,
+    "price": 0,
+    "material": "iron",
+    "symbol": "*",
+    "color": "light_green",
+    "flags": [ "RADIOACTIVE", "LEAK_ALWAYS" ]
+  },
+  {
+    "id": "nuclear_fuel",
+    "copy-from": "nuclear_waste",
+    "type": "GENERIC",
+    "name": "nuclear fuel pellet",
+    "description": "A small pellet of fissile material.  Handle carefully."
+  },
+  {
+    "id": "hazardous_waste_drum",
+    "copy-from": "55gal_drum",
+    "type": "CONTAINER",
+    "name": "hazardous waste drum",
+    "description": "A yellow drum meant for the storage of hazardous substances.",
+    "material": [ "steel", "lead" ],
+    "symbol": "0",
+    "color": "yellow"
   }
 ]

data/mods/Aftershock/items/afs_books.json

@@ -98,5 +98,25 @@
     "max_level": 6,
     "intelligence": 5,
     "time": 18
+  },
+  {
+    "id": "textbook_atomic",
+    "type": "BOOK",
+    "name": "Nuclear Physics Made Easy",
+    "name_plural": "Nuclear Physics Made Easy",
+    "description": "A book detailing the workings of state of the art atomic technology, and the physics behind it",
+    "weight": 2063,
+    "volume": 8,
+    "price": 9200,
+    "bashing": 8,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "light_green",
+    "skill": "electronics",
+    "required_level": 5,
+    "max_level": 7,
+    "intelligence": 13,
+    "time": 50,
+    "fun": -1
   }
 ]

data/mods/Aftershock/items/afs_weapons.json

@@ -154,5 +154,31 @@
     "clip_size": 1,
     "reload": 150,
     "flags": [ "NEVER_JAMS", "NO_UNWIELD", "TRADER_AVOID" ]
+  },
+  {
+    "id": "laser_rifle_cheap",
+    "type": "GUN",
+    "name": "shoddy laser rifle",
+    "description": "This is a cheap laser rifle made from common components.  Weak, but can be powered with rechargeable batteries.",
+    "weight": 8000,
+    "volume": 10,
+    "price": 40000,
+    "to_hit": -1,
+    "bashing": 8,
+    "material": [ "plastic", "copper" ],
+    "symbol": "(",
+    "color": "magenta",
+    "ammo": "battery",
+    "skill": "rifle",
+    "range": 10,
+    "ranged_damage": 20,
+    "dispersion": 150,
+    "durability": 10,
+    "loudness": 8,
+    "reload": 500,
+    "valid_mod_locations": [ [ "accessories", 4 ], [ "sights", 1 ], [ "sling", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
+    "ammo_effects": [ "LASER", "DRAW_AS_LINE" ],
+    "magazines": [ [ "battery", [ "heavy_battery_cell", "heavy_plus_battery_cell" ] ] ],
+    "flags": [ "NEVER_JAMS", "FIRE_20" ]
   }
 ]

data/mods/Aftershock/maps/afs_item_groups.json

@@ -237,7 +237,42 @@
       [ "afs_textbook_shotguns", 3 ],
       [ "afs_textbook_handguns", 3 ],
       [ "afs_textbook_rifles", 3 ],
-      [ "afs_textbook_launchers", 3 ]
+      [ "afs_textbook_launchers", 3 ],
+      [ "textbook_atomic", 8 ]
+    ]
+  },
+  {
+    "id": "guns_pistol_improvised",
+    "type": "item_group",
+    "items": [ [ "v29_cheap", 10 ] ]
+  },
+  {
+    "id": "nuclear_waste",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [ { "item": "nuclear_waste", "container-item": "hazardous_waste_drum", "charges": 10 } ]
+  },
+  {
+    "id": "nuclear_reactor",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "item": "nuclear_waste", "count-min": 5, "count-max": 10 },
+      { "item": "nuclear_fuel", "count-min": 1, "count-max": 10 }
+    ]
+  },
+  {
+    "id": "reactor_gear",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "item": "hazmat_suit", "prob": 33 },
+      { "item": "prussian_blue", "prob": 33 },
+      { "item": "rad_monitor", "prob": 33 },
+      { "item": "iodine", "prob": 33 },
+      { "item": "flashlight", "prob": 33 },
+      { "item": "1st_aid", "prob": 15 },
+      { "item": "geiger_off", "prob": 15 }
     ]
   }
 ]

data/mods/Aftershock/modinfo.json

@@ -3,9 +3,9 @@
     "type": "MOD_INFO",
     "ident": "aftershock",
     "name": "Aftershock",
-    "authors": [ "Esther" ],
+    "authors": [ "Esther", "Coolthulu" ],
     "maintainers": [ "Esther" ],
-    "description": "Drifts the game away from realism and more towards sci-fi.  NOTE: Incompatible with Bright Nights.",
+    "description": "Drifts the game away from realism and more towards sci-fi.",
     "category": "content",
     "dependencies": [ "dda" ]
   },

data/mods/Aftershock/recipes/afs__recipes.json

@@ -407,6 +407,28 @@
     "qualities": [ { "id": "CHEM", "level": 3 } ],
     "components": [ [ [ "iv_purifier", 3 ] ], [ [ "royal_jelly", 1 ] ], [ [ "slime_scrap", 1 ] ], [ [ "syringe", 1 ] ] ]
   },
+  {
+    "result": "laser_rifle_cheap",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_RANGED",
+    "skill_used": "electronics",
+    "difficulty": 5,
+    "time": 300000,
+    "reversible": true,
+    "autolearn": [ [ "electronics", 4 ] ],
+    "book_learn": [ [ "advanced_electronics", 3 ], [ "textbook_electronics", 3 ] ],
+    "qualities": [ { "id": "SCREW_FINE", "level": 1 } ],
+    "tools": [ [ [ "soldering_iron", 200 ], [ "toolset", 200 ] ] ],
+    "components": [
+      [ [ "amplifier", 2 ] ],
+      [ [ "power_supply", 1 ] ],
+      [ [ "cable", 100 ] ],
+      [ [ "e_scrap", 10 ] ],
+      [ [ "lens", 2 ] ],
+      [ [ "plastic_chunk", 6 ] ]
+    ]
+  },
   {
     "result": "afs_hauling_space",
     "type": "recipe",
@@ -419,5 +441,26 @@
     "using": [ [ "welding_standard", 10 ] ],
     "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "WRENCH", "level": 2 }, { "id": "SAW_M", "level": 2 } ],
     "components": [ [ [ "hdframe", 3 ] ], [ [ "sheet_metal", 4 ] ] ]
+  },
+  {
+    "result": "plut_cell",
+    "type": "recipe",
+    "category": "CC_ELECTRONIC",
+    "subcategory": "CSC_ELECTRONIC_COMPONENTS",
+    "skill_used": "electronics",
+    "difficulty": 5,
+    "time": 5000,
+    "autolearn": [ [ "electronics", 7 ] ],
+    "book_learn": [ [ "textbook_atomic", 5 ] ],
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
+    "tools": [ [ [ "soldering_iron", 50 ] ] ],
+    "components": [
+      [ [ "nuclear_fuel", 2 ] ],
+      [ [ "e_scrap", 5 ] ],
+      [ [ "lead", 25 ] ],
+      [ [ "plastic_chunk", 5 ] ],
+      [ [ "scrap", 5 ] ],
+      [ [ "can_drink_unsealed", 5 ], [ "can_food_unsealed", 5 ], [ "canister_empty", 5 ] ]
+    ]
   }
 ]

data/mods/Aftershock/recipes/afs_recipe_overrides.json

@@ -197,5 +197,19 @@
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
     "components": [ [ [ "sweetbread", 1 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ], [ [ "vinegar", 1 ] ], [ [ "salt", 2 ] ] ]
+  },
+  {
+    "result": "recharge_station",
+    "type": "recipe",
+    "category": "CC_ELECTRONIC",
+    "subcategory": "CSC_ELECTRONIC_PARTS",
+    "skill_used": "electronics",
+    "difficulty": 3,
+    "time": 50000,
+    "reversible": true,
+    "autolearn": [ [ "electronics", 2 ] ],
+    "using": [ [ "soldering_standard", 35 ] ],
+    "qualities": [ { "id": "SCREW", "level": 1 } ],
+    "components": [ [ [ "power_supply", 2 ] ], [ [ "processor", 2 ] ], [ [ "scrap", 5 ] ], [ [ "cable", 8 ] ] ]
   }
 ]

data/mods/Aftershock/vehicles/afs_vehicle_groups.json

@@ -7,12 +7,21 @@
   {
     "id": "suburban_home",
     "type": "vehicle_group",
-    "vehicles": [ [ "afs_sports_bike", 150 ] ]
+    "vehicles": [ [ "afs_sports_bike", 150 ], [ "car_atomic", 1000 ], [ "suv_atomic", 1000 ], [ "compact_atomic", 300 ] ]
   },
   {
     "id": "parkinglot",
     "type": "vehicle_group",
-    "vehicles": [ [ "afs_sports_bike", 300 ], [ "afs_electric_semi", 300 ], [ "afs_gas_tanker", 300 ], [ "afs_water_tanker", 250 ] ]
+    "vehicles": [
+      [ "afs_sports_bike", 300 ],
+      [ "afs_electric_semi", 300 ],
+      [ "afs_gas_tanker", 300 ],
+      [ "afs_water_tanker", 250 ],
+      [ "car_atomic", 1000 ],
+      [ "car_sports_atomic", 100 ],
+      [ "suv_atomic", 1000 ],
+      [ "compact_atomic", 300 ]
+    ]
   },
   {
     "id": "highway",
@@ -28,5 +37,20 @@
     "id": "afs_lab_utility",
     "type": "vehicle_group",
     "vehicles": [ [ "welding_cart", 5 ], [ "engine_crane", 3 ], [ "portable_generator", 8 ] ]
+  },
+  {
+    "id": "city_vehicles",
+    "type": "vehicle_group",
+    "vehicles": [ [ "car_atomic", 1000 ], [ "suv_atomic", 1000 ], [ "compact_atomic", 500 ] ]
+  },
+  {
+    "id": "city_pileup",
+    "type": "vehicle_group",
+    "vehicles": [ [ "car_atomic", 1000 ], [ "suv_atomic", 1000 ], [ "compact_atomic", 300 ] ]
+  },
+  {
+    "id": "highway",
+    "type": "vehicle_group",
+    "vehicles": [ [ "car_atomic", 1500 ], [ "suv_atomic", 1500 ], [ "compact_atomic", 300 ] ]
   }
 ]