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

Move more body_part to bodypart_id in Character part1 #40144

Merged
merged 14 commits into from
May 11, 2020
Merged

Move more body_part to bodypart_id in Character part1 #40144

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6cf46c4
warmth
May 4, 2020
f129d22
bonus_item_warmth
May 4, 2020
58d9ded
fix
May 4, 2020
7d329ac
Don't check warmth of num_bp
May 5, 2020
ae6e2c5
get_wind_resistance
May 4, 2020
b3df4e4
natural_attack_restricted_on
May 4, 2020
8eff51a
reduce_healing_effect
May 4, 2020
f65780c
passive_absorb_hit
May 4, 2020
612827c
bionic_armor_bonus
May 4, 2020
8341a5e
get_armor_fire
May 4, 2020
6789c1e
limb_color
May 4, 2020
3eb4741
no_cbm_on_bp,occupied_body_part,can_install_cbm_on_bp,get_occupied_bo…
May 4, 2020
fa8194b
solve post merge errors
May 5, 2020
b70f359
post merge fixes
May 8, 2020
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
Prev Previous commit
Next Next commit
reduce_healing_effect
  • Loading branch information
Fris0uman committed May 8, 2020
commit 8eff51a934a4704bdab4f7ff41163d77894e7c0c
19 changes: 11 additions & 8 deletions src/character.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8496,10 +8496,10 @@ void Character::apply_damage( Creature *source, bodypart_id hurt, int dam, const
// remove healing effects if damaged
int remove_med = roll_remainder( dam / 5.0f );
if( remove_med > 0 && has_effect( effect_bandaged, enum_bp ) ) {
remove_med -= reduce_healing_effect( effect_bandaged, remove_med, enum_bp );
remove_med -= reduce_healing_effect( effect_bandaged, remove_med, hurt );
}
if( remove_med > 0 && has_effect( effect_disinfected, enum_bp ) ) {
reduce_healing_effect( effect_disinfected, remove_med, enum_bp );
reduce_healing_effect( effect_disinfected, remove_med, hurt );
}
}
}
Expand Down Expand Up @@ -8656,22 +8656,25 @@ dealt_damage_instance Character::deal_damage( Creature *source, bodypart_id bp,
return dealt_dams;
}

int Character::reduce_healing_effect( const efftype_id &eff_id, int remove_med, body_part hurt )
int Character::reduce_healing_effect( const efftype_id &eff_id, int remove_med,
const bodypart_id &hurt )
{
effect &e = get_effect( eff_id, hurt );
const body_part hurt_token = hurt->token;
effect &e = get_effect( eff_id, hurt_token );
int intensity = e.get_intensity();
if( remove_med < intensity ) {
if( eff_id == effect_bandaged ) {
add_msg_if_player( m_bad, _( "Bandages on your %s were damaged!" ), body_part_name( hurt ) );
add_msg_if_player( m_bad, _( "Bandages on your %s were damaged!" ), body_part_name( hurt_token ) );
} else if( eff_id == effect_disinfected ) {
add_msg_if_player( m_bad, _( "You got some filth on your disinfected %s!" ),
body_part_name( hurt ) );
body_part_name( hurt_token ) );
}
} else {
if( eff_id == effect_bandaged ) {
add_msg_if_player( m_bad, _( "Bandages on your %s were destroyed!" ), body_part_name( hurt ) );
add_msg_if_player( m_bad, _( "Bandages on your %s were destroyed!" ),
body_part_name( hurt_token ) );
} else if( eff_id == effect_disinfected ) {
add_msg_if_player( m_bad, _( "Your %s is no longer disinfected!" ), body_part_name( hurt ) );
add_msg_if_player( m_bad, _( "Your %s is no longer disinfected!" ), body_part_name( hurt_token ) );
}
}
e.mod_duration( -6_hours * remove_med );
Expand Down
2 changes: 1 addition & 1 deletion src/character.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ class Character : public Creature, public visitable<Character>
dealt_damage_instance deal_damage( Creature *source, bodypart_id bp,
const damage_instance &d ) override;
/** Reduce healing effect intensity, return initial intensity of the effect */
int reduce_healing_effect( const efftype_id &eff_id, int remove_med, body_part hurt );
int reduce_healing_effect( const efftype_id &eff_id, int remove_med, const bodypart_id &hurt );

void cough( bool harmful = false, int loudness = 4 );
/**
Expand Down