Fix water temperature from vehicle faucets (#55092)

* fuels_left() works with item

* use get_item_thermal_energy()

* use current phase

* ammo_required() is more generic

* combine different tanks for turrets

* split fuel_items_left() from fuels_left()

* correct unit in comment

* specify unit here too

Author: Hirmuolio

src/item.h

@@ -990,6 +990,11 @@ class item : public visitable
         /** Sets the item to new temperature and energy based new specific energy (J/g) and resets last_temp_check*/
         void set_item_specific_energy( float specific_energy );
 
+        /**
+         * Get the thermal energy of the item in Joules.
+         */
+        float get_item_thermal_energy() const;
+
         /** reset the last_temp_check used when crafting new items and the like */
         void reset_temp_check();
 
@@ -2658,11 +2663,6 @@ class item : public visitable
          */
         void calc_temp( int temp, float insulation, const time_duration &time_delta );
 
-        /**
-         * Get the thermal energy of the item in Joules.
-         */
-        float get_item_thermal_energy() const;
-
         /** Calculates item specific energy (J/g) from temperature (K)*/
         float get_specific_energy_from_temperature( float new_temperature );
 

src/vehicle.cpp

@@ -3333,15 +3333,13 @@ int vehicle::fuel_capacity( const itype_id &ftype ) const
 
 float vehicle::fuel_specific_energy( const itype_id &ftype ) const
 {
-    float total_energy = 0.0f;
-    float total_mass = 0.0f;
+    float total_energy = 0.0f; // J
+    float total_mass = 0.0f;  // g
     for( const vehicle_part &vp : parts ) {
         if( vp.is_tank() && vp.ammo_current() == ftype &&
-            vp.base.legacy_front().made_of( phase_id::LIQUID ) ) {
-            float energy = vp.base.legacy_front().specific_energy;
-            float mass = to_gram( vp.base.legacy_front().weight() );
-            total_energy += energy * mass;
-            total_mass += mass;
+            vp.base.only_item().made_of( phase_id::LIQUID ) ) {
+            total_energy += vp.base.only_item().get_item_thermal_energy();
+            total_mass += to_gram( vp.base.only_item().weight() );
         }
     }
     return total_energy / total_mass;
@@ -6766,6 +6764,17 @@ std::map<itype_id, int> vehicle::fuels_left() const
     return result;
 }
 
+std::list<item *> vehicle::fuel_items_left()
+{
+    std::list<item *> result;
+    for( vehicle_part &p : parts ) {
+        if( p.is_fuel_store() && !p.ammo_current().is_null() && !p.base.is_container_empty() ) {
+            result.push_back( &p.base.only_item() );
+        }
+    }
+    return result;
+}
+
 bool vehicle::is_foldable() const
 {
     for( const vpart_reference &vp : get_all_parts() ) {

src/vehicle.h

@@ -1186,6 +1186,11 @@ class vehicle
          */
         std::map<itype_id, int> fuels_left() const;
 
+        /**
+         * All the individual fuel items that are in all the tanks in the vehicle.
+        */
+        std::list<item *> fuel_items_left();
+
         // Checks how much certain fuel left in tanks.
         int fuel_left( const itype_id &ftype, bool recurse = false,
                        const std::function<bool( const vehicle_part & )> &filter = return_true<const vehicle_part &> )
@@ -1199,7 +1204,7 @@ class vehicle
         // Returns total vehicle fuel capacity for the given fuel type
         int fuel_capacity( const itype_id &ftype ) const;
 
-        // Returns the total specific energy of this fuel type. Frozen is ignored.
+        // Returns the total specific energy (J/g) of this fuel type. Frozen is ignored.
         float fuel_specific_energy( const itype_id &ftype ) const;
 
         // drains a fuel type (e.g. for the kitchen unit)

src/vehicle_use.cpp

@@ -2085,10 +2085,9 @@ void vpart_position::form_inventory( inventory &inv )
 
     // HACK: water_faucet pseudo tool gives access to liquids in tanks
     if( vp_faucet && inv.provide_pseudo_item( itype_water_faucet, 0 ) ) {
-        for( const std::pair<const itype_id, int> &it : vehicle().fuels_left() ) {
-            item fuel( it.first, calendar::turn_zero );
-            if( fuel.made_of( phase_id::LIQUID ) ) {
-                fuel.charges = it.second;
+        for( const item *it : vehicle().fuel_items_left() ) {
+            if( it->made_of( phase_id::LIQUID ) ) {
+                item fuel( *it );
                 inv.add_item( fuel );
             }
         }