games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

introduce toResourceType

Browse Source
This commit is contained in:
Laserlicht
2025-09-15 00:08:18 +02:00
parent acd067e587
commit d808bd6412
34 changed files with 160 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/gameState/GameStatistics.cpp
View File

@@ -108,7 +108,7 @@ void StatisticDataSetEntry::serializeJson(JsonSerializeFormat & handler)
auto zonesData = handler.enterStruct("numMines");
for(auto & idx : LIBRARY->resourceTypeHandler->getAllObjects())
if(idx != GameResID::MITHRIL)
handler.serializeInt(LIBRARY->resourceTypeHandler->getById(idx)->getJsonKey(), numMines[idx], 0);
handler.serializeInt(idx.toResource()->getJsonKey(), numMines[idx], 0);
}
handler.serializeInt("score", score);
handler.serializeInt("maxHeroLevel", maxHeroLevel);
@@ -193,15 +193,15 @@ std::string StatisticDataSet::toCsv(std::string sep) const
ss << "EventDefeatedStrongestHero" << sep;
ss << "MovementPointsUsed";
for(auto & resource : resources)
ss << sep << LIBRARY->resourceTypeHandler->getById(resource)->getJsonKey();
ss << sep << resource.toResource()->getJsonKey();
for(auto & resource : resources)
ss << sep << LIBRARY->resourceTypeHandler->getById(resource)->getJsonKey() + "Mines";
ss << sep << resource.toResource()->getJsonKey() + "Mines";
for(auto & resource : resources)
ss << sep << LIBRARY->resourceTypeHandler->getById(resource)->getJsonKey() + "SpentResourcesForArmy";
ss << sep << resource.toResource()->getJsonKey() + "SpentResourcesForArmy";
for(auto & resource : resources)
ss << sep << LIBRARY->resourceTypeHandler->getById(resource)->getJsonKey() + "SpentResourcesForBuildings";
ss << sep << resource.toResource()->getJsonKey() + "SpentResourcesForBuildings";
for(auto & resource : resources)
ss << sep << LIBRARY->resourceTypeHandler->getById(resource)->getJsonKey() + "TradeVolume";
ss << sep << resource.toResource()->getJsonKey() + "TradeVolume";
ss << "\r\n";
for(auto & entry : data)