Remove dumb gun cheese

Author: RenechCDDA

src/ranged.cpp

@@ -1300,13 +1300,17 @@ int Character::fire_gun( map &here, const tripoint_bub_ms &target, int shots, it
                                body_part_name_accusative( bodypart_id( hurt_part.first ) ) );
     }
 
-    // Practice the base gun skill proportionally to number of hits, but always by one.
-    if( !gun.has_flag( flag_WONT_TRAIN_MARKSMANSHIP ) ) {
-        practice( skill_gun, ( hits + 1 ) * 5 );
+    // Marksmanship and gun skills only train for attacks taking place at least 2 tiles away.
+    // Any shots happening at point blank cannot be considered training in any sort of gun skill!
+    if( rl_dist( pos_bub().xy(), target.xy() ) > 1 ) {
+        // Practice the base gun skill proportionally to number of hits, but always by one.
+        if( !gun.has_flag( flag_WONT_TRAIN_MARKSMANSHIP ) ) {
+            practice( skill_gun, ( hits + 1 ) * 5 );
+        }
+        // launchers train weapon skill for both hits and misses.
+        int practice_units = gun_skill == skill_launcher ? curshot : hits;
+        practice( gun_skill, ( practice_units + 1 ) * 5 );
     }
-    // launchers train weapon skill for both hits and misses.
-    int practice_units = gun_skill == skill_launcher ? curshot : hits;
-    practice( gun_skill, ( practice_units + 1 ) * 5 );
 
     if( !gun.is_gun() ) {
         // If we lose our gun as a side effect of firing it, skip the rest of the function.