Commit Graph

64 Commits

Author SHA1 Message Date
Basilius Sauter e04d963633 Updated BattleClass to use BattleEvents
Implemented BattleEvents from @austenmc's old branch.

Added an empty Buff-Model as well, as well as a BuffList.

@ToDo: Add events, and add buff calculations to the battle class.

This PR will, however, only introduce the basic battle class, buffs will
come in another patch.
2016-05-25 11:30:57 +02:00
Basilius Sauter fb2c764e15 Implement Buff Model 2016-05-24 17:03:30 +02:00
Basilius Sauter 4e22b83dda Adds additional tests for exceptions 2016-05-23 18:28:30 +02:00
Basilius Sauter 3e2ea99b1f Added more methods to the Battle class and tests
If a battle is over or not can now be tested using this->isOver(). If the
battle is over, battle->getWinner() can be used to get the winner of this
fight, battle->getLooser() for the looser.
2016-05-23 18:19:01 +02:00
Basilius Sauter a8098af488 Completed basic battle system.
The class Battle takes two participants (player and monster) that both
need to implement the FighterInterface. Right now, rounds are
completed by the fightNRounds method.

Since all enemies in the old code follow the same default scaling,
monsters and masters use a AutoScaleFighter trait for now.
2016-05-23 16:29:15 +02:00
Basilius Sauter 820272ed93 Merge remote-tracking branch 'origin/master' into feature/fight 2016-05-23 14:11:38 +02:00
Basilius Sauter e7892db46b Adds various needed classes for the battle system 2016-05-23 14:07:04 +02:00
Austen McDonald 090beed91a Fix reference to models directory in Boostrap. 2016-05-21 21:43:33 -07:00
Austen McDonald e2c97d21f9 Add composer/composer as dependency (and pedantically reorder some deps). 2016-05-21 21:42:52 -07:00
Austen McDonald 78695eb52d Remove extra cache clear statement in tests. 2016-05-21 13:46:01 -07:00
Austen McDonald 8251e22784 Change configuration to use environment variables instead of globals. 2016-05-21 13:43:36 -07:00
Austen McDonald 01cc817913 Update composer.json to include metadata (and update installed versions) 2016-05-20 21:32:26 -07:00
Austen McDonald ca98a7337a Rename Game and Bootsrap methods to address feedback 2016-05-19 22:05:59 -07:00
Austen McDonald c60794511f Add Bootstrap as (at least temporary) way to construct a game. 2016-05-15 14:50:30 -07:00
Austen McDonald 5cce8f5a69 Add constructor for Game object. 2016-05-15 14:48:19 -07:00
Austen McDonald be0ea8fb09 Rename Game methods to be shorter, even if not following PHP conventions 2016-05-15 14:34:45 -07:00
Austen McDonald 9bb6137644 Remove GameInterface. I dont think we need this right now. 2016-05-15 14:27:57 -07:00
Austen McDonald 043c25ef85 Rebase and resolve conflicts, including updating tests
closes #16
2016-05-15 14:16:03 -07:00
Austen McDonald 9583865f70 Update composer modules 2016-05-14 21:31:40 -07:00
Austen McDonald da069c357e Add ModuleManager tests 2016-05-14 21:08:57 -07:00
Austen McDonald 4dfa46231c Fix bugs in ModuleManager 2016-05-14 21:08:57 -07:00
Austen McDonald e45b0ee694 Fix some bugs in ModelTestCase, including clearing the cache 2016-05-14 21:08:57 -07:00
Austen McDonald bd21736687 Add Game object and a GameInterface for use with tests. 2016-05-14 21:06:23 -07:00
Austen McDonald f06299cc7f Change Module to have createdAt field 2016-05-14 21:06:23 -07:00
Austen McDonald 6988c3bd7a Add missing documentation to EventManager constructor 2016-05-14 21:06:23 -07:00
Austen McDonald 6d962453b6 Fix up typos and syntax errors and add tests to Event system 2016-05-14 21:06:23 -07:00
Austen McDonald 9ac276ca37 Add EventManager and related classes 2016-05-14 21:06:23 -07:00
Austen McDonald 8b8b7e5299 Add ModuleManager and basic module handling functionality 2016-05-14 21:06:23 -07:00
Austen McDonald 86816f8666 Add Module model and tests 2016-05-14 21:06:23 -07:00
Basilius Sauter 0ff9958830 Adds MotD and Message model as well as tests
This commit adds the MotD model for storing and retrieving
messages-of-the-day.

