Skip to content

Commit

Permalink
feat(balance): buff fingertip razor bionic, take 2 (#4623)
Browse files Browse the repository at this point in the history
* feat(balance): updates to fingertip razor bionic, take 2

Co-Authored-By: Chorus System <3629845+yay855@users.noreply.github.com>

* Some code tinkerin'

Co-Authored-By: Chorus System <3629845+yay855@users.noreply.github.com>

---------

Co-authored-by: Chorus System <3629845+yay855@users.noreply.github.com>
  • Loading branch information
chaosvolt and yay855 committed May 13, 2024
1 parent 95b727e commit b68a042
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion data/json/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@
"id": "bio_razors",
"type": "bionic",
"name": { "str": "Fingertip Razors" },
"description": "You possess razor-sharp claws underneath your fingernails that do a small amount of unarmed slashing damage whenever your fingertips are uncovered.",
"description": "You possess razor-sharp claws underneath your fingernails that do a fair amount of unarmed slashing damage whenever your fingertips are uncovered, and which you can use with some precision to cut and butcher..",
"occupied_bodyparts": [ [ "hand_l", 2 ], [ "hand_r", 2 ] ],
"fake_item": "fake_razor",
"flags": [ "BIONIC_NPC_USABLE" ]
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@
"type": "BIONIC_ITEM",
"name": { "str": "Fingertip Razors CBM" },
"looks_like": "bio_int_enhancer",
"description": "A set of ten double-edged, four centimeter long razor-sharp claws that are implanted underneath the fingernails. These will deal a small amount of unarmed slashing damage whenever the user's fingertips are uncovered.",
"description": "A set of ten double-edged, four centimeter long razor-sharp claws that are implanted underneath the fingernails. These will deal a fair amount of unarmed slashing damage whenever the user's fingertips are uncovered, and allow the user to somewhat precisely slice things apart.",
"price": "4500 USD",
"weight": "5 g",
"difficulty": 4
Expand Down
3 changes: 2 additions & 1 deletion data/json/items/fake.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@
"copy-from": "fake_item",
"type": "TOOL",
"name": { "str": "bionic razor" },
"qualities": [ [ "BUTCHER", 8 ] ]
"//": "Bonus unarmed damage for having Fingertip Razors installed is applied in melee.cpp, see function Character::roll_cut_damage",
"qualities": [ [ "BUTCHER", 15 ], [ "CUT", 1 ], [ "CUT_FINE", 2 ] ]
},
{
"id": "clairvoyance_plus_rod",
Expand Down
2 changes: 1 addition & 1 deletion src/character_display.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ int character_display::display_empty_handed_base_damage( const Character &you )
// Mutation and bionic bonuses double if both hands are free
int per_hand = 0;
if( you.has_bionic( bionic_id( "bio_razors" ) ) ) {
per_hand += 4;
per_hand += 9;
}
for( const trait_id &mut : you.get_mutations() ) {
if( mut->flags.count( trait_flag_NEED_ACTIVE_TO_MELEE ) > 0 &&
Expand Down
6 changes: 1 addition & 5 deletions src/melee.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,7 @@ void Character::roll_cut_damage( bool crit, damage_instance &di, bool average,
if( left_empty || right_empty ) {
float per_hand = 0.0f;
if( has_bionic( bionic_id( "bio_razors" ) ) ) {
per_hand += 2;
per_hand += 9;
}

for( const trait_id &mut : get_mutations() ) {
Expand Down Expand Up @@ -1123,10 +1123,6 @@ void Character::roll_stab_damage( bool crit, damage_instance &di, bool /*average
per_hand += stab_bonus + unarmed_bonus;
}

if( has_bionic( bionic_id( "bio_razors" ) ) ) {
per_hand += 2;
}

stab_dam += per_hand; // First hand
if( left_empty && right_empty ) {
// Second hand
Expand Down

0 comments on commit b68a042

Please sign in to comment.