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

Update No Logic for previous rule set (#3159)

Browse Source
This commit is contained in:
Caladius 2023-09-10 13:53:05 -04:00 committed by GitHub
parent e31b2fd9a4
commit 023654f617
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 120 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
soh/soh/Enhancements/presets.h
View File

@ -28,6 +28,7 @@ enum EnhancementPreset {
enum RandomizerPreset {
RANDOMIZER_PRESET_DEFAULT,
RANDOMIZER_PRESET_SPOCK_RACE,
RANDOMIZER_PRESET_SPOCK_RACE_NO_LOGIC,
RANDOMIZER_PRESET_S6,
RANDOMIZER_PRESET_HELL_MODE,
};
@ -740,6 +741,7 @@ const std::vector<PresetEntry> randomizerPresetEntries = {
};
const std::vector<PresetEntry> spockRacePresetEntries = {
PRESET_ENTRY_S32("gRandomizeLogicRules", 0),
PRESET_ENTRY_S32("gGameplayStats.RTATiming", 1),
PRESET_ENTRY_S32("gTextSpeed", 5),
PRESET_ENTRY_S32("gMweepSpeed", 5),
@ -832,6 +834,114 @@ const std::vector<PresetEntry> spockRacePresetEntries = {
PRESET_ENTRY_S32("gRandomizerSettingsEnabled", 1),
};
const std::vector<PresetEntry> spockRaceNoLogicPresetEntries = {
PRESET_ENTRY_S32("gAdultMinimumWeightFish", 6),
PRESET_ENTRY_S32("gAssignableTunicsAndBoots", 1),
PRESET_ENTRY_S32("gCheatEasyPauseBufferEnabled", 1),
PRESET_ENTRY_S32("gChildMinimumWeightFish", 3),
PRESET_ENTRY_S32("gClimbSpeed", 4),
PRESET_ENTRY_S32("gCosmetics.Goron_NeckLength", 1000),
PRESET_ENTRY_S32("gCreditsFix", 1),
PRESET_ENTRY_S32("gCustomizeFishing", 1),
PRESET_ENTRY_S32("gDampeAllNight", 1),
PRESET_ENTRY_S32("gDayGravePull", 1),
PRESET_ENTRY_S32("gDisableFirstPersonChus", 1),
PRESET_ENTRY_S32("gDisableLOD", 1),
PRESET_ENTRY_S32("gDisableNaviCallAudio", 1),
PRESET_ENTRY_S32("gDpadEquips", 1),
PRESET_ENTRY_S32("gDpadNoDropOcarinaInput", 1),
PRESET_ENTRY_S32("gDpadOcarina", 1),
PRESET_ENTRY_S32("gDpadText", 1),
PRESET_ENTRY_S32("gDrawLineupTick", 1),
PRESET_ENTRY_S32("gEquipmentCanBeRemoved", 1),
PRESET_ENTRY_S32("gFastBoomerang", 1),
PRESET_ENTRY_S32("gFastChests", 1),
PRESET_ENTRY_S32("gFastDrops", 1),
PRESET_ENTRY_S32("gFastFarores", 1),
PRESET_ENTRY_S32("gFastOcarinaPlayback", 1),
PRESET_ENTRY_S32("gFasterBlockPush", 5),
PRESET_ENTRY_S32("gFasterHeavyBlockLift", 1),
PRESET_ENTRY_S32("gFishNeverEscape", 1),
PRESET_ENTRY_S32("gForgeTime", 0),
PRESET_ENTRY_S32("gGameplayStats.RTATiming", 1),
PRESET_ENTRY_S32("gGameplayStats.ShowIngameTimer", 1),
PRESET_ENTRY_S32("gGoronPot", 1),
PRESET_ENTRY_S32("gGuaranteeFishingBite", 1),
PRESET_ENTRY_S32("gHideBuildInfo", 1),
PRESET_ENTRY_S32("gInjectItemCounts", 1),
PRESET_ENTRY_S32("gInstantFishing", 1),
PRESET_ENTRY_S32("gInstantPutaway", 1),
PRESET_ENTRY_S32("gMMBunnyHood", 2),
PRESET_ENTRY_S32("gMarketSneak", 1),
PRESET_ENTRY_S32("gMaskSelect", 1),
PRESET_ENTRY_S32("gMweepSpeed", 5),
PRESET_ENTRY_S32("gNewDrops", 1),
PRESET_ENTRY_S32("gNoForcedNavi", 1),
PRESET_ENTRY_S32("gNoInputForCredits", 1),
PRESET_ENTRY_S32("gOnFileSelectNameEntry", 0),
PRESET_ENTRY_S32("gOpenMenuBar", 1),
PRESET_ENTRY_S32("gPauseAnyCursor", 1),
PRESET_ENTRY_S32("gPreset1", 1),
PRESET_ENTRY_S32("gRStickOcarina", 1),
PRESET_ENTRY_S32("gRandomize10GSHint", 1),
PRESET_ENTRY_S32("gRandomize20GSHint", 1),
PRESET_ENTRY_S32("gRandomize30GSHint", 1),
PRESET_ENTRY_S32("gRandomize40GSHint", 1),
PRESET_ENTRY_S32("gRandomize50GSHint", 1),
PRESET_ENTRY_S32("gRandomizeAllLocationsReachable", 0),
PRESET_ENTRY_S32("gRandomizeBlueFireArrows", 1),
PRESET_ENTRY_S32("gRandomizeBombchusInLogic", 1),
PRESET_ENTRY_S32("gRandomizeBossKeysanity", 5),
PRESET_ENTRY_S32("gRandomizeCompleteMaskQuest", 1),
PRESET_ENTRY_S32("gRandomizeCuccosToReturn", 1),
PRESET_ENTRY_S32("gRandomizeDampeHint", 1),
PRESET_ENTRY_S32("gRandomizeDoorOfTime", 2),
PRESET_ENTRY_S32("gRandomizeEnableBombchuDrops", 1),
PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,142,143,228,"),
PRESET_ENTRY_S32("gRandomizeForest", 2),
PRESET_ENTRY_S32("gRandomizeFullWallets", 1),
PRESET_ENTRY_S32("gRandomizeGanonTrial", 0),
PRESET_ENTRY_S32("gRandomizeGerudoFortress", 1),
PRESET_ENTRY_S32("gRandomizeGerudoKeys", 3),
PRESET_ENTRY_S32("gRandomizeGregHint", 1),
PRESET_ENTRY_S32("gRandomizeGsExpectSunsSong", 0),
PRESET_ENTRY_S32("gRandomizeKakarikoGate", 1),
PRESET_ENTRY_S32("gRandomizeKeysanity", 5),
PRESET_ENTRY_S32("gRandomizeLacsRewardCount", 5),
PRESET_ENTRY_S32("gRandomizeLogicRules", 1),
PRESET_ENTRY_S32("gRandomizeRainbowBridge", 7),
PRESET_ENTRY_S32("gRandomizeScrubText", 1),
PRESET_ENTRY_S32("gRandomizeShopsanity", 6),
PRESET_ENTRY_S32("gRandomizeShuffleAdultTrade", 0),
PRESET_ENTRY_S32("gRandomizeShuffleBeans", 1),
PRESET_ENTRY_S32("gRandomizeShuffleGanonBossKey", 9),
PRESET_ENTRY_S32("gRandomizeShuffleGerudoToken", 1),
PRESET_ENTRY_S32("gRandomizeShuffleKeyRings", 2),
PRESET_ENTRY_S32("gRandomizeShuffleKokiriSword", 1),
PRESET_ENTRY_S32("gRandomizeShuffleOcarinas", 1),
PRESET_ENTRY_S32("gRandomizeShuffleScrubs", 1),
PRESET_ENTRY_S32("gRandomizeShuffleSongs", 2),
PRESET_ENTRY_S32("gRandomizeShuffleTokens", 3),
PRESET_ENTRY_S32("gRandomizeSkipChildStealth", 1),
PRESET_ENTRY_S32("gRandomizeSkipChildZelda", 1),
PRESET_ENTRY_S32("gRandomizeSkipEponaRace", 1),
PRESET_ENTRY_S32("gRandomizeSkipScarecrowsSong", 1),
PRESET_ENTRY_S32("gRandomizeSkipTowerEscape", 1),
PRESET_ENTRY_S32("gRandomizeStartingConsumables", 1),
PRESET_ENTRY_S32("gRandomizeStartingMapsCompasses", 0),
PRESET_ENTRY_S32("gRandomizeStartingOcarina", 1),
PRESET_ENTRY_S32("gRandomizeSunlightArrows", 1),
PRESET_ENTRY_S32("gRandomizerSettingsEnabled", 1),
PRESET_ENTRY_S32("gSaveFileID", 4),
PRESET_ENTRY_S32("gSeparateArrows", 1),
PRESET_ENTRY_S32("gSkipLogoTitle", 1),
PRESET_ENTRY_S32("gSkipScarecrow", 1),
PRESET_ENTRY_S32("gSkipText", 1),
PRESET_ENTRY_S32("gSkulltulaFreeze", 1),
PRESET_ENTRY_S32("gTextSpeed", 5),
PRESET_ENTRY_S32("gZFightingMode", 0),
};
const std::vector<PresetEntry> s6PresetEntries = {
PRESET_ENTRY_S32("gChestSizeAndTextureMatchesContents", CSMC_BOTH),
PRESET_ENTRY_S32("gFastChests", 1),
@ -964,6 +1074,16 @@ const std::map<PresetType, PresetTypeDefinition> presetTypes = {
"- All locations reachable is off\n", \
spockRacePresetEntries,
} },
{ RANDOMIZER_PRESET_SPOCK_RACE_NO_LOGIC, {
"Spock Race - No Logic",
"No Logic Race preset used for official Ship of Harkinian No Logic races. The following settings are "
"notable:\n"
"- Rainbow Bridge is set to Greg\n"
"- Ganons Boss Key is 5 dungeon rewards\n"
"- Shopsanity and Scrubsanity enabled\n"
"- All locations reachable is off\n",
spockRaceNoLogicPresetEntries,
} },
{ RANDOMIZER_PRESET_S6, {
"S6 Tournament (Adapted)",
"Matches OOTR S6 tournament settings as close as we can get with the options available in SoH. The following differences are notable:\n" \