Skip to content

Commit

Permalink
Worn gloves count as unarmed weapons when no weapon is held
Browse files Browse the repository at this point in the history
  • Loading branch information
@CodeBandit
CodeBandit committed Jun 10, 2020
1 parent d071e91 commit 3171900
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 17 deletions.
22 changes: 22 additions & 0 deletions data/json/items/armor/gloves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -948,5 +948,27 @@
"environmental_protection": 2,
"material_thickness": 5,
"flags": [ "STURDY", "OUTER", "RAINPROOF", "ONLY_ONE" ]
},
{
"id": "gloves_studded",
"type": "ARMOR",
"name": { "str": "pair of studded gloves", "str_pl": "pairs of studded gloves" },
"description": "A pair of gloves with studded metal knuckles.",
"weight": "218 g",
"volume": "250 ml",
"price": 1100,
"price_postapoc": 250,
"bashing": 2,
"cutting": 1,
"material": [ "leather", "cotton" ],
"symbol": "[",
"looks_like": "gloves_leather",
"color": "light_gray",
"covers": [ "HANDS" ],
"coverage": 100,
"encumbrance": 2,
"warmth": 5,
"material_thickness": 2,
"flags": [ "WATER_FRIENDLY", "STAB", "DURABLE_MELEE" ]
}
]
16 changes: 16 additions & 0 deletions data/json/recipes/armor/hands.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,5 +469,21 @@
"book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ],
"using": [ [ "chainmail_standard", 2 ] ],
"components": [ [ [ "link_sheet", 2 ] ], [ [ "chain_link", 50 ] ], [ [ "wire", 1 ] ], [ [ "rag", 4 ] ] ]
},
{
"result": "gloves_studded",
"type": "recipe",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_HANDS",
"skill_used": "tailor",
"difficulty": 3,
"time": "30 m",
"autolearn": true,
"using": [ [ "sewing_standard", 4 ] ],
"components": [
[ [ "rag", 4 ], [ "gloves_light", 1 ], [ "gloves_liner", 1 ] ],
[ [ "leather", 2 ], [ "gloves_leather", 1 ] ],
[ [ "scrap", 4 ] ]
]
}
]
62 changes: 45 additions & 17 deletions src/melee.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ static const trait_id trait_PROF_SKATER( "PROF_SKATER" );
static const trait_id trait_VINES2( "VINES2" );
static const trait_id trait_VINES3( "VINES3" );

static const std::string flag_UNARMED_WEAPON( "UNARMED_WEAPON" );

static const efftype_id effect_amigara( "amigara" );

static const species_id species_HUMAN( "HUMAN" );
Expand Down Expand Up @@ -422,17 +424,39 @@ void Character::melee_attack( Creature &t, bool allow_special, const matec_id &f
return;
}
}
item &cur_weapon = allow_unarmed ? used_weapon() : weapon;
item *cur_weapon = allow_unarmed ? &used_weapon() : &weapon;

// If no weapon is selected, use highest layer of gloves instead.
bool unarmed_flag_set = false;
if( cur_weapon->is_null() ) {
bool found_glove = false;
for( item &worn_item : worn ) {
// Uses enum layer_level to make distinction for top layer.
if( ( worn_item.covers( bodypart_id( bp_hand_l ) ) &&
worn_item.covers( bodypart_id( bp_hand_r ) ) ) ) {
if( cur_weapon->is_null() || ( worn_item.get_layer() >= cur_weapon->get_layer() ) ) {
cur_weapon = &worn_item;
found_glove = true;
}
}
}

// Treat all gloves as unarmed weapons.
if( found_glove && !cur_weapon->has_flag( flag_UNARMED_WEAPON ) ) {
cur_weapon->set_flag( flag_UNARMED_WEAPON );
unarmed_flag_set = true;
}
}

