From 1da26df999ce57ec9142450eacd747c07884f7c5 Mon Sep 17 00:00:00 2001 From: Matthew Date: Thu, 19 Dec 2024 15:44:00 -0800 Subject: [PATCH] sc2: Making victory checks option range from 0 to 10 --- worlds/sc2/locations.py | 4 ++-- worlds/sc2/mission_order/options.py | 4 ++-- worlds/sc2/options.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/worlds/sc2/locations.py b/worlds/sc2/locations.py index e6fbdbb70031..828d6013ed03 100644 --- a/worlds/sc2/locations.py +++ b/worlds/sc2/locations.py @@ -19,7 +19,7 @@ SC2LOTV_LOC_ID_OFFSET = SC2HOTS_LOC_ID_OFFSET + 2000 SC2NCO_LOC_ID_OFFSET = SC2LOTV_LOC_ID_OFFSET + 2500 SC2_RACESWAP_LOC_ID_OFFSET = SC2NCO_LOC_ID_OFFSET + 900 -VICTORY_CACHE_OFFSET = 91 +VICTORY_CACHE_OFFSET = 90 class SC2Location(Location): @@ -5750,7 +5750,7 @@ def get_locations(world: Optional['SC2World']) -> Tuple[LocationData, ...]: ] beat_events: List[LocationData] = [] victory_caches: List[LocationData] = [] - VICTORY_CACHE_SIZE = 9 + VICTORY_CACHE_SIZE = 10 for location_data in location_table: # Generating Beat event and Victory Cache locations if location_data.type == LocationType.VICTORY: diff --git a/worlds/sc2/mission_order/options.py b/worlds/sc2/mission_order/options.py index 08c0d1214b99..7db294ef500a 100644 --- a/worlds/sc2/mission_order/options.py +++ b/worlds/sc2/mission_order/options.py @@ -64,7 +64,7 @@ IntZero = And(int, lambda val: val >= 0) IntOne = And(int, lambda val: val >= 1) IntPercent = And(int, lambda val: 0 <= val <= 100) -IntZeroToNine = And(int, lambda val: 0 <= val <= 9) +IntZeroToTen = And(int, lambda val: 0 <= val <= 10) SubRuleEntryRule = { "rules": [{str: object}], # recursive schema checking is too hard @@ -155,7 +155,7 @@ class CustomMissionOrder(OptionDict): Optional("entry_rules"): [EntryRule], Optional("mission_pool"): {int}, Optional("difficulty"): Difficulty, - Optional("victory_checks"): IntZeroToNine, + Optional("victory_checks"): IntZeroToTen, }], }, } diff --git a/worlds/sc2/options.py b/worlds/sc2/options.py index ea700949c179..7580dc2536a5 100644 --- a/worlds/sc2/options.py +++ b/worlds/sc2/options.py @@ -892,7 +892,7 @@ class VictoryChecks(Range): """ display_name = "Victory Checks" range_start = 0 - range_end = 9 + range_end = 10 default = 0