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

Author: dragonsbutalsorabbits

worlds/crystal_project/__init__.py

@@ -442,6 +442,10 @@ def get_total_progressive_levels(self, max_progressive_levels: int) -> int:
         progressive_levels = -(level_up_amount // -self.options.progressive_level_size.value)
         return progressive_levels
 
+    @staticmethod
+    def get_total_passive_point_cap_items(max_passive_point_cap: int, starting_passive_point_cap: int, cap_increase: int) -> int:
+        return round((max_passive_point_cap - starting_passive_point_cap) / cap_increase)
+
     #making randomized scholar ability pool
     def get_optional_scholar_abilities(self, count: int):
         return self.random.sample(optional_scholar_abilities, count)
@@ -621,6 +625,13 @@ def get_item_pool(self, excluded_items: Set[str]) -> List[Item]:
             if item not in pool:
                 pool.append(item)
 
+        if self.options.maximum_passive_points > self.options.starting_passive_points:
+            passive_points_to_add_to_pool = self.get_total_passive_point_cap_items(self.options.maximum_passive_points.value, self.options.starting_passive_points.value, self.options.passive_point_cap_increase_size.value)
+            if passive_points_to_add_to_pool > 0:
+                for _ in range(passive_points_to_add_to_pool):
+                    item = self.set_classifications(PASSIVE_POINT_CAP)
+                    pool.append(item)
+
         if self.options.use_mods:
             combined_locations: List[ModLocationData] = self.modded_locations
             combined_locations.extend(self.modded_shops)
@@ -762,4 +773,7 @@ def fill_slot_data(self) -> Dict[str, Any]:
             "prefillMap": bool(self.options.fill_full_map.value),
             "disableSparks": bool(self.options.disable_sparks.value),
             "homePointHustle": self.options.home_point_hustle.value,
+            "maximumPassivePoints": self.options.maximum_passive_points.value,
+            "startingPassivePoints": self.options.starting_passive_points.value,
+            "passivePointCapIncreaseSize": self.options.passive_point_cap_increase_size.value,
         }

worlds/crystal_project/constants/key_items.py

@@ -22,6 +22,7 @@
 ANCIENT_TABLET_C = "Item - Ancient Tablet C"
 TREASURE_FINDER = "Item - Treasure Finder"
 PROGRESSIVE_LEVEL = "Item - Progressive Level"
+PASSIVE_POINT_CAP = "Item - Passive Point Cap"
 SPECIAL_SHOUDU_STEW = "Item - Special Shoudu Stew"
 SPECIAL_MILK = "Item - Special Milk"
 SPECIAL_FRESH_SALMON = "Item - Special Fresh Salmon"

worlds/crystal_project/items.py

@@ -192,6 +192,7 @@ class Job(NamedTuple):
     TREASURE_FINDER: ItemData(ITEM, 196 + item_index_offset, ItemClassification.useful),
     # Progressive Level is used for all level gating options: Progressive Level Pass, Progressive Level Cap, and Progressive Level Catch-Up
     PROGRESSIVE_LEVEL: ItemData(ITEM, 500 + item_index_offset, ItemClassification.progression, 0),
+    PASSIVE_POINT_CAP: ItemData(ITEM, 799 + item_index_offset, ItemClassification.useful, 0),
     HOMEPOINT_UNLOCK: ItemData(ITEM, 800 + item_index_offset, ItemClassification.filler, 0),
     SPECIAL_SHOUDU_STEW: ItemData(ITEM, 229 + item_index_offset, ItemClassification.progression, 0, 1),
     SPECIAL_MILK: ItemData(ITEM, 230 + item_index_offset, ItemClassification.progression, 0, 1),

worlds/crystal_project/options.py

@@ -284,7 +284,6 @@ class LevelComparedToEnemies(Range):
     range_end = 10
     default = 0
 
-
 class ProgressiveLevelSize(Range):
     """
     If Level Gating is on, Progressive Levels will be added to the item pool. This sets the number of levels that an individual Progressive Level will grant.
@@ -305,6 +304,38 @@ class MaxLevel(Range):
     range_end = 99
     default = 60
 
+class MaximumPassivePoints(Range):
+    """
+    This controls the maximum number of passive points each party member will have
+    Default is the vanilla value of 10
+    If your starting Passive points are less than your maximum, checks will be added to the pool that increase the maximum when found.
+    """
+    display_name = "Max Passive Points"
+    range_start = 0
+    range_end = 50
+    default = 10
+
+class StartingPassivePoints(Range):
+    """
+    This controls the number of passive points each party member will have at the start of the seed
+    Default is the vanilla value of 10
+    If your starting Passive points are less than your maximum, checks will be added to the pool that increase the maximum when found.
+    """
+    display_name = "Starting Passive Points"
+    range_start = 0
+    range_end = 50
+    default = 10
+
+class PassivePointCapIncreaseSize(Range):
+    """
+    If your Maximum Passive Points is greate than your starting passive points
+    this controls how many additional passive points each check will give you
+    """
+    display_name = "Passive Point Cap Increase Size"
+    range_start = 1
+    range_end = 10
+    default = 2
+
 class KeyMode(Choice):
     """
     Skeleton Key: Only the Skeleton Key, which can open any locked door, will be in your item pool.
@@ -505,6 +536,9 @@ class CrystalProjectOptions(PerGameCommonOptions):
     level_compared_to_enemies: LevelComparedToEnemies
     progressive_level_size: ProgressiveLevelSize
     max_level: MaxLevel
+    starting_passive_points: StartingPassivePoints
+    maximum_passive_points: MaximumPassivePoints
+    passive_point_cap_increase_size: PassivePointCapIncreaseSize
     key_mode: KeyMode
     obscure_routes: ObscureRoutes
     hop_to_it: HopToIt
@@ -526,7 +560,7 @@ class CrystalProjectOptions(PerGameCommonOptions):
 crystal_project_option_groups: Dict[str, List[Any]] = {
     "Goal Options": [Goal, ClamshellGoalQuantity, ExtraClamshellsInPool, AstleyJobQuantity],
     "Location Options": [IncludedRegions, JobRando, StartingJobQuantity, DisableSparks, KillBossesMode, Shopsanity, Regionsanity, RegionsanityStarterRegionMinLevel, RegionsanityStarterRegionMaxLevel, HomePointHustle],
-    "Progression Options": [ProgressiveMountMode, StartingLevel, LevelGating, LevelComparedToEnemies, ProgressiveLevelSize, MaxLevel, KeyMode, ObscureRoutes, HopToIt, PrioritizeCrystals, AutoSpendLP, AutoEquipPassives, EasyLeveling],
+    "Progression Options": [ProgressiveMountMode, StartingLevel, LevelGating, LevelComparedToEnemies, ProgressiveLevelSize, MaxLevel, StartingPassivePoints, MaximumPassivePoints, PassivePointCapIncreaseSize, KeyMode, ObscureRoutes, HopToIt, PrioritizeCrystals, AutoSpendLP, AutoEquipPassives, EasyLeveling],
     "Item Pool Options": [ProgressiveEquipmentMode, StartWithTreasureFinder, StartWithMaps, FillFullMap, IncludeSummonAbilities, IncludeScholarAbilities],
     "Bonus Fun": [ItemInfoMode, RandomizeMusic, UseMods]
 }