Merge pull request #82843 from RenechCDDA/remove_STK

Maleclypse · web-flow · commit 2f8f3952c5ef · 2025-09-12T23:41:18.000-05:00
Remove Stats Through Kills and supporting code
diff --git a/.github/reviewers.yml b/.github/reviewers.yml
@@ -23,8 +23,6 @@ files:
     - Fris0uman
   'data/mods/ruralbiome/**':
     - I-am-Erk
-  'data/mods/stats_through_kills/**':
-    - KorGgenT
   'data/mods/Xedra_Evolved/**':
     - Maleclypse
   'data/mods/MindOverMatter/**':
diff --git a/data/core/external_options.json b/data/core/external_options.json
@@ -202,13 +202,6 @@
     "stype": "bool",
     "value": false
   },
-  {
-    "type": "EXTERNAL_OPTION",
-    "name": "STATS_THROUGH_KILLS",
-    "//": "Stats through Kills.  A mod that allows your stats to increase by killing zombies.",
-    "stype": "bool",
-    "value": false
-  },
   {
     "type": "EXTERNAL_OPTION",
     "name": "WEARY_BMR_MULT",
diff --git a/data/core/mod_migrations.json b/data/core/mod_migrations.json
@@ -17,6 +17,12 @@
     "id": "StatsThroughSkills",
     "removal_reason": "Hardcode that enabled this was removed and it doesn't meet repo inclusion criteria, non-hardcoded alternatives are available out of repo."
   },
+  {
+    "type": "mod_migration",
+    "//": "Removed in 0.J",
+    "id": "stats_through_kills",
+    "removal_reason": "Does not meet repo requirements of offering a different, curated gameplay experience."
+  },
   {
     "type": "mod_migration",
     "//": "Removed in 0.I",
diff --git a/data/mods/stats_through_kills/modinfo.json b/data/mods/stats_through_kills/modinfo.json
diff --git a/src/avatar.cpp b/src/avatar.cpp
@@ -1165,91 +1165,6 @@ void avatar::reset_stats()
 
 }
 
