falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PlayReport: use UDLs to improve readability 

Also replaced `str.findIndex(x) == -1` with `!str.include(x)`.
This commit is contained in:
Léo Lam 2024-04-24 03:14:18 +01:00
parent 24a4226082
commit 7faab114ea
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Game/gamePlayReport.cpp
View File

@ -9,17 +9,18 @@
namespace uking { namespace uking {
using namespace sead::literals;
int convertPositionToInt(const sead::Vector2i& pos); int convertPositionToInt(const sead::Vector2i& pos);
void reportKorok(const sead::Vector3f& position) { void reportKorok(const sead::Vector3f& position) {
ksys::ProductReporter::getSomeBool(); ksys::ProductReporter::getSomeBool();
s32 id = ksys::gdt::getFlag_HiddenKorok_Number(); s32 id = ksys::gdt::getFlag_HiddenKorok_Number();
PlayReport report(sead::SafeString("korok"), 7, PlayReport report("korok"_str, 7, ksys::PlayReportMgr::instance()->getReporter()->getHeap());
ksys::PlayReportMgr::instance()->getReporter()->getHeap());
report.addMapType(); report.addMapType();
report.add(sead::SafeString("Id"), u32(id)); report.add("Id"_str, u32(id));
report.addPlayTimes(); report.addPlayTimes();
report.addPosition({position.x, position.z}); report.addPosition({position.x, position.z});
@ -33,17 +34,15 @@ void reportKorok(const sead::Vector3f& position) {
void reportDungeon(const sead::SafeString& name, const sead::SafeString& event) { void reportDungeon(const sead::SafeString& name, const sead::SafeString& event) {
ksys::ProductReporter::getSomeBool(); ksys::ProductReporter::getSomeBool();
if (name.findIndex("Remains") == -1 && name.findIndex("Dungeon") == -1 && if (!name.include("Remains") && !name.include("Dungeon") && !name.include("FinalTrial"))
name.findIndex("FinalTrial") == -1)
return; return;
PlayReport report(sead::SafeString("dungeon"), 6, PlayReport report("dungeon"_str, 6, ksys::PlayReportMgr::instance()->getReporter()->getHeap());
ksys::PlayReportMgr::instance()->getReporter()->getHeap());
report.addMapType(); report.addMapType();
report.add(sead::SafeString("Name"), name); report.add("Name"_str, name);
report.add(sead::SafeString("Event"), event); report.add("Event"_str, event);
report.addPlayTimes(); report.addPlayTimes();
@ -240,19 +239,18 @@ unsigned int getQuestId(const sead::SafeString& quest_name) {
void reportGetItem(const sead::Vector3f& pos, const sead::SafeString& item_name) { void reportGetItem(const sead::Vector3f& pos, const sead::SafeString& item_name) {
ksys::ProductReporter::getSomeBool(); ksys::ProductReporter::getSomeBool();
PlayReport report(sead::SafeString("getitem"), 7, PlayReport report("getitem"_str, 7, ksys::PlayReportMgr::instance()->getReporter()->getHeap());
ksys::PlayReportMgr::instance()->getReporter()->getHeap());
report.addMapType(); report.addMapType();
auto name = static_cast<int>(sead::HashCRC32::calcStringHash(item_name)); auto name = static_cast<int>(sead::HashCRC32::calcStringHash(item_name));
ksys::ProductReporter::getSomeBool(); ksys::ProductReporter::getSomeBool();
report.add(sead::SafeString("name"), name); report.add("name"_str, name);
int position = convertPositionToInt({int(pos.x), int(pos.y)}); int position = convertPositionToInt({int(pos.x), int(pos.y)});
report.add(sead::SafeString("Position"), position); report.add("Position"_str, position);
report.addPlayTimes(); report.addPlayTimes();
if (ksys::PlayReportMgr::instance()) { if (ksys::PlayReportMgr::instance()) {
@ -271,14 +269,14 @@ void reportQuestStep(const ksys::qst::Quest* quest, int step_index) {
const unsigned int quest_id = getQuestId(name); const unsigned int quest_id = getQuestId(name);
PlayReport report(sead::SafeString("challenge"), 7, PlayReport report("challenge"_str, 7,
ksys::PlayReportMgr::instance()->getReporter()->getHeap()); ksys::PlayReportMgr::instance()->getReporter()->getHeap());
report.addMapType(); report.addMapType();
report.add(sead::SafeString("Id"), quest_id); report.add("Id"_str, quest_id);
report.add(sead::SafeString("Name"), name); report.add("Name"_str, name);
report.add(sead::SafeString("Step"), step_index); report.add("Step"_str, step_index);
report.add(sead::SafeString("StepName"), step_name); report.add("StepName"_str, step_name);
report.addPlayTimes(); report.addPlayTimes();
if (ksys::PlayReportMgr::instance()) { if (ksys::PlayReportMgr::instance()) {
@ -296,7 +294,7 @@ void PlayReport::addMapType() {
if (!ksys::gdt::Manager::instance()) if (!ksys::gdt::Manager::instance())
return; return;
add(sead::SafeString("IsHardMode"), ksys::gdt::getFlag_AoC_HardMode_Enabled()); add("IsHardMode"_str, ksys::gdt::getFlag_AoC_HardMode_Enabled());
const sead::SafeString& current_map = ksys::StageInfo::getCurrentMapType(); const sead::SafeString& current_map = ksys::StageInfo::getCurrentMapType();
u32 type = 0; u32 type = 0;
@ -313,7 +311,7 @@ void PlayReport::addMapType() {
if (current_map == "MainFieldDungeon") if (current_map == "MainFieldDungeon")
type = 4; type = 4;
add(sead::SafeString("MapType"), type); add("MapType"_str, type);
} }
} // namespace uking } // namespace uking