renamed Passive Point Cap Increase item to Passive Point Boost and did an edit pass on the Passive Points player options

Author: dragonsbutalsorabbits

worlds/crystal_project/__init__.py

@@ -454,7 +454,7 @@ def get_total_progressive_levels(self, max_progressive_levels: int) -> int:
         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:
+    def get_total_passive_point_boosts(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
@@ -637,10 +637,10 @@ def get_item_pool(self, excluded_items: Set[str]) -> List[Item]:
                 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)
+            passive_point_boosts_to_add_to_pool = self.get_total_passive_point_boosts(self.options.maximum_passive_points.value, self.options.starting_passive_points.value, self.options.passive_point_boost_size.value)
+            if passive_point_boosts_to_add_to_pool > 0:
+                for _ in range(passive_point_boosts_to_add_to_pool):
+                    item = self.set_classifications(PASSIVE_POINT_BOOST)
                     pool.append(item)
 
         if self.options.use_mods:
@@ -786,5 +786,5 @@ def fill_slot_data(self) -> Dict[str, Any]:
             "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,
+            "passivePointBoostSize": self.options.passive_point_boost_size.value,
         }

worlds/crystal_project/constants/key_items.py

@@ -22,7 +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"
+PASSIVE_POINT_BOOST = "Item - Passive Point Boost"
 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,7 +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),
+    PASSIVE_POINT_BOOST: 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

@@ -304,34 +304,31 @@ class MaxLevel(Range):
     range_end = 99
     default = 60
 
-class MaximumPassivePoints(Range):
+class StartingPassivePoints(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.
+    The number of Passive Points each party member starts with. Default is the vanilla value of 10.
     """
-    display_name = "Max Passive Points"
+    display_name = "Starting Passive Points"
     range_start = 0
     range_end = 50
     default = 10
 
-class StartingPassivePoints(Range):
+class MaximumPassivePoints(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.
+    The maximum number of Passive Points each party member can have. Default is the vanilla value of 10.
+
+    If you set your Maximum Passive Points higher than your Starting Passive Points, Passive Point Boosts will be added to the item pool that increase your party's available Passive Points when found.
     """
-    display_name = "Starting Passive Points"
+    display_name = "Maximum Passive Points"
     range_start = 0
     range_end = 50
     default = 10
 
-class PassivePointCapIncreaseSize(Range):
+class PassivePointBoostSize(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
+    This sets the number of Passive Points you gain per Passive Point Boost.
     """
-    display_name = "Passive Point Cap Increase Size"
+    display_name = "Passive Point Boost Size"
     range_start = 1
     range_end = 10
     default = 2
@@ -550,7 +547,7 @@ class CrystalProjectOptions(PerGameCommonOptions):
     max_level: MaxLevel
     starting_passive_points: StartingPassivePoints
     maximum_passive_points: MaximumPassivePoints
-    passive_point_cap_increase_size: PassivePointCapIncreaseSize
+    passive_point_boost_size: PassivePointBoostSize
     key_mode: KeyMode
     obscure_routes: ObscureRoutes
     hop_to_it: HopToIt
@@ -572,7 +569,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, StartingPassivePoints, MaximumPassivePoints, PassivePointCapIncreaseSize, KeyMode, ObscureRoutes, HopToIt, PrioritizeCrystals, AutoSpendLP, AutoEquipPassives, EasyLeveling],
+    "Progression Options": [ProgressiveMountMode, StartingLevel, LevelGating, LevelComparedToEnemies, ProgressiveLevelSize, MaxLevel, StartingPassivePoints, MaximumPassivePoints, PassivePointBoostSize, KeyMode, ObscureRoutes, HopToIt, PrioritizeCrystals, AutoSpendLP, AutoEquipPassives, EasyLeveling],
     "Item Pool Options": [ProgressiveEquipmentMode, StartWithTreasureFinder, StartWithMaps, FillFullMap, IncludeSummonAbilities, IncludeScholarAbilities],
     "Bonus Fun": [ItemInfoMode, RandomizeMusic, UseMods]
 }