mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-07 10:50:29 -05:00
Code Issues Projects Releases Wiki Activity

Fixes some build errors resulting from merge.

Browse Source
This commit is contained in:
Christopher Leggett 2023-12-10 14:00:31 -05:00
parent d58968d196
commit 2ef978c792
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
8 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
View File

@ -31,7 +31,7 @@ void AreaTable_Init_GanonsCastle() {
Entrance(RR_GANONS_CASTLE_MAIN, {[]{return true;}}), Entrance(RR_GANONS_CASTLE_MAIN, {[]{return true;}}),
}); });
areaTable[RR_GANONS_CASTLE_MAIN] = Area("Ganon's Castle Main", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, { areaTable[RR_GANONS_CASTLE_MAIN] = Area("Ganon's Castle Main", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
//Exits //Exits
Entrance(RR_GANONS_CASTLE_LOBBY, {[]{return true;}}), Entrance(RR_GANONS_CASTLE_LOBBY, {[]{return true;}}),
Entrance(RR_GANONS_CASTLE_FOREST_TRIAL, {[]{return true;}}), Entrance(RR_GANONS_CASTLE_FOREST_TRIAL, {[]{return true;}}),
@ -136,10 +136,10 @@ void AreaTable_Init_GanonsCastle() {
}, { }, {
//Exits //Exits
Entrance(RR_GANONS_CASTLE_ENTRYWAY, {[]{return true;}}), Entrance(RR_GANONS_CASTLE_ENTRYWAY, {[]{return true;}}),
Entrance(RR_GANONS_CASTLE_MQ_MAIN, {[]{return (CanUse(RG_MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER)) || ((HasExplosives || Nuts || CanUse(BOOMERANG)) && CanJumpslash);}}), Entrance(RR_GANONS_CASTLE_MQ_MAIN, {[]{return (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER)) || ((HasExplosives || Nuts || CanUse(RG_BOOMERANG)) && CanJumpslash);}}),
}); });
areaTable[RR_GANONS_CASTLE_MQ_MAIN] = Area("Ganon's Castle MQ Main", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, { areaTable[RR_GANONS_CASTLE_MQ_MAIN] = Area("Ganon's Castle MQ Main", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
//Exits //Exits
Entrance(RR_GANONS_CASTLE_MQ_LOBBY, {[]{return true;}}), Entrance(RR_GANONS_CASTLE_MQ_LOBBY, {[]{return true;}}),
Entrance(RR_GANONS_CASTLE_MQ_FOREST_TRIAL, {[]{return true;}}), Entrance(RR_GANONS_CASTLE_MQ_FOREST_TRIAL, {[]{return true;}}),

8
soh/soh/Enhancements/randomizer/item.cpp
View File

@ -19,9 +19,9 @@ Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_,
: randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_), : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) { advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) { if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) {
giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, NULL}); giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_RANDOMIZER, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, NULL});
} else { } else {
giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, getItemId_, gid_, true, ITEM_FROM_NPC, category_, NULL}); giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_VANILLA, getItemId_, gid_, true, ITEM_FROM_NPC, category_, NULL});
} }
} }
@ -33,9 +33,9 @@ Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_,
: randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_), : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) { advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) {
if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) { if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) {
giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, NULL}); giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_RANDOMIZER, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, NULL});
} else { } else {
giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, getItemId_, gid_, true, ITEM_FROM_NPC, category_, NULL}); giEntry = std::make_shared<GetItemEntry>(GetItemEntry{itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_VANILLA, getItemId_, gid_, true, ITEM_FROM_NPC, category_, NULL});
} }
} }

4
soh/soh/Enhancements/randomizer/option_descriptions.cpp
View File

