activation consume (#60502)

src/activity_handlers.cpp

@@ -1667,7 +1667,7 @@ void activity_handlers::start_fire_finish( player_activity *act, Character *you
         return;
     }
 
-    it.ammo_consume( 1, you->pos(), you );
+    it.activation_consume( 1, you->pos(), you );
 
     you->practice( skill_survival, act->index, 5 );
 

src/character.cpp

@@ -6508,11 +6508,11 @@ bool Character::invoke_item( item *used, const std::string &method, const tripoi
 
     if( actually_used->is_comestible() ) {
         const bool ret = consume_effects( *used );
-        actually_used->ammo_consume( charges_used.value(), pt, this );
+        actually_used->activation_consume( charges_used.value(), pt, this );
         return ret;
     }
 
-    actually_used->ammo_consume( charges_used.value(), pt, this );
+    actually_used->activation_consume( charges_used.value(), pt, this );
 
     if( actually_used->has_flag( flag_SINGLE_USE ) || actually_used->is_bionic() ||
         actually_used->is_deployable() ) {

src/item.cpp

@@ -10890,6 +10890,11 @@ int item::ammo_consume( int qty, const tripoint &pos, Character *carrier )
     return wanted_qty - qty;
 }
 
+int item::activation_consume( int qty, const tripoint &pos, Character *carrier )
+{
+    return ammo_consume( qty * ammo_required(), pos, carrier );
+}
+
 const itype *item::ammo_data() const
 {
     const item *mag = magazine_current();

src/item.h

@@ -2294,6 +2294,16 @@ class item : public visitable
          */
         int ammo_consume( int qty, const tripoint &pos, Character *carrier );
 
+        /**
+         * Consume ammo to activate item qty times (if available) and return the amount of ammo that was consumed
+         * Consume order: loaded items, UPS, bionic
+         * @param qty number of times to consume item activation charges
+         * @param pos current location of item, used for ejecting magazines and similar effects
+         * @param carrier holder of the item, used for getting UPS and bionic power
+         * @return amount of ammo consumed which will be between 0 and qty
+         */
+        int activation_consume( int qty, const tripoint &pos, Character *carrier );
+
         /** Specific ammo data, returns nullptr if item is neither ammo nor loaded with any */
         const itype *ammo_data() const;
         /** Specific ammo type, returns "null" if item is neither ammo nor loaded with any */

src/trapfunc.cpp

@@ -1262,7 +1262,7 @@ bool trapfunc::ledge( const tripoint &p, Creature *c, item * )
         if( jetpack.ammo_sufficient( you ) ) {
             you->add_msg_player_or_npc( _( "You ignite your %s and use it to break the fall." ),
                                         _( "<npcname> uses their %s to break the fall." ), jetpack.tname() );
-            jetpack.ammo_consume( 1, you->pos(), you );
+            jetpack.activation_consume( 1, you->pos(), you );
         } else {
             you->add_msg_if_player( m_bad,
                                     _( "You attempt to break the fall with your %s but it is out of fuel!" ), jetpack.tname() );