Remove nerfed Banshee Rocket Barrage from logic

EnvyDragon · Jan 9, 2024 · 7a7b781 · 7a7b781
1 parent 83aad63
commit 7a7b781
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/worlds/sc2/Items.py b/worlds/sc2/Items.py
@@ -829,7 +829,7 @@ def get_full_item_list():
                  description="Increases Banshee attack damage by 25% while cloaked."),
     ItemNames.BANSHEE_ROCKET_BARRAGE:
         ItemData(339 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 20, SC2Race.TERRAN,
-                 classification=ItemClassification.progression, parent_item=ItemNames.BANSHEE, origin={"ext"},
+                 parent_item=ItemNames.BANSHEE, origin={"ext"},
                  description="Deals 75 damage to enemy ground units in the target area."),
     ItemNames.GHOST_RESOURCE_EFFICIENCY:
         ItemData(340 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 21, SC2Race.TERRAN,

diff --git a/worlds/sc2/Rules.py b/worlds/sc2/Rules.py
@@ -126,9 +126,6 @@ def terran_defense_rating(self, state: CollectionState, zerg_enemy: bool, air_en
         # Viking with splash
         if state.has_all({ItemNames.VIKING, ItemNames.VIKING_SHREDDER_ROUNDS}, self.player):
             defense_score += 2
-        # Banshee upgrade
-        if state.has_all({ItemNames.BANSHEE, ItemNames.BANSHEE_ROCKET_BARRAGE}, self.player):
-            defense_score += 3
 
         # General enemy-based rules
         if zerg_enemy:
@@ -252,13 +249,6 @@ def terran_base_trasher(self, state: CollectionState) -> bool:
         return state.has(ItemNames.SIEGE_TANK, self.player) \
             or state.has_all({ItemNames.BATTLECRUISER, ItemNames.BATTLECRUISER_ATX_LASER_BATTERY}, self.player) \
             or state.has_all({ItemNames.LIBERATOR, ItemNames.LIBERATOR_RAID_ARTILLERY}, self.player) \
-            or (
-                    state.has_all({ItemNames.BANSHEE, ItemNames.BANSHEE_ROCKET_BARRAGE}, self.player)
-                    and (
-                            self.advanced_tactics
-                            or state.has(ItemNames.BANSHEE_ADVANCED_TARGETING_OPTICS, self.player)
-                    )
-            ) \
             or (self.advanced_tactics
                 and ((state.has_all({ItemNames.RAVEN, ItemNames.RAVEN_HUNTER_SEEKER_WEAPON}, self.player)
                       or self.can_nuke(state))