morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SC2: Quality of Life Changes/Fixes to Prepare For Future Feature (#550)

Browse Source
This commit is contained in:
TheCondor07
2022-05-20 20:47:16 -04:00
committed by GitHub
parent cb9db5dff1
commit bb15485965
5 changed files with 284 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
worlds/sc2wol/LogicMixin.py
View File

@@ -12,9 +12,6 @@ class SC2WoLLogic(LogicMixin):
def _sc2wol_has_air(self, world: MultiWorld, player: int) -> bool:
return self.has_any({'Viking', 'Wraith', 'Medivac', 'Banshee', 'Hercules'}, player)
def _sc2wol_has_battlecruiser(self, world: MultiWorld, player: int) -> bool:
return self.has('Battlecruiser', player)
def _sc2wol_has_air_anti_air(self, world: MultiWorld, player: int) -> bool:
return self.has_any({'Viking', 'Wraith'}, player)
@@ -29,6 +26,12 @@ class SC2WoLLogic(LogicMixin):
self.has('Bunker', player) and self._sc2wol_has_bunker_unit(world, player)) and \
self._sc2wol_has_anti_air(world, player)
def _sc2wol_has_competent_comp(self, world: MultiWorld, player: int) -> bool:
return (self.has('Marine', player) or self.has('Marauder', player) and
self._sc2wol_has_mobile_anti_air(world, player)) and self.has_any({'Medivac', 'Medic'}, player) or \
self.has('Thor', player) or self.has("Banshee", player) and self._sc2wol_has_mobile_anti_air(world, player) or \
self.has('Battlecruiser', player) and self._sc2wol_has_common_unit(world, player)
def _sc2wol_has_train_killers(self, world: MultiWorld, player: int) -> bool:
return (self.has_any({'Siege Tank', 'Diamondback'}, player) or
self.has_all({'Reaper', "G-4 Clusterbomb"}, player) or self.has_all({'Spectre', 'Psionic Lash'}, player))