File tree Expand file tree Collapse file tree 2 files changed +14
-1
lines changed Expand file tree Collapse file tree 2 files changed +14
-1
lines changed Original file line number Diff line number Diff line change @@ -104,6 +104,9 @@ static Character *get_avatar_or_follower( const character_id &id )
104
104
return nullptr ;
105
105
}
106
106
107
+ // Legacy value, maintained until kill_xp rework/removal from dependent in-repo mods
108
+ static constexpr int npc_kill_xp = 10 ;
109
+
107
110
void kill_tracker::notify ( const cata::event &e )
108
111
{
109
112
switch ( e.type () ) {
@@ -112,16 +115,20 @@ void kill_tracker::notify( const cata::event &e )
112
115
if ( Character *killer = get_avatar_or_follower ( killer_id ) ) {
113
116
const mtype_id victim_type = e.get <mtype_id>( " victim_type" );
114
117
kills[victim_type]++;
118
+ // Legacy value update, maintained until kill_xp rework/removal from dependent in-repo mods
119
+ killer->kill_xp += e.get <int >( " exp" );
115
120
victim_type.obj ().families .practice_kill ( *killer );
116
121
}
117
122
break ;
118
123
}
119
124
case event_type::character_kills_character: {
120
125
const character_id killer_id = e.get <character_id>( " killer" );
121
126
// player is credited for NPC kills they or their followers make
122
- if ( get_avatar_or_follower ( killer_id ) ) {
127
+ if ( Character *killer = get_avatar_or_follower ( killer_id ) ) {
123
128
const std::string victim_name = e.get <cata_variant_type::string>( " victim_name" );
124
129
npc_kills.push_back ( victim_name );
130
+ // Legacy value update, maintained until kill_xp rework/removal from dependent in-repo mods
131
+ killer->kill_xp += npc_kill_xp;
125
132
}
126
133
break ;
127
134
}
Original file line number Diff line number Diff line change @@ -777,6 +777,9 @@ void Character::load( const JsonObject &data )
777
777
data.read ( " stim" , stim );
778
778
data.read ( " stamina" , stamina );
779
779
780
+ // legacy value, maintained until kill_xp dependency removed from in-repo mods
781
+ data.read ( " kill_xp" , kill_xp );
782
+
780
783
data.read ( " moncams" , moncams );
781
784
782
785
data.read ( " magic" , magic );
@@ -1411,6 +1414,9 @@ void Character::store( JsonOut &json ) const
1411
1414
json.member ( " type_of_scent" , type_of_scent );
1412
1415
json.member ( " focus_pool" , focus_pool );
1413
1416
1417
+ // legacy value, maintained until kill_xp dependency removed from in-repo mods
1418
+ json.member ( " kill_xp" , kill_xp );
1419
+
1414
1420
// breathing
1415
1421
json.member ( " underwater" , underwater );
1416
1422
json.member ( " oxygen" , oxygen );
You can’t perform that action at this time.
0 commit comments