Skip to content

Commit

Permalink
feat(balance): allow mills to hold more food than smoking racks (#5747)
Browse files Browse the repository at this point in the history
  • Loading branch information
chaosvolt authored Nov 22, 2024
1 parent bda0e52 commit 4e50719
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/iexamine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5315,6 +5315,7 @@ namespace sm_rack
{
const int MIN_CHARCOAL = 100;
const int CHARCOAL_PER_LITER = 25;
const units::volume MAX_FOOD_VOLUME_MILLING = units::from_liter( 100 );
const units::volume MAX_FOOD_VOLUME = units::from_liter( 20 );
const units::volume MAX_FOOD_VOLUME_PORTABLE = units::from_liter( 15 );
} // namespace sm_rack
Expand Down Expand Up @@ -5366,11 +5367,10 @@ static void mill_activate( player &p, const tripoint &examp )
add_msg( _( "This mill is empty. Fill it with starchy products such as wheat, barley or oats and try again." ) );
return;
}
// TODO: currently mill just uses sm_rack defined max volume
if( food_volume > sm_rack::MAX_FOOD_VOLUME ) {
if( food_volume > sm_rack::MAX_FOOD_VOLUME_MILLING ) {
add_msg( _( "This mill is overloaded with products, and the millstone can't turn. Remove some and try again." ) );
add_msg( pgettext( "volume units", "You think that you can load about %s %s in it." ),
format_volume( sm_rack::MAX_FOOD_VOLUME ), volume_units_long() );
format_volume( sm_rack::MAX_FOOD_VOLUME_MILLING ), volume_units_long() );
return;
}

Expand Down Expand Up @@ -5901,8 +5901,8 @@ void iexamine::quern_examine( player &p, const tripoint &examp )
}

const bool empty = f_volume == 0_ml;
const bool full = f_volume >= sm_rack::MAX_FOOD_VOLUME;
const auto remaining_capacity = sm_rack::MAX_FOOD_VOLUME - f_volume;
const bool full = f_volume >= sm_rack::MAX_FOOD_VOLUME_MILLING;
const auto remaining_capacity = sm_rack::MAX_FOOD_VOLUME_MILLING - f_volume;

uilist smenu;
smenu.text = _( "What to do with the mill?" );
Expand Down

0 comments on commit 4e50719

Please sign in to comment.