From 9c859b018e7843fdd171a71f0592d157ea6c500c Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Sat, 20 Nov 2021 15:24:50 -0600 Subject: [PATCH] Flesh out plutonium usage and spawns (#1109) * Flesh out plutonium usage and spawns * Tiny Aftershock update * Suggestions per feedback * Tweaks per feedback --- .../itemgroups/Clothing_Gear/clothing.json | 10 ++++------ data/json/itemgroups/Clothing_Gear/gear.json | 5 ++--- .../Locations_MapExtras/locations.json | 3 ++- .../Locations_MapExtras/robofac_trade.json | 1 + .../monster_drops_lairs.json | 5 +++-- .../itemgroups/Weapons_Mods_Ammo/ammo.json | 20 +++++++++++++++++++ data/json/itemgroups/activities_hobbies.json | 3 +-- data/json/itemgroups/defense_mode.json | 2 +- data/json/itemgroups/main.json | 1 + data/json/itemgroups/military.json | 6 ++++-- data/json/itemgroups/science_and_tech.json | 4 ++++ data/json/itemgroups/supplies.json | 3 ++- data/json/itemgroups/tools.json | 14 +++++++++++++ data/json/items/ammo.json | 2 +- data/json/items/battery.json | 18 ++++++++--------- data/json/items/tool/electronics.json | 2 +- data/json/npcs/NC_SOLDIER.json | 3 +-- .../mods/Aftershock/items/item_overrides.json | 2 +- 18 files changed, 72 insertions(+), 32 deletions(-) diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index 793d5756129b..65868436c706 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -1845,8 +1845,7 @@ [ "optical_cloak", 1 ], [ "holo_cloak", 1 ], [ "backpack", 38 ], - [ "UPS_off", 5 ], - [ "adv_UPS_off", 3 ], + [ "adv_UPS_off", 10 ], [ "tacvest", 10 ], [ "molle_pack", 8 ], [ "duffelbag", 15 ], @@ -1886,8 +1885,7 @@ [ "mil_mess_kit", 1 ], [ "backpack", 38 ], [ "briefcase", 10 ], - [ "UPS_off", 5 ], - [ "adv_UPS_off", 3 ], + { "item": "adv_UPS_off", "prob": 10, "charges": [ 0, 2000 ] }, [ "chestguard_hard", 20 ], [ "armguard_hard", 20 ], [ "legguard_hard", 15 ], @@ -2011,8 +2009,8 @@ [ "legpouch_large", 6 ], [ "chestpouch", 9 ], [ "ammo_satchel", 4 ], - [ "UPS_off", 5 ], - [ "adv_UPS_off", 3 ], + { "group": "used_UPS", "prob": 5 }, + { "item": "adv_UPS_off", "prob": 3, "charges": [ 0, 2000 ] }, [ "tacvest", 10 ], [ "molle_pack", 8 ], [ "legrig", 10 ], diff --git a/data/json/itemgroups/Clothing_Gear/gear.json b/data/json/itemgroups/Clothing_Gear/gear.json index 75006a68c51b..bdf8f537e8e0 100644 --- a/data/json/itemgroups/Clothing_Gear/gear.json +++ b/data/json/itemgroups/Clothing_Gear/gear.json @@ -125,8 +125,7 @@ [ "knee_pads", 5 ], [ "elbow_pads", 5 ], [ "legrig", 5 ], - [ "UPS_off", 5 ], - [ "adv_UPS_off", 2 ], + { "group": "charged_UPS", "prob": 10 }, [ "emer_blanket", 5 ], { "group": "ammo_pocket_batteries_full", "prob": 50 }, [ "tool_belt", 5 ], @@ -153,7 +152,7 @@ [ "rad_monitor", 10 ], [ "oxygen_tank", 10 ], [ "smoxygen_tank", 15 ], - [ "adv_UPS_off", 2 ], + { "group": "charged_UPS", "prob": 5 }, [ "prussian_blue", 25 ], [ "iodine", 50 ] ] diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index e3c7d2c11176..768c4c0d9820 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -1585,7 +1585,7 @@ [ "radio", 20 ], [ "geiger_off", 8 ], [ "rad_monitor", 4 ], - [ "UPS_off", 5 ], + { "group": "used_UPS", "prob": 5 }, [ "flyer", 10 ], [ "bio_purifier", 10 ], [ "bio_climate", 10 ], @@ -2054,6 +2054,7 @@ "type": "item_group", "id": "vault", "items": [ + { "group": "ammo_atomic_batteries", "prob": 10 }, { "group": "schematics", "prob": 5 }, [ "recipe_mil_augs", 5 ], [ "recipe_caseless", 5 ], diff --git a/data/json/itemgroups/Locations_MapExtras/robofac_trade.json b/data/json/itemgroups/Locations_MapExtras/robofac_trade.json index 28c2b7b53881..e47b74a55bb7 100644 --- a/data/json/itemgroups/Locations_MapExtras/robofac_trade.json +++ b/data/json/itemgroups/Locations_MapExtras/robofac_trade.json @@ -4,6 +4,7 @@ "id": "robofac_basic_trade", "subtype": "distribution", "entries": [ + { "group": "ammo_atomic_batteries_full", "prob": 100 }, { "group": "bionics_common", "prob": 100 }, { "group": "textbooks", "prob": 100 }, { "group": "electronics", "prob": 100 }, diff --git a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json index 8a46dddfe54a..2b110d9bc733 100644 --- a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json +++ b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json @@ -214,6 +214,7 @@ "subtype": "distribution", "entries": [ { "group": "mags_obscure", "prob": 40 }, + { "group": "ammo_atomic_batteries", "prob": 5 }, { "item": "corpse", "prob": 10 }, { "item": "holy_symbol", "prob": 1 }, { "item": "mutagen", "prob": 8 }, @@ -307,8 +308,8 @@ { "item": "bot_grenade_hack", "prob": 1 }, { "item": "bot_flashbang_hack", "prob": 1 }, { "item": "bot_gasbomb_hack", "prob": 1 }, - { "item": "UPS_off", "prob": 5 }, - { "item": "adv_UPS_off", "prob": 3 }, + { "group": "used_UPS", "prob": 5 }, + { "item": "adv_UPS_off", "prob": 3, "charges": [ 0, 2000 ] }, { "item": "bio_power_storage", "prob": 10 }, { "item": "bio_flashlight", "prob": 10 }, { "item": "bio_lighter", "prob": 10 }, diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json index e2525da43a98..f5a0cfb7de5b 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json @@ -689,5 +689,25 @@ "id": "ammo_pocket_batteries_full", "subtype": "distribution", "entries": [ { "group": "ammo_light_batteries_full", "prob": 5 }, { "group": "ammo_medium_batteries_full", "prob": 5 } ] + }, + { + "id": "ammo_atomic_batteries", + "type": "item_group", + "items": [ + { "item": "light_battery_cell", "prob": 4, "charges": [ 500, 1000 ] }, + { "item": "light_minus_atomic_battery_cell", "prob": 3, "charges": [ 250, 500 ] }, + { "item": "medium_battery_cell", "prob": 2, "charges": [ 2500, 5000 ] }, + { "item": "heavy_battery_cell", "prob": 1, "charges": [ 5000, 10000 ] } + ] + }, + { + "id": "ammo_atomic_batteries_full", + "type": "item_group", + "items": [ + { "item": "light_battery_cell", "prob": 4, "charges": 1000 }, + { "item": "light_minus_atomic_battery_cell", "prob": 3, "charges": 500 }, + { "item": "medium_battery_cell", "prob": 2, "charges": 5000 }, + { "item": "heavy_battery_cell", "prob": 1, "charges": 10000 } + ] } ] diff --git a/data/json/itemgroups/activities_hobbies.json b/data/json/itemgroups/activities_hobbies.json index 30d081f253ab..866b1c518d14 100644 --- a/data/json/itemgroups/activities_hobbies.json +++ b/data/json/itemgroups/activities_hobbies.json @@ -234,8 +234,7 @@ [ "water_purifier", 5 ], [ "radio", 20 ], [ "beartrap", 5 ], - [ "UPS_off", 5 ], - [ "adv_UPS_off", 3 ], + [ "UPS_off", 10 ], [ "string_36", 40 ], [ "longbow", 5 ], [ "compbow", 1 ], diff --git a/data/json/itemgroups/defense_mode.json b/data/json/itemgroups/defense_mode.json index 5339db7a5dd9..616df4d3800d 100644 --- a/data/json/itemgroups/defense_mode.json +++ b/data/json/itemgroups/defense_mode.json @@ -159,7 +159,7 @@ { "item": "smokebomb" }, { "item": "bot_manhack" }, { "item": "bot_turret_light" }, - { "item": "UPS_off" }, + { "item": "heavy_battery_cell", "charges": [ 500, 1000 ], "container-item": "UPS_off" }, { "item": "mininuke" } ] } diff --git a/data/json/itemgroups/main.json b/data/json/itemgroups/main.json index 0ff3a8bfbf07..0985ffef867d 100644 --- a/data/json/itemgroups/main.json +++ b/data/json/itemgroups/main.json @@ -6,6 +6,7 @@ "magazine": 100, "subtype": "distribution", "entries": [ + { "group": "ammo_atomic_batteries", "prob": 10 }, { "item": "12mm", "prob": 20 }, { "item": "adrenaline_injector", "prob": 20 }, { "item": "ampoule", "prob": 100 }, diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index 439f39b08693..29208390c8ac 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -104,6 +104,7 @@ "entries": [ { "group": "mil_food", "prob": 1251 }, { "group": "mil_armor", "prob": 575 }, + { "item": "plut_cell", "prob": 5 }, { "item": "m107a1", "prob": 1 }, { "item": "bipod", "prob": 1 }, { "item": "50bmg", "prob": 3 }, @@ -353,6 +354,8 @@ "subtype": "distribution", "entries": [ { "group": "mags_milspec", "prob": 40 }, + { "item": "adv_UPS_off", "prob": 5, "charges": [ 0, 2000 ] }, + { "item": "plut_cell", "prob": 5 }, { "item": "flamethrower", "prob": 20 }, { "item": "rm451_flamethrower", "prob": 10 }, { "item": "m249", "prob": 30 }, @@ -500,8 +503,7 @@ { "item": "v8_combustion", "prob": 10 }, { "item": "extinguisher", "prob": 20 }, { "item": "radio", "prob": 20 }, - { "item": "UPS_off", "prob": 5 }, - { "item": "adv_UPS_off", "prob": 3 }, + { "item": "adv_UPS_off", "prob": 10, "charges": [ 0, 2000 ] }, { "item": "tacvest", "prob": 10 }, { "item": "molle_pack", "prob": 8 }, { "item": "legrig", "prob": 10 }, diff --git a/data/json/itemgroups/science_and_tech.json b/data/json/itemgroups/science_and_tech.json index 0a95d960f5ac..ca170c7ff0ad 100644 --- a/data/json/itemgroups/science_and_tech.json +++ b/data/json/itemgroups/science_and_tech.json @@ -6,6 +6,8 @@ "magazine": 100, "items": [ { "group": "tools_science", "prob": 50 }, + { "group": "ammo_atomic_batteries", "prob": 10 }, + { "group": "ammo_atomic_batteries_full", "prob": 5 }, [ "ether", 5 ], [ "water_clean", 90 ], { "item": "bleach", "prob": 20, "charges-min": 1 }, @@ -347,6 +349,8 @@ "type": "item_group", "id": "teleport", "items": [ + { "group": "ammo_atomic_batteries", "prob": 10 }, + { "group": "ammo_atomic_batteries_full", "prob": 10 }, [ "screwdriver", 40 ], [ "screwdriver_set", 40 ], [ "wrench", 30 ], diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index 14c1b68f3558..013fa0f43219 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -28,7 +28,8 @@ [ "jumper_cable", 15 ], [ "jumper_cable_heavy", 5 ], [ "recharge_station", 20 ], - [ "hand_crank_charger", 30 ] + [ "hand_crank_charger", 30 ], + [ "UPS_off", 10 ] ] }, { diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json index 8996d50d465a..d1b3405e808e 100644 --- a/data/json/itemgroups/tools.json +++ b/data/json/itemgroups/tools.json @@ -99,6 +99,7 @@ [ "flashlight", 20 ], [ "goggles_nv", 5 ], [ "hand_crank_charger", 15 ], + [ "UPS_off", 5 ], [ "handflare", 20 ], [ "hatchet", 10 ], [ "heavy_flashlight", 15 ], @@ -218,6 +219,7 @@ "//": "Equipment of any size commonly used by engineers and mechanics", "ammo": 100, "items": [ + { "group": "charged_UPS", "prob": 5 }, [ "jack", 80 ], [ "jack_small", 80 ], { @@ -486,5 +488,17 @@ [ "circsaw_blade", 10 ], [ "elec_chainsaw_off", 35 ] ] + }, + { + "id": "charged_UPS", + "type": "item_group", + "//": "A standard civilian UPS, with 80-100% charge. Use for storage locations where items tend to spawn loaded or charged.", + "items": [ { "item": "heavy_battery_cell", "charges": [ 800, 1000 ], "container-item": "UPS_off" } ] + }, + { + "id": "used_UPS", + "type": "item_group", + "//": "A standard civilian UPS, with 0-100% charge. Use for spawns where the item may have seen heavy use before being dropped.", + "items": [ { "item": "heavy_battery_cell", "charges": [ 800, 1000 ], "container-item": "UPS_off" } ] } ] diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index c5dea218f353..5c5dd99229bc 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -225,7 +225,7 @@ "name": { "str": "plutonium fuel cell" }, "symbol": "=", "color": "green", - "description": "This is neither a fuel cell, nor nuclear, but the name stuck. It uses plutonium-244 as a catalyst to stabilize a complicated nanocompound that can store enormous amounts of power. Unfortunately it cannot be recharged by conventional means: expended cells had to be sent to a central reprocessing facility that almost certainly doesn't exist anymore.", + "description": "This power cell was designed to store enormous amounts of power, using plutonium-244 and now-irreplaceable compounds to make compact reactors more practical than ever. Unfortunately it cannot be recharged by conventional means: expended cells had to be sent to a central reprocessing facility that almost certainly doesn't exist anymore.", "material": [ "steel", "plastic" ], "flags": [ "LEAK_DAM", "RADIOACTIVE" ], "volume": "250 ml", diff --git a/data/json/items/battery.json b/data/json/items/battery.json index 1d8a0867c8c4..959148dc88d1 100644 --- a/data/json/items/battery.json +++ b/data/json/items/battery.json @@ -39,8 +39,8 @@ "id": "light_minus_atomic_battery_cell", "type": "MAGAZINE", "category": "battery", - "name": { "str": "ultra-light plutonium fuel battery", "str_pl": "ultra-light plutonium fuel batteries" }, - "description": "This battery uses a thin plutonium-244 rod to stablize an exotic nanocompound. It is universally compatible with small devices. Although it stores a huge amount of power, it cannot be recharged.", + "name": { "str": "ultra-light plutonium battery", "str_pl": "ultra-light plutonium batteries" }, + "description": "This battery uses a thin plutonium-244 rod to stabilize an exotic nanocompound, manufactured from repurposed plutonium fission cells. It is universally compatible with small devices. Although it stores a huge amount of power, it cannot be recharged.", "ascii_picture": "ultra_light_battery_plut", "weight": "80 g", "volume": "1 ml", @@ -115,8 +115,8 @@ "id": "light_atomic_battery_cell", "type": "MAGAZINE", "category": "battery", - "name": { "str": "light plutonium fuel battery", "str_pl": "light plutonium fuel batteries" }, - "description": "This battery uses a thin plutonium-244 rod to stabilize an exotic nanocompound. It is universally compatible with all kinds of personal electronic devices. Although it stores a huge amount of power, it cannot be recharged.", + "name": { "str": "light plutonium battery", "str_pl": "light plutonium batteries" }, + "description": "This battery uses a thin plutonium-244 rod to stabilize an exotic nanocompound, manufactured from repurposed plutonium fission cells. It is universally compatible with all kinds of personal electronic devices. Although it stores a huge amount of power, it cannot be recharged.", "ascii_picture": "light_battery_plut", "weight": "160 g", "volume": "35ml", @@ -191,8 +191,8 @@ "id": "medium_atomic_battery_cell", "type": "MAGAZINE", "category": "battery", - "name": { "str": "medium plutonium fuel battery", "str_pl": "medium plutonium fuel batteries" }, - "description": "This battery uses a thin plutonium-244 rod to stablize an exotic nanocompound. It is universally compatible with all kinds of appliances and power tools. Although it stores a huge amount of power, it cannot be recharged.", + "name": { "str": "medium plutonium battery", "str_pl": "medium plutonium batteries" }, + "description": "This battery uses a thin plutonium-244 rod to stabilize an exotic nanocompound, manufactured from repurposed plutonium fission cells. It is universally compatible with all kinds of appliances and power tools. Although it stores a huge amount of power, it cannot be recharged.", "ascii_picture": "medium_battery_plut", "weight": "1000 g", "volume": "525ml", @@ -267,8 +267,8 @@ "id": "heavy_atomic_battery_cell", "type": "MAGAZINE", "category": "battery", - "name": { "str": "heavy plutonium fuel battery", "str_pl": "heavy plutonium fuel batteries" }, - "description": "This battery uses a thin plutonium-244 rod to stablize an exotic nanocompound. It is universally compatible with all kinds of industrial-grade equipment and large tools. Although it stores a huge amount of power, it cannot be recharged.", + "name": { "str": "heavy plutonium battery", "str_pl": "heavy plutonium batteries" }, + "description": "This battery uses a thin plutonium-244 rod to stabilize an exotic nanocompound, manufactured from repurposed plutonium fission cells. It is universally compatible with all kinds of industrial-grade equipment and large tools. Although it stores a huge amount of power, it cannot be recharged.", "ascii_picture": "heavy_battery_plut", "weight": "1600 g", "volume": "1500ml", @@ -288,7 +288,7 @@ "type": "MAGAZINE", "category": "battery", "name": { "str": "military plutonium fuel cell" }, - "description": "This battery uses a huge plutonium-244 rod to stablize an exotic nanocompound. It was used in military mech-suits, was highly experimental, and had no civilian applications. Although it stores a stupendous amount of power, it cannot be recharged.", + "description": "This battery uses a huge plutonium-244 rod to stabilize an exotic nanocompound, manufactured from repurposed plutonium fission cells. It was used in military mech-suits, was highly experimental, and had no civilian applications. Although it stores a stupendous amount of power, it cannot be recharged.", "weight": "64000 g", "volume": "30 L", "price": 100000, diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json index 0cd90095b793..cb8ad8e37c29 100644 --- a/data/json/items/tool/electronics.json +++ b/data/json/items/tool/electronics.json @@ -4,7 +4,7 @@ "type": "TOOL", "category": "tools", "name": { "str": "advanced UPS", "str_pl": "advanced UPS's" }, - "description": "This is an advanced version of the unified power supply, or UPS. This device has been significantly redesigned to provide better efficiency as well as to consume plutonium fuel cells rather than batteries. Sadly, its plutonium reactor can't be charged in UPS charging station.", + "description": "This is an advanced version of the unified power supply, or UPS. Designed for military use to power advanced weapons, it uses plutonium fuel cells which provide better efficiency, but are not rechargeable. It can power many household electronics as well.", "weight": "453 g", "volume": "2 L", "price": 560000, diff --git a/data/json/npcs/NC_SOLDIER.json b/data/json/npcs/NC_SOLDIER.json index 5ea3df264c7e..5a0a42acbdd6 100644 --- a/data/json/npcs/NC_SOLDIER.json +++ b/data/json/npcs/NC_SOLDIER.json @@ -133,8 +133,7 @@ { "item": "goggles_nv", "prob": 1 }, { "item": "goggles_ir", "prob": 1 }, { "item": "optical_cloak", "prob": 1 }, - { "item": "UPS_off", "prob": 5 }, - { "item": "adv_UPS_off", "prob": 3 }, + { "item": "adv_UPS_off", "prob": 10, "charges": [ 0, 2000 ] }, { "item": "tacvest", "prob": 10 }, { "item": "backpack", "prob": 8 }, { "item": "dump_pouch", "prob": 20 }, diff --git a/data/mods/Aftershock/items/item_overrides.json b/data/mods/Aftershock/items/item_overrides.json index d10559560c8d..d71cf8de913b 100644 --- a/data/mods/Aftershock/items/item_overrides.json +++ b/data/mods/Aftershock/items/item_overrides.json @@ -11,6 +11,6 @@ "id": "plut_cell", "copy-from": "plut_cell", "category": "tools", - "name": { "str": "plutonium cell" } + "name": { "str": "plutonium fuel cell" } } ]