Merge pull request #2 from Magnemania/sc2wol-extended-units-logic

Mission-specific logic for new units

Author: Ziktofel

worlds/sc2wol/LogicMixin.py

@@ -34,7 +34,7 @@ def _sc2wol_defense_rating(self, multiworld: MultiWorld, player: int, zerg_enemy
         if self.has_all({'Siege Tank', 'Maelstrom Rounds (Siege Tank)'}, player):
             defense_score += 2
         if self.has_all({'Widow Mine', 'Concealment (Widow Mine)'}, player):
-            defense_score += 2
+            defense_score += 1
         if zerg_enemy:
             defense_score += sum((zerg_defense_ratings[item] for item in zerg_defense_ratings if self.has(item, player)))
             if self.has('Firebat', player) and self.has('Bunker', player):
@@ -54,8 +54,15 @@ def _sc2wol_has_competent_comp(self, multiworld: MultiWorld, player: int) -> boo
                self.has('Siege Tank', player) and self._sc2wol_has_competent_anti_air(multiworld, player)
 
     def _sc2wol_has_train_killers(self, multiworld: MultiWorld, player: int) -> bool:
-        return (self.has_any({'Siege Tank', 'Diamondback', 'Marauder'}, player) or get_option_value(multiworld, player, 'required_tactics') > 0
-                and self.has_all({'Reaper', "G-4 Clusterbomb"}, player) or self.has_all({'Spectre', 'Psionic Lash'}, player))
+        return (
+                self.has_any({'Siege Tank', 'Diamondback', 'Marauder', 'Cyclone'}, player)
+                or get_option_value(multiworld, player, 'required_tactics') > 0
+                and (
+                        self.has_all({'Reaper', "G-4 Clusterbomb"}, player)
+                        or self.has_all({'Spectre', 'Psionic Lash'}, player)
+                        or self.has_any({'Vulture', 'Liberator'}, player)
+                )
+        )
 
     def _sc2wol_able_to_rescue(self, multiworld: MultiWorld, player: int) -> bool:
         return self.has_any({'Medivac', 'Hercules', 'Raven', 'Viking'}, player) or get_option_value(multiworld, player, 'required_tactics') > 0
@@ -97,7 +104,7 @@ def _sc2wol_final_mission_requirements(self, multiworld: MultiWorld, player: int
             # Air
             defense_rating = self._sc2wol_defense_rating(multiworld, player, True, True)
             return defense_rating >= 8 and beats_kerrigan \
-                and self.has_any({'Viking', 'Battlecruiser'}, player) \
+                and self.has_any({'Viking', 'Battlecruiser', 'Valkyrie'}, player) \
                 and self.has_any({'Hive Mind Emulator', 'Psi Disruptor', 'Missile Turret'}, player)
 
     def _sc2wol_cleared_missions(self, multiworld: MultiWorld, player: int, mission_count: int) -> bool: