1 files changed, 0 insertions, 110 deletions
diff --git a/asciifarm/client/client.py b/asciifarm/client/client.py
deleted file mode 100644
index d6e2595..0000000
--- a/asciifarm/client/client.py
+++ /dev/null
@@ -1,110 +0,0 @@
-#! /usr/bin/python3
-
-import os
-import sys
-
-import curses
-import threading
-#import logging
-import json
-import getpass
-import argparse
-from .display.screen import Screen
-import string
-from .display import Display
-
-#logging.basicConfig(filename="client.log", filemode='w', level=logging.DEBUG)
-
-class Client:
-    
-    def __init__(self, stdscr, display, name, connection, keybindings):
-        self.stdscr = stdscr
-        self.display = display
-        self.name = name
-        self.keepalive = True
-        self.connection = connection
-        
-        self.commands = {}
-        for key, commands in keybindings["input"].items():
-            if isinstance(commands[0], str):
-                commands = [commands]
-            self.commands[ord(key)] = [["input", command] for command in commands]
-        
-        self.controlsString = "Controls:\n"+'\n'.join(
-                chr(key) + ": " + ', '.join(' '.join(action[1]) for action in actions)
-                for key, actions in self.commands.items()
-                if chr(key) in string.printable)
-        
-        self.display.showInfo(self.controlsString)
-        
-        
-    
-    def start(self):
-        threading.Thread(target=self.listen, daemon=True).start()
-        self.connection.send(json.dumps(["name", self.name]))
-        self.command_loop()
-        
-    
-    def listen(self):
-        self.connection.listen(self.update, self.close)
-    
-    def close(self, err=None):
-        self.keepalive = False
-        sys.exit()
-    
-    
-    def update(self, databytes):
-        if not self.keepalive:
-            sys.exit()
-        datastr = databytes.decode('utf-8')
-        data = json.loads(datastr)
-        if len(data) and isinstance(data[0], str):
-            data = [data]
-        for msg in data:
-            msgType = msg[0]
-            if msgType == 'error':
-                error = msg[1]
-                if error == "nametaken":
-                    print("error: name is already taken", file=sys.stderr)
-                    self.close()
-            if msgType == 'field':
-                field = msg[1]
-                fieldWidth = field['width']
-                fieldHeight = field['height']
-                self.display.resizeField((fieldWidth, fieldHeight))
-                fieldCells = field['field']
-                mapping = field['mapping']
-                self.display.drawFieldCells(
-                    (tuple(reversed(divmod(i, fieldWidth))),
-                     mapping[spr])
-                    for i, spr in enumerate(fieldCells))
-            
-            if msgType == 'changecells'and len(msg[1]):
-                self.display.drawFieldCells(msg[1])
-            
-            if msgType == "playerpos":
-                self.display.setFieldCenter(msg[1])
-            
-            if msgType == "health":
-                health = msg[1]
-                if health:
-                    self.display.setHealth(*health)
-            if msgType == "inventory":
-                self.display.setInventory(msg[1])
-            if msgType == "ground":
-                self.display.setGround(msg[1])
-        
-        
-        self.display.update()
-    
-    def command_loop(self):
-        while self.keepalive:
-            key = self.stdscr.getch()
-            if key == 27:
-                self.keepalive = False
-            if key in self.commands:
-                self.connection.send(json.dumps(self.commands[key]))
-    
-
-
-