Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 3 additions & 14 deletions ManualClient.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,8 @@ def __init__(self, server_address, password):
async def server_auth(self, password_requested: bool = False):
if password_requested and not self.password:
await super(ManualContext, self).server_auth(password_requested)

if "Manual_" not in self.ui.game_bar_text.text:
raise Exception("The Manual client can only be used for Manual games.")

self.game = self.ui.game_bar_text.text
self.game = "Manual"

self.location_names_to_id = dict([(value, key) for key, value in self.location_names.items()])

Expand Down Expand Up @@ -117,19 +114,11 @@ class ManualManager(GameManager):
def __init__(self, ctx):
super().__init__(ctx)

def build(self) -> Layout:
def build(self) -> Layout:
super(ManualManager, self).build()

#
self.manual_game_layout = BoxLayout(orientation="horizontal", size_hint_y=None, height=30)

game_bar_label = Label(text="Manual Game ID", size=(150, 30), size_hint_y=None, size_hint_x=None)
self.manual_game_layout.add_widget(game_bar_label)
self.game_bar_text = TextInput(text="Manual_{\"game\" from game.json}_{\"player\" from game.json}",
size_hint_y=None, height=30, multiline=False, write_tab=False)
self.manual_game_layout.add_widget(self.game_bar_text)

self.grid.add_widget(self.manual_game_layout, 3)

panel = TabbedPanelItem(text="Tracker and Locations", size_hint_y = 1)
self.tracker_and_locations_panel = panel.content = TrackerAndLocationsLayout(cols = 2)

Expand Down
14 changes: 0 additions & 14 deletions worlds/_manual/Data.py

This file was deleted.

10 changes: 0 additions & 10 deletions worlds/_manual/Game.py

This file was deleted.

63 changes: 0 additions & 63 deletions worlds/_manual/Items.py

This file was deleted.

49 changes: 0 additions & 49 deletions worlds/_manual/Locations.py

This file was deleted.

15 changes: 0 additions & 15 deletions worlds/_manual/Options.py

This file was deleted.

48 changes: 0 additions & 48 deletions worlds/_manual/Regions.py

This file was deleted.

132 changes: 0 additions & 132 deletions worlds/_manual/__init__.py

This file was deleted.

6 changes: 0 additions & 6 deletions worlds/_manual/data/game.json

This file was deleted.

Loading