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

minor cleanup

This commit is contained in:
Fabian Dill 2021-10-30 07:52:03 +02:00
parent 9bf9f2c611
commit 704a0e3078
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kvui.py
View File

@ -72,8 +72,6 @@ class ServerToolTip(Label):
class ServerLabel(HoverBehavior, Label): class ServerLabel(HoverBehavior, Label):
hover_text = """"""
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(ServerLabel, self).__init__(*args, **kwargs) super(ServerLabel, self).__init__(*args, **kwargs)
self.layout = FloatLayout() self.layout = FloatLayout()
@ -92,7 +90,8 @@ class ServerLabel(HoverBehavior, Label):
ctx = self.ctx ctx = self.ctx
text = f"Connected to: {ctx.server_address}." text = f"Connected to: {ctx.server_address}."
if ctx.slot is not None: if ctx.slot is not None:
text += f"\nYou are Slot Number {ctx.slot} in Team Number {ctx.team}, named {ctx.player_names[ctx.slot]}." text += f"\nYou are Slot Number {ctx.slot} in Team Number {ctx.team}, " \
f"named {ctx.player_names[ctx.slot]}."
if ctx.items_received: if ctx.items_received:
text += f"\nYou have received {len(ctx.items_received)} items. " \ text += f"\nYou have received {len(ctx.items_received)} items. " \
f"You can list them in order with /received." f"You can list them in order with /received."
@ -106,7 +105,8 @@ class ServerLabel(HoverBehavior, Label):
text += f"\n {permission_name}: {permission_data}" text += f"\n {permission_name}: {permission_data}"
if ctx.hint_cost is not None: if ctx.hint_cost is not None:
text += f"\nA new !hint <itemname> costs {ctx.hint_cost}% of checks made. " \ text += f"\nA new !hint <itemname> costs {ctx.hint_cost}% of checks made. " \
f"For you this means every {max(0, int(ctx.hint_cost * 0.01 * ctx.total_locations))} location checks." f"For you this means every {max(0, int(ctx.hint_cost * 0.01 * ctx.total_locations))} " \
"location checks."
elif ctx.hint_cost == 0: elif ctx.hint_cost == 0:
text += "\n!hint is free to use." text += "\n!hint is free to use."

1
worlds/AutoWorld.py
View File

@ -145,6 +145,7 @@ class World(metaclass=AutoWorldRegister):
"""Optional method that is supposed to be used for special fill stages. This is run *after* plando.""" """Optional method that is supposed to be used for special fill stages. This is run *after* plando."""
pass pass
@classmethod
def fill_hook(cls, progitempool: List[Item], nonexcludeditempool: List[Item], def fill_hook(cls, progitempool: List[Item], nonexcludeditempool: List[Item],
localrestitempool: Dict[int, List[Item]], nonlocalrestitempool: Dict[int, List[Item]], localrestitempool: Dict[int, List[Item]], nonlocalrestitempool: Dict[int, List[Item]],
restitempool: List[Item], fill_locations: List[Location]): restitempool: List[Item], fill_locations: List[Location]):