mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-11-22 09:22:18 -05:00
Replace Race Preset Magic Numbers and Remove gPreset1 from No Logic Preset (#3255)
* magic * Remove gpreset1
This commit is contained in:
inspectredc
GitHub
parent
2a356b6e9a
commit
8c7786d4bb
@ -763,7 +763,7 @@ const std::vector<PresetEntry> spockRacePresetEntries = {
|
||||
PRESET_ENTRY_S32("gInstantPutaway", 1),
|
||||
PRESET_ENTRY_S32("gFastBoomerang", 1),
|
||||
PRESET_ENTRY_S32("gDpadNoDropOcarinaInput", 1),
|
||||
PRESET_ENTRY_S32("gMMBunnyHood", 2),
|
||||
PRESET_ENTRY_S32("gMMBunnyHood", BUNNY_HOOD_FAST),
|
||||
PRESET_ENTRY_S32("gSeparateArrows", 1),
|
||||
PRESET_ENTRY_S32("gAssignableTunicsAndBoots", 1),
|
||||
PRESET_ENTRY_S32("gEquipmentCanBeRemoved", 1),
|
||||
@ -803,32 +803,32 @@ const std::vector<PresetEntry> spockRacePresetEntries = {
|
||||
PRESET_ENTRY_S32("gRandomizeCompleteMaskQuest", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeCuccosToReturn", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeDampeHint", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeDoorOfTime", 2),
|
||||
PRESET_ENTRY_S32("gRandomizeDoorOfTime", RO_DOOROFTIME_OPEN),
|
||||
PRESET_ENTRY_S32("gRandomizeEnableBombchuDrops", 1),
|
||||
PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,142,143,228,"),
|
||||
PRESET_ENTRY_S32("gRandomizeForest", 2),
|
||||
PRESET_ENTRY_S32("gRandomizeForest", RO_FOREST_OPEN),
|
||||
PRESET_ENTRY_S32("gRandomizeFullWallets", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeGanonTrial", 0),
|
||||
PRESET_ENTRY_S32("gRandomizeGerudoFortress", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeGanonTrial", RO_GANONS_TRIALS_SKIP),
|
||||
PRESET_ENTRY_S32("gRandomizeGerudoFortress", RO_GF_FAST),
|
||||
PRESET_ENTRY_S32("gRandomizeGregHint", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeGsExpectSunsSong", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeKakarikoGate", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeKakarikoGate", RO_KAK_GATE_OPEN),
|
||||
PRESET_ENTRY_S32("gRandomizeLacsRewardCount", 5),
|
||||
PRESET_ENTRY_S32("gRandomizeRainbowBridge", 7),
|
||||
PRESET_ENTRY_S32("gRandomizeRainbowBridge", RO_BRIDGE_GREG),
|
||||
PRESET_ENTRY_S32("gRandomizeScrubText", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeShopsanity", 6),
|
||||
PRESET_ENTRY_S32("gRandomizeShuffleGanonBossKey", 9),
|
||||
PRESET_ENTRY_S32("gRandomizeShuffleKeyRings", 2),
|
||||
PRESET_ENTRY_S32("gRandomizeShopsanity", RO_SHOPSANITY_RANDOM),
|
||||
PRESET_ENTRY_S32("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_LACS_REWARDS),
|
||||
PRESET_ENTRY_S32("gRandomizeShuffleKeyRings", RO_KEYRINGS_COUNT),
|
||||
PRESET_ENTRY_S32("gRandomizeShuffleKokiriSword", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeShuffleOcarinas", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeShuffleScrubs", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeShuffleScrubs", RO_SCRUBS_AFFORDABLE),
|
||||
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("gRandomizeStartingMapsCompasses", RO_DUNGEON_ITEM_LOC_STARTWITH),
|
||||
PRESET_ENTRY_S32("gRandomizeStartingOcarina", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeSunlightArrows", 1),
|
||||
PRESET_ENTRY_S32("gRandomizerSettingsEnabled", 1),
|
||||
@ -871,7 +871,7 @@ const std::vector<PresetEntry> spockRaceNoLogicPresetEntries = {
|
||||
PRESET_ENTRY_S32("gInjectItemCounts", 1),
|
||||
PRESET_ENTRY_S32("gInstantFishing", 1),
|
||||
PRESET_ENTRY_S32("gInstantPutaway", 1),
|
||||
PRESET_ENTRY_S32("gMMBunnyHood", 2),
|
||||
PRESET_ENTRY_S32("gMMBunnyHood", BUNNY_HOOD_FAST),
|
||||
PRESET_ENTRY_S32("gMarketSneak", 1),
|
||||
PRESET_ENTRY_S32("gMaskSelect", 1),
|
||||
PRESET_ENTRY_S32("gMweepSpeed", 5),
|
||||
@ -881,7 +881,6 @@ const std::vector<PresetEntry> spockRaceNoLogicPresetEntries = {
|
||||
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),
|
||||
@ -891,44 +890,44 @@ const std::vector<PresetEntry> spockRaceNoLogicPresetEntries = {
|
||||
PRESET_ENTRY_S32("gRandomizeAllLocationsReachable", 0),
|
||||
PRESET_ENTRY_S32("gRandomizeBlueFireArrows", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeBombchusInLogic", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeBossKeysanity", 5),
|
||||
PRESET_ENTRY_S32("gRandomizeBossKeysanity", RO_DUNGEON_ITEM_LOC_ANYWHERE),
|
||||
PRESET_ENTRY_S32("gRandomizeCompleteMaskQuest", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeCuccosToReturn", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeDampeHint", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeDoorOfTime", 2),
|
||||
PRESET_ENTRY_S32("gRandomizeDoorOfTime", RO_DOOROFTIME_OPEN),
|
||||
PRESET_ENTRY_S32("gRandomizeEnableBombchuDrops", 1),
|
||||
PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,142,143,228,"),
|
||||
PRESET_ENTRY_S32("gRandomizeForest", 2),
|
||||
PRESET_ENTRY_S32("gRandomizeForest", RO_FOREST_OPEN),
|
||||
PRESET_ENTRY_S32("gRandomizeFullWallets", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeGanonTrial", 0),
|
||||
PRESET_ENTRY_S32("gRandomizeGerudoFortress", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeGerudoKeys", 3),
|
||||
PRESET_ENTRY_S32("gRandomizeGanonTrial", RO_GANONS_TRIALS_SKIP),
|
||||
PRESET_ENTRY_S32("gRandomizeGerudoFortress", RO_GF_FAST),
|
||||
PRESET_ENTRY_S32("gRandomizeGerudoKeys", RO_GERUDO_KEYS_ANYWHERE),
|
||||
PRESET_ENTRY_S32("gRandomizeGregHint", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeGsExpectSunsSong", 0),
|
||||
PRESET_ENTRY_S32("gRandomizeKakarikoGate", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeKeysanity", 5),
|
||||
PRESET_ENTRY_S32("gRandomizeKakarikoGate", RO_KAK_GATE_OPEN),
|
||||
PRESET_ENTRY_S32("gRandomizeKeysanity", RO_DUNGEON_ITEM_LOC_ANYWHERE),
|
||||
PRESET_ENTRY_S32("gRandomizeLacsRewardCount", 5),
|
||||
PRESET_ENTRY_S32("gRandomizeLogicRules", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeRainbowBridge", 7),
|
||||
PRESET_ENTRY_S32("gRandomizeLogicRules", RO_LOGIC_NO_LOGIC),
|
||||
PRESET_ENTRY_S32("gRandomizeRainbowBridge", RO_BRIDGE_GREG),
|
||||
PRESET_ENTRY_S32("gRandomizeScrubText", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeShopsanity", 6),
|
||||
PRESET_ENTRY_S32("gRandomizeShopsanity", RO_SHOPSANITY_RANDOM),
|
||||
PRESET_ENTRY_S32("gRandomizeShuffleAdultTrade", 0),
|
||||
PRESET_ENTRY_S32("gRandomizeShuffleBeans", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeShuffleGanonBossKey", 9),
|
||||
PRESET_ENTRY_S32("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_LACS_REWARDS),
|
||||
PRESET_ENTRY_S32("gRandomizeShuffleGerudoToken", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeShuffleKeyRings", 2),
|
||||
PRESET_ENTRY_S32("gRandomizeShuffleKeyRings", RO_KEYRINGS_COUNT),
|
||||
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("gRandomizeShuffleSongs", RO_SONG_SHUFFLE_ANYWHERE),
|
||||
PRESET_ENTRY_S32("gRandomizeShuffleTokens", RO_TOKENSANITY_ALL),
|
||||
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("gRandomizeStartingMapsCompasses", RO_DUNGEON_ITEM_LOC_STARTWITH),
|
||||
PRESET_ENTRY_S32("gRandomizeStartingOcarina", 1),
|
||||
PRESET_ENTRY_S32("gRandomizeSunlightArrows", 1),
|
||||
PRESET_ENTRY_S32("gRandomizerSettingsEnabled", 1),
|
||||
|
||||
Loading…
Reference in New Issue
Block a user