Commit graph

76 commits

Author SHA1 Message Date
Griatch
fcb6f19287 Reproduce latest PR fix for develop 2020-10-12 21:11:08 +02:00
Griatch
0df87037e7 Ran black on sources, add black config 2020-07-27 21:09:13 +02:00
Griatch
94cf728081 Merge changes from master 2020-07-15 18:07:45 +02:00
Griatch
fff80c4752 Make sure to strip key/value of whitespace in lockfunc kwargs. Resolves #2150 2020-06-28 17:09:41 +02:00
Griatch
a84843d314 Pass category from objtag lockfunc. Resolve #2149 2020-06-28 11:22:07 +02:00
Griatch
345c91e35a Resolve merge conflicts 2020-05-18 22:52:49 +02:00
Griatch
935c2c6eff Test tag error claim of #2139 2020-05-18 20:38:04 +02:00
Griatch
8b2b23873f Run black on sources 2020-04-20 23:39:09 +02:00
trhr
f088207091 fixing fstring 2020-04-16 06:14:03 -05:00
trhr
0f8c0ad9bf fixing fstring 2020-04-16 05:53:51 -05:00
Griatch
27babf4469 Add inside_rec lockfunc. Resolves #1618 2020-02-17 01:11:31 +01:00
trhr
090157979b django.utils.translation.ugettext(), ugettext_lazy(), ugettext_noop(), ungettext(), and ungettext_lazy() are deprecated in favor of the functions that they’re aliases for: django.utils.translation.gettext(), gettext_lazy(), gettext_noop(), ngettext(), and ngettext_lazy(). 2020-02-09 20:14:47 -06:00
Griatch
69d85bd184 Make scripts/objects lists use EvMore. Change EvMore to not justify by default. 2020-01-11 15:49:12 +01:00
Griatch
2676f4574e Fix stupid bug in holds() lockfunc 2020-01-07 10:16:21 +01:00
Griatch
4ea6209123 Ran black on branc 2019-12-16 20:31:42 +01:00
Griatch
c2c7fa311a Format code with black. Add makefile to run fmt/tests 2019-09-28 18:18:11 +02:00
Greg Taylor
5e1a672fc2 Remove builtins imports
This module is not intended to be used directly in most cases, per:
https://docs.python.org/3/library/builtins.html

None of our usages warrant the explicit import. We also avoid some
confusion as folks dig to see what we are doing to require
importing builtins directly.
2019-09-15 20:29:59 -07:00
Griatch
ed187ad05f Various fixes from game jam 2019-05-14 10:33:31 +02:00
Griatch
ebb2fb6c1c Clean up with 2to3 2018-10-13 19:43:17 +02:00
Griatch
72f4fedcbe Merge with develop and fix merge conflicts 2018-10-01 20:58:16 +02:00
Griatch
6a90ccd0af Fix lockhandler import error 2018-09-14 22:12:12 +02:00
Griatch
566481310c Update CHANGELOG, delay import of dummy handler 2018-08-31 09:57:24 +02:00
Griatch
4f72f0ccbb List lockfuncs in menu, more elaborate doc strings 2018-07-24 20:48:54 +02:00
Griatch
116f6e7505 Fix unittests, resolve bugs 2018-06-10 20:00:35 +02:00
Griatch
054cba42bf Refactor prototype-functionality into its own package 2018-06-06 19:15:20 +02:00
Griatch
d71b281b56 Merge with develop branch, resolve conflicts 2018-05-09 17:39:10 +02:00
Griatch
2f985c882b Fix lockhandler singleton implmentation with a dummyobj 2018-04-25 22:34:33 +02:00
Griatch
c9ecd3b997 Add check_lockstring as a function in locks/lockhandler.py 2018-04-22 22:28:43 +02:00
Griatch
641ea746a5 Further stabilizing of spawner storage mechanism and error checking 2018-03-18 17:28:52 +01:00
Griatch
0967c9f668 Add lockhandler.append to update lock string 2018-03-18 16:31:01 +01:00
Griatch
3b7648ec0e Correct bugs in lock-handling, add more unit tests 2018-02-03 01:17:52 +01:00
Ryan Stein
7d524ac328 Unwrap for expressions in comprehensions, too. 2017-11-02 22:52:16 -04:00
Ryan Stein
6fa280b9fd Run 2to3. 2017-10-29 13:40:30 -04:00
Griatch
b737c209b1 Correct lockhandler's handling of lock-lists 2017-08-31 20:58:34 +02:00
Griatch
92df3ce5ae Structure handlers to allow .get() to return lists
See #1154. In the end I didn't modify the Attributehandler and
TagHandler like this, instead I added the `return_list` argument
for cases when one wants a guaranteed return.
2017-08-27 14:56:05 +02:00
Griatch
b278337172 Make PEP8 cleanup of line spaces and character distances as well as indents 2017-08-19 23:16:36 +02:00
Griatch
5590ee2258 Rename all instances of Player->Account. 2017-07-07 23:47:21 +02:00
Griatch
0bd47f0c52 Change permission strings so Immortals->Developer, Wizards->Admin, Builders->Builder, PlayerHelper->Helper, Players->Player, Guests->Guest. Made perm() and pperm() lock function accept both the plural and singular form (so both Admin and Admins work). Still lacking a data migration for updating an existing database to the new setup. 2017-02-17 23:25:09 +01:00
Griatch
a9f08760cc Further refactoring towards #1176. 2017-02-02 00:02:58 +01:00
Griatch
74eebfed6d Refactor code to remove alerts as per lgtm and #1176. 2017-01-29 19:02:00 +01:00
Griatch
c6d9c0619e Refactor code for readability and compatibility. 2017-01-27 00:19:27 +01:00
Griatch
b57b807da6 Make lockwarning log file name settable; turn off if not set. Resolves #1161. 2017-01-11 21:37:32 +01:00
Tehom
3ff9eac86c Have lockshandler fail gracefully rather than cause a server crash 2016-10-07 10:06:49 +02:00
Griatch
1a30079fd4 Fix how the lock command returns strings to avoid a malformed AMP send. This (again fixes ##996. 2016-06-15 20:02:32 +02:00
Griatch
d966051558 Changing utils.all_from_module to really only load variables actually
defined in the module in question (so will no longer include imports
from other modules). Added utils.callables_from_module to handle the
common case of only wanting callable functions from a module (used by
lock funcs, inlinefuncs etc).
2016-05-22 20:45:05 +02:00
Griatch
c1e4b1fe07 Further fixes to the tag lockfunc as well as handling of the changes to at_look to not include calling execute_cmd(look) but to use the at_look hook. This should finally resolve #889. 2015-12-15 20:17:41 +01:00
Ahmed Charles
11b61fe335 Import python3 compatible object. 2015-11-02 00:19:04 +01:00
Griatch
c7e1a6a086 Resolved merge conflicts against master. 2015-10-20 00:07:39 +02:00
Ahmed Charles
9b17fa450d Remove unnecessary assignment. 2015-10-19 23:32:13 +02:00
Griatch
50371b6abd Merged conflicts. 2015-10-19 23:32:00 +02:00