Levels unity #224

danalex97 · 2017-08-28T21:17:24Z

This is a pull request meant to complete and extend the #220 pull request. The new features are support for levels exported from Unity(see https://github.com/ocadotechnology/aimmo-unity/tree/level_generation for more deails). Now both .txt levels and .json levels are supported.

Another important change is a refactoring for the cells: we can now pass a sprite description metadata formatted as a json. Some parts of the world_map may seem boilerplate, but this is due to the fact that #223 is yet to be merged.

danalex97 · 2017-08-30T14:21:45Z

Useful link: https://github.com/ocadotechnology/aimmo/wiki/Levels

CelineBoudier · 2017-08-31T12:48:07Z

I would squash (or rename?) a few commits there, to get a clean history if possible. Commits like "Fixed small merge problem." are not really helpful for instance...

CelineBoudier · 2017-08-31T13:00:02Z

players/views.py

@@ -143,7 +143,7 @@ def watch_level(request, num):
    LOGGER.debug('Displaying game with id %s', game.id)
    return _render_game(request, game)

-
+# This function adds the Levels to the database


might be better as a documentation below the title? But the title is explicit enough I think?

👍 I think we can just remove the comment.

CelineBoudier · 2017-08-31T13:09:36Z

aimmo-game/tests/test_simulation/test_map_generator.py

@@ -8,7 +8,7 @@
 from simulation.map_generator import get_random_edge_index
 from simulation.world_map import WorldMap


I don't think you need this import anymore :)

The WorldMap is not. The get_random_edge_index function is, as we test it.

danalex97 · 2017-08-31T14:30:50Z

I squashed some commits and removed the prints in tests. Hopefully now is more clean.

CelineBoudier · 2017-09-04T11:53:21Z

aimmo-game/simulation/game_state.py

@@ -1,6 +1,5 @@
 from simulation.avatar import fog_of_war

-


two lines please https://www.python.org/dev/peps/pep-0008/#blank-lines

CelineBoudier · 2017-09-04T11:53:37Z

aimmo-game/simulation/levels/decoders.py

+from simulation.pickups import HealthPickup
+from simulation.pickups import InvulnerabilityPickup
+from simulation.pickups import DamagePickup
+


two lines please https://www.python.org/dev/peps/pep-0008/#blank-lines

CelineBoudier · 2017-09-04T11:53:47Z

aimmo-game/simulation/levels/decoders.py

+    if "sprite" in json:
+        return json["sprite"]
+    return {}
+


two lines please https://www.python.org/dev/peps/pep-0008/#blank-lines

CelineBoudier · 2017-09-04T11:53:54Z

aimmo-game/simulation/levels/decoders.py

+    @abc.abstractmethod
+    def decode(self, json, world_map):
+        pass
+


two lines please https://www.python.org/dev/peps/pep-0008/#blank-lines

CelineBoudier · 2017-09-04T11:57:19Z

aimmo-game/simulation/levels/decoders.py

+
+def get_sprite(json):
+    if "sprite" in json:
+        return json["sprite"]


please use https://docs.python.org/2/library/stdtypes.html#dict.get to get the value here :)

CelineBoudier · 2017-09-04T11:58:59Z

aimmo-game/simulation/levels/parsers.py

+    def get_objects(self):
+        self.parse_json()
+        return self.map
+


two lines please https://www.python.org/dev/peps/pep-0008/#blank-lines

CelineBoudier · 2017-09-04T12:00:27Z

aimmo-game/simulation/levels/transforms.py

@@ -0,0 +1,29 @@
+import hashlib
+


two lines please https://www.python.org/dev/peps/pep-0008/#blank-lines

CelineBoudier · 2017-09-04T12:00:57Z

aimmo-game/simulation/map_generator.py


-    def get_game_state(self, avatar_manager):
-        return GameState(self.get_map(), avatar_manager, self.check_complete)
+LOGGER = logging.getLogger(__name__)



you get the idea :)

