Gun's displayed weight doesn't account for magazine/ammo weight

[Salty-Panda]

Describe the bug

Gun with and without magazine (or ammo in case of some shotguns) display the same weight

Steps To Reproduce

Debug gun, magazine, ammo, load and unload to your heart's content while inspecting the weapon

Expected behavior

The gun to display increased weight that includes all its nested pockets

Versions and configuration

• OS: Windows
  • OS Version: 10.0 2004
• Game Version: 0.E-7587-g8d87f15 [64-bit]
• Graphics Version: Tiles
• Game Language: English [en]
• Mods loaded: [ Dark Days Ahead [dda], Disable NPC Needs [no_npc_food], Aftershock [aftershock], Blaze Industries [blazeindustries], Magiclysm [magiclysm], Graphical Overmap [Graphical_Overmap], Graphical Overmap Magiclysm [Graphical_Overmap_Magiclysm], Mythical Martial Arts [MMA], C.R.I.T Expansion Mod [crt_expansion], No Fungal Monsters [No_Fungi], Stats Through Kills [stats_through_kills], SpeedyDex [speedydex], Bionic Professions [package_bionic_professions], Aftershock - UndeadPeople Tileset [AftershockUDP], Blaze Industries - UndeadPeople Tileset [BlazeIndustriesUDP], C.R.I.T Expansion Mod - UndeadPeople Tileset [crt_expansionUDP], Magiclysm - UndeadPeople Tileset [MagiclysmUDP], Mythical Martial Arts - UndeadPeople Tileset [MMAUDP] ]

[J-Cieplinski]

@Mrzjadacz what do you mean by "some shotguns"? Do shotguns that are not using magazine display the correct weight with ammo loaded?

Is magazine considered a gunmod in the code or is it a separate entity?

[J-Cieplinski]

Ok I see now that it's a separate entity. I just need confirmation if weapons that are not using magazine also displaying incorrect weight

[Salty-Panda]

Yes, problem was the same for shotguns using ammo directly

[J-Cieplinski]

I'm not completely sure but the issue possibly stems from

bool item::is_magazine() const
{
    return !!type->magazine || contents.has_pocket_type( item_pocket::pocket_type::MAGAZINE );
} 

bool item::magazine_integral() const
{
    return contents.has_pocket_type( item_pocket::pocket_type::MAGAZINE );
}

bool item_contents::has_pocket_type( const item_pocket::pocket_type pk_type ) const
{
    for( const item_pocket &pocket : contents ) {
        if( pocket.is_type( pk_type ) ) {
            return true;
        }
    }
    return false;
}

if( magazine_integral() && !is_magazine() )

I'm not sure what is the function of !! in is_magazine, but let's just say it's double negation which would yield a positive(I'm probably wrong, dunno why it's done that way). So the if( magazine_integral() && !is_magazine() ) from item.cpp:5005 which I believe is responsible for adding ammo weight to gun total weight, depends on both magazine_integral being true and it not being a magazine. However the item is a magazine only if it's type is a magazine OR it has pocket type of MAGAZINE. And magazine_integral is true only if item has a pocket type of MAGAZINE.

So the

if( magazine_integral() && !is_magazine() )

is true only if an item has a pocket type of MAGAZINE and item does not have a pocket type of MAGAZINE which is never true.

I would like for someone with more knowledge about the code base to chime in, and maybe someone who knowys why !! is there :)

[J-Cieplinski]

diff --git a/src/item.cpp b/src/item.cpp
index 95d16a6ff1..0ff6d6e0c0 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -5002,7 +5002,7 @@ units::mass item::weight( bool, bool integral ) const
             ret *= 0.85;
         }

-    } else if( magazine_integral() && !is_magazine() ) {
+    } else if( magazine_integral() && (!is_magazine() || is_gun()) ) {
         if( ammo_current() == itype_plut_cell ) {
             ret += ammo_remaining() * find_type( ammotype(
                     *ammo_types().begin() )->default_ammotype() )->weight / PLUTONIUM_CHARGES;

Seem to fix it for weapon not using a magazine. I will try to figure out the fix for magazine weapons later in the day