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

refactor shield calculations #2

Closed
wants to merge 24 commits into from
Closed

refactor shield calculations #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
58b7e55
Commit what I've got for the moment
chaosvolt May 20, 2023
ed857bb
Apply suggestions from code review
chaosvolt May 20, 2023
2922ad7
Update character.cpp
chaosvolt May 20, 2023
8a9ec71
Update character.cpp
chaosvolt May 20, 2023
825aa2d
[Eternal Screaming]
chaosvolt May 20, 2023
fe604a5
Update src/creature.h
chaosvolt May 20, 2023
f773ca0
feat: drag heavier vehicles (#2840)
scarf005 May 20, 2023
7473334
Fix it up to a basic working state
chaosvolt May 20, 2023
dcce2ad
Continue code tweaks, add ballistic shield
chaosvolt May 20, 2023
74a0190
And some hopefully final touches
chaosvolt May 20, 2023
9f37517
Commit what I've got for the moment
chaosvolt May 20, 2023
a491e94
Apply suggestions from code review
chaosvolt May 20, 2023
d0477c9
Update character.cpp
chaosvolt May 20, 2023
a2adae3
Update character.cpp
chaosvolt May 20, 2023
b18e16d
[Eternal Screaming]
chaosvolt May 20, 2023
980b8ae
Update src/creature.h
chaosvolt May 20, 2023
892f7cf
Fix it up to a basic working state
chaosvolt May 20, 2023
8ec4f9d
Continue code tweaks, add ballistic shield
chaosvolt May 20, 2023
ae1a450
Update JSON_FLAGS.md
chaosvolt May 21, 2023
1aeeb98
Fix merge conflicts
chaosvolt May 21, 2023
9031323
Update src/character.cpp
chaosvolt May 21, 2023
6d806e4
refactor: extract covered by shield
scarf005 May 21, 2023
195c271
refactor: extract shieldlevel
scarf005 May 21, 2023
dec2fd3
refactor: extract damage calculation
scarf005 May 21, 2023
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
Apply suggestions from code review 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@chaosvolt @github-actions
chaosvolt and github-actions[bot] authored May 20, 2023
commit ed857bba25bf7571bf1fd568771100380af2e02c
3 changes: 2 additions & 1 deletion src/character.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10650,7 +10650,8 @@ bool Character::block_ranged_hit( Creature *source, bodypart_id &bp_hit, damage_
// 1. Best item available doesn't count as a shield.
// 2. Shield already protects the part we're interested in.
// 3. Targeted bodypart is a foot, unlikely to ever successfully block that low.
if( !shield.has_flag( "BLOCK_WHILE_WORN" ) || shield.covers( bp_hit->token ) || bp_hit == bodypart_str_id( "foot_l" ) || bp_hit == bodypart_str_id( "foot_r" ) ) {
if( !shield.has_flag( "BLOCK_WHILE_WORN" ) || shield.covers( bp_hit->token ) ||
bp_hit == bodypart_str_id( "foot_l" ) || bp_hit == bodypart_str_id( "foot_r" ) ) {
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion src/creature.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ class Creature

// handles interaction of shields and ranged attacks. mutates &dam
virtual bool block_ranged_hit( Creature *source, bodypart_id &bp_hit,
damage_instance &dam ) = 0;
damage_instance &dam ) = 0;

// handles armor absorption (including clothing damage etc)
// of damage instance. mutates &dam
Expand Down