Merge pull request #82563 from John-Candlebury/afs-fix-chromoelectric

Maleclypse · web-flow · commit 4dc2e1e2ede5 · 2025-08-26T00:19:53.000-05:00
Energy remaining now looks for battery ammo_types
diff --git a/src/item.cpp b/src/item.cpp
@@ -11520,7 +11520,7 @@ units::energy item::energy_remaining( const Character *carrier, bool ignoreExter
     if( is_magazine() ) {
         ret += energy;
         for( const item *e : contents.all_items_top( pocket_type::MAGAZINE ) ) {
-            if( e->typeId() == itype_battery ) {
+            if( e->ammo_type() == ammo_battery ) {
                 ret += units::from_kilojoule( static_cast<std::int64_t>( e->charges ) );
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -11520,7 +11520,7 @@ units::energy item::energy_remaining( const Character *carrier, bool ignoreExter`
`11520`	`11520`	`if( is_magazine() ) {`
`11521`	`11521`	`ret += energy;`
`11522`	`11522`	`for( const item *e : contents.all_items_top( pocket_type::MAGAZINE ) ) {`
`11523`		`- if( e->typeId() == itype_battery ) {`
	`11523`	`+ if( e->ammo_type() == ammo_battery ) {`
`11524`	`11524`	`ret += units::from_kilojoule( static_cast<std::int64_t>( e->charges ) );`
`11525`	`11525`	`}`
`11526`	`11526`	`}`