Merge pull request ArchipelagoMW#10 from dewiniaid/hk-costsanity

Hk costsanity updates and bugfixes

Author: dewiniaid

worlds/hk/Options.py

@@ -426,11 +426,21 @@ class StartingGeo(Range):
     default = 0
 
 
-class CostSanity(Toggle):
+class CostSanity(Choice):
     """If enabled, most locations with costs (like stag stations) will have randomly determined costs.
+    If set to shopsonly, CostSanity will only apply to shops (including Grubfather, Seer and Egg Shop).
+    If set to notshops, CostSanity will only apply to non-shops (e.g. Stag stations and Cornifer locations)
 
     These costs can be in Geo (except Grubfather, Seer and Eggshop), Grubs, Charms, Essence and/or Rancid Eggs
     """
+    option_off = 0
+    alias_false = 0
+    alias_no = 0
+    option_on = 1
+    alias_true = 1
+    alias_yes = 1
+    option_shopsonly = 2
+    option_notshops = 3
     display_name = "Cost Sanity"
 
 
@@ -446,7 +456,7 @@ class CostSanityHybridChance(Range):
     extra_data = {
         "__module__": __name__, "range_end": 1000,
         "__doc__": (
-            "The likelihood of Costsanity choosing a {cost.option} cost."
+            f"The likelihood of Costsanity choosing a {cost.option} cost."
             " Chosen as a sum of all weights from other types."
         ),
         "default": cost.weight

worlds/hk/__init__.py

@@ -11,7 +11,7 @@
 from .Items import item_table, lookup_type_to_names, item_name_groups
 from .Regions import create_regions
 from .Rules import set_rules, cost_terms
-from .Options import hollow_knight_options, hollow_knight_randomize_options, Goal, WhitePalace, \
+from .Options import hollow_knight_options, hollow_knight_randomize_options, Goal, WhitePalace, CostSanity, \
     shop_to_option
 from .ExtractedData import locations, starts, multi_locations, location_to_region_lookup, \
     event_names, item_effects, connectors, one_ways, vanilla_shop_costs, vanilla_location_costs
@@ -339,7 +339,8 @@ def sort_shops_by_cost(self):
                 loc.costs = costs
 
     def apply_costsanity(self):
-        if not self.world.CostSanity[self.player].value:
+        setting = self.world.CostSanity[self.player].value
+        if not setting:
             return  # noop
 
         def _compute_weights(weights: dict, desc: str) -> typing.Dict[str, int]:
@@ -382,7 +383,10 @@ def _compute_weights(weights: dict, desc: str) -> typing.Dict[str, int]:
                     continue
                 if location.name == "Vessel_Fragment-Basin":
                     continue
-
+                if setting == CostSanity.option_notshops and location.basename in multi_locations:
+                    continue
+                if setting == CostSanity.option_shopsonly and location.basename not in multi_locations:
+                    continue
                 if location.basename in {'Grubfather', 'Seer', 'Eggshop'}:
                     our_weights = dict(weights_geoless)
                 else: