Rename goner gamedata struct to milestones

This commit is contained in:
Eidolon 2024-02-21 17:51:53 -06:00
parent ce6b76b0cf
commit 38940ee568
2 changed files with 24 additions and 24 deletions

View file

@ -56,15 +56,15 @@ void srb2::save_ng_gamedata()
ng.challengekeys.pendingkeyroundoffset = gamedata->pendingkeyroundoffset;
ng.challengekeys.keyspending = gamedata->keyspending;
ng.challengekeys.chaokeys = gamedata->chaokeys;
ng.goner.everloadedaddon = gamedata->everloadedaddon;
ng.goner.everfinishcredits = gamedata->everfinishedcredits;
ng.goner.eversavedreplay = gamedata->eversavedreplay;
ng.goner.everseenspecial = gamedata->everseenspecial;
ng.goner.chaokeytutorial = gamedata->chaokeytutorial;
ng.goner.majorkeyskipattempted = gamedata->majorkeyskipattempted;
ng.goner.finishedtutorialchallenge = gamedata->finishedtutorialchallenge;
ng.goner.enteredtutorialchallenge = gamedata->enteredtutorialchallenge;
ng.goner.level = gamedata->gonerlevel;
ng.milestones.everloadedaddon = gamedata->everloadedaddon;
ng.milestones.everfinishcredits = gamedata->everfinishedcredits;
ng.milestones.eversavedreplay = gamedata->eversavedreplay;
ng.milestones.everseenspecial = gamedata->everseenspecial;
ng.milestones.chaokeytutorial = gamedata->chaokeytutorial;
ng.milestones.majorkeyskipattempted = gamedata->majorkeyskipattempted;
ng.milestones.finishedtutorialchallenge = gamedata->finishedtutorialchallenge;
ng.milestones.enteredtutorialchallenge = gamedata->enteredtutorialchallenge;
ng.milestones.gonerlevel = gamedata->gonerlevel;
ng.prisons.thisprisoneggpickup = gamedata->thisprisoneggpickup;
ng.prisons.prisoneggstothispickup = gamedata->prisoneggstothispickup;
ng.tafolderhash = quickncasehash(timeattackfolder, 64);
@ -390,15 +390,15 @@ void srb2::load_ng_gamedata()
gamedata->pendingkeyroundoffset = js.challengekeys.pendingkeyroundoffset;
gamedata->keyspending = js.challengekeys.keyspending;
gamedata->chaokeys = js.challengekeys.chaokeys;
gamedata->everloadedaddon = js.goner.everloadedaddon;
gamedata->everfinishedcredits = js.goner.everfinishcredits;
gamedata->eversavedreplay = js.goner.eversavedreplay;
gamedata->everseenspecial = js.goner.everseenspecial;
gamedata->chaokeytutorial = js.goner.chaokeytutorial;
gamedata->majorkeyskipattempted = js.goner.majorkeyskipattempted;
gamedata->finishedtutorialchallenge = js.goner.finishedtutorialchallenge;
gamedata->enteredtutorialchallenge = js.goner.enteredtutorialchallenge;
gamedata->gonerlevel = js.goner.level;
gamedata->everloadedaddon = js.milestones.everloadedaddon;
gamedata->everfinishedcredits = js.milestones.everfinishcredits;
gamedata->eversavedreplay = js.milestones.eversavedreplay;
gamedata->everseenspecial = js.milestones.everseenspecial;
gamedata->chaokeytutorial = js.milestones.chaokeytutorial;
gamedata->majorkeyskipattempted = js.milestones.majorkeyskipattempted;
gamedata->finishedtutorialchallenge = js.milestones.finishedtutorialchallenge;
gamedata->enteredtutorialchallenge = js.milestones.enteredtutorialchallenge;
gamedata->gonerlevel = js.milestones.gonerlevel;
gamedata->thisprisoneggpickup = js.prisons.thisprisoneggpickup;
gamedata->prisoneggstothispickup = js.prisons.prisoneggstothispickup;

View file

@ -59,9 +59,9 @@ struct GamedataChallengeKeysJson final
NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(GamedataChallengeKeysJson, pendingkeyrounds, pendingkeyroundoffset, keyspending, chaokeys)
};
struct GamedataGonerJson final
struct GamedataMilestonesJson final
{
uint32_t level;
uint32_t gonerlevel;
bool everloadedaddon;
bool everfinishcredits;
bool eversavedreplay;
@ -72,8 +72,8 @@ struct GamedataGonerJson final
bool enteredtutorialchallenge;
NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(
GamedataGonerJson,
level,
GamedataMilestonesJson,
gonerlevel,
everloadedaddon,
everfinishcredits,
eversavedreplay,
@ -190,7 +190,7 @@ struct GamedataJson final
GamedataRingsJson rings;
GamedataRoundsJson rounds;
GamedataChallengeKeysJson challengekeys;
GamedataGonerJson goner;
GamedataMilestonesJson milestones;
GamedataPrisonEggPickupsJson prisons;
uint32_t tafolderhash;
std::vector<bool> emblems;
@ -210,7 +210,7 @@ struct GamedataJson final
rings,
rounds,
challengekeys,
goner,
milestones,
prisons,
tafolderhash,
emblems,