From 5803f3ea83f09f4f37fad482388091020e0aad9d Mon Sep 17 00:00:00 2001 From: Robob27 Date: Mon, 5 Dec 2022 03:36:40 -0500 Subject: [PATCH] Remove UNARMED_WEAPON flag entirely --- data/json/flags.json | 6 ------ src/flag.cpp | 1 - src/flag.h | 1 - src/melee.cpp | 2 +- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/data/json/flags.json b/data/json/flags.json index ea98f92e55be8..6817b725b232f 100644 --- a/data/json/flags.json +++ b/data/json/flags.json @@ -935,12 +935,6 @@ "type": "json_flag", "//": "This gun wont train marksmanship when fired. Used in Aftershock smart guns." }, - { - "id": "UNARMED_WEAPON", - "type": "json_flag", - "//": "Allows wielding with unarmed fighting styles and trains unarmed when used.", - "info": "This weapon can be used with unarmed fighting styles." - }, { "id": "NANOFAB_REPAIR", "type": "json_flag", diff --git a/src/flag.cpp b/src/flag.cpp index 8aa2535aec624..d58f377854317 100644 --- a/src/flag.cpp +++ b/src/flag.cpp @@ -327,7 +327,6 @@ const flag_id flag_TRADER_AVOID( "TRADER_AVOID" ); const flag_id flag_TRADER_KEEP( "TRADER_KEEP" ); const flag_id flag_TRADER_KEEP_EQUIPPED( "TRADER_KEEP_EQUIPPED" ); const flag_id flag_TWO_WAY_RADIO( "TWO_WAY_RADIO" ); -const flag_id flag_UNARMED_WEAPON( "UNARMED_WEAPON" ); const flag_id flag_UNBREAKABLE( "UNBREAKABLE" ); const flag_id flag_UNBREAKABLE_MELEE( "UNBREAKABLE_MELEE" ); const flag_id flag_UNDERSIZE( "UNDERSIZE" ); diff --git a/src/flag.h b/src/flag.h index 53edc1bbb5a9c..1dfbf0013f619 100644 --- a/src/flag.h +++ b/src/flag.h @@ -331,7 +331,6 @@ extern const flag_id flag_TRADER_AVOID; extern const flag_id flag_TRADER_KEEP; extern const flag_id flag_TRADER_KEEP_EQUIPPED; extern const flag_id flag_TWO_WAY_RADIO; -extern const flag_id flag_UNARMED_WEAPON; extern const flag_id flag_UNBREAKABLE; extern const flag_id flag_UNBREAKABLE_MELEE; extern const flag_id flag_UNDERSIZE; diff --git a/src/melee.cpp b/src/melee.cpp index 290511a2f670d..99f161ff8c1bb 100644 --- a/src/melee.cpp +++ b/src/melee.cpp @@ -1052,7 +1052,7 @@ double Character::crit_chance( float roll_hit, float target_dodge, const item &w double weapon_crit_chance = 0.5; if( weap.is_null() ) { // Unarmed attack: 1/2 of unarmed skill is to-hit - /** @EFFECT_UNARMED increases critical chance with UNARMED_WEAPON */ + /** @EFFECT_UNARMED increases critical chance */ weapon_crit_chance = 0.5 + 0.05 * get_skill_level( skill_unarmed ); }