diff --git a/evennia/contrib/tutorial_world/intro_menu.py b/evennia/contrib/tutorial_world/intro_menu.py index faeeebc6c3..e482eec453 100644 --- a/evennia/contrib/tutorial_world/intro_menu.py +++ b/evennia/contrib/tutorial_world/intro_menu.py @@ -389,7 +389,7 @@ gaming style you like and possibly any new ones you can come up with! (aka MUDs, MUSHes, MUX, MOOs...). It is open-source and |wfree to use|n, also for commercial projects (BSD license). -Out of the box, Evennia provides a |wfull, if empty game|n. Whereas you can play +Out of the box, Evennia provides a |wworking, if empty game|n. Whereas you can play via traditional telnet MUD-clients, the server runs your game's website and offers a |wHTML5 webclient|n so that people can play your game in their browser without downloading anything extra. diff --git a/evennia/scripts/monitorhandler.py b/evennia/scripts/monitorhandler.py index 67dcf2b942..67b84eaf42 100644 --- a/evennia/scripts/monitorhandler.py +++ b/evennia/scripts/monitorhandler.py @@ -93,7 +93,7 @@ class MonitorHandler(object): def at_update(self, obj, fieldname): """ - Called by the field as it saves. + Called by the field/attribute as it saves. """ to_delete = [] diff --git a/evennia/server/inputfuncs.py b/evennia/server/inputfuncs.py index 1230b09928..47c36f9816 100644 --- a/evennia/server/inputfuncs.py +++ b/evennia/server/inputfuncs.py @@ -522,9 +522,8 @@ def webclient_options(session, *args, **kwargs): session=session, ) else: - # kwargs provided: persist them to the account object - for key, value in kwargs.items(): - clientoptions[key] = value + # kwargs provided: persist them to the account object. + clientoptions.update(kwargs) # OOB protocol-specific aliases and wrappers diff --git a/evennia/utils/dbserialize.py b/evennia/utils/dbserialize.py index ad41937ff9..9a3c77aeab 100644 --- a/evennia/utils/dbserialize.py +++ b/evennia/utils/dbserialize.py @@ -300,6 +300,10 @@ class _SaverDict(_SaverMutable, MutableMapping): def has_key(self, key): return key in self._data + @_save + def update(self, *args, **kwargs): + self._data.update(*args, **kwargs) + class _SaverSet(_SaverMutable, MutableSet): """ diff --git a/evennia/web/webclient/static/webclient/js/evennia.js b/evennia/web/webclient/static/webclient/js/evennia.js index 2deabb010d..d406db1453 100644 --- a/evennia/web/webclient/static/webclient/js/evennia.js +++ b/evennia/web/webclient/static/webclient/js/evennia.js @@ -268,12 +268,14 @@ An "emitter" object must have a function // Parse the incoming data, send to emitter // Incoming data is on the form [cmdname, args, kwargs] data = JSON.parse(data); + // console.log(" server->client:", data) Evennia.emit(data[0], data[1], data[2]); }; } var msg = function(data) { // send data across the wire. Make sure to json it. + // console.log("client->server:", data) websocket.send(JSON.stringify(data)); };