Commit graph

4371 commits

Author SHA1 Message Date
FlutterSprite
1fe9bf3dce Moved distance_inc back to being its own function
I almost forgot - distance_inc is actually used by both
'approach' and 'withdraw', since approaching an object
might put you farther away from others. So, I moved it back
to its own function.
2017-10-23 22:29:45 -07:00
FlutterSprite
95f840ac7a get_range integrated into movement functions
This makes the code a bit more readable and fixes a bug
in withdrawing that didn't take other objects into account
properly.
2017-10-23 22:05:56 -07:00
FlutterSprite
66bb313c34 Empty returns deleted, methods properly spaced 2017-10-23 21:59:01 -07:00
FlutterSprite
e742179310 References to 'object' changed to 'thing' instead 2017-10-23 21:57:00 -07:00
FlutterSprite
b2ec29db81 distance_inc & distance_dec changed to helper funcs 2017-10-23 21:51:03 -07:00
FlutterSprite
30eea75ad7 Options for turn timeout and actions per turn 2017-10-23 21:36:42 -07:00
FlutterSprite
f576005772 Moved turn handler script up higher in module 2017-10-23 21:24:20 -07:00
FlutterSprite
347f161d94 Simplified bool returns in is_in_combat, is_turn 2017-10-23 21:16:19 -07:00
FlutterSprite
6e619d1949 Add at_defeat hook, PEP8 capitalization 2017-10-23 21:02:42 -07:00
Griatch
dfb2e02be6 Merge branch 'patch-1' of git://github.com/j-f1/evennia into j-f1-patch-1 2017-10-23 22:09:26 +02:00
Griatch
c0dec02075 Merge branch 'master' into develop 2017-10-23 22:06:25 +02:00
bclack
f356b6b6d3 Add newline after multimatch string error message
Other utility functions, such as caller.msg(), don't require adding
newline because newlines are added implicitly.  This change modifies the
multimatch string parameter to also not require newline, but add one
implicitly.
2017-10-23 22:06:10 +02:00
Nicholas Matlaga
781de86777 Change aliases of ExtendedRoom's desc command to reflect 0.7 hanges' 2017-10-22 21:42:12 +02:00
Griatch
6b4ce9eb2a Merge branch 'fix_extended_room' of git://github.com/chainsol/evennia into chainsol-fix_extended_room 2017-10-22 21:41:22 +02:00
Nicholas Matlaga
5f516215ee Change aliases of ExtendedRoom's desc command to reflect 0.7 hanges' 2017-10-22 15:34:13 -04:00
Jed Fox
57f0abe370 Add notification support to a few older browsers and Safari 2017-10-22 10:50:36 -04:00
Griatch
4a282b859e Change maintainer to be more generic 2017-10-20 23:28:59 +02:00
Griatch
329bb28d9e Some more docs 2017-10-20 23:10:08 +02:00
Griatch
1729611529 Add custom prompt for docker container 2017-10-20 00:45:19 +02:00
Griatch
6871567d78 Made alternative docker image style 2017-10-20 00:25:33 +02:00
Griatch
004d66887c Merge branch 'update-dockerfile' of git://github.com/gstoel/evennia into gstoel-update-dockerfile 2017-10-19 21:49:05 +02:00
Griatch
4499dad455 Merge branch 'develop' of github.com:evennia/evennia into develop 2017-10-19 21:43:32 +02:00
Griatch
0fdb7c8174 Merge branch 'master' into develop 2017-10-19 21:43:07 +02:00
Griatch
4a219e1360 Merge pull request #1482 from BlauFeuer/develop
Text corrections in comments and strings
2017-10-18 20:52:34 +02:00
AmberFennek
fe6be5069a Text corrections in comments and strings 2017-10-16 15:13:53 -04:00
Scyfris Talivinsky
9d10ca4f39 Fix an issue with adding an empty column to an EvTable
There seems to be an issue with adding an empty column (i.e. a column
with empty data) to an EvTable that has already been set up.  It seems
that the column with empty data is added with one extra row than the
rest of the table, and when a new call to add_rows() is made to EvTable,
the data in the column that was added previously is offset by 1.

