Skip to content

Osrs explain training #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FarisTheAncient wants to merge 3 commits into
base: osrs-2.1.0
Choose a base branch
from
+26 −8
Open

Osrs explain training #97

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a18bb7
unrelated update that will need to happen :)
FarisTheAncient Jul 4, 2026
9b8f979
update explain to include training rules
FarisTheAncient Jul 4, 2026
0e63945
Adding docstring so UT will display it in the help list
FarisTheAncient Jul 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 26 additions & 8 deletions worlds/osrs/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def generate_early(self) -> None:
starting_area = self.options.starting_area

#UT specific override, if we are in normal gen, resolve starting area, we will get it from slot_data in UT
if not hasattr(self.multiworld, "generation_is_fake"):
if not getattr(self.multiworld, "generation_is_fake", False):
if starting_area.value == StartingArea.option_any_bank:
self.starting_area_item = rnd.choice(list(starting_area_dict.values()))
elif starting_area.value == StartingArea.option_no_bank:
Expand Down Expand Up @@ -234,7 +234,7 @@ def task_within_skill_levels(self, skills_required):
return True

def roll_locations(self):
generation_is_fake = hasattr(self.multiworld, "generation_is_fake") # UT specific override
generation_is_fake = getattr(self.multiworld, "generation_is_fake", False) # UT specific override
locations_required = 0
for item_row in item_rows:
if item_row.name == self.starting_area_item:
Expand Down Expand Up @@ -427,23 +427,28 @@ def get_filler_item_name(self) -> str:
ItemNames.Progressive_Range_Armor, ItemNames.Progressive_Tools])

def explain_rule(self, dest_name:str, state:CollectionState ):
if self.options.goal.value not in [self.options.goal.option_bingo, self.options.goal.option_dragon_slayer_bingo]: return None
"""
training [skill] [level] - get the explained rule for a given skill training
"""
bingo = self.options.goal.value in [self.options.goal.option_bingo, self.options.goal.option_dragon_slayer_bingo]
from NetUtils import JSONMessagePart
ret:list[JSONMessagePart] = []
max_index = self.options.bingo_size.value
if dest_name.lower() in ["/","forward","forward diagonal", "bingo: forward diagonal"]:
if bingo and dest_name.lower() in ["/","forward","forward diagonal", "bingo: forward diagonal"]:
ret.append({"type":"text","text":"Bingo : Forward Diagonal : \n"})
for i in range(max_index):
temp_str = self.bingo_board[i][i]
temp_status = state.can_reach_location(temp_str,self.player)
ret.extend([{"type":"text","text":f"{temp_str}"},{"type":"color","text":f" ({str(temp_status)}) \n","color":"green" if temp_status else "red"}])
elif dest_name.lower() in ["\\","reverse","reverse diagonal", "bingo: reverse diagonal","backwards","backwards diagonal", "bingo: backwards diagonal"]:
elif bingo and dest_name.lower() in ["\\","reverse","reverse diagonal", "bingo: reverse diagonal","backwards","backwards diagonal", "bingo: backwards diagonal"]:
ret.append({"type":"text","text":"Bingo : Reverse Diagonal : \n"})
for i in range(max_index):
temp_str = self.bingo_board[i][(max_index-1)-i]
temp_status = state.can_reach_location(temp_str,self.player)
ret.extend([{"type":"text","text":f"{temp_str}"},{"type":"color","text":f" ({str(temp_status)}) \n","color":"green" if temp_status else "red"}])
elif dest_name.lower().startswith("r ") or dest_name.lower().startswith("row "):
elif bingo and dest_name.lower().startswith("r ") or dest_name.lower().startswith("row ") or dest_name.lower().startswith("bingo: row "):
if dest_name.lower().startswith("bingo: "):
dest_name = dest_name[7:] #strip bingo prefix
_,row = dest_name.split(" ",2)
if not row.isdecimal():
return None
Expand All @@ -453,7 +458,9 @@ def explain_rule(self, dest_name:str, state:CollectionState ):
temp_str = self.bingo_board[row_i][i]
temp_status = state.can_reach_location(temp_str,self.player)
ret.extend([{"type":"text","text":f"{temp_str}"},{"type":"color","text":f" ({str(temp_status)}) \n","color":"green" if temp_status else "red"}])
elif dest_name.lower().startswith("c ") or dest_name.lower().startswith("col ") or dest_name.lower().startswith("column "):
elif bingo and dest_name.lower().startswith("c ") or dest_name.lower().startswith("col ") or dest_name.lower().startswith("column ") or dest_name.lower().startswith("bingo: column "):
if dest_name.lower().startswith("bingo: "):
dest_name = dest_name[7:] #strip bingo prefix
_,col = dest_name.split(" ",2)
if not col.isdecimal():
return None
Expand All @@ -463,6 +470,17 @@ def explain_rule(self, dest_name:str, state:CollectionState ):
temp_str = self.bingo_board[i][col_i]
temp_status = state.can_reach_location(temp_str,self.player)
ret.extend([{"type":"text","text":f"{temp_str}"},{"type":"color","text":f" ({str(temp_status)}) \n","color":"green" if temp_status else "red"}])
elif dest_name.lower().startswith("training"):
try:
_,skill,level = dest_name.lower().split(" ")
except ValueError:
return [{"type":"text","text":"format - training [skill] [level]"}]
if skill in task_types:
if str(level).isnumeric():
level = int(level)
ret.extend(get_skill_rule(skill,level,self.options).resolve(self).explain_json(state))
else:
return [{"type":"text","text":"Level needs to be a number (or skill should be one word)"}]
if ret:
return ret
else:
Expand Down Expand Up @@ -594,7 +612,7 @@ def set_rules(self) -> None:
self.set_rule(self.get_location(f"Bingo: Column {index+1}"),And(*col_rules))
self.set_rule(self.get_location("Bingo: Forward Diagonal"), And(*for_rules))
self.set_rule(self.get_location("Bingo: Reverse Diagonal"), And(*bak_rules))
if hasattr(self.multiworld,"generation_is_fake"):
if getattr(self.multiworld,"generation_is_fake", False):
#Make some entrances for the bingo board map tab, these are all useless logically but their ability to be transversed will still be important
menu_region = self.get_region("Menu") #they're all just going to connect menu to itself
for index in range(self.options.bingo_size.value):
Expand Down
Loading