mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-26 03:12:18 -05:00
Code Issues Projects Releases Wiki Activity

Replace some printfs with spdlogs (#4058)

Browse Source
This commit is contained in:
Garrett Cox 2024-04-19 12:28:38 -05:00 committed by GitHub
parent 565a62a518
commit 43e8eec6bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
soh/soh/Enhancements/randomizer/3drando/fill.cpp
View File

@ -635,7 +635,7 @@ static void AssumedFill(const std::vector<RandomizerGet>& items, const std::vect
bool setLocationsAsHintable = false) { bool setLocationsAsHintable = false) {
auto ctx = Rando::Context::GetInstance(); auto ctx = Rando::Context::GetInstance();
if (items.size() > allowedLocations.size()) { if (items.size() > allowedLocations.size()) {
printf("\x1b[2;2HERROR: MORE ITEMS THAN LOCATIONS IN GIVEN LISTS"); SPDLOG_ERROR("ERROR: MORE ITEMS THAN LOCATIONS IN GIVEN LISTS");
SPDLOG_DEBUG("Items:\n"); SPDLOG_DEBUG("Items:\n");
// NOLINTNEXTLINE(clang-diagnostic-unused-variable) // NOLINTNEXTLINE(clang-diagnostic-unused-variable)
for (const RandomizerGet item : items) { for (const RandomizerGet item : items) {
@ -984,9 +984,9 @@ void VanillaFill() {
} }
//If necessary, handle ER stuff //If necessary, handle ER stuff
if (ctx->GetOption(RSK_SHUFFLE_ENTRANCES)) { if (ctx->GetOption(RSK_SHUFFLE_ENTRANCES)) {
printf("\x1b[7;10HShuffling Entrances..."); SPDLOG_INFO("Shuffling Entrances...");
ctx->GetEntranceShuffler()->ShuffleAllEntrances(); ctx->GetEntranceShuffler()->ShuffleAllEntrances();
printf("\x1b[7;32HDone"); SPDLOG_INFO("Shuffling Entrances Done");
} }
// Populate the playthrough for entrances so they are placed in the spoiler log // Populate the playthrough for entrances so they are placed in the spoiler log
GeneratePlaythrough(); GeneratePlaythrough();
@ -997,11 +997,6 @@ void VanillaFill() {
} }
void ClearProgress() { void ClearProgress() {
printf("\x1b[7;32H "); // Done
printf("\x1b[8;10H "); // Placing Items...Done
printf("\x1b[9;10H "); // Calculating Playthrough...Done
printf("\x1b[10;10H "); // Creating Hints...Done
printf("\x1b[11;10H "); // Writing Spoiler Log...Done
} }
int Fill() { int Fill() {
@ -1024,13 +1019,13 @@ int Fill() {
//can validate the world using deku/hylian shields //can validate the world using deku/hylian shields
AddElementsToPool(ItemPool, GetMinVanillaShopItems(32)); //assume worst case shopsanity 4 AddElementsToPool(ItemPool, GetMinVanillaShopItems(32)); //assume worst case shopsanity 4
if (ctx->GetOption(RSK_SHUFFLE_ENTRANCES)) { if (ctx->GetOption(RSK_SHUFFLE_ENTRANCES)) {
printf("\x1b[7;10HShuffling Entrances"); SPDLOG_INFO("Shuffling Entrances...");
if (ctx->GetEntranceShuffler()->ShuffleAllEntrances() == ENTRANCE_SHUFFLE_FAILURE) { if (ctx->GetEntranceShuffler()->ShuffleAllEntrances() == ENTRANCE_SHUFFLE_FAILURE) {
retries++; retries++;
ClearProgress(); ClearProgress();
continue; continue;
} }
printf("\x1b[7;32HDone"); SPDLOG_INFO("Shuffling Entrances Done");
} }
SetAreas(); SetAreas();
//erase temporary shop items //erase temporary shop items
@ -1142,19 +1137,20 @@ int Fill() {
GeneratePlaythrough(); GeneratePlaythrough();
//Successful placement, produced beatable result //Successful placement, produced beatable result
if(ctx->playthroughBeatable && !placementFailure) { if(ctx->playthroughBeatable && !placementFailure) {
printf("Done"); SPDLOG_INFO("Calculating Playthrough...");
printf("\x1b[9;10HCalculating Playthrough...");
PareDownPlaythrough(); PareDownPlaythrough();
CalculateWotH(); CalculateWotH();
CalculateBarren(); CalculateBarren();
printf("Done"); SPDLOG_INFO("Calculating Playthrough Done");
ctx->CreateItemOverrides(); ctx->CreateItemOverrides();
ctx->GetEntranceShuffler()->CreateEntranceOverrides(); ctx->GetEntranceShuffler()->CreateEntranceOverrides();
SPDLOG_INFO("Creating Other Hint Texts...");
//funny ganon line //funny ganon line
Text ganonText = RandomElement(GetHintCategory(HintCategory::GanonLine)).GetText(); Text ganonText = RandomElement(GetHintCategory(HintCategory::GanonLine)).GetText();
CreateMessageFromTextObject(0x70CB, 0, 2, 3, AddColorsAndFormat(ganonText)); CreateMessageFromTextObject(0x70CB, 0, 2, 3, AddColorsAndFormat(ganonText));
SetGanonText(ganonText); SetGanonText(ganonText);
SPDLOG_INFO("Creating Other Hint Texts Done");
CreateAllHints(); CreateAllHints();
CreateWarpSongTexts(); CreateWarpSongTexts();
@ -1162,7 +1158,7 @@ int Fill() {
} }
//Unsuccessful placement //Unsuccessful placement
if(retries < 4) { if(retries < 4) {
SPDLOG_DEBUG("\nGOT STUCK. RETRYING...\n"); SPDLOG_DEBUG("Failed to generate a beatable seed. Retrying...");
Areas::ResetAllLocations(); Areas::ResetAllLocations();
logic->Reset(); logic->Reset();
ClearProgress(); ClearProgress();

4
soh/soh/Enhancements/randomizer/3drando/hints.cpp
View File

@ -1114,8 +1114,8 @@ void CreateAllHints(){
CreateFrogsHint(); CreateFrogsHint();
} }
if (ctx->GetOption(RSK_GOSSIP_STONE_HINTS).IsNot(RO_GOSSIP_STONES_NONE)) { if (ctx->GetOption(RSK_GOSSIP_STONE_HINTS).IsNot(RO_GOSSIP_STONES_NONE)) {
printf("\x1b[10;10HCreating Hints..."); SPDLOG_INFO("Creating Hints...");
CreateStoneHints(); CreateStoneHints();
printf("Done"); SPDLOG_INFO("Creating Hints Done");
} }
} }

2
soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
View File

@ -468,7 +468,7 @@ void PlaceJunkInExcludedLocation(const RandomizerCheck il) {
return; return;
} }
} }
printf("ERROR: No Junk to Place!!!\n"); SPDLOG_ERROR("ERROR: No Junk to Place!!!");
} }
static void PlaceVanillaDekuScrubItems() { static void PlaceVanillaDekuScrubItems() {

6
soh/soh/Enhancements/randomizer/3drando/menu.cpp
View File

@ -50,12 +50,10 @@ bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<Ra
int ret = Playthrough::Playthrough_Init(ctx->GetSettings()->GetSeed(), excludedLocations, enabledTricks); int ret = Playthrough::Playthrough_Init(ctx->GetSettings()->GetSeed(), excludedLocations, enabledTricks);
if (ret < 0) { if (ret < 0) {
if (ret == -1) { // Failed to generate after 5 tries if (ret == -1) { // Failed to generate after 5 tries
printf("\n\nFailed to generate after 5 tries.\nPress B to go back to the menu.\nA different seed might be " SPDLOG_ERROR("Failed to generate after 5 tries.");
"successful.");
SPDLOG_DEBUG("\nRANDOMIZATION FAILED COMPLETELY. PLZ FIX\n");//RANDOTODO print seed for reproduction purposes
return false; return false;
} else { } else {
printf("\n\nError %d with fill.\nPress Select to exit or B to go back to the menu.\n", ret); SPDLOG_ERROR("Error {} with fill.", ret);
return false; return false;
} }
} }

16
soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
View File

@ -69,18 +69,18 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
if (true) { if (true) {
//TODO: Handle different types of file output (i.e. Spoiler Log, Plando Template, Patch Files, Race Files, etc.) //TODO: Handle different types of file output (i.e. Spoiler Log, Plando Template, Patch Files, Race Files, etc.)
// write logs // write logs
printf("\x1b[11;10HWriting Spoiler Log..."); SPDLOG_INFO("Writing Spoiler Log...");
if (SpoilerLog_Write()) { if (SpoilerLog_Write()) {
printf("Done"); SPDLOG_INFO("Writing Spoiler Log Done");
} else { } else {
printf("Failed"); SPDLOG_ERROR("Writing Spoiler Log Failed");
} }
#ifdef ENABLE_DEBUG #ifdef ENABLE_DEBUG
printf("\x1b[11;10HWriting Placement Log..."); SPDLOG_INFO("Writing Placement Log...");
if (PlacementLog_Write()) { if (PlacementLog_Write()) {
printf("Done\n"); SPDLOG_INFO("Writing Placement Log Done");
} else { } else {
printf("Failed\n"); SPDLOG_ERROR("Writing Placement Log Failed");
} }
#endif #endif
} }
@ -93,7 +93,7 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
// used for generating a lot of seeds at once // used for generating a lot of seeds at once
int Playthrough_Repeat(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, int count /*= 1*/) { int Playthrough_Repeat(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, int count /*= 1*/) {
printf("\x1b[0;0HGENERATING %d SEEDS", count); SPDLOG_INFO("GENERATING {} SEEDS", count);
auto ctx = Rando::Context::GetInstance(); auto ctx = Rando::Context::GetInstance();
uint32_t repeatedSeed = 0; uint32_t repeatedSeed = 0;
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
@ -103,7 +103,7 @@ int Playthrough_Repeat(std::set<RandomizerCheck> excludedLocations, std::set<Ran
//CitraPrint("testing seed: " + std::to_string(Settings::seed)); //CitraPrint("testing seed: " + std::to_string(Settings::seed));
ClearProgress(); ClearProgress();
Playthrough_Init(ctx->GetSettings()->GetSeed(), excludedLocations, enabledTricks); Playthrough_Init(ctx->GetSettings()->GetSeed(), excludedLocations, enabledTricks);
printf("\x1b[15;15HSeeds Generated: %d\n", i + 1); SPDLOG_INFO("Seeds Generated: {}", i + 1);
} }
return 1; return 1;

2
soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
View File

@ -260,7 +260,7 @@ void WriteIngameSpoilerLog() {
} }
} }
if (spoilerOutOfSpace || playthroughItemNotFound) { if (spoilerOutOfSpace || playthroughItemNotFound) {
printf("Error! "); SPDLOG_ERROR("In-game spoiler log is out of space, playthrough data will not be written");
} }
} }
} }