This change fixes that by calculating the size of the new column to take
into account the headers BEFORE making the calculation on whether to
expand the column to match the table's size or not.
2017-10-15 13:38:53 -07:00
FlutterSprite
c762d3d7d1 Update README.md
Adds information about the tb_range module to the readme.
2017-10-14 22:36:18 -07:00
FlutterSprite
d150d191e9 Add tb_range - movement & positioning for 'turnbattle'
Adds a system for range and movement to the 'turnbattle' contrib. This is based on the abstract movement and positioning system I made for 'The World of Cool Battles', my learning project - fighters' absolute positions are not tracked, only their relative distance to each other and other objects. Commands for movement as well as distinction between melee and ranged attacks are included.
2017-10-14 22:34:18 -07:00
FlutterSprite
6cbd9984d7 Delete turnbattle.py
Now that this system has been moved to /turnbattle/, this file is obsolete.
2017-10-14 22:31:10 -07:00
Griatch
1f54d464a9 Include EvMenu etc in evennia init step. 2017-10-14 20:53:41 +02:00
Griatch
3e02f96566 Add ability to search_script by typeclass 2017-10-14 20:15:44 +02:00
Griatch
a447a22c87 Merge branch 'master' into develop 2017-10-13 23:11:34 +02:00
Griatch
14348eafab Remove left-over debug statements in irc module 2017-10-13 23:09:58 +02:00
Griatch
d70e7c52d2 Merge branch 'develop' of git://github.com/FlutterSprite/evennia into FlutterSprite-develop 2017-10-13 23:05:06 +02:00
Griatch
8be657ba43 Merge branch 'master' into develop 2017-10-13 23:04:37 +02:00
Griatch
fbaad6c3b7 Further cleanup of a module 2017-10-12 19:35:42 +02:00
Griatch
eeacf01427 Merge branch 'master' of git://github.com/vonzimr/evennia into vonzimr-master 2017-10-12 19:28:33 +02:00
Griatch
9f7fb2734c Make @py output appear for all sessions in MULTISESSION_MODE=1
Resolves #1356.
2017-10-12 18:03:48 +02:00
Griatch
4d6464cf89 Merge pull request #1476 from RyanStein/master
resolve #1448, fix 'no help entry' not popping up in webclient
2017-10-12 17:27:08 +02:00
vonzimr
3d2e7a7efd remove blank tests 2017-10-11 19:53:48 -07:00
Ryan Stein
53a4fc0b66 resolve #1448, fix 'no help entry' not popping up in webclient 2017-10-10 12:51:09 -04:00
FlutterSprite
8bdfa011fb Added more tb_equip tests
The unit tests for tb_basic and tb_equip are almost the same, with a few minor differences created by the different default values for unarmed attack and damage rolls.
2017-10-09 17:44:47 -07:00
vonzimr
5d2ee7e5f4 added IRC_INVERT code according to: https://github.com/myano/jenni/wiki/IRC-String-Formatting 2017-10-09 14:14:14 -07:00
vonzimr
9ddd79b202 extra tests for irc parsing functions 2017-10-09 14:13:48 -07:00
vonzimr
d01e9d9c32 fix spelling of variable to be more consistent with comments. 2017-10-09 12:32:03 -07:00
FlutterSprite
576e2b4be6 Updated typeclass names & added tests for tb_equip commands 2017-10-09 00:16:14 -07:00
FlutterSprite
da8b20e0b1 Renamed typeclasses to avoid conflicts 2017-10-09 00:14:32 -07:00
FlutterSprite
f031ba1b21 Renamed typeclasses to avoid conflicts 2017-10-09 00:13:03 -07:00
FlutterSprite
a3fd45bebb Update contrib unit tests for turnbattle
Points the contrib unit tests to the turnbattle module's new location in its subfolder.
2017-10-08 20:09:30 -07:00
FlutterSprite
b50c7a1f3e __init__.py for Turnbattle folder 2017-10-08 20:08:08 -07:00