Skip to content

Commit

Permalink
Merge pull request #75471 from dynst/minireactor
Browse files Browse the repository at this point in the history
Aftershock: fix up minireactor and plutonium cells
  • Loading branch information
Night-Pryanik authored Nov 7, 2024
2 parents 9a0ccb8 + 6006460 commit 92ef2d6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions data/json/items/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,8 @@
"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.",
"material": [ "plut_cell" ],
"flags": [ "LEAK_DAM", "RADIOACTIVE" ],
"volume": "250 ml",
"weight": "80 g",
"volume": "5 ml",
"weight": "20 g",
"ammo_type": "plutonium",
"count": 5,
"effects": [ "COOKOFF", "NEVER_MISFIRES" ]
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Aftershock/vehicles/part_items.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"color": "light_cyan",
"symbol": ":",
"material": [ "superalloy", "ceramic" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "plutonium": 10000 }, "rigid": true } ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "plutonium": 1000 }, "rigid": true } ],
"volume": "100 L",
"category": "veh_parts",
"price": "900 USD",
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Aftershock/vehicles/vehicle_parts.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@
"damage_modifier": 80,
"durability": 580,
"description": "A small nuclear reactor. When loaded with plutonium cells and turned on, will generate a lot of electrical power.",
"power": "100 W",
"//": "Here it is a multiplier on power efficiency - 1 unit of plutonium is 100 units of battery",
"power": "10000 W",
"//": "Here it is a multiplier on power efficiency - 1 unit of plutonium is 10000 kJ",
"epower": "149200 W",
"fuel_type": "plut_cell",
"item": "minireactor",
Expand Down

0 comments on commit 92ef2d6

Please sign in to comment.