@ -508,7 +508,9 @@ void Settings::CreateOptionDescriptions() {
"\n" "\n"
//"Glitched - Glitches may be required to beat the game. You can disable and enable glitches below.\n" //"Glitched - Glitches may be required to beat the game. You can disable and enable glitches below.\n"
//"\n" //"\n"
"No logic - Item placement is completely random. MAY BE IMPOSSIBLE TO BEAT."; "No logic - Item placement is completely random. MAY BE IMPOSSIBLE TO BEAT.\n"
"\n"
"Vanilla - Places all items and dungeon rewards in their vanilla locations.";
mOptionDescriptions[RSK_ALL_LOCATIONS_REACHABLE] = "When this options is enabled, the randomizer will " mOptionDescriptions[RSK_ALL_LOCATIONS_REACHABLE] = "When this options is enabled, the randomizer will "
"guarantee that every item is obtainable and every " "guarantee that every item is obtainable and every "
"location is reachable. When disabled, only " "location is reachable. When disabled, only "

5
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -1960,8 +1960,7 @@ void RandomizerSettingsWindow::DrawElement() {
mNeedsUpdate = true; mNeedsUpdate = true;
} }
// RANDOTODO: Implement Disalbling of Options for Vanilla Logic // RANDOTODO: Implement Disalbling of Options for Vanilla Logic
// RANDOTODO: UIWidgets::EnhancementCombobox("gRandomizeLogicRules", randoLogicRules, RO_LOGIC_GLITCHLESS); if (CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) == RO_LOGIC_GLITCHLESS) {
if (CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) != RO_LOGIC_NO_LOGIC) {
ImGui::SameLine(); ImGui::SameLine();
if (mSettings->GetOption(RSK_ALL_LOCATIONS_REACHABLE).RenderImGui()) { if (mSettings->GetOption(RSK_ALL_LOCATIONS_REACHABLE).RenderImGui()) {
mNeedsUpdate = true; mNeedsUpdate = true;
@ -2513,7 +2512,7 @@ CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
} }
CustomMessage Randomizer::GetSariaMessage(u16 originalTextId) { CustomMessage Randomizer::GetSariaMessage(u16 originalTextId) {
if (originalTextId == TEXT_SARIA_SFM || (originalTextId >= TEXT_SARIAS_SONG_TEXT_START && originalTextId <= TEXT_SARIAS_SONG_TEXT_END)) { if (originalTextId == TEXT_SARIA_SFM || (originalTextId == TEXT_SARIAS_SONG_FOREST_SOUNDS && originalTextId == TEXT_SARIAS_SONG_FOREST_TEMPLE)) {
CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_SARIAS_SONG_FACE_TO_FACE); CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_SARIAS_SONG_FACE_TO_FACE);
CustomMessage messageEntry2 = messageEntry; CustomMessage messageEntry2 = messageEntry;
std::string code = originalTextId == TEXT_SARIA_SFM ? "" : "\x0B"; std::string code = originalTextId == TEXT_SARIA_SFM ? "" : "\x0B";

2
soh/soh/Enhancements/randomizer/randomizerTypes.h
View File

@ -607,6 +607,7 @@ typedef enum {
RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT, RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT,
RR_GANONS_CASTLE_LOBBY, RR_GANONS_CASTLE_LOBBY,
RR_GANONS_CASTLE_MAIN,
RR_GANONS_CASTLE_DEKU_SCRUBS, RR_GANONS_CASTLE_DEKU_SCRUBS,
RR_GANONS_CASTLE_FOREST_TRIAL, RR_GANONS_CASTLE_FOREST_TRIAL,
RR_GANONS_CASTLE_FIRE_TRIAL, RR_GANONS_CASTLE_FIRE_TRIAL,
@ -617,6 +618,7 @@ typedef enum {
RR_GANONS_CASTLE_TOWER, RR_GANONS_CASTLE_TOWER,
RR_GANONS_CASTLE_MQ_LOBBY, RR_GANONS_CASTLE_MQ_LOBBY,
RR_GANONS_CASTLE_MQ_MAIN,
RR_GANONS_CASTLE_MQ_DEKU_SCRUBS, RR_GANONS_CASTLE_MQ_DEKU_SCRUBS,
RR_GANONS_CASTLE_MQ_FOREST_TRIAL, RR_GANONS_CASTLE_MQ_FOREST_TRIAL,
RR_GANONS_CASTLE_MQ_FIRE_TRIAL, RR_GANONS_CASTLE_MQ_FIRE_TRIAL,

4
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
View File

@ -614,7 +614,7 @@ void CheckTrackerSceneFlagSet(int16_t sceneNum, int16_t flagType, int32_t flag)
SetCheckCollected(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR); SetCheckCollected(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR);
return; return;
} }
for (auto& loc : Rando::StaticData::GetLocationTable) { for (auto& loc : Rando::StaticData::GetLocationTable()) {
if (!IsVisibleInCheckTracker(loc.GetRandomizerCheck())) { if (!IsVisibleInCheckTracker(loc.GetRandomizerCheck())) {
continue; continue;
} }
@ -709,7 +709,7 @@ void CheckTrackerFlagSet(int16_t flagType, int32_t flag) {
scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_SCRUB || scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_SCRUB ||
scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_MASTER_SWORD || scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_MASTER_SWORD ||
scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF)) { scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF)) {
if (flag == OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(rc)) { if (flag == OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(loc.GetRandomizerCheck())) {
SetCheckCollected(loc.GetRandomizerCheck()); SetCheckCollected(loc.GetRandomizerCheck());
return; return;
} }

2
soh/soh/Enhancements/randomizer/settings.cpp
View File

@ -1878,6 +1878,8 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
mOptions[index].SetSelectedIndex(RO_LOGIC_GLITCHLESS); mOptions[index].SetSelectedIndex(RO_LOGIC_GLITCHLESS);
} else if (it.value() == "No Logic") { } else if (it.value() == "No Logic") {
mOptions[index].SetSelectedIndex(RO_LOGIC_NO_LOGIC); mOptions[index].SetSelectedIndex(RO_LOGIC_NO_LOGIC);
} else if (it.value() == "Vanilla") {
mOptions[index].SetSelectedIndex(RO_LOGIC_VANILLA);
} }
break; break;
case RSK_FOREST: case RSK_FOREST:

2
soh/src/code/z_sram.c
View File

@ -239,6 +239,8 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) {
gSaveContext.n64ddFlag = fileChooseCtx->n64ddFlag; gSaveContext.n64ddFlag = fileChooseCtx->n64ddFlag;
u8 currentQuest = fileChooseCtx->questType[fileChooseCtx->buttonIndex];
if (Randomizer_IsSeedGenerated()) { if (Randomizer_IsSeedGenerated()) {
gSaveContext.questId = QUEST_RANDOMIZER; gSaveContext.questId = QUEST_RANDOMIZER;