From d89c2e0ba664bec0d90a8996d978e5366caedd84 Mon Sep 17 00:00:00 2001 From: SirChuckOfTheChuckles Date: Fri, 9 Aug 2024 01:18:22 -0400 Subject: [PATCH 1/4] Item information for Disruptors --- worlds/sc2/item_descriptions.py | 4 ++++ worlds/sc2/item_names.py | 4 ++++ worlds/sc2/items.py | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/worlds/sc2/item_descriptions.py b/worlds/sc2/item_descriptions.py index 4bdb86b42c39..6a4b5c2a901b 100644 --- a/worlds/sc2/item_descriptions.py +++ b/worlds/sc2/item_descriptions.py @@ -841,6 +841,10 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description: item_names.IMMORTAL_ANNIHILATOR_STALWART_SINGULARITY_CHARGE: "Increases Immortal, Annihilator, and Stalwart attack range by +2.", item_names.IMMORTAL_ANNIHILATOR_STALWART_ADVANCED_TARGETING_MECHANICS: "Immortals, Annihilators, and Stalwarts can attack air units.", item_names.IMMORTAL_ANNIHILATOR_STALWART_DISRUPTOR_DISPERSION: "Immortals, Annihilators, and Stalwarts deal minor splash damage.", + item_names.DISRUPTOR_CLOAKING_MODULE: "Disruptors are permanently cloaked.", + item_names.DISRUPTOR_RESTRUCTURED_THRUSTERS: "Allows the Disruptor to move while casting Purification Nova. Also allows the Disruptor to Blink.", + item_names.DISRUPTOR_PERFECTED_POWER: "Allows Purification Nova to hit air units. Bonus damage to shields is now baseline.", + item_names.DISRUPTOR_RESTRAINED_DESTRUCTION: "Purification Nova does 50% reduced damage to friendly units and structures.", item_names.COLOSSUS_PACIFICATION_PROTOCOL: "Increases Colossus attack speed.", item_names.WRATHWALKER_RAPID_POWER_CYCLING: "Reduces the charging time and increases attack speed of the Wrathwalker's Charged Blast.", item_names.WRATHWALKER_EYE_OF_WRATH: "Increases Wrathwalker weapon range by +1.", diff --git a/worlds/sc2/item_names.py b/worlds/sc2/item_names.py index 198f508d17ba..a5c2a9c4aeea 100644 --- a/worlds/sc2/item_names.py +++ b/worlds/sc2/item_names.py @@ -670,6 +670,10 @@ IMMORTAL_ANNIHILATOR_STALWART_SINGULARITY_CHARGE = "Singularity Charge (Immortal/Annihilator/Stalwart)" IMMORTAL_ANNIHILATOR_STALWART_ADVANCED_TARGETING_MECHANICS = "Advanced Targeting Mechanics (Immortal/Annihilator/Stalwart)" IMMORTAL_ANNIHILATOR_STALWART_DISRUPTOR_DISPERSION = "Disruptor Dispersion (Immortal/Annihilator/Stalwart)" +DISRUPTOR_CLOAKING_MODULE = "Cloaking Module (Disruptor)" +DISRUPTOR_RESTRUCTURED_THRUSTERS = "Restructured Thrusters (Disruptor)" +DISRUPTOR_PERFECTED_POWER = "Perfected Power (Disruptor)" +DISRUPTOR_RESTRAINED_DESTRUCTION = "Restrained Destruction (Disruptor)" COLOSSUS_PACIFICATION_PROTOCOL = "Pacification Protocol (Colossus)" WRATHWALKER_RAPID_POWER_CYCLING = "Rapid Power Cycling (Wrathwalker)" WRATHWALKER_EYE_OF_WRATH = "Eye of Wrath (Wrathwalker)" diff --git a/worlds/sc2/items.py b/worlds/sc2/items.py index 3cb5b5cbc9d0..e869863fb254 100644 --- a/worlds/sc2/items.py +++ b/worlds/sc2/items.py @@ -1760,6 +1760,11 @@ def get_full_item_list(): item_names.ORACLE_BOSONIC_CORE: ItemData(378 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 18, SC2Race.PROTOSS, origin={"ext"}, parent_item=item_names.ORACLE), item_names.SCOUT_RESOURCE_EFFICIENCY: ItemData(379 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 19, SC2Race.PROTOSS, origin={"ext"}, parent_item=item_names.SCOUT), item_names.IMMORTAL_ANNIHILATOR_STALWART_DISRUPTOR_DISPERSION: ItemData(380 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 20, SC2Race.PROTOSS, origin={"ext"}), + item_names.DISRUPTOR_CLOAKING_MODULE: ItemData(381 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 21, SC2Race.PROTOSS, origin={"ext"}), + item_names.DISRUPTOR_RESTRUCTURED_THRUSTERS: ItemData(382 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 22, SC2Race.PROTOSS, origin={"ext"}), + item_names.DISRUPTOR_PERFECTED_POWER: ItemData(383 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 23, SC2Race.PROTOSS, origin={"ext"}), + item_names.DISRUPTOR_RESTRAINED_DESTRUCTION: ItemData(384 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 24, SC2Race.PROTOSS, origin={"ext"}), + # War Council item_names.ZEALOT_WHIRLWIND: ItemData(500 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 0, SC2Race.PROTOSS, parent_item=item_names.ZEALOT), From 0b6fc566db4005f79f5e371f6fce42ff649ce9f6 Mon Sep 17 00:00:00 2001 From: SirChuckOfTheChuckles Date: Fri, 9 Aug 2024 14:19:16 -0400 Subject: [PATCH 2/4] Forgot to make some items filler --- worlds/sc2/items.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worlds/sc2/items.py b/worlds/sc2/items.py index e869863fb254..1030cafeab24 100644 --- a/worlds/sc2/items.py +++ b/worlds/sc2/items.py @@ -1760,10 +1760,10 @@ def get_full_item_list(): item_names.ORACLE_BOSONIC_CORE: ItemData(378 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 18, SC2Race.PROTOSS, origin={"ext"}, parent_item=item_names.ORACLE), item_names.SCOUT_RESOURCE_EFFICIENCY: ItemData(379 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 19, SC2Race.PROTOSS, origin={"ext"}, parent_item=item_names.SCOUT), item_names.IMMORTAL_ANNIHILATOR_STALWART_DISRUPTOR_DISPERSION: ItemData(380 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 20, SC2Race.PROTOSS, origin={"ext"}), - item_names.DISRUPTOR_CLOAKING_MODULE: ItemData(381 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 21, SC2Race.PROTOSS, origin={"ext"}), + item_names.DISRUPTOR_CLOAKING_MODULE: ItemData(381 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 21, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"ext"}), item_names.DISRUPTOR_RESTRUCTURED_THRUSTERS: ItemData(382 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 22, SC2Race.PROTOSS, origin={"ext"}), item_names.DISRUPTOR_PERFECTED_POWER: ItemData(383 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 23, SC2Race.PROTOSS, origin={"ext"}), - item_names.DISRUPTOR_RESTRAINED_DESTRUCTION: ItemData(384 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 24, SC2Race.PROTOSS, origin={"ext"}), + item_names.DISRUPTOR_RESTRAINED_DESTRUCTION: ItemData(384 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 24, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"ext"}), # War Council From b3237f6961ccdeae47a6a6b7db6c47f5857d8eb2 Mon Sep 17 00:00:00 2001 From: SirChuckOfTheChuckles Date: Fri, 9 Aug 2024 15:30:01 -0400 Subject: [PATCH 3/4] Disruptor War council --- worlds/sc2/item_descriptions.py | 3 +-- worlds/sc2/item_names.py | 3 +-- worlds/sc2/items.py | 7 +++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/worlds/sc2/item_descriptions.py b/worlds/sc2/item_descriptions.py index 6a4b5c2a901b..c1191feb4c25 100644 --- a/worlds/sc2/item_descriptions.py +++ b/worlds/sc2/item_descriptions.py @@ -842,7 +842,6 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description: item_names.IMMORTAL_ANNIHILATOR_STALWART_ADVANCED_TARGETING_MECHANICS: "Immortals, Annihilators, and Stalwarts can attack air units.", item_names.IMMORTAL_ANNIHILATOR_STALWART_DISRUPTOR_DISPERSION: "Immortals, Annihilators, and Stalwarts deal minor splash damage.", item_names.DISRUPTOR_CLOAKING_MODULE: "Disruptors are permanently cloaked.", - item_names.DISRUPTOR_RESTRUCTURED_THRUSTERS: "Allows the Disruptor to move while casting Purification Nova. Also allows the Disruptor to Blink.", item_names.DISRUPTOR_PERFECTED_POWER: "Allows Purification Nova to hit air units. Bonus damage to shields is now baseline.", item_names.DISRUPTOR_RESTRAINED_DESTRUCTION: "Purification Nova does 50% reduced damage to friendly units and structures.", item_names.COLOSSUS_PACIFICATION_PROTOCOL: "Increases Colossus attack speed.", @@ -900,7 +899,7 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description: # Colossus item_names.WRATHWALKER_AERIAL_TRACKING: "Wrathwalker War Council upgrade. Wrathwalkers can now target air units.", item_names.REAVER_KHALAI_REPLICATORS: "Reaver War Council upgrade. Reaver Scarabs no longer cost minerals.", - # Disruptor + item_names.DISRUPTOR_RESTRUCTURED_THRUSTERS: "Allows the Disruptor to move while casting Purification Nova. Also allows the Disruptor to Blink.", # Warp Prism # Observer item_names.PHOENIX_DOUBLE_GRAVITON_BEAM: "Phoenix War Council upgrade. Phoenixes can now use Graviton Beam to lift two targets at once.", diff --git a/worlds/sc2/item_names.py b/worlds/sc2/item_names.py index a5c2a9c4aeea..7e3b22f8e85c 100644 --- a/worlds/sc2/item_names.py +++ b/worlds/sc2/item_names.py @@ -671,7 +671,6 @@ IMMORTAL_ANNIHILATOR_STALWART_ADVANCED_TARGETING_MECHANICS = "Advanced Targeting Mechanics (Immortal/Annihilator/Stalwart)" IMMORTAL_ANNIHILATOR_STALWART_DISRUPTOR_DISPERSION = "Disruptor Dispersion (Immortal/Annihilator/Stalwart)" DISRUPTOR_CLOAKING_MODULE = "Cloaking Module (Disruptor)" -DISRUPTOR_RESTRUCTURED_THRUSTERS = "Restructured Thrusters (Disruptor)" DISRUPTOR_PERFECTED_POWER = "Perfected Power (Disruptor)" DISRUPTOR_RESTRAINED_DESTRUCTION = "Restrained Destruction (Disruptor)" COLOSSUS_PACIFICATION_PROTOCOL = "Pacification Protocol (Colossus)" @@ -731,7 +730,7 @@ # Colossus WRATHWALKER_AERIAL_TRACKING = "Aerial Tracking (Wrathwalker)" REAVER_KHALAI_REPLICATORS = "Khalai Replicators (Reaver)" -# Disruptor +DISRUPTOR_RESTRUCTURED_THRUSTERS = "Restructured Thrusters (Disruptor)" # Warp Prism # Observer PHOENIX_DOUBLE_GRAVITON_BEAM = "Double Graviton Beam (Phoenix)" diff --git a/worlds/sc2/items.py b/worlds/sc2/items.py index 1030cafeab24..e82a5af659e1 100644 --- a/worlds/sc2/items.py +++ b/worlds/sc2/items.py @@ -1761,9 +1761,8 @@ def get_full_item_list(): item_names.SCOUT_RESOURCE_EFFICIENCY: ItemData(379 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 19, SC2Race.PROTOSS, origin={"ext"}, parent_item=item_names.SCOUT), item_names.IMMORTAL_ANNIHILATOR_STALWART_DISRUPTOR_DISPERSION: ItemData(380 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 20, SC2Race.PROTOSS, origin={"ext"}), item_names.DISRUPTOR_CLOAKING_MODULE: ItemData(381 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 21, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"ext"}), - item_names.DISRUPTOR_RESTRUCTURED_THRUSTERS: ItemData(382 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 22, SC2Race.PROTOSS, origin={"ext"}), - item_names.DISRUPTOR_PERFECTED_POWER: ItemData(383 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 23, SC2Race.PROTOSS, origin={"ext"}), - item_names.DISRUPTOR_RESTRAINED_DESTRUCTION: ItemData(384 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 24, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"ext"}), + item_names.DISRUPTOR_PERFECTED_POWER: ItemData(382 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 22, SC2Race.PROTOSS, origin={"ext"}), + item_names.DISRUPTOR_RESTRAINED_DESTRUCTION: ItemData(383 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 23, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"ext"}), # War Council @@ -1794,7 +1793,7 @@ def get_full_item_list(): # 524 reserved for Colossus item_names.WRATHWALKER_AERIAL_TRACKING: ItemData(525 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 25, SC2Race.PROTOSS, classification=ItemClassification.progression, parent_item=item_names.WRATHWALKER), item_names.REAVER_KHALAI_REPLICATORS: ItemData(526 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 26, SC2Race.PROTOSS, parent_item=item_names.REAVER), - # 527 reserved for Disruptor + item_names.DISRUPTOR_RESTRUCTURED_THRUSTERS: ItemData(527 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 27, SC2Race.PROTOSS, parent_item=item_names.DISRUPTOR), # 528 reserved for Warp Prism # 529 reserved for Observer item_names.PHOENIX_DOUBLE_GRAVITON_BEAM: ItemData(530 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council_2, 0, SC2Race.PROTOSS, parent_item=item_names.PHOENIX), From 878526ea7160536e74ebb51175c3e1406bd71b74 Mon Sep 17 00:00:00 2001 From: SirChuckOfTheChuckles Date: Sat, 10 Aug 2024 00:53:24 -0400 Subject: [PATCH 4/4] item description updates --- worlds/sc2/item_descriptions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worlds/sc2/item_descriptions.py b/worlds/sc2/item_descriptions.py index c1191feb4c25..106634034286 100644 --- a/worlds/sc2/item_descriptions.py +++ b/worlds/sc2/item_descriptions.py @@ -842,7 +842,7 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description: item_names.IMMORTAL_ANNIHILATOR_STALWART_ADVANCED_TARGETING_MECHANICS: "Immortals, Annihilators, and Stalwarts can attack air units.", item_names.IMMORTAL_ANNIHILATOR_STALWART_DISRUPTOR_DISPERSION: "Immortals, Annihilators, and Stalwarts deal minor splash damage.", item_names.DISRUPTOR_CLOAKING_MODULE: "Disruptors are permanently cloaked.", - item_names.DISRUPTOR_PERFECTED_POWER: "Allows Purification Nova to hit air units. Bonus damage to shields is now baseline.", + item_names.DISRUPTOR_PERFECTED_POWER: "Allows Purification Nova to hit air units. Bonus damage to shields is now baseline for enemies (friendly damage unaffected).", item_names.DISRUPTOR_RESTRAINED_DESTRUCTION: "Purification Nova does 50% reduced damage to friendly units and structures.", item_names.COLOSSUS_PACIFICATION_PROTOCOL: "Increases Colossus attack speed.", item_names.WRATHWALKER_RAPID_POWER_CYCLING: "Reduces the charging time and increases attack speed of the Wrathwalker's Charged Blast.", @@ -899,7 +899,7 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description: # Colossus item_names.WRATHWALKER_AERIAL_TRACKING: "Wrathwalker War Council upgrade. Wrathwalkers can now target air units.", item_names.REAVER_KHALAI_REPLICATORS: "Reaver War Council upgrade. Reaver Scarabs no longer cost minerals.", - item_names.DISRUPTOR_RESTRUCTURED_THRUSTERS: "Allows the Disruptor to move while casting Purification Nova. Also allows the Disruptor to Blink.", + item_names.DISRUPTOR_RESTRUCTURED_THRUSTERS: "Disruptor War Council upgrade. Allows the Disruptor to move while casting Purification Nova. Also allows the Disruptor to Blink.", # Warp Prism # Observer item_names.PHOENIX_DOUBLE_GRAVITON_BEAM: "Phoenix War Council upgrade. Phoenixes can now use Graviton Beam to lift two targets at once.",