mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-03-30 03:33:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revamp combat logic function to work properly without melee

Browse Source
This commit is contained in:
Scipio Wright
2024-07-13 10:39:58 -04:00
parent 9f90401b91
commit 38d0bb6634
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
worlds/tunic/combat_logic.py
View File

@@ -49,21 +49,33 @@ def has_combat_reqs(area_name: str, state: CollectionState, player: int) -> bool
extra_att_needed = 0
extra_def_needed = 0
extra_mp_needed = 0
extra_magic_needed = False
has_magic = state.has_any({"Magic Wand", "Gun"}, player)
for item in data.equipment:
if item == "Stick":
if not has_melee(state, player):
extra_mp_needed += 4
extra_att_needed -= 16
if has_magic:
# magic can make up for the lack of stick
extra_mp_needed += 2
extra_att_needed -= 16
else:
return False
elif item == "Sword":
if not has_sword(state, player):
# need sword for bosses
if data.is_boss:
return False
# +4 mp pretty much makes up for the lack of sword, at least in Quarry
extra_mp_needed += 4
extra_magic_needed = True
extra_att_needed -= 2
if has_magic:
# +4 mp pretty much makes up for the lack of sword, at least in Quarry
extra_mp_needed += 4
# stick is a backup plan, and doesn't scale well, so let's require a little less
extra_att_needed -= 2
elif has_melee(state, player):
# may revise this later based on feedback
extra_att_needed += 3
extra_def_needed += 2
else:
return False
elif item == "Shield":
if not state.has("Shield", player):
extra_def_needed += 2
@@ -72,11 +84,8 @@ def has_combat_reqs(area_name: str, state: CollectionState, player: int) -> bool
# these are entirely based on vibes
extra_att_needed += 2
extra_def_needed += 3
elif item == "Magic" or extra_magic_needed:
if not state.has_any({"Magic Wand", "Gun"}, player):
# if you needed magic from a lack of sword, and you don't even have a magic weapon, then false
if extra_magic_needed:
return False
elif item == "Magic":
if not has_magic:
extra_att_needed += 2
extra_def_needed += 2
extra_mp_needed -= 16
@@ -90,7 +99,7 @@ def has_combat_reqs(area_name: str, state: CollectionState, player: int) -> bool
def has_required_stats(data: AreaStats, state: CollectionState, player: int) -> bool:
# for now, just check if you have the vanilla stat requirements, can get more advanced later
player_att = get_att_level(state, player)
if data.att_level > 1 and player_att < data.att_level:
if player_att < data.att_level:
return False
# adding defense and sp together since they accomplish similar things: making you take less damage
if (data.def_level + data.sp_level > 2