Merge pull request Ziktofel#197 from EnvyDragon/guardian-shell-changes

SC2: Tagging Guardian Shell as SoA passive
EnvyDragon · May 16, 2024 · 98810fd · 98810fd
2 parents a49ab24 + bacd3c2
commit 98810fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/worlds/sc2/Client.py b/worlds/sc2/Client.py
@@ -969,6 +969,9 @@ def caclulate_soa_options(ctx: SC2Context) -> int:
         soa_autocasts_presence_value = 2
     elif ctx.spear_of_adun_autonomously_cast_ability_presence == SpearOfAdunAutonomouslyCastAbilityPresence.option_everywhere:
         soa_autocasts_presence_value = 3
+    # Guardian Shell breaks without SoA on version 4+, but can be generated without SoA on version 3
+    if ctx.slow_data_version < 4 and soa_autocasts_presence_value < 2:
+        soa_autocasts_presence_value = 2
     options |= soa_autocasts_presence_value << 3
 
     # Bit 5

diff --git a/worlds/sc2/Items.py b/worlds/sc2/Items.py
@@ -1853,6 +1853,7 @@ def get_basic_units(world: 'SC2World', race: SC2Race) -> typing.Set[str]:
 spear_of_adun_castable_passives = {
     ItemNames.RECONSTRUCTION_BEAM,
     ItemNames.OVERWATCH,
+    ItemNames.GUARDIAN_SHELL,
 }
 
 nova_equipment = {