From bcbfe73d82cc46e65fd24aa553d3fc7aa6f079c4 Mon Sep 17 00:00:00 2001 From: moganda12 <115957608+moganda12@users.noreply.github.com> Date: Tue, 10 Dec 2024 03:53:06 +0000 Subject: [PATCH] end of day 2 --- src/main.cpp | 35 ++++++++++++++++++++++++++++++----- todo.txt | 4 ++-- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index caa0a26..d80197e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -76,7 +76,7 @@ struct Acheivement { str name; str description; str flavortext; - bool completed; + bool earned; }; struct TclickerState { @@ -423,6 +423,12 @@ void onExit(std::vector&) { #pragma region THE WALL + + + + +#pragma region for upgrades + void unlockCursor(std::vector& args) { gameState.cursorUnlocked = true; } @@ -550,6 +556,16 @@ void unLockEndgame(std::vector& args) { +#pragma region for acheivements +#pragma endregion + + +#pragma endregion + + + + + #pragma region saves integer json_read_integer_safe(json::value_type j, integer def = 0) { @@ -1092,7 +1108,7 @@ void list(std::vector& args) { if(args.size() < 1) { std::cout << BOLDRED << "You must specify some group of things to list!\n"; } else if(args.size() >= 1) { - if(args[0] == "upgrade" || args[0] == "upgrades") { + if(args[0] == "upgrade" || args[0] == "upgrades") { if(args.size() == 1) { std::cout << BOLDWHITE << "Upgrades:\n\n"; @@ -1108,8 +1124,8 @@ void list(std::vector& args) { for(Upgrade& upgrade : upgrades) { if(upgrade.purchased) { - std::cout << BOLDBLUE << upgrade.name << " - " << upgrade.description << '\n'; - std::cout << "cost " << TransitorsString(upgrade.cost, 0) << "!\n\n"; + std::cout << BOLDBLUE << upgrade.name << " - " << upgrade.description << BOLDYELLOW << "(owned)\n"; + std::cout << BOLDBLUE << "cost " << TransitorsString(upgrade.cost, 0) << "!\n\n"; } } } else if(args[1] == "all") { @@ -1129,7 +1145,7 @@ void list(std::vector& args) { } for(Upgrade& upgrade : owned) { - std::cout << BOLDBLUE << upgrade.name << " - " << upgrade.description << '\n'; + std::cout << BOLDBLUE << upgrade.name << " - " << upgrade.description << BOLDYELLOW << "(owned)\n"; std::cout << "will cost " << TransitorsString(upgrade.cost) << "!\n\n"; } @@ -1139,6 +1155,15 @@ void list(std::vector& args) { } } } + } else if(args[0] == "acheivement" || args[0] == "acheivements") { + if(args.size() >= 1) { + std::cout << BOLDWHITE << "Acheivments:"; + + for(Acheivement& acheivement : acheivements) { + std::cout << BOLDBLUE << acheivement.name << " - " << acheivement.description << '\n'; + std::cout << BOLDBLUE << '"' << acheivement.flavortext << "\"\n\n"; + } + } } else if(args[0] == "building" || args[0] == "buildings") { std::cout << BOLDWHITE << "Buildings:\n\n"; diff --git a/todo.txt b/todo.txt index a253274..1ca9275 100644 --- a/todo.txt +++ b/todo.txt @@ -2,12 +2,12 @@ 0.0.2 [ ] -[ ] refactoring { +[x] refactoring { - [x] move the upgrade and acheivement lists out of save - [x] rename save to something better - [x] redo the list command - - [ ] section off code into regions + - [x] section off code into regions } [x] make main menu {