monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SC2: always show uncollected locations (#1007)

This commit is contained in:
Fabian Dill 2022-09-18 12:40:35 +02:00 committed by GitHub
parent 1c0a93acad
commit 0215e1fa28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Starcraft2Client.py
View File

@ -295,34 +295,37 @@ class SC2Context(CommonContext):
category_panel.add_widget( category_panel.add_widget(
Label(text=category, size_hint_y=None, height=50, outline_width=1)) Label(text=category, size_hint_y=None, height=50, outline_width=1))
# Map is completed
for mission in categories[category]: for mission in categories[category]:
text = mission text: str = mission
tooltip = "" tooltip: str = ""
# Map has uncollected locations # Map has uncollected locations
if mission in unfinished_missions: if mission in unfinished_missions:
text = f"[color=6495ED]{text}[/color]" text = f"[color=6495ED]{text}[/color]"
tooltip = f"Uncollected locations:\n"
tooltip += "\n".join([self.ctx.location_names[loc] for loc in
self.ctx.locations_for_mission(mission)
if loc in self.ctx.missing_locations])
elif mission in available_missions: elif mission in available_missions:
text = f"[color=FFFFFF]{text}[/color]" text = f"[color=FFFFFF]{text}[/color]"
# Map requirements not met # Map requirements not met
else: else:
text = f"[color=a9a9a9]{text}[/color]" text = f"[color=a9a9a9]{text}[/color]"
tooltip = f"Requires: " tooltip = f"Requires: "
if len(self.ctx.mission_req_table[mission].required_world) > 0: if self.ctx.mission_req_table[mission].required_world:
tooltip += ", ".join(list(self.ctx.mission_req_table)[req_mission - 1] for tooltip += ", ".join(list(self.ctx.mission_req_table)[req_mission - 1] for
req_mission in req_mission in
self.ctx.mission_req_table[mission].required_world) self.ctx.mission_req_table[mission].required_world)
if self.ctx.mission_req_table[mission].number > 0: if self.ctx.mission_req_table[mission].number:
tooltip += " and " tooltip += " and "
if self.ctx.mission_req_table[mission].number > 0: if self.ctx.mission_req_table[mission].number:
tooltip += f"{self.ctx.mission_req_table[mission].number} missions completed" tooltip += f"{self.ctx.mission_req_table[mission].number} missions completed"
remaining_location_names: typing.List[str] = [
self.ctx.location_names[loc] for loc in self.ctx.locations_for_mission(mission)
if loc in self.ctx.missing_locations]
if remaining_location_names:
if tooltip:
tooltip += "\n"
tooltip += f"Uncollected locations:\n"
tooltip += "\n".join(remaining_location_names)
mission_button = MissionButton(text=text, size_hint_y=None, height=50) mission_button = MissionButton(text=text, size_hint_y=None, height=50)
mission_button.tooltip_text = tooltip mission_button.tooltip_text = tooltip