Remove UNARMED_WEAPON flag entirely

CleverRaven · Jan 15, 2023 · de41f54 · de41f54
1 parent b744d37
commit de41f54
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 9 deletions.
diff --git 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 <good>can be used with</good> <info>unarmed fighting styles</info>."
-  },
   {
     "id": "NANOFAB_REPAIR",
     "type": "json_flag",

diff --git 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
@@ -332,7 +332,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
@@ -1051,7 +1051,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 );
     }