Regular UPS increases in volume when loaded

[ektoplazm]

Describe the bug

Unlike other electronic devices UPS increases in volume when loaded with heavy batteries, which renders it useless for power armor.

Steps To Reproduce

1. Spawn UPS
2. Spawn different types of heavy batteries
3. Check volume changes on the UPS after loading it

Expected behavior

The volume of the UPS should not increase since it's an electronic device and batteries are not supposed to protrude from those.

Just checked adv UPS - it behaves normally, loading it with plutonium cells does not increase its volume.

Screenshots

Versions and configuration

debug.log

- OS Version: 10.0 1903

• Game Version: 0.D-12166-g0a401c8 [64-bit]
• Graphics Version: Tiles
• Mods loaded: [
  Dark Days Ahead [dda],
  Disable NPC Needs [no_npc_food],
  Bionic Slots [cbm_slots],
  No Rail Stations [No_Rail_Stations]

[Funguss]

In the full description it mentions that the UPS has its' own custom battery that's rechargeable but irremovable. In light of this it's reasonable to suppose the battery is attached via cable than by internal housing...

Was just struck by the realisation that the UPS isn't rechargeable via batteries at all. Not quite sure how you've achieved this.

[CSHague]

That's the old description for the UPS in the screenshot so it must be an older version before it was changed. Until recently, you could load batteries into the UPS until it was changed to have its own battery making it slightly higher capacity than a heavy battery, giving the UPS some use. As a consequence of updating, however, any UPS that was loaded with a battery will have an unchargable UPS after updating as it will still have the battery loaded in it, overriding the internal "magazine"

[Funguss]

Oh? How recently? I always used to recharge my UPS via a vehicle port, on the rare occasions I used them at all. I don't think I've recharged them with batteries since back when they came as ammo stacks.

[ektoplazm]

The UPS is supposed to be rechargable with heavy batteries in the current experimental build:

Cataclysm-DDA/data/json/items/tool/electronics.json

Line 507 in 999937b

[ "battery", [ "heavy_plus_battery_cell", "heavy_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ]

http://cdda-trunk.chezzo.com/UPS_off

The aftershock version however is described as: "Has it's own custom battery, with higher capacity and rechargeable, but not removeable.

[Funguss]

Aha! Sorry about that! I would say that for power armour there's a CBM for it that allows it to work on bio energy, plus there's a UPS CBM I believe.

[ektoplazm]

I found the culprit - in this PR the volume of all heavy batteries was increased, while "magazine_well" parameter for the regular UPS remained unchanged at 4 units (i.e. 1 L):

Cataclysm-DDA/data/json/items/tool/electronics.json

Line 509 in 999937b

"magazine_well": 4,

I'll make a PR to fix it shortly.