Catchup_combat cnly catches up *combat skills*, not everything

Author: RenechCDDA

src/character.cpp

@@ -2780,8 +2780,14 @@ bool Character::practice( const skill_id &id, int amount, int cap, bool suppress
     // but perception also plays a role, representing both memory/attentiveness and catching on to how
     // the two apply to each other.
     float catchup_modifier = 1.0f + ( 2.0f * get_int() + get_per() ) / 24.0f; // 2 for an average person
-    catchup_modifier = enchantment_cache->modify_value( enchant_vals::mod::SKILL_RUST_BONUS_XP,
-                       catchup_modifier );
+    if( level.isRusty() ) {
+        if( skill.is_combat_skill() ) {
+            catchup_modifier = enchantment_cache->modify_value( enchant_vals::mod::COMBAT_CATCHUP,
+                               catchup_modifier );
+        }
+        catchup_modifier = enchantment_cache->modify_value( enchant_vals::mod::SKILL_RUST_BONUS_XP,
+                           catchup_modifier );
+    }
 
     float knowledge_modifier = 1.0f + get_int() /
                                40.0f; // 1.2 for an average person, always a bit higher than base amount
@@ -2806,9 +2812,6 @@ bool Character::practice( const skill_id &id, int amount, int cap, bool suppress
         amount /= 3.0f;
     }
 
-    catchup_modifier = enchantment_cache->modify_value( enchant_vals::mod::COMBAT_CATCHUP,
-                       catchup_modifier );
-
     if( isSavant && id != savantSkill ) {
         amount *= 0.5f;
     }