From 13b2873972369c4287a46eea630510a61f4c341c Mon Sep 17 00:00:00 2001 From: bones Date: Mon, 9 Sep 2024 15:31:38 -0400 Subject: [PATCH] move frightful fleshwelder to misc upgrade --- worlds/sc2/item_names.py | 2 +- worlds/sc2/items.py | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/worlds/sc2/item_names.py b/worlds/sc2/item_names.py index 3e1fbbbf2a11..10d9f6db05cf 100644 --- a/worlds/sc2/item_names.py +++ b/worlds/sc2/item_names.py @@ -484,7 +484,6 @@ INFESTED_SIEGE_TANK_PROGRESSIVE_AUTOMATED_MITOSIS = "Progressive Automated Mitosis (Infested Siege Tank)" INFESTED_SIEGE_TANK_ACIDIC_ENZYMES = "Acidic Enzymes (Infested Siege Tank)" INFESTED_SIEGE_TANK_DEEP_TUNNEL = "Deep Tunnel (Infested Siege Tank)" -FRIGHTFUL_FLESHWELDER = "Frightful Fleshwelder (Zerg)" INFESTED_DIAMONDBACK_SATURATED_CULTURES = "Saturated Cultures (Infested Diamondback)" INFESTED_DIAMONDBACK_CAUSTIC_MUCUS = "Caustic Mucus (Infested Diamondback)" INFESTED_BANSHEE_BRACED_EXOSKELETON = "Braced Exoskeleton (Infested Banshee)" @@ -550,6 +549,7 @@ MALIGNANT_CREEP = "Malignant Creep (Zerg)" VESPENE_EFFICIENCY = "Vespene Efficiency (Zerg)" ZERG_CREEP_STOMACH = "Creep Stomach (Zerg)" +FRIGHTFUL_FLESHWELDER = "Frightful Fleshwelder (Zerg)" # Kerrigan Levels KERRIGAN_LEVELS_1 = "1 Kerrigan Level" diff --git a/worlds/sc2/items.py b/worlds/sc2/items.py index 9d1721047b5f..31cebbe154cc 100644 --- a/worlds/sc2/items.py +++ b/worlds/sc2/items.py @@ -1502,20 +1502,18 @@ def get_full_item_list(): ItemData(360 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 17, SC2Race.ZERG, parent_item=item_names.INFESTED_SIEGE_TANK, origin={"ext"}), item_names.INFESTED_SIEGE_TANK_DEEP_TUNNEL: ItemData(361 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 18, SC2Race.ZERG, parent_item=item_names.INFESTED_SIEGE_TANK, origin={"ext"}), - item_names.FRIGHTFUL_FLESHWELDER: - ItemData(362 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 19, SC2Race.ZERG, origin={"ext"}), item_names.INFESTED_DIAMONDBACK_SATURATED_CULTURES: - ItemData(363 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 20, SC2Race.ZERG, parent_item=item_names.INFESTED_DIAMONDBACK, origin={"ext"}), + ItemData(362 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 19, SC2Race.ZERG, parent_item=item_names.INFESTED_DIAMONDBACK, origin={"ext"}), item_names.INFESTED_DIAMONDBACK_CAUSTIC_MUCUS: - ItemData(364 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 21, SC2Race.ZERG, parent_item=item_names.INFESTED_DIAMONDBACK, origin={"ext"}), + ItemData(363 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 20, SC2Race.ZERG, parent_item=item_names.INFESTED_DIAMONDBACK, origin={"ext"}), item_names.INFESTED_BANSHEE_BRACED_EXOSKELETON: - ItemData(365 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 22, SC2Race.ZERG, parent_item=item_names.INFESTED_BANSHEE, origin={"ext"}), + ItemData(364 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 21, SC2Race.ZERG, parent_item=item_names.INFESTED_BANSHEE, origin={"ext"}), item_names.INFESTED_BANSHEE_RAPID_HIBERNATION: - ItemData(366 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 23, SC2Race.ZERG, parent_item=item_names.INFESTED_BANSHEE, origin={"ext"}), + ItemData(365 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 22, SC2Race.ZERG, parent_item=item_names.INFESTED_BANSHEE, origin={"ext"}), item_names.INFESTED_LIBERATOR_CLOUD_DISPERSAL: - ItemData(367 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 24, SC2Race.ZERG, parent_item=item_names.INFESTED_LIBERATOR, origin={"ext"}), + ItemData(366 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 23, SC2Race.ZERG, parent_item=item_names.INFESTED_LIBERATOR, origin={"ext"}), item_names.INFESTED_LIBERATOR_VIRAL_CONTAMINATION: - ItemData(368 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 25, SC2Race.ZERG, parent_item=item_names.INFESTED_LIBERATOR, origin={"ext"}), + ItemData(367 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 24, SC2Race.ZERG, parent_item=item_names.INFESTED_LIBERATOR, origin={"ext"}), item_names.KERRIGAN_KINETIC_BLAST: ItemData(400 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Ability, 0, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.progression), item_names.KERRIGAN_HEROIC_FORTITUDE: ItemData(401 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Ability, 1, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.progression), @@ -1569,6 +1567,7 @@ def get_full_item_list(): item_names.OVERLORD_GENERATE_CREEP: ItemData(701 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Evolution_Pit, 7, SC2Race.ZERG, origin={"ext"}), item_names.OVERLORD_ANTENNAE: ItemData(702 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Evolution_Pit, 8, SC2Race.ZERG, origin={"ext"}, classification=ItemClassification.filler), item_names.OVERLORD_PNEUMATIZED_CARAPACE: ItemData(703 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Evolution_Pit, 9, SC2Race.ZERG, origin={"ext"}), + item_names.FRIGHTFUL_FLESHWELDER: ItemData(704 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Evolution_Pit, 11, SC2Race.ZERG, origin={"ext"}), # Morphs item_names.MUTALISK_CORRUPTOR_GUARDIAN_ASPECT: ItemData(800 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Morph, 6, SC2Race.ZERG, origin={"bw"}),