Commit Graph

202 Commits

Author SHA1 Message Date
141469c11f refactor: changed returnType of checkRequestAndApply to optional 2021-06-01 16:34:08 +02:00
842db2439a breaking: remove observable pattern, make methods return events directly 2021-06-01 15:43:04 +02:00
4802b0113d feat: implemented NPC serialization properly 2021-06-01 14:04:50 +02:00
C H
fe7687bc21 added some tests for Events, Requests and their Builders 2021-06-01 09:40:03 +02:00
6c06beb366 fix: that's not supposed to be in there 2021-06-01 00:52:24 +02:00
cce1622a45 WIP: add full game test base 2021-06-01 00:50:43 +02:00
ae9f5902e1 refactor: create proper game logic test 2021-06-01 00:50:29 +02:00
787ba7d38e fix: naming and field occupation during game initialization 2021-06-01 00:48:49 +02:00
bfe7b10169 feat: implemented EntitySerializer and partial test 2021-06-01 00:42:54 +02:00
ad9d314b6b refactor: removed unused imports in JSON 2021-06-01 00:42:46 +02:00
23777bad33 refactor: extracted SerializedEntityType enum 2021-06-01 00:33:43 +02:00
20f014209a feat: added inventory method to get inventory as array 2021-06-01 00:33:43 +02:00
bccffad8f0 fix: more code is apparently better 2021-06-01 00:32:07 +02:00
3238f45836 refactor: matched test packages to previous refactor 2021-05-31 23:41:40 +02:00
d080fff5d3 refactor: arranged de/serializers into packages 2021-05-31 23:38:22 +02:00
852c85df08 feat: partial rewrite of JSON wit support for CharacterConfig 2021-05-31 23:25:41 +02:00
c8d34fcc97 feat: implemented config-based character deserialization 2021-05-31 23:25:41 +02:00
fa6207e47d feat: characterConfig now has a HashMap for values 2021-05-31 23:25:41 +02:00
9a9fe4ae97 feat: add thanos into the handling 2021-05-31 22:54:13 +02:00
1ba5410fd6 fix: improve the terrible rasterization code 2021-05-31 22:50:44 +02:00
4b794e99e9 feat: add proper game initialization 2021-05-31 21:37:18 +02:00
184c839c3a fix: utilize config in GameLogic 2021-05-31 18:30:26 +02:00
7c36ea5c5c fix: add configs to GameInstance and fix GameState snapshots 2021-05-31 18:07:53 +02:00
ab011e54da test: partial test for EventDeserializer 2021-05-31 17:57:55 +02:00
488b18b40c fix: make configuration class names consistent 2021-05-31 17:51:57 +02:00
d09a733f2a feat: add CharacterConfig 2021-05-31 17:50:15 +02:00
213955bc37 fix: reset turnCount at the beginning of a new round 2021-05-31 17:37:37 +02:00
a69d8b916f refactor: improved information hiding in RequestDeserializerTest 2021-05-31 15:03:11 +02:00
C H
bf574cec1e Update RequestBuilderTest.java 2021-05-30 18:51:30 +02:00
C H
1e47a63cb7 Merge branch 'gamelib' of https://gitlab.informatik.uni-ulm.de/sopra/ws20-marvelous-mashup/teams/team25 into gamelib 2021-05-30 18:50:33 +02:00
C H
75e9ee07a5 testing: RequestBuilder testing 2021-05-30 18:50:21 +02:00
e6dc10e3f5 feat: implemented proper Request serialization 2021-05-30 18:07:28 +02:00
6a6669ae5d refactor: re-formatted JSONTest 2021-05-30 18:07:05 +02:00
2ff309500e feat: implemented proper stringify in the JSON class, and changed ObjectMapper to static 2021-05-30 18:06:18 +02:00
d2216f190a feat: removed ObjectMapper in deserializers, and replaced it with context-based mapping 2021-05-30 17:22:02 +02:00
9192677ca1 fix: corrected JSON property order of CharacterRequest 2021-05-30 17:03:29 +02:00
27c3d6554a fix: fixed JSON mapping of requestTypes 2021-05-30 17:01:48 +02:00
cb0f2cae13 feat: optimized IntVector2Deserializer 2021-05-30 17:01:27 +02:00
d0829f3948 feat: implemented proper deserialization for EntityID and IntVector2 2021-05-30 17:00:59 +02:00
42e57daa54 test: started writing GameLogic test, and added providers for several types 2021-05-28 17:25:49 +02:00
a25231fb3e fix: fixed bugs in RequestDeserializer, and wrote Proptests for it 2021-05-28 16:20:40 +02:00
da1d72d61a refactor: nicer enum arrangement of RequestTypes 2021-05-28 16:20:22 +02:00
b871b4d3a4 refactor: split MessageStructure into multiple messages, as a starting point for proper implementation of the login standard 2021-05-28 14:51:17 +02:00
a92f437412 feat: completed RequestDeserializer 2021-05-28 14:50:38 +02:00
b2b963579e test: wrote proptest for IntVector to practise proptesting 2021-05-28 14:47:15 +02:00
C H
0ba55f4922 Merge branch 'gamelib' of https://gitlab.informatik.uni-ulm.de/sopra/ws20-marvelous-mashup/teams/team25 into gamelib 2021-05-28 13:40:08 +02:00
C H
940d8a8d97 EventBuilder Tests 2021-05-28 13:18:20 +02:00
0696176609 fix: allow EndRoundRequest event 2021-05-27 18:02:30 +02:00
830ef22997 feat/refactor: actually track win conditions 2021-05-27 17:58:44 +02:00
7f7459e7a7 fix: make movement events pick up infinity stones 2021-05-27 17:30:36 +02:00
3522cee9a4 feat: add stone cooldown handling 2021-05-27 17:26:46 +02:00
0f50efa121 feat: add handling for overtime victories 2021-05-27 17:18:36 +02:00
a416698adf feat: add handling for stan and goose 2021-05-27 17:08:08 +02:00
01ccabad14 refactor: massively improve turn and round handling code 2021-05-27 15:57:06 +02:00
7dcffab0a6 feat: changed ObjectMapper to static for the JSON deserializers 2021-05-26 16:16:48 +02:00
65c33d886c fix: removed checksum from MessageStructure 2021-05-21 22:33:01 +02:00
a4c510279a test: fixed EventDeserializerTest and implemented the GameEvent test part of it 2021-05-21 14:16:19 +02:00
035bf2eb7c refactor: generated Equals and HashCode for requests where necessary 2021-05-21 14:16:02 +02:00
596ace355a feat: implement method to start a game 2021-05-19 20:04:10 +02:00
f3b5fc277e wip: implement post turn handling 2021-05-19 19:59:41 +02:00
7bac3bd46a feat: properly expose EntityManager 2021-05-19 18:24:07 +02:00
bd442bedfc feat: add RequestBuilder and test base 2021-05-18 19:03:34 +02:00
588633fe46 fix: add more necessary getters to GameStateView 2021-05-18 18:44:01 +02:00
1348e342d6 refactor: removed deprecated checksum 2021-05-18 18:14:03 +02:00
a6e90ef0f4 fix: fixed a typo in RequestType 2021-05-18 17:58:35 +02:00
72cec32253 fix: make EventObserver use an array of events 2021-05-18 17:24:07 +02:00
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
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
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