MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

getKillCount: also search kills->events

develop
lethosor 2016-02-25 15:34:56 -05:00
parent 25507a10f9
commit 5bb19a230f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/modules/Units.cpp
Unescape Escape View File

@ -62,6 +62,7 @@ using namespace std;
#include "df/historical_figure.h" #include "df/historical_figure.h"
#include "df/historical_figure_info.h" #include "df/historical_figure_info.h"
#include "df/historical_kills.h" #include "df/historical_kills.h"
#include "df/history_event_hist_figure_diedst.h"
#include "df/identity.h" #include "df/identity.h"
#include "df/job.h" #include "df/job.h"
#include "df/nemesis_record.h" #include "df/nemesis_record.h"
@ -1107,11 +1108,18 @@ int Units::getKillCount(df::unit *unit)
CHECK_NULL_POINTER(unit); CHECK_NULL_POINTER(unit);
auto histfig = df::historical_figure::find(unit->hist_figure_id); auto histfig = df::historical_figure::find(unit->hist_figure_id);
int count = 0;
if (histfig && histfig->info->kills) if (histfig && histfig->info->kills)
return std::accumulate(histfig->info->kills->killed_count.begin(), {
histfig->info->kills->killed_count.end(), 0); auto kills = histfig->info->kills;
else count += std::accumulate(kills->killed_count.begin(), kills->killed_count.end(), 0);
return 0; for (auto it = kills->events.begin(); it != kills->events.end(); ++it)
{
if (virtual_cast<df::history_event_hist_figure_diedst>(df::history_event::find(*it)))
++count;
}
}
return count;
} }
inline void adjust_skill_rating(int &rating, bool is_adventure, int value, int dwarf3_4, int dwarf1_2, int adv9_10, int adv3_4, int adv1_2) inline void adjust_skill_rating(int &rating, bool is_adventure, int value, int dwarf3_4, int dwarf1_2, int adv9_10, int adv3_4, int adv1_2)