Commit graph

460 commits

Author SHA1 Message Date
FlutterSprite
44b570e5f0 Merge pull request #2 from FlutterSprite/develop
Merge develop
2017-11-18 13:44:25 -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
Griatch
4507c7aa2d Merge branch 'master' into develop 2017-11-11 01:02:26 +01:00
BattleJenkins
7ddb5162ab Added tb_magic.py - only basic input parsing 2017-11-09 22:36:11 -08: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
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
Tehom
eaeceddba1 Add unit tests for bodyfunctions. Merges #1494. 2017-10-29 11:10:01 +01:00
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
Nicholas Matlaga
781de86777 Change aliases of ExtendedRoom's desc command to reflect 0.7 hanges' 2017-10-22 21:42:12 +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
AmberFennek
fe6be5069a Text corrections in comments and strings 2017-10-16 15:13:53 -04: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
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
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
FlutterSprite
d4d8a9c1b8 Readme for turnbattle folder 2017-10-08 20:07:29 -07:00
FlutterSprite
83791e619a Add 'tb_equip', weapon & armor system for 'turnbattle'
Adds a new module, 'tb_equip', an implementation of the 'turnbattle' system that includes weapons and armor, which can be wielded and donned to modify attack damage and accuracy.
2017-10-08 20:05:53 -07:00
FlutterSprite
5cb1ce5b6e Move turnbattle.py to turnbattle/tb_basic.py
Moves the basic turnbattle module to a new module file in a new 'turnbattle' subfolder. Also fixes a minor bug where the first character in the turn order was not being initialized properly at the start of a fight.
2017-10-08 20:04:00 -07:00
amfl
75ad8d843d Pass at_before_say the corrent number of arguments 2017-10-03 19:38:25 +13:00
Griatch
5871e64681 Fix unittest for mail contrib update 2017-10-01 09:52:17 +02:00
Griatch
080c2a3b9f Add sanitization of mail contrib indices, as per #1311. 2017-09-30 23:44:24 +02:00
Griatch
03dcdd81cd Fix documentation error in contrib/multidescer. Resolves #1447. 2017-09-30 16:57:51 +02:00
Griatch
291fd6fa34 Fix call at_say -> at_before_say. Resolves #1451. 2017-09-30 14:18:37 +02:00
Griatch
787bfe5200 Cherry-pick of #1413. 2017-09-09 18:33:55 +02:00
Griatch
059ece50d9 Fix error in rpsystem install doctstring 2017-09-03 10:31:22 +02:00
Griatch
21d3dcb044 Explicitly close db connection from portal, address #1183. 2017-08-27 15:44:41 +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
7ff783fea1 Resolve merge conflicts with master. 2017-08-19 21:30:42 +02:00
Griatch
8b63fd7564 Merge pull request #1377 from vlegoff/ingame_python
Allow contrib.ingame_python.scripts.EventHandler.get_events to work w…
2017-08-13 15:56:23 +02:00