Just to check, "two lines please https://www.python.org/dev/peps/pep-0008/#blank-lines "?

CelineBoudier · 2017-09-04T12:01:32Z

players/views.py

@@ -143,7 +143,6 @@ def watch_level(request, num):
    LOGGER.debug('Displaying game with id %s', game.id)
    return _render_game(request, game)

-


CelineBoudier · 2017-09-04T12:02:28Z

all_tests.py

@@ -15,7 +15,6 @@
 BASE_DIR = os.path.abspath(os.path.dirname(__file__))
 APPS = ('', 'aimmo-game/', 'aimmo-game-worker/', 'aimmo-game-creator/')

-


danalex97 · 2017-09-04T13:35:21Z

I did the changes. For some reason GitHub does not show the comments outdated for enters.

CelineBoudier

sorry a few things had escaped me at first

CelineBoudier · 2017-09-04T14:26:32Z

aimmo-game/simulation/levels/completion_checks.py

+
+    return main_avatar.score > 1000
+
+COMPLETION_CHECKS = {


can't that be templated somehow and linked to the max number of levels defined somewhere?

The idea is that if I remove the completion check, it will just use the default one, that is return False.

CelineBoudier · 2017-09-04T14:27:33Z

aimmo-game/simulation/custom_map.py

+        return GameState(self.get_map(), avatar_manager, self.check_complete)
+
+    def check_complete(self, game_state):
+        return False


The default behavior for the check complete is to to never end the level. We override that in levels with the specific checks.

try abstracting it?

@CelineBoudier @danalex97 I'm not sure about python as it's still quite new to me, but I found the readibility of abstract methods/classes really difficult. Maybe we should use something like

@abc.abstractmethod

?

https://pymotw.com/3/abc/

Yeah, that's how I generally do it. But I wanted to make that a method with a default behavior, as all the classes EmptyMapGenerator, Main and JSONLevelGenerator use check_complete. I think it is better this way.

Why we have the parameter game state is that we might want some custom completion checks that do something like check the score and so on.

CelineBoudier · 2017-09-04T14:28:26Z

aimmo-game/tests/test_simulation/test_custom_map.py

+class TestAutomaticLevelGenerators(unittest.TestCase):
+    def test_generate_level_class(self):
+        def completed_check(self, y):
+            return False


same, why a parameter here if it's only to return False

I think the only reason is to fit the interface.

…w gets generated.

…e constructor actually a function, but we will move the logic to the level generator.

…asses will be placed in only one file.

…t the class generators at some point.

…ng/removing a level from maps will work.

… generator.

…prite field is not passed along, as the refactoring code has not been added.

…t both back-end and front-end generated levels.

…re_location fields with a new common class.

…s composed with a cell.

…annot be mutated. Now we need to get rid of _habitable and _generates_score fields.

…. Now we can pass the content from the level_generation through the new made classes.

…ld that is passes along with the models. Added documentation to parsers.

…umber.

…ut the rows and columns seem the be the other way round so we should look into it.

…le thing work the same but the responsability is seaprated.

…generator from WorldMap.

…ed parsers with the new transform.

…t is yet to be deleted.

… to see how to change the tests in custom_map.

…nch.

…ansform.

… instead of dictionary lookup.

OlafSzmidt · 2017-09-15T10:10:08Z

Any updates on merging this?

danalex97 · 2017-09-23T10:34:15Z

This was reviewed at some point, but then I rebased. @CelineBoudier reviewed this besides my last commit, As I rebased, git automatically dismissed the stale review.

Now there seem to be some conflicts. @OlafSzmidt I can rebase again or merge and someone can review this afterwards...

danalex97 · 2017-09-27T15:13:00Z

@OlafSzmidt Maybe we should rebase this after you finish the refactoring for MLP?

mrniket · 2017-11-09T17:13:19Z

I'm gonna close this as we are redoing it to work with 3D rendering

danalex97 added enhancement labels Aug 28, 2017

danalex97 requested review from Spycho, mikebryant, ramonfmir and CelineBoudier August 28, 2017 21:17

danalex97 removed the Epic label Aug 28, 2017

danalex97 self-assigned this Aug 28, 2017

CelineBoudier suggested changes Aug 31, 2017

View reviewed changes

danalex97 force-pushed the levels_unity branch 4 times, most recently from 7323f72 to 6bdb7ae Compare August 31, 2017 14:29

CelineBoudier suggested changes Sep 4, 2017

View reviewed changes

CelineBoudier previously approved these changes Sep 4, 2017

View reviewed changes

danalex97 dismissed CelineBoudier’s stale review via 4daf763 September 4, 2017 15:34

danalex97 force-pushed the levels_unity branch from dc762b8 to 4daf763 Compare September 4, 2017 15:34

danalex97 added 8 commits September 4, 2017 20:15

Added a second level. The levels get generated when the 'program' vie…

45ac6df

…w gets generated.

Added a class constructor that generates levels automatically. Now th…

d132559

…e constructor actually a function, but we will move the logic to the level generator.

Moved completion checks to a single file for all the levels.

2133fa8

Moved decoders to a different folder so that all the level related cl…

a725a83

…asses will be placed in only one file.

Moved tests so they are addressing a single issue now. We need to tes…

de93e14

…t the class generators at some point.

Changed the imports so the levels don't have to be imported. Now addi…

28c7278

…ng/removing a level from maps will work.

Documented level addition workflow.

0fda430

Added a test for the automatic level class generation.

67171b7

danalex97 and others added 22 commits September 4, 2017 20:15

Implemented the basic parser for the json exported by the Unity level…

9772929

… generator.

The obstacles exported from the front-end work as expected, but the s…

012ef28

…prite field is not passed along, as the refactoring code has not been added.

Changed the logic for getting the levels by file names. Now we suppor…

7debd61

…t both back-end and front-end generated levels.

Moved cell in separate folder. We shall replace the habitable and sco…

7f9dbe6

…re_location fields with a new common class.

Added a CellContent class hierarchy. Now we should only use that clas…

cbb3fd8

…s composed with a cell.

Minor fix in Cell Content class herarchy.

0052623

Keep generates_score and habitable as properties, i.e. getters that c…

1477bec

…annot be mutated. Now we need to get rid of _habitable and _generates_score fields.

Replaced all the _habitable and _generates_score with the new objects…

e25731a

…. Now we can pass the content from the level_generation through the new made classes.

Moved decoder registration inside decoders.py and added a 'style' fie…

1608788

…ld that is passes along with the models. Added documentation to parsers.

Sprites are sent together with the map feature.

153cec3

JSON not happy with comments plus naming issues fixed, style -> sprite.

84fc273

Hardcoded sprite JSON in custom maps and incremented check complete n…

60e2744

…umber.

Changed CellTransform's coordinates. The level appears as it should b…

65ac8f3

…ut the rows and columns seem the be the other way round so we should look into it.

Changed the WorldMap static functions to a map generator. Now the who…

31e389c

…le thing work the same but the responsability is seaprated.

Added documentation for the base generator.

4a91b5f

Modifed the EmptyMapGenerator to behave similarly to the removed map …

2f42719

…generator from WorldMap.

Refactoring the world_map class to work with the new cells and modifi…

b0c3110

…ed parsers with the new transform.

Fixed compatibility version problem. The cell was missing a field tha…

5275c77

…t is yet to be deleted.

Fixed MockParser to keep the same size of the transforms. Now we need…

de69dbb

… to see how to change the tests in custom_map.

Added imports and removed service test, which is tested on anther bra…

8b4c277

…nch.

Modified all the tests, so that they test the new behaviour of the tr…

b983e0b

…ansform.

Fixed indentation to match pep8 style and used get with default value…

abf2146

… instead of dictionary lookup.

danalex97 force-pushed the levels_unity branch from 4daf763 to 94be4e1 Compare September 4, 2017 19:31

Modifed test_service to be consistent with the new cell format. I'm out.

6194d8e

danalex97 force-pushed the levels_unity branch from 94be4e1 to 6194d8e Compare September 4, 2017 21:47

mrniket closed this Nov 9, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Levels unity #224

Levels unity #224

danalex97 commented Aug 28, 2017

danalex97 commented Aug 30, 2017

CelineBoudier commented Aug 31, 2017

CelineBoudier Aug 31, 2017

danalex97 Aug 31, 2017 •

edited

Loading

CelineBoudier Aug 31, 2017

danalex97 Aug 31, 2017 •

edited

Loading

danalex97 commented Aug 31, 2017 •

edited

Loading

CelineBoudier Sep 4, 2017

CelineBoudier Sep 4, 2017

CelineBoudier Sep 4, 2017

CelineBoudier Sep 4, 2017

CelineBoudier Sep 4, 2017

CelineBoudier Sep 4, 2017

CelineBoudier Sep 4, 2017

CelineBoudier Sep 4, 2017

danalex97 Sep 4, 2017 •

edited

Loading

CelineBoudier Sep 4, 2017

CelineBoudier Sep 4, 2017

CelineBoudier Sep 4, 2017

danalex97 commented Sep 4, 2017 •

edited

Loading

CelineBoudier left a comment

CelineBoudier Sep 4, 2017

danalex97 Sep 4, 2017

CelineBoudier Sep 4, 2017

danalex97 Sep 4, 2017

CelineBoudier Sep 4, 2017

OlafSzmidt Sep 4, 2017 •

edited

Loading

danalex97 Sep 4, 2017 •

edited

Loading

CelineBoudier Sep 4, 2017

danalex97 Sep 4, 2017 •

edited

Loading

OlafSzmidt commented Sep 15, 2017

danalex97 commented Sep 23, 2017

danalex97 commented Sep 27, 2017

mrniket commented Nov 9, 2017

		@@ -8,7 +8,7 @@
		from simulation.map_generator import get_random_edge_index
		from simulation.world_map import WorldMap

		@@ -143,7 +143,6 @@ def watch_level(request, num):
		LOGGER.debug('Displaying game with id %s', game.id)
		return _render_game(request, game)

		@@ -15,7 +15,6 @@
		BASE_DIR = os.path.abspath(os.path.dirname(__file__))
		APPS = ('', 'aimmo-game/', 'aimmo-game-worker/', 'aimmo-game-creator/')

Levels unity #224

Levels unity #224

Conversation

danalex97 commented Aug 28, 2017

danalex97 commented Aug 30, 2017

CelineBoudier commented Aug 31, 2017

Choose a reason for hiding this comment

danalex97 Aug 31, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

danalex97 Aug 31, 2017 • edited Loading

Choose a reason for hiding this comment

danalex97 commented Aug 31, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

danalex97 Sep 4, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

danalex97 commented Sep 4, 2017 • edited Loading

CelineBoudier left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OlafSzmidt Sep 4, 2017 • edited Loading

Choose a reason for hiding this comment

danalex97 Sep 4, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

danalex97 Sep 4, 2017 • edited Loading

Choose a reason for hiding this comment

OlafSzmidt commented Sep 15, 2017

danalex97 commented Sep 23, 2017

danalex97 commented Sep 27, 2017

mrniket commented Nov 9, 2017

danalex97 Aug 31, 2017 •

edited

Loading

danalex97 Aug 31, 2017 •

edited

Loading

danalex97 commented Aug 31, 2017 •

edited

Loading

danalex97 Sep 4, 2017 •

edited

Loading

danalex97 commented Sep 4, 2017 •

edited

Loading

OlafSzmidt Sep 4, 2017 •

edited

Loading

danalex97 Sep 4, 2017 •

edited

Loading

danalex97 Sep 4, 2017 •

edited

Loading