Merge branch 'main' of https://github.com/Emerassi/CrystalProjectAPWorld

Author: FabulaFey

worlds/crystal_project/__init__.py

@@ -40,7 +40,7 @@ class CrystalProjectWeb(WebWorld):
 
 class CrystalProjectWorld(World):
     """Crystal Project is a mix of old school job based jRPG mixed with a ton of 3D platforming and exploration."""
-    apworld_version = "0.6.0"
+    apworld_version = "0.6.1"
     game = "Crystal Project"
     options_dataclass = CrystalProjectOptions
     options: CrystalProjectOptions
@@ -155,7 +155,7 @@ def create_regions(self) -> None:
                 all_passes_state.collect(self.create_item(region_pass), prevent_sweep=True)
             for region in self.get_regions():
                 if region.can_reach(all_passes_state) and region.name != MENU and region.name != MODDED_ZONE:
-                    if len(region.locations) > 2:
+                    if len(region.locations) > 3:
                         initially_reachable_regions.append(region)
             self.starter_region = self.random.choice(initially_reachable_regions).name
             # logging.getLogger().info("Starting region is " + self.starter_region)

worlds/crystal_project/home_points.py

@@ -79,13 +79,13 @@ def get_home_points(player: Optional[int], options: Optional[CrystalProjectOptio
         LocationData(ANCIENT_RESERVOIR, "Ancient Reservoir Entrance", 1124),
         LocationData(ANCIENT_RESERVOIR, "Main Reservoir Chamber", 1660),
 
-        LocationData(SHOUDU_PROVINCE, "Shoudu Fields", 576, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(GANYMEDE_SHRINE, player) or state.can_reach(QUINTAR_RESERVE, player)),
-        LocationData(SHOUDU_PROVINCE, "Shoudu Market", 577, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(GANYMEDE_SHRINE, player) or state.can_reach(QUINTAR_RESERVE, player)),
+        LocationData(SHOUDU_PROVINCE, "Shoudu Fields", 576, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(GANYMEDE_SHRINE, player=player) or state.can_reach(QUINTAR_RESERVE, player=player)),
+        LocationData(SHOUDU_PROVINCE, "Shoudu Market", 577, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(GANYMEDE_SHRINE, player=player) or state.can_reach(QUINTAR_RESERVE, player=player)),
         LocationData(SHOUDU_PROVINCE, "Shoudu Port", 672),
-        LocationData(SHOUDU_PROVINCE, "Shanty Inn", 1523, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(GANYMEDE_SHRINE, player) or state.can_reach(QUINTAR_RESERVE, player)),
-        LocationData(SHOUDU_PROVINCE, "Sky Arena", 1524, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(QUINTAR_RESERVE, player)),
-        LocationData(SHOUDU_PROVINCE, "Prize Counter", 2731, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(GANYMEDE_SHRINE, player) or state.can_reach(QUINTAR_RESERVE, player)),
-        LocationData(SHOUDU_PROVINCE, "Shoudu Elevator", 3523, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(GANYMEDE_SHRINE, player) or state.can_reach(QUINTAR_RESERVE, player)),
+        LocationData(SHOUDU_PROVINCE, "Shanty Inn", 1523, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(GANYMEDE_SHRINE, player=player) or state.can_reach(QUINTAR_RESERVE, player=player)),
+        LocationData(SHOUDU_PROVINCE, "Sky Arena", 1524, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(QUINTAR_RESERVE, player=player)),
+        LocationData(SHOUDU_PROVINCE, "Prize Counter", 2731, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(GANYMEDE_SHRINE, player=player) or state.can_reach(QUINTAR_RESERVE, player=player)),
+        LocationData(SHOUDU_PROVINCE, "Shoudu Elevator", 3523, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(GANYMEDE_SHRINE, player=player) or state.can_reach(QUINTAR_RESERVE, player=player)),
 
         LocationData(GANYMEDE_SHRINE, "Ganymede Shrine", 1573),
 

worlds/crystal_project/locations.py

@@ -1312,7 +1312,7 @@ def get_bosses(player: int, options: CrystalProjectOptions) -> List[LocationData
         LocationData(CAPITAL_SEQUOIA, "Capital Sequoia Boss - Niltsi Summon", 1109 + boss_index_offset, lambda state: state.has(SUMMONER_JOB, player) and logic.is_area_in_level_range(state, 54)), #376, 178, -345 (Capital Sequoia (Maze) map) Monster ID: 93
         LocationData(SALMON_BAY, "Salmon Bay Boss - Guaba Summon", 1138 + boss_index_offset, lambda state: state.has(SUMMONER_JOB, player) and logic.is_area_in_level_range(state, 58)), #-50, 91, -330 Monster ID: 94
         LocationData(THE_UNDERCITY, "Underpass Boss - Pah Summon", 1130 + boss_index_offset, lambda state: state.has(SUMMONER_JOB, player) and (logic.has_swimming(state) or logic.has_glide(state)) and logic.is_area_in_level_range(state, 58)), #614, 91, -213 Monster ID: 97
-        LocationData(SHOUDU_PROVINCE, "Shoudu Province Boss - Tira Summon", 1132 + boss_index_offset, lambda state: state.has(SUMMONER_JOB, player) and (logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(QUINTAR_RESERVE, player) or state.can_reach(GANYMEDE_SHRINE, player)) and logic.is_area_in_level_range(state, 57)), #(720, 138, -278) Monster ID: 98
+        LocationData(SHOUDU_PROVINCE, "Shoudu Province Boss - Tira Summon", 1132 + boss_index_offset, lambda state: state.has(SUMMONER_JOB, player) and (logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(QUINTAR_RESERVE, player=player) or state.can_reach(GANYMEDE_SHRINE, player=player)) and logic.is_area_in_level_range(state, 57)), #(720, 138, -278) Monster ID: 98
         LocationData(LAKE_DELENDE, "Lake Delende Boss - Ioske Summon", 1111 + boss_index_offset, lambda state: state.has(SUMMONER_JOB, player) and logic.is_area_in_level_range(state, 57)), #97, 126, -211 Monster ID: 92
         LocationData(TALL_TALL_HEIGHTS, "Tall, Tall Heights Boss - Pamoa Summon", 1136 + boss_index_offset, lambda state: state.has(SUMMONER_JOB, player) and logic.has_vertical_movement(state) and logic.has_glide(state) and logic.is_area_in_level_range(state, 53)), #498, 218, -412 Monster ID: 91
         LocationData(JIDAMBA_TANGLE, "Jidamba Tangle Boss - Juses Summon", 1134 + boss_index_offset, lambda state: state.has(SUMMONER_JOB, player) and (logic.has_swimming(state) or logic.has_glide(state)) and logic.is_area_in_level_range(state, 58)), #(672, 124, 106) Monster ID: 99

worlds/crystal_project/test/test_highest_item_to_location_ratio.py

@@ -0,0 +1,23 @@
+from .bases import CrystalProjectTestBase
+
+class TestStuffingTheMostItemsIntoBeginnerRegions(CrystalProjectTestBase):
+    options = {
+        "goal": 2, #clamshells
+        "clamshellGoalQuantity": 99,
+        "extraClamshellsInPool": 99,
+        "includedRegions": 0, #beginner
+        "jobRando": 2, #full
+        "startingJobQuantity": 1,
+        "killBossesMode": 0,
+        "shopsanity": 0,
+        "regionsanity": 1,
+        "progressiveLevelSize": 3,
+        "maxLevel": 99,
+        "keyMode": 2, #vanilla
+        "startWithTreasureFinder": 0,
+        "startWithMaps": 1,
+        "includeSummonAbilities": 1,
+        "includeScholarAbilities": 1
+    }
+    #Todo: turn off start with maps in the future once we get enough item massaging for that to not break unit tests
+    run_default_tests = True