Merge pull request #81916 from GuardianDll/wield_damage_fix

Maleclypse · web-flow · commit 92cf853021f0 · 2025-07-19T16:17:05.000-05:00
print correct ammo damage in wielding menu
diff --git a/src/game_inventory.cpp b/src/game_inventory.cpp
@@ -1918,7 +1918,13 @@ class weapon_inventory_preset: public inventory_selector_preset
                                                 );
                         }
                     }
-                    const int ammo_damage = damage.total_damage();
+
+                    int ammo_damage;
+                    if( loc->barrel_length().value() > 0 ) {
+                        ammo_damage = damage.di_considering_length( loc->barrel_length() ).total_damage();
+                    } else {
+                        ammo_damage = damage.total_damage();
+                    }
 
                     return string_format( "%s<color_light_gray>+</color>%s <color_light_gray>=</color> %s",
                                           get_damage_string( basic_damage, true ),

Original file line number	Diff line number	Diff line change
`@@ -1918,7 +1918,13 @@ class weapon_inventory_preset: public inventory_selector_preset`
`1918`	`1918`	`);`
`1919`	`1919`	`}`
`1920`	`1920`	`}`
`1921`		`- const int ammo_damage = damage.total_damage();`
	`1921`	`+`
	`1922`	`+ int ammo_damage;`
	`1923`	`+ if( loc->barrel_length().value() > 0 ) {`
	`1924`	`+ ammo_damage = damage.di_considering_length( loc->barrel_length() ).total_damage();`
	`1925`	`+ } else {`
	`1926`	`+ ammo_damage = damage.total_damage();`
	`1927`	`+ }`
`1922`	`1928`
`1923`	`1929`	`return string_format( "%s<color_light_gray>+</color>%s <color_light_gray>=</color> %s",`
`1924`	`1930`	`get_damage_string( basic_damage, true ),`