github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 21:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move IsFireLoopLocked to method instead of being variable

Browse source
This commit is contained in:
Demur Rumed 2025-07-20 20:07:19 +00:00
commit b3f5318c09
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
run-clang-format.ps1
View file

@ -38,7 +38,7 @@ $basePath = (Resolve-Path .).Path
$files = Get-ChildItem -Path $basePath\soh -Recurse -File ` $files = Get-ChildItem -Path $basePath\soh -Recurse -File `
| Where-Object { ($_.Extension -eq '.c' -or $_.Extension -eq '.cpp' -or ` | Where-Object { ($_.Extension -eq '.c' -or $_.Extension -eq '.cpp' -or `
(($_.Extension -eq '.h' -or $_.Extension -eq '.hpp') -and ` (($_.Extension -eq '.h' -or $_.Extension -eq '.hpp') -and `
(-not ($_.FullName -like "*\soh\src\*" -or $_.FullName -like "*\soh\include\*")))) -and ` (-not ($_.FullName -like "*\soh\src\*" -or $_.FullName -like "*\soh\include\*" -or $_.FullName -like "*\soh\soh\Enhancements\randomizer\generated\*")))) -and `
(-not ($_.FullName -like "*\soh\assets\*" -or $_.FullName -like "*\soh\build\*")) } (-not ($_.FullName -like "*\soh\assets\*" -or $_.FullName -like "*\soh\build\*")) }
for ($i = 0; $i -lt $files.Length; $i++) { for ($i = 0; $i -lt $files.Length; $i++) {

2
run-clang-format.sh
View file

@ -26,4 +26,4 @@
# and pass it as an argument to clang-format # and pass it as an argument to clang-format
# verbose to print files being formatted and X out of Y status # verbose to print files being formatted and X out of Y status
find soh -type f \( -name "*.c" -o -name "*.cpp" -o \( \( -name "*.h" -o -name "*.hpp" \) ! -path "soh/src/*" ! -path "soh/include/*" \) \) ! -path "soh/assets/*" -print0 | xargs -0 clang-format-14 -i --verbose find soh -type f \( -name "*.c" -o -name "*.cpp" -o \( \( -name "*.h" -o -name "*.hpp" \) ! -path "soh/src/*" ! -path "soh/include/*" ! -path "soh/soh/Enhancements/randomizer/generated/*" \) \) ! -path "soh/assets/*" -print0 | xargs -0 clang-format-14 -i --verbose

2
soh/compile_logic.py
View file

@ -194,7 +194,6 @@ LOGIC = {
"AtNight", "AtNight",
"LoweredWaterInBotw", "LoweredWaterInBotw",
"BigPoes", "BigPoes",
"IsFireLoopLocked",
} }
RANDO = { RANDO = {
@ -276,6 +275,7 @@ logicFUNC = {
"HasBottle", "HasBottle",
"ScarecrowsSong", "ScarecrowsSong",
"SmallKeys", "SmallKeys",
"IsFireLoopLocked",
"OcarinaButtons", "OcarinaButtons",
"Hearts", "Hearts",
"EffectiveHealth", "EffectiveHealth",

12
soh/soh/Enhancements/randomizer/logic.cpp
View file

@ -1442,6 +1442,12 @@ bool Logic::SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless
} }
} }
bool Logic::IsFireLoopLocked() {
return ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) ||
ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD) ||
ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON);
}
std::map<RandomizerGet, uint32_t> Logic::RandoGetToEquipFlag = { std::map<RandomizerGet, uint32_t> Logic::RandoGetToEquipFlag = {
{ RG_KOKIRI_SWORD, EQUIP_FLAG_SWORD_KOKIRI }, { RG_MASTER_SWORD, EQUIP_FLAG_SWORD_MASTER }, { RG_KOKIRI_SWORD, EQUIP_FLAG_SWORD_KOKIRI }, { RG_MASTER_SWORD, EQUIP_FLAG_SWORD_MASTER },
{ RG_BIGGORON_SWORD, EQUIP_FLAG_SWORD_BGS }, { RG_DEKU_SHIELD, EQUIP_FLAG_SHIELD_DEKU }, { RG_BIGGORON_SWORD, EQUIP_FLAG_SWORD_BGS }, { RG_DEKU_SHIELD, EQUIP_FLAG_SHIELD_DEKU },
@ -2338,10 +2344,6 @@ void Logic::Reset(bool resetSaveContext /*= true*/) {
} }
StartPerformanceTimer(PT_LOGIC_RESET); StartPerformanceTimer(PT_LOGIC_RESET);
memset(inLogic, false, sizeof(inLogic)); memset(inLogic, false, sizeof(inLogic));
// Settings-dependent variables
IsFireLoopLocked = ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) ||
ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD) ||
ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON);
// AmmoCanDrop = /*AmmoDrops.IsNot(AMMODROPS_NONE)*/ false; TODO: AmmoDrop setting // AmmoCanDrop = /*AmmoDrops.IsNot(AMMODROPS_NONE)*/ false; TODO: AmmoDrop setting
@ -2407,7 +2409,7 @@ void Logic::Reset(bool resetSaveContext /*= true*/) {
// If not keysanity, start with 1 logical key to account for automatically unlocking the basement door in // If not keysanity, start with 1 logical key to account for automatically unlocking the basement door in
// vanilla FiT // vanilla FiT
if (!IsFireLoopLocked && ctx->GetDungeon(Rando::FIRE_TEMPLE)->IsVanilla()) { if (!IsFireLoopLocked() && ctx->GetDungeon(Rando::FIRE_TEMPLE)->IsVanilla()) {
SetSmallKeyCount(SCENE_FIRE_TEMPLE, 1); SetSmallKeyCount(SCENE_FIRE_TEMPLE, 1);
} }
} }

4
soh/soh/Enhancements/randomizer/logic.h
View file

@ -59,9 +59,6 @@ class Logic {
bool ShadowTrialClear = false; bool ShadowTrialClear = false;
bool LightTrialClear = false; bool LightTrialClear = false;
// Logical keysanity
bool IsFireLoopLocked = false;
// Bottle Count // Bottle Count
uint8_t Bottles = 0; uint8_t Bottles = 0;
uint8_t NumBottles = 0; uint8_t NumBottles = 0;
@ -194,6 +191,7 @@ class Logic {
bool CanOpenOverworldDoor(RandomizerGet itemName); bool CanOpenOverworldDoor(RandomizerGet itemName);
bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount); bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount);
bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched); bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched);
bool IsFireLoopLocked();
bool CanOpenUnderwaterChest(); bool CanOpenUnderwaterChest();
bool CanDoGlitch(GlitchType glitch); bool CanDoGlitch(GlitchType glitch);
bool CanEquipSwap(RandomizerGet itemName); bool CanEquipSwap(RandomizerGet itemName);