Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manual labour doesn't make you sleepy #47512

Merged
merged 4 commits into from
Mar 25, 2021
Merged

manual labour doesn't make you sleepy #47512

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bbe8e99
remove mod_fatigue() calls from activities
s7eamy Feb 14, 2021
f1b6443
Update activity_handlers.cpp
s7eamy Feb 14, 2021
a2c4225
Update src/activity_handlers.cpp
s7eamy Feb 15, 2021
d0f490e
troglobite buff
s7eamy Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 4 additions & 37 deletions src/activity_handlers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1821,23 +1821,13 @@ void activity_handlers::pickaxe_finish( player_activity *act, player *p )
const int helpersize = get_player_character().get_num_crafting_helpers( 3 );
if( here.is_bashable( pos ) && here.has_flag( flag_SUPPORTS_ROOF, pos ) &&
here.ter( pos ) != t_tree ) {
// Tunneling through solid rock is hungry, sweaty, tiring, backbreaking work
// Betcha wish you'd opted for the J-Hammer ;P
p->mod_stored_nutr( 15 - ( helpersize * 3 ) );
p->mod_thirst( 15 - ( helpersize * 3 ) );
// Tunneling through solid rock is sweaty, backbreaking work
// Betcha wish you'd opted for the J-Hammer
if( p->has_trait( trait_STOCKY_TROGLO ) ) {
// Yep, dwarves can dig longer before tiring
p->mod_fatigue( 20 - ( helpersize * 3 ) );
p->mod_pain( std::max( 0, ( 1 * static_cast<int>( rng( 0, 3 ) ) ) - helpersize ) );
} else {
p->mod_fatigue( 30 - ( helpersize * 3 ) );
p->mod_pain( std::max( 0, ( 2 * static_cast<int>( rng( 1, 3 ) ) ) - helpersize ) );
}
p->mod_pain( std::max( 0, ( 2 * static_cast<int>( rng( 1, 3 ) ) ) - helpersize ) );
} else if( here.move_cost( pos ) == 2 && here.get_abs_sub().z == 0 &&
here.ter( pos ) != t_dirt && here.ter( pos ) != t_grass ) {
//Breaking up concrete on the surface? not nearly as bad
p->mod_stored_nutr( 5 - ( helpersize ) );
p->mod_thirst( 5 - ( helpersize ) );
p->mod_fatigue( 10 - ( helpersize * 2 ) );
}
}
p->add_msg_player_or_npc( m_good,
Expand Down Expand Up @@ -2145,7 +2135,6 @@ void activity_handlers::hand_crank_do_turn( player_activity *act, player *p )
// Modify for weariness
time_to_crank /= p->exertion_adjusted_move_multiplier( act->exertion_level() );
if( calendar::once_every( time_duration::from_seconds( time_to_crank ) ) ) {
p->mod_fatigue( 1 );
if( hand_crank_item.ammo_capacity( ammotype( "battery" ) ) > hand_crank_item.ammo_remaining() ) {
hand_crank_item.ammo_set( itype_id( "battery" ), hand_crank_item.ammo_remaining() + 1 );
} else {
Expand Down Expand Up @@ -2173,7 +2162,6 @@ void activity_handlers::vibe_do_turn( player_activity *act, player *p )
}

if( calendar::once_every( 1_minutes ) ) {
p->mod_fatigue( 1 );
if( vibrator_item.ammo_remaining() > 0 ) {
vibrator_item.ammo_consume( 1, p->pos() );
p->add_morale( MORALE_FEELING_GOOD, 3, 40 );
Expand Down Expand Up @@ -3605,9 +3593,6 @@ void activity_handlers::hacksaw_finish( player_activity *act, player *p )
here.spawn_item( p->pos(), itype_pipe, 12 );
}

p->mod_stored_nutr( 5 );
p->mod_thirst( 5 );
p->mod_fatigue( 10 );
p->add_msg_if_player( m_good, _( "You finish cutting the metal." ) );

act->set_to_null();
Expand Down Expand Up @@ -3722,10 +3707,6 @@ void activity_handlers::chop_tree_finish( player_activity *act, player *p )
}

here.ter_set( pos, t_stump );
const int helpersize = p->get_num_crafting_helpers( 3 );
p->mod_stored_nutr( 5 - helpersize );
p->mod_thirst( 5 - helpersize );
p->mod_fatigue( 10 - ( helpersize * 2 ) );
p->add_msg_if_player( m_good, _( "You finish chopping down a tree." ) );
// sound of falling tree
sfx::play_variant_sound( "misc", "timber",
Expand Down Expand Up @@ -3771,10 +3752,6 @@ void activity_handlers::chop_logs_finish( player_activity *act, player *p )
here.add_item_or_charges( pos, obj );
}
here.ter_set( pos, t_dirt );
const int helpersize = p->get_num_crafting_helpers( 3 );
p->mod_stored_nutr( 5 - helpersize );
p->mod_thirst( 5 - helpersize );
p->mod_fatigue( 10 - ( helpersize * 2 ) );
p->add_msg_if_player( m_good, _( "You finish chopping wood." ) );

act->set_to_null();
Expand Down Expand Up @@ -3825,12 +3802,6 @@ void activity_handlers::jackhammer_finish( player_activity *act, player *p )

here.destroy( pos, true );

if( p->is_avatar() ) {
const int helpersize = get_player_character().get_num_crafting_helpers( 3 );
p->mod_stored_nutr( 5 - helpersize );
p->mod_thirst( 5 - helpersize );
p->mod_fatigue( 10 - ( helpersize * 2 ) );
}
p->add_msg_player_or_npc( m_good,
_( "You finish drilling." ),
_( "<npcname> finishes drilling." ) );
Expand Down Expand Up @@ -3870,10 +3841,6 @@ void activity_handlers::fill_pit_finish( player_activity *act, player *p )
} else {
here.ter_set( pos, t_dirt );
}
const int helpersize = get_player_character().get_num_crafting_helpers( 3 );
p->mod_stored_nutr( 5 - helpersize );
p->mod_thirst( 5 - helpersize );
p->mod_fatigue( 10 - ( helpersize * 2 ) );
p->add_msg_if_player( m_good, _( "You finish filling up %s." ), old_ter.obj().name() );

act->set_to_null();
Expand Down