...and then move evaluate_weapon() to Character

Author: RenechCDDA

src/character.h

@@ -1197,6 +1197,7 @@ class Character : public Creature, public visitable
         bool can_attack_high() const override;
 
         /** NPC-related item rating functions */
+        double evaluate_weapon( const item &maybe_weapon ) const;
         double weapon_value( const item &weap, int ammo = 10 ) const; // Evaluates item as a weapon
         double gun_value( const item &weap, int ammo = 10 ) const; // Evaluates item as a gun
         double melee_value( const item &weap ) const; // As above, but only as melee
@@ -1220,6 +1221,8 @@ class Character : public Creature, public visitable
         bool is_dead_state() const override;
 
     private:
+        double evaluate_weapon_internal( const item &maybe_weapon, bool can_use_gun,
+                                         bool use_silent ) const;
         mutable std::optional<bool> cached_dead_state;
     public:
         void set_part_hp_cur( const bodypart_id &id, int set ) override;

src/melee.cpp

@@ -2723,6 +2723,46 @@ int Character::attack_speed( const item &weap ) const
     return std::round( move_cost );
 }
 
+double Character::evaluate_weapon( const item &maybe_weapon ) const
+{
+    bool can_use_gun = true;
+    bool use_silent = false;
+    const npc *me_as_npc = dynamic_cast<const npc *>( this );
+    if( me_as_npc ) {
+        if( me_as_npc->is_player_ally() && !me_as_npc->rules.has_flag( ally_rule::use_guns ) ) {
+            can_use_gun = false;
+        }
+        if( me_as_npc->is_player_ally() && me_as_npc->rules.has_flag( ally_rule::use_silent ) ) {
+            use_silent = true;
+        }
+    }
+    return evaluate_weapon_internal( maybe_weapon, can_use_gun, use_silent );
+}
+
+double Character::evaluate_weapon_internal( const item &maybe_weapon, bool can_use_gun,
+        bool use_silent ) const
+{
+    // Needed because evaluation includes electricity via linked cables.
+    const map &here = get_map();
+
+    bool allowed = can_use_gun && maybe_weapon.is_gun() && ( !use_silent || maybe_weapon.is_silent() );
+    // According to unmodified evaluation score, NPCs almost always prioritize wielding guns if they have one.
+    // This is relatively reasonable, as players can issue commands to NPCs when we do not want them to use ranged weapons.
+    // Conversely, we cannot directly issue commands when we want NPCs to prioritize ranged weapons.
+    // Note that the scoring method here is different from the 'weapon_value' used elsewhere.
+    double val_gun = allowed ? gun_value( maybe_weapon, maybe_weapon.shots_remaining( here,
+                                          this ) ) : 0;
+    add_msg_debug( debugmode::DF_NPC_ITEMAI,
+                   "%s %s valued at <color_light_cyan>%1.2f as a ranged weapon to wield</color>.",
+                   disp_name( true ), maybe_weapon.type->get_id().str(), val_gun );
+    double val_melee = melee_value( maybe_weapon );
+    add_msg_debug( debugmode::DF_NPC_ITEMAI,
+                   "%s %s valued at <color_light_cyan>%1.2f as a melee weapon to wield</color>.", disp_name( true ),
+                   maybe_weapon.type->get_id().str(), val_melee );
+    double val = std::max( val_gun, val_melee );
+    return val;
+}
+
 double Character::weapon_value( const item &weap, int ammo ) const
 {
     if( is_wielding( weap ) || ( !get_wielded_item() && weap.is_null() ) ) {

src/npc.h

@@ -1131,12 +1131,6 @@ class npc : public Character
         int evaluate_sleep_spot( tripoint_bub_ms p );
         // Returns true if did something and we should end turn
         bool scan_new_items();
-        // Returns score for how well this weapon might kill things
-        double evaluate_weapon( const item &maybe_weapon ) const;
-    private:
-        // Returns score for how well this weapon might kill things
-        double evaluate_weapon_internal( const item &maybe_weapon, bool can_use_gun,
-                                         bool use_silent ) const;
     public:
         // Returns best weapon. Can return null (fists)
         item *evaluate_best_weapon() const;

src/npcmove.cpp

@@ -4133,37 +4133,6 @@ bool npc::do_player_activity()
     return moves != old_moves;
 }
 
-double npc::evaluate_weapon( const item &maybe_weapon ) const
-{
-    const bool can_use_gun = !is_player_ally() || rules.has_flag( ally_rule::use_guns );
-    const bool use_silent = is_player_ally() && rules.has_flag( ally_rule::use_silent );
-    return evaluate_weapon_internal( maybe_weapon, can_use_gun, use_silent );
-}
-
-double npc::evaluate_weapon_internal( const item &maybe_weapon, bool can_use_gun,
-                                      bool use_silent ) const
-{
-    // Needed because evaluation includes electricity via linked cables.
-    const map &here = get_map();
-
-    bool allowed = can_use_gun && maybe_weapon.is_gun() && ( !use_silent || maybe_weapon.is_silent() );
-    // According to unmodified evaluation score, NPCs almost always prioritize wielding guns if they have one.
-    // This is relatively reasonable, as players can issue commands to NPCs when we do not want them to use ranged weapons.
-    // Conversely, we cannot directly issue commands when we want NPCs to prioritize ranged weapons.
-    // Note that the scoring method here is different from the 'weapon_value' used elsewhere.
-    double val_gun = allowed ? gun_value( maybe_weapon, maybe_weapon.shots_remaining( here,
-                                          this ) ) : 0;
-    add_msg_debug( debugmode::DF_NPC_ITEMAI,
-                   "%s %s valued at <color_light_cyan>%1.2f as a ranged weapon to wield</color>.",
-                   disp_name( true ), maybe_weapon.type->get_id().str(), val_gun );
-    double val_melee = melee_value( maybe_weapon );
-    add_msg_debug( debugmode::DF_NPC_ITEMAI,
-                   "%s %s valued at <color_light_cyan>%1.2f as a melee weapon to wield</color>.", disp_name( true ),
-                   maybe_weapon.type->get_id().str(), val_melee );
-    double val = std::max( val_gun, val_melee );
-    return val;
-}
-
 item *npc::evaluate_best_weapon() const
 {
     bool can_use_gun = !is_player_ally() || rules.has_flag( ally_rule::use_guns );