It also adds a model for messages. Messages have an author as well as a
thread they belong to, the thread can be read by a specific number of
authors. FUrthermore, the message model supports system messages.

This commit introduces a number of needed changes:
- Character is now implementing the CharacterInterface
- MissingCharacter and SystemCharacter are supporting "pseudo-characters"
- trait MockCharacter implements non-implemented methods for
  MissingCharacter and SytemCharacter
- Characters are now soft-deletable. Models wanting to load soft-deleted
  characters need to fetch them eagerly.

Closes #17
2016-05-12 11:04:04 +02:00
Basilius Sauter 53d82646bf Refactored CharacterScene as CharacterViewpoint
closes #15
2016-04-29 19:03:48 +02:00
Basilius Sauter 2bb9bca69e Fix for dicebag test
dicebag tests asserts now for >= and <= instead of > and < since the edge
cases can happen from time to time as well.

closes #14
2016-04-28 22:58:05 +02:00
Basilius Sauter 5b86099bcc Adds GameConfiguration Model
Adds GameConfiguration Model which itself is a container for the
GameConfigurationElement entity. The GameConfiguration model makes use of
the introduces OneToManyCollection which implements the Collection
interface of the Doctrine library.

Closes PR #13
2016-04-28 18:35:46 +02:00
Basilius Sauter 7b21baee37 Introduction of the GameConfiguration model
This commit introduces the GameConfiguration, a model that is not an
entity. It also introduces GameConfigurationElement which is a doctrine
entity.
The two models make use of the traits introduced for CharacterProperty.
They also use the new OneToManyCollection class, which implements the
doctrine collection interface to a certain, limited extend. It mimicks
doctrine's PersisentCollection.
2016-04-27 22:51:16 +02:00
Basilius Sauter d59c08b60d Added a comment 2016-04-25 19:53:16 +02:00
Basilius Sauter 0692a977f2 Added additional tests to test the change of Scene. 2016-04-25 19:38:59 +02:00
Basilius Sauter dddaebbe0b Added additional test 2016-04-25 19:30:55 +02:00
Basilius Sauter 6edd4cf9b1 Implemented Character->getCharacterModel() 2016-04-25 19:25:25 +02:00
Basilius Sauter 7590247f89 Basic CharacterScene model
Moved basic Scene data to SceneBasics, created CharacterScene and a
getter for the Character model.
2016-04-21 07:32:57 +02:00
Basilius Sauter 9986420b10 Minor fixes and changes
The tests are now using sqlite inside of the memory. This ensures a
creation of the database every time the tests are run.
Added some additional tests for probing database persistance.
Removed outdated code.
2016-04-20 18:11:59 +02:00
Basilius Sauter 7643277cf7 Changed phpunit configuration back 2016-04-19 21:58:44 +02:00
Basilius Sauter 6a72a43cda Model changes
Adds basic Scene model
Extends Character model with reusable properties (Using the two traits
Properties and PropertyManager).
2016-04-19 21:51:40 +02:00
Austen McDonald 15ff6e8898 Make DiceBag and TimeKeeper conform to PSR2
closes #9
2016-04-18 21:02:14 -07:00
Basilius Sauter 001e4e9718 Closes 8 and resolved conflict
Conflicts:
	phpunit.xml
2016-04-18 07:23:07 +02:00
Basilius Sauter bd254f262e Closes #8 2016-04-18 07:06:34 +02:00
Austen McDonald 230e29963f Add Contributing section to the README
closes #5
2016-04-16 13:28:51 -07:00
Austen McDonald aa666d616b Add TimeKeeper and associated tests.
closes #6
2016-04-16 13:20:13 -07:00
Austen McDonald a1196c2ec3 Add DiceBag and tests
closes #7
2016-04-16 13:16:00 -07:00
Basilius Sauter f4a75607d7 Removed setsuites from phpunit 2016-04-16 09:17:56 +02:00
Basilius Sauter 9fe3582ffb Merge remote-tracking branch 'refs/remotes/origin/master' into feature/models 2016-04-16 09:17:39 +02:00