From 0b021ee06fc2df954050d696a0a3cfa29ea7c60f Mon Sep 17 00:00:00 2001 From: troido Date: Sun, 15 Oct 2017 23:30:31 +0200 Subject: [PATCH] initial commit --- .gitignore | 1 + client/characters.json | 17 ++ client/client.py | 133 ++++++++ client/connection.py | 23 ++ client/screen.py | 36 +++ hostgame.py | 25 ++ licence.md | 674 +++++++++++++++++++++++++++++++++++++++++ playgame.py | 29 ++ server/gameobjects.py | 153 ++++++++++ server/gameserver.py | 76 +++++ server/grid.py | 75 +++++ server/ground.py | 69 +++++ server/mainloop.py | 72 +++++ server/placable.py | 14 + server/player.py | 48 +++ server/playerent.py | 95 ++++++ server/room.py | 99 ++++++ server/server.py | 77 +++++ server/view.py | 55 ++++ server/world.py | 59 ++++ server/worldgen.py | 44 +++ shared/tcommunicate.py | 32 ++ 22 files changed, 1906 insertions(+) create mode 100644 .gitignore create mode 100644 client/characters.json create mode 100755 client/client.py create mode 100644 client/connection.py create mode 100644 client/screen.py create mode 100755 hostgame.py create mode 100644 licence.md create mode 100755 playgame.py create mode 100644 server/gameobjects.py create mode 100644 server/gameserver.py create mode 100644 server/grid.py create mode 100644 server/ground.py create mode 100644 server/mainloop.py create mode 100644 server/placable.py create mode 100644 server/player.py create mode 100644 server/playerent.py create mode 100644 server/room.py create mode 100644 server/server.py create mode 100644 server/view.py create mode 100644 server/world.py create mode 100644 server/worldgen.py create mode 100644 shared/tcommunicate.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..61f2dc9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +**/__pycache__/ diff --git a/client/characters.json b/client/characters.json new file mode 100644 index 0000000..358d2d5 --- /dev/null +++ b/client/characters.json @@ -0,0 +1,17 @@ +{ + "ascii":{ + "tree": "T", + "wall": "#", + "rock": "X", + "stone": "o", + "player": "@", + "ground": ".", + "grass1": ",", + "grass2": "'", + "grass3": "`", + "rabbit": "r", + "water": "~", + "floor": "+", + " ": " " + } +} diff --git a/client/client.py b/client/client.py new file mode 100755 index 0000000..b960bde --- /dev/null +++ b/client/client.py @@ -0,0 +1,133 @@ +#! /usr/bin/python3 + +import sys + +import curses +import threading +#import logging +import json +import getpass +import argparse +from connection import Connection +from screen import Screen + +# todo: remove references to tron + +#logging.basicConfig(filename="client.log", filemode='w', level=logging.DEBUG) + + +class Client: + + def __init__(self, stdscr, name="___", address="/tmp/tron_socket", spectate=False): + self.stdscr = stdscr + self.screen = Screen(stdscr) + + self.name = name + + self.keepalive = True + + self.connection = Connection() + self.connection.connect(address) + + self.lastoutputstring = None + self.lastinfostring = None + + if not spectate: + self.connection.send(json.dumps({"name":name})) + + self.fieldWidth = 0 + self.fieldHeight = 0 + + with open("client/characters.json") as f: + self.characters = json.load(f)['ascii'] + + threading.Thread(target=self.listen, daemon=True).start() + 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 'error' in data: + if data['error'] == "nametaken": + print("error: name is already taken", file=sys.stderr) + self.close() + if 'field' in data: + self.fieldWidth = data['field']['width'] + self.fieldHeight = data['field']['height'] + fieldCells = data['field']['field'] + mapping = data['field']['mapping'] + #print(mapping['0']) + outputstring = '\n'.join( + ''.join( + self.characters.get(mapping[fieldCells[x + y*self.fieldWidth]], '?') for x in range(self.fieldWidth) + ) for y in range(self.fieldHeight) + ) + if outputstring != self.lastoutputstring: + self.screen.put(outputstring, self.fieldWidth, self.fieldHeight) + self.lastoutputstring = outputstring + #else: + #self.screen.put('_'*100) + if 'info' in data: + infostring = json.dumps(data['info'], indent=2) + if infostring != self.lastinfostring: + self.screen.putPlayers(infostring, self.fieldWidth+2) + self.lastinfostring = infostring + self.screen.refresh() + + def command_loop(self): + + commands = { + ord("w"): "north", + curses.KEY_UP: "north", + ord("s"): "south", + curses.KEY_DOWN: "south", + ord("d"): "east", + curses.KEY_RIGHT: "east", + ord("a"): "west", + curses.KEY_LEFT: "west", + ord("e"): "take", + ord("q"): "drop", + ord("W"): "fastnorth", + ord("S"): "fastsouth", + ord("D"): "fasteast", + ord("A"): "fastwest" + } + + while self.keepalive: + key = self.stdscr.getch() + if key == 27: + self.keepalive = False + if key in commands: + self.connection.send(json.dumps({"input":commands[key]})) + + +def main(name, socket, spectate=False): + + + def start(stdscr): + client = Client(stdscr, name, socket, spectate) + + curses.wrapper(start) + + +if __name__ == "__main__": + + parser = argparse.ArgumentParser() + parser.add_argument('-n', '--name', help='Your player name (must be unique!). Defaults to username', default=getpass.getuser()) + parser.add_argument('-s', '--socket', help='The socket file to connect to. Defaults to /tmp/tron_socket', default="/tmp/tron_socket") + parser.add_argument('-p', '--spectate', help='Join as spectator', action="store_true") + args = parser.parse_args() + + main(args.name, args.socket, args.spectate) + + diff --git a/client/connection.py b/client/connection.py new file mode 100644 index 0000000..d1f7ead --- /dev/null +++ b/client/connection.py @@ -0,0 +1,23 @@ + +import socket + +from tcommunicate import send, receive + +class Connection: + + def __init__(self): + self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + + def connect(self, address): + self.sock.connect(address) + + def listen(self, callback, onError): + while True: + try: + data = receive(self.sock) + except Exception as err: + onError(err) + callback(data) + + def send(self, message): + send(self.sock, bytes(message, 'utf-8')) diff --git a/client/screen.py b/client/screen.py new file mode 100644 index 0000000..5a71b5c --- /dev/null +++ b/client/screen.py @@ -0,0 +1,36 @@ + +import curses + +class Screen: + + + def __init__(self, stdscr): + curses.curs_set(0) + self.height, self.width = stdscr.getmaxyx() + self.stdscr = stdscr + self.fieldpad = curses.newpad(100,200) + self.playerpad = curses.newpad(100,100) + self.changed = False + + + def put(self, field, width, height): + #self.fieldpad.clear() + #if ( + self.fieldpad.addstr(0, 0, field) + self.height, self.width = self.stdscr.getmaxyx() + self.fieldpad.noutrefresh(0,0,0,0,min(height, self.height-1), min(width, self.width-1)) + self.changed = True + + def putPlayers(self, players, x=0, y=0): + self.playerpad.clear() + self.playerpad.addstr(0, 0, players) + self.height, self.width = self.stdscr.getmaxyx() + #print(x, y, self.width, self.height) + if x < self.width and y < self.height: + self.playerpad.noutrefresh(0,0,y,x,self.height-1,self.width-1) + self.changed = True + + def refresh(self): + if self.changed: + curses.doupdate() + self.changed = False diff --git a/hostgame.py b/hostgame.py new file mode 100755 index 0000000..22817a8 --- /dev/null +++ b/hostgame.py @@ -0,0 +1,25 @@ +#! /usr/bin/python3 + + +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/") +sys.path.append(sys.path[0]+"/shared/") +import mainloop +import argparse + +parser = argparse.ArgumentParser() +parser.add_argument('-s', '--socket', help=""" +The address of the socket.\n +If this starts with a null byte, it is an abstract socket (this is usually what you want).\n +Otherwise it is a unix file (which you could give permissions)\n +Defaults to \\0roomtest\n +\n +When using a file as socket you will have to remove the file manually after execution (it is suggested to make it in /tmp)""", default="\0roomtest") +args = parser.parse_args() + +mainloop.Game().start(args.socket) diff --git a/licence.md b/licence.md new file mode 100644 index 0000000..9cecc1d --- /dev/null +++ b/licence.md @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/playgame.py b/playgame.py new file mode 100755 index 0000000..90270c9 --- /dev/null +++ b/playgame.py @@ -0,0 +1,29 @@ +#! /usr/bin/python3 + +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]+"/client/") +sys.path.append(sys.path[0]+"/shared/") + +import argparse +import getpass +import client + + +parser = argparse.ArgumentParser(description="The client to Vamok World aka Project Doggo 2017. Run this to connect to to the server.", epilog=""" +Gameplay information: + Control your player with the arrow keys or wasd. Press escape to exit. + You can pick up something with the 'e' key, and drop whatever you're holding with 'q'. + Currently you can't do much more than walking around and moving stones. + +~Troido""", formatter_class=argparse.RawDescriptionHelpFormatter) +parser.add_argument('-n', '--name', help='Your player name (must be unique!). Defaults to username', default=getpass.getuser()) +parser.add_argument('-s', '--socket', help='The socket address to connect to. Defaults to \0roomtest\nIf the addres starts with a null byte it is treated as abstract address (usually what you want), Otherwise it is treated as a unix filename', default="\0roomtest") +parser.add_argument('-p', '--spectate', help='Join as spectator', action="store_true") +args = parser.parse_args() + +client.main(args.name, args.socket, args.spectate) diff --git a/server/gameobjects.py b/server/gameobjects.py new file mode 100644 index 0000000..ec906f6 --- /dev/null +++ b/server/gameobjects.py @@ -0,0 +1,153 @@ + + +from placable import GameObject +import playerent +import random + +class Wall(GameObject): + + char = 'wall' + size = 2 + attributes = { + "solid", + } + + +class Rock(GameObject): + + char = 'rock' + size = 10 + attributes = { + "solid", + } + + + +class Tree(GameObject): + + char = 'tree'# 🌳♣♠𐇲𐂷 + size = 3 + attributes = { + "solid", + } + + +class Stone(GameObject): + + char = 'stone' # • + size = 0.2 + attributes = { + "takable", + } + + +class Grass(GameObject): + + size = 0.15 + + def __init__(self, *args): + self.char = random.choice(["ground", "grass1", "grass2", "grass3"]) + +class Floor(GameObject): + + char = "floor" + size = 0.1 + +class Ground(GameObject): + + char = "ground" + size = 0.1 + +class Water(GameObject): + + char = "water" + size = 0.1 + attributes = { + "solid" + } + + +#class MapExit(GameObject): + + #char = "$" + + #def __init__(self) + +## not really compatible yet +#class Rabbit(GameObject): + + #char = 'rabbit' + #size = 2 + #direction = None + #attributes = {} + #slowness = 8 + + #def __init__(self, x, y, field, game, name=None): + #self.controller = {} + #self.game = game + #self.name = name or str(id(self)) + #self.x = x + #self.y = y + #self.ground = None + #self.field = field + #self.place(x, y) + #self.holding = None + #self.moveCooldown = random.randrange(self.slowness) + #game.addUpdateListener(self.update, self) + + + #def place(self, x, y): + #if self.field: + #self.field.removeObj(self.x, self.y, self) + #self.field.addObj(x, y, self) + #self.ground = self.field.get(x,y) + #self.x = x + #self.y = y + + + #def update(self): + #self.moveCooldown = max(self.moveCooldown-1, 0) + + #action = random.choice(["north", "east", "south", "west", "", "", "", ""]) + #if action in {"north", "east", "south", "west"} and self.moveCooldown <= 0: + #direction = action + #dx = (direction == "east") - (direction == "west") + #dy = (direction == "south") - (direction == "north") + + #newx = self.x + dx + #newy = self.y + dy + + #if self.field.get(newx, newy).accesible(): + #self.place(newx, newy) + #self.moveCooldown = self.slowness + + + + #def remove(self): + ##self.game.removePlayer(self.name) + #self.field.removeObj(self.x, self.y, self) + #self.game.removeUpdateListener(self) + + + + + + + + +objectdict = { + "wall": Wall, + "tree": Tree, + "player": playerent.Player, + "stone": Stone, + "rock": Rock, + "rabbit": Rabbit, + "grass": Grass, + "water": Water, + "floor": Floor, + "ground": Ground + } + + +def makeObject(name, *args, **kwargs): + return objectdict[name](*args, **kwargs) diff --git a/server/gameserver.py b/server/gameserver.py new file mode 100644 index 0000000..2a4543b --- /dev/null +++ b/server/gameserver.py @@ -0,0 +1,76 @@ +#! /usr/bin/python3 + + + +import json +import server +import view +import player +import queue + + +class GameServer: + + + def __init__(self, game): + + self.serv = server.Server(self.newConnection, self.receive, self.close) + + self.connections = {} + + self.players = {} + + self.game = game + + self.messages = queue.Queue() + + def start(self, address): + self.serv.start(address) + + def sendState(self, view): + + for connection, name in list(self.connections.items()): + + data = view.playerView(name) + databytes = bytes(json.dumps(data), 'utf-8') + + self.serv.send(connection, databytes) + + def newConnection(self, n): + pass + + def receive(self, n, data): + data = json.loads(data.decode('utf-8')) + if "name" in data: + name = data["name"] + + if name in self.players: + self.serv.send(n, bytes(json.dumps({"error":"nametaken"}), "utf-8")) + else: + self.connections[n] = name + self.players[name] = n + self.messages.put(("join", name)) + print("new player: "+name) + + if "input" in data: + #c.data = data["input"] + if n in self.connections: + self.messages.put(("input", self.connections[n], data["input"])) + + def close(self, connection): + if connection in self.connections: + name = self.connections[connection] + del self.connections[connection] + del self.players[name] + self.messages.put(("leave", name)) + print("player "+name+" left") + + + def readMessages(self): + m = [] + while not self.messages.empty(): + m.append(self.messages.get()) + return m + + + diff --git a/server/grid.py b/server/grid.py new file mode 100644 index 0000000..e8cf469 --- /dev/null +++ b/server/grid.py @@ -0,0 +1,75 @@ + + +class Grid: + + + def __init__(self, width, height, default=0): + self.width = width + self.height = height + self.clear(default) + + def clear(self, value): + self.grid = [value for i in range(self.width*self.height)]; + + def isValid(self, x, y): + return x>=0 and y>=0 and x topObj.size: + topObj = obj + return topObj + + def getChar(self): + return self.char diff --git a/server/mainloop.py b/server/mainloop.py new file mode 100644 index 0000000..c53d54f --- /dev/null +++ b/server/mainloop.py @@ -0,0 +1,72 @@ + + +import gameserver +import room +import argparse +#import threading +import time +#import os +#import signal +import sys +import world +import view +import worldgen + + +class Game: + + def __init__(self): + + self.server = gameserver.GameServer(self) + + self.world = world.World(worldgen.generateWorld()) + + self.view = view.View(self.world) + + + def start(self, address): + + self.server.start(address) + + self.game_loop() + + + def game_loop(self): + + keepRunning = True + while keepRunning: + + self.update() + self.sendState() + time.sleep(0.05) + + def update(self): + + messages = self.server.readMessages() + + for msg in messages: + t = msg[0] + name = msg[1] + if t == "join": + self.world.makePlayer(name) + elif t == "leave": + self.world.removePlayer(name) + elif t == "input": + self.world.controlPlayer(name, msg[2]) + + + self.world.update() + + def sendState(self): + + self.server.sendState(self.view) + + + + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument('-s', '--socket', help='The socket file to listen to. Use this if the default socket exists already.\nWARNING: if the given file exists it will be overwritten.\nDefaults to /tmp/tron_socket', default="/tmp/tron_socket") + args = parser.parse_args() + + Game().start(args.socket) diff --git a/server/placable.py b/server/placable.py new file mode 100644 index 0000000..3fce11c --- /dev/null +++ b/server/placable.py @@ -0,0 +1,14 @@ + + + +class GameObject: + + char = '' + size = 0 + attributes = {} + + def __init__(self, *args): + pass + + def getChar(self): + return self.char diff --git a/server/player.py b/server/player.py new file mode 100644 index 0000000..57c39b2 --- /dev/null +++ b/server/player.py @@ -0,0 +1,48 @@ + +import playerent + +class Player: + + def __init__(self, name): + + self.name = name + + self.room = None + #self.pos = (0,0) + + self.entity = None + + self.data = {} + + self.controller = {} + + def updateData(self): + if self.entity: + pass + #self.data = self.entity.toJSON + + def leaveRoom(self): + self.entity.remove() + + def joinRoom(self, room, place=None): + if self.entity: + self.leaveRoom() + self.room = room + pos = place or room.getEntrance() + self.entity = playerent.Player(pos, room) + self.entity.setController(self.controller) + room.addObj(pos, self.entity) + + def getRoom(self): + return self.room + + def getInventory(self): + if self.entity: + return self.entity.holding + else: + return None + + def control(self, action): + self.controller["action"] = action + #return self.controller + diff --git a/server/playerent.py b/server/playerent.py new file mode 100644 index 0000000..9034a79 --- /dev/null +++ b/server/playerent.py @@ -0,0 +1,95 @@ + +from placable import GameObject + + +class Player(GameObject): + + char = 'player' + size = 2 + direction = None + attributes = {} + slowness = 2 + + def __init__(self, pos, room, name=None): + self.controller = {} + self.room = room + self.name = name or str(id(self)) + #self.char = self.name[0] + x, y = pos + self.x = x + self.y = y + #self.ground = None + self.place((x, y)) + self.holding = None + self.moveCooldown = 0 + #self.direction = random.choice(["north", "south", "east", "west"]) + room.addUpdateListener(self.update, self) + + def setController(self, controller): + self.controller = controller + + def place(self, pos): + x, y = pos + self.room.removeObj((self.x, self.y), self) + self.room.addObj((x, y), self) + #self.ground = self.room.get(x, y) + self.x = x + self.y = y + + + def update(self): + self.moveCooldown = max(self.moveCooldown-1, 0) + + if "action" in self.controller: + action = self.controller["action"] + + if action in {"north", "east", "south", "west"} and self.moveCooldown <= 0: + direction = action + dx = (direction == "east") - (direction == "west") + dy = (direction == "south") - (direction == "north") + + newx = self.x + dx + newy = self.y + dy + + if self.room.accessible((newx, newy)): + self.place((newx, newy)) + self.moveCooldown = self.slowness + + + if action in {"fastnorth", "fasteast", "fastsouth", "fastwest"}: + direction = action + dx = (direction == "fasteast") - (direction == "fastwest") + dy = (direction == "fastsouth") - (direction == "fastnorth") + + dx *= 10 + dy *= 10 + + newx = self.x + dx + newy = self.y + dy + + if self.room.accessible((newx, newy)): + self.place((newx, newy)) + + #place = self.room.get((self.x, self.y)) + + if action == "drop" and self.holding: + self.room.addObj((self.x, self.y), self.holding) + self.holding = None + + if action == "take" and not self.holding: + #place = self.field.get(self.x, self.y) + for obj in self.room.getObjs((self.x, self.y)): + if "takable" in obj.attributes: + self.room.removeObj((self.x, self.y), obj) + self.holding = obj + break + + #del self.controller["action"] + + def remove(self): + #self.game.removePlayer(self.name) + self.room.removeObj((self.x, self.y), self) + self.room.removeUpdateListener(self) + + + diff --git a/server/room.py b/server/room.py new file mode 100644 index 0000000..6348a0b --- /dev/null +++ b/server/room.py @@ -0,0 +1,99 @@ + +import random +import ground +import playerent +import gameobjects +from gameobjects import Wall +import grid + +_listType = type([]) +_stringType = type("hello") +_noneType = type(None) +_tupleType = type(()) +_dictType = type({}) + +class Room: + + + def __init__(self, name, data): + self.name = name + self.players = {} + self.width = data["width"] + self.height = data["height"] + self.updateListeners = {} + self.entrance = (10, 5) + + self.field = {} + + g = grid.fromDict(data) + for x in range(g.width): + for y in range(g.height): + val = g.get(x, y) + if isinstance(val, _stringType) : + val = [val] + for obj in val: + if isinstance(obj, _stringType): + self.addObj((x, y), gameobjects.makeObject(obj)) + elif isinstance(obj, _dictType): + t = obj["type"] + args = obj.get("args", []) + kwargs = obj.get("kwargs", {}) + self.addObj((x, y), gameobjects.makeObject(objtype, *args, **kwargs)) + + #for x in range(self.width): + #self.addObj((x, 0), Wall()) + #self.addObj((x, self.height-1), Wall()) + #for y in range(1,self.height-1): + #self.addObj((0, y), Wall()) + #self.addObj((self.width-1, y), Wall()) + + + def getEntrance(self): + return self.entrance + + def getController(self, name): + return self.players[name].getControlInterface() + + def update(self): + for listener in frozenset(self.updateListeners.values()): + listener() + + def addUpdateListener(self, listener, key=None): + if (key == None): + key = listener + self.updateListeners[key] = listener + + def removeUpdateListener(self, key): + self.updateListeners.pop(key, None) + + def getChar(self, pos): + #x, y = pos + return self._getGround(pos).getTopObj().getChar() + + def isValidPos(self, pos): + x, y = pos + return x >= 0 and y >= 0 and x < self.width and y < self.height + + def _getGround(self, pos): + if pos not in self.field and self.isValidPos(pos): + groundPatch = ground.GroundPatch() + self.field[pos] = groundPatch + return self.field.get(pos) + + #def get(self, pos): + #return self._getGround(pos) + + def addObj(self, pos, obj): + self._getGround(pos).addObj(obj) + + def removeObj(self, pos, obj): + self._getGround(pos).removeObj(obj) + + def getObjs(self, pos): + return self._getGround(pos).getObjs() + + def accessible(self, pos): + ground = self._getGround(pos) + return ground and ground.accessible() + + diff --git a/server/server.py b/server/server.py new file mode 100644 index 0000000..a1966b5 --- /dev/null +++ b/server/server.py @@ -0,0 +1,77 @@ + +import sys +import socket +import threading +import os +from tcommunicate import send, receive + + +# Class to open a TCP Unix Domain Socket +# will execute callback functions on new connections, closing connections and received messages +# also provides a send function + +class Server: + + + def __init__(self, onConnection=(lambda *_:None), onMessage=(lambda *_:None), onConnectionClose=(lambda *_:None)): + self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + self.onConnection = onConnection + self.onMessage = onMessage + self.onConnectionClose = onConnectionClose + + + def start(self, address): + print("starting server on address", address) + try: + self.sock.bind(address) + except PermissionError: + print("You don't have permission to use this socket file.\nRun the server with the '-s' option to specify another socket file path.\nWARNING: if an existing file is given, it will be overwritten.") + sys.exit(-1) + except OSError: + print("Unable to create a socket file.\nMost likely this means that a server is already running and using the socket file, or the execution of this program didn't clean up well.\nIf no other server is running, try removing "+address+".\nIf you can't specify another socket file with the -s option (and tell all players to connect to that)") + sys.exit(-1) + + self.sock.listen() + + self.listener = threading.Thread(target=self._listen, daemon=True) + self.listener.start() + + + def _listen(self): + self.connections = set() + print("listening") + while True: + connection, client_address = self.sock.accept() + listener = threading.Thread(target=self._listenCon, args=(connection,), daemon=True) + listener.start() + + def _listenCon(self, connection): + #print(connection.getsockopt(socket.SOL_SOCKET, socket.SO_PEERCRED)) + self.connections.add(connection) + self.onConnection(connection) + data = receive(connection) + while data: + self.onMessage(connection, data) + try: + data = receive(connection) + except socket.error: + break + if not len(data): + break + self.connections.discard(connection) + self.onConnectionClose(connection) + + + + def send(self, connection, msg): + try: + send(connection, msg) + except: + self.connections.discard(connection) + self.onConnectionClose(connection) + print("failed to send to client") + + def broadcast(self, msg): + for connection in frozenset(self.connections): + self.send(connection, msg) + diff --git a/server/view.py b/server/view.py new file mode 100644 index 0000000..20f6c9f --- /dev/null +++ b/server/view.py @@ -0,0 +1,55 @@ + +import grid + +# this class extracts the data to send to the clients from the world + + +class View: + + def __init__(self, world): + self.world = world + + + def viewRoom(self, room): + if not room: + return None + width = room.width + height = room.height + screen = grid.Grid(width, height) + for x in range(width): + for y in range(height): + screen.set(x, y, room.getChar((x, y))) + return screen.toDict() + + def roomView(self, roomName): + room = self.world.getRoom(roomName) + return self.viewRoom(room) + + def playerView(self, playerName): + player = self.world.getPlayer(playerName) + field = self.viewRoom(player.getRoom()) + #print(player.getRoom()) + holding = player.getInventory() + data = { + "type": "fullupdate", + "info":{ + "holding": holding.char if holding else "nothing" + #"ground": [obj.char for obj in player.ground.getObjs()] + } + } + if field: + data["field"] = field + + return data + +def view(room): + width = room.width + height = room.height + + screen = grid.Grid(width, height) + + for x in range(width): + for y in range(height): + screen.set(x, y, room.getChar((x, y))) + + return screen diff --git a/server/world.py b/server/world.py new file mode 100644 index 0000000..640d799 --- /dev/null +++ b/server/world.py @@ -0,0 +1,59 @@ + + +import room +import player + +# The World class is like the model in the MVC pattern (though the rest is not that clear) + +class World: + + def __init__(self, data={}): + + self.rooms = {} + + self.players = {} + + for roomname, roomdata in data.items(): + self.makeRoom(roomname, roomdata) + #self.makeRoom("begin", {"width": 64, "height": 32}) + + + def makePlayer(self, name, data=None): + if name in self.players: + #raise Exception("Can not make new player with the name of an existing player") + pl = self.players[name] + else: + pl = player.Player(name) + self.players[name] = pl + pl.joinRoom(self.rooms["begin"]) + return pl + + def makeRoom(self, name, data): + ro = room.Room(name, data) + self.rooms[name] = ro + return ro + + def update(self): + + for r in self.rooms.values(): + r.update() + + for player in self.players: + self.controlPlayer(player, None) + + def getPlayer(self, playername): + return self.players[playername] + + def getRoom(self, roomname): + return self.rooms.get(roomname) + + def controlPlayer(self, playername, action): + self.players[playername].control(action) + #return self.players[playername].getController() + + def removePlayer(self, name): + if name not in self.players: + return + pl = self.players[name] + pl.leaveRoom() + diff --git a/server/worldgen.py b/server/worldgen.py new file mode 100644 index 0000000..4df522b --- /dev/null +++ b/server/worldgen.py @@ -0,0 +1,44 @@ + +import grid + + + +# module for generating some test rooms. should probably be replaced + +def generateBeginRoom(): + + g = grid.Grid(64, 32, "grass") + + + + for x in range(20, 41): + for y in range(15, 26): + g.set(x, y, "ground") + + for x in range(20, 41): + g.set(x, 15, "wall") + g.set(x, 25, "wall") + + for y in range(16, 25): + g.set(20, y, "wall") + g.set(40, y, "wall") + + g.set(20, 19, "ground") + g.set(20, 20, "ground") + + for x in range(25, 32): + for y in range(6, 11): + g.set(x, y, "water") + for x in range(24, 34): + for y in range(7, 10): + g.set(x, y, "water") + + g.set(3, 8, ["grass", "stone"]) + + return g.toDict() + + +def generateWorld(): + return { + "begin": generateBeginRoom() + } diff --git a/shared/tcommunicate.py b/shared/tcommunicate.py new file mode 100644 index 0000000..b1fc1b0 --- /dev/null +++ b/shared/tcommunicate.py @@ -0,0 +1,32 @@ + +HEADER_SIZE = 4 + + +# this module is for sending discree messages over TCP +# this is achieved by prefixing all messages with their length +# calls to send and recv will also keep attempting to send all data unless this proves impossible + + +def send(sock, msg): + length = len(msg) + header = length.to_bytes(4, byteorder="big") + totalmsg = header + msg + sock.sendall(totalmsg) + +def receive(sock): + header = recvall(sock, 4) #sock.recv(4) + length = int.from_bytes(header, byteorder="big") + return recvall(sock, length) + +def recvall(sock, length): + chunks = [] + bytes_recd = 0 + while bytes_recd < length: + chunk = sock.recv(min(length - bytes_recd, 4096)) + if chunk == b'': + break + #raise RuntimeError("socket connection broken") + chunks.append(chunk) + bytes_recd = bytes_recd + len(chunk) + return b''.join(chunks) +