Merge remote-tracking branch 'origin/main'

CookieCat45 · Mar 25, 2024 · 67e8f62 · 67e8f62
2 parents 2e14859 + b00eb53
commit 67e8f62
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/worlds/ahit/Locations.py b/worlds/ahit/Locations.py
@@ -114,7 +114,7 @@ def get_location_names() -> Dict[str, int]:
 ahit_locations = {
     "Spaceship - Rumbi Abuse": LocData(2000301000, "Spaceship", hit_type=HitType.umbrella_or_brewing),
 
-    # 300000 range - Mafia Town/Batle of the Birds
+    # 300000 range - Mafia Town/Battle of the Birds
     "Welcome to Mafia Town - Umbrella": LocData(2000301002, "Welcome to Mafia Town"),
     "Mafia Town - Old Man (Seaside Spaghetti)": LocData(2000303833, "Mafia Town Area"),
     "Mafia Town - Old Man (Steel Beams)": LocData(2000303832, "Mafia Town Area"),

diff --git a/worlds/ahit/Options.py b/worlds/ahit/Options.py
@@ -516,7 +516,7 @@ class DWShuffleCountMax(Range):
 
 
 class DWEnableBonus(Toggle):
-    """In Death Wish, allow the full completion of contracts to reward items.
+    """In Death Wish, add a location for completing all of a DW contract's bonuses, in addition to the location for completing the DW contract normally.
     WARNING!! Only for the brave! This option can create VERY DIFFICULT SEEDS!
     ONLY turn this on if you know what you are doing to yourself and everyone else in the multiworld!
     Using Peace and Tranquility to auto-complete the bonuses will NOT count!"""

diff --git a/worlds/ahit/Rules.py b/worlds/ahit/Rules.py
@@ -413,7 +413,7 @@ def set_specific_rules(world: "HatInTimeWorld"):
     if difficulty >= Difficulty.HARD:
         set_hard_rules(world)
 
-    if difficulty >= 2:
+    if difficulty >= Difficulty.EXPERT:
         set_expert_rules(world)