Improvements to feral survivor and Mycus experience (cataclysmbnteam#…

…2922)

src/avatar_action.cpp

@@ -260,8 +260,11 @@ bool avatar_action::move( avatar &you, map &m, const tripoint &d )
 
     if( monster *const mon_ptr = g->critter_at<monster>( dest_loc, true ) ) {
         monster &critter = *mon_ptr;
+        // Additional checking to make sure we won't take a swing at friendly monsters.
+        Character &u = get_player_character();
+        monster_attitude att = critter.attitude( const_cast<Character *>( &u ) );
         if( critter.friendly == 0 &&
-            !critter.has_effect( effect_pet ) ) {
+            !critter.has_effect( effect_pet ) && att != MATT_FRIEND ) {
             if( you.is_auto_moving() ) {
                 add_msg( m_warning, _( "Monster in the way.  Auto-move canceled." ) );
                 add_msg( m_info, _( "Move into the monster to attack." ) );

src/monster.cpp

@@ -2967,6 +2967,15 @@ void monster::hear_sound( const tripoint &source, const int vol, const int dist
         return;
     }
 
+    static const string_id<monfaction> faction_zombie( "zombie" );
+    const bool feral_friend = ( faction == faction_zombie || !type->in_species( ZOMBIE ) ) &&
+                              g->u.has_trait( trait_PROF_FERAL ) && !g->u.has_effect( effect_feral_infighting_punishment );
+
+    // Hackery: If player is currently a feral and you're a zombie, ignore any sounds close to their position.
+    if( feral_friend && rl_dist( g->u.pos(), source ) <= 10 ) {
+        return;
+    }
+
     const bool goodhearing = has_flag( MF_GOODHEARING );
     const int volume = goodhearing ? 2 * vol - dist : vol - dist;
     // Error is based on volume, louder sound = less error