mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-04-11 23:58:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Making the fix better (thanks medic)

Browse Source
This commit is contained in:
Scipio Wright
2024-08-04 18:46:11 -04:00
parent f411d6d6cd
commit 5170898a77
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
worlds/tunic/combat_logic.py
View File

@@ -77,6 +77,11 @@ def has_combat_reqs(area_name: str, state: CollectionState, player: int) -> bool
return state.tunic_area_combat_state[player][area_name] == CombatState.succeeded
met_combat_reqs = check_combat_reqs(area_name, state, player)
# we want to skip the "none area" since we don't record its results
if area_name not in area_data.keys():
return met_combat_reqs
# loop through the lists and set the easier/harder area states accordingly
if area_name in boss_areas:
area_list = boss_areas
@@ -85,22 +90,20 @@ def has_combat_reqs(area_name: str, state: CollectionState, player: int) -> bool
else:
area_list = [area_name]
# we want to skip the "none area"
if area_name in area_data.keys():
if met_combat_reqs:
# set the state as true for each area until you get to the area we're looking at
for name in area_list:
state.tunic_area_combat_state[player][name] = CombatState.succeeded
if name == area_name:
break
else:
# set the state as false for the area we're looking at and each area after that
reached_name = False
for name in area_list:
if name == area_name:
reached_name = True
if reached_name:
state.tunic_area_combat_state[player][name] = CombatState.failed
if met_combat_reqs:
# set the state as true for each area until you get to the area we're looking at
for name in area_list:
state.tunic_area_combat_state[player][name] = CombatState.succeeded
if name == area_name:
break
else:
# set the state as false for the area we're looking at and each area after that
reached_name = False
for name in area_list:
if name == area_name:
reached_name = True
if reached_name:
state.tunic_area_combat_state[player][name] = CombatState.failed
return met_combat_reqs