remove unnecessary property

worlds/civ_6/Container.py

@@ -157,7 +157,7 @@ def generate_setup_file(world) -> str:
     Generates the Lua for the setup file. This sets initial variables and state that affect gameplay around Progressive Eras
     """
     setup = "-- Setup"
-    if world.options.progression_style.current_key == "eras_and_districts":
+    if world.options.progression_style == "eras_and_districts":
         setup += f"""
     -- Init Progressive Era Value if it hasn't been set already
     if Game.GetProperty("MaxAllowedEra") == nil then

worlds/civ_6/Enum.py

@@ -16,4 +16,4 @@ class CivVICheckType(Enum):
     PROGRESSIVE_DISTRICT = "PROGRESSIVE_DISTRICT"
     ERA = "ERA"
     GOODY = "GOODY"
-    BOOST = "BOOST"
+    BOOST = "BOOST"

worlds/civ_6/Regions.py

@@ -104,8 +104,8 @@ def create_regions(world: 'CivVIWorld', options: CivVIOptions, player: int):
     menu = Region("Menu", player, world.multiworld)
     world.multiworld.regions.append(menu)
 
-    has_progressive_items = options.progression_style.current_key != "none"
-    has_progressive_eras = options.progression_style.current_key == "eras_and_districts"
+    has_progressive_items = options.progression_style != "none"
+    has_progressive_eras = options.progression_style == "eras_and_districts"
     has_goody_huts = options.shuffle_goody_hut_rewards
     has_boosts = options.boostsanity
 

worlds/civ_6/Rules.py

@@ -28,7 +28,7 @@ def create_boost_rules(world: 'CivVIWorld'):
         if not boost_data or boost_data.PrereqRequiredCount == 0:
             continue
 
-        has_progressive_items = world.options.progression_style.current_key != "none"
+        has_progressive_items = world.options.progression_style != "none"
         set_rule(world_location,
                  generate_has_required_items_lambda(boost_data.Prereq, boost_data.PrereqRequiredCount, has_progressive_items, world.player)
                  )

worlds/civ_6/__init__.py

@@ -133,12 +133,12 @@ class CivVIWorld(World):
             boost_data = get_boosts_data()
             num_filler_items += len(boost_data)
 
-        filler_count = {rarity: FILLER_DISTRIBUTION[rarity] * num_filler_items for rarity in FillerItemRarity.__reversed__()}
+        filler_count = {rarity: math.ceil(FILLER_DISTRIBUTION[rarity] * num_filler_items) for rarity in FillerItemRarity.__reversed__()}
         min_count = 1
         # Add filler items by rarity
         total_created = 0
         for rarity, count in filler_count.items():
-            for _ in range(max(min_count, math.ceil(count))):
+            for _ in range(max(min_count, count)):
                 if total_created >= num_filler_items:
                     break
                 self.multiworld.itempool += [self.create_item(