Commit Graph

433 Commits

Author SHA1 Message Date
troido 1738f9dcfc clear a fieldcell before redrawing another character 2018-01-18 22:14:35 +00:00
troido 061b615db6 improved serialization again 2018-01-18 18:08:26 +01:00
troido ab29246ffd removed debug part of map that shouldn't have been committed 2018-01-18 17:29:59 +01:00
troido a8ca7042e2 fixed some issues with serialization and deserialization 2018-01-18 16:50:35 +01:00
troido 1ec1ad2cda better serialization for simple entities 2018-01-17 22:24:14 +01:00
troido 2dca06a9c0 saving now uses relative package names 2018-01-17 21:27:55 +01:00
troido b5c0da2cef fixed selectorvalue crash and selector disappearing when selected is removed 2018-01-17 21:26:52 +01:00
troido bde1baa51b refactored server: sort of unified object creation 2018-01-17 20:56:04 +01:00
troido d554669d1b updated maps and refactored client: renamed display parts and removed selector 2018-01-17 20:26:16 +01:00
troido 5e0514ddbd created buildable doors (that regain full health when opened/closed 2018-01-16 13:26:30 +01:00
troido c06e1c9b27 tildename is only the default when connecting over UDS, otherwise username 2018-01-16 13:10:16 +01:00
troido 0a0b34dbb9 provided code to set title of list menu 2018-01-15 23:12:11 +01:00
troido b146e7762a name is now set properly even if save is invalid 2018-01-15 18:41:45 +01:00
troido c94ce5d8f3 made simple doors 2018-01-15 17:46:30 +01:00
troido 67641536db changed rabbits into bunnies to avoid confusion with rats 2018-01-15 15:51:50 +01:00
troido 04f252fe31 fighting directions are now chosen in the order as defined in keybindings 2018-01-15 12:39:49 +01:00
jmdejong b9762917cc
Merge pull request #2 from login000/master
xcv correspond to ground, inventory, equipment
2018-01-15 10:02:20 +01:00
login000 461fa199b2 xcv correspond to ground, inventory, equipment
xcv now correspond to ground, inventory, equipment. This is the same as
their top-down order displayed in asciifarm’s ui’s sidebar.
2018-01-15 16:12:39 +11:00
troido 81003e61a1 changed how interactions work. Can now interact with adjacent objects 2018-01-14 23:52:19 +01:00
troido dfaf42e583 reduced number of rats spawning 2018-01-14 21:33:49 +01:00
troido 651a9a2e1c added rats as source of seeds. fixed default char error. brought WASD for directional attacks back 2018-01-14 21:27:46 +01:00
troido 942b30ebbd limited wall-building 2018-01-14 13:22:34 +01:00
troido 7a3f67ae02 fixed crash when ground is not set 2018-01-12 16:52:08 +01:00
troido 489cc1b680 client doesn't crash anymore when resizing the screen 2018-01-12 16:47:46 +01:00
troido 06fc0a5b00 now killserver saves before quitting 2018-01-12 16:18:23 +01:00
troido 5c9364a64b made wounds that flash the background red when an entity is attacked 2018-01-12 15:49:37 +01:00
troido 20570c3cdb made entity factories in gameobjects.py into lambda functions 2018-01-12 12:54:37 +01:00
troido 9c6ad01f4c wrote documentation for the map format 2018-01-12 12:29:35 +01:00
troido 616cfcd900 fixed bug where loaded buildable would crash when trying to build. Set save interval to 30 seconds. updated docs and todo 2018-01-12 10:55:17 +01:00
troido 68f16fdea4 Merge branch 'master' of github.com:jmdejong/Asciifarm 2018-01-11 22:45:35 +01:00
troido e871be3d23 create savedirs if they don't exist and update todo list 2018-01-11 22:45:32 +01:00
jmdejong add930f7f7
Merge pull request #1 from rakiru/code-review
Code review
2018-01-11 22:44:20 +01:00
rakiru e8d0bd4e51 Fix overly-broad `except` 2018-01-11 20:50:21 +00:00
rakiru d323e0e572 Fix potential error if given invalid socket type 2018-01-11 20:28:03 +00:00
rakiru 895a5c91a5 Fix attempt to use non-existent name
This theoretically also changes the meaning of the code from running
the callback always, to only running the callback when there wasn't an
error, which is what I'm assuming was meant, but in pratical terms,
attempting to use `data` in the case of an error would have raised a
`NameError` anyway.

`else` on a try block will only run if nothing was raised.
2018-01-11 20:25:39 +00:00
rakiru d29da0abbc Remove redundant semicolon 2018-01-11 19:23:48 +00:00
rakiru 79c9cc5b9e Replace None equality checks with identity checks
Both work, but the identity check is the more correct/idiomatic
approach (and also ever-so-slightly more efficient).
2018-01-11 19:19:58 +00:00
rakiru 6ceb306b89 Fix mutable default args
Some of these could also be changed to do

    self.thing = thing or []

instead of

    if thing is None:
        thing = []
    self.thing = thing

but I took the conservative route because I wasn't sure on opinions
2018-01-11 18:33:30 +00:00
rakiru c16c418745 Ignore IntelliJ-based IDE project directory 2018-01-11 18:28:16 +00:00
troido 5e70f66326 added reserved tildenames server-side, increased save interval and fixed players logging in between save interval not being saved 2018-01-10 17:39:28 +01:00
troido 0439c5c9e2 started tildenames client-side 2018-01-10 17:18:29 +01:00
troido f3ff1525e2 worldtemplate now constructs the room (I hope this is a good idea) 2018-01-04 17:49:00 +01:00
troido 16241fea60 no quotes necessary anymore in keybindings keys. Added some macros 2018-01-04 14:05:06 +01:00
troido 80af6af336 world loads rooms from a WorldTemplate, paving the road for runtime-created rooms 2018-01-04 14:03:51 +01:00
troido a351aa1f7c added contributing suggestions 2018-01-04 14:01:42 +01:00
troido 21e88c05d8 changed KEY_ENTER into NEWLINE. made separate module for naming keys 2018-01-03 23:52:03 +01:00
troido f6009eb181 fixed long lines messing up chat. fixed global chat 2018-01-03 20:58:26 +01:00
troido 6bb92dd44d actually made global chat default 2018-01-03 20:27:32 +01:00
troido 090391f650 added world chat and made it default 2018-01-03 20:14:37 +01:00
troido c1461a5d7d fixed keymap doc 2018-01-03 19:32:23 +01:00