Add combat logic for ghosts

Electro1512 · Jun 27, 2024 · 4610efd · 4610efd
1 parent a65ed50
commit 4610efd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/data/ChozoRuins.py b/data/ChozoRuins.py
@@ -2,7 +2,7 @@
 from worlds.metroidprime.Items import SuitUpgrade
 from worlds.metroidprime.data.AreaNames import MetroidPrimeArea
 from .RoomData import AreaData, DoorData, DoorLockType, PickupData, RoomData
-from worlds.metroidprime.Logic import can_bomb, can_boost, can_climb_tower_of_light, can_combat_flaaghra, can_grapple, can_heat, can_ice_beam, can_missile, can_morph_ball, can_move_underwater, can_plasma_beam, can_power_beam, can_power_bomb, can_scan, can_space_jump, can_spider, can_super_missile, can_wave_beam, has_energy_tanks, has_power_bomb_count
+from worlds.metroidprime.Logic import can_bomb, can_boost, can_climb_tower_of_light, can_combat_flaaghra, can_combat_ghosts, can_grapple, can_heat, can_ice_beam, can_missile, can_morph_ball, can_move_underwater, can_plasma_beam, can_power_beam, can_power_bomb, can_scan, can_space_jump, can_spider, can_super_missile, can_wave_beam, has_energy_tanks, has_power_bomb_count
 from worlds.metroidprime.data.Tricks import Tricks
 from .RoomNames import RoomName
 
@@ -262,7 +262,7 @@ class ChozoRuinsAreaData(AreaData):
             # 1: DoorData(RoomName.Sunchamber_Lobby, rule_func=can_climb_sun_tower) # gets locked until after you beat the ghosts
         }, pickups=[
             PickupData('Chozo Ruins: Sunchamber - Flaaghra', rule_func=can_flaahgra),
-            PickupData('Chozo Ruins: Sunchamber - Ghosts', rule_func=lambda state, player: can_flaahgra(state, player) and can_climb_sun_tower(state, player))]),
+            PickupData('Chozo Ruins: Sunchamber - Ghosts', rule_func=lambda state, player: can_flaahgra(state, player) and can_combat_ghosts(state, player) and can_climb_sun_tower(state, player))]),
         RoomName.Totem_Access: RoomData(doors={
             0: DoorData(RoomName.Ruined_Gallery),
             1: DoorData(RoomName.Hive_Totem),

diff --git a/data/TallonOverworld.py b/data/TallonOverworld.py
@@ -1,5 +1,5 @@
 
-from worlds.metroidprime.Logic import can_bomb, can_boost, can_charge_beam, can_crashed_frigate, can_crashed_frigate_backwards, can_grapple, can_missile, can_morph_ball, can_move_underwater, can_power_beam, can_power_bomb, can_space_jump, can_spider, can_super_missile, can_xray
+from worlds.metroidprime.Logic import can_bomb, can_boost, can_charge_beam, can_combat_ghosts, can_crashed_frigate, can_crashed_frigate_backwards, can_grapple, can_missile, can_morph_ball, can_move_underwater, can_power_beam, can_power_bomb, can_space_jump, can_spider, can_super_missile, can_xray
 from worlds.metroidprime.data.Tricks import Tricks
 from worlds.metroidprime.data.AreaNames import MetroidPrimeArea
 from .RoomData import AreaData, DoorData, DoorLockType, PickupData, RoomData
@@ -163,7 +163,7 @@ class TallonOverworldAreaData(AreaData):
         RoomName.Life_Grove_Tunnel: RoomData(
             doors={
                 0: DoorData(RoomName.Great_Tree_Hall, defaultLock=DoorLockType.Ice, rule_func=lambda state, player: can_power_bomb(state, player) and can_boost(state, player), exclude_from_rando=True),
-                1: DoorData(RoomName.Life_Grove, defaultLock=DoorLockType.None_, rule_func=lambda state, player: can_power_bomb(state, player) and can_boost(state, player), exclude_from_rando=True)
+                1: DoorData(RoomName.Life_Grove, defaultLock=DoorLockType.None_, rule_func=lambda state, player: can_power_beam(state, player) and can_combat_ghosts(state, player) and can_power_bomb(state, player) and can_boost(state, player), exclude_from_rando=True)
             },
             pickups=[
                 PickupData('Tallon Overworld: Life Grove Tunnel', rule_func=lambda state, player: can_power_bomb(state, player) and can_bomb(state, player) and can_boost(state, player)),