Commit Graph

95 Commits

Author SHA1 Message Date
2aefddf979 Merge branch 'gamelib' of ssh://gitlab.informatik.uni-ulm.de/sopra/ws20-marvelous-mashup/teams/team25 into gamelib 2021-05-18 14:19:23 +02:00
37e84b6e15 feat: created BasicAnswer, and cleaned up some code 2021-05-18 14:19:09 +02:00
9fa5c554ef feat: expose methods for game state event handling 2021-05-18 14:14:23 +02:00
2d33f150a8 refactor: remove todo 2021-05-18 14:02:55 +02:00
0bb4ba21df fix: code cleanup 2021-05-18 13:56:41 +02:00
b00ba50f97 feat: implement GameLogic.applyEvent 2021-05-18 13:55:36 +02:00
729a1d4a71 feat: add handling and checking for MindStone 2021-05-18 13:21:36 +02:00
4b69cca440 test: un-disabled JSONTest 2021-05-17 20:12:29 +02:00
1bd4e8a9c5 feat: partially created a test for EventDeserialzer, still needs some work 2021-05-17 20:10:42 +02:00
f3744ef225 feat: completed event deserializer, completing the deserialization pipeline 2021-05-17 20:10:13 +02:00
c5fe7ec7db fix: fixed GamestateEvent deserialization test 2021-05-17 18:48:58 +02:00
156677f290 test: wrote partial EventDeserializer test 2021-05-13 16:11:13 +02:00
3929bde062 test: removed prints from tests 2021-05-13 16:11:02 +02:00
2bfa17bef7 test: disabled two non-relevant tests 2021-05-13 16:10:51 +02:00
5701cedcf4 fix: added eventType to toString methods of events 2021-05-13 14:21:32 +02:00
868df160bb feat: implemented EntityDeserializer and EntityDeserializerTest 2021-05-11 23:11:17 +02:00
f7b1514491 feat: wrote EntityDeserializer 2021-05-11 21:17:55 +02:00
28ac25fa55 refactor: generated equals, hashCode and toString for entity classes 2021-05-11 21:17:06 +02:00
1cb2c145d1 feat: added integer conversion to StoneType enum 2021-05-11 21:00:33 +02:00
f4123481bc feat: implemented deserializer for IntVector2 and created a test for it 2021-05-11 20:26:57 +02:00
f09b9e2388 feat: connected deserializers to classes 2021-05-11 06:14:43 +02:00
6947105077 feat: created proper JSON deserializer and created test for JSON, which is still used for TDD 2021-05-11 06:14:18 +02:00
e3635851d2 feat: created deserializer for EntityIDs 2021-05-11 06:13:38 +02:00
734445275d feat: added JSON deserialization code to the JSON class 2021-05-11 06:13:21 +02:00
062281fdcb refactor: prepared GamestateEvent and MessageStructure for further steps by generating Equals and ToString 2021-05-11 06:11:01 +02:00
2b5d46f577 fix: changed character encoding for gradle compile to UTF-8 2021-05-11 05:06:28 +02:00
6e9efa1a59 refactor: changed GameStateEvent to GamestateEvent 2021-05-11 05:06:00 +02:00
e31cc1644d fix: added CustomEvents category for CustomEvent in EventType enum 2021-05-11 04:26:44 +02:00
7129f0f3ab fix: removed Req from EventTypes as it's now a request, not an event 2021-05-11 04:25:35 +02:00
1a98f25139 feat: add handling and checking for UseInfinityStoneRequest, fix: use proper distance calculations for some checks 2021-05-11 03:50:24 +02:00
4203092f9a fix: fixed building gamestate events (and the tests relating to that) 2021-05-11 03:20:19 +02:00
bbcff5d94b fix: changed project sdk and compiler settings to non-standard 15 2021-05-05 20:52:51 +02:00
c2d1c2cc98 feat: handle Req request and remove handling of lobby events 2021-05-05 18:59:07 +02:00
a9c80cb19b fix: add new event properties to builder 2021-05-05 18:58:39 +02:00
56a90f6bdf feat: added new request types 2021-05-05 17:49:36 +02:00
3038368ad8 feat: reworked GamestateEvent according to new standard 2021-05-05 17:32:18 +02:00
9405b89fb3 fix: resolve event emitter not emitting because of missing call to setChanged 2021-05-03 20:19:17 +02:00
a5ccba0326 refactor: switch to EventBuilder 2021-05-03 19:36:30 +02:00
80c77b7956 refactor: move event checks from builder to their respective classes 2021-05-03 19:25:36 +02:00
d36466a5a0 refactor: make GameLogic.checkRequest use error pattern and simple check methods 2021-05-02 15:34:42 +02:00
05f4751a2c feat: properly handle movement requests 2021-05-02 14:38:03 +02:00
d06ac91ef8 refactor: clean up code and improve event builder 2021-05-02 14:28:51 +02:00
45ac7d6a62 fix: properly add new pause events 2021-05-02 13:24:27 +02:00
3e36947d3e feat: partially finished test for EventBuilder 2021-05-02 04:14:28 +02:00
c190111de1 feat: completed EventBuilder with complete exception-based event checking for all events 2021-05-02 04:14:00 +02:00
1bd3cdf63f fix: rewrote CharacterEvent equals for nullability compatibility 2021-05-02 03:19:15 +02:00
326c469e55 fix: changed event types to non-primitives for nullability 2021-05-02 03:15:20 +02:00
e6cc61a272 feat: rewrote EntityBuilder to check for entity correctness when building entities 2021-05-02 02:58:39 +02:00
091e6eb688 fix: added entity to entityEvents as this is required for the SpawnEntityEvent 2021-05-02 02:58:02 +02:00
06af6b37f3 feat: added pause event types to eventType enum 2021-05-02 02:15:32 +02:00