From 5c4a3e8d163ca774a5069b35476588d77deadc7b Mon Sep 17 00:00:00 2001 From: William JCM Date: Tue, 20 Apr 2021 15:55:41 +0200 Subject: [PATCH] Start mapping story progress. --- CMakeLists.txt | 1 + GUI/EvtMainFrame.cpp | 3 +- GUI/MainFrame.cpp | 4 +-- GUI/MainFrame.fbp | 4 +-- Maps/StoryProgress.h | 73 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 Maps/StoryProgress.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 336498f..d01b8a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,7 @@ add_executable(wxMASSManager WIN32 GUI/EvtNameChangeDialog.h GUI/EvtNameChangeDialog.cpp Maps/LastMissionId.h + Maps/StoryProgress.h Mass/Mass.h Mass/Mass.cpp MassBuilderManager/MassBuilderManager.h diff --git a/GUI/EvtMainFrame.cpp b/GUI/EvtMainFrame.cpp index 87488f1..77edaf7 100644 --- a/GUI/EvtMainFrame.cpp +++ b/GUI/EvtMainFrame.cpp @@ -37,6 +37,7 @@ #include "EvtMainFrame.h" #include "../Maps/LastMissionId.h" +#include "../Maps/StoryProgress.h" EvtMainFrame::EvtMainFrame(wxWindow* parent): MainFrame(parent), @@ -621,7 +622,7 @@ void EvtMainFrame::updateProfileStats() { Profile* current_profile = _profileManager.currentProfile(); _companyName->SetLabel(current_profile->getCompanyName()); _credits->SetLabel(wxString::Format("%i", current_profile->getCredits())); - _storyProgress->SetLabel(wxString::Format("%i", current_profile->getStoryProgress())); + _storyProgress->SetLabel(wxString::Format("%s", story_progress_map.find(current_profile->getStoryProgress()) != story_progress_map.end() ? story_progress_map.at(current_profile->storyProgress()) : std::to_string(current_profile->storyProgress()))); _lastMissionId->SetLabel(wxString::Format("%s", mission_id_map.find(current_profile->getLastMissionId()) != mission_id_map.end() ? mission_id_map.at(current_profile->lastMissionId()) : std::to_string(current_profile->lastMissionId()))); } diff --git a/GUI/MainFrame.cpp b/GUI/MainFrame.cpp index a8ca7f4..da17537 100644 --- a/GUI/MainFrame.cpp +++ b/GUI/MainFrame.cpp @@ -84,13 +84,13 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co _storyProgressLabel = new wxStaticText( sbSizerGeneralInfo->GetStaticBox(), wxID_ANY, wxT("Story progress:"), wxDefaultPosition, wxDefaultSize, 0 ); _storyProgressLabel->Wrap( -1 ); - _storyProgressLabel->SetToolTip( wxT("What this value does or corresponds to is unknown at this point in time. It is only listed here for the sake of completion.") ); + _storyProgressLabel->SetToolTip( wxT("The current point in the story.") ); fgSizerGeneralStats->Add( _storyProgressLabel, 0, wxALL, 5 ); _storyProgress = new wxStaticText( sbSizerGeneralInfo->GetStaticBox(), wxID_ANY, wxT("0"), wxDefaultPosition, wxDefaultSize, 0 ); _storyProgress->Wrap( -1 ); - _storyProgress->SetToolTip( wxT("What this value does or corresponds to is unknown at this point in time. It is only listed here for the sake of completion.") ); + _storyProgress->SetToolTip( wxT("The current point in the story.") ); fgSizerGeneralStats->Add( _storyProgress, 0, wxALL|wxEXPAND, 5 ); diff --git a/GUI/MainFrame.fbp b/GUI/MainFrame.fbp index e57c8f3..fb7671c 100644 --- a/GUI/MainFrame.fbp +++ b/GUI/MainFrame.fbp @@ -849,7 +849,7 @@ ; ; forward_declare 0 - What this value does or corresponds to is unknown at this point in time. It is only listed here for the sake of completion. + The current point in the story. @@ -910,7 +910,7 @@ ; ; forward_declare 0 - What this value does or corresponds to is unknown at this point in time. It is only listed here for the sake of completion. + The current point in the story. diff --git a/Maps/StoryProgress.h b/Maps/StoryProgress.h new file mode 100644 index 0000000..1188ce1 --- /dev/null +++ b/Maps/StoryProgress.h @@ -0,0 +1,73 @@ +// wxMASSManager +// Copyright (C) 2020 Guillaume Jacquemin +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +#pragma once + +#include + +#include + +static const std::map story_progress_map {{ + {25600, "Chapter 1 start"}, + {25856, "Chapter 1 - After 1st meeting with Quin in mission section"}, + + {26112, "Chapter 1 - After training, talking with Reina and Quin in hangar"}, + {26368, "Chapter 1 - After training, returned to hangar"}, + {26624, "Chapter 1 - After training, talked with Quin in development section"}, + {26880, "Chapter 1 - After training, talked with Waltz in armour section"}, + {51200, "Chapter 1 - After training, talked with Kael in tuning section"}, + {51456, "Chapter 1 - After training, got mission 2 briefing"}, + + {76800, "Chapter 1 - After mission 2, talking with Reina"}, + {77056, "Chapter 1 - After mission 2, returned to hangar"}, + {77312, "Chapter 1 - After mission 2, talked with Kael in tuning section"}, + {77568, "Chapter 1 - After mission 2, talked with Reina in hangar"}, + {77824, "Chapter 1 - After mission 2, got mission 3 briefing"}, + + {102400, "Chapter 1 - After mission 3, talking with Reina"}, + {102656, "Chapter 1 - After mission 3, returned to hangar"}, + {102912, "Chapter 1 - After mission 3, talked with Waltz in armour section"}, + {103168, "Chapter 1 - After mission 3, got mission 4 briefing"}, + + {128000, "Chapter 1 - After mission 4, talking with Reina"}, + {128256, "Chapter 1 - After mission 4, returned to hangar"}, + {128512, "Chapter 1 - After mission 4, talked with Waltz in armour section"}, + {128768, "Chapter 1 - After mission 4, talked with Reina in hangar"}, + {129024, "Chapter 1 - After mission 4, got mission 5 and hunt 1 briefing"}, + + {153600, "Chapter 1 - After mission 5, meeting Neon and Aine"}, + {153856, "Chapter 1 - After mission 5, returned to hangar"}, + {154112, "Chapter 1 - After mission 5, got mission 6 briefing"}, + + {179200, "Chapter 1 - After mission 6, talking with Reina"}, + {179456, "Chapter 1 - After mission 6, returned to hangar"}, + {179712, "Chapter 1 - After mission 6, got hunt 2 briefing"}, + {179968, "Chapter 1 - After mission 6, met Ellenier"}, + {180224, "Chapter 1 - After mission 6, got mission 7 briefing"}, + + {204800, "Chapter 1 - After mission 7, talking with Nier"}, + {205056, "Chapter 1 - After mission 7, returned to hangar"}, + {205312, "Chapter 1 - After mission 7, talked with Quin, Reina, and Nier in development section"}, + {205568, "Chapter 1 - After mission 7, got mission 8 briefing"}, + + {230400, "Chapter 1 - After mission 8, talking with crew in hangar"}, + {230656, "Chapter 1 - After mission 8, returned to hangar"}, + {230912, "Chapter 1 - After mission 8, got hunt 3 briefing"}, + {231168, "Chapter 1 - After mission 8, talked with Reina, Nier, and Quin in development section"}, + + {231424, "Chapter 2 start"}, + {231680, "Chapter 2 - got mission 9 briefing"}, +}};