-// based on  D&D 5e level progression
-static const std::array<int, 20> xp_cutoffs = { {
-        300, 900, 2700, 6500, 14000,
-        23000, 34000, 48000, 64000, 85000,
-        100000, 120000, 140000, 165000, 195000,
-        225000, 265000, 305000, 355000, 405000
-    }
-};
-
-int avatar::free_upgrade_points() const
-{
-    int lvl = 0;
-    for( const int &xp_lvl : xp_cutoffs ) {
-        if( kill_xp >= xp_lvl ) {
-            lvl++;
-        } else {
-            break;
-        }
-    }
-    return lvl - spent_upgrade_points;
-}
-
-void avatar::upgrade_stat_prompt( const character_stat &stat )
-{
-    const int free_points = free_upgrade_points();
-
-    if( free_points <= 0 ) {
-        const std::size_t lvl = spent_upgrade_points + free_points;
-        if( lvl >= xp_cutoffs.size() ) {
-            popup( _( "You've already reached maximum level." ) );
-        } else {
-            popup( _( "Needs %d more experience to gain next level." ), xp_cutoffs[lvl] - kill_xp );
-        }
-        return;
-    }
-
-    std::string stat_string;
-    switch( stat ) {
-        case character_stat::STRENGTH:
-            stat_string = _( "strength" );
-            break;
-        case character_stat::DEXTERITY:
-            stat_string = _( "dexterity" );
-            break;
-        case character_stat::INTELLIGENCE:
-            stat_string = _( "intelligence" );
-            break;
-        case character_stat::PERCEPTION:
-            stat_string = _( "perception" );
-            break;
-        case character_stat::DUMMY_STAT:
-            stat_string = _( "invalid stat" );
-            debugmsg( "Tried to use invalid stat" );
-            break;
-        default:
-            return;
-    }
-
-    if( query_yn( _( "Are you sure you want to raise %s?  %d points available." ), stat_string,
-                  free_points ) ) {
-        switch( stat ) {
-            case character_stat::STRENGTH:
-                str_max++;
-                spent_upgrade_points++;
-                recalc_hp();
-                break;
-            case character_stat::DEXTERITY:
-                dex_max++;
-                spent_upgrade_points++;
-                break;
-            case character_stat::INTELLIGENCE:
-                int_max++;
-                spent_upgrade_points++;
-                break;
-            case character_stat::PERCEPTION:
-                per_max++;
-                spent_upgrade_points++;
-                break;
-            case character_stat::DUMMY_STAT:
-                debugmsg( "Tried to use invalid stat" );
-                break;
-        }
-    }
-}
-
 faction *avatar::get_faction() const
 {
     return g->faction_manager_ptr->get( faction_your_followers );
diff --git a/src/character.h b/src/character.h
@@ -581,9 +581,8 @@ class Character : public Creature, public visitable
         int ppen_per;
         int ppen_spd;
 
+        // Legacy value, used by several mods via eoc.
         int kill_xp = 0;
-        // Level-up points spent on Stats through Kills
-        int spent_upgrade_points = 0;
 
         float cached_organic_size;
 
diff --git a/src/debug_menu.cpp b/src/debug_menu.cpp
@@ -2444,9 +2444,7 @@ static void character_edit_menu()
     nmenu.addentry( D_HEALTHY, true, 'a', "%s", _( "Set health" ) );
     nmenu.addentry( D_NEEDS, true, 'n', "%s", _( "Set needs" ) );
     nmenu.addentry( D_NORMALIZE_BODY, true, 'N', "%s", _( "Normalize body stats" ) );
-    if( get_option<bool>( "STATS_THROUGH_KILLS" ) ) {
-        nmenu.addentry( D_KILL_XP, true, 'X', "%s", _( "Set kill XP" ) );
-    }
+    nmenu.addentry( D_KILL_XP, true, 'X', "%s", _( "Set kill XP (for mods)" ) );
     nmenu.addentry( D_MUTATE, true, 'u', "%s", _( "Mutate" ) );
     nmenu.addentry( D_BIONICS, true, 'b', "%s", _( "Edit [b]ionics" ) );
     nmenu.addentry( D_STATUS, true,
diff --git a/src/kill_tracker.cpp b/src/kill_tracker.cpp
@@ -86,16 +86,6 @@ int kill_tracker::total_kill_count() const
     return monster_kill_count() + npc_kill_count();
 }
 
-int kill_tracker::legacy_kill_xp() const
-{
-    int ret = 0;
-    for( const std::pair<const mtype_id, int> &pair : kills ) {
-        ret += ( pair.first->difficulty + pair.first->difficulty_base ) * pair.second;
-    }
-    ret += npc_kills.size() * 10;
-    return ret;
-}
-
 void kill_tracker::clear()
 {
     kills.clear();
@@ -114,8 +104,6 @@ static Character *get_avatar_or_follower( const character_id &id )
     return nullptr;
 }
 
-static constexpr int npc_kill_xp = 10;
-
 void kill_tracker::notify( const cata::event &e )
 {
     switch( e.type() ) {
@@ -124,17 +112,16 @@ void kill_tracker::notify( const cata::event &e )
             if( Character *killer = get_avatar_or_follower( killer_id ) ) {
                 const mtype_id victim_type = e.get<mtype_id>( "victim_type" );
                 kills[victim_type]++;
-                killer->kill_xp += e.get<int>( "exp" );
                 victim_type.obj().families.practice_kill( *killer );
             }
             break;
         }
         case event_type::character_kills_character: {
             const character_id killer_id = e.get<character_id>( "killer" );
-            if( Character *killer = get_avatar_or_follower( killer_id ) ) {
+            // player is credited for NPC kills they or their followers make
+            if( get_avatar_or_follower( killer_id ) ) {
                 const std::string victim_name = e.get<cata_variant_type::string>( "victim_name" );
                 npc_kills.push_back( victim_name );
-                killer->kill_xp += npc_kill_xp;
             }
             break;
         }
diff --git a/src/kill_tracker.h b/src/kill_tracker.h
@@ -29,8 +29,6 @@ class kill_tracker : public event_subscriber
         int monster_kill_count() const;
         int npc_kill_count() const;
         int total_kill_count() const;
-        // TEMPORARY until 0.G
-        int legacy_kill_xp() const;
 
         void clear();
         using event_subscriber::notify;
diff --git a/src/player_display.cpp b/src/player_display.cpp
@@ -14,7 +14,6 @@
 #include <vector>
 
 #include "addiction.h"
-#include "avatar.h"
 #include "bionics.h"
 #include "bodygraph.h"
 #include "bodypart.h"
@@ -41,7 +40,6 @@
 #include "itype.h"
 #include "magic_enchantment.h"
 #include "mutation.h"
-#include "options.h"
 #include "output.h"
 #include "pimpl.h"
 #include "point.h"
@@ -1396,8 +1394,6 @@ static bool handle_player_display_action( Character &you, unsigned int &line,
             case player_display_tab::stats:
                 if( header_clicked ) {
                     display_bodygraph( you );
-                } else if( line < 4 && get_option<bool>( "STATS_THROUGH_KILLS" ) && you.is_avatar() ) {
-                    you.as_avatar()->upgrade_stat_prompt( static_cast<character_stat>( line ) );
                 }
 
                 invalidate_tab( curtab );
diff --git a/src/savegame_json.cpp b/src/savegame_json.cpp
@@ -777,24 +777,6 @@ void Character::load( const JsonObject &data )
     data.read( "stim", stim );
     data.read( "stamina", stamina );
 
-    // stats through kills
-    data.read( "kill_xp", kill_xp );
-    if( !data.read( "spent_upgrade_points", spent_upgrade_points ) ) {
-        // TEMPORARY until 0.G, remove migration logic after
-        int str_upgrade = 0;
-        int dex_upgrade = 0;
-        int int_upgrade = 0;
-        int per_upgrade = 0;
-        if( data.read( "str_upgrade", str_upgrade ) && data.read( "dex_upgrade", dex_upgrade ) &&
-            data.read( "int_upgrade", int_upgrade ) && data.read( "per_upgrade", per_upgrade ) ) {
-            str_max += str_upgrade;
-            dex_max += dex_upgrade;
-            int_max += int_upgrade;
-            per_max += per_upgrade;
-            spent_upgrade_points = str_upgrade + dex_upgrade + int_upgrade + per_upgrade;
-        }
-    }
-
     data.read( "moncams", moncams );
 
     data.read( "magic", magic );
@@ -1429,10 +1411,6 @@ void Character::store( JsonOut &json ) const
     json.member( "type_of_scent", type_of_scent );
     json.member( "focus_pool", focus_pool );
 
-    // stats through kills
-    json.member( "kill_xp", kill_xp );
-    json.member( "spent_upgrade_points", spent_upgrade_points );
-
     // breathing
     json.member( "underwater", underwater );
     json.member( "oxygen", oxygen );
diff --git a/src/scores_ui.cpp b/src/scores_ui.cpp
@@ -12,7 +12,6 @@
 #include <vector>
 
 #include "achievement.h"
-#include "avatar.h"
 #include "cata_imgui.h"
 #include "color.h"
 #include "enum_traits.h"
@@ -22,7 +21,6 @@
 #include "kill_tracker.h"
 #include "localized_comparator.h"
 #include "mtype.h"
-#include "options.h"
 #include "past_games_info.h"
 #include "stats_tracker.h"
 #include "string_formatter.h"
@@ -231,15 +229,6 @@ void scores_ui_impl::draw_scores_text() const
 
 void scores_ui_impl::draw_kills_text() const
 {
-    if( get_option<bool>( "STATS_THROUGH_KILLS" ) &&
-        ImGui::CollapsingHeader( _( "Stats through kills:" ), ImGuiTreeNodeFlags_DefaultOpen ) ) {
-        ImGui::TextWrapped( _( "Total kills: %d" ), total_kills );
-        ImGui::NewLine();
-        ImGui::TextWrapped( _( "Experience: %d (%d points available)" ),
-                            get_avatar().kill_xp,
-                            get_avatar().free_upgrade_points() );
-    }
-
     if( ImGui::CollapsingHeader( string_format( _( "Monster kills (%d):" ), monster_kills ).c_str(),
                                  monster_group_collapsed ? ImGuiTreeNodeFlags_None : ImGuiTreeNodeFlags_DefaultOpen ) ) {
         if( monster_kills == 0 ) {

Original file line number	Diff line number	Diff line change
`@@ -86,16 +86,6 @@ int kill_tracker::total_kill_count() const`
`86`	`86`	`return monster_kill_count() + npc_kill_count();`
`87`	`87`	`}`
`88`	`88`
`89`		`-int kill_tracker::legacy_kill_xp() const`
`90`		`-{`
`91`		`- int ret = 0;`
`92`		`- for( const std::pair<const mtype_id, int> &pair : kills ) {`
`93`		`- ret += ( pair.first->difficulty + pair.first->difficulty_base ) * pair.second;`
`94`		`- }`
`95`		`- ret += npc_kills.size() * 10;`
`96`		`- return ret;`
`97`		`-}`
`98`		`-`
`99`	`89`	`void kill_tracker::clear()`
`100`	`90`	`{`
`101`	`91`	`kills.clear();`
`@@ -114,8 +104,6 @@ static Character *get_avatar_or_follower( const character_id &id )`
`114`	`104`	`return nullptr;`
`115`	`105`	`}`
`116`	`106`
`117`		`-static constexpr int npc_kill_xp = 10;`
`118`		`-`
`119`	`107`	`void kill_tracker::notify( const cata::event &e )`
`120`	`108`	`{`
`121`	`109`	`switch( e.type() ) {`
`@@ -124,17 +112,16 @@ void kill_tracker::notify( const cata::event &e )`
`124`	`112`	`if( Character *killer = get_avatar_or_follower( killer_id ) ) {`
`125`	`113`	`const mtype_id victim_type = e.get<mtype_id>( "victim_type" );`
`126`	`114`	`kills[victim_type]++;`
`127`		`- killer->kill_xp += e.get<int>( "exp" );`
`128`	`115`	`victim_type.obj().families.practice_kill( *killer );`
`129`	`116`	`}`
`130`	`117`	`break;`
`131`	`118`	`}`
`132`	`119`	`case event_type::character_kills_character: {`
`133`	`120`	`const character_id killer_id = e.get<character_id>( "killer" );`
`134`		`- if( Character *killer = get_avatar_or_follower( killer_id ) ) {`
	`121`	`+ // player is credited for NPC kills they or their followers make`
	`122`	`+ if( get_avatar_or_follower( killer_id ) ) {`
`135`	`123`	`const std::string victim_name = e.get<cata_variant_type::string>( "victim_name" );`
`136`	`124`	`npc_kills.push_back( victim_name );`
`137`		`- killer->kill_xp += npc_kill_xp;`
`138`	`125`	`}`
`139`	`126`	`break;`
`140`	`127`	`}`