From 0961150554927291cc5ff51919ca52e9a4b4506a Mon Sep 17 00:00:00 2001 From: Wango Fett Date: Thu, 26 Oct 2017 17:05:49 +0000 Subject: [PATCH] Pip installable! --- .gitignore | 3 ++ MANIFEST.in | 1 + Pipfile | 12 ++++++ asciifarm | 3 -- asciifarm/__init__.py | 0 asciifarm/charmaps/__init__.py | 0 {charmaps => asciifarm/charmaps}/default.json | 0 .../charmaps}/fullwidth.json | 0 {client => asciifarm/client}/__init__.py | 0 {client => asciifarm/client}/client.py | 0 {client => asciifarm/client}/connection.py | 0 .../client}/display/__init__.py | 0 .../client}/display/fieldpad.py | 0 .../client}/display/healthpad.py | 0 .../client}/display/infopad.py | 0 .../client}/display/screen.py | 0 {client => asciifarm/client}/fullwidth.json | 0 {client => asciifarm/client}/tcommunicate.py | 0 hostfarms.py => asciifarm/hostfarms.py | 17 +++++---- .../keybindings}/default.json | 0 {maps => asciifarm/maps}/basement.json | 0 {maps => asciifarm/maps}/begin.json | 0 {maps => asciifarm/maps}/world.json | 0 {maps => asciifarm/maps}/worlddata.json | 0 minstarter.py => asciifarm/minstarter.py | 0 playgame.py => asciifarm/playgame.py | 5 ++- asciifarm/server/__init__.py | 0 asciifarm/server/components/__init__.py | 0 .../server}/components/alignment.py | 0 .../server}/components/build.py | 2 +- .../server}/components/fighter.py | 5 +-- .../server}/components/food.py | 0 .../server}/components/grow.py | 5 +-- .../server}/components/harvest.py | 0 .../server}/components/healing.py | 0 .../server}/components/inputcontroller.py | 0 .../server}/components/inventory.py | 0 .../server}/components/item.py | 0 .../server}/components/loot.py | 5 +-- .../server}/components/monsterai.py | 4 +- .../server}/components/move.py | 3 +- .../server}/components/portal.py | 0 .../components/randomwalkcontroller.py | 0 .../server}/components/spawner.py | 4 +- .../server}/components/target.py | 0 .../server}/components/trap.py | 0 {server => asciifarm/server}/entity.py | 4 +- {server => asciifarm/server}/event.py | 0 {server => asciifarm/server}/faction.py | 0 {server => asciifarm/server}/gameobjects.py | 37 +++++++++---------- {server => asciifarm/server}/gameserver.py | 8 ++-- {server => asciifarm/server}/grid.py | 2 +- {server => asciifarm/server}/ground.py | 5 ++- {server => asciifarm/server}/loader.py | 3 +- {server => asciifarm/server}/mainloop.py | 9 ++--- {server => asciifarm/server}/pathfinding.py | 0 {server => asciifarm/server}/player.py | 18 ++++----- {server => asciifarm/server}/room.py | 14 +++---- {server => asciifarm/server}/roomdata.py | 0 {server => asciifarm/server}/server.py | 10 ++--- {server => asciifarm/server}/tcommunicate.py | 0 {server => asciifarm/server}/timeout.py | 0 {server => asciifarm/server}/utils.py | 0 {server => asciifarm/server}/view.py | 3 +- {server => asciifarm/server}/world.py | 5 +-- {shared => asciifarm/shared}/tcommunicate.py | 0 {test => asciifarm/test}/altbindings.json | 0 {test => asciifarm/test}/altcharacters.json | 0 setup.py | 29 +++++++++++++++ startserver | 3 -- 70 files changed, 127 insertions(+), 92 deletions(-) create mode 100644 MANIFEST.in create mode 100644 Pipfile delete mode 100755 asciifarm create mode 100644 asciifarm/__init__.py create mode 100644 asciifarm/charmaps/__init__.py rename {charmaps => asciifarm/charmaps}/default.json (100%) rename {charmaps => asciifarm/charmaps}/fullwidth.json (100%) rename {client => asciifarm/client}/__init__.py (100%) rename {client => asciifarm/client}/client.py (100%) rename {client => asciifarm/client}/connection.py (100%) rename {client => asciifarm/client}/display/__init__.py (100%) rename {client => asciifarm/client}/display/fieldpad.py (100%) rename {client => asciifarm/client}/display/healthpad.py (100%) rename {client => asciifarm/client}/display/infopad.py (100%) rename {client => asciifarm/client}/display/screen.py (100%) rename {client => asciifarm/client}/fullwidth.json (100%) rename {client => asciifarm/client}/tcommunicate.py (100%) rename hostfarms.py => asciifarm/hostfarms.py (83%) rename {keybindings => asciifarm/keybindings}/default.json (100%) rename {maps => asciifarm/maps}/basement.json (100%) rename {maps => asciifarm/maps}/begin.json (100%) rename {maps => asciifarm/maps}/world.json (100%) rename {maps => asciifarm/maps}/worlddata.json (100%) rename minstarter.py => asciifarm/minstarter.py (100%) rename playgame.py => asciifarm/playgame.py (99%) create mode 100644 asciifarm/server/__init__.py create mode 100644 asciifarm/server/components/__init__.py rename {server => asciifarm/server}/components/alignment.py (100%) rename {server => asciifarm/server}/components/build.py (95%) rename {server => asciifarm/server}/components/fighter.py (98%) rename {server => asciifarm/server}/components/food.py (100%) rename {server => asciifarm/server}/components/grow.py (94%) rename {server => asciifarm/server}/components/harvest.py (100%) rename {server => asciifarm/server}/components/healing.py (100%) rename {server => asciifarm/server}/components/inputcontroller.py (100%) rename {server => asciifarm/server}/components/inventory.py (100%) rename {server => asciifarm/server}/components/item.py (100%) rename {server => asciifarm/server}/components/loot.py (97%) rename {server => asciifarm/server}/components/monsterai.py (98%) rename {server => asciifarm/server}/components/move.py (98%) rename {server => asciifarm/server}/components/portal.py (100%) rename {server => asciifarm/server}/components/randomwalkcontroller.py (100%) rename {server => asciifarm/server}/components/spawner.py (96%) rename {server => asciifarm/server}/components/target.py (100%) rename {server => asciifarm/server}/components/trap.py (100%) rename {server => asciifarm/server}/entity.py (99%) rename {server => asciifarm/server}/event.py (100%) rename {server => asciifarm/server}/faction.py (100%) rename {server => asciifarm/server}/gameobjects.py (87%) rename {server => asciifarm/server}/gameserver.py (97%) rename {server => asciifarm/server}/grid.py (98%) rename {server => asciifarm/server}/ground.py (98%) rename {server => asciifarm/server}/loader.py (99%) rename {server => asciifarm/server}/mainloop.py (95%) rename {server => asciifarm/server}/pathfinding.py (100%) rename {server => asciifarm/server}/player.py (92%) rename {server => asciifarm/server}/room.py (96%) rename {server => asciifarm/server}/roomdata.py (100%) rename {server => asciifarm/server}/server.py (98%) rename {server => asciifarm/server}/tcommunicate.py (100%) rename {server => asciifarm/server}/timeout.py (100%) rename {server => asciifarm/server}/utils.py (100%) rename {server => asciifarm/server}/view.py (98%) rename {server => asciifarm/server}/world.py (97%) rename {shared => asciifarm/shared}/tcommunicate.py (100%) rename {test => asciifarm/test}/altbindings.json (100%) rename {test => asciifarm/test}/altcharacters.json (100%) create mode 100644 setup.py delete mode 100755 startserver diff --git a/.gitignore b/.gitignore index 1c19e2e..612ffac 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ *.sw[a-p] *.log devlog/ +*.pyc +*.egg-info/ +**/dist/ diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..3b0a581 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +recursive-include asciifarm *.json diff --git a/Pipfile b/Pipfile new file mode 100644 index 0000000..05d837e --- /dev/null +++ b/Pipfile @@ -0,0 +1,12 @@ +[[source]] + +url = "https://pypi.python.org/simple" +name = "pypi" +verify_ssl = true + + +[packages] + + + +[dev-packages] diff --git a/asciifarm b/asciifarm deleted file mode 100755 index 947f2c6..0000000 --- a/asciifarm +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd "`dirname "$0"`" -./playgame.py $@ diff --git a/asciifarm/__init__.py b/asciifarm/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/asciifarm/charmaps/__init__.py b/asciifarm/charmaps/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/charmaps/default.json b/asciifarm/charmaps/default.json similarity index 100% rename from charmaps/default.json rename to asciifarm/charmaps/default.json diff --git a/charmaps/fullwidth.json b/asciifarm/charmaps/fullwidth.json similarity index 100% rename from charmaps/fullwidth.json rename to asciifarm/charmaps/fullwidth.json diff --git a/client/__init__.py b/asciifarm/client/__init__.py similarity index 100% rename from client/__init__.py rename to asciifarm/client/__init__.py diff --git a/client/client.py b/asciifarm/client/client.py similarity index 100% rename from client/client.py rename to asciifarm/client/client.py diff --git a/client/connection.py b/asciifarm/client/connection.py similarity index 100% rename from client/connection.py rename to asciifarm/client/connection.py diff --git a/client/display/__init__.py b/asciifarm/client/display/__init__.py similarity index 100% rename from client/display/__init__.py rename to asciifarm/client/display/__init__.py diff --git a/client/display/fieldpad.py b/asciifarm/client/display/fieldpad.py similarity index 100% rename from client/display/fieldpad.py rename to asciifarm/client/display/fieldpad.py diff --git a/client/display/healthpad.py b/asciifarm/client/display/healthpad.py similarity index 100% rename from client/display/healthpad.py rename to asciifarm/client/display/healthpad.py diff --git a/client/display/infopad.py b/asciifarm/client/display/infopad.py similarity index 100% rename from client/display/infopad.py rename to asciifarm/client/display/infopad.py diff --git a/client/display/screen.py b/asciifarm/client/display/screen.py similarity index 100% rename from client/display/screen.py rename to asciifarm/client/display/screen.py diff --git a/client/fullwidth.json b/asciifarm/client/fullwidth.json similarity index 100% rename from client/fullwidth.json rename to asciifarm/client/fullwidth.json diff --git a/client/tcommunicate.py b/asciifarm/client/tcommunicate.py similarity index 100% rename from client/tcommunicate.py rename to asciifarm/client/tcommunicate.py diff --git a/hostfarms.py b/asciifarm/hostfarms.py similarity index 83% rename from hostfarms.py rename to asciifarm/hostfarms.py index 7f5d675..11a6b47 100755 --- a/hostfarms.py +++ b/asciifarm/hostfarms.py @@ -1,30 +1,31 @@ #!/usr/bin/python3 -u +import argparse +import pathlib import sys if sys.version_info[0] < 3: print("This game is written in python 3.\nRun 'python3 "+sys.argv[0]+"' or './"+sys.argv[0]+"'") sys.exit(-1) -sys.path.append(sys.path[0]+"/server/") -import mainloop -import argparse -import loader +from .server import mainloop +from .server import loader defaultAdresses = { "abstract": "asciifarm", "unix": "asciifarm.socket", "inet": "localhost:9021", - } +} +default_world = pathlib.Path(__file__).parent.joinpath('maps', 'worlddata.json') def main(): parser = argparse.ArgumentParser() parser.add_argument("-a", "--address", help="The address of the socket. When the socket type is 'abstract' this is just a name. When it is 'unix' this is a filename. When it is 'inet' is should be in the format 'address:port', eg 'localhost:8080'. Defaults depends on the socket type") parser.add_argument("-s", "--socket", help="the socket type. 'unix' is unix domain sockets, 'abstract' is abstract unix domain sockets and 'inet' is inet sockets. ", choices=["abstract", "unix", "inet"], default="abstract") - parser.add_argument("-w", "--world", help="A file to load the world from.", default="maps/worlddata.json") + parser.add_argument("-w", "--world", help="A file to load the world from.", default=str(default_world)) # str is only needed for python 3.5< args = parser.parse_args() address = args.address @@ -39,4 +40,6 @@ def main(): worldData = loader.loadWorld(args.world) mainloop.Game(args.socket, worldData).start(address) -main() + +if __name__ == '__main__': + main() diff --git a/keybindings/default.json b/asciifarm/keybindings/default.json similarity index 100% rename from keybindings/default.json rename to asciifarm/keybindings/default.json diff --git a/maps/basement.json b/asciifarm/maps/basement.json similarity index 100% rename from maps/basement.json rename to asciifarm/maps/basement.json diff --git a/maps/begin.json b/asciifarm/maps/begin.json similarity index 100% rename from maps/begin.json rename to asciifarm/maps/begin.json diff --git a/maps/world.json b/asciifarm/maps/world.json similarity index 100% rename from maps/world.json rename to asciifarm/maps/world.json diff --git a/maps/worlddata.json b/asciifarm/maps/worlddata.json similarity index 100% rename from maps/worlddata.json rename to asciifarm/maps/worlddata.json diff --git a/minstarter.py b/asciifarm/minstarter.py similarity index 100% rename from minstarter.py rename to asciifarm/minstarter.py diff --git a/playgame.py b/asciifarm/playgame.py similarity index 99% rename from playgame.py rename to asciifarm/playgame.py index 3bed0fd..0060ad3 100755 --- a/playgame.py +++ b/asciifarm/playgame.py @@ -8,10 +8,11 @@ if sys.version_info[0] < 3: import argparse import getpass -import client +import json import os import os.path -import json + +from . import client thisPath = os.path.dirname(__file__) charMapPath = os.path.join(thisPath, "charmaps") diff --git a/asciifarm/server/__init__.py b/asciifarm/server/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/asciifarm/server/components/__init__.py b/asciifarm/server/components/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/server/components/alignment.py b/asciifarm/server/components/alignment.py similarity index 100% rename from server/components/alignment.py rename to asciifarm/server/components/alignment.py diff --git a/server/components/build.py b/asciifarm/server/components/build.py similarity index 95% rename from server/components/build.py rename to asciifarm/server/components/build.py index 7da4a17..aec3d81 100644 --- a/server/components/build.py +++ b/asciifarm/server/components/build.py @@ -1,5 +1,5 @@ +from .. import gameobjects -import gameobjects class Build: """ item type for item that can be placed on the map to become something more static (like buildable walls or crops)""" diff --git a/server/components/fighter.py b/asciifarm/server/components/fighter.py similarity index 98% rename from server/components/fighter.py rename to asciifarm/server/components/fighter.py index 8b5e392..a8c4d8b 100644 --- a/server/components/fighter.py +++ b/asciifarm/server/components/fighter.py @@ -1,6 +1,5 @@ - -import timeout -import utils +from .. import timeout +from .. import utils class Fighter: diff --git a/server/components/food.py b/asciifarm/server/components/food.py similarity index 100% rename from server/components/food.py rename to asciifarm/server/components/food.py diff --git a/server/components/grow.py b/asciifarm/server/components/grow.py similarity index 94% rename from server/components/grow.py rename to asciifarm/server/components/grow.py index ee9de3b..e60d070 100644 --- a/server/components/grow.py +++ b/asciifarm/server/components/grow.py @@ -1,6 +1,5 @@ - -import timeout -import gameobjects +from .. import timeout +from .. import gameobjects class Growing: diff --git a/server/components/harvest.py b/asciifarm/server/components/harvest.py similarity index 100% rename from server/components/harvest.py rename to asciifarm/server/components/harvest.py diff --git a/server/components/healing.py b/asciifarm/server/components/healing.py similarity index 100% rename from server/components/healing.py rename to asciifarm/server/components/healing.py diff --git a/server/components/inputcontroller.py b/asciifarm/server/components/inputcontroller.py similarity index 100% rename from server/components/inputcontroller.py rename to asciifarm/server/components/inputcontroller.py diff --git a/server/components/inventory.py b/asciifarm/server/components/inventory.py similarity index 100% rename from server/components/inventory.py rename to asciifarm/server/components/inventory.py diff --git a/server/components/item.py b/asciifarm/server/components/item.py similarity index 100% rename from server/components/item.py rename to asciifarm/server/components/item.py diff --git a/server/components/loot.py b/asciifarm/server/components/loot.py similarity index 97% rename from server/components/loot.py rename to asciifarm/server/components/loot.py index 9808a8a..0bf455a 100644 --- a/server/components/loot.py +++ b/asciifarm/server/components/loot.py @@ -1,7 +1,6 @@ - - -import gameobjects import random +from .. import gameobjects + class Loot: """ entities that have this component will drop loot on death """ diff --git a/server/components/monsterai.py b/asciifarm/server/components/monsterai.py similarity index 98% rename from server/components/monsterai.py rename to asciifarm/server/components/monsterai.py index 5171ad6..16ca45f 100644 --- a/server/components/monsterai.py +++ b/asciifarm/server/components/monsterai.py @@ -1,7 +1,7 @@ - -import pathfinding import random +from .. import pathfinding + class MonsterAi: diff --git a/server/components/move.py b/asciifarm/server/components/move.py similarity index 98% rename from server/components/move.py rename to asciifarm/server/components/move.py index a63548f..225bb6c 100644 --- a/server/components/move.py +++ b/asciifarm/server/components/move.py @@ -1,5 +1,4 @@ - -import timeout +from .. import timeout class Move: diff --git a/server/components/portal.py b/asciifarm/server/components/portal.py similarity index 100% rename from server/components/portal.py rename to asciifarm/server/components/portal.py diff --git a/server/components/randomwalkcontroller.py b/asciifarm/server/components/randomwalkcontroller.py similarity index 100% rename from server/components/randomwalkcontroller.py rename to asciifarm/server/components/randomwalkcontroller.py diff --git a/server/components/spawner.py b/asciifarm/server/components/spawner.py similarity index 96% rename from server/components/spawner.py rename to asciifarm/server/components/spawner.py index 0cb10fb..34f3a3d 100644 --- a/server/components/spawner.py +++ b/asciifarm/server/components/spawner.py @@ -1,6 +1,6 @@ +from .. import gameobjects +from .. import timeout -import timeout -import gameobjects class Spawner: diff --git a/server/components/target.py b/asciifarm/server/components/target.py similarity index 100% rename from server/components/target.py rename to asciifarm/server/components/target.py diff --git a/server/components/trap.py b/asciifarm/server/components/trap.py similarity index 100% rename from server/components/trap.py rename to asciifarm/server/components/trap.py diff --git a/server/entity.py b/asciifarm/server/entity.py similarity index 99% rename from server/entity.py rename to asciifarm/server/entity.py index b8a9d8e..ae8f6d8 100644 --- a/server/entity.py +++ b/asciifarm/server/entity.py @@ -1,6 +1,4 @@ - -import event - +from . import event class Entity: diff --git a/server/event.py b/asciifarm/server/event.py similarity index 100% rename from server/event.py rename to asciifarm/server/event.py diff --git a/server/faction.py b/asciifarm/server/faction.py similarity index 100% rename from server/faction.py rename to asciifarm/server/faction.py diff --git a/server/gameobjects.py b/asciifarm/server/gameobjects.py similarity index 87% rename from server/gameobjects.py rename to asciifarm/server/gameobjects.py index 25d63bb..76039df 100644 --- a/server/gameobjects.py +++ b/asciifarm/server/gameobjects.py @@ -1,23 +1,22 @@ - - import random -import entity -import faction -from entity import Entity -from components.item import Item -from components.randomwalkcontroller import RandomWalkController -from components.move import Move -from components.portal import Portal -from components.trap import Trap -from components.fighter import Fighter -from components.monsterai import MonsterAi -from components.spawner import Spawner -from components.grow import Growing -from components.alignment import Alignment -from components.loot import Loot -from components.build import Build -from components.harvest import Harvest -from components.food import Food + +from . import entity +from . import faction +from .entity import Entity +from .components.item import Item +from .components.randomwalkcontroller import RandomWalkController +from .components.move import Move +from .components.portal import Portal +from .components.trap import Trap +from .components.fighter import Fighter +from .components.monsterai import MonsterAi +from .components.spawner import Spawner +from .components.grow import Growing +from .components.alignment import Alignment +from .components.loot import Loot +from .components.build import Build +from .components.harvest import Harvest +from .components.food import Food """ This module contains factory functions for many placable entities, and a make function to call a factory by a string name """ diff --git a/server/gameserver.py b/asciifarm/server/gameserver.py similarity index 97% rename from server/gameserver.py rename to asciifarm/server/gameserver.py index 64c87a6..13c6b33 100644 --- a/server/gameserver.py +++ b/asciifarm/server/gameserver.py @@ -1,13 +1,13 @@ #! /usr/bin/python3 - import json -import server -import view -import player import queue +from . import view +from . import server +from . import player + class GameServer: diff --git a/server/grid.py b/asciifarm/server/grid.py similarity index 98% rename from server/grid.py rename to asciifarm/server/grid.py index 44fadd2..d88f0c8 100644 --- a/server/grid.py +++ b/asciifarm/server/grid.py @@ -1,5 +1,5 @@ +from . import utils -import utils class Grid: diff --git a/server/ground.py b/asciifarm/server/ground.py similarity index 98% rename from server/ground.py rename to asciifarm/server/ground.py index 5b50fe9..707ef7a 100644 --- a/server/ground.py +++ b/asciifarm/server/ground.py @@ -1,9 +1,10 @@ - import random -import event + +from . import event neighbourdirs = {"north":(0,-1), "south":(0,1), "east":(1,0), "west":(-1,0)} + class GroundPatch: def __init__(self, room, pos, sprite=' '): diff --git a/server/loader.py b/asciifarm/server/loader.py similarity index 99% rename from server/loader.py rename to asciifarm/server/loader.py index 33ca2b4..fd5c7d0 100644 --- a/server/loader.py +++ b/asciifarm/server/loader.py @@ -1,7 +1,7 @@ - import os.path import json + def loadRoom(roomPath): with open(roomPath) as roomFile: room = json.load(roomFile) @@ -9,6 +9,7 @@ def loadRoom(roomPath): room["places"][name] = tuple(pos) return room + def loadWorld(worldPath): with open(worldPath) as worldFile: diff --git a/server/mainloop.py b/asciifarm/server/mainloop.py similarity index 95% rename from server/mainloop.py rename to asciifarm/server/mainloop.py index bd20f7c..5944c32 100644 --- a/server/mainloop.py +++ b/asciifarm/server/mainloop.py @@ -1,9 +1,8 @@ - - -import gameserver import time -import world -import view + +from . import gameserver +from . import world +from . import view class Game: diff --git a/server/pathfinding.py b/asciifarm/server/pathfinding.py similarity index 100% rename from server/pathfinding.py rename to asciifarm/server/pathfinding.py diff --git a/server/player.py b/asciifarm/server/player.py similarity index 92% rename from server/player.py rename to asciifarm/server/player.py index a8b263b..8a08c75 100644 --- a/server/player.py +++ b/asciifarm/server/player.py @@ -1,13 +1,13 @@ +from .components.inventory import Inventory +from .components.inputcontroller import InputController +from .components.move import Move +from .components.fighter import Fighter +from .components.healing import Healing +from .components.alignment import Alignment +from .components.target import Target +from . import faction +from . import entity -from components.inventory import Inventory -from components.inputcontroller import InputController -from components.move import Move -from components.fighter import Fighter -from components.healing import Healing -from components.alignment import Alignment -from components.target import Target -import faction -import entity class Player: diff --git a/server/room.py b/asciifarm/server/room.py similarity index 96% rename from server/room.py rename to asciifarm/server/room.py index 29c521e..8cbd5d7 100644 --- a/server/room.py +++ b/asciifarm/server/room.py @@ -1,11 +1,11 @@ - import random -import ground -import gameobjects -import grid -import event -import entity -import roomdata + +from . import ground +from . import gameobjects +from . import grid +from . import event +from . import entity +from . import roomdata class Room: diff --git a/server/roomdata.py b/asciifarm/server/roomdata.py similarity index 100% rename from server/roomdata.py rename to asciifarm/server/roomdata.py diff --git a/server/server.py b/asciifarm/server/server.py similarity index 98% rename from server/server.py rename to asciifarm/server/server.py index 60d27ea..047754a 100644 --- a/server/server.py +++ b/asciifarm/server/server.py @@ -1,9 +1,9 @@ - -import sys -import socket -import threading import os -from tcommunicate import send, receive +import socket +import sys +import threading + +from .tcommunicate import send, receive # Class to open a TCP Socket diff --git a/server/tcommunicate.py b/asciifarm/server/tcommunicate.py similarity index 100% rename from server/tcommunicate.py rename to asciifarm/server/tcommunicate.py diff --git a/server/timeout.py b/asciifarm/server/timeout.py similarity index 100% rename from server/timeout.py rename to asciifarm/server/timeout.py diff --git a/server/utils.py b/asciifarm/server/utils.py similarity index 100% rename from server/utils.py rename to asciifarm/server/utils.py diff --git a/server/view.py b/asciifarm/server/view.py similarity index 98% rename from server/view.py rename to asciifarm/server/view.py index 9d69bff..e0c4373 100644 --- a/server/view.py +++ b/asciifarm/server/view.py @@ -1,5 +1,4 @@ - -import grid +from . import grid # this class extracts the data to send to the clients from the world diff --git a/server/world.py b/asciifarm/server/world.py similarity index 97% rename from server/world.py rename to asciifarm/server/world.py index ed1fd88..8ecfcbb 100644 --- a/server/world.py +++ b/asciifarm/server/world.py @@ -1,8 +1,7 @@ +from . import room +from . import player -import room -import player - # The World class is like the model in the MVC pattern (though the rest is not that clear) class World: diff --git a/shared/tcommunicate.py b/asciifarm/shared/tcommunicate.py similarity index 100% rename from shared/tcommunicate.py rename to asciifarm/shared/tcommunicate.py diff --git a/test/altbindings.json b/asciifarm/test/altbindings.json similarity index 100% rename from test/altbindings.json rename to asciifarm/test/altbindings.json diff --git a/test/altcharacters.json b/asciifarm/test/altcharacters.json similarity index 100% rename from test/altcharacters.json rename to asciifarm/test/altcharacters.json diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..86459ce --- /dev/null +++ b/setup.py @@ -0,0 +1,29 @@ +from setuptools import setup, find_packages + +setup( + name='asciifarm', + version='0.1.1', + description="Troido's tilde.town ASCII Farm", + long_description="TODO", + author="Troido", + author_email='troido@tilde.town', + url='http://tilde.town/~troido', + packages=find_packages(), + include_package_data=True, + data_files=[ + ('charmaps', ['asciifarm/charmaps/default.json', 'asciifarm/charmaps/fullwidth.json']), + ], + entry_points={ + 'console_scripts': [ + 'asciifarm = asciifarm.playgame:main', + 'hostfarm = asciifarm.hostfarms:main', + ], + }, + license='TODO', + install_requires=[ + # TODO: Put requirements here -wangofett, 2017-10-26 + ], + tests_require=[ + # TODO: put tests requirements here -wangofett, 2017-10-26 + ] +) diff --git a/startserver b/startserver deleted file mode 100755 index 9748278..0000000 --- a/startserver +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd "`dirname "$0"`" -./hostfarms.py $@ >stdout.log 2>stderr.log &