feat: make max skill level limit configurable

cataclysmbnteam · Jan 27, 2025 · 053f910 · 053f910
1 parent 77d7938
commit 053f910
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/src/cached_options.cpp b/src/cached_options.cpp
@@ -19,6 +19,7 @@ int fov_3d_z_range;
 bool tile_iso;
 bool pixel_minimap_option = false;
 int PICKUP_RANGE;
+int MAX_SKILL = 10;
 
 FungalOptions fungal_opt;
 

diff --git a/src/cached_options.h b/src/cached_options.h
@@ -84,6 +84,8 @@ extern int PICKUP_RANGE;
  */
 extern bool dont_debugmsg;
 
+// Maximum (effective) level for a skill.
+extern int MAX_SKILL;
 
 /* Options related to fungal activity */
 struct FungalOptions {

diff --git a/src/character.cpp b/src/character.cpp
@@ -3793,7 +3793,7 @@ void Character::practice( const skill_id &id, int amount, int cap, bool suppress
 
     if( !level.can_train() && !in_sleep_state() ) {
         // If leveling is disabled, don't train, don't drain focus, don't print anything
-        // This also checks if your skill level is maxed out at the cap of 10.
+        // This also checks if your skill level is maxed out.
         return;
     }
 
@@ -8764,7 +8764,6 @@ void Character::on_hit( Creature *source, bodypart_id bp_hit,
     bool in_skater_vehicle = in_vehicle && veh_part.part_with_feature( "SEAT_REQUIRES_BALANCE", false );
 
     if( ( worn_with_flag( flag_REQUIRES_BALANCE ) || in_skater_vehicle ) && !is_on_ground() ) {
-        int rolls = 4;
         if( worn_with_flag( flag_ROLLER_ONE ) && !in_skater_vehicle ) {
             if( worn_with_flag( flag_REQUIRES_BALANCE ) && !has_effect( effect_downed ) ) {
                 int rolls = 4;

diff --git a/src/game_constants.h b/src/game_constants.h
@@ -113,9 +113,6 @@ static constexpr units::mass JACK_LIMIT = 8500_kilogram;
 // Slowest speed at which a gun can be aimed.
 static constexpr int MAX_AIM_COST = 10;
 
-// Maximum (effective) level for a skill.
-static constexpr int MAX_SKILL = 10;
-
 // Maximum (effective) level for a stat.
 static constexpr int MAX_STAT = 20;
 

diff --git a/src/options.cpp b/src/options.cpp
@@ -2226,6 +2226,11 @@ void options_manager::add_options_debug()
          0.0, 100.0, 1.0, 0.1
        );
 
+    add( "MAX_SKILL_LEVEL", debug, translate_marker("Max Skill Level"),
+         translate_marker("The maximum level a skill can be trained to."),
+         0, 1000, 10
+       );
+
     add( "SKILL_RUST", debug, translate_marker( "Skill rust" ),
          translate_marker( "Set the level of skill rust.  Vanilla: Vanilla Cataclysm - Capped: Capped at skill levels 2 - Int: Intelligence dependent - IntCap: Intelligence dependent, capped - Off: None at all." ),
          //~ plain, default, normal
@@ -3448,6 +3453,7 @@ void options_manager::cache_to_globals()
     fov_3d_z_range = ::get_option<int>( "FOV_3D_Z_RANGE" );
     static_z_effect = ::get_option<bool>( "STATICZEFFECT" );
     PICKUP_RANGE = ::get_option<int>( "PICKUP_RANGE" );
+    MAX_SKILL = ::get_option<int>( "MAX_SKILL_LEVEL" );
 
     merge_comestible_mode = ( [] {
         const auto opt = ::get_option<std::string>( "MERGE_COMESTIBLES" );

diff --git a/src/skill.cpp b/src/skill.cpp
@@ -9,7 +9,7 @@
 
 #include "cata_utility.h"
 #include "debug.h"
-#include "game_constants.h"
+#include "cached_options.h"
 #include "item.h"
 #include "json.h"
 #include "options.h"