Commit graph

9560 commits

Author SHA1 Message Date
FlutterSprite
2302408072 Merge pull request #3 from FlutterSprite/tb_items
Merge magic and items branches
2017-11-18 13:51:51 -08:00
FlutterSprite
44b570e5f0 Merge pull request #2 from FlutterSprite/develop
Merge develop
2017-11-18 13:44:25 -08:00
BattleJenkins
686b290b5d Fix condition ticking 2017-11-18 13:25:47 -08:00
BattleJenkins
44c75d8d18 Added functional condition, TickerHandler countdown 2017-11-18 13:22:03 -08:00
BattleJenkins
ae060ecc77 Fix weird spacing in use_item() 2017-11-17 21:19:02 -08:00
BattleJenkins
e61df0a400 Start porting in condition code from coolbattles 2017-11-17 21:17:35 -08:00
BattleJenkins
91c333e6d3 Move some item logic from CmdUse to new func use_item 2017-11-17 16:46:27 -08:00
BattleJenkins
5ce18379c0 Proper implementation of spend_item_use() 2017-11-16 00:15:20 -08:00
BattleJenkins
35340f86c8 Added 'use' command, item functions, example items 2017-11-15 23:12:25 -08:00
FlutterSprite
0616e0b218 Create tb_items.py 2017-11-15 16:25:08 -08:00
FlutterSprite
ed5c198d65 Merge pull request #1 from evennia/develop
Sync with develop
2017-11-15 16:23:38 -08:00
BattleJenkins
fda565b274 Final touches 2017-11-15 14:58:25 -08:00
BattleJenkins
7701d5f92b Comments and documentation, CmdStatus() added 2017-11-15 14:41:43 -08:00
FlutterSprite
858494eebb Formatting and documentation 2017-11-15 14:14:16 -08:00
FlutterSprite
83579a2e06 Added attack spells, more healing spell variants 2017-11-12 21:11:28 -08:00
FlutterSprite
5fe3cd186d Added functional 'cure wounds' spell
Also added more spell verification in the 'cast' command,
accounting for spell's MP cost and whether it can be used in
combat
2017-11-12 18:23:22 -08:00
FlutterSprite
f0630535e0 Fix variable in example menu function
I changed this while making unit tests and forgot to change it
back. Whoops!
2017-11-12 11:58:23 -08:00
FlutterSprite
53d8536744 Update tree_select.py 2017-11-12 11:51:53 -08:00
FlutterSprite
7d10570424 Catch callback errors with logger 2017-11-12 11:46:59 -08:00
FlutterSprite
ebe7c6f4b3 Fix order of args for the callback in documentation 2017-11-12 02:21:49 -08:00
FlutterSprite
4a554a4409 Add mention of how the callback is used 2017-11-12 01:56:35 -08:00
Nicholas
814ddc567e Change pop() to first() 2017-11-11 12:29:07 -05:00
Griatch
4507c7aa2d Merge branch 'master' into develop 2017-11-11 01:02:26 +01:00
Griatch
e3766762ee Fix dockerfile dependency. Resolve #1510. 2017-11-11 01:02:05 +01:00
Tehom
8049112186 Fix sethome's help file 2017-11-10 14:42:21 -05:00
BattleJenkins
7ddb5162ab Added tb_magic.py - only basic input parsing 2017-11-09 22:36:11 -08:00
Tehom
27e3a8ab7f Move deprecated TEMPLATE_DEBUG setting to the 'options' field of TEMPLATES. 2017-11-10 00:34:20 -05:00
Tehom
737d551cd7 Fix search and timeout with large database 2017-11-09 22:33:08 -05:00
FlutterSprite
8d5e167a8d Add unit tests for health_bar contrib 2017-11-05 18:42:55 -08:00
FlutterSprite
9ab3d27875 Adds health bar module
Adds a versatile function that will return a given current and maximum value as a "health bar" rendered with ANSI or xterm256 background color codes. This function has many options, such as being able to specify the length of the bar, its colors (including changing color depending on how full the bar is), what text is included inside the bar and how the text is justified within it.
2017-11-05 18:36:08 -08:00
Griatch
20ef7f26ed Resolve merge conflicts against develop branch 2017-11-05 14:20:25 +01:00
Ryan Stein
131f7157c4 Use a more robust method of validating an encoding. 2017-11-03 12:45:24 -04:00
Ryan Stein
6f91e1e546 Remove to_unicode. 2017-11-03 12:36:45 -04:00
Ryan Stein
7d524ac328 Unwrap for expressions in comprehensions, too. 2017-11-02 22:52:16 -04:00
Ryan Stein
f2e800ddf1 Unwrap several for statements from 2to3 conversion process. 2017-11-02 12:46:33 -04:00
Ryan Stein
8c318c6d38 Configure Travis CI for Python 3. 2017-11-02 10:43:13 -04:00
Ryan Stein
cd21fb2396 Use Python 3's new super() convention. 2017-11-02 10:41:41 -04:00
FlutterSprite
5ea86d86fa Fix typo in documentation 2017-10-30 19:16:43 -07:00
FlutterSprite
9a047a6362 Add tree select to README.md 2017-10-30 16:24:11 -07:00
FlutterSprite
fc16898db3 Added unit tests for tree_select contrib 2017-10-30 16:21:32 -07:00
FlutterSprite
94e9b4370e Add simple menu tree selection contrib
This contrib module allows developers to generate an EvMenu instance with options sourced from a multi-line string, which supports categories, back and forth menu navigation, option descriptions, and passing selections to custom callbacks. This allows for easier dynamic menus and much faster deployment of simple menu trees which does not require the manual definition of menu nodes and option dictionary-lists.
2017-10-30 15:01:51 -07:00
Griatch
d2ddbe9eb5 Merge branch 'develop' of https://github.com/FlutterSprite/evennia into FlutterSprite-develop 2017-10-30 22:05:17 +01:00
FlutterSprite
e48763a02e Clarify the nature of the different modules 2017-10-30 13:23:06 -07:00
Tehom
5a83d533a5 Add tests for general_context 2017-10-30 20:36:22 +01:00
FlutterSprite
89773e5860 Moved 'turnbattle' to packages section in readme 2017-10-30 05:11:53 -07:00
FlutterSprite
c6f422d44b Updated username in contrib readme 2017-10-30 05:03:26 -07:00
FlutterSprite
df9072253f Set turn handler's intervals higher during tests
This was an attempt to try to fix some strange 'unhandled error in
deffered' results while unit testing the contrib folder. It didn't
work, but it's probably good to do anyway.
2017-10-29 23:00:22 -07:00
FlutterSprite
9bc3fcf486 Unit tests for tb_range added 2017-10-29 21:39:11 -07:00
Ryan Stein
0cd979327b Fix whitespace. 2017-10-29 23:47:27 -04:00
Ryan Stein
93475a6de5 Deprecate to_str, to_unicode. Fix class_from_module, is_iter, make_iter. 2017-10-29 23:29:21 -04:00