if( cur_weapon.attack_time() > attack_speed( cur_weapon ) * 20 ) {
if( cur_weapon->attack_time() > attack_speed( *cur_weapon ) * 20 ) {
add_msg( m_bad, _( "This weapon is too unwieldy to attack with!" ) );
return;
}

int move_cost = attack_speed( cur_weapon );
int move_cost = attack_speed( *cur_weapon );

if( hit_spread < 0 ) {
int stumble_pen = stumble( *this, cur_weapon );
int stumble_pen = stumble( *this, *cur_weapon );
sfx::generate_melee_sound( pos(), t.pos(), false, false );
if( is_player() ) { // Only display messages if this is the player

Expand All @@ -443,8 +467,8 @@ void Character::melee_attack( Creature &t, bool allow_special, const matec_id &f
}
}

if( can_miss_recovery( cur_weapon ) ) {
ma_technique tec = martial_arts_data.get_miss_recovery_tec( cur_weapon );
if( can_miss_recovery( *cur_weapon ) ) {
ma_technique tec = martial_arts_data.get_miss_recovery_tec( *cur_weapon );
add_msg( _( tec.avatar_message ), t.disp_name() );
} else if( stumble_pen >= 60 ) {
add_msg( m_bad, _( "You miss and stumble with the momentum." ) );
Expand All @@ -465,12 +489,12 @@ void Character::melee_attack( Creature &t, bool allow_special, const matec_id &f

// Practice melee and relevant weapon skill (if any) except when using CQB bionic
if( !has_active_bionic( bio_cqb ) ) {
melee_train( *this, 2, 5, cur_weapon );
melee_train( *this, 2, 5, *cur_weapon );
}

// Cap stumble penalty, heavy weapons are quite weak already
move_cost += std::min( 60, stumble_pen );
if( martial_arts_data.has_miss_recovery_tec( cur_weapon ) ) {
if( martial_arts_data.has_miss_recovery_tec( *cur_weapon ) ) {
move_cost /= 2;
}

Expand All @@ -481,19 +505,19 @@ void Character::melee_attack( Creature &t, bool allow_special, const matec_id &f
// Remember if we see the monster at start - it may change
const bool seen = g->u.sees( t );
// Start of attacks.
const bool critical_hit = scored_crit( t.dodge_roll(), cur_weapon );
const bool critical_hit = scored_crit( t.dodge_roll(), *cur_weapon );
if( critical_hit ) {
melee::melee_stats.actual_crit_count += 1;
}
damage_instance d;
roll_all_damage( critical_hit, d, false, cur_weapon );
roll_all_damage( critical_hit, d, false, *cur_weapon );

const bool has_force_technique = !force_technique.str().empty();

// Pick one or more special attacks
matec_id technique_id;
if( allow_special && !has_force_technique ) {
technique_id = pick_technique( t, cur_weapon, critical_hit, false, false );
technique_id = pick_technique( t, *cur_weapon, critical_hit, false, false );
} else if( has_force_technique ) {
technique_id = force_technique;
} else {
Expand All @@ -507,8 +531,8 @@ void Character::melee_attack( Creature &t, bool allow_special, const matec_id &f
d.mult_damage( 0.1 );
}
// polearms and pikes (but not spears) do less damage to adjacent targets
if( cur_weapon.reach_range( *this ) > 1 && !reach_attacking &&
cur_weapon.has_flag( "POLEARM" ) ) {
if( cur_weapon->reach_range( *this ) > 1 && !reach_attacking &&
cur_weapon->has_flag( "POLEARM" ) ) {
d.mult_damage( 0.7 );
}

Expand All @@ -522,7 +546,7 @@ void Character::melee_attack( Creature &t, bool allow_special, const matec_id &f
// Proceed with melee attack.
if( !t.is_dead_state() ) {
// Handles speed penalties to monster & us, etc
std::string specialmsg = melee_special_effects( t, d, cur_weapon );
std::string specialmsg = melee_special_effects( t, d, *cur_weapon );

// gets overwritten with the dealt damage values
dealt_damage_instance dealt_dam;
Expand All @@ -533,8 +557,8 @@ void Character::melee_attack( Creature &t, bool allow_special, const matec_id &f
t.deal_melee_hit( this, hit_spread, critical_hit, d, dealt_dam );
if( dealt_special_dam.type_damage( DT_CUT ) > 0 ||
dealt_special_dam.type_damage( DT_STAB ) > 0 ||
( cur_weapon.is_null() && ( dealt_dam.type_damage( DT_CUT ) > 0 ||
dealt_dam.type_damage( DT_STAB ) > 0 ) ) ) {
( cur_weapon->is_null() && ( dealt_dam.type_damage( DT_CUT ) > 0 ||
dealt_dam.type_damage( DT_STAB ) > 0 ) ) ) {
if( has_trait( trait_POISONOUS ) ) {
add_msg_if_player( m_good, _( "You poison %s!" ), t.disp_name() );
t.add_effect( effect_poison, 6_turns );
Expand Down Expand Up @@ -563,7 +587,7 @@ void Character::melee_attack( Creature &t, bool allow_special, const matec_id &f

// Practice melee and relevant weapon skill (if any) except when using CQB bionic
if( !has_active_bionic( bio_cqb ) ) {
melee_train( *this, 5, 10, cur_weapon );
melee_train( *this, 5, 10, *cur_weapon );
}

if( dam >= 5 && has_artifact_with( AEP_SAP_LIFE ) ) {
Expand Down Expand Up @@ -598,6 +622,10 @@ void Character::melee_attack( Creature &t, bool allow_special, const matec_id &f
}
}

if( unarmed_flag_set ) {
cur_weapon->unset_flag( flag_UNARMED_WEAPON );
}

/** @EFFECT_MELEE reduces stamina cost of melee attacks */
const int mod_sta = get_standard_stamina_cost();

Expand Down

0 comments on commit 3171900

Please sign in to comment.