Merge pull request ArchipelagoMW#14 from hopop201/sc2hots

"Fixing" Kerrigan levels
Magnemania · Mar 31, 2023 · 2c52b43 · 2c52b43
2 parents 37ad1a4 + 25105e4
commit 2c52b43
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/worlds/sc2hots/Items.py b/worlds/sc2hots/Items.py
@@ -184,7 +184,7 @@ def get_full_item_list():
     "3 Kerrigan Levels": ItemData(507 + SC2HOTS_ITEM_ID_OFFSET, "Level", 3, quantity=0, classification=ItemClassification.filler),
     "2 Kerrigan Levels": ItemData(508 + SC2HOTS_ITEM_ID_OFFSET, "Level", 2, quantity=0, classification=ItemClassification.filler),
     "1 Kerrigan Level": ItemData(509 + SC2HOTS_ITEM_ID_OFFSET, "Level", 1, quantity=0, classification=ItemClassification.filler),
-    "15 Kerrigan Levels": ItemData(510 + SC2HOTS_ITEM_ID_OFFSET, "Level", 15, quantity=0),
+    "14 Kerrigan Levels": ItemData(510 + SC2HOTS_ITEM_ID_OFFSET, "Level", 14, quantity=0),
     "35 Kerrigan Levels": ItemData(511 + SC2HOTS_ITEM_ID_OFFSET, "Level", 35, quantity=0),
     "70 Kerrigan Levels": ItemData(512 + SC2HOTS_ITEM_ID_OFFSET, "Level", 70, quantity=0),
     # "War Pigs": ItemData(500 + SC2HOTS_ITEM_ID_OFFSET, "Mercenary", 0, classification=ItemClassification.progression),

diff --git a/worlds/sc2hots/Options.py b/worlds/sc2hots/Options.py
@@ -161,7 +161,7 @@ class KerriganLevelDistribution(Choice):
     intended to fit more levels into settings with little room for filler while keeping some variance in level gains.
     1x70:  Uses 1 items worth 70 levels.
     2x35:  Uses 2 items worth 35 levels each.
-    5x15:  Uses 5 items worth 15 levels each.
+    5x14:  Uses 5 items worth 14 levels each.
     7x10:  Uses 7 items worth 10 levels each.
     10x7:  Uses 10 items worth 7 levels each.
     14x5:  Uses 14 items worth 5 levels each.
@@ -173,7 +173,7 @@ class KerriganLevelDistribution(Choice):
     option_smooth = 1
     option_1x70 = 2
     option_2x35 = 3
-    option_5x15 = 4
+    option_5x14 = 4
     option_7x10 = 5
     option_10x7 = 6
     option_14x5 = 7

diff --git a/worlds/sc2hots/__init__.py b/worlds/sc2hots/__init__.py
@@ -281,9 +281,9 @@ def fill_pool_with_kerrigan_levels(multiworld: MultiWorld, player: int, item_poo
     elif option == 3: # 2x35
         item_pool.append(create_item_with_correct_settings(player, "35 Kerrigan Levels"))
         item_pool.append(create_item_with_correct_settings(player, "35 Kerrigan Levels"))
-    elif option == 4: # 5x15
+    elif option == 4: # 5x14
         for _ in range(5):
-            item_pool.append(create_item_with_correct_settings(player, "15 Kerrigan Levels"))
+            item_pool.append(create_item_with_correct_settings(player, "14 Kerrigan Levels"))
     elif option == 5: # 7x10
         distribution = [0, 0, 0, 0, 0, 0, 0, 0, 0, 7]
     elif option == 6: # 10x7
@@ -300,4 +300,4 @@ def fill_pool_with_kerrigan_levels(multiworld: MultiWorld, player: int, item_poo
         if tier > 0:
             name += "s"
         for _ in range(distribution[tier]):
-            item_pool.append(create_item_with_correct_settings(player, name))
+            item_pool.append(create_item_with_correct_settings(player, name))