Merge pull request #35873 from DaviBones/laundry-charges

Fix resource requirements when washing items with charges
CleverRaven · Dec 5, 2019 · 34ac4b8 · 34ac4b8
2 parents 5812006 + 50fe47a
commit 34ac4b8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/iuse.cpp b/src/iuse.cpp
@@ -9456,7 +9456,8 @@ int iuse::wash_items( player *p, bool soft_items, bool hard_items )
     ) {
         units::volume total_volume = 0_ml;
         for( const auto &p : items ) {
-            total_volume += p.first->volume() * p.second;
+            total_volume += p.first->volume() * p.second /
+                            ( p.first->count_by_charges() ? p.first->charges : 1 );
         }
         washing_requirements required = washing_requirements_for_volume( total_volume );
         auto to_string = []( int val ) -> std::string {
@@ -9494,7 +9495,7 @@ int iuse::wash_items( player *p, bool soft_items, bool hard_items )
             p->add_msg_if_player( m_info, _( "Never mind." ) );
             return 0;
         }
-        total_volume += i.volume() * pair.second;
+        total_volume += i.volume() * pair.second / ( i.count_by_charges() ? i.charges : 1 );
     }
 
     washing_requirements required = washing_requirements_for_volume( total_volume );