diff --git a/source-code/source/plugins/Patches/databank.cpp b/source-code/source/plugins/Patches/databank.cpp index 60e8f3e..ce59197 100644 --- a/source-code/source/plugins/Patches/databank.cpp +++ b/source-code/source/plugins/Patches/databank.cpp @@ -34,9 +34,8 @@ namespace Databank try { PvEntry entry; - int id = std::stoi(tokens[i]); + std::tuple id(std::stoi(tokens[i]), std::stoi(tokens[i + 2])); entry.unk1 = std::stoi(tokens[i + 1]); - entry.unk2 = std::stoi(tokens[i + 2]); entry.advStart = tokens[i + 3]; entry.advEnd = tokens[i + 4]; entry.start = tokens[i + 5]; @@ -74,9 +73,9 @@ namespace Databank } } - void PvList::addEntry(int id, PvEntry& entry) + void PvList::addEntry(int id, int extra, PvEntry& entry) { - entries.insert({ id, entry }); + entries.insert({ std::tuple(id, extra), entry }); } void PvList::generateMissingEntries() @@ -90,7 +89,8 @@ namespace Databank entry.start = "2000-01-01"; entry.end = "2029-01-01"; - entries.insert({ i, entry }); + entries.insert({ std::tuple(i, 0), entry }); + entries.insert({ std::tuple(i, 1), entry }); } } @@ -115,9 +115,9 @@ namespace Databank } first = false; const PvEntry& entry = entryMap.second; - entryStream << entryMap.first << "," + entryStream << std::get<0>(entryMap.first) << "," << entry.unk1 << "," - << entry.unk2 << "," + << std::get<1>(entryMap.first) << "," << entry.advStart << "," << entry.advEnd << "," << entry.start << "," diff --git a/source-code/source/plugins/Patches/databank.h b/source-code/source/plugins/Patches/databank.h index 185446d..d303163 100644 --- a/source-code/source/plugins/Patches/databank.h +++ b/source-code/source/plugins/Patches/databank.h @@ -8,19 +8,18 @@ namespace Databank struct PvEntry { int unk1 = 1; - int unk2 = 0; std::string advStart, advEnd, start, end; }; class PvList { protected: - std::map entries; + std::map, PvEntry> entries; public: bool readFromStr(std::string& str); bool readFromFile(const std::string& filename); - void addEntry(int id, PvEntry& entry); + void addEntry(int id, int extra, PvEntry& entry); void generateMissingEntries(); std::string finalize(); };